From b51fd2ee6ed21c81d71899e26538ed182e3858c0 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Mon, 25 Mar 2019 19:30:36 +0100
Subject: [PATCH 001/709] JBPM-8310 - S2I builder image for kjar as a service
 as native images, JBPM-8311 - S2I builder image for kjar as a service on
 OpenShift for SpringBoot/HotSpot

---
 .gitignore                                    |  14 ++
 s2i/kaas-quarkus-centos-s2i/Dockerfile        |  38 +++++
 s2i/kaas-quarkus-centos-s2i/Makefile          |  10 ++
 s2i/kaas-quarkus-centos-s2i/README.md         |  82 +++++++++
 .../maven/settings.xml                        |  47 ++++++
 s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble  |  56 +++++++
 s2i/kaas-quarkus-centos-s2i/s2i/bin/run       |   9 +
 .../s2i/bin/save-artifacts                    |   9 +
 s2i/kaas-quarkus-centos-s2i/s2i/bin/usage     |  21 +++
 s2i/kaas-quarkus-centos-s2i/test/run          | 155 ++++++++++++++++++
 .../test/test-app/index.html                  |  10 ++
 s2i/kaas-quarkus-centos/Dockerfile            |  32 ++++
 s2i/kaas-quarkus-centos/Makefile              |  10 ++
 s2i/kaas-quarkus-centos/README.md             |  82 +++++++++
 s2i/kaas-quarkus-centos/s2i/bin/assemble      |  12 ++
 .../s2i/bin/assemble-runtime                  |  14 ++
 s2i/kaas-quarkus-centos/s2i/bin/run           |   9 +
 s2i/kaas-quarkus-centos/s2i/bin/usage         |  12 ++
 s2i/kaas-quarkus-centos/test/run              | 155 ++++++++++++++++++
 .../test/test-app/index.html                  |  10 ++
 s2i/kaas-springboot-centos-s2i/Dockerfile     |  37 +++++
 s2i/kaas-springboot-centos-s2i/Makefile       |  10 ++
 s2i/kaas-springboot-centos-s2i/README.md      |  82 +++++++++
 .../maven/settings.xml                        |  47 ++++++
 .../s2i/bin/assemble                          |  54 ++++++
 s2i/kaas-springboot-centos-s2i/s2i/bin/run    |   9 +
 .../s2i/bin/save-artifacts                    |   9 +
 s2i/kaas-springboot-centos-s2i/s2i/bin/usage  |  20 +++
 s2i/kaas-springboot-centos-s2i/test/run       | 155 ++++++++++++++++++
 .../test/test-app/index.html                  |  10 ++
 s2i/kaas-springboot-centos/Dockerfile         |  34 ++++
 s2i/kaas-springboot-centos/Makefile           |  10 ++
 s2i/kaas-springboot-centos/README.md          |  82 +++++++++
 .../s2i/bin/assemble-runtime                  |  14 ++
 s2i/kaas-springboot-centos/s2i/bin/run        |   9 +
 s2i/kaas-springboot-centos/s2i/bin/usage      |  12 ++
 s2i/kaas-springboot-centos/test/run           | 155 ++++++++++++++++++
 .../test/test-app/index.html                  |  10 ++
 38 files changed, 1546 insertions(+)
 create mode 100755 .gitignore
 create mode 100644 s2i/kaas-quarkus-centos-s2i/Dockerfile
 create mode 100644 s2i/kaas-quarkus-centos-s2i/Makefile
 create mode 100644 s2i/kaas-quarkus-centos-s2i/README.md
 create mode 100644 s2i/kaas-quarkus-centos-s2i/maven/settings.xml
 create mode 100755 s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
 create mode 100755 s2i/kaas-quarkus-centos-s2i/s2i/bin/run
 create mode 100644 s2i/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts
 create mode 100755 s2i/kaas-quarkus-centos-s2i/s2i/bin/usage
 create mode 100755 s2i/kaas-quarkus-centos-s2i/test/run
 create mode 100644 s2i/kaas-quarkus-centos-s2i/test/test-app/index.html
 create mode 100644 s2i/kaas-quarkus-centos/Dockerfile
 create mode 100644 s2i/kaas-quarkus-centos/Makefile
 create mode 100644 s2i/kaas-quarkus-centos/README.md
 create mode 100755 s2i/kaas-quarkus-centos/s2i/bin/assemble
 create mode 100755 s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime
 create mode 100755 s2i/kaas-quarkus-centos/s2i/bin/run
 create mode 100755 s2i/kaas-quarkus-centos/s2i/bin/usage
 create mode 100755 s2i/kaas-quarkus-centos/test/run
 create mode 100644 s2i/kaas-quarkus-centos/test/test-app/index.html
 create mode 100644 s2i/kaas-springboot-centos-s2i/Dockerfile
 create mode 100644 s2i/kaas-springboot-centos-s2i/Makefile
 create mode 100644 s2i/kaas-springboot-centos-s2i/README.md
 create mode 100644 s2i/kaas-springboot-centos-s2i/maven/settings.xml
 create mode 100755 s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
 create mode 100755 s2i/kaas-springboot-centos-s2i/s2i/bin/run
 create mode 100644 s2i/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
 create mode 100755 s2i/kaas-springboot-centos-s2i/s2i/bin/usage
 create mode 100755 s2i/kaas-springboot-centos-s2i/test/run
 create mode 100644 s2i/kaas-springboot-centos-s2i/test/test-app/index.html
 create mode 100644 s2i/kaas-springboot-centos/Dockerfile
 create mode 100644 s2i/kaas-springboot-centos/Makefile
 create mode 100644 s2i/kaas-springboot-centos/README.md
 create mode 100755 s2i/kaas-springboot-centos/s2i/bin/assemble-runtime
 create mode 100755 s2i/kaas-springboot-centos/s2i/bin/run
 create mode 100755 s2i/kaas-springboot-centos/s2i/bin/usage
 create mode 100755 s2i/kaas-springboot-centos/test/run
 create mode 100644 s2i/kaas-springboot-centos/test/test-app/index.html

diff --git a/.gitignore b/.gitignore
new file mode 100755
index 00000000000..adf03446e4d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+/target
+/local
+
+# Eclipse, Netbeans and IntelliJ files
+/.*
+!.gitignore
+/nbproject
+/*.ipr
+/*.iws
+/*.iml
+*.xpr
+
+# Repository wide ignore mac DS_Store files
+.DS_Store
diff --git a/s2i/kaas-quarkus-centos-s2i/Dockerfile b/s2i/kaas-quarkus-centos-s2i/Dockerfile
new file mode 100644
index 00000000000..fa0af6b7976
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/Dockerfile
@@ -0,0 +1,38 @@
+# kaas-quarkus-centos-s2i
+FROM centos:latest
+
+LABEL maintainer="Submarine <submarine@kiegroup.com>"
+
+ENV MAVEN_VERSION 3.6.0
+ENV GRAALVM_VERSION ce-1.0.0-rc14
+ENV SUBMARINE_HOME /home/submarine
+
+LABEL io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
+      io.openshift.s2i.destination="/tmp" \
+      io.k8s.description="Platform for building KaaS based on Quarkus" \
+      io.k8s.display-name="KaaS based on Quarkus" \
+      io.openshift.expose-services="8080:http" \
+      io.openshift.tags="builder,kaas,quarkus"
+
+# Install Apache Maven and GraalVM
+RUN yum install -y --setopt=skip_missing_names_on_install=False \
+    tar gzip gcc glibc-devel zlib-devel curl && \
+    curl -fsSL https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /usr/share \
+    && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven && \
+    curl -fsSL https://github.com/oracle/graal/releases/download/vm-1.0.0-rc14/graalvm-$GRAALVM_VERSION-linux-amd64.tar.gz | tar xzf - -C /usr/share \
+    && mv /usr/share/graalvm-$GRAALVM_VERSION /usr/share/graalvm && \
+    adduser -u 1001 -g 0 submarine --home-dir ${SUBMARINE_HOME} && \
+    chown -R 1001:0 ${SUBMARINE_HOME} && \
+    chmod -R ug+rwX ${SUBMARINE_HOME}
+
+COPY ./s2i/bin/ /usr/local/s2i
+RUN chmod 755 /usr/local/s2i/*
+
+USER 1001
+
+WORKDIR ${SUBMARINE_HOME}
+
+COPY ./maven/ ${SUBMARINE_HOME}
+
+# Set the default CMD for the image
+CMD ["/usr/local/s2i/usage"]
diff --git a/s2i/kaas-quarkus-centos-s2i/Makefile b/s2i/kaas-quarkus-centos-s2i/Makefile
new file mode 100644
index 00000000000..eabc22a88fd
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/Makefile
@@ -0,0 +1,10 @@
+IMAGE_NAME = kaas-quarkus-centos-s2i
+
+.PHONY: build
+build:
+	docker build -t $(IMAGE_NAME) .
+
+.PHONY: test
+test:
+	docker build -t $(IMAGE_NAME)-candidate .
+	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
diff --git a/s2i/kaas-quarkus-centos-s2i/README.md b/s2i/kaas-quarkus-centos-s2i/README.md
new file mode 100644
index 00000000000..a1690dbb424
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/README.md
@@ -0,0 +1,82 @@
+
+# Creating a basic S2I builder image  
+
+## Getting started  
+
+### Files and Directories  
+| File                   | Required? | Description                                                  |
+|------------------------|-----------|--------------------------------------------------------------|
+| Dockerfile             | Yes       | Defines the base builder image                               |
+| s2i/bin/assemble       | Yes       | Script that builds the application                           |
+| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
+| s2i/bin/run            | Yes       | Script that runs the application                             |
+| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
+| test/run               | No        | Test script for the builder image                            |
+| test/test-app          | Yes       | Test application source code                                 |
+
+#### Dockerfile
+Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
+
+#### S2I scripts
+
+##### assemble
+Create an *assemble* script that will build our application, e.g.:
+- build python modules
+- bundle install ruby gems
+- setup application specific configuration
+
+The script can also specify a way to restore any saved artifacts from the previous image.   
+
+##### run
+Create a *run* script that will start the application. 
+
+##### save-artifacts (optional)
+Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
+
+##### usage (optional) 
+Create a *usage* script that will print out instructions on how to use the image.
+
+##### Make the scripts executable 
+Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
+
+#### Create the builder image
+The following command will create a builder image named kaas-quarkus based on the Dockerfile that was created previously.
+```
+docker build -t kaas-quarkus .
+```
+The builder image can also be created by using the *make* command since a *Makefile* is included.
+
+Once the image has finished building, the command *s2i usage kaas-quarkus* will print out the help info that was defined in the *usage* script.
+
+#### Testing the builder image
+The builder image can be tested using the following commands:
+```
+docker build -t kaas-quarkus-candidate .
+IMAGE_NAME=kaas-quarkus-candidate test/run
+```
+The builder image can also be tested by using the *make test* command since a *Makefile* is included.
+
+#### Creating the application image
+The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
+The following command will create the application image:
+```
+s2i build test/test-app kaas-quarkus kaas-quarkus-app
+---> Building and installing application from source...
+```
+Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory. 
+
+#### Running the application image
+Running the application image is as simple as invoking the docker run command:
+```
+docker run -d -p 8080:8080 kaas-quarkus-app
+```
+The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
+
+#### Using the saved artifacts script
+Rebuilding the application using the saved artifacts can be accomplished using the following command:
+```
+s2i build --incremental=true test/test-app nginx-centos7 nginx-app
+---> Restoring build artifacts...
+---> Building and installing application from source...
+```
+This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.
diff --git a/s2i/kaas-quarkus-centos-s2i/maven/settings.xml b/s2i/kaas-quarkus-centos-s2i/maven/settings.xml
new file mode 100644
index 00000000000..deeadde6cae
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/maven/settings.xml
@@ -0,0 +1,47 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <profiles>
+    <profile>
+      <id>default</id>
+      <repositories>
+        <repository>
+          <id>nexus</id>
+          <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+         <id>local-nexus</id>
+         <name>Local Nexus repository</name>
+         <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+         <releases>
+           <enabled>true</enabled>
+           <updatePolicy>never</updatePolicy>
+         </releases>
+         <snapshots>
+           <enabled>true</enabled>
+           <updatePolicy>always</updatePolicy>
+         </snapshots>
+       </repository>
+      </repositories>
+      <pluginRepositories>
+      <pluginRepository>
+        <id>local-nexus</id>
+        <name>Local Nexus repository</name>
+        <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+        <releases>
+          <enabled>true</enabled>
+          <updatePolicy>never</updatePolicy>
+        </releases>
+        <snapshots>
+          <enabled>true</enabled>
+          <updatePolicy>always</updatePolicy>
+        </snapshots>
+      </pluginRepository>
+    </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>default</activeProfile>
+  </activeProfiles>
+</settings>
diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble b/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
new file mode 100755
index 00000000000..786aea9fc3e
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
@@ -0,0 +1,56 @@
+#!/bin/bash -e
+#
+# S2I assemble script for the 'kaas-quarkus-centos-s2i' image.
+# The 'assemble' script builds your application source so that it is ready to run.
+#
+# For more information refer to the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+export JAVA_HOME=/usr/share/graalvm
+export MAVEN_HOME=/usr/share/maven
+export GRAALVM_HOME=/usr/share/graalvm
+
+# If the 'kaas-quarkus-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
+if [[ "$1" == "-h" ]]; then
+	exec /usr/libexec/s2i/usage
+fi
+
+if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
+		echo "---> Restore build artifacts"
+    mv /tmp/artifacts/.m2 $HOME
+fi
+
+echo "---> Installing application source..."
+cd /tmp/src/
+
+if [ -f "pom.xml" ]; then
+	echo "---> Building application from source..."
+	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/settings.xml -DskipTests
+else
+	echo "---> Generating project structure..."
+
+	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-quarkus-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $SUBMARINE_HOME/settings.xml
+
+	# copy resources into the generated project
+	for item in *
+	do
+		if [ -d $item ] && [ "$item" == "project" ]; then
+			echo "--> Skipping generated project ..."
+		else
+			echo "--> Coping resource $item"
+			cp -R $item project/src/main/resources
+		fi
+	done
+
+	# move all project content into the current directory
+	mv project/* .
+
+	echo "---> Building application from source..."
+	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/settings.xml -DskipTests
+
+fi
+
+echo "---> Installing application binaries"
+mkdir $SUBMARINE_HOME/bin
+cp -v target/*-runner $SUBMARINE_HOME/bin
+chmod +x $SUBMARINE_HOME/bin/*-runner
diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/run b/s2i/kaas-quarkus-centos-s2i/s2i/bin/run
new file mode 100755
index 00000000000..bb4694d9ca9
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/s2i/bin/run
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+#
+# S2I run script for the 'kaas-quarkus-centos-s2i' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+exec $SUBMARINE_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0
diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts b/s2i/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts
new file mode 100644
index 00000000000..d06c9a151cf
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+pushd ${HOME} > /dev/null
+if [ -d .m2 ]; then
+    tar cf - .m2
+    echo "--> Maven artifacts saved"
+    ls -l
+fi
+popd > /dev/null
diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/usage b/s2i/kaas-quarkus-centos-s2i/s2i/bin/usage
new file mode 100755
index 00000000000..6eb210310a6
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/s2i/bin/usage
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+cat <<EOF
+This is the kaas-quarkus-centos S2I image:
+
+Build native image based on project source either complete maven project or just set of business assets 
+such as processes, rules, decisions.
+
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+This image is intended to build application binaries only that are later on transfered to runtime image.
+
+
+s2i build -c <source code path/URL> kaas-quarkus-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/submarine/bin
+
+Sample invocation:
+
+s2i build -c /Development/project/ kaas-quarkus-centos-s2i application --runtime-image kaas-quarkus-centos --runtime-artifact /home/submarine/bin
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
diff --git a/s2i/kaas-quarkus-centos-s2i/test/run b/s2i/kaas-quarkus-centos-s2i/test/run
new file mode 100755
index 00000000000..a069abda968
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/test/run
@@ -0,0 +1,155 @@
+#!/bin/bash
+#
+# The 'run' performs a simple test that verifies the S2I image.
+# The main focus here is to exercise the S2I scripts.
+#
+# For more information see the documentation:
+# https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+# IMAGE_NAME specifies a name of the candidate image used for testing.
+# The image has to be available before this script is executed.
+#
+IMAGE_NAME=${IMAGE_NAME-kaas-quarkus-candidate}
+
+# Determining system utility executables (darwin compatibility check)
+READLINK_EXEC="readlink -zf"
+MKTEMP_EXEC="mktemp --suffix=.cid"
+if [[ "$OSTYPE" =~ 'darwin' ]]; then
+  READLINK_EXEC="readlink"
+  MKTEMP_EXEC="mktemp"
+  ! type -a "greadlink" &>"/dev/null" || READLINK_EXEC="greadlink"
+  ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
+fi
+
+_dir="$(dirname "${BASH_SOURCE[0]}")"
+test_dir="$($READLINK_EXEC ${_dir} || echo ${_dir})"
+image_dir=$($READLINK_EXEC ${test_dir}/.. || echo ${test_dir}/..)
+scripts_url="${image_dir}/.s2i/bin"
+cid_file=$($MKTEMP_EXEC -u)
+
+# Since we built the candidate image locally, we don't want S2I to attempt to pull
+# it from Docker hub
+s2i_args="--pull-policy=never --loglevel=2"
+
+# Port the image exposes service to be tested
+test_port=8080
+
+image_exists() {
+  docker inspect $1 &>/dev/null
+}
+
+container_exists() {
+  image_exists $(cat $cid_file)
+}
+
+container_ip() {
+  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostIp }}" $(cat $cid_file) | sed 's/0.0.0.0/localhost/'
+}
+
+container_port() {
+  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostPort }}" "$(cat "${cid_file}")"
+}
+
+run_s2i_build() {
+  s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
+}
+
+prepare() {
+  if ! image_exists ${IMAGE_NAME}; then
+    echo "ERROR: The image ${IMAGE_NAME} must exist before this script is executed."
+    exit 1
+  fi
+  # s2i build requires the application is a valid 'Git' repository
+  pushd ${test_dir}/test-app >/dev/null
+  git init
+  git config user.email "build@localhost" && git config user.name "builder"
+  git add -A && git commit -m "Sample commit"
+  popd >/dev/null
+  run_s2i_build
+}
+
+run_test_application() {
+  docker run --rm --cidfile=${cid_file} -p ${test_port}:${test_port} ${IMAGE_NAME}-testapp
+}
+
+cleanup() {
+  if [ -f $cid_file ]; then
+    if container_exists; then
+      docker stop $(cat $cid_file)
+    fi
+  fi
+  if image_exists ${IMAGE_NAME}-testapp; then
+    docker rmi ${IMAGE_NAME}-testapp
+  fi
+}
+
+check_result() {
+  local result="$1"
+  if [[ "$result" != "0" ]]; then
+    echo "S2I image '${IMAGE_NAME}' test FAILED (exit code: ${result})"
+    cleanup
+    exit $result
+  fi
+}
+
+wait_for_cid() {
+  local max_attempts=10
+  local sleep_time=1
+  local attempt=1
+  local result=1
+  while [ $attempt -le $max_attempts ]; do
+    [ -f $cid_file ] && break
+    echo "Waiting for container to start..."
+    attempt=$(( $attempt + 1 ))
+    sleep $sleep_time
+  done
+}
+
+test_usage() {
+  echo "Testing 's2i usage'..."
+  s2i usage ${s2i_args} ${IMAGE_NAME} &>/dev/null
+}
+
+test_connection() {
+  echo "Testing HTTP connection (http://$(container_ip):$(container_port))"
+  local max_attempts=10
+  local sleep_time=1
+  local attempt=1
+  local result=1
+  while [ $attempt -le $max_attempts ]; do
+    echo "Sending GET request to http://$(container_ip):$(container_port)/"
+    response_code=$(curl -s -w %{http_code} -o /dev/null http://$(container_ip):$(container_port)/)
+    status=$?
+    if [ $status -eq 0 ]; then
+      if [ $response_code -eq 200 ]; then
+        result=0
+      fi
+      break
+    fi
+    attempt=$(( $attempt + 1 ))
+    sleep $sleep_time
+  done
+  return $result
+}
+
+# Build the application image twice to ensure the 'save-artifacts' and
+# 'restore-artifacts' scripts are working properly
+prepare
+run_s2i_build
+check_result $?
+
+# Verify the 'usage' script is working properly
+test_usage
+check_result $?
+
+# Verify that the HTTP connection can be established to test application container
+run_test_application &
+
+# Wait for the container to write its CID file
+wait_for_cid
+
+test_connection
+check_result $?
+
+cleanup
+
diff --git a/s2i/kaas-quarkus-centos-s2i/test/test-app/index.html b/s2i/kaas-quarkus-centos-s2i/test/test-app/index.html
new file mode 100644
index 00000000000..7bca10c2d5b
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i/test/test-app/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+	<head>
+		<title>Hello World!</title>
+	</head>
+	<body>
+		<h1>Hello World!</h1>
+	</body>
+</html>
+ 
\ No newline at end of file
diff --git a/s2i/kaas-quarkus-centos/Dockerfile b/s2i/kaas-quarkus-centos/Dockerfile
new file mode 100644
index 00000000000..dacddbe4616
--- /dev/null
+++ b/s2i/kaas-quarkus-centos/Dockerfile
@@ -0,0 +1,32 @@
+# kaas-quarkus-centos
+FROM centos:latest
+
+ENV SUBMARINE_HOME /home/submarine
+
+LABEL maintainer="Submarine <submarine@kiegroup.com>"
+
+#Set labels used in OpenShift to describe the builder image
+LABEL io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
+      io.openshift.s2i.destination="/tmp" \
+      io.k8s.description="Runtime image for KaaS based on Quarkus native image" \
+      io.k8s.display-name="KaaS based on Quarkus native image" \
+      io.openshift.expose-services="8080:http" \
+      io.openshift.tags="builder,runtime,KaaS,Quarkus"
+
+
+# S2I scripts
+COPY s2i/bin/ /usr/local/s2i
+
+RUN chmod 755 /usr/local/s2i/* && \
+    adduser -u 1001 -g 0 submarine --home-dir ${SUBMARINE_HOME} && \
+    chown -R 1001:0 ${SUBMARINE_HOME} && \
+    chmod -R ug+rwX ${SUBMARINE_HOME}
+
+USER 1001
+
+WORKDIR ${SUBMARINE_HOME}
+
+# Set the default port for applications built using this image
+EXPOSE 8080
+
+CMD ["/usr/local/s2i/run"]
diff --git a/s2i/kaas-quarkus-centos/Makefile b/s2i/kaas-quarkus-centos/Makefile
new file mode 100644
index 00000000000..0970bc4829c
--- /dev/null
+++ b/s2i/kaas-quarkus-centos/Makefile
@@ -0,0 +1,10 @@
+IMAGE_NAME = kaas-quarkus-centos
+
+.PHONY: build
+build:
+	docker build -t $(IMAGE_NAME) .
+
+.PHONY: test
+test:
+	docker build -t $(IMAGE_NAME)-candidate .
+	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
diff --git a/s2i/kaas-quarkus-centos/README.md b/s2i/kaas-quarkus-centos/README.md
new file mode 100644
index 00000000000..645d793d378
--- /dev/null
+++ b/s2i/kaas-quarkus-centos/README.md
@@ -0,0 +1,82 @@
+
+# Creating a basic S2I builder image  
+
+## Getting started  
+
+### Files and Directories  
+| File                   | Required? | Description                                                  |
+|------------------------|-----------|--------------------------------------------------------------|
+| Dockerfile             | Yes       | Defines the base builder image                               |
+| s2i/bin/assemble       | Yes       | Script that builds the application                           |
+| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
+| s2i/bin/run            | Yes       | Script that runs the application                             |
+| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
+| test/run               | No        | Test script for the builder image                            |
+| test/test-app          | Yes       | Test application source code                                 |
+
+#### Dockerfile
+Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
+
+#### S2I scripts
+
+##### assemble
+Create an *assemble* script that will build our application, e.g.:
+- build python modules
+- bundle install ruby gems
+- setup application specific configuration
+
+The script can also specify a way to restore any saved artifacts from the previous image.   
+
+##### run
+Create a *run* script that will start the application. 
+
+##### save-artifacts (optional)
+Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
+
+##### usage (optional) 
+Create a *usage* script that will print out instructions on how to use the image.
+
+##### Make the scripts executable 
+Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
+
+#### Create the builder image
+The following command will create a builder image named kaas-quarkus-centos based on the Dockerfile that was created previously.
+```
+docker build -t kaas-quarkus-centos .
+```
+The builder image can also be created by using the *make* command since a *Makefile* is included.
+
+Once the image has finished building, the command *s2i usage kaas-quarkus-centos* will print out the help info that was defined in the *usage* script.
+
+#### Testing the builder image
+The builder image can be tested using the following commands:
+```
+docker build -t kaas-quarkus-centos-candidate .
+IMAGE_NAME=kaas-quarkus-centos-candidate test/run
+```
+The builder image can also be tested by using the *make test* command since a *Makefile* is included.
+
+#### Creating the application image
+The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
+The following command will create the application image:
+```
+s2i build test/test-app kaas-quarkus-centos kaas-quarkus-centos-app
+---> Building and installing application from source...
+```
+Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory. 
+
+#### Running the application image
+Running the application image is as simple as invoking the docker run command:
+```
+docker run -d -p 8080:8080 kaas-quarkus-centos-app
+```
+The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
+
+#### Using the saved artifacts script
+Rebuilding the application using the saved artifacts can be accomplished using the following command:
+```
+s2i build --incremental=true test/test-app nginx-centos7 nginx-app
+---> Restoring build artifacts...
+---> Building and installing application from source...
+```
+This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/assemble b/s2i/kaas-quarkus-centos/s2i/bin/assemble
new file mode 100755
index 00000000000..56c6e8116d8
--- /dev/null
+++ b/s2i/kaas-quarkus-centos/s2i/bin/assemble
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+# this script is used by OpenShift with chained builds
+# to transfer data from builder image into the runtime image
+
+cp -R /tmp/src/bin/ $SUBMARINE_HOME
+
+if [ -d "$SUBMARINE_HOME/bin" ]; then
+  echo "---> Application binaries found and ready to use"
+else
+  echo "---> Application binaries NOT found, failing build..."
+  exit 1
+fi
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime b/s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime
new file mode 100755
index 00000000000..fdbeaa1b6c2
--- /dev/null
+++ b/s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+#
+# S2I assemble-runtime script for the 'kaas-quarkus-centos' image.
+# The assemble-runtime script executes preparation for running the container on runtime image.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+if [ -d "$SUBMARINE_HOME/bin" ]; then
+  echo "---> Application binaries found and ready to use"
+else
+  echo "---> Application binaries NOT found, failing build..."
+  exit 1
+fi
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/run b/s2i/kaas-quarkus-centos/s2i/bin/run
new file mode 100755
index 00000000000..f82fcbc2c98
--- /dev/null
+++ b/s2i/kaas-quarkus-centos/s2i/bin/run
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+#
+# S2I run script for the 'kaas-quarkus-centos' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+exec $SUBMARINE_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/usage b/s2i/kaas-quarkus-centos/s2i/bin/usage
new file mode 100755
index 00000000000..99d159ba98f
--- /dev/null
+++ b/s2i/kaas-quarkus-centos/s2i/bin/usage
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+cat <<EOF
+This is the kaas-quarkus-centos S2I image:
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+Sample invocation:
+
+s2i build <source code path/URL> kaas-quarkus-centos <application image>
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
diff --git a/s2i/kaas-quarkus-centos/test/run b/s2i/kaas-quarkus-centos/test/run
new file mode 100755
index 00000000000..e74c9b198e6
--- /dev/null
+++ b/s2i/kaas-quarkus-centos/test/run
@@ -0,0 +1,155 @@
+#!/bin/bash
+#
+# The 'run' performs a simple test that verifies the S2I image.
+# The main focus here is to exercise the S2I scripts.
+#
+# For more information see the documentation:
+# https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+# IMAGE_NAME specifies a name of the candidate image used for testing.
+# The image has to be available before this script is executed.
+#
+IMAGE_NAME=${IMAGE_NAME-kaas-quarkus-centos-candidate}
+
+# Determining system utility executables (darwin compatibility check)
+READLINK_EXEC="readlink -zf"
+MKTEMP_EXEC="mktemp --suffix=.cid"
+if [[ "$OSTYPE" =~ 'darwin' ]]; then
+  READLINK_EXEC="readlink"
+  MKTEMP_EXEC="mktemp"
+  ! type -a "greadlink" &>"/dev/null" || READLINK_EXEC="greadlink"
+  ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
+fi
+
+_dir="$(dirname "${BASH_SOURCE[0]}")"
+test_dir="$($READLINK_EXEC ${_dir} || echo ${_dir})"
+image_dir=$($READLINK_EXEC ${test_dir}/.. || echo ${test_dir}/..)
+scripts_url="${image_dir}/.s2i/bin"
+cid_file=$($MKTEMP_EXEC -u)
+
+# Since we built the candidate image locally, we don't want S2I to attempt to pull
+# it from Docker hub
+s2i_args="--pull-policy=never --loglevel=2"
+
+# Port the image exposes service to be tested
+test_port=8080
+
+image_exists() {
+  docker inspect $1 &>/dev/null
+}
+
+container_exists() {
+  image_exists $(cat $cid_file)
+}
+
+container_ip() {
+  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostIp }}" $(cat $cid_file) | sed 's/0.0.0.0/localhost/'
+}
+
+container_port() {
+  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostPort }}" "$(cat "${cid_file}")"
+}
+
+run_s2i_build() {
+  s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
+}
+
+prepare() {
+  if ! image_exists ${IMAGE_NAME}; then
+    echo "ERROR: The image ${IMAGE_NAME} must exist before this script is executed."
+    exit 1
+  fi
+  # s2i build requires the application is a valid 'Git' repository
+  pushd ${test_dir}/test-app >/dev/null
+  git init
+  git config user.email "build@localhost" && git config user.name "builder"
+  git add -A && git commit -m "Sample commit"
+  popd >/dev/null
+  run_s2i_build
+}
+
+run_test_application() {
+  docker run --rm --cidfile=${cid_file} -p ${test_port}:${test_port} ${IMAGE_NAME}-testapp
+}
+
+cleanup() {
+  if [ -f $cid_file ]; then
+    if container_exists; then
+      docker stop $(cat $cid_file)
+    fi
+  fi
+  if image_exists ${IMAGE_NAME}-testapp; then
+    docker rmi ${IMAGE_NAME}-testapp
+  fi
+}
+
+check_result() {
+  local result="$1"
+  if [[ "$result" != "0" ]]; then
+    echo "S2I image '${IMAGE_NAME}' test FAILED (exit code: ${result})"
+    cleanup
+    exit $result
+  fi
+}
+
+wait_for_cid() {
+  local max_attempts=10
+  local sleep_time=1
+  local attempt=1
+  local result=1
+  while [ $attempt -le $max_attempts ]; do
+    [ -f $cid_file ] && break
+    echo "Waiting for container to start..."
+    attempt=$(( $attempt + 1 ))
+    sleep $sleep_time
+  done
+}
+
+test_usage() {
+  echo "Testing 's2i usage'..."
+  s2i usage ${s2i_args} ${IMAGE_NAME} &>/dev/null
+}
+
+test_connection() {
+  echo "Testing HTTP connection (http://$(container_ip):$(container_port))"
+  local max_attempts=10
+  local sleep_time=1
+  local attempt=1
+  local result=1
+  while [ $attempt -le $max_attempts ]; do
+    echo "Sending GET request to http://$(container_ip):$(container_port)/"
+    response_code=$(curl -s -w %{http_code} -o /dev/null http://$(container_ip):$(container_port)/)
+    status=$?
+    if [ $status -eq 0 ]; then
+      if [ $response_code -eq 200 ]; then
+        result=0
+      fi
+      break
+    fi
+    attempt=$(( $attempt + 1 ))
+    sleep $sleep_time
+  done
+  return $result
+}
+
+# Build the application image twice to ensure the 'save-artifacts' and
+# 'restore-artifacts' scripts are working properly
+prepare
+run_s2i_build
+check_result $?
+
+# Verify the 'usage' script is working properly
+test_usage
+check_result $?
+
+# Verify that the HTTP connection can be established to test application container
+run_test_application &
+
+# Wait for the container to write its CID file
+wait_for_cid
+
+test_connection
+check_result $?
+
+cleanup
+
diff --git a/s2i/kaas-quarkus-centos/test/test-app/index.html b/s2i/kaas-quarkus-centos/test/test-app/index.html
new file mode 100644
index 00000000000..7bca10c2d5b
--- /dev/null
+++ b/s2i/kaas-quarkus-centos/test/test-app/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+	<head>
+		<title>Hello World!</title>
+	</head>
+	<body>
+		<h1>Hello World!</h1>
+	</body>
+</html>
+ 
\ No newline at end of file
diff --git a/s2i/kaas-springboot-centos-s2i/Dockerfile b/s2i/kaas-springboot-centos-s2i/Dockerfile
new file mode 100644
index 00000000000..4c541cabdba
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/Dockerfile
@@ -0,0 +1,37 @@
+# kaas-quarkus-centos-s2i
+FROM centos:latest
+
+LABEL maintainer="Submarine <submarine@kiegroup.com>"
+
+ENV MAVEN_VERSION 3.6.0
+ENV JAVA_VERSON 1.8.0
+ENV SUBMARINE_HOME /home/submarine
+
+LABEL io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
+      io.openshift.s2i.destination="/tmp" \
+      io.k8s.description="Platform for building KaaS based on SpringBoot" \
+      io.k8s.display-name="KaaS based on SpringBoot" \
+      io.openshift.expose-services="8080:http" \
+      io.openshift.tags="builder,kaas,springboot"
+
+# install s2i files
+COPY ./s2i/bin/ /usr/local/s2i
+
+# install required packages
+RUN yum install -y --setopt=skip_missing_names_on_install=False \
+    tar curl java-$JAVA_VERSON-openjdk-devel && \
+    curl -fsSL https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /usr/share \
+    && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven && \
+    adduser -u 1001 -g 0 submarine --home-dir ${SUBMARINE_HOME} && \
+    chown -R 1001:0 ${SUBMARINE_HOME} && \
+    chmod -R ug+rwX ${SUBMARINE_HOME} && \
+    chmod 755 /usr/local/s2i/*
+
+USER 1001
+
+WORKDIR ${SUBMARINE_HOME}
+
+COPY ./maven/ ${SUBMARINE_HOME}
+
+# Set the default CMD for the image
+CMD ["/usr/local/s2i/usage"]
diff --git a/s2i/kaas-springboot-centos-s2i/Makefile b/s2i/kaas-springboot-centos-s2i/Makefile
new file mode 100644
index 00000000000..8f7321fbca3
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/Makefile
@@ -0,0 +1,10 @@
+IMAGE_NAME = kaas-springboot-centos-s2i
+
+.PHONY: build
+build:
+	docker build -t $(IMAGE_NAME) .
+
+.PHONY: test
+test:
+	docker build -t $(IMAGE_NAME)-candidate .
+	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
diff --git a/s2i/kaas-springboot-centos-s2i/README.md b/s2i/kaas-springboot-centos-s2i/README.md
new file mode 100644
index 00000000000..51ecbcff9db
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/README.md
@@ -0,0 +1,82 @@
+
+# Creating a basic S2I builder image  
+
+## Getting started  
+
+### Files and Directories  
+| File                   | Required? | Description                                                  |
+|------------------------|-----------|--------------------------------------------------------------|
+| Dockerfile             | Yes       | Defines the base builder image                               |
+| s2i/bin/assemble       | Yes       | Script that builds the application                           |
+| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
+| s2i/bin/run            | Yes       | Script that runs the application                             |
+| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
+| test/run               | No        | Test script for the builder image                            |
+| test/test-app          | Yes       | Test application source code                                 |
+
+#### Dockerfile
+Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
+
+#### S2I scripts
+
+##### assemble
+Create an *assemble* script that will build our application, e.g.:
+- build python modules
+- bundle install ruby gems
+- setup application specific configuration
+
+The script can also specify a way to restore any saved artifacts from the previous image.   
+
+##### run
+Create a *run* script that will start the application. 
+
+##### save-artifacts (optional)
+Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
+
+##### usage (optional) 
+Create a *usage* script that will print out instructions on how to use the image.
+
+##### Make the scripts executable 
+Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
+
+#### Create the builder image
+The following command will create a builder image named kaas-springboot-centos-s2i based on the Dockerfile that was created previously.
+```
+docker build -t kaas-springboot-centos-s2i .
+```
+The builder image can also be created by using the *make* command since a *Makefile* is included.
+
+Once the image has finished building, the command *s2i usage kaas-springboot-centos-s2i* will print out the help info that was defined in the *usage* script.
+
+#### Testing the builder image
+The builder image can be tested using the following commands:
+```
+docker build -t kaas-springboot-centos-s2i-candidate .
+IMAGE_NAME=kaas-springboot-centos-s2i-candidate test/run
+```
+The builder image can also be tested by using the *make test* command since a *Makefile* is included.
+
+#### Creating the application image
+The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
+The following command will create the application image:
+```
+s2i build test/test-app kaas-springboot-centos-s2i kaas-springboot-centos-s2i-app
+---> Building and installing application from source...
+```
+Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory. 
+
+#### Running the application image
+Running the application image is as simple as invoking the docker run command:
+```
+docker run -d -p 8080:8080 kaas-springboot-centos-s2i-app
+```
+The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
+
+#### Using the saved artifacts script
+Rebuilding the application using the saved artifacts can be accomplished using the following command:
+```
+s2i build --incremental=true test/test-app nginx-centos7 nginx-app
+---> Restoring build artifacts...
+---> Building and installing application from source...
+```
+This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.
diff --git a/s2i/kaas-springboot-centos-s2i/maven/settings.xml b/s2i/kaas-springboot-centos-s2i/maven/settings.xml
new file mode 100644
index 00000000000..deeadde6cae
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/maven/settings.xml
@@ -0,0 +1,47 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <profiles>
+    <profile>
+      <id>default</id>
+      <repositories>
+        <repository>
+          <id>nexus</id>
+          <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+         <id>local-nexus</id>
+         <name>Local Nexus repository</name>
+         <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+         <releases>
+           <enabled>true</enabled>
+           <updatePolicy>never</updatePolicy>
+         </releases>
+         <snapshots>
+           <enabled>true</enabled>
+           <updatePolicy>always</updatePolicy>
+         </snapshots>
+       </repository>
+      </repositories>
+      <pluginRepositories>
+      <pluginRepository>
+        <id>local-nexus</id>
+        <name>Local Nexus repository</name>
+        <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+        <releases>
+          <enabled>true</enabled>
+          <updatePolicy>never</updatePolicy>
+        </releases>
+        <snapshots>
+          <enabled>true</enabled>
+          <updatePolicy>always</updatePolicy>
+        </snapshots>
+      </pluginRepository>
+    </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>default</activeProfile>
+  </activeProfiles>
+</settings>
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble b/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
new file mode 100755
index 00000000000..ab96147e361
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
@@ -0,0 +1,54 @@
+#!/bin/bash -e
+#
+# S2I assemble script for the 'kaas-springboot-centos-s2i' image.
+# The 'assemble' script builds your application source so that it is ready to run.
+#
+# For more information refer to the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+export JAVA_HOME=/usr/lib/jvm/java
+export MAVEN_HOME=/usr/share/maven
+
+# If the 'kaas-springboot-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
+if [[ "$1" == "-h" ]]; then
+	exec /usr/libexec/s2i/usage
+fi
+
+if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
+		echo "---> Restore build artifacts"
+    mv /tmp/artifacts/.m2 $HOME
+fi
+
+echo "---> Installing application source..."
+cd /tmp/src/
+
+if [ -f "pom.xml" ]; then
+	echo "---> Building application from source..."
+	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml -DskipTests
+else
+	echo "---> Generating project structure..."
+
+	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-springboot-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $SUBMARINE_HOME/settings.xml
+
+	# copy resources into the generated project
+	for item in *
+	do
+		if [ -d $item ] && [ "$item" == "project" ]; then
+			echo "--> Skipping generated project ..."
+		else
+			echo "--> Coping resource $item"
+			cp -R $item project/src/main/resources
+		fi
+	done
+
+	# move all project content into the current directory
+	mv project/* .
+
+	echo "---> Building application from source..."
+	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml -DskipTests
+fi
+
+
+echo "---> Installing application binaries"
+mkdir $SUBMARINE_HOME/bin
+cp -v target/*.jar $SUBMARINE_HOME/bin
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/run b/s2i/kaas-springboot-centos-s2i/s2i/bin/run
new file mode 100755
index 00000000000..eb4c6f0dec1
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/s2i/bin/run
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+#
+# S2I run script for the 'kaas-springboot-centos-s2i' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+exec java -jar $SUBMARINE_HOME/bin/*.jar
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/save-artifacts b/s2i/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
new file mode 100644
index 00000000000..d06c9a151cf
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+pushd ${HOME} > /dev/null
+if [ -d .m2 ]; then
+    tar cf - .m2
+    echo "--> Maven artifacts saved"
+    ls -l
+fi
+popd > /dev/null
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/usage b/s2i/kaas-springboot-centos-s2i/s2i/bin/usage
new file mode 100755
index 00000000000..8b01045a39f
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/s2i/bin/usage
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+cat <<EOF
+This is the kaas-springboot-centos S2I image:
+
+Build executable jar based on project source either complete maven project or just set of business assets 
+such as processes, rules, decisions.
+
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+This image is intended to build application binaries only that are later on transfered to runtime image.
+
+s2i build -c <source code path/URL> kaas-quarkus-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/submarine/bin
+
+Sample invocation:
+
+s2i build -c /Development/project/ kaas-springboot-centos-s2i application --runtime-image kaas-springboot-centos --runtime-artifact /home/submarine/bin
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
diff --git a/s2i/kaas-springboot-centos-s2i/test/run b/s2i/kaas-springboot-centos-s2i/test/run
new file mode 100755
index 00000000000..d4c2c9b4b15
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/test/run
@@ -0,0 +1,155 @@
+#!/bin/bash
+#
+# The 'run' performs a simple test that verifies the S2I image.
+# The main focus here is to exercise the S2I scripts.
+#
+# For more information see the documentation:
+# https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+# IMAGE_NAME specifies a name of the candidate image used for testing.
+# The image has to be available before this script is executed.
+#
+IMAGE_NAME=${IMAGE_NAME-kaas-springboot-centos-s2i-candidate}
+
+# Determining system utility executables (darwin compatibility check)
+READLINK_EXEC="readlink -zf"
+MKTEMP_EXEC="mktemp --suffix=.cid"
+if [[ "$OSTYPE" =~ 'darwin' ]]; then
+  READLINK_EXEC="readlink"
+  MKTEMP_EXEC="mktemp"
+  ! type -a "greadlink" &>"/dev/null" || READLINK_EXEC="greadlink"
+  ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
+fi
+
+_dir="$(dirname "${BASH_SOURCE[0]}")"
+test_dir="$($READLINK_EXEC ${_dir} || echo ${_dir})"
+image_dir=$($READLINK_EXEC ${test_dir}/.. || echo ${test_dir}/..)
+scripts_url="${image_dir}/.s2i/bin"
+cid_file=$($MKTEMP_EXEC -u)
+
+# Since we built the candidate image locally, we don't want S2I to attempt to pull
+# it from Docker hub
+s2i_args="--pull-policy=never --loglevel=2"
+
+# Port the image exposes service to be tested
+test_port=8080
+
+image_exists() {
+  docker inspect $1 &>/dev/null
+}
+
+container_exists() {
+  image_exists $(cat $cid_file)
+}
+
+container_ip() {
+  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostIp }}" $(cat $cid_file) | sed 's/0.0.0.0/localhost/'
+}
+
+container_port() {
+  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostPort }}" "$(cat "${cid_file}")"
+}
+
+run_s2i_build() {
+  s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
+}
+
+prepare() {
+  if ! image_exists ${IMAGE_NAME}; then
+    echo "ERROR: The image ${IMAGE_NAME} must exist before this script is executed."
+    exit 1
+  fi
+  # s2i build requires the application is a valid 'Git' repository
+  pushd ${test_dir}/test-app >/dev/null
+  git init
+  git config user.email "build@localhost" && git config user.name "builder"
+  git add -A && git commit -m "Sample commit"
+  popd >/dev/null
+  run_s2i_build
+}
+
+run_test_application() {
+  docker run --rm --cidfile=${cid_file} -p ${test_port}:${test_port} ${IMAGE_NAME}-testapp
+}
+
+cleanup() {
+  if [ -f $cid_file ]; then
+    if container_exists; then
+      docker stop $(cat $cid_file)
+    fi
+  fi
+  if image_exists ${IMAGE_NAME}-testapp; then
+    docker rmi ${IMAGE_NAME}-testapp
+  fi
+}
+
+check_result() {
+  local result="$1"
+  if [[ "$result" != "0" ]]; then
+    echo "S2I image '${IMAGE_NAME}' test FAILED (exit code: ${result})"
+    cleanup
+    exit $result
+  fi
+}
+
+wait_for_cid() {
+  local max_attempts=10
+  local sleep_time=1
+  local attempt=1
+  local result=1
+  while [ $attempt -le $max_attempts ]; do
+    [ -f $cid_file ] && break
+    echo "Waiting for container to start..."
+    attempt=$(( $attempt + 1 ))
+    sleep $sleep_time
+  done
+}
+
+test_usage() {
+  echo "Testing 's2i usage'..."
+  s2i usage ${s2i_args} ${IMAGE_NAME} &>/dev/null
+}
+
+test_connection() {
+  echo "Testing HTTP connection (http://$(container_ip):$(container_port))"
+  local max_attempts=10
+  local sleep_time=1
+  local attempt=1
+  local result=1
+  while [ $attempt -le $max_attempts ]; do
+    echo "Sending GET request to http://$(container_ip):$(container_port)/"
+    response_code=$(curl -s -w %{http_code} -o /dev/null http://$(container_ip):$(container_port)/)
+    status=$?
+    if [ $status -eq 0 ]; then
+      if [ $response_code -eq 200 ]; then
+        result=0
+      fi
+      break
+    fi
+    attempt=$(( $attempt + 1 ))
+    sleep $sleep_time
+  done
+  return $result
+}
+
+# Build the application image twice to ensure the 'save-artifacts' and
+# 'restore-artifacts' scripts are working properly
+prepare
+run_s2i_build
+check_result $?
+
+# Verify the 'usage' script is working properly
+test_usage
+check_result $?
+
+# Verify that the HTTP connection can be established to test application container
+run_test_application &
+
+# Wait for the container to write its CID file
+wait_for_cid
+
+test_connection
+check_result $?
+
+cleanup
+
diff --git a/s2i/kaas-springboot-centos-s2i/test/test-app/index.html b/s2i/kaas-springboot-centos-s2i/test/test-app/index.html
new file mode 100644
index 00000000000..7bca10c2d5b
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i/test/test-app/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+	<head>
+		<title>Hello World!</title>
+	</head>
+	<body>
+		<h1>Hello World!</h1>
+	</body>
+</html>
+ 
\ No newline at end of file
diff --git a/s2i/kaas-springboot-centos/Dockerfile b/s2i/kaas-springboot-centos/Dockerfile
new file mode 100644
index 00000000000..6039e19a5be
--- /dev/null
+++ b/s2i/kaas-springboot-centos/Dockerfile
@@ -0,0 +1,34 @@
+# kaas-springboot-centos
+FROM centos:latest
+
+ENV JAVA_VERSON 1.8.0
+ENV SUBMARINE_HOME /home/submarine
+
+LABEL maintainer="Submarine <submarine@kiegroup.com>"
+
+#Set labels used in OpenShift to describe the builder image
+LABEL io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
+      io.openshift.s2i.destination="/tmp" \
+      io.k8s.description="Runtime image for KaaS based on SpringBoot native image" \
+      io.k8s.display-name="KaaS based on SpringBoot native image" \
+      io.openshift.expose-services="8080:http" \
+      io.openshift.tags="builder,runtime,kaas,springboot"
+
+# S2I scripts
+COPY s2i/bin/ /usr/local/s2i
+
+RUN yum install -y java-$JAVA_VERSON-openjdk j && \
+    yum clean all && \
+    chmod 755 /usr/local/s2i/* && \
+    adduser -u 1001 -g 0 submarine --home-dir ${SUBMARINE_HOME} && \
+    chown -R 1001:0 ${SUBMARINE_HOME} && \
+    chmod -R ug+rwX ${SUBMARINE_HOME}
+
+USER 1001
+
+WORKDIR ${SUBMARINE_HOME}
+
+# Set the default port for applications built using this image
+EXPOSE 8080
+
+CMD ["/usr/local/s2i/run"]
diff --git a/s2i/kaas-springboot-centos/Makefile b/s2i/kaas-springboot-centos/Makefile
new file mode 100644
index 00000000000..1bdd3bf68ae
--- /dev/null
+++ b/s2i/kaas-springboot-centos/Makefile
@@ -0,0 +1,10 @@
+IMAGE_NAME = kaas-springboot-centos
+
+.PHONY: build
+build:
+	docker build -t $(IMAGE_NAME) .
+
+.PHONY: test
+test:
+	docker build -t $(IMAGE_NAME)-candidate .
+	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
diff --git a/s2i/kaas-springboot-centos/README.md b/s2i/kaas-springboot-centos/README.md
new file mode 100644
index 00000000000..af395b95246
--- /dev/null
+++ b/s2i/kaas-springboot-centos/README.md
@@ -0,0 +1,82 @@
+
+# Creating a basic S2I builder image  
+
+## Getting started  
+
+### Files and Directories  
+| File                   | Required? | Description                                                  |
+|------------------------|-----------|--------------------------------------------------------------|
+| Dockerfile             | Yes       | Defines the base builder image                               |
+| s2i/bin/assemble       | Yes       | Script that builds the application                           |
+| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
+| s2i/bin/run            | Yes       | Script that runs the application                             |
+| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
+| test/run               | No        | Test script for the builder image                            |
+| test/test-app          | Yes       | Test application source code                                 |
+
+#### Dockerfile
+Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
+
+#### S2I scripts
+
+##### assemble
+Create an *assemble* script that will build our application, e.g.:
+- build python modules
+- bundle install ruby gems
+- setup application specific configuration
+
+The script can also specify a way to restore any saved artifacts from the previous image.   
+
+##### run
+Create a *run* script that will start the application. 
+
+##### save-artifacts (optional)
+Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
+
+##### usage (optional) 
+Create a *usage* script that will print out instructions on how to use the image.
+
+##### Make the scripts executable 
+Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
+
+#### Create the builder image
+The following command will create a builder image named kaas-springboot-centos based on the Dockerfile that was created previously.
+```
+docker build -t kaas-springboot-centos .
+```
+The builder image can also be created by using the *make* command since a *Makefile* is included.
+
+Once the image has finished building, the command *s2i usage kaas-springboot-centos* will print out the help info that was defined in the *usage* script.
+
+#### Testing the builder image
+The builder image can be tested using the following commands:
+```
+docker build -t kaas-springboot-centos-candidate .
+IMAGE_NAME=kaas-springboot-centos-candidate test/run
+```
+The builder image can also be tested by using the *make test* command since a *Makefile* is included.
+
+#### Creating the application image
+The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
+The following command will create the application image:
+```
+s2i build test/test-app kaas-springboot-centos kaas-springboot-centos-app
+---> Building and installing application from source...
+```
+Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory. 
+
+#### Running the application image
+Running the application image is as simple as invoking the docker run command:
+```
+docker run -d -p 8080:8080 kaas-springboot-centos-app
+```
+The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
+
+#### Using the saved artifacts script
+Rebuilding the application using the saved artifacts can be accomplished using the following command:
+```
+s2i build --incremental=true test/test-app nginx-centos7 nginx-app
+---> Restoring build artifacts...
+---> Building and installing application from source...
+```
+This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.
diff --git a/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime b/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime
new file mode 100755
index 00000000000..def7b944189
--- /dev/null
+++ b/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+#
+# S2I assemble-runtime script for the 'kaas-springboot-centos' image.
+# The assemble-runtime script executes preparation for running the container on runtime image.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+if [ -d "$SUBMARINE_HOME/bin" ]; then
+  echo "---> Application binaries found and ready to use"
+else
+  echo "---> Application binaries NOT found, failing build..."
+  exit 1
+fi
diff --git a/s2i/kaas-springboot-centos/s2i/bin/run b/s2i/kaas-springboot-centos/s2i/bin/run
new file mode 100755
index 00000000000..c7dd5841d33
--- /dev/null
+++ b/s2i/kaas-springboot-centos/s2i/bin/run
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+#
+# S2I run script for the 'kaas-springboot-centos' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+exec java -jar $SUBMARINE_HOME/bin/*.jar
diff --git a/s2i/kaas-springboot-centos/s2i/bin/usage b/s2i/kaas-springboot-centos/s2i/bin/usage
new file mode 100755
index 00000000000..99d159ba98f
--- /dev/null
+++ b/s2i/kaas-springboot-centos/s2i/bin/usage
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+cat <<EOF
+This is the kaas-quarkus-centos S2I image:
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+Sample invocation:
+
+s2i build <source code path/URL> kaas-quarkus-centos <application image>
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
diff --git a/s2i/kaas-springboot-centos/test/run b/s2i/kaas-springboot-centos/test/run
new file mode 100755
index 00000000000..47cdad993f5
--- /dev/null
+++ b/s2i/kaas-springboot-centos/test/run
@@ -0,0 +1,155 @@
+#!/bin/bash
+#
+# The 'run' performs a simple test that verifies the S2I image.
+# The main focus here is to exercise the S2I scripts.
+#
+# For more information see the documentation:
+# https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+# IMAGE_NAME specifies a name of the candidate image used for testing.
+# The image has to be available before this script is executed.
+#
+IMAGE_NAME=${IMAGE_NAME-kaas-springboot-centos-candidate}
+
+# Determining system utility executables (darwin compatibility check)
+READLINK_EXEC="readlink -zf"
+MKTEMP_EXEC="mktemp --suffix=.cid"
+if [[ "$OSTYPE" =~ 'darwin' ]]; then
+  READLINK_EXEC="readlink"
+  MKTEMP_EXEC="mktemp"
+  ! type -a "greadlink" &>"/dev/null" || READLINK_EXEC="greadlink"
+  ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
+fi
+
+_dir="$(dirname "${BASH_SOURCE[0]}")"
+test_dir="$($READLINK_EXEC ${_dir} || echo ${_dir})"
+image_dir=$($READLINK_EXEC ${test_dir}/.. || echo ${test_dir}/..)
+scripts_url="${image_dir}/.s2i/bin"
+cid_file=$($MKTEMP_EXEC -u)
+
+# Since we built the candidate image locally, we don't want S2I to attempt to pull
+# it from Docker hub
+s2i_args="--pull-policy=never --loglevel=2"
+
+# Port the image exposes service to be tested
+test_port=8080
+
+image_exists() {
+  docker inspect $1 &>/dev/null
+}
+
+container_exists() {
+  image_exists $(cat $cid_file)
+}
+
+container_ip() {
+  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostIp }}" $(cat $cid_file) | sed 's/0.0.0.0/localhost/'
+}
+
+container_port() {
+  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostPort }}" "$(cat "${cid_file}")"
+}
+
+run_s2i_build() {
+  s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
+}
+
+prepare() {
+  if ! image_exists ${IMAGE_NAME}; then
+    echo "ERROR: The image ${IMAGE_NAME} must exist before this script is executed."
+    exit 1
+  fi
+  # s2i build requires the application is a valid 'Git' repository
+  pushd ${test_dir}/test-app >/dev/null
+  git init
+  git config user.email "build@localhost" && git config user.name "builder"
+  git add -A && git commit -m "Sample commit"
+  popd >/dev/null
+  run_s2i_build
+}
+
+run_test_application() {
+  docker run --rm --cidfile=${cid_file} -p ${test_port}:${test_port} ${IMAGE_NAME}-testapp
+}
+
+cleanup() {
+  if [ -f $cid_file ]; then
+    if container_exists; then
+      docker stop $(cat $cid_file)
+    fi
+  fi
+  if image_exists ${IMAGE_NAME}-testapp; then
+    docker rmi ${IMAGE_NAME}-testapp
+  fi
+}
+
+check_result() {
+  local result="$1"
+  if [[ "$result" != "0" ]]; then
+    echo "S2I image '${IMAGE_NAME}' test FAILED (exit code: ${result})"
+    cleanup
+    exit $result
+  fi
+}
+
+wait_for_cid() {
+  local max_attempts=10
+  local sleep_time=1
+  local attempt=1
+  local result=1
+  while [ $attempt -le $max_attempts ]; do
+    [ -f $cid_file ] && break
+    echo "Waiting for container to start..."
+    attempt=$(( $attempt + 1 ))
+    sleep $sleep_time
+  done
+}
+
+test_usage() {
+  echo "Testing 's2i usage'..."
+  s2i usage ${s2i_args} ${IMAGE_NAME} &>/dev/null
+}
+
+test_connection() {
+  echo "Testing HTTP connection (http://$(container_ip):$(container_port))"
+  local max_attempts=10
+  local sleep_time=1
+  local attempt=1
+  local result=1
+  while [ $attempt -le $max_attempts ]; do
+    echo "Sending GET request to http://$(container_ip):$(container_port)/"
+    response_code=$(curl -s -w %{http_code} -o /dev/null http://$(container_ip):$(container_port)/)
+    status=$?
+    if [ $status -eq 0 ]; then
+      if [ $response_code -eq 200 ]; then
+        result=0
+      fi
+      break
+    fi
+    attempt=$(( $attempt + 1 ))
+    sleep $sleep_time
+  done
+  return $result
+}
+
+# Build the application image twice to ensure the 'save-artifacts' and
+# 'restore-artifacts' scripts are working properly
+prepare
+run_s2i_build
+check_result $?
+
+# Verify the 'usage' script is working properly
+test_usage
+check_result $?
+
+# Verify that the HTTP connection can be established to test application container
+run_test_application &
+
+# Wait for the container to write its CID file
+wait_for_cid
+
+test_connection
+check_result $?
+
+cleanup
+
diff --git a/s2i/kaas-springboot-centos/test/test-app/index.html b/s2i/kaas-springboot-centos/test/test-app/index.html
new file mode 100644
index 00000000000..7bca10c2d5b
--- /dev/null
+++ b/s2i/kaas-springboot-centos/test/test-app/index.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+	<head>
+		<title>Hello World!</title>
+	</head>
+	<body>
+		<h1>Hello World!</h1>
+	</body>
+</html>
+ 
\ No newline at end of file

From 2a845d59a9d5817aa16cbfd2e78c9ac049e58e74 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Wed, 27 Mar 2019 13:47:32 +0100
Subject: [PATCH 002/709] Updated settings.xml to use JBoss maven repo, added
 readme files

---
 s2i/README.md                                 | 148 ++++++++++++++++++
 s2i/kaas-quarkus-centos-s2i/README.md         |  87 +++-------
 .../maven/settings.xml                        |  16 +-
 s2i/kaas-quarkus-centos/README.md             |  88 +++--------
 s2i/kaas-springboot-centos-s2i/README.md      |  87 +++-------
 .../maven/settings.xml                        |  16 +-
 s2i/kaas-springboot-centos/README.md          |  88 +++--------
 7 files changed, 240 insertions(+), 290 deletions(-)
 create mode 100644 s2i/README.md

diff --git a/s2i/README.md b/s2i/README.md
new file mode 100644
index 00000000000..061d3bb41fe
--- /dev/null
+++ b/s2i/README.md
@@ -0,0 +1,148 @@
+# Submarine S2I images
+
+To be able to produce efficient container images for Submarine there are following sets
+of builder images to perform the build and to run the result binaries.
+
+Images are grouped by the runtime that will run the binaries and the OS level
+
+## Centos 7
+
+## Quarkus
+
+### kaas-quarkus-centos-s2i
+
+Builder image that is responsible for building the project
+with Apache Maven and generate native image using GraalVM/SubstrateVM
+
+For more details have a loot at [README.md](kaas-quarkus-centos-s2i/README.md)
+
+### kaas-quarkus-centos
+
+Runtime image that is responsible for just running the binaries taken from the
+builder image. That approach is giving small and compact image that does not
+not carry on any of the build tools or artefacts (like local maven repository).
+
+For more details have a loot at [README.md](kaas-quarkus-centos/README.md)
+
+## SpringBoot
+
+### kaas-springboot-centos-s2i
+
+Builder image that is responsible for building the project
+with Apache Maven and generate fat jar.
+
+For more details have a loot at [README.md](kaas-springboot-centos-s2i/README.md)
+
+### kaas-springboot-centos
+
+Runtime image that is responsible for just running the fat jar taken from the
+builder image. It has JRE installed on the container to allow java executable.
+That approach is giving small and compact image that does not
+not carry on any of the build tools or artefacts (like local maven repository).
+
+For more details have a loot at [README.md](kaas-springboot-centos/README.md)
+
+# Supported source structure
+
+Images can be build based on two types of source structure
+
+- assets only
+- kjar maven project
+
+## Assets only
+
+This source structure assumes there is no maven project
+but only business assets stored either directly in the top folder or grouped into directories.
+
+Business assets are:
+
+- process definition - bpmn2
+- rule definition - drl
+- decision definition - dmn
+- etc
+
+Upon build these assets will be copied to generated kjar maven project and build with maven to produce the runnable binary.
+
+## Kjar maven project
+
+This source structure is expected to be valid kjar project equipped with runtime information - either Quarkus or Spring Boot.
+
+Best way is to use maven archetypes to generate project structure (same archetypes are used in cases assets only are used as source).
+
+[KaaS Quarkus archetype](https://github.com/kiegroup/submarine-runtimes/tree/master/archetypes/kaas-quarkus-archetype)
+
+[KaaS SpringBoot archetype](https://github.com/kiegroup/submarine-runtimes/tree/master/archetypes/kaas-springboot-archetype)
+
+# Example usage
+
+## Build the application
+
+Once the images are built and imported into registry (docker hub or internal OpenShift registry)
+new applications can be build and deployed with this few steps
+
+`oc new-build repository/kaas-quarkus-centos-s2i~https://github.com/user/project --name=builder-app-name`
+
+Modify accordingly following
+- repository is the docker repository the images are available in (could be OpenShift project or docker hub user)
+- user is user name in github
+- project is project in github
+- builder-app-name is name of the resulting build image that will be referenced in next step to build the runtime image
+
+## Build runtime image of the application
+
+Once the build is finished, create another build config to produce runtime image
+
+`oc new-build --name app-name --source-image=builder-app-name --source-image-path=/home/submarine/bin:. --image-stream=kaas-quarkus-centos`
+
+Modify accordingly following
+- app-name is the final name of the image that will be deployed
+- builder-app-name is the name of the built image from first step
+
+This build is very fast and should produce rather small image (below 100mb).
+
+## Create new application from the runtime image
+
+Create new application based on runtime image
+
+`oc new-app app-name:latest`
+
+Modify accordingly following
+- app-name is the final name of the image that will be deployed
+
+## Make the application available to users
+
+Expose the application via route
+
+`oc expose svc/app-name`
+
+Modify accordingly following
+- app-name is the name of the application that was deployed
+
+# Subsequent builds of the application
+
+Once the build configs are in place there is only one command that is needed to produce
+new application image (the runtime one)
+
+`oc start-build builder-app-name`
+
+Modify accordingly following
+- builder-app-name is name of the resulting build image that was built in the first step.
+
+This will get the latest source and run the builder image first. Once the build
+is completed it will automatically trigger building of the runtime image and next
+automatic deployment of the runtime image.
+
+## Improve speed of the builds
+
+Time needed to build the application is rather long, mainly due to
+maven downloading dependencies for the build which usually takes several minutes.
+
+That can be improved by using incremental builds
+
+`oc start-build builder-app-name --incremental=true`
+
+Modify accordingly following
+- builder-app-name is name of the resulting build image that was built in the first step.
+
+what this does ... essentially reuses previously build image and takes advantage of
+already downloaded artefacts. By that improving overall build time significantly.
diff --git a/s2i/kaas-quarkus-centos-s2i/README.md b/s2i/kaas-quarkus-centos-s2i/README.md
index a1690dbb424..5f7d5c2a370 100644
--- a/s2i/kaas-quarkus-centos-s2i/README.md
+++ b/s2i/kaas-quarkus-centos-s2i/README.md
@@ -1,82 +1,35 @@
+# S2I image to build builder image based on Centos 7
 
-# Creating a basic S2I builder image  
+This S2I is considered image builder that is equipped with build tools
 
-## Getting started  
+- GraalVM
+- Apache Maven
 
-### Files and Directories  
-| File                   | Required? | Description                                                  |
-|------------------------|-----------|--------------------------------------------------------------|
-| Dockerfile             | Yes       | Defines the base builder image                               |
-| s2i/bin/assemble       | Yes       | Script that builds the application                           |
-| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
-| s2i/bin/run            | Yes       | Script that runs the application                             |
-| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
-| test/run               | No        | Test script for the builder image                            |
-| test/test-app          | Yes       | Test application source code                                 |
+So it is equipped with all required tools to build a runnable native image of
+KaaS (Knowledge as a Service) type of projects.
 
-#### Dockerfile
-Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
+## Build the image
 
-#### S2I scripts
+To be able to build the image a docker should be installed.
 
-##### assemble
-Create an *assemble* script that will build our application, e.g.:
-- build python modules
-- bundle install ruby gems
-- setup application specific configuration
+Setup environment
 
-The script can also specify a way to restore any saved artifacts from the previous image.   
+`eval $(minishift docker-env)`
 
-##### run
-Create a *run* script that will start the application. 
+Login to docker registry
 
-##### save-artifacts (optional)
-Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
+`docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)`
 
-##### usage (optional) 
-Create a *usage* script that will print out instructions on how to use the image.
+Built the image
 
-##### Make the scripts executable 
-Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
+`make`
 
-#### Create the builder image
-The following command will create a builder image named kaas-quarkus based on the Dockerfile that was created previously.
-```
-docker build -t kaas-quarkus .
-```
-The builder image can also be created by using the *make* command since a *Makefile* is included.
+(this will run a docker build and produce a image builder)
 
-Once the image has finished building, the command *s2i usage kaas-quarkus* will print out the help info that was defined in the *usage* script.
+Tag the built image
 
-#### Testing the builder image
-The builder image can be tested using the following commands:
-```
-docker build -t kaas-quarkus-candidate .
-IMAGE_NAME=kaas-quarkus-candidate test/run
-```
-The builder image can also be tested by using the *make test* command since a *Makefile* is included.
+`docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-quarkus-centos-s2i`
 
-#### Creating the application image
-The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
-The following command will create the application image:
-```
-s2i build test/test-app kaas-quarkus kaas-quarkus-app
----> Building and installing application from source...
-```
-Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory. 
-
-#### Running the application image
-Running the application image is as simple as invoking the docker run command:
-```
-docker run -d -p 8080:8080 kaas-quarkus-app
-```
-The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
-
-#### Using the saved artifacts script
-Rebuilding the application using the saved artifacts can be accomplished using the following command:
-```
-s2i build --incremental=true test/test-app nginx-centos7 nginx-app
----> Restoring build artifacts...
----> Building and installing application from source...
-```
-This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.
+Modify accordingly
+- IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
+- PROJECT - OpenShift project that the image should be pushed to
diff --git a/s2i/kaas-quarkus-centos-s2i/maven/settings.xml b/s2i/kaas-quarkus-centos-s2i/maven/settings.xml
index deeadde6cae..8c1b0dab7ec 100644
--- a/s2i/kaas-quarkus-centos-s2i/maven/settings.xml
+++ b/s2i/kaas-quarkus-centos-s2i/maven/settings.xml
@@ -7,13 +7,9 @@
       <id>default</id>
       <repositories>
         <repository>
-          <id>nexus</id>
-          <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-         <id>local-nexus</id>
-         <name>Local Nexus repository</name>
-         <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+         <id>jboss-public-repository-group</id>
+         <name>JBoss Public Repository Group</name>
+         <url>https://repository.jboss.org/nexus/content/groups/public/</url>
          <releases>
            <enabled>true</enabled>
            <updatePolicy>never</updatePolicy>
@@ -26,9 +22,9 @@
       </repositories>
       <pluginRepositories>
       <pluginRepository>
-        <id>local-nexus</id>
-        <name>Local Nexus repository</name>
-        <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+        <id>jboss-public-repository-group</id>
+        <name>JBoss Public Repository Group</name>
+        <url>https://repository.jboss.org/nexus/content/groups/public/</url>
         <releases>
           <enabled>true</enabled>
           <updatePolicy>never</updatePolicy>
diff --git a/s2i/kaas-quarkus-centos/README.md b/s2i/kaas-quarkus-centos/README.md
index 645d793d378..1242ae6ac38 100644
--- a/s2i/kaas-quarkus-centos/README.md
+++ b/s2i/kaas-quarkus-centos/README.md
@@ -1,82 +1,34 @@
+# S2I image to build runtime image based on Centos 7
 
-# Creating a basic S2I builder image  
+This S2I is considered a runtime image builder as it relies on another image
+(built with `kaas-quarkus-centos-s2i`) that actually produced the binaries to be executed
+(the native image based on Quarkus runtime). So this one will only get the binaries
+and place into the container.
 
-## Getting started  
+With that it produces lightweight and compact application container image.
 
-### Files and Directories  
-| File                   | Required? | Description                                                  |
-|------------------------|-----------|--------------------------------------------------------------|
-| Dockerfile             | Yes       | Defines the base builder image                               |
-| s2i/bin/assemble       | Yes       | Script that builds the application                           |
-| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
-| s2i/bin/run            | Yes       | Script that runs the application                             |
-| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
-| test/run               | No        | Test script for the builder image                            |
-| test/test-app          | Yes       | Test application source code                                 |
+## Build the image
 
-#### Dockerfile
-Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
+To be able to build the image a docker should be installed.
 
-#### S2I scripts
+Setup environment
 
-##### assemble
-Create an *assemble* script that will build our application, e.g.:
-- build python modules
-- bundle install ruby gems
-- setup application specific configuration
+`eval $(minishift docker-env)`
 
-The script can also specify a way to restore any saved artifacts from the previous image.   
+Login to docker registry
 
-##### run
-Create a *run* script that will start the application. 
+`docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)`
 
-##### save-artifacts (optional)
-Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
+Built the image
 
-##### usage (optional) 
-Create a *usage* script that will print out instructions on how to use the image.
+`make`
 
-##### Make the scripts executable 
-Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
+(this will run a docker build and produce a image builder)
 
-#### Create the builder image
-The following command will create a builder image named kaas-quarkus-centos based on the Dockerfile that was created previously.
-```
-docker build -t kaas-quarkus-centos .
-```
-The builder image can also be created by using the *make* command since a *Makefile* is included.
+Tag the built image
 
-Once the image has finished building, the command *s2i usage kaas-quarkus-centos* will print out the help info that was defined in the *usage* script.
+`docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-quarkus-centos`
 
-#### Testing the builder image
-The builder image can be tested using the following commands:
-```
-docker build -t kaas-quarkus-centos-candidate .
-IMAGE_NAME=kaas-quarkus-centos-candidate test/run
-```
-The builder image can also be tested by using the *make test* command since a *Makefile* is included.
-
-#### Creating the application image
-The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
-The following command will create the application image:
-```
-s2i build test/test-app kaas-quarkus-centos kaas-quarkus-centos-app
----> Building and installing application from source...
-```
-Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory. 
-
-#### Running the application image
-Running the application image is as simple as invoking the docker run command:
-```
-docker run -d -p 8080:8080 kaas-quarkus-centos-app
-```
-The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
-
-#### Using the saved artifacts script
-Rebuilding the application using the saved artifacts can be accomplished using the following command:
-```
-s2i build --incremental=true test/test-app nginx-centos7 nginx-app
----> Restoring build artifacts...
----> Building and installing application from source...
-```
-This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.
+Modify accordingly
+- IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
+- PROJECT - OpenShift project that the image should be pushed to
diff --git a/s2i/kaas-springboot-centos-s2i/README.md b/s2i/kaas-springboot-centos-s2i/README.md
index 51ecbcff9db..8d371c9e619 100644
--- a/s2i/kaas-springboot-centos-s2i/README.md
+++ b/s2i/kaas-springboot-centos-s2i/README.md
@@ -1,82 +1,35 @@
+# S2I image to build builder image based on Centos 7
 
-# Creating a basic S2I builder image  
+This S2I is considered image builder that is equipped with build tools
 
-## Getting started  
+- OpenJDK 1.8
+- Apache Maven
 
-### Files and Directories  
-| File                   | Required? | Description                                                  |
-|------------------------|-----------|--------------------------------------------------------------|
-| Dockerfile             | Yes       | Defines the base builder image                               |
-| s2i/bin/assemble       | Yes       | Script that builds the application                           |
-| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
-| s2i/bin/run            | Yes       | Script that runs the application                             |
-| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
-| test/run               | No        | Test script for the builder image                            |
-| test/test-app          | Yes       | Test application source code                                 |
+So it is equipped with all required tools to build a runnable fat jar of
+KaaS (Knowledge as a Service) type of projects.
 
-#### Dockerfile
-Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
+## Build the image
 
-#### S2I scripts
+To be able to build the image a docker should be installed.
 
-##### assemble
-Create an *assemble* script that will build our application, e.g.:
-- build python modules
-- bundle install ruby gems
-- setup application specific configuration
+Setup environment
 
-The script can also specify a way to restore any saved artifacts from the previous image.   
+`eval $(minishift docker-env)`
 
-##### run
-Create a *run* script that will start the application. 
+Login to docker registry
 
-##### save-artifacts (optional)
-Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
+`docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)`
 
-##### usage (optional) 
-Create a *usage* script that will print out instructions on how to use the image.
+Built the image
 
-##### Make the scripts executable 
-Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
+`make`
 
-#### Create the builder image
-The following command will create a builder image named kaas-springboot-centos-s2i based on the Dockerfile that was created previously.
-```
-docker build -t kaas-springboot-centos-s2i .
-```
-The builder image can also be created by using the *make* command since a *Makefile* is included.
+(this will run a docker build and produce a image builder)
 
-Once the image has finished building, the command *s2i usage kaas-springboot-centos-s2i* will print out the help info that was defined in the *usage* script.
+Tag the built image
 
-#### Testing the builder image
-The builder image can be tested using the following commands:
-```
-docker build -t kaas-springboot-centos-s2i-candidate .
-IMAGE_NAME=kaas-springboot-centos-s2i-candidate test/run
-```
-The builder image can also be tested by using the *make test* command since a *Makefile* is included.
+`docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-springboot-centos-s2i`
 
-#### Creating the application image
-The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
-The following command will create the application image:
-```
-s2i build test/test-app kaas-springboot-centos-s2i kaas-springboot-centos-s2i-app
----> Building and installing application from source...
-```
-Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory. 
-
-#### Running the application image
-Running the application image is as simple as invoking the docker run command:
-```
-docker run -d -p 8080:8080 kaas-springboot-centos-s2i-app
-```
-The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
-
-#### Using the saved artifacts script
-Rebuilding the application using the saved artifacts can be accomplished using the following command:
-```
-s2i build --incremental=true test/test-app nginx-centos7 nginx-app
----> Restoring build artifacts...
----> Building and installing application from source...
-```
-This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.
+Modify accordingly
+- IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
+- PROJECT - OpenShift project that the image should be pushed to
diff --git a/s2i/kaas-springboot-centos-s2i/maven/settings.xml b/s2i/kaas-springboot-centos-s2i/maven/settings.xml
index deeadde6cae..8c1b0dab7ec 100644
--- a/s2i/kaas-springboot-centos-s2i/maven/settings.xml
+++ b/s2i/kaas-springboot-centos-s2i/maven/settings.xml
@@ -7,13 +7,9 @@
       <id>default</id>
       <repositories>
         <repository>
-          <id>nexus</id>
-          <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-         <id>local-nexus</id>
-         <name>Local Nexus repository</name>
-         <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+         <id>jboss-public-repository-group</id>
+         <name>JBoss Public Repository Group</name>
+         <url>https://repository.jboss.org/nexus/content/groups/public/</url>
          <releases>
            <enabled>true</enabled>
            <updatePolicy>never</updatePolicy>
@@ -26,9 +22,9 @@
       </repositories>
       <pluginRepositories>
       <pluginRepository>
-        <id>local-nexus</id>
-        <name>Local Nexus repository</name>
-        <url>http://192.168.100.15:8081/nexus/content/repositories/snapshots/</url>
+        <id>jboss-public-repository-group</id>
+        <name>JBoss Public Repository Group</name>
+        <url>https://repository.jboss.org/nexus/content/groups/public/</url>
         <releases>
           <enabled>true</enabled>
           <updatePolicy>never</updatePolicy>
diff --git a/s2i/kaas-springboot-centos/README.md b/s2i/kaas-springboot-centos/README.md
index af395b95246..cffdc093cdc 100644
--- a/s2i/kaas-springboot-centos/README.md
+++ b/s2i/kaas-springboot-centos/README.md
@@ -1,82 +1,34 @@
+# S2I image to build runtime image based on Centos 7
 
-# Creating a basic S2I builder image  
+This S2I is considered a runtime image builder as it relies on another image
+(built with `kaas-springboot-centos-s2i`) that actually produced the binaries to be executed
+(the fat jar based on SpringBoot 2.1.x runtime). So this one will only get the binaries
+and place into the container.
 
-## Getting started  
+On top of the OS it has JRE installed (OpenJDK 1.8) to be able to execute fat jar.
 
-### Files and Directories  
-| File                   | Required? | Description                                                  |
-|------------------------|-----------|--------------------------------------------------------------|
-| Dockerfile             | Yes       | Defines the base builder image                               |
-| s2i/bin/assemble       | Yes       | Script that builds the application                           |
-| s2i/bin/usage          | No        | Script that prints the usage of the builder                  |
-| s2i/bin/run            | Yes       | Script that runs the application                             |
-| s2i/bin/save-artifacts | No        | Script for incremental builds that saves the built artifacts |
-| test/run               | No        | Test script for the builder image                            |
-| test/test-app          | Yes       | Test application source code                                 |
+## Build the image
 
-#### Dockerfile
-Create a *Dockerfile* that installs all of the necessary tools and libraries that are needed to build and run our application.  This file will also handle copying the s2i scripts into the created image.
+To be able to build the image a docker should be installed.
 
-#### S2I scripts
+Setup environment
 
-##### assemble
-Create an *assemble* script that will build our application, e.g.:
-- build python modules
-- bundle install ruby gems
-- setup application specific configuration
+`eval $(minishift docker-env)`
 
-The script can also specify a way to restore any saved artifacts from the previous image.   
+Login to docker registry
 
-##### run
-Create a *run* script that will start the application. 
+`docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)`
 
-##### save-artifacts (optional)
-Create a *save-artifacts* script which allows a new build to reuse content from a previous version of the application image.
+Built the image
 
-##### usage (optional) 
-Create a *usage* script that will print out instructions on how to use the image.
+`make`
 
-##### Make the scripts executable 
-Make sure that all of the scripts are executable by running *chmod +x s2i/bin/**
+(this will run a docker build and produce a image builder)
 
-#### Create the builder image
-The following command will create a builder image named kaas-springboot-centos based on the Dockerfile that was created previously.
-```
-docker build -t kaas-springboot-centos .
-```
-The builder image can also be created by using the *make* command since a *Makefile* is included.
+Tag the built image
 
-Once the image has finished building, the command *s2i usage kaas-springboot-centos* will print out the help info that was defined in the *usage* script.
+`docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-springboot-centos`
 
-#### Testing the builder image
-The builder image can be tested using the following commands:
-```
-docker build -t kaas-springboot-centos-candidate .
-IMAGE_NAME=kaas-springboot-centos-candidate test/run
-```
-The builder image can also be tested by using the *make test* command since a *Makefile* is included.
-
-#### Creating the application image
-The application image combines the builder image with your applications source code, which is served using whatever application is installed via the *Dockerfile*, compiled using the *assemble* script, and run using the *run* script.
-The following command will create the application image:
-```
-s2i build test/test-app kaas-springboot-centos kaas-springboot-centos-app
----> Building and installing application from source...
-```
-Using the logic defined in the *assemble* script, s2i will now create an application image using the builder image as a base and including the source code from the test/test-app directory. 
-
-#### Running the application image
-Running the application image is as simple as invoking the docker run command:
-```
-docker run -d -p 8080:8080 kaas-springboot-centos-app
-```
-The application, which consists of a simple static web page, should now be accessible at  [http://localhost:8080](http://localhost:8080).
-
-#### Using the saved artifacts script
-Rebuilding the application using the saved artifacts can be accomplished using the following command:
-```
-s2i build --incremental=true test/test-app nginx-centos7 nginx-app
----> Restoring build artifacts...
----> Building and installing application from source...
-```
-This will run the *save-artifacts* script which includes the custom code to backup the currently running application source, rebuild the application image, and then re-deploy the previously saved source using the *assemble* script.
+Modify accordingly
+- IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
+- PROJECT - OpenShift project that the image should be pushed to

From ed468e53907e86df21c035ed81d68b1526696daf Mon Sep 17 00:00:00 2001
From: Duncan Doyle <Duncan.Doyle@gmail.com>
Date: Thu, 4 Apr 2019 20:28:41 +0200
Subject: [PATCH 003/709] Typo fix. (#1)

---
 s2i/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/s2i/README.md b/s2i/README.md
index 061d3bb41fe..69d5f8eef20 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -14,7 +14,7 @@ Images are grouped by the runtime that will run the binaries and the OS level
 Builder image that is responsible for building the project
 with Apache Maven and generate native image using GraalVM/SubstrateVM
 
-For more details have a loot at [README.md](kaas-quarkus-centos-s2i/README.md)
+For more details have a look at [README.md](kaas-quarkus-centos-s2i/README.md)
 
 ### kaas-quarkus-centos
 
@@ -22,7 +22,7 @@ Runtime image that is responsible for just running the binaries taken from the
 builder image. That approach is giving small and compact image that does not
 not carry on any of the build tools or artefacts (like local maven repository).
 
-For more details have a loot at [README.md](kaas-quarkus-centos/README.md)
+For more details have a look at [README.md](kaas-quarkus-centos/README.md)
 
 ## SpringBoot
 
@@ -31,7 +31,7 @@ For more details have a loot at [README.md](kaas-quarkus-centos/README.md)
 Builder image that is responsible for building the project
 with Apache Maven and generate fat jar.
 
-For more details have a loot at [README.md](kaas-springboot-centos-s2i/README.md)
+For more details have a look at [README.md](kaas-springboot-centos-s2i/README.md)
 
 ### kaas-springboot-centos
 
@@ -40,7 +40,7 @@ builder image. It has JRE installed on the container to allow java executable.
 That approach is giving small and compact image that does not
 not carry on any of the build tools or artefacts (like local maven repository).
 
-For more details have a loot at [README.md](kaas-springboot-centos/README.md)
+For more details have a look at [README.md](kaas-springboot-centos/README.md)
 
 # Supported source structure
 

From 2e5e2eb09d9ce11a310ddb8f04ffb6607ff4faf1 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Mon, 8 Apr 2019 12:02:15 +0200
Subject: [PATCH 004/709] JBPM-8385 - Add image-metadata.json into s2i builders
 add custom labels

---
 s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble     | 10 ++++++++++
 s2i/kaas-quarkus-centos/s2i/bin/assemble         |  4 ++++
 s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime |  5 +++++
 s2i/kaas-quarkus-centos/s2i/bin/run              |  2 +-
 s2i/kaas-springboot-centos-s2i/s2i/bin/assemble  |  2 ++
 s2i/kaas-springboot-centos/s2i/bin/assemble      | 16 ++++++++++++++++
 .../s2i/bin/assemble-runtime                     |  4 ++++
 7 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100755 s2i/kaas-springboot-centos/s2i/bin/assemble

diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble b/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
index 786aea9fc3e..2b74e77bdb2 100755
--- a/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
+++ b/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
@@ -50,7 +50,17 @@ else
 
 fi
 
+
 echo "---> Installing application binaries"
 mkdir $SUBMARINE_HOME/bin
 cp -v target/*-runner $SUBMARINE_HOME/bin
 chmod +x $SUBMARINE_HOME/bin/*-runner
+
+
+echo "---> Copy image metadata file..."
+mkdir /tmp/.s2i
+cp -v target/image_metadata.json /tmp/.s2i
+cp -v target/image_metadata.json $SUBMARINE_HOME/bin
+
+echo "---> Copy native java libraries for ssl handling..."
+cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $SUBMARINE_HOME/bin
\ No newline at end of file
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/assemble b/s2i/kaas-quarkus-centos/s2i/bin/assemble
index 56c6e8116d8..072dc4ea9ae 100755
--- a/s2i/kaas-quarkus-centos/s2i/bin/assemble
+++ b/s2i/kaas-quarkus-centos/s2i/bin/assemble
@@ -6,6 +6,10 @@ cp -R /tmp/src/bin/ $SUBMARINE_HOME
 
 if [ -d "$SUBMARINE_HOME/bin" ]; then
   echo "---> Application binaries found and ready to use"
+  
+  echo "---> Adding custom labels..."
+  mkdir /tmp/.s2i
+  mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
 else
   echo "---> Application binaries NOT found, failing build..."
   exit 1
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime b/s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime
index fdbeaa1b6c2..7f89d55c331 100755
--- a/s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime
+++ b/s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime
@@ -6,8 +6,13 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
+
 if [ -d "$SUBMARINE_HOME/bin" ]; then
   echo "---> Application binaries found and ready to use"
+  
+  echo "---> Adding custom labels..."
+  mkdir /tmp/.s2i
+  mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
 else
   echo "---> Application binaries NOT found, failing build..."
   exit 1
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/run b/s2i/kaas-quarkus-centos/s2i/bin/run
index f82fcbc2c98..c1b0d8f722e 100755
--- a/s2i/kaas-quarkus-centos/s2i/bin/run
+++ b/s2i/kaas-quarkus-centos/s2i/bin/run
@@ -6,4 +6,4 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec $SUBMARINE_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0
+exec $SUBMARINE_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$SUBMARINE_HOME/bin
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble b/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
index ab96147e361..65bf51e07fc 100755
--- a/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
+++ b/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
@@ -48,6 +48,8 @@ else
 	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml -DskipTests
 fi
 
+echo "---> Copy image metadata file..."
+cp -v target/image_metadata.json /tmp/.s2i/image_metadata.json
 
 echo "---> Installing application binaries"
 mkdir $SUBMARINE_HOME/bin
diff --git a/s2i/kaas-springboot-centos/s2i/bin/assemble b/s2i/kaas-springboot-centos/s2i/bin/assemble
new file mode 100755
index 00000000000..072dc4ea9ae
--- /dev/null
+++ b/s2i/kaas-springboot-centos/s2i/bin/assemble
@@ -0,0 +1,16 @@
+#!/bin/bash -e
+# this script is used by OpenShift with chained builds
+# to transfer data from builder image into the runtime image
+
+cp -R /tmp/src/bin/ $SUBMARINE_HOME
+
+if [ -d "$SUBMARINE_HOME/bin" ]; then
+  echo "---> Application binaries found and ready to use"
+  
+  echo "---> Adding custom labels..."
+  mkdir /tmp/.s2i
+  mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+else
+  echo "---> Application binaries NOT found, failing build..."
+  exit 1
+fi
diff --git a/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime b/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime
index def7b944189..73b8ff448c0 100755
--- a/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime
+++ b/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime
@@ -8,6 +8,10 @@
 #
 if [ -d "$SUBMARINE_HOME/bin" ]; then
   echo "---> Application binaries found and ready to use"
+  
+  echo "---> Adding custom labels..."
+  mkdir /tmp/.s2i
+  mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
 else
   echo "---> Application binaries NOT found, failing build..."
   exit 1

From 5a224d15dcf6a26b15848b156aa373854e32394b Mon Sep 17 00:00:00 2001
From: Karel Suta <krlsuta@gmail.com>
Date: Mon, 8 Apr 2019 19:04:27 +0200
Subject: [PATCH 005/709] Create necessary folders and copy metadata (#2)

Fixing SpringBoot S2I issues
---
 s2i/kaas-springboot-centos-s2i/s2i/bin/assemble | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble b/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
index 65bf51e07fc..476f7bc2cf9 100755
--- a/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
+++ b/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
@@ -48,9 +48,11 @@ else
 	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml -DskipTests
 fi
 
-echo "---> Copy image metadata file..."
-cp -v target/image_metadata.json /tmp/.s2i/image_metadata.json
-
 echo "---> Installing application binaries"
 mkdir $SUBMARINE_HOME/bin
 cp -v target/*.jar $SUBMARINE_HOME/bin
+
+echo "---> Copy image metadata file..."
+mkdir /tmp/.s2i
+cp -v target/image_metadata.json /tmp/.s2i/image_metadata.json
+cp -v target/image_metadata.json $SUBMARINE_HOME/bin

From df8a776faaedd199edbe4f1214ef92a8e748ac80 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Fri, 12 Apr 2019 13:15:54 +0200
Subject: [PATCH 006/709] updated grallvm to rc15, added additional maven flags
 to not produce additional artefacts like source

---
 s2i/kaas-quarkus-centos-s2i/Dockerfile          | 6 +++---
 s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble    | 8 ++++++--
 s2i/kaas-springboot-centos-s2i/s2i/bin/assemble | 8 ++++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/s2i/kaas-quarkus-centos-s2i/Dockerfile b/s2i/kaas-quarkus-centos-s2i/Dockerfile
index fa0af6b7976..4384c99e03e 100644
--- a/s2i/kaas-quarkus-centos-s2i/Dockerfile
+++ b/s2i/kaas-quarkus-centos-s2i/Dockerfile
@@ -4,7 +4,7 @@ FROM centos:latest
 LABEL maintainer="Submarine <submarine@kiegroup.com>"
 
 ENV MAVEN_VERSION 3.6.0
-ENV GRAALVM_VERSION ce-1.0.0-rc14
+ENV GRAALVM_VERSION 1.0.0-rc15
 ENV SUBMARINE_HOME /home/submarine
 
 LABEL io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
@@ -19,8 +19,8 @@ RUN yum install -y --setopt=skip_missing_names_on_install=False \
     tar gzip gcc glibc-devel zlib-devel curl && \
     curl -fsSL https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /usr/share \
     && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven && \
-    curl -fsSL https://github.com/oracle/graal/releases/download/vm-1.0.0-rc14/graalvm-$GRAALVM_VERSION-linux-amd64.tar.gz | tar xzf - -C /usr/share \
-    && mv /usr/share/graalvm-$GRAALVM_VERSION /usr/share/graalvm && \
+    curl -fsSL https://github.com/oracle/graal/releases/download/vm-$GRAALVM_VERSION/graalvm-ce-$GRAALVM_VERSION-linux-amd64.tar.gz | tar xzf - -C /usr/share \
+    && mv /usr/share/graalvm-ce-$GRAALVM_VERSION /usr/share/graalvm && \
     adduser -u 1001 -g 0 submarine --home-dir ${SUBMARINE_HOME} && \
     chown -R 1001:0 ${SUBMARINE_HOME} && \
     chmod -R ug+rwX ${SUBMARINE_HOME}
diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble b/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
index 2b74e77bdb2..9b2d8bf5a02 100755
--- a/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
+++ b/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
@@ -25,7 +25,9 @@ cd /tmp/src/
 
 if [ -f "pom.xml" ]; then
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/settings.xml -DskipTests
+	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/settings.xml \
+    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 else
 	echo "---> Generating project structure..."
 
@@ -46,7 +48,9 @@ else
 	mv project/* .
 
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/settings.xml -DskipTests
+	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/settings.xml \
+    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 
 fi
 
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble b/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
index 476f7bc2cf9..7f4159ce905 100755
--- a/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
+++ b/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
@@ -24,7 +24,9 @@ cd /tmp/src/
 
 if [ -f "pom.xml" ]; then
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml -DskipTests
+	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml \
+    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 else
 	echo "---> Generating project structure..."
 
@@ -45,7 +47,9 @@ else
 	mv project/* .
 
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml -DskipTests
+	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml \
+    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 fi
 
 echo "---> Installing application binaries"

From 13f185ebba7f0474b9484f1a691ba62019682915 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Sat, 13 Apr 2019 12:47:24 +0200
Subject: [PATCH 007/709] JBPM-8388 - Service discovery for work item handlers

---
 .gitignore                                    |  20 +-
 pom.xml                                       |  45 ++++
 submarine-cloud-services/.gitignore           |  32 +++
 submarine-cloud-services/pom.xml              |  15 ++
 .../submarine-cloud-workitems/.gitignore      |  32 +++
 .../submarine-cloud-workitems/pom.xml         |  31 +++
 .../DiscoveredServiceWorkItemHandler.java     | 200 ++++++++++++++++++
 .../cloud/workitems/HttpMethods.java          |   7 +
 8 files changed, 381 insertions(+), 1 deletion(-)
 create mode 100644 pom.xml
 create mode 100644 submarine-cloud-services/.gitignore
 create mode 100644 submarine-cloud-services/pom.xml
 create mode 100644 submarine-cloud-services/submarine-cloud-workitems/.gitignore
 create mode 100644 submarine-cloud-services/submarine-cloud-workitems/pom.xml
 create mode 100644 submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
 create mode 100644 submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java

diff --git a/.gitignore b/.gitignore
index adf03446e4d..0d73459cf99 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+bin/
 /target
 /local
 
@@ -8,7 +9,24 @@
 /*.ipr
 /*.iws
 /*.iml
-*.xpr
 
 # Repository wide ignore mac DS_Store files
 .DS_Store
+
+# Original jbpm ignores
+*~
+
+# Test info
+/settings*.xml
+/lib-jdbc/
+*.db
+*.tlog
+
+# modules that don't exist in this branch
+/jbpm-human-task-war/
+/jbpm-bam/
+/jbpm-gwt/
+
+# files used for external db testing
+jdbc_driver.jar
+db-settings.xml
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000000..949162d25c0
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.kie</groupId>
+    <artifactId>submarine-bom</artifactId>
+    <version>8.0.0-SNAPSHOT</version>
+    <!-- relativePath causes out-of-date problems on hudson slaves -->
+    <!--<relativePath>../droolsjbpm-build-bootstrap/pom.xml</relativePath> -->
+  </parent>
+
+  <groupId>org.submarine</groupId>
+  <artifactId>submarine-cloud</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Submarine Cloud</name>
+  <description>Submarine Cloud</description>
+
+  <repositories>
+    <!-- Bootstrap repository to locate the parent pom when the parent pom 
+      has not been build locally. -->
+    <repository>
+      <id>jboss-public-repository-group</id>
+      <name>JBoss Public Repository Group</name>
+      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+      <layout>default</layout>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>daily</updatePolicy>
+      </snapshots>
+    </repository>
+  </repositories>
+  
+  <modules>
+  <module>submarine-cloud-services</module>
+  </modules>
+
+</project>
diff --git a/submarine-cloud-services/.gitignore b/submarine-cloud-services/.gitignore
new file mode 100644
index 00000000000..0d73459cf99
--- /dev/null
+++ b/submarine-cloud-services/.gitignore
@@ -0,0 +1,32 @@
+bin/
+/target
+/local
+
+# Eclipse, Netbeans and IntelliJ files
+/.*
+!.gitignore
+/nbproject
+/*.ipr
+/*.iws
+/*.iml
+
+# Repository wide ignore mac DS_Store files
+.DS_Store
+
+# Original jbpm ignores
+*~
+
+# Test info
+/settings*.xml
+/lib-jdbc/
+*.db
+*.tlog
+
+# modules that don't exist in this branch
+/jbpm-human-task-war/
+/jbpm-bam/
+/jbpm-gwt/
+
+# files used for external db testing
+jdbc_driver.jar
+db-settings.xml
diff --git a/submarine-cloud-services/pom.xml b/submarine-cloud-services/pom.xml
new file mode 100644
index 00000000000..9fc92ed3ea0
--- /dev/null
+++ b/submarine-cloud-services/pom.xml
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.submarine</groupId>
+    <artifactId>submarine-cloud</artifactId>
+    <version>8.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>submarine-cloud-services</artifactId>
+  <packaging>pom</packaging>
+  <name>Submarine Cloud Services</name>
+  <description>Submarine Cloud Services</description>
+  <modules>
+    <module>submarine-cloud-workitems</module>
+  </modules>
+</project>
\ No newline at end of file
diff --git a/submarine-cloud-services/submarine-cloud-workitems/.gitignore b/submarine-cloud-services/submarine-cloud-workitems/.gitignore
new file mode 100644
index 00000000000..0d73459cf99
--- /dev/null
+++ b/submarine-cloud-services/submarine-cloud-workitems/.gitignore
@@ -0,0 +1,32 @@
+bin/
+/target
+/local
+
+# Eclipse, Netbeans and IntelliJ files
+/.*
+!.gitignore
+/nbproject
+/*.ipr
+/*.iws
+/*.iml
+
+# Repository wide ignore mac DS_Store files
+.DS_Store
+
+# Original jbpm ignores
+*~
+
+# Test info
+/settings*.xml
+/lib-jdbc/
+*.db
+*.tlog
+
+# modules that don't exist in this branch
+/jbpm-human-task-war/
+/jbpm-bam/
+/jbpm-gwt/
+
+# files used for external db testing
+jdbc_driver.jar
+db-settings.xml
diff --git a/submarine-cloud-services/submarine-cloud-workitems/pom.xml b/submarine-cloud-services/submarine-cloud-workitems/pom.xml
new file mode 100644
index 00000000000..ce2701f2ef7
--- /dev/null
+++ b/submarine-cloud-services/submarine-cloud-workitems/pom.xml
@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.submarine</groupId>
+    <artifactId>submarine-cloud-services</artifactId>
+    <version>8.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>submarine-cloud-workitems</artifactId>
+  <name>Submarine Cloud Work Items</name>
+  <description>Submarine Cloud Work Items</description>
+
+  <properties>
+    <submarine.version>8.0.0-SNAPSHOT</submarine.version>
+
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-api</artifactId>
+      <version>${submarine.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-client</artifactId>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
new file mode 100644
index 00000000000..2da14ed8daf
--- /dev/null
+++ b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
@@ -0,0 +1,200 @@
+package org.kie.submarine.cloud.workitems;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.api.model.ServiceList;
+import io.fabric8.kubernetes.api.model.ServiceSpec;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+
+public abstract class DiscoveredServiceWorkItemHandler implements WorkItemHandler {
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(DiscoveredServiceWorkItemHandler.class);
+    
+    protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+    protected static final List<String> INTERNAL_FIELDS = Arrays.asList("TaskName", "ActorId", "GroupId", "Priority", "Comment", "Skippable", "Content", "Model", "Namespace");
+    
+    protected Map<String, String> serviceEndpoints = new ConcurrentHashMap<>();
+    
+    private volatile KubernetesClient client;
+    private OkHttpClient http = new OkHttpClient();
+    private ObjectMapper mapper = new ObjectMapper();
+
+    
+    public DiscoveredServiceWorkItemHandler() {
+        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
+    }
+    
+    /**
+     * Looks up service's endpoint (cluster ip + port) using label selector - meaning returns services that have given label.
+     * Services are looked up only in given namespace. 
+     * @param service label assign to a service that should be used as selector
+     * @return valid endpoint (in URL form) if found or runtime exception in case of no services found
+     */
+    protected String findEndpoint(String namespace, String service) {
+
+        ServiceList found = getKubeClient().services().inNamespace(namespace).withLabel(service).list();
+        if (found.getItems().isEmpty()) {
+            throw new RuntimeException("No endpoint found for service " + service);
+        }
+        Service foundService = found.getItems().get(0);
+
+        ServiceSpec spec = foundService.getSpec();
+        
+        StringBuilder location = new StringBuilder("http://")
+                                    .append(spec.getClusterIP())
+                                    .append(":")
+                                    .append(spec.getPorts().get(0).getPort())
+                                    .append("/")
+                                    .append(service);
+
+        return location.toString();
+    }
+
+    /**
+     * Discover valid service to be invoked in given namespace and serviceName. Where serviceName is 
+     * considered to be a label on the service .It uses service discovery
+     * base on label selectors to find the matching service endpoint (cluster ip and port)
+     * @param workItem work item that this handler is working on
+     * @param namespace namespace to look up services in
+     * @param serviceName name of the service to look up by - label
+     * @param method http method to be used when calling a service (supports GET, POST, PUT, DELETE)
+     * @return returns map of data that was returned from the service call
+     */
+    protected Map<String, Object> discoverAndCall(WorkItem workItem, String namespace, String serviceName, HttpMethods method) {
+        Map<String, Object> data = new HashMap<>(workItem.getParameters());
+        String service = (String) data.remove(serviceName);
+        
+        // remove all internal fields before sending
+        INTERNAL_FIELDS.forEach(field -> data.remove(field));
+        
+        // discover service endpoint
+        String endpoint = serviceEndpoints.computeIfAbsent(service, (s) -> findEndpoint(namespace, s));
+        LOGGER.debug("Found endpoint for service {} with location {}", service, endpoint);
+        
+        RequestBody body = produceRequestPayload(data);
+        Request request = null;
+        
+        switch (method) {
+            case POST:
+                request = producePostRequest(endpoint, body);
+                break;
+            case GET:
+                request = produceGetRequest(endpoint);
+                break;
+            case PUT:
+                request = producePutRequest(endpoint, body);
+                break;
+            case DELETE:
+                request = produceDeleteRequest(endpoint, body);
+                break;
+            default:
+                break;
+        }
+
+        try (Response response = http.newCall(request).execute()) {
+            
+            Map<String, Object> results = produceResultsFromResponse(response);
+            
+            return results;
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    
+    protected RequestBody produceRequestPayload(Map<String, Object> data) {
+        if (data == null) {
+            return null;
+        }
+        try {
+            String json = mapper.writeValueAsString(data);
+            LOGGER.debug("Sending body {}", json);
+            RequestBody body = RequestBody.create(JSON, json);
+            
+            return body;
+        } catch (Exception e) {
+            throw new RuntimeException("Unexpected error when producing request payload", e);
+        }
+    }
+    
+    @SuppressWarnings("unchecked")
+    protected Map<String, Object> produceResultsFromResponse(Response response) throws IOException {
+        String payload = response.body().string();            
+        LOGGER.debug("Resonse code {} and payload {}", response.code(), payload);
+        
+        if (!response.isSuccessful()) {
+            throw new RuntimeException("Unsuccessful response from service " + response.message() + " (code " + response.code() + ")");
+        }
+        
+        Map<String, Object> results = mapper.readValue(payload, Map.class);
+        
+        return results;
+    }
+    
+    protected Request producePostRequest(String endpoint, RequestBody body) {
+        Request request = new Request.Builder().url(endpoint)
+                .post(body)
+                .build();
+        
+        return request;
+    }
+    
+    protected Request produceGetRequest(String endpoint) {
+        Request request = new Request.Builder().url(endpoint)
+                .get()
+                .build();
+        
+        return request;
+    }
+    
+    protected Request producePutRequest(String endpoint, RequestBody body) {
+        Request request = new Request.Builder().url(endpoint)
+                .put(body)
+                .build();
+        
+        return request;
+    }
+    
+    protected Request produceDeleteRequest(String endpoint, RequestBody body) {
+        Request request = new Request.Builder().url(endpoint)
+                .delete(body)
+                .build();
+        
+        return request;
+    }
+    
+    protected KubernetesClient getKubeClient() {
+        if (client == null) {
+            synchronized (this) {
+                if (client == null) {
+                    client = new DefaultKubernetesClient();
+                }
+            }
+        }
+        return client;
+
+    }
+}
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
new file mode 100644
index 00000000000..79b18a03346
--- /dev/null
+++ b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
@@ -0,0 +1,7 @@
+package org.kie.submarine.cloud.workitems;
+
+
+public enum HttpMethods {
+
+    GET, POST, PUT, DELETE;
+}

From b6d1273d143c8d9f7871619279c39442af7f0985 Mon Sep 17 00:00:00 2001
From: Tibor Zimanyi <tibor.zimanyi@gmail.com>
Date: Mon, 15 Apr 2019 13:50:06 +0200
Subject: [PATCH 008/709] DROOLS-3816 Add PR pipeline (#3)

---
 Jenkinsfile | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000000..76564aaeca8
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,73 @@
+@Library('jenkins-pipeline-shared-libraries')_
+
+pipeline {
+    agent {
+        label 'submarine-static || kie-rhel7'
+    }
+    tools {
+        maven 'kie-maven-3.5.4'
+        jdk 'kie-jdk1.8'
+    }
+    options {
+        buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
+    }
+    stages {
+        stage('Initialize') {
+            steps {
+                sh 'printenv'
+            }
+        }
+        stage('Build submarine-bom') {
+            steps {
+                timeout(15) {
+                    dir("submarine-bom") {
+                        script {
+                            githubscm.checkoutIfExists('submarine-bom', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
+                        }
+                        sh 'mvn clean install -DskipTests'
+                    }
+                }
+            }
+        }
+        stage('Build submarine-runtimes') {
+            steps {
+                timeout(30) {
+                    dir("submarine-runtimes") {
+                        script {
+                            githubscm.checkoutIfExists('submarine-runtimes', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
+                        }
+                        sh 'mvn clean install -DskipTests'
+                    }
+                }
+            }
+        }
+        stage('Build submarine-cloud') {
+            steps {
+                timeout(30) {
+                    sh 'mvn clean install'
+                }
+            }
+        }
+        // Currently there are no tests in submarine-cloud
+//        stage('Publish test results') {
+//            steps {
+//                junit '**/target/surefire-reports/**/*.xml'
+//            }
+//        }
+    }
+    post {
+        unstable {
+            script {
+                mailer.sendEmailFailure()
+            }
+        }
+        failure {
+            script {
+                mailer.sendEmailFailure()
+            }
+        }
+        always {
+            cleanWs()
+        }
+    }
+}
\ No newline at end of file

From d339a1bc2109a03bd8bc16a695368631d4aea242 Mon Sep 17 00:00:00 2001
From: Tibor Zimanyi <tibor.zimanyi@gmail.com>
Date: Wed, 17 Apr 2019 14:23:32 +0200
Subject: [PATCH 009/709] DROOLS-3898 Use submarine Maven settings.xml in PR
 automation (#4)

---
 Jenkinsfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 76564aaeca8..816c8ebfa49 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,8 +23,8 @@ pipeline {
                     dir("submarine-bom") {
                         script {
                             githubscm.checkoutIfExists('submarine-bom', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
+                            maven.runMavenWithSubmarineSettings('clean install', true)
                         }
-                        sh 'mvn clean install -DskipTests'
                     }
                 }
             }
@@ -35,8 +35,8 @@ pipeline {
                     dir("submarine-runtimes") {
                         script {
                             githubscm.checkoutIfExists('submarine-runtimes', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
+                            maven.runMavenWithSubmarineSettings('clean install', true)
                         }
-                        sh 'mvn clean install -DskipTests'
                     }
                 }
             }
@@ -44,7 +44,9 @@ pipeline {
         stage('Build submarine-cloud') {
             steps {
                 timeout(30) {
-                    sh 'mvn clean install'
+                    script {
+                        maven.runMavenWithSubmarineSettings('clean install', false)
+                    }
                 }
             }
         }

From f0f6e7d73f9dafdd2d200bf3e5bf28d1958add47 Mon Sep 17 00:00:00 2001
From: Tibor Zimanyi <tibor.zimanyi@gmail.com>
Date: Wed, 17 Apr 2019 18:03:57 +0200
Subject: [PATCH 010/709] Always publish test results in PRs (#5)

---
 Jenkinsfile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 816c8ebfa49..22b11451ab1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,12 +50,6 @@ pipeline {
                 }
             }
         }
-        // Currently there are no tests in submarine-cloud
-//        stage('Publish test results') {
-//            steps {
-//                junit '**/target/surefire-reports/**/*.xml'
-//            }
-//        }
     }
     post {
         unstable {
@@ -69,6 +63,8 @@ pipeline {
             }
         }
         always {
+            // Currently there are no tests in submarine-cloud
+//            junit '**/target/surefire-reports/**/*.xml'
             cleanWs()
         }
     }

From f7c51758ff33b0593669a66e91e2ef24c5f637c4 Mon Sep 17 00:00:00 2001
From: tzimanyi <tibor.zimanyi@gmail.com>
Date: Thu, 18 Apr 2019 10:29:46 +0200
Subject: [PATCH 011/709] DROOLS-3909 Add global timeout to PR pipeline

---
 Jenkinsfile | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 22b11451ab1..2f53fd73886 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,6 +10,7 @@ pipeline {
     }
     options {
         buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
+        timeout(time: 90, unit: 'MINUTES')
     }
     stages {
         stage('Initialize') {
@@ -19,34 +20,28 @@ pipeline {
         }
         stage('Build submarine-bom') {
             steps {
-                timeout(15) {
-                    dir("submarine-bom") {
-                        script {
-                            githubscm.checkoutIfExists('submarine-bom', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
-                            maven.runMavenWithSubmarineSettings('clean install', true)
-                        }
+                dir("submarine-bom") {
+                    script {
+                        githubscm.checkoutIfExists('submarine-bom', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
+                        maven.runMavenWithSubmarineSettings('clean install', true)
                     }
                 }
             }
         }
         stage('Build submarine-runtimes') {
             steps {
-                timeout(30) {
-                    dir("submarine-runtimes") {
-                        script {
-                            githubscm.checkoutIfExists('submarine-runtimes', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
-                            maven.runMavenWithSubmarineSettings('clean install', true)
-                        }
+                dir("submarine-runtimes") {
+                    script {
+                        githubscm.checkoutIfExists('submarine-runtimes', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
+                        maven.runMavenWithSubmarineSettings('clean install', true)
                     }
                 }
             }
         }
         stage('Build submarine-cloud') {
             steps {
-                timeout(30) {
-                    script {
-                        maven.runMavenWithSubmarineSettings('clean install', false)
-                    }
+                script {
+                    maven.runMavenWithSubmarineSettings('clean install', false)
                 }
             }
         }

From 6dc064a9d1d17128659c32c0c68689e3d77511d8 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Thu, 18 Apr 2019 13:27:38 +0200
Subject: [PATCH 012/709] added support for knative service discovery (#6)

---
 .../DiscoveredServiceWorkItemHandler.java     | 174 +++++++++++++-----
 .../cloud/workitems/HttpMethods.java          |  15 ++
 .../cloud/workitems/ServiceInfo.java          |  43 +++++
 3 files changed, 191 insertions(+), 41 deletions(-)
 create mode 100644 submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java

diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
index 2da14ed8daf..36eb21a51ce 100644
--- a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
+++ b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+
 package org.kie.submarine.cloud.workitems;
 
 import java.io.IOException;
@@ -5,7 +20,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 import org.kie.api.runtime.process.WorkItem;
 import org.kie.api.runtime.process.WorkItemHandler;
@@ -16,14 +33,12 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.util.StdDateFormat;
 
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.ServiceList;
-import io.fabric8.kubernetes.api.model.ServiceSpec;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.Request.Builder;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 
@@ -35,16 +50,28 @@ public abstract class DiscoveredServiceWorkItemHandler implements WorkItemHandle
     protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
     protected static final List<String> INTERNAL_FIELDS = Arrays.asList("TaskName", "ActorId", "GroupId", "Priority", "Comment", "Skippable", "Content", "Model", "Namespace");
     
-    protected Map<String, String> serviceEndpoints = new ConcurrentHashMap<>();
+    protected static final String KNATIVE_SERVICE_SERVICE_URL = "apis/serving.knative.dev/v1alpha1/namespaces/@ns@/services?labelSelector=";
+    protected static final String KNATIVE_ISTIO_GATEWAY_URL = "api/v1/namespaces/istio-system/services/istio-ingressgateway";
+    protected static final String SERVICE_URL = "api/v1/namespaces/@ns@/services?labelSelector=";
+    
+    protected String istionGatewayClusterIp;
+    
+    protected Map<String, ServiceInfo> serviceEndpoints = new ConcurrentHashMap<>();
     
     private volatile KubernetesClient client;
-    private OkHttpClient http = new OkHttpClient();
+    private OkHttpClient http;
     private ObjectMapper mapper = new ObjectMapper();
 
     
     public DiscoveredServiceWorkItemHandler() {
         mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
         mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
+        
+        http = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
     }
     
     /**
@@ -53,24 +80,65 @@ public DiscoveredServiceWorkItemHandler() {
      * @param service label assign to a service that should be used as selector
      * @return valid endpoint (in URL form) if found or runtime exception in case of no services found
      */
-    protected String findEndpoint(String namespace, String service) {
+    protected ServiceInfo findEndpoint(String namespace, String service) {
+        
+        LOGGER.debug("Looking up for service {} in namespace {}", service, namespace);
+        DefaultKubernetesClient kubeClient = (DefaultKubernetesClient) getKubeClient();
+        String host = null;
+        Integer port = null;
+        Map<String, String> headers = null;
+        if (istionGatewayClusterIp != null) {
+            LOGGER.debug("Knative environment found, looking up for ingresgateway {} and host for serving service", istionGatewayClusterIp);
+            host = istionGatewayClusterIp;
+            port = 80;
+            headers = new HashMap<>();
+            
+            Request request = new Request.Builder().url(kubeClient.getMasterUrl() + KNATIVE_SERVICE_SERVICE_URL.replaceFirst("@ns@", namespace) + service)
+                                                   .build();
+            LOGGER.debug("About to call a search for services labeled with {}, complete url is {}", service, request.url());
+            try (Response response = kubeClient.getHttpClient().newCall(request).execute()) {
+                String out = response.body().string();
+                if (response.isSuccessful()) {
+                    Map<?, ?> data = mapper.readValue(out, Map.class);
+                    headers.put("HOST", ((Map<?, ?>)((Map<?, ?>)((List<?>)data.get("items")).get(0)).get("status")).get("domain").toString());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            LOGGER.debug("Headers to be used for requests {}", headers);
+            
+        } else {
+            LOGGER.debug("Looking up for service in regular kube/openshift environment");
+            
+            Request request = new Request.Builder()
+                                                   .url(kubeClient.getMasterUrl() + SERVICE_URL.replaceFirst("@ns@", namespace) + service)
+                                                   .build();
 
-        ServiceList found = getKubeClient().services().inNamespace(namespace).withLabel(service).list();
-        if (found.getItems().isEmpty()) {
-            throw new RuntimeException("No endpoint found for service " + service);
-        }
-        Service foundService = found.getItems().get(0);
+            try (Response response = kubeClient.getHttpClient().newCall(request).execute()) {
+                String out = response.body().string();
 
-        ServiceSpec spec = foundService.getSpec();
-        
+                if (response.isSuccessful()) {
+                    Map<?, ?> data = mapper.readValue(out, Map.class);
+                    
+                    Map<?, ?> spec = ((Map<?, ?>) ((Map<?, ?>) ((List<?>) data.get("items")).get(0)).get("spec"));
+                    host = spec.get("clusterIP").toString();
+                    port = (Integer) ((Map<?, ?>) ((List<?>)spec.get("ports")).get(0)).get("port");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }            
+        }
+        if (host == null) {
+          throw new RuntimeException("No endpoint found for service " + service);
+        }
         StringBuilder location = new StringBuilder("http://")
-                                    .append(spec.getClusterIP())
-                                    .append(":")
-                                    .append(spec.getPorts().get(0).getPort())
-                                    .append("/")
-                                    .append(service);
-
-        return location.toString();
+                .append(host)
+                .append(":")
+                .append(port)
+                .append("/")
+                .append(service);
+        LOGGER.debug("Host {} and port {} found for service {} in namespace {}", host, port, service, namespace);
+       return new ServiceInfo(location.toString(), headers);
     }
 
     /**
@@ -91,7 +159,7 @@ protected Map<String, Object> discoverAndCall(WorkItem workItem, String namespac
         INTERNAL_FIELDS.forEach(field -> data.remove(field));
         
         // discover service endpoint
-        String endpoint = serviceEndpoints.computeIfAbsent(service, (s) -> findEndpoint(namespace, s));
+        ServiceInfo endpoint = serviceEndpoints.computeIfAbsent(service, (s) -> findEndpoint(namespace, s));
         LOGGER.debug("Found endpoint for service {} with location {}", service, endpoint);
         
         RequestBody body = produceRequestPayload(data);
@@ -154,36 +222,45 @@ protected Map<String, Object> produceResultsFromResponse(Response response) thro
         return results;
     }
     
-    protected Request producePostRequest(String endpoint, RequestBody body) {
-        Request request = new Request.Builder().url(endpoint)
-                .post(body)
-                .build();
+    protected Request producePostRequest(ServiceInfo endpoint, RequestBody body) {
+        Builder builder = new Request.Builder().url(endpoint.getUrl())
+                .post(body);
+        applyHeaders(endpoint, builder);
         
-        return request;
+        return builder.build();
     }
     
-    protected Request produceGetRequest(String endpoint) {
-        Request request = new Request.Builder().url(endpoint)
-                .get()
-                .build();
+    protected Request produceGetRequest(ServiceInfo endpoint) {
+        Builder builder = new Request.Builder().url(endpoint.getUrl())
+                .get();
+        applyHeaders(endpoint, builder);
         
-        return request;
+        return builder.build();
     }
     
-    protected Request producePutRequest(String endpoint, RequestBody body) {
-        Request request = new Request.Builder().url(endpoint)
-                .put(body)
-                .build();
+    protected Request producePutRequest(ServiceInfo endpoint, RequestBody body) {
+        Builder builder = new Request.Builder().url(endpoint.getUrl())
+                .put(body);
+        applyHeaders(endpoint, builder);
         
-        return request;
+        return builder.build();
     }
     
-    protected Request produceDeleteRequest(String endpoint, RequestBody body) {
-        Request request = new Request.Builder().url(endpoint)
-                .delete(body)
-                .build();
+    protected Request produceDeleteRequest(ServiceInfo endpoint, RequestBody body) {
+        Builder builder = new Request.Builder().url(endpoint.getUrl())
+                .delete(body);
+        applyHeaders(endpoint, builder);
         
-        return request;
+        return builder.build();
+    }
+    
+    protected void applyHeaders(ServiceInfo endpoint, Builder builder) {
+
+        if (endpoint.getHeaders() != null) {
+            for (Entry<String, String> header : endpoint.getHeaders().entrySet()) {
+                builder.addHeader(header.getKey(), header.getValue());
+            }
+        }
     }
     
     protected KubernetesClient getKubeClient() {
@@ -191,6 +268,21 @@ protected KubernetesClient getKubeClient() {
             synchronized (this) {
                 if (client == null) {
                     client = new DefaultKubernetesClient();
+                    LOGGER.debug("Kube Client created, looking up istio ingressgateway...");
+                    Request request = new Request.Builder().url(client.getMasterUrl() + KNATIVE_ISTIO_GATEWAY_URL)
+                                                           .build();
+
+                    try (Response response = ((DefaultKubernetesClient) client).getHttpClient().newCall(request).execute()) {
+                        String out = response.body().string();
+                        LOGGER.debug("Request {} completed with code {}, and response {}", request.url().toString(), response.code(), out);
+                        if (response.isSuccessful()) {
+                            Map<?, ?> data = mapper.readValue(out, Map.class);
+                            this.istionGatewayClusterIp = ((Map<?, ?>) data.get("spec")).get("clusterIP").toString();
+                        }
+                        LOGGER.debug("Istio geteway is " + istionGatewayClusterIp);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         }
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
index 79b18a03346..a6036f8e854 100644
--- a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
+++ b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+
 package org.kie.submarine.cloud.workitems;
 
 
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java
new file mode 100644
index 00000000000..410192cf4c9
--- /dev/null
+++ b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+
+package org.kie.submarine.cloud.workitems;
+
+import java.util.Map;
+
+public class ServiceInfo {
+
+    private final String url;
+    private final Map<String, String> headers;
+
+    public ServiceInfo(String url, Map<String, String> headers) {
+        this.url = url;
+        this.headers = headers;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceInfo [url=" + url + ", headers=" + headers + "]";
+    }
+
+}

From 152049914cd8e4c8df8cd704b16e3bd7c0244fc5 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Wed, 24 Apr 2019 13:43:55 +0200
Subject: [PATCH 013/709] added basic tests for
 DiscoveredServiceWorkItemHandler (#9)

---
 Jenkinsfile                                   |   2 +-
 .../submarine-cloud-workitems/pom.xml         |  16 +++
 .../DiscoveredServiceWorkItemHandler.java     |   6 +-
 .../DiscoveredServiceWorkItemHandlerTest.java | 110 ++++++++++++++++++
 4 files changed, 132 insertions(+), 2 deletions(-)
 create mode 100644 submarine-cloud-services/submarine-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java

diff --git a/Jenkinsfile b/Jenkinsfile
index 2f53fd73886..3501e289657 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,7 +59,7 @@ pipeline {
         }
         always {
             // Currently there are no tests in submarine-cloud
-//            junit '**/target/surefire-reports/**/*.xml'
+            junit '**/target/surefire-reports/**/*.xml'
             cleanWs()
         }
     }
diff --git a/submarine-cloud-services/submarine-cloud-workitems/pom.xml b/submarine-cloud-services/submarine-cloud-workitems/pom.xml
index ce2701f2ef7..00a92d7629f 100644
--- a/submarine-cloud-services/submarine-cloud-workitems/pom.xml
+++ b/submarine-cloud-services/submarine-cloud-workitems/pom.xml
@@ -27,5 +27,21 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>
     </dependency>
+    
+     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
index 36eb21a51ce..85b429707fe 100644
--- a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
+++ b/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
@@ -67,7 +67,11 @@ public DiscoveredServiceWorkItemHandler() {
         mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
         mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
         
-        http = new OkHttpClient.Builder()
+        http = buildHttpClient();
+    }
+    
+    protected OkHttpClient buildHttpClient() {
+        return new OkHttpClient.Builder()
                 .connectTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(60, TimeUnit.SECONDS)
                 .readTimeout(60, TimeUnit.SECONDS)
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java b/submarine-cloud-services/submarine-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
new file mode 100644
index 00000000000..e0330260f3b
--- /dev/null
+++ b/submarine-cloud-services/submarine-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+
+package org.kie.submarine.cloud.workitems;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemManager;
+import org.mockito.Mockito;
+
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSource;
+
+public class DiscoveredServiceWorkItemHandlerTest {
+    
+    
+    private OkHttpClient httpClient;
+
+    @Before
+    public void setup() {
+        httpClient = mock(OkHttpClient.class);
+    }
+    
+    @Test
+    public void testGivenEndpoint() throws IOException {
+        DiscoveredServiceWorkItemHandler handler = new TestDiscoveredServiceWorkItemHandler("test", "http://testhost:9000"); 
+        
+        WorkItem workItem = Mockito.mock(WorkItem.class);
+        when(workItem.getParameters()).thenReturn(Collections.singletonMap("service", "test"));
+        
+        Call call = mock(Call.class);
+        ResponseBody body = new ResponseBody() {
+            private String content = "{\"test\" : \"fake\"}";
+            @Override
+            public BufferedSource source() {
+                Buffer b = new Buffer();
+                b.write(content.getBytes());
+                return b;
+            }
+            
+            @Override
+            public MediaType contentType() {
+                return MediaType.parse("application/json");
+            }
+            
+            @Override
+            public long contentLength() {
+                return content.length();
+            }
+        };
+        Response response = new Response.Builder().body(body).protocol(Protocol.HTTP_1_1).message("test").request(new Request.Builder().url("http://localhost:9000").build()).code(200).build();
+                
+     
+        when(call.execute()).thenReturn(response);
+        when(httpClient.newCall(any())).thenReturn(call);
+        
+        Map<String, Object> results = handler.discoverAndCall(workItem, "", "service", HttpMethods.POST);
+        
+        assertThat(results).isNotNull().containsKey("test").containsValue("fake");
+    }
+    
+    private class TestDiscoveredServiceWorkItemHandler extends DiscoveredServiceWorkItemHandler {
+
+        public TestDiscoveredServiceWorkItemHandler(String service, String endpoint) {
+            super();
+            this.serviceEndpoints.put(service, new ServiceInfo(endpoint, null));
+        }
+        
+        @Override
+        public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {
+        }
+
+        @Override
+        public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
+        }
+
+        @Override
+        protected OkHttpClient buildHttpClient() {
+            return httpClient;
+        }
+        
+    }
+}

From a271813c151d16f15247e698e00a113f58897ad3 Mon Sep 17 00:00:00 2001
From: Spolti <filippespolti@gmail.com>
Date: Thu, 25 Apr 2019 08:32:46 -0300
Subject: [PATCH 014/709] cekit (#10)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 .gitignore                                    |   4 +-
 s2i/Makefile                                  |  76 ++++++++++++
 s2i/README.md                                 |  76 +++++++++++-
 s2i/image.yaml                                |  29 +++++
 s2i/kaas-quarkus-centos-overrides.yaml        |  20 ++++
 s2i/kaas-quarkus-centos-s2i-overrides.yaml    |  27 +++++
 s2i/kaas-quarkus-centos-s2i/Dockerfile        |  38 ------
 s2i/kaas-quarkus-centos-s2i/Makefile          |  10 --
 s2i/kaas-quarkus-centos-s2i/README.md         |  35 ------
 .../maven/settings.xml                        |  43 -------
 s2i/kaas-quarkus-centos/Dockerfile            |  32 -----
 s2i/kaas-quarkus-centos/Makefile              |  10 --
 s2i/kaas-quarkus-centos/README.md             |  34 ------
 s2i/kaas-springboot-centos-overrides.yaml     |  22 ++++
 s2i/kaas-springboot-centos-s2i-overrides.yaml |  21 ++++
 s2i/kaas-springboot-centos-s2i/Dockerfile     |  37 ------
 s2i/kaas-springboot-centos-s2i/Makefile       |  10 --
 s2i/kaas-springboot-centos-s2i/README.md      |  35 ------
 .../maven/settings.xml                        |  43 -------
 .../s2i/bin/assemble                          |  62 ----------
 s2i/kaas-springboot-centos-s2i/s2i/bin/run    |   9 --
 .../s2i/bin/save-artifacts                    |   9 --
 s2i/kaas-springboot-centos-s2i/s2i/bin/usage  |  20 ----
 s2i/kaas-springboot-centos/Dockerfile         |  34 ------
 s2i/kaas-springboot-centos/Makefile           |  10 --
 s2i/kaas-springboot-centos/README.md          |  34 ------
 s2i/kaas-springboot-centos/s2i/bin/assemble   |  16 ---
 .../s2i/bin/assemble-runtime                  |  18 ---
 s2i/kaas-springboot-centos/s2i/bin/run        |   9 --
 s2i/kaas-springboot-centos/s2i/bin/usage      |  12 --
 s2i/modules/add-submarine-user/add-user       |   3 +
 s2i/modules/add-submarine-user/module.yaml    |   8 ++
 s2i/modules/graalvm/1.0.0-rc14/configure      |   8 ++
 s2i/modules/graalvm/1.0.0-rc14/module.yaml    |  21 ++++
 s2i/modules/graalvm/1.0.0-rc15/configure      |   7 ++
 s2i/modules/graalvm/1.0.0-rc15/module.yaml    |  20 ++++
 s2i/modules/java-openjdk/1.8.0/module.yaml    |  25 ++++
 s2i/modules/kaas-quarkus-centos-s2i/README.md |   9 ++
 s2i/modules/kaas-quarkus-centos-s2i/configure |  10 ++
 .../kaas-quarkus-centos-s2i/module.yaml       |   4 +
 .../kaas-quarkus-centos-s2i/s2i/bin/assemble  |  30 +++--
 .../kaas-quarkus-centos-s2i/s2i/bin/run       |   0
 .../s2i/bin/save-artifacts                    |   0
 .../kaas-quarkus-centos-s2i/s2i/bin/usage     |   0
 .../kaas-quarkus-centos-s2i/test/run          |   2 +-
 .../test/test-app/index.html                  |   0
 s2i/modules/kaas-quarkus-centos/README.md     |  12 ++
 s2i/modules/kaas-quarkus-centos/configure     |   9 ++
 s2i/modules/kaas-quarkus-centos/module.yaml   |   4 +
 .../kaas-quarkus-centos/s2i/bin/assemble      |   8 +-
 .../s2i/bin/assemble-runtime                  |   8 +-
 .../kaas-quarkus-centos/s2i/bin/run           |   0
 .../kaas-quarkus-centos/s2i/bin/usage         |   0
 .../kaas-quarkus-centos}/test/run             |   5 +-
 .../test/test-app/index.html                  |   0
 .../kaas-springboot-centos-s2i/README.md      |   9 ++
 .../kaas-springboot-centos-s2i/configure      |  10 ++
 .../kaas-springboot-centos-s2i/module.yaml    |   4 +
 .../kaas-springboot-centos-s2i}/test/run      |   2 +-
 .../test/test-app/index.html                  |   0
 s2i/modules/kaas-springboot-centos/README.md  |   8 ++
 s2i/modules/kaas-springboot-centos/configure  |  10 ++
 .../kaas-springboot-centos/module.yaml        |   4 +
 .../kaas-springboot-centos/test/run           |   0
 .../test/test-app/index.html                  |   0
 .../maven/3.6.0/added/configure-maven.sh      |  72 +++++++++++
 s2i/modules/maven/3.6.0/added/configure.sh    | 112 ++++++++++++++++++
 s2i/modules/maven/3.6.0/configure             |  12 ++
 s2i/modules/maven/3.6.0/maven/settings.xml    |  52 ++++++++
 s2i/modules/maven/3.6.0/module.yaml           |  37 ++++++
 s2i/submarine-imagestream.yaml                |  92 ++++++++++++++
 71 files changed, 870 insertions(+), 582 deletions(-)
 create mode 100644 s2i/Makefile
 create mode 100644 s2i/image.yaml
 create mode 100644 s2i/kaas-quarkus-centos-overrides.yaml
 create mode 100644 s2i/kaas-quarkus-centos-s2i-overrides.yaml
 delete mode 100644 s2i/kaas-quarkus-centos-s2i/Dockerfile
 delete mode 100644 s2i/kaas-quarkus-centos-s2i/Makefile
 delete mode 100644 s2i/kaas-quarkus-centos-s2i/README.md
 delete mode 100644 s2i/kaas-quarkus-centos-s2i/maven/settings.xml
 delete mode 100644 s2i/kaas-quarkus-centos/Dockerfile
 delete mode 100644 s2i/kaas-quarkus-centos/Makefile
 delete mode 100644 s2i/kaas-quarkus-centos/README.md
 create mode 100644 s2i/kaas-springboot-centos-overrides.yaml
 create mode 100644 s2i/kaas-springboot-centos-s2i-overrides.yaml
 delete mode 100644 s2i/kaas-springboot-centos-s2i/Dockerfile
 delete mode 100644 s2i/kaas-springboot-centos-s2i/Makefile
 delete mode 100644 s2i/kaas-springboot-centos-s2i/README.md
 delete mode 100644 s2i/kaas-springboot-centos-s2i/maven/settings.xml
 delete mode 100755 s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
 delete mode 100755 s2i/kaas-springboot-centos-s2i/s2i/bin/run
 delete mode 100644 s2i/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
 delete mode 100755 s2i/kaas-springboot-centos-s2i/s2i/bin/usage
 delete mode 100644 s2i/kaas-springboot-centos/Dockerfile
 delete mode 100644 s2i/kaas-springboot-centos/Makefile
 delete mode 100644 s2i/kaas-springboot-centos/README.md
 delete mode 100755 s2i/kaas-springboot-centos/s2i/bin/assemble
 delete mode 100755 s2i/kaas-springboot-centos/s2i/bin/assemble-runtime
 delete mode 100755 s2i/kaas-springboot-centos/s2i/bin/run
 delete mode 100755 s2i/kaas-springboot-centos/s2i/bin/usage
 create mode 100644 s2i/modules/add-submarine-user/add-user
 create mode 100644 s2i/modules/add-submarine-user/module.yaml
 create mode 100644 s2i/modules/graalvm/1.0.0-rc14/configure
 create mode 100644 s2i/modules/graalvm/1.0.0-rc14/module.yaml
 create mode 100644 s2i/modules/graalvm/1.0.0-rc15/configure
 create mode 100644 s2i/modules/graalvm/1.0.0-rc15/module.yaml
 create mode 100644 s2i/modules/java-openjdk/1.8.0/module.yaml
 create mode 100644 s2i/modules/kaas-quarkus-centos-s2i/README.md
 create mode 100644 s2i/modules/kaas-quarkus-centos-s2i/configure
 create mode 100644 s2i/modules/kaas-quarkus-centos-s2i/module.yaml
 rename s2i/{ => modules}/kaas-quarkus-centos-s2i/s2i/bin/assemble (70%)
 rename s2i/{ => modules}/kaas-quarkus-centos-s2i/s2i/bin/run (100%)
 rename s2i/{ => modules}/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts (100%)
 rename s2i/{ => modules}/kaas-quarkus-centos-s2i/s2i/bin/usage (100%)
 rename s2i/{ => modules}/kaas-quarkus-centos-s2i/test/run (98%)
 rename s2i/{ => modules}/kaas-quarkus-centos-s2i/test/test-app/index.html (100%)
 create mode 100644 s2i/modules/kaas-quarkus-centos/README.md
 create mode 100644 s2i/modules/kaas-quarkus-centos/configure
 create mode 100644 s2i/modules/kaas-quarkus-centos/module.yaml
 rename s2i/{ => modules}/kaas-quarkus-centos/s2i/bin/assemble (58%)
 rename s2i/{ => modules}/kaas-quarkus-centos/s2i/bin/assemble-runtime (65%)
 rename s2i/{ => modules}/kaas-quarkus-centos/s2i/bin/run (100%)
 rename s2i/{ => modules}/kaas-quarkus-centos/s2i/bin/usage (100%)
 rename s2i/{kaas-springboot-centos-s2i => modules/kaas-quarkus-centos}/test/run (94%)
 rename s2i/{ => modules}/kaas-quarkus-centos/test/test-app/index.html (100%)
 create mode 100644 s2i/modules/kaas-springboot-centos-s2i/README.md
 create mode 100644 s2i/modules/kaas-springboot-centos-s2i/configure
 create mode 100644 s2i/modules/kaas-springboot-centos-s2i/module.yaml
 rename s2i/{kaas-quarkus-centos => modules/kaas-springboot-centos-s2i}/test/run (98%)
 rename s2i/{ => modules}/kaas-springboot-centos-s2i/test/test-app/index.html (100%)
 create mode 100644 s2i/modules/kaas-springboot-centos/README.md
 create mode 100644 s2i/modules/kaas-springboot-centos/configure
 create mode 100644 s2i/modules/kaas-springboot-centos/module.yaml
 rename s2i/{ => modules}/kaas-springboot-centos/test/run (100%)
 rename s2i/{ => modules}/kaas-springboot-centos/test/test-app/index.html (100%)
 create mode 100644 s2i/modules/maven/3.6.0/added/configure-maven.sh
 create mode 100644 s2i/modules/maven/3.6.0/added/configure.sh
 create mode 100644 s2i/modules/maven/3.6.0/configure
 create mode 100644 s2i/modules/maven/3.6.0/maven/settings.xml
 create mode 100644 s2i/modules/maven/3.6.0/module.yaml
 create mode 100644 s2i/submarine-imagestream.yaml

diff --git a/.gitignore b/.gitignore
index 0d73459cf99..611832304ea 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 bin/
 /target
 /local
+target/
 
 # Eclipse, Netbeans and IntelliJ files
 /.*
@@ -8,7 +9,8 @@ bin/
 /nbproject
 /*.ipr
 /*.iws
-/*.iml
+*/*.iml
+.idea/
 
 # Repository wide ignore mac DS_Store files
 .DS_Store
diff --git a/s2i/Makefile b/s2i/Makefile
new file mode 100644
index 00000000000..dab067fca70
--- /dev/null
+++ b/s2i/Makefile
@@ -0,0 +1,76 @@
+IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
+
+.DEFAULT_GOAL := build
+
+# Build all images
+.PHONY: build
+build: kaas-quarkus-centos kaas-quarkus-centos-s2i kaas-springboot-centos kaas-springboot-centos-s2i
+
+kaas-quarkus-centos:
+	cekit build -v --overrides-file kaas-quarkus-centos-overrides.yaml
+	docker-squash quay.io/kiegroup/kaas-quarkus-centos:${IMAGE_VERSION} --tag=quay.io/kiegroup/kaas-quarkus-centos:${IMAGE_VERSION}
+	docker tag quay.io/kiegroup/kaas-quarkus-centos:${IMAGE_VERSION} quay.io/kiegroup/kaas-quarkus-centos:latest
+
+kaas-quarkus-centos-s2i:
+	cekit build -v --overrides-file kaas-quarkus-centos-s2i-overrides.yaml
+	docker-squash quay.io/kiegroup/kaas-quarkus-centos-s2i:${IMAGE_VERSION} --tag=quay.io/kiegroup/kaas-quarkus-centos-s2i:${IMAGE_VERSION}
+	docker tag quay.io/kiegroup/kaas-quarkus-centos-s2i:${IMAGE_VERSION} quay.io/kiegroup/kaas-quarkus-centos-s2i:latest
+
+kaas-springboot-centos:
+	cekit build -v --overrides-file kaas-springboot-centos-overrides.yaml
+	docker-squash quay.io/kiegroup/kaas-springboot-centos:${IMAGE_VERSION} --tag=quay.io/kiegroup/kaas-springboot-centos:${IMAGE_VERSION}
+	docker tag quay.io/kiegroup/kaas-springboot-centos:${IMAGE_VERSION} quay.io/kiegroup/kaas-springboot-centos:latest
+
+kaas-springboot-centos-s2i:
+	cekit build -v --overrides-file kaas-springboot-centos-s2i-overrides.yaml
+	docker-squash quay.io/kiegroup/kaas-springboot-centos-s2i:${IMAGE_VERSION} --tag=quay.io/kiegroup/kaas-springboot-centos-s2i:${IMAGE_VERSION}
+	docker tag quay.io/kiegroup/kaas-springboot-centos-s2i:${IMAGE_VERSION} quay.io/kiegroup/kaas-springboot-centos-s2i:latest
+
+.PHONY: build-cekit
+build-cekit3:
+	cekit -v build --overrides-file kaas-quarkus-centos-overrides.yaml docker
+	cekit -v build --overrides-file kaas-quarkus-centos-s2i-overrides.yaml docker
+	cekit -v build --overrides-file kaas-springboot-centos-overrides.yaml docker
+	cekit -v build --overrides-file kaas-springboot-centos-s2i-overrides.yaml docker
+
+
+# Build and test all images
+.PHONY: test
+test:
+	cekit build -v --overrides-file kaas-quarkus-centos-overrides.yaml
+	modules/kaas-quarkus-centos/test/run
+
+	cekit build -v --overrides-file kaas-quarkus-centos-s2i-overrides.yaml
+	modules/kaas-quarkus-centos-s2i/test/run
+
+	cekit build -v --overrides-file kaas-springboot-centos-overrides.yaml
+	modules/kaas-springboot-centos/test/run
+
+	cekit build -v --overrides-file kaas-springboot-centos-s2i-overrides.yaml
+	modules/kaas-springboot-centos-s2i-/test/run
+
+test-cekit3:
+	cekit -v build --overrides-file kaas-quarkus-centos-overrides.yaml --overrides 'name: kaas-quarkus-centos-candidate' docker --no-squash
+	modules/kaas-quarkus-centos/test/run
+	cekit -v build --overrides-file kaas-quarkus-centos-s2i-overrides.yaml --overrides 'name: kaas-quarkus-centos-s2i-candidate' docker --no-squash
+	modules/kaas-quarkus-centos-s2i/test/run
+	cekit -v build --overrides-file kaas-springboot-centos-overrides.yaml --overrides 'name: kaas-springboot-centos-candidate' docker --no-squash
+	modules/kaas-springboot-centos/test/run
+	cekit -v build --overrides-file kaas-springboot-centos-s2i-overrides.yaml --overrides 'name: kaas-springboot-centos-s2i-candidate' docker --no-squash
+	modules/kaas-springboot-centos-s2i-/test/run
+
+# push images to quay.io, this requires permissions under kiegroup organization
+.PHONY: push
+push: build _push
+
+cekit3: build-cekit3 _push
+
+_push:
+	docker push quay.io/kiegroup/kaas-quarkus-centos:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kaas-quarkus-centos:latest
+	docker push quay.io/kiegroup/kaas-quarkus-centos-s2i:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kaas-quarkus-centos-s2i:latest
+	docker push quay.io/kiegroup/kaas-springboot-centos:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kaas-springboot-centos:latest
+	docker push quay.io/kiegroup/kaas-springboot-centos-s2i:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kaas-springboot-centos-s2i:latest
\ No newline at end of file
diff --git a/s2i/README.md b/s2i/README.md
index 69d5f8eef20..e3a2d4ee366 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -14,7 +14,9 @@ Images are grouped by the runtime that will run the binaries and the OS level
 Builder image that is responsible for building the project
 with Apache Maven and generate native image using GraalVM/SubstrateVM
 
-For more details have a look at [README.md](kaas-quarkus-centos-s2i/README.md)
+Image location: quay.io/kiegroup/kaas-quarkus-centos-s2i:latest
+
+For more details have a look at [README.md](modules/kaas-quarkus-centos-s2i/README.md)
 
 ### kaas-quarkus-centos
 
@@ -22,6 +24,8 @@ Runtime image that is responsible for just running the binaries taken from the
 builder image. That approach is giving small and compact image that does not
 not carry on any of the build tools or artefacts (like local maven repository).
 
+Image location: quay.io/kiegroup/kaas-quarkus-centos:latest
+
 For more details have a look at [README.md](kaas-quarkus-centos/README.md)
 
 ## SpringBoot
@@ -31,6 +35,8 @@ For more details have a look at [README.md](kaas-quarkus-centos/README.md)
 Builder image that is responsible for building the project
 with Apache Maven and generate fat jar.
 
+Image location: quay.io/kiegroup/kaas-springboot-centos-s2i:latest
+
 For more details have a look at [README.md](kaas-springboot-centos-s2i/README.md)
 
 ### kaas-springboot-centos
@@ -40,6 +46,8 @@ builder image. It has JRE installed on the container to allow java executable.
 That approach is giving small and compact image that does not
 not carry on any of the build tools or artefacts (like local maven repository).
 
+Image location: quay.io/kiegroup/kaas-springboot-centos:latest
+
 For more details have a look at [README.md](kaas-springboot-centos/README.md)
 
 # Supported source structure
@@ -80,7 +88,7 @@ Best way is to use maven archetypes to generate project structure (same archetyp
 Once the images are built and imported into registry (docker hub or internal OpenShift registry)
 new applications can be build and deployed with this few steps
 
-`oc new-build repository/kaas-quarkus-centos-s2i~https://github.com/user/project --name=builder-app-name`
+`oc new-build quay.io/kiegroup/kaas-quarkus-centos-s2i~https://github.com/user/project --name=builder-app-name`
 
 Modify accordingly following
 - repository is the docker repository the images are available in (could be OpenShift project or docker hub user)
@@ -145,4 +153,66 @@ Modify accordingly following
 - builder-app-name is name of the resulting build image that was built in the first step.
 
 what this does ... essentially reuses previously build image and takes advantage of
-already downloaded artefacts. By that improving overall build time significantly.
+already downloaded artifacts. By that improving overall build time significantly.
+
+You can also use a maven mirror, if available on your internal network, just set the 
+MAVEN_MIRROR_URL environment variable when starting a new build.
+
+
+
+## Building the images locally:
+
+CeKit2 or 3 (Not fully tested) and docker-squash are required to build the images, how to install: https://docs.cekit.io/en/latest/handbook/installation/instructions.html
+
+To build all images: 
+```bash 
+$ make
+```
+
+To build a single image, use `make build image-name`, example:
+```bash
+$ make kaas-quarkus-centos
+```
+
+To build all images using cekit3:
+```bash
+$ make build-cekit3
+```
+
+Testing the images (WIP):
+```bash
+$ make test
+```
+
+And finally, to push the images for the quay.io/kiegroup registry, this step requires permission under the kiegroup 
+organization on quay.io.:
+```bash
+ make push
+ ```
+
+##### Pushing the built images to a local OCP registry:
+To be able to build the image a docker should be installed.
+ 
+Setup environment
+ 
+```bash
+$ eval $(minishift docker-env)
+ ```
+ 
+Login to docker registry
+
+```bash
+$ docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)
+```
+ 
+(this will run a docker build and produce a image builder)
+ 
+Tag the built image, example
+```bash
+$ docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-quarkus-centos
+```
+
+Modify accordingly
+ - IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
+    * Note that, you can also use the image name:tag.
+ - PROJECT - OpenShift project that the image should be pushed to
\ No newline at end of file
diff --git a/s2i/image.yaml b/s2i/image.yaml
new file mode 100644
index 00000000000..f4db1965097
--- /dev/null
+++ b/s2i/image.yaml
@@ -0,0 +1,29 @@
+schema_version: 1
+
+name: "submarine-image-real-name-on-overrides-file"
+version: "1.0"
+from: "centos:latest"
+
+labels:
+- name: "maintainer"
+  value: "Submarine <submarine@kiegroup.com>"
+- name: "io.openshift.s2i.scripts-url"
+  value: "image:///usr/local/s2i"
+- name: "io.openshift.s2i.destination"
+  value: "/tmp"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+modules:
+  repositories:
+  - path: modules
+
+packages:
+  repositories:
+  - name: scl
+    rpm: centos-release-scl
+
+run:
+  user: 1001
+  cmd:
+  - "/usr/local/s2i/run"
diff --git a/s2i/kaas-quarkus-centos-overrides.yaml b/s2i/kaas-quarkus-centos-overrides.yaml
new file mode 100644
index 00000000000..2a46473737f
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-overrides.yaml
@@ -0,0 +1,20 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kaas-quarkus-centos"
+description: "Runtime image for KaaS based on Quarkus native image"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for KaaS based on Quarkus native image"
+- name: "io.k8s.display-name"
+  value: "KaaS based on Quarkus native image"
+- name: "io.openshift.tags"
+  value: "builder,runtime,kaas,quarkus"
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: add-submarine-user
+  - name: kaas-quarkus-centos
\ No newline at end of file
diff --git a/s2i/kaas-quarkus-centos-s2i-overrides.yaml b/s2i/kaas-quarkus-centos-s2i-overrides.yaml
new file mode 100644
index 00000000000..d0367f90989
--- /dev/null
+++ b/s2i/kaas-quarkus-centos-s2i-overrides.yaml
@@ -0,0 +1,27 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kaas-quarkus-centos-s2i"
+description: "Platform for building KaaS based on Quarkus"
+
+labels:
+- name: "io.k8s.description"
+  value: "Platform for building KaaS based on Quarkus"
+- name: "io.k8s.display-name"
+  value: "KaaS based on Quarkus"
+- name: "io.openshift.tags"
+  value: "builder,kaas,quarkus"
+
+modules:
+  install:
+  - name: add-submarine-user
+  - name: graalvm
+    version: "1.0.0-rc15"
+  - name: maven
+    version: "3.6.0"
+  - name: kaas-quarkus-centos-s2i
+
+packages:
+  install:
+  - gcc
+  - glibc-devel
+  - zlib-devel
\ No newline at end of file
diff --git a/s2i/kaas-quarkus-centos-s2i/Dockerfile b/s2i/kaas-quarkus-centos-s2i/Dockerfile
deleted file mode 100644
index 4384c99e03e..00000000000
--- a/s2i/kaas-quarkus-centos-s2i/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# kaas-quarkus-centos-s2i
-FROM centos:latest
-
-LABEL maintainer="Submarine <submarine@kiegroup.com>"
-
-ENV MAVEN_VERSION 3.6.0
-ENV GRAALVM_VERSION 1.0.0-rc15
-ENV SUBMARINE_HOME /home/submarine
-
-LABEL io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
-      io.openshift.s2i.destination="/tmp" \
-      io.k8s.description="Platform for building KaaS based on Quarkus" \
-      io.k8s.display-name="KaaS based on Quarkus" \
-      io.openshift.expose-services="8080:http" \
-      io.openshift.tags="builder,kaas,quarkus"
-
-# Install Apache Maven and GraalVM
-RUN yum install -y --setopt=skip_missing_names_on_install=False \
-    tar gzip gcc glibc-devel zlib-devel curl && \
-    curl -fsSL https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /usr/share \
-    && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven && \
-    curl -fsSL https://github.com/oracle/graal/releases/download/vm-$GRAALVM_VERSION/graalvm-ce-$GRAALVM_VERSION-linux-amd64.tar.gz | tar xzf - -C /usr/share \
-    && mv /usr/share/graalvm-ce-$GRAALVM_VERSION /usr/share/graalvm && \
-    adduser -u 1001 -g 0 submarine --home-dir ${SUBMARINE_HOME} && \
-    chown -R 1001:0 ${SUBMARINE_HOME} && \
-    chmod -R ug+rwX ${SUBMARINE_HOME}
-
-COPY ./s2i/bin/ /usr/local/s2i
-RUN chmod 755 /usr/local/s2i/*
-
-USER 1001
-
-WORKDIR ${SUBMARINE_HOME}
-
-COPY ./maven/ ${SUBMARINE_HOME}
-
-# Set the default CMD for the image
-CMD ["/usr/local/s2i/usage"]
diff --git a/s2i/kaas-quarkus-centos-s2i/Makefile b/s2i/kaas-quarkus-centos-s2i/Makefile
deleted file mode 100644
index eabc22a88fd..00000000000
--- a/s2i/kaas-quarkus-centos-s2i/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_NAME = kaas-quarkus-centos-s2i
-
-.PHONY: build
-build:
-	docker build -t $(IMAGE_NAME) .
-
-.PHONY: test
-test:
-	docker build -t $(IMAGE_NAME)-candidate .
-	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
diff --git a/s2i/kaas-quarkus-centos-s2i/README.md b/s2i/kaas-quarkus-centos-s2i/README.md
deleted file mode 100644
index 5f7d5c2a370..00000000000
--- a/s2i/kaas-quarkus-centos-s2i/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# S2I image to build builder image based on Centos 7
-
-This S2I is considered image builder that is equipped with build tools
-
-- GraalVM
-- Apache Maven
-
-So it is equipped with all required tools to build a runnable native image of
-KaaS (Knowledge as a Service) type of projects.
-
-## Build the image
-
-To be able to build the image a docker should be installed.
-
-Setup environment
-
-`eval $(minishift docker-env)`
-
-Login to docker registry
-
-`docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)`
-
-Built the image
-
-`make`
-
-(this will run a docker build and produce a image builder)
-
-Tag the built image
-
-`docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-quarkus-centos-s2i`
-
-Modify accordingly
-- IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
-- PROJECT - OpenShift project that the image should be pushed to
diff --git a/s2i/kaas-quarkus-centos-s2i/maven/settings.xml b/s2i/kaas-quarkus-centos-s2i/maven/settings.xml
deleted file mode 100644
index 8c1b0dab7ec..00000000000
--- a/s2i/kaas-quarkus-centos-s2i/maven/settings.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <profiles>
-    <profile>
-      <id>default</id>
-      <repositories>
-        <repository>
-         <id>jboss-public-repository-group</id>
-         <name>JBoss Public Repository Group</name>
-         <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-         <releases>
-           <enabled>true</enabled>
-           <updatePolicy>never</updatePolicy>
-         </releases>
-         <snapshots>
-           <enabled>true</enabled>
-           <updatePolicy>always</updatePolicy>
-         </snapshots>
-       </repository>
-      </repositories>
-      <pluginRepositories>
-      <pluginRepository>
-        <id>jboss-public-repository-group</id>
-        <name>JBoss Public Repository Group</name>
-        <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-        <releases>
-          <enabled>true</enabled>
-          <updatePolicy>never</updatePolicy>
-        </releases>
-        <snapshots>
-          <enabled>true</enabled>
-          <updatePolicy>always</updatePolicy>
-        </snapshots>
-      </pluginRepository>
-    </pluginRepositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <activeProfile>default</activeProfile>
-  </activeProfiles>
-</settings>
diff --git a/s2i/kaas-quarkus-centos/Dockerfile b/s2i/kaas-quarkus-centos/Dockerfile
deleted file mode 100644
index dacddbe4616..00000000000
--- a/s2i/kaas-quarkus-centos/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# kaas-quarkus-centos
-FROM centos:latest
-
-ENV SUBMARINE_HOME /home/submarine
-
-LABEL maintainer="Submarine <submarine@kiegroup.com>"
-
-#Set labels used in OpenShift to describe the builder image
-LABEL io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
-      io.openshift.s2i.destination="/tmp" \
-      io.k8s.description="Runtime image for KaaS based on Quarkus native image" \
-      io.k8s.display-name="KaaS based on Quarkus native image" \
-      io.openshift.expose-services="8080:http" \
-      io.openshift.tags="builder,runtime,KaaS,Quarkus"
-
-
-# S2I scripts
-COPY s2i/bin/ /usr/local/s2i
-
-RUN chmod 755 /usr/local/s2i/* && \
-    adduser -u 1001 -g 0 submarine --home-dir ${SUBMARINE_HOME} && \
-    chown -R 1001:0 ${SUBMARINE_HOME} && \
-    chmod -R ug+rwX ${SUBMARINE_HOME}
-
-USER 1001
-
-WORKDIR ${SUBMARINE_HOME}
-
-# Set the default port for applications built using this image
-EXPOSE 8080
-
-CMD ["/usr/local/s2i/run"]
diff --git a/s2i/kaas-quarkus-centos/Makefile b/s2i/kaas-quarkus-centos/Makefile
deleted file mode 100644
index 0970bc4829c..00000000000
--- a/s2i/kaas-quarkus-centos/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_NAME = kaas-quarkus-centos
-
-.PHONY: build
-build:
-	docker build -t $(IMAGE_NAME) .
-
-.PHONY: test
-test:
-	docker build -t $(IMAGE_NAME)-candidate .
-	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
diff --git a/s2i/kaas-quarkus-centos/README.md b/s2i/kaas-quarkus-centos/README.md
deleted file mode 100644
index 1242ae6ac38..00000000000
--- a/s2i/kaas-quarkus-centos/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# S2I image to build runtime image based on Centos 7
-
-This S2I is considered a runtime image builder as it relies on another image
-(built with `kaas-quarkus-centos-s2i`) that actually produced the binaries to be executed
-(the native image based on Quarkus runtime). So this one will only get the binaries
-and place into the container.
-
-With that it produces lightweight and compact application container image.
-
-## Build the image
-
-To be able to build the image a docker should be installed.
-
-Setup environment
-
-`eval $(minishift docker-env)`
-
-Login to docker registry
-
-`docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)`
-
-Built the image
-
-`make`
-
-(this will run a docker build and produce a image builder)
-
-Tag the built image
-
-`docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-quarkus-centos`
-
-Modify accordingly
-- IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
-- PROJECT - OpenShift project that the image should be pushed to
diff --git a/s2i/kaas-springboot-centos-overrides.yaml b/s2i/kaas-springboot-centos-overrides.yaml
new file mode 100644
index 00000000000..2d62e339e54
--- /dev/null
+++ b/s2i/kaas-springboot-centos-overrides.yaml
@@ -0,0 +1,22 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kaas-springboot-centos"
+description: "Runtime image for KaaS based on SpringBoot native image"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for KaaS based on SpringBoot native image"
+- name: "io.k8s.display-name"
+  value: "KaaS based on SpringBoot native image"
+- name: "io.openshift.tags"
+  value: "builder,runtime,kaas,springboot"
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: add-submarine-user
+  - name: java-openjdk
+    version: "1.8.0"
+  - name: kaas-springboot-centos
\ No newline at end of file
diff --git a/s2i/kaas-springboot-centos-s2i-overrides.yaml b/s2i/kaas-springboot-centos-s2i-overrides.yaml
new file mode 100644
index 00000000000..8bbbc449d53
--- /dev/null
+++ b/s2i/kaas-springboot-centos-s2i-overrides.yaml
@@ -0,0 +1,21 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kaas-springboot-centos-s2i"
+description: "Platform for building KaaS based on SpringBoot"
+
+labels:
+- name: "io.k8s.description"
+  value: "Platform for building KaaS based on SpringBoot"
+- name: "io.k8s.display-name"
+  value: "KaaS based on SpringBoot"
+- name: "io.openshift.tags"
+  value: "builder,kaas,springboot"
+
+modules:
+  install:
+  - name: add-submarine-user
+  - name: maven
+    version: "3.6.0"
+  - name: java-openjdk
+    version: "1.8.0"
+  - name: kaas-springboot-centos-s2i
\ No newline at end of file
diff --git a/s2i/kaas-springboot-centos-s2i/Dockerfile b/s2i/kaas-springboot-centos-s2i/Dockerfile
deleted file mode 100644
index 4c541cabdba..00000000000
--- a/s2i/kaas-springboot-centos-s2i/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# kaas-quarkus-centos-s2i
-FROM centos:latest
-
-LABEL maintainer="Submarine <submarine@kiegroup.com>"
-
-ENV MAVEN_VERSION 3.6.0
-ENV JAVA_VERSON 1.8.0
-ENV SUBMARINE_HOME /home/submarine
-
-LABEL io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
-      io.openshift.s2i.destination="/tmp" \
-      io.k8s.description="Platform for building KaaS based on SpringBoot" \
-      io.k8s.display-name="KaaS based on SpringBoot" \
-      io.openshift.expose-services="8080:http" \
-      io.openshift.tags="builder,kaas,springboot"
-
-# install s2i files
-COPY ./s2i/bin/ /usr/local/s2i
-
-# install required packages
-RUN yum install -y --setopt=skip_missing_names_on_install=False \
-    tar curl java-$JAVA_VERSON-openjdk-devel && \
-    curl -fsSL https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /usr/share \
-    && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven && \
-    adduser -u 1001 -g 0 submarine --home-dir ${SUBMARINE_HOME} && \
-    chown -R 1001:0 ${SUBMARINE_HOME} && \
-    chmod -R ug+rwX ${SUBMARINE_HOME} && \
-    chmod 755 /usr/local/s2i/*
-
-USER 1001
-
-WORKDIR ${SUBMARINE_HOME}
-
-COPY ./maven/ ${SUBMARINE_HOME}
-
-# Set the default CMD for the image
-CMD ["/usr/local/s2i/usage"]
diff --git a/s2i/kaas-springboot-centos-s2i/Makefile b/s2i/kaas-springboot-centos-s2i/Makefile
deleted file mode 100644
index 8f7321fbca3..00000000000
--- a/s2i/kaas-springboot-centos-s2i/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_NAME = kaas-springboot-centos-s2i
-
-.PHONY: build
-build:
-	docker build -t $(IMAGE_NAME) .
-
-.PHONY: test
-test:
-	docker build -t $(IMAGE_NAME)-candidate .
-	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
diff --git a/s2i/kaas-springboot-centos-s2i/README.md b/s2i/kaas-springboot-centos-s2i/README.md
deleted file mode 100644
index 8d371c9e619..00000000000
--- a/s2i/kaas-springboot-centos-s2i/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# S2I image to build builder image based on Centos 7
-
-This S2I is considered image builder that is equipped with build tools
-
-- OpenJDK 1.8
-- Apache Maven
-
-So it is equipped with all required tools to build a runnable fat jar of
-KaaS (Knowledge as a Service) type of projects.
-
-## Build the image
-
-To be able to build the image a docker should be installed.
-
-Setup environment
-
-`eval $(minishift docker-env)`
-
-Login to docker registry
-
-`docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)`
-
-Built the image
-
-`make`
-
-(this will run a docker build and produce a image builder)
-
-Tag the built image
-
-`docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-springboot-centos-s2i`
-
-Modify accordingly
-- IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
-- PROJECT - OpenShift project that the image should be pushed to
diff --git a/s2i/kaas-springboot-centos-s2i/maven/settings.xml b/s2i/kaas-springboot-centos-s2i/maven/settings.xml
deleted file mode 100644
index 8c1b0dab7ec..00000000000
--- a/s2i/kaas-springboot-centos-s2i/maven/settings.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <profiles>
-    <profile>
-      <id>default</id>
-      <repositories>
-        <repository>
-         <id>jboss-public-repository-group</id>
-         <name>JBoss Public Repository Group</name>
-         <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-         <releases>
-           <enabled>true</enabled>
-           <updatePolicy>never</updatePolicy>
-         </releases>
-         <snapshots>
-           <enabled>true</enabled>
-           <updatePolicy>always</updatePolicy>
-         </snapshots>
-       </repository>
-      </repositories>
-      <pluginRepositories>
-      <pluginRepository>
-        <id>jboss-public-repository-group</id>
-        <name>JBoss Public Repository Group</name>
-        <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-        <releases>
-          <enabled>true</enabled>
-          <updatePolicy>never</updatePolicy>
-        </releases>
-        <snapshots>
-          <enabled>true</enabled>
-          <updatePolicy>always</updatePolicy>
-        </snapshots>
-      </pluginRepository>
-    </pluginRepositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <activeProfile>default</activeProfile>
-  </activeProfiles>
-</settings>
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble b/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
deleted file mode 100755
index 7f4159ce905..00000000000
--- a/s2i/kaas-springboot-centos-s2i/s2i/bin/assemble
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble script for the 'kaas-springboot-centos-s2i' image.
-# The 'assemble' script builds your application source so that it is ready to run.
-#
-# For more information refer to the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-export JAVA_HOME=/usr/lib/jvm/java
-export MAVEN_HOME=/usr/share/maven
-
-# If the 'kaas-springboot-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
-if [[ "$1" == "-h" ]]; then
-	exec /usr/libexec/s2i/usage
-fi
-
-if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
-		echo "---> Restore build artifacts"
-    mv /tmp/artifacts/.m2 $HOME
-fi
-
-echo "---> Installing application source..."
-cd /tmp/src/
-
-if [ -f "pom.xml" ]; then
-	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml \
-    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-else
-	echo "---> Generating project structure..."
-
-	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-springboot-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $SUBMARINE_HOME/settings.xml
-
-	# copy resources into the generated project
-	for item in *
-	do
-		if [ -d $item ] && [ "$item" == "project" ]; then
-			echo "--> Skipping generated project ..."
-		else
-			echo "--> Coping resource $item"
-			cp -R $item project/src/main/resources
-		fi
-	done
-
-	# move all project content into the current directory
-	mv project/* .
-
-	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/settings.xml \
-    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-fi
-
-echo "---> Installing application binaries"
-mkdir $SUBMARINE_HOME/bin
-cp -v target/*.jar $SUBMARINE_HOME/bin
-
-echo "---> Copy image metadata file..."
-mkdir /tmp/.s2i
-cp -v target/image_metadata.json /tmp/.s2i/image_metadata.json
-cp -v target/image_metadata.json $SUBMARINE_HOME/bin
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/run b/s2i/kaas-springboot-centos-s2i/s2i/bin/run
deleted file mode 100755
index eb4c6f0dec1..00000000000
--- a/s2i/kaas-springboot-centos-s2i/s2i/bin/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-#
-# S2I run script for the 'kaas-springboot-centos-s2i' image.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-exec java -jar $SUBMARINE_HOME/bin/*.jar
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/save-artifacts b/s2i/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
deleted file mode 100644
index d06c9a151cf..00000000000
--- a/s2i/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-pushd ${HOME} > /dev/null
-if [ -d .m2 ]; then
-    tar cf - .m2
-    echo "--> Maven artifacts saved"
-    ls -l
-fi
-popd > /dev/null
diff --git a/s2i/kaas-springboot-centos-s2i/s2i/bin/usage b/s2i/kaas-springboot-centos-s2i/s2i/bin/usage
deleted file mode 100755
index 8b01045a39f..00000000000
--- a/s2i/kaas-springboot-centos-s2i/s2i/bin/usage
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -e
-cat <<EOF
-This is the kaas-springboot-centos S2I image:
-
-Build executable jar based on project source either complete maven project or just set of business assets 
-such as processes, rules, decisions.
-
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-This image is intended to build application binaries only that are later on transfered to runtime image.
-
-s2i build -c <source code path/URL> kaas-quarkus-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/submarine/bin
-
-Sample invocation:
-
-s2i build -c /Development/project/ kaas-springboot-centos-s2i application --runtime-image kaas-springboot-centos --runtime-artifact /home/submarine/bin
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/s2i/kaas-springboot-centos/Dockerfile b/s2i/kaas-springboot-centos/Dockerfile
deleted file mode 100644
index 6039e19a5be..00000000000
--- a/s2i/kaas-springboot-centos/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# kaas-springboot-centos
-FROM centos:latest
-
-ENV JAVA_VERSON 1.8.0
-ENV SUBMARINE_HOME /home/submarine
-
-LABEL maintainer="Submarine <submarine@kiegroup.com>"
-
-#Set labels used in OpenShift to describe the builder image
-LABEL io.openshift.s2i.scripts-url="image:///usr/local/s2i" \
-      io.openshift.s2i.destination="/tmp" \
-      io.k8s.description="Runtime image for KaaS based on SpringBoot native image" \
-      io.k8s.display-name="KaaS based on SpringBoot native image" \
-      io.openshift.expose-services="8080:http" \
-      io.openshift.tags="builder,runtime,kaas,springboot"
-
-# S2I scripts
-COPY s2i/bin/ /usr/local/s2i
-
-RUN yum install -y java-$JAVA_VERSON-openjdk j && \
-    yum clean all && \
-    chmod 755 /usr/local/s2i/* && \
-    adduser -u 1001 -g 0 submarine --home-dir ${SUBMARINE_HOME} && \
-    chown -R 1001:0 ${SUBMARINE_HOME} && \
-    chmod -R ug+rwX ${SUBMARINE_HOME}
-
-USER 1001
-
-WORKDIR ${SUBMARINE_HOME}
-
-# Set the default port for applications built using this image
-EXPOSE 8080
-
-CMD ["/usr/local/s2i/run"]
diff --git a/s2i/kaas-springboot-centos/Makefile b/s2i/kaas-springboot-centos/Makefile
deleted file mode 100644
index 1bdd3bf68ae..00000000000
--- a/s2i/kaas-springboot-centos/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_NAME = kaas-springboot-centos
-
-.PHONY: build
-build:
-	docker build -t $(IMAGE_NAME) .
-
-.PHONY: test
-test:
-	docker build -t $(IMAGE_NAME)-candidate .
-	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
diff --git a/s2i/kaas-springboot-centos/README.md b/s2i/kaas-springboot-centos/README.md
deleted file mode 100644
index cffdc093cdc..00000000000
--- a/s2i/kaas-springboot-centos/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# S2I image to build runtime image based on Centos 7
-
-This S2I is considered a runtime image builder as it relies on another image
-(built with `kaas-springboot-centos-s2i`) that actually produced the binaries to be executed
-(the fat jar based on SpringBoot 2.1.x runtime). So this one will only get the binaries
-and place into the container.
-
-On top of the OS it has JRE installed (OpenJDK 1.8) to be able to execute fat jar.
-
-## Build the image
-
-To be able to build the image a docker should be installed.
-
-Setup environment
-
-`eval $(minishift docker-env)`
-
-Login to docker registry
-
-`docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)`
-
-Built the image
-
-`make`
-
-(this will run a docker build and produce a image builder)
-
-Tag the built image
-
-`docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-springboot-centos`
-
-Modify accordingly
-- IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
-- PROJECT - OpenShift project that the image should be pushed to
diff --git a/s2i/kaas-springboot-centos/s2i/bin/assemble b/s2i/kaas-springboot-centos/s2i/bin/assemble
deleted file mode 100755
index 072dc4ea9ae..00000000000
--- a/s2i/kaas-springboot-centos/s2i/bin/assemble
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -e
-# this script is used by OpenShift with chained builds
-# to transfer data from builder image into the runtime image
-
-cp -R /tmp/src/bin/ $SUBMARINE_HOME
-
-if [ -d "$SUBMARINE_HOME/bin" ]; then
-  echo "---> Application binaries found and ready to use"
-  
-  echo "---> Adding custom labels..."
-  mkdir /tmp/.s2i
-  mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-else
-  echo "---> Application binaries NOT found, failing build..."
-  exit 1
-fi
diff --git a/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime b/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime
deleted file mode 100755
index 73b8ff448c0..00000000000
--- a/s2i/kaas-springboot-centos/s2i/bin/assemble-runtime
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble-runtime script for the 'kaas-springboot-centos' image.
-# The assemble-runtime script executes preparation for running the container on runtime image.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-if [ -d "$SUBMARINE_HOME/bin" ]; then
-  echo "---> Application binaries found and ready to use"
-  
-  echo "---> Adding custom labels..."
-  mkdir /tmp/.s2i
-  mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-else
-  echo "---> Application binaries NOT found, failing build..."
-  exit 1
-fi
diff --git a/s2i/kaas-springboot-centos/s2i/bin/run b/s2i/kaas-springboot-centos/s2i/bin/run
deleted file mode 100755
index c7dd5841d33..00000000000
--- a/s2i/kaas-springboot-centos/s2i/bin/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-#
-# S2I run script for the 'kaas-springboot-centos' image.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-exec java -jar $SUBMARINE_HOME/bin/*.jar
diff --git a/s2i/kaas-springboot-centos/s2i/bin/usage b/s2i/kaas-springboot-centos/s2i/bin/usage
deleted file mode 100755
index 99d159ba98f..00000000000
--- a/s2i/kaas-springboot-centos/s2i/bin/usage
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-cat <<EOF
-This is the kaas-quarkus-centos S2I image:
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-Sample invocation:
-
-s2i build <source code path/URL> kaas-quarkus-centos <application image>
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/s2i/modules/add-submarine-user/add-user b/s2i/modules/add-submarine-user/add-user
new file mode 100644
index 00000000000..946f8a08562
--- /dev/null
+++ b/s2i/modules/add-submarine-user/add-user
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+groupadd -r submarine -g 1001 && useradd -u 1001 -r -g 1001 -m -d ${SUBMARINE_HOME} -s /sbin/nologin -c "Submarine user" submarine
diff --git a/s2i/modules/add-submarine-user/module.yaml b/s2i/modules/add-submarine-user/module.yaml
new file mode 100644
index 00000000000..2cd73fac6ea
--- /dev/null
+++ b/s2i/modules/add-submarine-user/module.yaml
@@ -0,0 +1,8 @@
+schema_version: 1
+name: add-submarine-user
+execute:
+- script: add-user
+
+envs:
+- name: "SUBMARINE_HOME"
+  value: "/home/submarine"
\ No newline at end of file
diff --git a/s2i/modules/graalvm/1.0.0-rc14/configure b/s2i/modules/graalvm/1.0.0-rc14/configure
new file mode 100644
index 00000000000..15d479548b8
--- /dev/null
+++ b/s2i/modules/graalvm/1.0.0-rc14/configure
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+
+tar xzf ${SOURCES_DIR}/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
+
diff --git a/s2i/modules/graalvm/1.0.0-rc14/module.yaml b/s2i/modules/graalvm/1.0.0-rc14/module.yaml
new file mode 100644
index 00000000000..085baa4a141
--- /dev/null
+++ b/s2i/modules/graalvm/1.0.0-rc14/module.yaml
@@ -0,0 +1,21 @@
+schema_version: 1
+name: graalvm
+version: "1.0.0-rc14"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/usr/share/graalvm"
+    #version without prefix ce
+  - name: "GRAALVM_VERSION"
+    value: "1.0.0-rc14"
+
+# unfortunately by now the version needs to be hardcoded.
+artifacts:
+  - name: graalvm-ce-1.0.0-rc14-linux-amd64.tar.gz
+    url: https://github.com/oracle/graal/releases/download/vm-1.0.0-rc14/graalvm-ce-1.0.0-rc14-linux-amd64.tar.gz
+    md5: 89e562717a7ca3f54a1799f5c2a0167b
+
+execute:
+  - script: configure
\ No newline at end of file
diff --git a/s2i/modules/graalvm/1.0.0-rc15/configure b/s2i/modules/graalvm/1.0.0-rc15/configure
new file mode 100644
index 00000000000..a41b91383db
--- /dev/null
+++ b/s2i/modules/graalvm/1.0.0-rc15/configure
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+
+tar xzf ${SOURCES_DIR}/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
\ No newline at end of file
diff --git a/s2i/modules/graalvm/1.0.0-rc15/module.yaml b/s2i/modules/graalvm/1.0.0-rc15/module.yaml
new file mode 100644
index 00000000000..cf298ef7426
--- /dev/null
+++ b/s2i/modules/graalvm/1.0.0-rc15/module.yaml
@@ -0,0 +1,20 @@
+schema_version: 1
+name: graalvm
+version: "1.0.0-rc15"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/usr/share/graalvm"
+  #version without prefix ce
+  - name: "GRAALVM_VERSION"
+    value: "1.0.0-rc15"
+
+artifacts:
+- name: graalvm-ce-1.0.0-rc15-linux-amd64.tar.gz
+  url: https://github.com/oracle/graal/releases/download/vm-1.0.0-rc15/graalvm-ce-1.0.0-rc15-linux-amd64.tar.gz
+  md5: 904ce54888e49296364dc6f9ff5081a6
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/s2i/modules/java-openjdk/1.8.0/module.yaml b/s2i/modules/java-openjdk/1.8.0/module.yaml
new file mode 100644
index 00000000000..e1f464a2cda
--- /dev/null
+++ b/s2i/modules/java-openjdk/1.8.0/module.yaml
@@ -0,0 +1,25 @@
+schema_version: 1
+name: java-openjdk
+version: "1.8.0"
+
+labels:
+  - name: "com.redhat.component"
+    value: "jboss-openjdk18-rhel7-container"
+  - name: "org.jboss.product"
+    value: "openjdk"
+  - name: "org.jboss.product.version"
+    value: "1.8.0"
+  - name: "org.jboss.product.openjdk.version"
+    value: "1.8.0"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/lib/jvm/java-1.8.0"
+  - name: "JAVA_VENDOR"
+    value: "openjdk"
+  - name: "JAVA_VERSION"
+    value: "1.8.0"
+
+packages:
+  install:
+  - java-1.8.0-openjdk-devel
\ No newline at end of file
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/README.md b/s2i/modules/kaas-quarkus-centos-s2i/README.md
new file mode 100644
index 00000000000..723ff946926
--- /dev/null
+++ b/s2i/modules/kaas-quarkus-centos-s2i/README.md
@@ -0,0 +1,9 @@
+# S2I image to build builder image based on Centos 7
+
+This S2I is considered image builder that is equipped with build tools
+
+- GraalVM
+- Apache Maven
+
+So it is equipped with all required tools to build a runnable native image of
+KaaS (Knowledge as a Service) type of projects.
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/configure b/s2i/modules/kaas-quarkus-centos-s2i/configure
new file mode 100644
index 00000000000..70a714afd57
--- /dev/null
+++ b/s2i/modules/kaas-quarkus-centos-s2i/configure
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+
+cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
+
+chmod 755 /usr/local/s2i/*
+chown -R 1001:1001 ${SUBMARINE_HOME}
+chmod -R ug+rwX ${SUBMARINE_HOME}
\ No newline at end of file
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/module.yaml b/s2i/modules/kaas-quarkus-centos-s2i/module.yaml
new file mode 100644
index 00000000000..3d2d3d6af36
--- /dev/null
+++ b/s2i/modules/kaas-quarkus-centos-s2i/module.yaml
@@ -0,0 +1,4 @@
+schema_version: 1
+name: kaas-quarkus-centos-s2i
+execute:
+  - script: configure
\ No newline at end of file
diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble b/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/assemble
similarity index 70%
rename from s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
rename to s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/assemble
index 9b2d8bf5a02..7486416d9d6 100755
--- a/s2i/kaas-quarkus-centos-s2i/s2i/bin/assemble
+++ b/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/assemble
@@ -6,9 +6,15 @@
 # For more information refer to the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-export JAVA_HOME=/usr/share/graalvm
-export MAVEN_HOME=/usr/share/maven
-export GRAALVM_HOME=/usr/share/graalvm
+#############################################
+# Configure maven - for a complete list of
+# supported values, please refer the module.yaml
+# file.
+CONFIGURE_SCRIPTS=(
+  ${SUBMARINE_HOME}/.m2/configure-maven.sh
+)
+source ${SUBMARINE_HOME}/.m2/configure.sh
+#############################################
 
 # If the 'kaas-quarkus-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
 if [[ "$1" == "-h" ]]; then
@@ -16,7 +22,7 @@ if [[ "$1" == "-h" ]]; then
 fi
 
 if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
-		echo "---> Restore build artifacts"
+    echo "---> Restore build artifacts"
     mv /tmp/artifacts/.m2 $HOME
 fi
 
@@ -25,13 +31,13 @@ cd /tmp/src/
 
 if [ -f "pom.xml" ]; then
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/settings.xml \
+	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/.m2/settings.xml \
     -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
     -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 else
 	echo "---> Generating project structure..."
 
-	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-quarkus-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $SUBMARINE_HOME/settings.xml
+	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-quarkus-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $SUBMARINE_HOME/.m2/settings.xml
 
 	# copy resources into the generated project
 	for item in *
@@ -48,7 +54,7 @@ else
 	mv project/* .
 
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/settings.xml \
+	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/.m2/settings.xml \
     -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
     -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 
@@ -62,9 +68,13 @@ chmod +x $SUBMARINE_HOME/bin/*-runner
 
 
 echo "---> Copy image metadata file..."
-mkdir /tmp/.s2i
-cp -v target/image_metadata.json /tmp/.s2i
-cp -v target/image_metadata.json $SUBMARINE_HOME/bin
+if [ -e /tmp/src/target/image_metadata.json ]; then
+    mkdir /tmp/.s2i
+    cp -v /tmp/src/target/image_metadata.json /tmp/.s2i
+    cp -v /tmp/src/target/image_metadata.json $SUBMARINE_HOME/bin
+else
+    echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
+fi
 
 echo "---> Copy native java libraries for ssl handling..."
 cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $SUBMARINE_HOME/bin
\ No newline at end of file
diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/run b/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/run
similarity index 100%
rename from s2i/kaas-quarkus-centos-s2i/s2i/bin/run
rename to s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/run
diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts b/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts
similarity index 100%
rename from s2i/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts
rename to s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts
diff --git a/s2i/kaas-quarkus-centos-s2i/s2i/bin/usage b/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/usage
similarity index 100%
rename from s2i/kaas-quarkus-centos-s2i/s2i/bin/usage
rename to s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/usage
diff --git a/s2i/kaas-quarkus-centos-s2i/test/run b/s2i/modules/kaas-quarkus-centos-s2i/test/run
similarity index 98%
rename from s2i/kaas-quarkus-centos-s2i/test/run
rename to s2i/modules/kaas-quarkus-centos-s2i/test/run
index a069abda968..7b06e654e24 100755
--- a/s2i/kaas-quarkus-centos-s2i/test/run
+++ b/s2i/modules/kaas-quarkus-centos-s2i/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME-kaas-quarkus-candidate}
+IMAGE_NAME=${IMAGE_NAME:-kaas-quarkus-centos-s2i-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
diff --git a/s2i/kaas-quarkus-centos-s2i/test/test-app/index.html b/s2i/modules/kaas-quarkus-centos-s2i/test/test-app/index.html
similarity index 100%
rename from s2i/kaas-quarkus-centos-s2i/test/test-app/index.html
rename to s2i/modules/kaas-quarkus-centos-s2i/test/test-app/index.html
diff --git a/s2i/modules/kaas-quarkus-centos/README.md b/s2i/modules/kaas-quarkus-centos/README.md
new file mode 100644
index 00000000000..8907bb40984
--- /dev/null
+++ b/s2i/modules/kaas-quarkus-centos/README.md
@@ -0,0 +1,12 @@
+# S2I image to build runtime image based on Centos 7
+
+This S2I is considered a runtime image builder as it relies on another image
+(built with `kaas-quarkus-centos-s2i`) that actually produced the binaries to be executed
+(the native image based on Quarkus runtime). So this one will only get the binaries
+and place into the container.
+
+With that it produces lightweight and compact application container image.
+
+
+
+
diff --git a/s2i/modules/kaas-quarkus-centos/configure b/s2i/modules/kaas-quarkus-centos/configure
new file mode 100644
index 00000000000..be705b8adfa
--- /dev/null
+++ b/s2i/modules/kaas-quarkus-centos/configure
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+SCRIPT_DIR=$(dirname $0)
+
+cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
+
+chmod 755 /usr/local/s2i/*
+chown -R 1001:0 ${SUBMARINE_HOME}
+chmod -R ug+rwX ${SUBMARINE_HOME}
\ No newline at end of file
diff --git a/s2i/modules/kaas-quarkus-centos/module.yaml b/s2i/modules/kaas-quarkus-centos/module.yaml
new file mode 100644
index 00000000000..2131bd71252
--- /dev/null
+++ b/s2i/modules/kaas-quarkus-centos/module.yaml
@@ -0,0 +1,4 @@
+schema_version: 1
+name: kaas-quarkus-centos
+execute:
+- script: configure
\ No newline at end of file
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/assemble b/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble
similarity index 58%
rename from s2i/kaas-quarkus-centos/s2i/bin/assemble
rename to s2i/modules/kaas-quarkus-centos/s2i/bin/assemble
index 072dc4ea9ae..4f2862a73ad 100755
--- a/s2i/kaas-quarkus-centos/s2i/bin/assemble
+++ b/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble
@@ -8,8 +8,12 @@ if [ -d "$SUBMARINE_HOME/bin" ]; then
   echo "---> Application binaries found and ready to use"
   
   echo "---> Adding custom labels..."
-  mkdir /tmp/.s2i
-  mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+  if [ -e "${SUBMARINE_HOME}/bin/image_metadata.json" ]; then
+    mkdir /tmp/.s2i
+    mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+  else
+    echo "-----> Failed to copy metada file, $SUBMARINE_HOME/bin/image_metadata.json does not exist"
+  fi
 else
   echo "---> Application binaries NOT found, failing build..."
   exit 1
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime b/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble-runtime
similarity index 65%
rename from s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime
rename to s2i/modules/kaas-quarkus-centos/s2i/bin/assemble-runtime
index 7f89d55c331..26be42a28da 100755
--- a/s2i/kaas-quarkus-centos/s2i/bin/assemble-runtime
+++ b/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble-runtime
@@ -11,8 +11,12 @@ if [ -d "$SUBMARINE_HOME/bin" ]; then
   echo "---> Application binaries found and ready to use"
   
   echo "---> Adding custom labels..."
-  mkdir /tmp/.s2i
-  mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+  if [ -e "${SUBMARINE_HOME}/bin/image_metadata.json" ]; then
+    mkdir /tmp/.s2i
+    mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+  else
+    echo "-----> Failed to copy metada file, $SUBMARINE_HOME/bin/image_metadata.json does not exist"
+  fi
 else
   echo "---> Application binaries NOT found, failing build..."
   exit 1
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/run b/s2i/modules/kaas-quarkus-centos/s2i/bin/run
similarity index 100%
rename from s2i/kaas-quarkus-centos/s2i/bin/run
rename to s2i/modules/kaas-quarkus-centos/s2i/bin/run
diff --git a/s2i/kaas-quarkus-centos/s2i/bin/usage b/s2i/modules/kaas-quarkus-centos/s2i/bin/usage
similarity index 100%
rename from s2i/kaas-quarkus-centos/s2i/bin/usage
rename to s2i/modules/kaas-quarkus-centos/s2i/bin/usage
diff --git a/s2i/kaas-springboot-centos-s2i/test/run b/s2i/modules/kaas-quarkus-centos/test/run
similarity index 94%
rename from s2i/kaas-springboot-centos-s2i/test/run
rename to s2i/modules/kaas-quarkus-centos/test/run
index d4c2c9b4b15..0dcb7146a50 100755
--- a/s2i/kaas-springboot-centos-s2i/test/run
+++ b/s2i/modules/kaas-quarkus-centos/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME-kaas-springboot-centos-s2i-candidate}
+IMAGE_NAME=${IMAGE_NAME:-kaas-quarkus-centos-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
@@ -22,7 +22,7 @@ if [[ "$OSTYPE" =~ 'darwin' ]]; then
 fi
 
 _dir="$(dirname "${BASH_SOURCE[0]}")"
-test_dir="$($READLINK_EXEC ${_dir} || echo ${_dir})"
+test_dir="$(${READLINK_EXEC} ${_dir} || echo ${_dir})"
 image_dir=$($READLINK_EXEC ${test_dir}/.. || echo ${test_dir}/..)
 scripts_url="${image_dir}/.s2i/bin"
 cid_file=$($MKTEMP_EXEC -u)
@@ -51,6 +51,7 @@ container_port() {
 }
 
 run_s2i_build() {
+echo "s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp"
   s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
 }
 
diff --git a/s2i/kaas-quarkus-centos/test/test-app/index.html b/s2i/modules/kaas-quarkus-centos/test/test-app/index.html
similarity index 100%
rename from s2i/kaas-quarkus-centos/test/test-app/index.html
rename to s2i/modules/kaas-quarkus-centos/test/test-app/index.html
diff --git a/s2i/modules/kaas-springboot-centos-s2i/README.md b/s2i/modules/kaas-springboot-centos-s2i/README.md
new file mode 100644
index 00000000000..6cc3ba2fb86
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos-s2i/README.md
@@ -0,0 +1,9 @@
+# S2I image to build builder image based on Centos 7
+
+This S2I is considered image builder that is equipped with build tools
+
+- OpenJDK 1.8
+- Apache Maven
+
+So it is equipped with all required tools to build a runnable fat jar of
+KaaS (Knowledge as a Service) type of projects.
diff --git a/s2i/modules/kaas-springboot-centos-s2i/configure b/s2i/modules/kaas-springboot-centos-s2i/configure
new file mode 100644
index 00000000000..70a714afd57
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos-s2i/configure
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+
+cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
+
+chmod 755 /usr/local/s2i/*
+chown -R 1001:1001 ${SUBMARINE_HOME}
+chmod -R ug+rwX ${SUBMARINE_HOME}
\ No newline at end of file
diff --git a/s2i/modules/kaas-springboot-centos-s2i/module.yaml b/s2i/modules/kaas-springboot-centos-s2i/module.yaml
new file mode 100644
index 00000000000..3479d8273ac
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos-s2i/module.yaml
@@ -0,0 +1,4 @@
+schema_version: 1
+name: kaas-springboot-centos-s2i
+execute:
+  - script: configure
\ No newline at end of file
diff --git a/s2i/kaas-quarkus-centos/test/run b/s2i/modules/kaas-springboot-centos-s2i/test/run
similarity index 98%
rename from s2i/kaas-quarkus-centos/test/run
rename to s2i/modules/kaas-springboot-centos-s2i/test/run
index e74c9b198e6..061e6bb55ab 100755
--- a/s2i/kaas-quarkus-centos/test/run
+++ b/s2i/modules/kaas-springboot-centos-s2i/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME-kaas-quarkus-centos-candidate}
+IMAGE_NAME=${IMAGE_NAME:-kaas-springboot-centos-s2i-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
diff --git a/s2i/kaas-springboot-centos-s2i/test/test-app/index.html b/s2i/modules/kaas-springboot-centos-s2i/test/test-app/index.html
similarity index 100%
rename from s2i/kaas-springboot-centos-s2i/test/test-app/index.html
rename to s2i/modules/kaas-springboot-centos-s2i/test/test-app/index.html
diff --git a/s2i/modules/kaas-springboot-centos/README.md b/s2i/modules/kaas-springboot-centos/README.md
new file mode 100644
index 00000000000..7dee4f65ff6
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos/README.md
@@ -0,0 +1,8 @@
+# S2I image to build runtime image based on Centos 7
+
+This S2I is considered a runtime image builder as it relies on another image
+(built with `kaas-springboot-centos-s2i`) that actually produced the binaries to be executed
+(the fat jar based on SpringBoot 2.1.x runtime). So this one will only get the binaries
+and place into the container.
+
+On top of the OS it has JRE installed (OpenJDK 1.8) to be able to execute fat jar.
diff --git a/s2i/modules/kaas-springboot-centos/configure b/s2i/modules/kaas-springboot-centos/configure
new file mode 100644
index 00000000000..70a714afd57
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos/configure
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+
+cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
+
+chmod 755 /usr/local/s2i/*
+chown -R 1001:1001 ${SUBMARINE_HOME}
+chmod -R ug+rwX ${SUBMARINE_HOME}
\ No newline at end of file
diff --git a/s2i/modules/kaas-springboot-centos/module.yaml b/s2i/modules/kaas-springboot-centos/module.yaml
new file mode 100644
index 00000000000..68c1beb0e0d
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos/module.yaml
@@ -0,0 +1,4 @@
+schema_version: 1
+name: kaas-springboot-centos
+execute:
+  - script: configure
\ No newline at end of file
diff --git a/s2i/kaas-springboot-centos/test/run b/s2i/modules/kaas-springboot-centos/test/run
similarity index 100%
rename from s2i/kaas-springboot-centos/test/run
rename to s2i/modules/kaas-springboot-centos/test/run
diff --git a/s2i/kaas-springboot-centos/test/test-app/index.html b/s2i/modules/kaas-springboot-centos/test/test-app/index.html
similarity index 100%
rename from s2i/kaas-springboot-centos/test/test-app/index.html
rename to s2i/modules/kaas-springboot-centos/test/test-app/index.html
diff --git a/s2i/modules/maven/3.6.0/added/configure-maven.sh b/s2i/modules/maven/3.6.0/added/configure-maven.sh
new file mode 100644
index 00000000000..30819af2c84
--- /dev/null
+++ b/s2i/modules/maven/3.6.0/added/configure-maven.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+function prepareEnv() {
+    unset HTTPS_PROXY
+    unset HTTP_PROXY_HOST
+    unset HTTP_PROXY_PORT
+    unset HTTP_PROXY_PASSWORD
+    unset HTTP_PROXY_USERNAME
+    unset HTTP_PROXY_NONPROXYHOSTS
+    unset MAVEN_MIRROR_URL
+}
+
+function configure() {
+    configure_proxy
+    configure_mirrors
+}
+
+# insert settings for HTTP proxy into maven settings.xml if supplied
+function configure_proxy() {
+
+  # prefer old http_proxy_ format for username/password, but
+  # also allow proxy_ format.
+  HTTP_PROXY_USERNAME=${HTTP_PROXY_USERNAME:-$PROXY_USERNAME}
+  HTTP_PROXY_PASSWORD=${HTTP_PROXY_PASSWORD:-$PROXY_PASSWORD}
+
+  proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}}
+  # if http_proxy_host/port is set, prefer that (oldest mechanism)
+  # before looking at HTTP(S)_PROXY
+  proxyhost=${HTTP_PROXY_HOST:-$(echo $proxy | cut -d : -f 1,2)}
+  proxyport=${HTTP_PROXY_PORT:-$(echo $proxy | cut -d : -f 3)}
+
+   if [ -n "$proxyhost" ]; then
+    if [[ `echo $proxyhost | grep -i https://` ]]; then
+      proxyport=${proxyport:-443}
+      proxyprotocol="https"
+    else
+      proxyport=${proxyport:-80}
+      proxyprotocol="http"
+    fi
+
+     xml="<proxy>\
+         <id>genproxy</id>\
+         <active>true</active>\
+         <protocol>$proxyprotocol</protocol>\
+         <host>$proxyhost</host>\
+         <port>$proxyport</port>"
+    if [ -n "$HTTP_PROXY_USERNAME" -a -n "$HTTP_PROXY_PASSWORD" ]; then
+      xml="$xml\
+         <username>$HTTP_PROXY_USERNAME</username>\
+         <password>$HTTP_PROXY_PASSWORD</password>"
+    fi
+    if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then
+      xml="$xml\
+         <nonProxyHosts>$HTTP_PROXY_NONPROXYHOSTS</nonProxyHosts>"
+    fi
+  xml="$xml\
+       </proxy>"
+    sed -i "s|<!-- ### configured http proxy ### -->|$xml|" $HOME/.m2/settings.xml
+  fi
+}
+
+ # insert settings for mirrors/repository managers into settings.xml if supplied
+function configure_mirrors() {
+  if [ -n "$MAVEN_MIRROR_URL" ]; then
+    xml="    <mirror>\
+      <id>mirror.default</id>\
+      <url>$MAVEN_MIRROR_URL</url>\
+      <mirrorOf>external:*</mirrorOf>\
+    </mirror>"
+    sed -i "s|<!-- ### configured mirrors ### -->|$xml|" $HOME/.m2/settings.xml
+  fi
+}
\ No newline at end of file
diff --git a/s2i/modules/maven/3.6.0/added/configure.sh b/s2i/modules/maven/3.6.0/added/configure.sh
new file mode 100644
index 00000000000..8be292b0b81
--- /dev/null
+++ b/s2i/modules/maven/3.6.0/added/configure.sh
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# This script executes a list of modules defined by CONFIGURE_SCRIPTS.
+#
+# Configuration occurs over three basic phases: preConfigure, configure and
+# postConfigure.
+#
+# The configure phase is special in that it iterates over a series of
+# environments.  In addition to the execution environment, users may specify
+# additional configuration details through environment scripts specified through
+# the ENV_FILES variable.  The processing of env files is similar to the process
+# for the execution environment, with the addition of a prepareEnv method, which
+# is used to clean the environment before processing the env contributed by
+# a file.  This is to help ensure that duplicate configurations are not created
+# when processing env files.
+#
+# The following details the API which the modules may implement.  If a
+# particular function is not implemented by a module, it is treated as a no-op.
+#
+# preConfigure:     invoked before any configuration takes place.  Use this to
+#                   manipulate the environment prior to configuration.  For
+#                   example, the backward-compatiblity.sh module initializes
+#                   environment variables from older variable names, if present.
+#
+# configure:        invoked to configure based on the execution environment.
+#
+# postConfigure:    invoked after all configuration has been completed.
+#
+# prepareEnv:       invoked prior to processing env files.  Modules should
+#                   use this to prepare the environment before processing
+#                   configuration from a file, e.g. by unset variables
+#                   defined in the execution environment to prevent duplicate
+#                   configuration entries.  This method is invoked once, as
+#                   each env file is processed in a subshell, thus preventing
+#                   contamination of the environment from file to file.
+#
+# preConfigureEnv:  similar to preConfigure, except this is invoked after an env
+#                   file has been sourced, but before configureEnv.
+#
+# configureEnv:     similar to configure.
+#
+# postConfigureEnv: simliar to postConfigure, except that it is invoked for each
+#                   env file.
+#
+# The reason the configuration API is duplicated for an Env, is that some
+# modules may not support env files, or may require configuration of "singleton"
+# type entries, which should only be processed once.
+#
+
+# clear functions from any previous module
+function prepareModule() {
+  unset -f preConfigure
+  unset -f configure
+  unset -f postConfigure
+
+  unset -f prepareEnv
+  unset -f preConfigureEnv
+  unset -f configureEnv
+  unset -f postConfigureEnv
+}
+
+# Execute a particular function from a module
+# $1 - module file
+# $2 - function name
+function executeModule() {
+  source $1;
+  if [ -n "$(type -t $2)" ]; then
+    eval $2
+  fi
+}
+
+# Run through the list of scripts, executing the specified function for each.
+# $1 - function name
+function executeModules() {
+  for module in ${CONFIGURE_SCRIPTS[@]}; do
+    prepareModule
+    executeModule $module $1
+  done
+}
+
+# Processes the files provided by ENV_FILES.  Invokes the *Env functions for
+# each module.  Env processing is done in subshells.  The outer subshell
+# provides a sanitized environment, that will be used by each inner subshell.
+# This insulates the execution environment from any changes made during env
+# file processing, and keeps the base environment the same from file to file
+# (i.e. we don't have to run prepareEnv for each file).
+function processEnvFiles() {
+  if [ -n "$ENV_FILES" ]; then
+    (
+      executeModules prepareEnv
+      for prop_file_arg in $(echo $ENV_FILES | sed "s/,/ /g"); do
+        for prop_file in $(find $prop_file_arg -maxdepth 0 2>/dev/null); do
+          (
+            if [ -f $prop_file ]; then
+              source $prop_file
+              executeModules preConfigureEnv
+              executeModules configureEnv
+              executeModules postConfigureEnv
+            else
+              echo "Warning - Could not process environment for $prop_file.  File does not exist."
+            fi
+          )
+        done
+      done
+    )
+  fi
+}
+
+executeModules preConfigure
+executeModules configure
+processEnvFiles
+executeModules postConfigure
\ No newline at end of file
diff --git a/s2i/modules/maven/3.6.0/configure b/s2i/modules/maven/3.6.0/configure
new file mode 100644
index 00000000000..040cfa97e38
--- /dev/null
+++ b/s2i/modules/maven/3.6.0/configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+
+tar xzf ${SOURCES_DIR}/apache-maven-${MAVEN_VERSION}-bin.tar.gz -C /usr/share
+mv /usr/share/apache-maven-${MAVEN_VERSION} /usr/share/maven
+
+mkdir ${SUBMARINE_HOME}/.m2
+cp -v ${SCRIPT_DIR}/maven/* ${SUBMARINE_HOME}/.m2
+cp -v ${SCRIPT_DIR}/added/* ${SUBMARINE_HOME}/.m2
\ No newline at end of file
diff --git a/s2i/modules/maven/3.6.0/maven/settings.xml b/s2i/modules/maven/3.6.0/maven/settings.xml
new file mode 100644
index 00000000000..77c08913f48
--- /dev/null
+++ b/s2i/modules/maven/3.6.0/maven/settings.xml
@@ -0,0 +1,52 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+    <mirrors>
+        <!-- ### configured mirrors ### -->
+    </mirrors>
+
+    <proxies>
+        <!-- ### configured http proxy ### -->
+    </proxies>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <repositories>
+                <repository>
+                    <id>jboss-public-repository-group</id>
+                    <name>JBoss Public Repository Group</name>
+                    <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                        <updatePolicy>always</updatePolicy>
+                    </snapshots>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>jboss-public-repository-group</id>
+                    <name>JBoss Public Repository Group</name>
+                    <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                        <updatePolicy>always</updatePolicy>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+    <activeProfiles>
+        <activeProfile>default</activeProfile>
+    </activeProfiles>
+</settings>
diff --git a/s2i/modules/maven/3.6.0/module.yaml b/s2i/modules/maven/3.6.0/module.yaml
new file mode 100644
index 00000000000..2d60839bc97
--- /dev/null
+++ b/s2i/modules/maven/3.6.0/module.yaml
@@ -0,0 +1,37 @@
+schema_version: 1
+name: maven
+version: "3.6.0"
+
+envs:
+  - name: "MAVEN_VERSION"
+    value: "3.6.0"
+  - name: " MAVEN_HOME"
+    value: "/usr/share/maven"
+  - name: "HTTP_PROXY"
+    description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
+    example: "http://127.0.0.1:8080"
+  - name: "HTTP_PROXY_HOST"
+    description: "Proxy Host, don't need to be set if HTTP_PROXY is used."
+    example: "127.0.0.1"
+  - name: "HTTP_PROXY_PORT"
+    description: "Proxy Port, don't need to be set if HTTP_PROXY is used."
+    example: "8181"
+  - name: "HTTP_PROXY_PASSWORD"
+    description: "Proxy Password"
+  - name: "HTTP_PROXY_USERNAME"
+    description: "Proxy Username"
+  - name: "HTTP_PROXY_NONPROXYHOSTS"
+    description: "Non proxy hosts, list of hosts that will ot be proxied."
+    example: "localhost"
+  - name: "MAVEN_MIRROR_URL"
+    description: "The base URL of a mirror used for retrieving artifacts."
+    example: "http://10.0.0.1:8080/repository/internal/"
+
+# unfortunately by now the version needs to be hardcoded.
+artifacts:
+  - name: apache-maven-3.6.0-bin.tar.gz
+    url: https://archive.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz
+    md5: 268081b8394502b6bf8a75ca9c5a2c4f
+
+execute:
+  - script: configure
\ No newline at end of file
diff --git a/s2i/submarine-imagestream.yaml b/s2i/submarine-imagestream.yaml
new file mode 100644
index 00000000000..b7e8531df70
--- /dev/null
+++ b/s2i/submarine-imagestream.yaml
@@ -0,0 +1,92 @@
+kind: ImageStreamList
+apiVersion: v1
+metadata:
+  name: submarine-image-streams
+  annotations:
+    description: ImageStream definitions for Submarine images
+    openshift.io/provider-display-name: Kie Group.
+items:
+- kind: ImageStream
+  apiVersion: v1
+  metadata:
+    name: kaas-quarkus-centos
+    annotations:
+      openshift.io/display-name: Runtime image for KaaS based on Quarkus native image
+      openshift.io/provider-display-name: Kie Group.
+  spec:
+    tags:
+    - name: '1.0'
+      annotations:
+        description: Runtime image for KaaS based on Quarkus native image
+        iconClass: icon-jbpm
+        tags: builder,runtime,kaas,quarkus
+        supports: quarkus
+        version: '1.0'
+      referencePolicy:
+        type: Local
+      from:
+        kind: DockerImage
+        name: quay.io/kiegroup/kaas-quarkus-centos:1.0
+- kind: ImageStream
+  apiVersion: v1
+  metadata:
+    name: kaas-quarkus-centos-s2i
+    annotations:
+      openshift.io/display-name: Platform for building KaaS based on Quarkus
+      openshift.io/provider-display-name: Kie Group.
+  spec:
+    tags:
+    - name: '1.0'
+      annotations:
+        description: Platform for building KaaS based on Quarkus
+        iconClass: icon-jbpm
+        tags: builder,kaas,quarkus
+        supports: quarkus
+        version: '1.0'
+      referencePolicy:
+        type: Local
+      from:
+        kind: DockerImage
+        name: quay.io/kiegroup/kaas-quarkus-centos-s2i:1.0
+- kind: ImageStream
+  apiVersion: v1
+  metadata:
+    name: kaas-springboot-centos
+    annotations:
+      openshift.io/display-name: Runtime image for KaaS based on SpringBoot native image
+      openshift.io/provider-display-name: Kie Group.
+  spec:
+    tags:
+    - name: '1.0'
+      annotations:
+        description: Platform for building KaaS based on Quarkus
+        iconClass: icon-jbpm
+        tags: builder,runtime,kaas,springboot
+        supports: springboot
+        version: '1.0'
+      referencePolicy:
+        type: Local
+      from:
+        kind: DockerImage
+        name: quay.io/kiegroup/kaas-springboot-centos:1.0
+- kind: ImageStream
+  apiVersion: v1
+  metadata:
+    name: kaas-springboot-centos-s2i
+    annotations:
+      openshift.io/display-name: Platform for building KaaS based on SpringBoot
+      openshift.io/provider-display-name: Kie Group.
+  spec:
+    tags:
+    - name: '1.0'
+      annotations:
+        description: Platform for building KaaS based on Quarkus
+        iconClass: icon-jbpm
+        tags: builder,kaas,springboot
+        supports: springboot
+        version: '1.0'
+      referencePolicy:
+        type: Local
+      from:
+        kind: DockerImage
+        name: quay.io/kiegroup/kaas-springboot-centos-s2i:1.0
\ No newline at end of file

From 70572ece41a9a83b28e20bae698f972465a4b5ab Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 30 Apr 2019 02:51:03 -0300
Subject: [PATCH 015/709] fix permission on springboot runtime image (#11)

---
 s2i/modules/kaas-springboot-centos/configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s2i/modules/kaas-springboot-centos/configure b/s2i/modules/kaas-springboot-centos/configure
index 70a714afd57..6e9fbaf9116 100644
--- a/s2i/modules/kaas-springboot-centos/configure
+++ b/s2i/modules/kaas-springboot-centos/configure
@@ -6,5 +6,5 @@ SCRIPT_DIR=$(dirname $0)
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:1001 ${SUBMARINE_HOME}
+chown -R 1001:0 ${SUBMARINE_HOME}
 chmod -R ug+rwX ${SUBMARINE_HOME}
\ No newline at end of file

From 1c93b7e78525f8c4b079b84ecad12b79cfac8cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Petrovick=C3=BD?= <lpetrovi@redhat.com>
Date: Wed, 15 May 2019 11:41:17 +0200
Subject: [PATCH 016/709] [DROOLS-3968] Move off JUnit 4 and onto JUnit Vintage
 (#12)

This is a fully backwards compatible change, no tests are changing
source code.
---
 .../submarine-cloud-workitems/pom.xml                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/submarine-cloud-services/submarine-cloud-workitems/pom.xml b/submarine-cloud-services/submarine-cloud-workitems/pom.xml
index 00a92d7629f..6f9178b6812 100644
--- a/submarine-cloud-services/submarine-cloud-workitems/pom.xml
+++ b/submarine-cloud-services/submarine-cloud-workitems/pom.xml
@@ -27,10 +27,10 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>
     </dependency>
-    
-     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -44,4 +44,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

From d992a8d8e942a9e3d868ae194a95e0f113ea64eb Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Thu, 16 May 2019 17:35:19 +0200
Subject: [PATCH 017/709] Upgrade of GraalVM to rc16 (#13)

---
 s2i/kaas-quarkus-centos-s2i-overrides.yaml |  2 +-
 s2i/modules/graalvm/1.0.0-rc16/configure   |  7 +++++++
 s2i/modules/graalvm/1.0.0-rc16/module.yaml | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 s2i/modules/graalvm/1.0.0-rc16/configure
 create mode 100644 s2i/modules/graalvm/1.0.0-rc16/module.yaml

diff --git a/s2i/kaas-quarkus-centos-s2i-overrides.yaml b/s2i/kaas-quarkus-centos-s2i-overrides.yaml
index d0367f90989..75a2f9e4537 100644
--- a/s2i/kaas-quarkus-centos-s2i-overrides.yaml
+++ b/s2i/kaas-quarkus-centos-s2i-overrides.yaml
@@ -15,7 +15,7 @@ modules:
   install:
   - name: add-submarine-user
   - name: graalvm
-    version: "1.0.0-rc15"
+    version: "1.0.0-rc16"
   - name: maven
     version: "3.6.0"
   - name: kaas-quarkus-centos-s2i
diff --git a/s2i/modules/graalvm/1.0.0-rc16/configure b/s2i/modules/graalvm/1.0.0-rc16/configure
new file mode 100644
index 00000000000..a41b91383db
--- /dev/null
+++ b/s2i/modules/graalvm/1.0.0-rc16/configure
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+
+tar xzf ${SOURCES_DIR}/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
\ No newline at end of file
diff --git a/s2i/modules/graalvm/1.0.0-rc16/module.yaml b/s2i/modules/graalvm/1.0.0-rc16/module.yaml
new file mode 100644
index 00000000000..2594043c5c0
--- /dev/null
+++ b/s2i/modules/graalvm/1.0.0-rc16/module.yaml
@@ -0,0 +1,20 @@
+schema_version: 1
+name: graalvm
+version: "1.0.0-rc16"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/usr/share/graalvm"
+  #version without prefix ce
+  - name: "GRAALVM_VERSION"
+    value: "1.0.0-rc16"
+
+artifacts:
+- name: graalvm-ce-1.0.0-rc16-linux-amd64.tar.gz
+  url: https://github.com/oracle/graal/releases/download/vm-1.0.0-rc16/graalvm-ce-1.0.0-rc16-linux-amd64.tar.gz
+  md5: 42376d71746ef62525d51eeca84f508c
+
+execute:
+- script: configure
\ No newline at end of file

From 836841981b61b96ef9c5eede26ab9cd1a2cb3243 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Sat, 25 May 2019 03:13:13 -0300
Subject: [PATCH 018/709] add springboot s2i files (#15)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 .../s2i/bin/assemble                          | 73 +++++++++++++++++++
 .../kaas-springboot-centos-s2i/s2i/bin/run    |  9 +++
 .../s2i/bin/save-artifacts                    |  9 +++
 .../kaas-springboot-centos-s2i/s2i/bin/usage  | 20 +++++
 .../kaas-springboot-centos/s2i/bin/assemble   | 20 +++++
 .../s2i/bin/assemble-runtime                  | 22 ++++++
 .../kaas-springboot-centos/s2i/bin/run        |  9 +++
 .../kaas-springboot-centos/s2i/bin/usage      | 12 +++
 8 files changed, 174 insertions(+)
 create mode 100755 s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble
 create mode 100755 s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run
 create mode 100644 s2i/modules/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
 create mode 100755 s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage
 create mode 100755 s2i/modules/kaas-springboot-centos/s2i/bin/assemble
 create mode 100755 s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime
 create mode 100755 s2i/modules/kaas-springboot-centos/s2i/bin/run
 create mode 100755 s2i/modules/kaas-springboot-centos/s2i/bin/usage

diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble
new file mode 100755
index 00000000000..872998cfbb3
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble
@@ -0,0 +1,73 @@
+#!/bin/bash -e
+#
+# S2I assemble script for the 'kaas-springboot-centos-s2i' image.
+# The 'assemble' script builds your application source so that it is ready to run.
+#
+# For more information refer to the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+#############################################
+# Configure maven - for a complete list of
+# supported values, please refer the module.yaml
+# file.
+CONFIGURE_SCRIPTS=(
+  ${SUBMARINE_HOME}/.m2/configure-maven.sh
+)
+source ${SUBMARINE_HOME}/.m2/configure.sh
+#############################################
+
+# If the 'kaas-springboot-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
+if [[ "$1" == "-h" ]]; then
+	exec /usr/libexec/s2i/usage
+fi
+
+if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
+		echo "---> Restore build artifacts"
+    mv /tmp/artifacts/.m2 $HOME
+fi
+
+echo "---> Installing application source..."
+cd /tmp/src/
+
+if [ -f "pom.xml" ]; then
+	echo "---> Building application from source..."
+	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/.m2/settings.xml \
+    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
+else
+	echo "---> Generating project structure..."
+
+	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-springboot-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $SUBMARINE_HOME/.m2/settings.xml
+
+	# copy resources into the generated project
+	for item in *
+	do
+		if [ -d $item ] && [ "$item" == "project" ]; then
+			echo "--> Skipping generated project ..."
+		else
+			echo "--> Coping resource $item"
+			cp -R $item project/src/main/resources
+		fi
+	done
+
+	# move all project content into the current directory
+	mv project/* .
+
+	echo "---> Building application from source..."
+	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/.m2/settings.xml \
+    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
+fi
+
+echo "---> Installing application binaries"
+mkdir $SUBMARINE_HOME/bin
+cp -v target/*.jar $SUBMARINE_HOME/bin
+
+echo "---> Copy image metadata file..."
+if [ -e /tmp/src/target/image_metadata.json ]; then
+    mkdir /tmp/.s2i
+    cp -v /tmp/src/target/image_metadata.json /tmp/.s2i
+    cp -v /tmp/src/target/image_metadata.json $SUBMARINE_HOME/bin
+else
+    echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
+fi
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run
new file mode 100755
index 00000000000..eb4c6f0dec1
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+#
+# S2I run script for the 'kaas-springboot-centos-s2i' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+exec java -jar $SUBMARINE_HOME/bin/*.jar
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/save-artifacts b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
new file mode 100644
index 00000000000..d06c9a151cf
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+pushd ${HOME} > /dev/null
+if [ -d .m2 ]; then
+    tar cf - .m2
+    echo "--> Maven artifacts saved"
+    ls -l
+fi
+popd > /dev/null
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage
new file mode 100755
index 00000000000..8b01045a39f
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+cat <<EOF
+This is the kaas-springboot-centos S2I image:
+
+Build executable jar based on project source either complete maven project or just set of business assets 
+such as processes, rules, decisions.
+
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+This image is intended to build application binaries only that are later on transfered to runtime image.
+
+s2i build -c <source code path/URL> kaas-quarkus-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/submarine/bin
+
+Sample invocation:
+
+s2i build -c /Development/project/ kaas-springboot-centos-s2i application --runtime-image kaas-springboot-centos --runtime-artifact /home/submarine/bin
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/assemble b/s2i/modules/kaas-springboot-centos/s2i/bin/assemble
new file mode 100755
index 00000000000..4f2862a73ad
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos/s2i/bin/assemble
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+# this script is used by OpenShift with chained builds
+# to transfer data from builder image into the runtime image
+
+cp -R /tmp/src/bin/ $SUBMARINE_HOME
+
+if [ -d "$SUBMARINE_HOME/bin" ]; then
+  echo "---> Application binaries found and ready to use"
+  
+  echo "---> Adding custom labels..."
+  if [ -e "${SUBMARINE_HOME}/bin/image_metadata.json" ]; then
+    mkdir /tmp/.s2i
+    mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+  else
+    echo "-----> Failed to copy metada file, $SUBMARINE_HOME/bin/image_metadata.json does not exist"
+  fi
+else
+  echo "---> Application binaries NOT found, failing build..."
+  exit 1
+fi
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime b/s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime
new file mode 100755
index 00000000000..4601a8514c5
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+#
+# S2I assemble-runtime script for the 'kaas-springboot-centos' image.
+# The assemble-runtime script executes preparation for running the container on runtime image.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+if [ -d "$SUBMARINE_HOME/bin" ]; then
+  echo "---> Application binaries found and ready to use"
+  
+  echo "---> Adding custom labels..."
+  if [ -e "${SUBMARINE_HOME}/bin/image_metadata.json" ]; then
+    mkdir /tmp/.s2i
+    mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+  else
+    echo "-----> Failed to copy metada file, $SUBMARINE_HOME/bin/image_metadata.json does not exist"
+  fi
+else
+  echo "---> Application binaries NOT found, failing build..."
+  exit 1
+fi
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/run b/s2i/modules/kaas-springboot-centos/s2i/bin/run
new file mode 100755
index 00000000000..c7dd5841d33
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos/s2i/bin/run
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+#
+# S2I run script for the 'kaas-springboot-centos' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+exec java -jar $SUBMARINE_HOME/bin/*.jar
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/usage b/s2i/modules/kaas-springboot-centos/s2i/bin/usage
new file mode 100755
index 00000000000..99d159ba98f
--- /dev/null
+++ b/s2i/modules/kaas-springboot-centos/s2i/bin/usage
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+cat <<EOF
+This is the kaas-quarkus-centos S2I image:
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+Sample invocation:
+
+s2i build <source code path/URL> kaas-quarkus-centos <application image>
+
+You can then run the resulting image via:
+docker run <application image>
+EOF

From 9a80d8a0ddb441800cea4fe1de6838a817aff569 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Sat, 25 May 2019 21:04:22 +0200
Subject: [PATCH 019/709] move from submarine to kogito (#14)

---
 .../.gitignore                                |  0
 .../kogito-cloud-workitems}/.gitignore        |  0
 .../kogito-cloud-workitems}/pom.xml           | 17 ++--
 .../DiscoveredServiceWorkItemHandler.java     |  0
 .../cloud/workitems/HttpMethods.java          |  0
 .../cloud/workitems/ServiceInfo.java          |  0
 .../DiscoveredServiceWorkItemHandlerTest.java |  0
 kogito-cloud-services/pom.xml                 | 35 ++++++++
 pom.xml                                       | 20 ++---
 s2i/Makefile                                  | 90 +++++++++----------
 s2i/README.md                                 | 58 ++++++------
 s2i/image.yaml                                |  4 +-
 s2i/kaas-quarkus-centos-overrides.yaml        | 20 -----
 s2i/kaas-quarkus-centos-s2i-overrides.yaml    | 27 ------
 s2i/kaas-springboot-centos-overrides.yaml     | 22 -----
 s2i/kaas-springboot-centos-s2i-overrides.yaml | 21 -----
 ...agestream.yaml => kogito-imagestream.yaml} | 44 ++++-----
 s2i/kogito-quarkus-centos-overrides.yaml      | 20 +++++
 s2i/kogito-quarkus-centos-s2i-overrides.yaml  | 27 ++++++
 s2i/kogito-springboot-centos-overrides.yaml   | 22 +++++
 ...ogito-springboot-centos-s2i-overrides.yaml | 21 +++++
 s2i/modules/add-kogito-user/add-user          |  3 +
 s2i/modules/add-kogito-user/module.yaml       |  8 ++
 s2i/modules/add-submarine-user/add-user       |  3 -
 s2i/modules/add-submarine-user/module.yaml    |  8 --
 .../kaas-quarkus-centos-s2i/module.yaml       |  4 -
 .../kaas-quarkus-centos-s2i/s2i/bin/assemble  | 80 -----------------
 .../kaas-quarkus-centos-s2i/s2i/bin/run       |  9 --
 .../s2i/bin/save-artifacts                    |  9 --
 .../kaas-quarkus-centos-s2i/s2i/bin/usage     | 21 -----
 s2i/modules/kaas-quarkus-centos/module.yaml   |  4 -
 .../kaas-quarkus-centos/s2i/bin/assemble      | 20 -----
 .../s2i/bin/assemble-runtime                  | 23 -----
 s2i/modules/kaas-quarkus-centos/s2i/bin/run   |  9 --
 s2i/modules/kaas-quarkus-centos/s2i/bin/usage | 12 ---
 .../kaas-springboot-centos-s2i/module.yaml    |  4 -
 .../s2i/bin/assemble                          | 16 ++--
 .../kaas-springboot-centos-s2i/s2i/bin/run    |  4 +-
 .../kaas-springboot-centos-s2i/s2i/bin/usage  |  6 +-
 .../kaas-springboot-centos/module.yaml        |  4 -
 .../README.md                                 |  0
 .../configure                                 |  4 +-
 .../kogito-quarkus-centos-s2i/module.yaml     |  4 +
 .../test/run                                  |  3 +-
 .../test/test-app/index.html                  |  0
 .../README.md                                 |  6 +-
 .../configure                                 |  4 +-
 s2i/modules/kogito-quarkus-centos/module.yaml |  4 +
 .../test/run                                  |  3 +-
 .../test/test-app/index.html                  |  0
 .../README.md                                 |  0
 .../configure                                 |  4 +-
 .../kogito-springboot-centos-s2i/module.yaml  |  4 +
 .../test/run                                  |  3 +-
 .../test/test-app/index.html                  |  0
 .../README.md                                 |  2 +-
 .../configure                                 |  4 +-
 .../kogito-springboot-centos/module.yaml      |  4 +
 .../test/run                                  |  3 +-
 .../test/test-app/index.html                  |  0
 submarine-cloud-services/pom.xml              | 15 ----
 61 files changed, 293 insertions(+), 469 deletions(-)
 rename {submarine-cloud-services => kogito-cloud-services}/.gitignore (100%)
 rename {submarine-cloud-services/submarine-cloud-workitems => kogito-cloud-services/kogito-cloud-workitems}/.gitignore (100%)
 rename {submarine-cloud-services/submarine-cloud-workitems => kogito-cloud-services/kogito-cloud-workitems}/pom.xml (71%)
 rename {submarine-cloud-services/submarine-cloud-workitems => kogito-cloud-services/kogito-cloud-workitems}/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java (100%)
 rename {submarine-cloud-services/submarine-cloud-workitems => kogito-cloud-services/kogito-cloud-workitems}/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java (100%)
 rename {submarine-cloud-services/submarine-cloud-workitems => kogito-cloud-services/kogito-cloud-workitems}/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java (100%)
 rename {submarine-cloud-services/submarine-cloud-workitems => kogito-cloud-services/kogito-cloud-workitems}/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java (100%)
 create mode 100644 kogito-cloud-services/pom.xml
 delete mode 100644 s2i/kaas-quarkus-centos-overrides.yaml
 delete mode 100644 s2i/kaas-quarkus-centos-s2i-overrides.yaml
 delete mode 100644 s2i/kaas-springboot-centos-overrides.yaml
 delete mode 100644 s2i/kaas-springboot-centos-s2i-overrides.yaml
 rename s2i/{submarine-imagestream.yaml => kogito-imagestream.yaml} (53%)
 create mode 100644 s2i/kogito-quarkus-centos-overrides.yaml
 create mode 100644 s2i/kogito-quarkus-centos-s2i-overrides.yaml
 create mode 100644 s2i/kogito-springboot-centos-overrides.yaml
 create mode 100644 s2i/kogito-springboot-centos-s2i-overrides.yaml
 create mode 100644 s2i/modules/add-kogito-user/add-user
 create mode 100644 s2i/modules/add-kogito-user/module.yaml
 delete mode 100644 s2i/modules/add-submarine-user/add-user
 delete mode 100644 s2i/modules/add-submarine-user/module.yaml
 delete mode 100644 s2i/modules/kaas-quarkus-centos-s2i/module.yaml
 delete mode 100755 s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/assemble
 delete mode 100755 s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/run
 delete mode 100644 s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts
 delete mode 100755 s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/usage
 delete mode 100644 s2i/modules/kaas-quarkus-centos/module.yaml
 delete mode 100755 s2i/modules/kaas-quarkus-centos/s2i/bin/assemble
 delete mode 100755 s2i/modules/kaas-quarkus-centos/s2i/bin/assemble-runtime
 delete mode 100755 s2i/modules/kaas-quarkus-centos/s2i/bin/run
 delete mode 100755 s2i/modules/kaas-quarkus-centos/s2i/bin/usage
 delete mode 100644 s2i/modules/kaas-springboot-centos-s2i/module.yaml
 delete mode 100644 s2i/modules/kaas-springboot-centos/module.yaml
 rename s2i/modules/{kaas-quarkus-centos-s2i => kogito-quarkus-centos-s2i}/README.md (100%)
 rename s2i/modules/{kaas-springboot-centos => kogito-quarkus-centos-s2i}/configure (63%)
 create mode 100644 s2i/modules/kogito-quarkus-centos-s2i/module.yaml
 rename s2i/modules/{kaas-quarkus-centos-s2i => kogito-quarkus-centos-s2i}/test/run (98%)
 rename s2i/modules/{kaas-quarkus-centos-s2i => kogito-quarkus-centos-s2i}/test/test-app/index.html (100%)
 rename s2i/modules/{kaas-quarkus-centos => kogito-quarkus-centos}/README.md (77%)
 rename s2i/modules/{kaas-quarkus-centos => kogito-quarkus-centos}/configure (61%)
 create mode 100644 s2i/modules/kogito-quarkus-centos/module.yaml
 rename s2i/modules/{kaas-quarkus-centos => kogito-quarkus-centos}/test/run (98%)
 rename s2i/modules/{kaas-quarkus-centos => kogito-quarkus-centos}/test/test-app/index.html (100%)
 rename s2i/modules/{kaas-springboot-centos-s2i => kogito-springboot-centos-s2i}/README.md (100%)
 rename s2i/modules/{kaas-quarkus-centos-s2i => kogito-springboot-centos-s2i}/configure (62%)
 create mode 100644 s2i/modules/kogito-springboot-centos-s2i/module.yaml
 rename s2i/modules/{kaas-springboot-centos-s2i => kogito-springboot-centos-s2i}/test/run (98%)
 rename s2i/modules/{kaas-springboot-centos-s2i => kogito-springboot-centos-s2i}/test/test-app/index.html (100%)
 rename s2i/modules/{kaas-springboot-centos => kogito-springboot-centos}/README.md (77%)
 rename s2i/modules/{kaas-springboot-centos-s2i => kogito-springboot-centos}/configure (62%)
 create mode 100644 s2i/modules/kogito-springboot-centos/module.yaml
 rename s2i/modules/{kaas-springboot-centos => kogito-springboot-centos}/test/run (98%)
 rename s2i/modules/{kaas-springboot-centos => kogito-springboot-centos}/test/test-app/index.html (100%)
 delete mode 100644 submarine-cloud-services/pom.xml

diff --git a/submarine-cloud-services/.gitignore b/kogito-cloud-services/.gitignore
similarity index 100%
rename from submarine-cloud-services/.gitignore
rename to kogito-cloud-services/.gitignore
diff --git a/submarine-cloud-services/submarine-cloud-workitems/.gitignore b/kogito-cloud-services/kogito-cloud-workitems/.gitignore
similarity index 100%
rename from submarine-cloud-services/submarine-cloud-workitems/.gitignore
rename to kogito-cloud-services/kogito-cloud-workitems/.gitignore
diff --git a/submarine-cloud-services/submarine-cloud-workitems/pom.xml b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
similarity index 71%
rename from submarine-cloud-services/submarine-cloud-workitems/pom.xml
rename to kogito-cloud-services/kogito-cloud-workitems/pom.xml
index 6f9178b6812..18b6c73cea4 100644
--- a/submarine-cloud-services/submarine-cloud-workitems/pom.xml
+++ b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
@@ -3,25 +3,22 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.submarine</groupId>
-    <artifactId>submarine-cloud-services</artifactId>
+    <groupId>org.kie.kogito</groupId>
+    <artifactId>kogito-cloud-services</artifactId>
     <version>8.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>submarine-cloud-workitems</artifactId>
-  <name>Submarine Cloud Work Items</name>
-  <description>Submarine Cloud Work Items</description>
+  <artifactId>kogito-cloud-workitems</artifactId>
+  <name>Kogito Cloud Work Items</name>
+  <description>Kogito Cloud Work Items</description>
 
   <properties>
-    <submarine.version>8.0.0-SNAPSHOT</submarine.version>
-
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.kie</groupId>
-      <artifactId>kie-api</artifactId>
-      <version>${submarine.version}</version>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-api</artifactId>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
similarity index 100%
rename from submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
rename to kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
similarity index 100%
rename from submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
rename to kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java
similarity index 100%
rename from submarine-cloud-services/submarine-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java
rename to kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java
diff --git a/submarine-cloud-services/submarine-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
similarity index 100%
rename from submarine-cloud-services/submarine-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
rename to kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
diff --git a/kogito-cloud-services/pom.xml b/kogito-cloud-services/pom.xml
new file mode 100644
index 00000000000..7221296ddbf
--- /dev/null
+++ b/kogito-cloud-services/pom.xml
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.kie.kogito</groupId>
+    <artifactId>kogito-cloud</artifactId>
+    <version>8.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>kogito-cloud-services</artifactId>
+  <packaging>pom</packaging>
+  <name>Kogito Cloud Services</name>
+  <description>Kogito Cloud Services</description>
+
+  <modules>
+    <module>kogito-cloud-workitems</module>
+  </modules>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>jbpm-bom</artifactId>
+        <version>${version.org.kie.kogito}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>drools-bom</artifactId>
+        <version>${version.org.kie.kogito}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>
diff --git a/pom.xml b/pom.xml
index 949162d25c0..21843a63c02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,22 +5,20 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie</groupId>
-    <artifactId>submarine-bom</artifactId>
+    <groupId>org.kie.kogito</groupId>
+    <artifactId>kogito-bom-parent</artifactId>
     <version>8.0.0-SNAPSHOT</version>
-    <!-- relativePath causes out-of-date problems on hudson slaves -->
-    <!--<relativePath>../droolsjbpm-build-bootstrap/pom.xml</relativePath> -->
   </parent>
 
-  <groupId>org.submarine</groupId>
-  <artifactId>submarine-cloud</artifactId>
+  <groupId>org.kie.kogito</groupId>
+  <artifactId>kogito-cloud</artifactId>
   <packaging>pom</packaging>
 
-  <name>Submarine Cloud</name>
-  <description>Submarine Cloud</description>
+  <name>Kogito Cloud</name>
+  <description>Kogito Cloud</description>
 
   <repositories>
-    <!-- Bootstrap repository to locate the parent pom when the parent pom 
+    <!-- Bootstrap repository to locate the parent pom when the parent pom
       has not been build locally. -->
     <repository>
       <id>jboss-public-repository-group</id>
@@ -37,9 +35,9 @@
       </snapshots>
     </repository>
   </repositories>
-  
+
   <modules>
-  <module>submarine-cloud-services</module>
+    <module>kogito-cloud-services</module>
   </modules>
 
 </project>
diff --git a/s2i/Makefile b/s2i/Makefile
index dab067fca70..b8c2be2aa90 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -4,60 +4,60 @@ IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
 
 # Build all images
 .PHONY: build
-build: kaas-quarkus-centos kaas-quarkus-centos-s2i kaas-springboot-centos kaas-springboot-centos-s2i
+build: kogito-quarkus-centos kogito-quarkus-centos-s2i kogito-springboot-centos kogito-springboot-centos-s2i
 
-kaas-quarkus-centos:
-	cekit build -v --overrides-file kaas-quarkus-centos-overrides.yaml
-	docker-squash quay.io/kiegroup/kaas-quarkus-centos:${IMAGE_VERSION} --tag=quay.io/kiegroup/kaas-quarkus-centos:${IMAGE_VERSION}
-	docker tag quay.io/kiegroup/kaas-quarkus-centos:${IMAGE_VERSION} quay.io/kiegroup/kaas-quarkus-centos:latest
+kogito-quarkus-centos:
+	cekit build -v --overrides-file kogito-quarkus-centos-overrides.yaml
+	docker-squash quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION} --tag=quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION}
+	docker tag quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-centos:latest
 
-kaas-quarkus-centos-s2i:
-	cekit build -v --overrides-file kaas-quarkus-centos-s2i-overrides.yaml
-	docker-squash quay.io/kiegroup/kaas-quarkus-centos-s2i:${IMAGE_VERSION} --tag=quay.io/kiegroup/kaas-quarkus-centos-s2i:${IMAGE_VERSION}
-	docker tag quay.io/kiegroup/kaas-quarkus-centos-s2i:${IMAGE_VERSION} quay.io/kiegroup/kaas-quarkus-centos-s2i:latest
+kogito-quarkus-centos-s2i:
+	cekit build -v --overrides-file kogito-quarkus-centos-s2i-overrides.yaml
+	docker-squash quay.io/kiegroup/kogito-quarkus-centos-s2i:${IMAGE_VERSION} --tag=quay.io/kiegroup/kogito-quarkus-centos-s2i:${IMAGE_VERSION}
+	docker tag quay.io/kiegroup/kogito-quarkus-centos-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-centos-s2i:latest
 
-kaas-springboot-centos:
-	cekit build -v --overrides-file kaas-springboot-centos-overrides.yaml
-	docker-squash quay.io/kiegroup/kaas-springboot-centos:${IMAGE_VERSION} --tag=quay.io/kiegroup/kaas-springboot-centos:${IMAGE_VERSION}
-	docker tag quay.io/kiegroup/kaas-springboot-centos:${IMAGE_VERSION} quay.io/kiegroup/kaas-springboot-centos:latest
+kogito-springboot-centos:
+	cekit build -v --overrides-file kogito-springboot-centos-overrides.yaml
+	docker-squash quay.io/kiegroup/kogito-springboot-centos:${IMAGE_VERSION} --tag=quay.io/kiegroup/kogito-springboot-centos:${IMAGE_VERSION}
+	docker tag quay.io/kiegroup/kogito-springboot-centos:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-centos:latest
 
-kaas-springboot-centos-s2i:
-	cekit build -v --overrides-file kaas-springboot-centos-s2i-overrides.yaml
-	docker-squash quay.io/kiegroup/kaas-springboot-centos-s2i:${IMAGE_VERSION} --tag=quay.io/kiegroup/kaas-springboot-centos-s2i:${IMAGE_VERSION}
-	docker tag quay.io/kiegroup/kaas-springboot-centos-s2i:${IMAGE_VERSION} quay.io/kiegroup/kaas-springboot-centos-s2i:latest
+kogito-springboot-centos-s2i:
+	cekit build -v --overrides-file kogito-springboot-centos-s2i-overrides.yaml
+	docker-squash quay.io/kiegroup/kogito-springboot-centos-s2i:${IMAGE_VERSION} --tag=quay.io/kiegroup/kogito-springboot-centos-s2i:${IMAGE_VERSION}
+	docker tag quay.io/kiegroup/kogito-springboot-centos-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-centos-s2i:latest
 
 .PHONY: build-cekit
 build-cekit3:
-	cekit -v build --overrides-file kaas-quarkus-centos-overrides.yaml docker
-	cekit -v build --overrides-file kaas-quarkus-centos-s2i-overrides.yaml docker
-	cekit -v build --overrides-file kaas-springboot-centos-overrides.yaml docker
-	cekit -v build --overrides-file kaas-springboot-centos-s2i-overrides.yaml docker
+	cekit -v build --overrides-file kogito-quarkus-centos-overrides.yaml docker
+	cekit -v build --overrides-file kogito-quarkus-centos-s2i-overrides.yaml docker
+	cekit -v build --overrides-file kogito-springboot-centos-overrides.yaml docker
+	cekit -v build --overrides-file kogito-springboot-centos-s2i-overrides.yaml docker
 
 
 # Build and test all images
 .PHONY: test
 test:
-	cekit build -v --overrides-file kaas-quarkus-centos-overrides.yaml
-	modules/kaas-quarkus-centos/test/run
+	cekit build -v --overrides-file kogito-quarkus-centos-overrides.yaml
+	modules/kogito-quarkus-centos/test/run
 
-	cekit build -v --overrides-file kaas-quarkus-centos-s2i-overrides.yaml
-	modules/kaas-quarkus-centos-s2i/test/run
+	cekit build -v --overrides-file kogito-quarkus-centos-s2i-overrides.yaml
+	modules/kogito-quarkus-centos-s2i/test/run
 
-	cekit build -v --overrides-file kaas-springboot-centos-overrides.yaml
-	modules/kaas-springboot-centos/test/run
+	cekit build -v --overrides-file kogito-springboot-centos-overrides.yaml
+	modules/kogito-springboot-centos/test/run
 
-	cekit build -v --overrides-file kaas-springboot-centos-s2i-overrides.yaml
-	modules/kaas-springboot-centos-s2i-/test/run
+	cekit build -v --overrides-file kogito-springboot-centos-s2i-overrides.yaml
+	modules/kogito-springboot-centos-s2i-/test/run
 
 test-cekit3:
-	cekit -v build --overrides-file kaas-quarkus-centos-overrides.yaml --overrides 'name: kaas-quarkus-centos-candidate' docker --no-squash
-	modules/kaas-quarkus-centos/test/run
-	cekit -v build --overrides-file kaas-quarkus-centos-s2i-overrides.yaml --overrides 'name: kaas-quarkus-centos-s2i-candidate' docker --no-squash
-	modules/kaas-quarkus-centos-s2i/test/run
-	cekit -v build --overrides-file kaas-springboot-centos-overrides.yaml --overrides 'name: kaas-springboot-centos-candidate' docker --no-squash
-	modules/kaas-springboot-centos/test/run
-	cekit -v build --overrides-file kaas-springboot-centos-s2i-overrides.yaml --overrides 'name: kaas-springboot-centos-s2i-candidate' docker --no-squash
-	modules/kaas-springboot-centos-s2i-/test/run
+	cekit -v build --overrides-file kogito-quarkus-centos-overrides.yaml --overrides 'name: kogito-quarkus-centos-candidate' docker --no-squash
+	modules/kogito-quarkus-centos/test/run
+	cekit -v build --overrides-file kogito-quarkus-centos-s2i-overrides.yaml --overrides 'name: kogito-quarkus-centos-s2i-candidate' docker --no-squash
+	modules/kogito-quarkus-centos-s2i/test/run
+	cekit -v build --overrides-file kogito-springboot-centos-overrides.yaml --overrides 'name: kogito-springboot-centos-candidate' docker --no-squash
+	modules/kogito-springboot-centos/test/run
+	cekit -v build --overrides-file kogito-springboot-centos-s2i-overrides.yaml --overrides 'name: kogito-springboot-centos-s2i-candidate' docker --no-squash
+	modules/kogito-springboot-centos-s2i-/test/run
 
 # push images to quay.io, this requires permissions under kiegroup organization
 .PHONY: push
@@ -66,11 +66,11 @@ push: build _push
 cekit3: build-cekit3 _push
 
 _push:
-	docker push quay.io/kiegroup/kaas-quarkus-centos:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kaas-quarkus-centos:latest
-	docker push quay.io/kiegroup/kaas-quarkus-centos-s2i:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kaas-quarkus-centos-s2i:latest
-	docker push quay.io/kiegroup/kaas-springboot-centos:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kaas-springboot-centos:latest
-	docker push quay.io/kiegroup/kaas-springboot-centos-s2i:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kaas-springboot-centos-s2i:latest
\ No newline at end of file
+	docker push quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-quarkus-centos:latest
+	docker push quay.io/kiegroup/kogito-quarkus-centos-s2i:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-quarkus-centos-s2i:latest
+	docker push quay.io/kiegroup/kogito-springboot-centos:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-springboot-centos:latest
+	docker push quay.io/kiegroup/kogito-springboot-centos-s2i:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-springboot-centos-s2i:latest
diff --git a/s2i/README.md b/s2i/README.md
index e3a2d4ee366..239f1a0f137 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -1,6 +1,6 @@
-# Submarine S2I images
+# Kogito S2I images
 
-To be able to produce efficient container images for Submarine there are following sets
+To be able to produce efficient container images for Kogito there are following sets
 of builder images to perform the build and to run the result binaries.
 
 Images are grouped by the runtime that will run the binaries and the OS level
@@ -9,46 +9,46 @@ Images are grouped by the runtime that will run the binaries and the OS level
 
 ## Quarkus
 
-### kaas-quarkus-centos-s2i
+### kogito-quarkus-centos-s2i
 
 Builder image that is responsible for building the project
 with Apache Maven and generate native image using GraalVM/SubstrateVM
 
-Image location: quay.io/kiegroup/kaas-quarkus-centos-s2i:latest
+Image location: quay.io/kiegroup/kogito-quarkus-centos-s2i:latest
 
-For more details have a look at [README.md](modules/kaas-quarkus-centos-s2i/README.md)
+For more details have a look at [README.md](modules/kogito-quarkus-centos-s2i/README.md)
 
-### kaas-quarkus-centos
+### kogito-quarkus-centos
 
 Runtime image that is responsible for just running the binaries taken from the
 builder image. That approach is giving small and compact image that does not
 not carry on any of the build tools or artefacts (like local maven repository).
 
-Image location: quay.io/kiegroup/kaas-quarkus-centos:latest
+Image location: quay.io/kiegroup/kogito-quarkus-centos:latest
 
-For more details have a look at [README.md](kaas-quarkus-centos/README.md)
+For more details have a look at [README.md](kogito-quarkus-centos/README.md)
 
 ## SpringBoot
 
-### kaas-springboot-centos-s2i
+### kogito-springboot-centos-s2i
 
 Builder image that is responsible for building the project
 with Apache Maven and generate fat jar.
 
-Image location: quay.io/kiegroup/kaas-springboot-centos-s2i:latest
+Image location: quay.io/kiegroup/kogito-springboot-centos-s2i:latest
 
-For more details have a look at [README.md](kaas-springboot-centos-s2i/README.md)
+For more details have a look at [README.md](kogito-springboot-centos-s2i/README.md)
 
-### kaas-springboot-centos
+### kogito-springboot-centos
 
 Runtime image that is responsible for just running the fat jar taken from the
 builder image. It has JRE installed on the container to allow java executable.
 That approach is giving small and compact image that does not
 not carry on any of the build tools or artefacts (like local maven repository).
 
-Image location: quay.io/kiegroup/kaas-springboot-centos:latest
+Image location: quay.io/kiegroup/kogito-springboot-centos:latest
 
-For more details have a look at [README.md](kaas-springboot-centos/README.md)
+For more details have a look at [README.md](kogito-springboot-centos/README.md)
 
 # Supported source structure
 
@@ -77,9 +77,9 @@ This source structure is expected to be valid kjar project equipped with runtime
 
 Best way is to use maven archetypes to generate project structure (same archetypes are used in cases assets only are used as source).
 
-[KaaS Quarkus archetype](https://github.com/kiegroup/submarine-runtimes/tree/master/archetypes/kaas-quarkus-archetype)
+[Kogito Quarkus archetype](https://github.com/kiegroup/kogito-runtimes/tree/master/archetypes/kogito-quarkus-archetype)
 
-[KaaS SpringBoot archetype](https://github.com/kiegroup/submarine-runtimes/tree/master/archetypes/kaas-springboot-archetype)
+[Kogito SpringBoot archetype](https://github.com/kiegroup/kogito-runtimes/tree/master/archetypes/kogito-springboot-archetype)
 
 # Example usage
 
@@ -88,7 +88,7 @@ Best way is to use maven archetypes to generate project structure (same archetyp
 Once the images are built and imported into registry (docker hub or internal OpenShift registry)
 new applications can be build and deployed with this few steps
 
-`oc new-build quay.io/kiegroup/kaas-quarkus-centos-s2i~https://github.com/user/project --name=builder-app-name`
+`oc new-build quay.io/kiegroup/kogito-quarkus-centos-s2i~https://github.com/user/project --name=builder-app-name`
 
 Modify accordingly following
 - repository is the docker repository the images are available in (could be OpenShift project or docker hub user)
@@ -100,7 +100,7 @@ Modify accordingly following
 
 Once the build is finished, create another build config to produce runtime image
 
-`oc new-build --name app-name --source-image=builder-app-name --source-image-path=/home/submarine/bin:. --image-stream=kaas-quarkus-centos`
+`oc new-build --name app-name --source-image=builder-app-name --source-image-path=/home/kogito/bin:. --image-stream=kogito-quarkus-centos`
 
 Modify accordingly following
 - app-name is the final name of the image that will be deployed
@@ -155,7 +155,7 @@ Modify accordingly following
 what this does ... essentially reuses previously build image and takes advantage of
 already downloaded artifacts. By that improving overall build time significantly.
 
-You can also use a maven mirror, if available on your internal network, just set the 
+You can also use a maven mirror, if available on your internal network, just set the
 MAVEN_MIRROR_URL environment variable when starting a new build.
 
 
@@ -164,8 +164,8 @@ MAVEN_MIRROR_URL environment variable when starting a new build.
 
 CeKit2 or 3 (Not fully tested) and docker-squash are required to build the images, how to install: https://docs.cekit.io/en/latest/handbook/installation/instructions.html
 
-To build all images: 
-```bash 
+To build all images:
+```bash
 $ make
 ```
 
@@ -184,7 +184,7 @@ Testing the images (WIP):
 $ make test
 ```
 
-And finally, to push the images for the quay.io/kiegroup registry, this step requires permission under the kiegroup 
+And finally, to push the images for the quay.io/kiegroup registry, this step requires permission under the kiegroup
 organization on quay.io.:
 ```bash
  make push
@@ -192,27 +192,27 @@ organization on quay.io.:
 
 ##### Pushing the built images to a local OCP registry:
 To be able to build the image a docker should be installed.
- 
+
 Setup environment
- 
+
 ```bash
 $ eval $(minishift docker-env)
  ```
- 
+
 Login to docker registry
 
 ```bash
 $ docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)
 ```
- 
+
 (this will run a docker build and produce a image builder)
- 
+
 Tag the built image, example
 ```bash
-$ docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kaas-quarkus-centos
+$ docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kogito-quarkus-centos
 ```
 
 Modify accordingly
  - IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
     * Note that, you can also use the image name:tag.
- - PROJECT - OpenShift project that the image should be pushed to
\ No newline at end of file
+ - PROJECT - OpenShift project that the image should be pushed to
diff --git a/s2i/image.yaml b/s2i/image.yaml
index f4db1965097..98379087402 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,12 +1,12 @@
 schema_version: 1
 
-name: "submarine-image-real-name-on-overrides-file"
+name: "kogito-image-real-name-on-overrides-file"
 version: "1.0"
 from: "centos:latest"
 
 labels:
 - name: "maintainer"
-  value: "Submarine <submarine@kiegroup.com>"
+  value: "kogito <kogito@kiegroup.com>"
 - name: "io.openshift.s2i.scripts-url"
   value: "image:///usr/local/s2i"
 - name: "io.openshift.s2i.destination"
diff --git a/s2i/kaas-quarkus-centos-overrides.yaml b/s2i/kaas-quarkus-centos-overrides.yaml
deleted file mode 100644
index 2a46473737f..00000000000
--- a/s2i/kaas-quarkus-centos-overrides.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-schema_version: 1
-
-name: "quay.io/kiegroup/kaas-quarkus-centos"
-description: "Runtime image for KaaS based on Quarkus native image"
-
-labels:
-- name: "io.k8s.description"
-  value: "Runtime image for KaaS based on Quarkus native image"
-- name: "io.k8s.display-name"
-  value: "KaaS based on Quarkus native image"
-- name: "io.openshift.tags"
-  value: "builder,runtime,kaas,quarkus"
-
-ports:
-- value: 8080
-
-modules:
-  install:
-  - name: add-submarine-user
-  - name: kaas-quarkus-centos
\ No newline at end of file
diff --git a/s2i/kaas-quarkus-centos-s2i-overrides.yaml b/s2i/kaas-quarkus-centos-s2i-overrides.yaml
deleted file mode 100644
index 75a2f9e4537..00000000000
--- a/s2i/kaas-quarkus-centos-s2i-overrides.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-schema_version: 1
-
-name: "quay.io/kiegroup/kaas-quarkus-centos-s2i"
-description: "Platform for building KaaS based on Quarkus"
-
-labels:
-- name: "io.k8s.description"
-  value: "Platform for building KaaS based on Quarkus"
-- name: "io.k8s.display-name"
-  value: "KaaS based on Quarkus"
-- name: "io.openshift.tags"
-  value: "builder,kaas,quarkus"
-
-modules:
-  install:
-  - name: add-submarine-user
-  - name: graalvm
-    version: "1.0.0-rc16"
-  - name: maven
-    version: "3.6.0"
-  - name: kaas-quarkus-centos-s2i
-
-packages:
-  install:
-  - gcc
-  - glibc-devel
-  - zlib-devel
\ No newline at end of file
diff --git a/s2i/kaas-springboot-centos-overrides.yaml b/s2i/kaas-springboot-centos-overrides.yaml
deleted file mode 100644
index 2d62e339e54..00000000000
--- a/s2i/kaas-springboot-centos-overrides.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-schema_version: 1
-
-name: "quay.io/kiegroup/kaas-springboot-centos"
-description: "Runtime image for KaaS based on SpringBoot native image"
-
-labels:
-- name: "io.k8s.description"
-  value: "Runtime image for KaaS based on SpringBoot native image"
-- name: "io.k8s.display-name"
-  value: "KaaS based on SpringBoot native image"
-- name: "io.openshift.tags"
-  value: "builder,runtime,kaas,springboot"
-
-ports:
-- value: 8080
-
-modules:
-  install:
-  - name: add-submarine-user
-  - name: java-openjdk
-    version: "1.8.0"
-  - name: kaas-springboot-centos
\ No newline at end of file
diff --git a/s2i/kaas-springboot-centos-s2i-overrides.yaml b/s2i/kaas-springboot-centos-s2i-overrides.yaml
deleted file mode 100644
index 8bbbc449d53..00000000000
--- a/s2i/kaas-springboot-centos-s2i-overrides.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-schema_version: 1
-
-name: "quay.io/kiegroup/kaas-springboot-centos-s2i"
-description: "Platform for building KaaS based on SpringBoot"
-
-labels:
-- name: "io.k8s.description"
-  value: "Platform for building KaaS based on SpringBoot"
-- name: "io.k8s.display-name"
-  value: "KaaS based on SpringBoot"
-- name: "io.openshift.tags"
-  value: "builder,kaas,springboot"
-
-modules:
-  install:
-  - name: add-submarine-user
-  - name: maven
-    version: "3.6.0"
-  - name: java-openjdk
-    version: "1.8.0"
-  - name: kaas-springboot-centos-s2i
\ No newline at end of file
diff --git a/s2i/submarine-imagestream.yaml b/s2i/kogito-imagestream.yaml
similarity index 53%
rename from s2i/submarine-imagestream.yaml
rename to s2i/kogito-imagestream.yaml
index b7e8531df70..bf9e2f108f3 100644
--- a/s2i/submarine-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -1,92 +1,92 @@
 kind: ImageStreamList
 apiVersion: v1
 metadata:
-  name: submarine-image-streams
+  name: kogito-image-streams
   annotations:
-    description: ImageStream definitions for Submarine images
+    description: ImageStream definitions for Kogito images
     openshift.io/provider-display-name: Kie Group.
 items:
 - kind: ImageStream
   apiVersion: v1
   metadata:
-    name: kaas-quarkus-centos
+    name: kogito-quarkus-centos
     annotations:
-      openshift.io/display-name: Runtime image for KaaS based on Quarkus native image
+      openshift.io/display-name: Runtime image for Kogito based on Quarkus native image
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
     - name: '1.0'
       annotations:
-        description: Runtime image for KaaS based on Quarkus native image
+        description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
-        tags: builder,runtime,kaas,quarkus
+        tags: builder,runtime,kogito,quarkus
         supports: quarkus
         version: '1.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kaas-quarkus-centos:1.0
+        name: quay.io/kiegroup/kogito-quarkus-centos:1.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
-    name: kaas-quarkus-centos-s2i
+    name: kogito-quarkus-centos-s2i
     annotations:
-      openshift.io/display-name: Platform for building KaaS based on Quarkus
+      openshift.io/display-name: Platform for building Kogito based on Quarkus
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
     - name: '1.0'
       annotations:
-        description: Platform for building KaaS based on Quarkus
+        description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
-        tags: builder,kaas,quarkus
+        tags: builder,kogito,quarkus
         supports: quarkus
         version: '1.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kaas-quarkus-centos-s2i:1.0
+        name: quay.io/kiegroup/kogito-quarkus-centos-s2i:1.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
-    name: kaas-springboot-centos
+    name: kogito-springboot-centos
     annotations:
-      openshift.io/display-name: Runtime image for KaaS based on SpringBoot native image
+      openshift.io/display-name: Runtime image for Kogito based on SpringBoot native image
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
     - name: '1.0'
       annotations:
-        description: Platform for building KaaS based on Quarkus
+        description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
-        tags: builder,runtime,kaas,springboot
+        tags: builder,runtime,kogito,springboot
         supports: springboot
         version: '1.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kaas-springboot-centos:1.0
+        name: quay.io/kiegroup/kogito-springboot-centos:1.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
-    name: kaas-springboot-centos-s2i
+    name: kogito-springboot-centos-s2i
     annotations:
-      openshift.io/display-name: Platform for building KaaS based on SpringBoot
+      openshift.io/display-name: Platform for building Kogito based on SpringBoot
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
     - name: '1.0'
       annotations:
-        description: Platform for building KaaS based on Quarkus
+        description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
-        tags: builder,kaas,springboot
+        tags: builder,kogito,springboot
         supports: springboot
         version: '1.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kaas-springboot-centos-s2i:1.0
\ No newline at end of file
+        name: quay.io/kiegroup/kogito-springboot-centos-s2i:1.0
diff --git a/s2i/kogito-quarkus-centos-overrides.yaml b/s2i/kogito-quarkus-centos-overrides.yaml
new file mode 100644
index 00000000000..d6ccdeb211c
--- /dev/null
+++ b/s2i/kogito-quarkus-centos-overrides.yaml
@@ -0,0 +1,20 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-quarkus-centos"
+description: "Runtime image for Kogito based on Quarkus native image"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito based on Quarkus native image"
+- name: "io.k8s.display-name"
+  value: "Kogito based on Quarkus native image"
+- name: "io.openshift.tags"
+  value: "builder,runtime,kogito,quarkus"
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: add-kogito-user
+  - name: kogito-quarkus-centos
diff --git a/s2i/kogito-quarkus-centos-s2i-overrides.yaml b/s2i/kogito-quarkus-centos-s2i-overrides.yaml
new file mode 100644
index 00000000000..1f9f6222f12
--- /dev/null
+++ b/s2i/kogito-quarkus-centos-s2i-overrides.yaml
@@ -0,0 +1,27 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-quarkus-centos-s2i"
+description: "Platform for building Kogito based on Quarkus"
+
+labels:
+- name: "io.k8s.description"
+  value: "Platform for building Kogito based on Quarkus"
+- name: "io.k8s.display-name"
+  value: "Kogito based on Quarkus"
+- name: "io.openshift.tags"
+  value: "builder,kogito,quarkus"
+
+modules:
+  install:
+  - name: add-kogito-user
+  - name: graalvm
+    version: "1.0.0-rc16"
+  - name: maven
+    version: "3.6.0"
+  - name: kogito-quarkus-centos-s2i
+
+packages:
+  install:
+  - gcc
+  - glibc-devel
+  - zlib-devel
diff --git a/s2i/kogito-springboot-centos-overrides.yaml b/s2i/kogito-springboot-centos-overrides.yaml
new file mode 100644
index 00000000000..18e1d19c725
--- /dev/null
+++ b/s2i/kogito-springboot-centos-overrides.yaml
@@ -0,0 +1,22 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-springboot-centos"
+description: "Runtime image for Kogito based on SpringBoot native image"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito based on SpringBoot native image"
+- name: "io.k8s.display-name"
+  value: "Kogito based on SpringBoot native image"
+- name: "io.openshift.tags"
+  value: "builder,runtime,kogito,springboot"
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: add-kogito-user
+  - name: java-openjdk
+    version: "1.8.0"
+  - name: kogito-springboot-centos
diff --git a/s2i/kogito-springboot-centos-s2i-overrides.yaml b/s2i/kogito-springboot-centos-s2i-overrides.yaml
new file mode 100644
index 00000000000..f8594ad38b0
--- /dev/null
+++ b/s2i/kogito-springboot-centos-s2i-overrides.yaml
@@ -0,0 +1,21 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-springboot-centos-s2i"
+description: "Platform for building Kogito based on SpringBoot"
+
+labels:
+- name: "io.k8s.description"
+  value: "Platform for building Kogito based on SpringBoot"
+- name: "io.k8s.display-name"
+  value: "Kogito based on SpringBoot"
+- name: "io.openshift.tags"
+  value: "builder,kogito,springboot"
+
+modules:
+  install:
+  - name: add-kogito-user
+  - name: maven
+    version: "3.6.0"
+  - name: java-openjdk
+    version: "1.8.0"
+  - name: kogito-springboot-centos-s2i
diff --git a/s2i/modules/add-kogito-user/add-user b/s2i/modules/add-kogito-user/add-user
new file mode 100644
index 00000000000..194d0c33273
--- /dev/null
+++ b/s2i/modules/add-kogito-user/add-user
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+groupadd -r kogito -g 1001 && useradd -u 1001 -r -g 1001 -m -d ${KOGITO_HOME} -s /sbin/nologin -c "Kogito user" kogito
diff --git a/s2i/modules/add-kogito-user/module.yaml b/s2i/modules/add-kogito-user/module.yaml
new file mode 100644
index 00000000000..de1b70eb21a
--- /dev/null
+++ b/s2i/modules/add-kogito-user/module.yaml
@@ -0,0 +1,8 @@
+schema_version: 1
+name: add-kogito-user
+execute:
+- script: add-user
+
+envs:
+- name: "KOGITO_HOME"
+  value: "/home/kogito"
diff --git a/s2i/modules/add-submarine-user/add-user b/s2i/modules/add-submarine-user/add-user
deleted file mode 100644
index 946f8a08562..00000000000
--- a/s2i/modules/add-submarine-user/add-user
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-groupadd -r submarine -g 1001 && useradd -u 1001 -r -g 1001 -m -d ${SUBMARINE_HOME} -s /sbin/nologin -c "Submarine user" submarine
diff --git a/s2i/modules/add-submarine-user/module.yaml b/s2i/modules/add-submarine-user/module.yaml
deleted file mode 100644
index 2cd73fac6ea..00000000000
--- a/s2i/modules/add-submarine-user/module.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-schema_version: 1
-name: add-submarine-user
-execute:
-- script: add-user
-
-envs:
-- name: "SUBMARINE_HOME"
-  value: "/home/submarine"
\ No newline at end of file
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/module.yaml b/s2i/modules/kaas-quarkus-centos-s2i/module.yaml
deleted file mode 100644
index 3d2d3d6af36..00000000000
--- a/s2i/modules/kaas-quarkus-centos-s2i/module.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-schema_version: 1
-name: kaas-quarkus-centos-s2i
-execute:
-  - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/assemble b/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/assemble
deleted file mode 100755
index 7486416d9d6..00000000000
--- a/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/assemble
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble script for the 'kaas-quarkus-centos-s2i' image.
-# The 'assemble' script builds your application source so that it is ready to run.
-#
-# For more information refer to the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-#############################################
-# Configure maven - for a complete list of
-# supported values, please refer the module.yaml
-# file.
-CONFIGURE_SCRIPTS=(
-  ${SUBMARINE_HOME}/.m2/configure-maven.sh
-)
-source ${SUBMARINE_HOME}/.m2/configure.sh
-#############################################
-
-# If the 'kaas-quarkus-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
-if [[ "$1" == "-h" ]]; then
-	exec /usr/libexec/s2i/usage
-fi
-
-if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
-    echo "---> Restore build artifacts"
-    mv /tmp/artifacts/.m2 $HOME
-fi
-
-echo "---> Installing application source..."
-cd /tmp/src/
-
-if [ -f "pom.xml" ]; then
-	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/.m2/settings.xml \
-    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-else
-	echo "---> Generating project structure..."
-
-	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-quarkus-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $SUBMARINE_HOME/.m2/settings.xml
-
-	# copy resources into the generated project
-	for item in *
-	do
-		if [ -d $item ] && [ "$item" == "project" ]; then
-			echo "--> Skipping generated project ..."
-		else
-			echo "--> Coping resource $item"
-			cp -R $item project/src/main/resources
-		fi
-	done
-
-	# move all project content into the current directory
-	mv project/* .
-
-	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -Pnative -s $SUBMARINE_HOME/.m2/settings.xml \
-    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-
-fi
-
-
-echo "---> Installing application binaries"
-mkdir $SUBMARINE_HOME/bin
-cp -v target/*-runner $SUBMARINE_HOME/bin
-chmod +x $SUBMARINE_HOME/bin/*-runner
-
-
-echo "---> Copy image metadata file..."
-if [ -e /tmp/src/target/image_metadata.json ]; then
-    mkdir /tmp/.s2i
-    cp -v /tmp/src/target/image_metadata.json /tmp/.s2i
-    cp -v /tmp/src/target/image_metadata.json $SUBMARINE_HOME/bin
-else
-    echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
-fi
-
-echo "---> Copy native java libraries for ssl handling..."
-cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $SUBMARINE_HOME/bin
\ No newline at end of file
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/run b/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/run
deleted file mode 100755
index bb4694d9ca9..00000000000
--- a/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-#
-# S2I run script for the 'kaas-quarkus-centos-s2i' image.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-exec $SUBMARINE_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts b/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts
deleted file mode 100644
index d06c9a151cf..00000000000
--- a/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/save-artifacts
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-pushd ${HOME} > /dev/null
-if [ -d .m2 ]; then
-    tar cf - .m2
-    echo "--> Maven artifacts saved"
-    ls -l
-fi
-popd > /dev/null
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/usage b/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/usage
deleted file mode 100755
index 6eb210310a6..00000000000
--- a/s2i/modules/kaas-quarkus-centos-s2i/s2i/bin/usage
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-cat <<EOF
-This is the kaas-quarkus-centos S2I image:
-
-Build native image based on project source either complete maven project or just set of business assets 
-such as processes, rules, decisions.
-
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-This image is intended to build application binaries only that are later on transfered to runtime image.
-
-
-s2i build -c <source code path/URL> kaas-quarkus-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/submarine/bin
-
-Sample invocation:
-
-s2i build -c /Development/project/ kaas-quarkus-centos-s2i application --runtime-image kaas-quarkus-centos --runtime-artifact /home/submarine/bin
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/s2i/modules/kaas-quarkus-centos/module.yaml b/s2i/modules/kaas-quarkus-centos/module.yaml
deleted file mode 100644
index 2131bd71252..00000000000
--- a/s2i/modules/kaas-quarkus-centos/module.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-schema_version: 1
-name: kaas-quarkus-centos
-execute:
-- script: configure
\ No newline at end of file
diff --git a/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble b/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble
deleted file mode 100755
index 4f2862a73ad..00000000000
--- a/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -e
-# this script is used by OpenShift with chained builds
-# to transfer data from builder image into the runtime image
-
-cp -R /tmp/src/bin/ $SUBMARINE_HOME
-
-if [ -d "$SUBMARINE_HOME/bin" ]; then
-  echo "---> Application binaries found and ready to use"
-  
-  echo "---> Adding custom labels..."
-  if [ -e "${SUBMARINE_HOME}/bin/image_metadata.json" ]; then
-    mkdir /tmp/.s2i
-    mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-  else
-    echo "-----> Failed to copy metada file, $SUBMARINE_HOME/bin/image_metadata.json does not exist"
-  fi
-else
-  echo "---> Application binaries NOT found, failing build..."
-  exit 1
-fi
diff --git a/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble-runtime b/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble-runtime
deleted file mode 100755
index 26be42a28da..00000000000
--- a/s2i/modules/kaas-quarkus-centos/s2i/bin/assemble-runtime
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble-runtime script for the 'kaas-quarkus-centos' image.
-# The assemble-runtime script executes preparation for running the container on runtime image.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-
-if [ -d "$SUBMARINE_HOME/bin" ]; then
-  echo "---> Application binaries found and ready to use"
-  
-  echo "---> Adding custom labels..."
-  if [ -e "${SUBMARINE_HOME}/bin/image_metadata.json" ]; then
-    mkdir /tmp/.s2i
-    mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-  else
-    echo "-----> Failed to copy metada file, $SUBMARINE_HOME/bin/image_metadata.json does not exist"
-  fi
-else
-  echo "---> Application binaries NOT found, failing build..."
-  exit 1
-fi
diff --git a/s2i/modules/kaas-quarkus-centos/s2i/bin/run b/s2i/modules/kaas-quarkus-centos/s2i/bin/run
deleted file mode 100755
index c1b0d8f722e..00000000000
--- a/s2i/modules/kaas-quarkus-centos/s2i/bin/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-#
-# S2I run script for the 'kaas-quarkus-centos' image.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-exec $SUBMARINE_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$SUBMARINE_HOME/bin
diff --git a/s2i/modules/kaas-quarkus-centos/s2i/bin/usage b/s2i/modules/kaas-quarkus-centos/s2i/bin/usage
deleted file mode 100755
index 99d159ba98f..00000000000
--- a/s2i/modules/kaas-quarkus-centos/s2i/bin/usage
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-cat <<EOF
-This is the kaas-quarkus-centos S2I image:
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-Sample invocation:
-
-s2i build <source code path/URL> kaas-quarkus-centos <application image>
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/s2i/modules/kaas-springboot-centos-s2i/module.yaml b/s2i/modules/kaas-springboot-centos-s2i/module.yaml
deleted file mode 100644
index 3479d8273ac..00000000000
--- a/s2i/modules/kaas-springboot-centos-s2i/module.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-schema_version: 1
-name: kaas-springboot-centos-s2i
-execute:
-  - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble
index 872998cfbb3..257e95465aa 100755
--- a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble
+++ b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble
@@ -11,9 +11,9 @@
 # supported values, please refer the module.yaml
 # file.
 CONFIGURE_SCRIPTS=(
-  ${SUBMARINE_HOME}/.m2/configure-maven.sh
+  ${KOGITO_HOME}/.m2/configure-maven.sh
 )
-source ${SUBMARINE_HOME}/.m2/configure.sh
+source ${KOGITO_HOME}/.m2/configure.sh
 #############################################
 
 # If the 'kaas-springboot-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
@@ -31,13 +31,13 @@ cd /tmp/src/
 
 if [ -f "pom.xml" ]; then
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/.m2/settings.xml \
+	$MAVEN_HOME/bin/mvn clean package -s $KOGITO_HOME/.m2/settings.xml \
     -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
     -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 else
 	echo "---> Generating project structure..."
 
-	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-springboot-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $SUBMARINE_HOME/.m2/settings.xml
+	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=kogito-springboot-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
 
 	# copy resources into the generated project
 	for item in *
@@ -54,20 +54,20 @@ else
 	mv project/* .
 
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -s $SUBMARINE_HOME/.m2/settings.xml \
+	$MAVEN_HOME/bin/mvn clean package -s $KOGITO_HOME/.m2/settings.xml \
     -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
     -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 fi
 
 echo "---> Installing application binaries"
-mkdir $SUBMARINE_HOME/bin
-cp -v target/*.jar $SUBMARINE_HOME/bin
+mkdir $KOGITO_HOME/bin
+cp -v target/*.jar $KOGITO_HOME/bin
 
 echo "---> Copy image metadata file..."
 if [ -e /tmp/src/target/image_metadata.json ]; then
     mkdir /tmp/.s2i
     cp -v /tmp/src/target/image_metadata.json /tmp/.s2i
-    cp -v /tmp/src/target/image_metadata.json $SUBMARINE_HOME/bin
+    cp -v /tmp/src/target/image_metadata.json $KOGITO_HOME/bin
 else
     echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
 fi
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run
index eb4c6f0dec1..8f72eec78c0 100755
--- a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run
+++ b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run
@@ -1,9 +1,9 @@
 #!/bin/bash -e
 #
-# S2I run script for the 'kaas-springboot-centos-s2i' image.
+# S2I run script for the 'kogito-springboot-centos-s2i' image.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec java -jar $SUBMARINE_HOME/bin/*.jar
+exec java -jar $KOGITO_HOME/bin/*.jar
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage
index 8b01045a39f..dd3e20411ac 100755
--- a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage
+++ b/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 cat <<EOF
-This is the kaas-springboot-centos S2I image:
+This is the kogito-springboot-centos S2I image:
 
 Build executable jar based on project source either complete maven project or just set of business assets 
 such as processes, rules, decisions.
@@ -9,11 +9,11 @@ To use it, install S2I: https://github.com/openshift/source-to-image
 
 This image is intended to build application binaries only that are later on transfered to runtime image.
 
-s2i build -c <source code path/URL> kaas-quarkus-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/submarine/bin
+s2i build -c <source code path/URL> kogito-springboot-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/kogito/bin
 
 Sample invocation:
 
-s2i build -c /Development/project/ kaas-springboot-centos-s2i application --runtime-image kaas-springboot-centos --runtime-artifact /home/submarine/bin
+s2i build -c /Development/project/ kogito-springboot-centos-s2i application --runtime-image kogito-springboot-centos --runtime-artifact /home/kogito/bin
 
 You can then run the resulting image via:
 docker run <application image>
diff --git a/s2i/modules/kaas-springboot-centos/module.yaml b/s2i/modules/kaas-springboot-centos/module.yaml
deleted file mode 100644
index 68c1beb0e0d..00000000000
--- a/s2i/modules/kaas-springboot-centos/module.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-schema_version: 1
-name: kaas-springboot-centos
-execute:
-  - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/README.md b/s2i/modules/kogito-quarkus-centos-s2i/README.md
similarity index 100%
rename from s2i/modules/kaas-quarkus-centos-s2i/README.md
rename to s2i/modules/kogito-quarkus-centos-s2i/README.md
diff --git a/s2i/modules/kaas-springboot-centos/configure b/s2i/modules/kogito-quarkus-centos-s2i/configure
similarity index 63%
rename from s2i/modules/kaas-springboot-centos/configure
rename to s2i/modules/kogito-quarkus-centos-s2i/configure
index 6e9fbaf9116..ff7734d3446 100644
--- a/s2i/modules/kaas-springboot-centos/configure
+++ b/s2i/modules/kogito-quarkus-centos-s2i/configure
@@ -6,5 +6,5 @@ SCRIPT_DIR=$(dirname $0)
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${SUBMARINE_HOME}
-chmod -R ug+rwX ${SUBMARINE_HOME}
\ No newline at end of file
+chown -R 1001:1001 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/module.yaml b/s2i/modules/kogito-quarkus-centos-s2i/module.yaml
new file mode 100644
index 00000000000..94a98650239
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-centos-s2i/module.yaml
@@ -0,0 +1,4 @@
+schema_version: 1
+name: kogito-quarkus-centos-s2i
+execute:
+  - script: configure
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/test/run b/s2i/modules/kogito-quarkus-centos-s2i/test/run
similarity index 98%
rename from s2i/modules/kaas-quarkus-centos-s2i/test/run
rename to s2i/modules/kogito-quarkus-centos-s2i/test/run
index 7b06e654e24..fd9c1c88865 100755
--- a/s2i/modules/kaas-quarkus-centos-s2i/test/run
+++ b/s2i/modules/kogito-quarkus-centos-s2i/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME:-kaas-quarkus-centos-s2i-candidate}
+IMAGE_NAME=${IMAGE_NAME:-kogito-quarkus-centos-s2i-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
@@ -152,4 +152,3 @@ test_connection
 check_result $?
 
 cleanup
-
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/test/test-app/index.html b/s2i/modules/kogito-quarkus-centos-s2i/test/test-app/index.html
similarity index 100%
rename from s2i/modules/kaas-quarkus-centos-s2i/test/test-app/index.html
rename to s2i/modules/kogito-quarkus-centos-s2i/test/test-app/index.html
diff --git a/s2i/modules/kaas-quarkus-centos/README.md b/s2i/modules/kogito-quarkus-centos/README.md
similarity index 77%
rename from s2i/modules/kaas-quarkus-centos/README.md
rename to s2i/modules/kogito-quarkus-centos/README.md
index 8907bb40984..8f806643417 100644
--- a/s2i/modules/kaas-quarkus-centos/README.md
+++ b/s2i/modules/kogito-quarkus-centos/README.md
@@ -1,12 +1,8 @@
 # S2I image to build runtime image based on Centos 7
 
 This S2I is considered a runtime image builder as it relies on another image
-(built with `kaas-quarkus-centos-s2i`) that actually produced the binaries to be executed
+(built with `kogito-quarkus-centos-s2i`) that actually produced the binaries to be executed
 (the native image based on Quarkus runtime). So this one will only get the binaries
 and place into the container.
 
 With that it produces lightweight and compact application container image.
-
-
-
-
diff --git a/s2i/modules/kaas-quarkus-centos/configure b/s2i/modules/kogito-quarkus-centos/configure
similarity index 61%
rename from s2i/modules/kaas-quarkus-centos/configure
rename to s2i/modules/kogito-quarkus-centos/configure
index be705b8adfa..902a6c1d521 100644
--- a/s2i/modules/kaas-quarkus-centos/configure
+++ b/s2i/modules/kogito-quarkus-centos/configure
@@ -5,5 +5,5 @@ SCRIPT_DIR=$(dirname $0)
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${SUBMARINE_HOME}
-chmod -R ug+rwX ${SUBMARINE_HOME}
\ No newline at end of file
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-quarkus-centos/module.yaml b/s2i/modules/kogito-quarkus-centos/module.yaml
new file mode 100644
index 00000000000..a7890ce0e17
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-centos/module.yaml
@@ -0,0 +1,4 @@
+schema_version: 1
+name: kogito-quarkus-centos
+execute:
+- script: configure
diff --git a/s2i/modules/kaas-quarkus-centos/test/run b/s2i/modules/kogito-quarkus-centos/test/run
similarity index 98%
rename from s2i/modules/kaas-quarkus-centos/test/run
rename to s2i/modules/kogito-quarkus-centos/test/run
index 0dcb7146a50..c4d141279ce 100755
--- a/s2i/modules/kaas-quarkus-centos/test/run
+++ b/s2i/modules/kogito-quarkus-centos/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME:-kaas-quarkus-centos-candidate}
+IMAGE_NAME=${IMAGE_NAME:-kogito-quarkus-centos-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
@@ -153,4 +153,3 @@ test_connection
 check_result $?
 
 cleanup
-
diff --git a/s2i/modules/kaas-quarkus-centos/test/test-app/index.html b/s2i/modules/kogito-quarkus-centos/test/test-app/index.html
similarity index 100%
rename from s2i/modules/kaas-quarkus-centos/test/test-app/index.html
rename to s2i/modules/kogito-quarkus-centos/test/test-app/index.html
diff --git a/s2i/modules/kaas-springboot-centos-s2i/README.md b/s2i/modules/kogito-springboot-centos-s2i/README.md
similarity index 100%
rename from s2i/modules/kaas-springboot-centos-s2i/README.md
rename to s2i/modules/kogito-springboot-centos-s2i/README.md
diff --git a/s2i/modules/kaas-quarkus-centos-s2i/configure b/s2i/modules/kogito-springboot-centos-s2i/configure
similarity index 62%
rename from s2i/modules/kaas-quarkus-centos-s2i/configure
rename to s2i/modules/kogito-springboot-centos-s2i/configure
index 70a714afd57..ff7734d3446 100644
--- a/s2i/modules/kaas-quarkus-centos-s2i/configure
+++ b/s2i/modules/kogito-springboot-centos-s2i/configure
@@ -6,5 +6,5 @@ SCRIPT_DIR=$(dirname $0)
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:1001 ${SUBMARINE_HOME}
-chmod -R ug+rwX ${SUBMARINE_HOME}
\ No newline at end of file
+chown -R 1001:1001 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-springboot-centos-s2i/module.yaml b/s2i/modules/kogito-springboot-centos-s2i/module.yaml
new file mode 100644
index 00000000000..bce54b2601f
--- /dev/null
+++ b/s2i/modules/kogito-springboot-centos-s2i/module.yaml
@@ -0,0 +1,4 @@
+schema_version: 1
+name: kogito-springboot-centos-s2i
+execute:
+  - script: configure
diff --git a/s2i/modules/kaas-springboot-centos-s2i/test/run b/s2i/modules/kogito-springboot-centos-s2i/test/run
similarity index 98%
rename from s2i/modules/kaas-springboot-centos-s2i/test/run
rename to s2i/modules/kogito-springboot-centos-s2i/test/run
index 061e6bb55ab..60bc2f41ff1 100755
--- a/s2i/modules/kaas-springboot-centos-s2i/test/run
+++ b/s2i/modules/kogito-springboot-centos-s2i/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME:-kaas-springboot-centos-s2i-candidate}
+IMAGE_NAME=${IMAGE_NAME:-kogito-springboot-centos-s2i-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
@@ -152,4 +152,3 @@ test_connection
 check_result $?
 
 cleanup
-
diff --git a/s2i/modules/kaas-springboot-centos-s2i/test/test-app/index.html b/s2i/modules/kogito-springboot-centos-s2i/test/test-app/index.html
similarity index 100%
rename from s2i/modules/kaas-springboot-centos-s2i/test/test-app/index.html
rename to s2i/modules/kogito-springboot-centos-s2i/test/test-app/index.html
diff --git a/s2i/modules/kaas-springboot-centos/README.md b/s2i/modules/kogito-springboot-centos/README.md
similarity index 77%
rename from s2i/modules/kaas-springboot-centos/README.md
rename to s2i/modules/kogito-springboot-centos/README.md
index 7dee4f65ff6..2cdd0c7a742 100644
--- a/s2i/modules/kaas-springboot-centos/README.md
+++ b/s2i/modules/kogito-springboot-centos/README.md
@@ -1,7 +1,7 @@
 # S2I image to build runtime image based on Centos 7
 
 This S2I is considered a runtime image builder as it relies on another image
-(built with `kaas-springboot-centos-s2i`) that actually produced the binaries to be executed
+(built with `kogito-springboot-centos-s2i`) that actually produced the binaries to be executed
 (the fat jar based on SpringBoot 2.1.x runtime). So this one will only get the binaries
 and place into the container.
 
diff --git a/s2i/modules/kaas-springboot-centos-s2i/configure b/s2i/modules/kogito-springboot-centos/configure
similarity index 62%
rename from s2i/modules/kaas-springboot-centos-s2i/configure
rename to s2i/modules/kogito-springboot-centos/configure
index 70a714afd57..0fe63c4ce07 100644
--- a/s2i/modules/kaas-springboot-centos-s2i/configure
+++ b/s2i/modules/kogito-springboot-centos/configure
@@ -6,5 +6,5 @@ SCRIPT_DIR=$(dirname $0)
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:1001 ${SUBMARINE_HOME}
-chmod -R ug+rwX ${SUBMARINE_HOME}
\ No newline at end of file
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-springboot-centos/module.yaml b/s2i/modules/kogito-springboot-centos/module.yaml
new file mode 100644
index 00000000000..a410c65e82d
--- /dev/null
+++ b/s2i/modules/kogito-springboot-centos/module.yaml
@@ -0,0 +1,4 @@
+schema_version: 1
+name: kogito-springboot-centos
+execute:
+  - script: configure
diff --git a/s2i/modules/kaas-springboot-centos/test/run b/s2i/modules/kogito-springboot-centos/test/run
similarity index 98%
rename from s2i/modules/kaas-springboot-centos/test/run
rename to s2i/modules/kogito-springboot-centos/test/run
index 47cdad993f5..051794ef1ed 100755
--- a/s2i/modules/kaas-springboot-centos/test/run
+++ b/s2i/modules/kogito-springboot-centos/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME-kaas-springboot-centos-candidate}
+IMAGE_NAME=${IMAGE_NAME-kogito-springboot-centos-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
@@ -152,4 +152,3 @@ test_connection
 check_result $?
 
 cleanup
-
diff --git a/s2i/modules/kaas-springboot-centos/test/test-app/index.html b/s2i/modules/kogito-springboot-centos/test/test-app/index.html
similarity index 100%
rename from s2i/modules/kaas-springboot-centos/test/test-app/index.html
rename to s2i/modules/kogito-springboot-centos/test/test-app/index.html
diff --git a/submarine-cloud-services/pom.xml b/submarine-cloud-services/pom.xml
deleted file mode 100644
index 9fc92ed3ea0..00000000000
--- a/submarine-cloud-services/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.submarine</groupId>
-    <artifactId>submarine-cloud</artifactId>
-    <version>8.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>submarine-cloud-services</artifactId>
-  <packaging>pom</packaging>
-  <name>Submarine Cloud Services</name>
-  <description>Submarine Cloud Services</description>
-  <modules>
-    <module>submarine-cloud-workitems</module>
-  </modules>
-</project>
\ No newline at end of file

From 97da78b9d1ede67cf08e29665788a22f4977dd3a Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Sun, 26 May 2019 09:48:18 +0200
Subject: [PATCH 020/709] updated jenkinsfile after repository rename

---
 Jenkinsfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3501e289657..d4852ca78f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,27 +18,27 @@ pipeline {
                 sh 'printenv'
             }
         }
-        stage('Build submarine-bom') {
+        stage('Build kogito-bom') {
             steps {
-                dir("submarine-bom") {
+                dir("kogito-bom") {
                     script {
-                        githubscm.checkoutIfExists('submarine-bom', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
+                        githubscm.checkoutIfExists('kogito-bom', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
                         maven.runMavenWithSubmarineSettings('clean install', true)
                     }
                 }
             }
         }
-        stage('Build submarine-runtimes') {
+        stage('Build kogito-runtimes') {
             steps {
-                dir("submarine-runtimes") {
+                dir("kogito-runtimes") {
                     script {
-                        githubscm.checkoutIfExists('submarine-runtimes', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
+                        githubscm.checkoutIfExists('kogito-runtimes', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
                         maven.runMavenWithSubmarineSettings('clean install', true)
                     }
                 }
             }
         }
-        stage('Build submarine-cloud') {
+        stage('Build kogito-cloud') {
             steps {
                 script {
                     maven.runMavenWithSubmarineSettings('clean install', false)
@@ -63,4 +63,4 @@ pipeline {
             cleanWs()
         }
     }
-}
\ No newline at end of file
+}

From 0592124460871a3678fc3b2c2a2d7d0804a998fb Mon Sep 17 00:00:00 2001
From: tzimanyi <tibor.zimanyi@gmail.com>
Date: Mon, 27 May 2019 12:12:22 +0200
Subject: [PATCH 021/709] Fix submarine -> kogito rename leftovers

---
 .../workitems/DiscoveredServiceWorkItemHandler.java    |  2 +-
 .../cloud/workitems/HttpMethods.java                   |  2 +-
 .../cloud/workitems/ServiceInfo.java                   |  2 +-
 .../DiscoveredServiceWorkItemHandlerTest.java          |  2 +-
 s2i/modules/kaas-springboot-centos/s2i/bin/assemble    | 10 +++++-----
 .../kaas-springboot-centos/s2i/bin/assemble-runtime    |  8 ++++----
 s2i/modules/kaas-springboot-centos/s2i/bin/run         |  2 +-
 s2i/modules/maven/3.6.0/configure                      |  6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)
 rename kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/{submarine => kogito}/cloud/workitems/DiscoveredServiceWorkItemHandler.java (99%)
 rename kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/{submarine => kogito}/cloud/workitems/HttpMethods.java (93%)
 rename kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/{submarine => kogito}/cloud/workitems/ServiceInfo.java (96%)
 rename kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/{submarine => kogito}/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java (98%)

diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
similarity index 99%
rename from kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
rename to kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
index 85b429707fe..5c8e2ee5171 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandler.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.kie.submarine.cloud.workitems;
+package org.kie.kogito.cloud.workitems;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/HttpMethods.java
similarity index 93%
rename from kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
rename to kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/HttpMethods.java
index a6036f8e854..901f03ef9bc 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/HttpMethods.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/HttpMethods.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.kie.submarine.cloud.workitems;
+package org.kie.kogito.cloud.workitems;
 
 
 public enum HttpMethods {
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/ServiceInfo.java
similarity index 96%
rename from kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java
rename to kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/ServiceInfo.java
index 410192cf4c9..5a590ace8c9 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/submarine/cloud/workitems/ServiceInfo.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/ServiceInfo.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.kie.submarine.cloud.workitems;
+package org.kie.kogito.cloud.workitems;
 
 import java.util.Map;
 
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
similarity index 98%
rename from kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
rename to kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
index e0330260f3b..bd57d30b505 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/submarine/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.kie.submarine.cloud.workitems;
+package org.kie.kogito.cloud.workitems;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/assemble b/s2i/modules/kaas-springboot-centos/s2i/bin/assemble
index 4f2862a73ad..eddd94e36b9 100755
--- a/s2i/modules/kaas-springboot-centos/s2i/bin/assemble
+++ b/s2i/modules/kaas-springboot-centos/s2i/bin/assemble
@@ -2,17 +2,17 @@
 # this script is used by OpenShift with chained builds
 # to transfer data from builder image into the runtime image
 
-cp -R /tmp/src/bin/ $SUBMARINE_HOME
+cp -R /tmp/src/bin/ $KOGITO_HOME
 
-if [ -d "$SUBMARINE_HOME/bin" ]; then
+if [ -d "$KOGITO_HOME/bin" ]; then
   echo "---> Application binaries found and ready to use"
   
   echo "---> Adding custom labels..."
-  if [ -e "${SUBMARINE_HOME}/bin/image_metadata.json" ]; then
+  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
     mkdir /tmp/.s2i
-    mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
   else
-    echo "-----> Failed to copy metada file, $SUBMARINE_HOME/bin/image_metadata.json does not exist"
+    echo "-----> Failed to copy metada file, $KOGITO_HOME/bin/image_metadata.json does not exist"
   fi
 else
   echo "---> Application binaries NOT found, failing build..."
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime b/s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime
index 4601a8514c5..492dfd690da 100755
--- a/s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime
+++ b/s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime
@@ -6,15 +6,15 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-if [ -d "$SUBMARINE_HOME/bin" ]; then
+if [ -d "$KOGITO_HOME/bin" ]; then
   echo "---> Application binaries found and ready to use"
   
   echo "---> Adding custom labels..."
-  if [ -e "${SUBMARINE_HOME}/bin/image_metadata.json" ]; then
+  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
     mkdir /tmp/.s2i
-    mv -v $SUBMARINE_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
   else
-    echo "-----> Failed to copy metada file, $SUBMARINE_HOME/bin/image_metadata.json does not exist"
+    echo "-----> Failed to copy metada file, $KOGITO_HOME/bin/image_metadata.json does not exist"
   fi
 else
   echo "---> Application binaries NOT found, failing build..."
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/run b/s2i/modules/kaas-springboot-centos/s2i/bin/run
index c7dd5841d33..9c2c4f73153 100755
--- a/s2i/modules/kaas-springboot-centos/s2i/bin/run
+++ b/s2i/modules/kaas-springboot-centos/s2i/bin/run
@@ -6,4 +6,4 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec java -jar $SUBMARINE_HOME/bin/*.jar
+exec java -jar $KOGITO_HOME/bin/*.jar
diff --git a/s2i/modules/maven/3.6.0/configure b/s2i/modules/maven/3.6.0/configure
index 040cfa97e38..e130133ac63 100644
--- a/s2i/modules/maven/3.6.0/configure
+++ b/s2i/modules/maven/3.6.0/configure
@@ -7,6 +7,6 @@ SCRIPT_DIR=$(dirname $0)
 tar xzf ${SOURCES_DIR}/apache-maven-${MAVEN_VERSION}-bin.tar.gz -C /usr/share
 mv /usr/share/apache-maven-${MAVEN_VERSION} /usr/share/maven
 
-mkdir ${SUBMARINE_HOME}/.m2
-cp -v ${SCRIPT_DIR}/maven/* ${SUBMARINE_HOME}/.m2
-cp -v ${SCRIPT_DIR}/added/* ${SUBMARINE_HOME}/.m2
\ No newline at end of file
+mkdir ${KOGITO_HOME}/.m2
+cp -v ${SCRIPT_DIR}/maven/* ${KOGITO_HOME}/.m2
+cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/.m2
\ No newline at end of file

From 14f58b91b2951ae1cbc3868b0b73e7c5f8a4531f Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 27 May 2019 12:35:58 -0300
Subject: [PATCH 022/709] re-add quarkus s2i files and renaming (#18)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 .gitignore                                    |  1 -
 s2i/Makefile                                  |  2 +-
 s2i/README.md                                 |  2 +-
 .../s2i/bin/assemble                          | 80 +++++++++++++++++++
 .../kogito-quarkus-centos-s2i/s2i/bin/run     |  9 +++
 .../s2i/bin/save-artifacts                    |  9 +++
 .../kogito-quarkus-centos-s2i/s2i/bin/usasge  | 21 +++++
 .../s2i/bin/assemble                          |  0
 .../s2i/bin/assemble-runtime                  | 23 ++++++
 s2i/modules/kogito-quarkus-centos/s2i/bin/run |  9 +++
 .../kogito-quarkus-centos/s2i/bin/usage       | 12 +++
 .../s2i/bin/assemble                          |  0
 .../s2i/bin/run                               |  0
 .../s2i/bin/save-artifacts                    |  0
 .../s2i/bin/usage                             |  0
 .../kogito-springboot-centos/s2i/bin/assemble | 20 +++++
 .../s2i/bin/assemble-runtime                  |  2 +-
 .../s2i/bin/run                               |  2 +-
 .../s2i/bin/usage                             |  4 +-
 19 files changed, 189 insertions(+), 7 deletions(-)
 create mode 100644 s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/assemble
 create mode 100644 s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/run
 create mode 100644 s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/save-artifacts
 create mode 100644 s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usasge
 rename s2i/modules/{kaas-springboot-centos => kogito-quarkus-centos}/s2i/bin/assemble (100%)
 mode change 100755 => 100644
 create mode 100644 s2i/modules/kogito-quarkus-centos/s2i/bin/assemble-runtime
 create mode 100755 s2i/modules/kogito-quarkus-centos/s2i/bin/run
 create mode 100644 s2i/modules/kogito-quarkus-centos/s2i/bin/usage
 rename s2i/modules/{kaas-springboot-centos-s2i => kogito-springboot-centos-s2i}/s2i/bin/assemble (100%)
 rename s2i/modules/{kaas-springboot-centos-s2i => kogito-springboot-centos-s2i}/s2i/bin/run (100%)
 rename s2i/modules/{kaas-springboot-centos-s2i => kogito-springboot-centos-s2i}/s2i/bin/save-artifacts (100%)
 rename s2i/modules/{kaas-springboot-centos-s2i => kogito-springboot-centos-s2i}/s2i/bin/usage (100%)
 create mode 100755 s2i/modules/kogito-springboot-centos/s2i/bin/assemble
 rename s2i/modules/{kaas-springboot-centos => kogito-springboot-centos}/s2i/bin/assemble-runtime (90%)
 rename s2i/modules/{kaas-springboot-centos => kogito-springboot-centos}/s2i/bin/run (80%)
 rename s2i/modules/{kaas-springboot-centos => kogito-springboot-centos}/s2i/bin/usage (61%)

diff --git a/.gitignore b/.gitignore
index 611832304ea..9e3cd0af4f4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-bin/
 /target
 /local
 target/
diff --git a/s2i/Makefile b/s2i/Makefile
index b8c2be2aa90..b874173458b 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -63,7 +63,7 @@ test-cekit3:
 .PHONY: push
 push: build _push
 
-cekit3: build-cekit3 _push
+push-cekit3: build-cekit3 _push
 
 _push:
 	docker push quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION}
diff --git a/s2i/README.md b/s2i/README.md
index 239f1a0f137..08c43f6adf9 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -171,7 +171,7 @@ $ make
 
 To build a single image, use `make build image-name`, example:
 ```bash
-$ make kaas-quarkus-centos
+$ make kogito-quarkus-centos
 ```
 
 To build all images using cekit3:
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/assemble
new file mode 100644
index 00000000000..296fe0ad530
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/assemble
@@ -0,0 +1,80 @@
+#!/bin/bash -e
+#
+# S2I assemble script for the 'kaas-quarkus-centos-s2i' image.
+# The 'assemble' script builds your application source so that it is ready to run.
+#
+# For more information refer to the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+#############################################
+# Configure maven - for a complete list of
+# supported values, please refer the module.yaml
+# file.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/.m2/configure-maven.sh
+)
+source ${KOGITO_HOME}/.m2/configure.sh
+#############################################
+
+# If the 'kaas-quarkus-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
+if [[ "$1" == "-h" ]]; then
+	exec /usr/libexec/s2i/usage
+fi
+
+if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
+    echo "---> Restore build artifacts"
+    mv /tmp/artifacts/.m2 $HOME
+fi
+
+echo "---> Installing application source..."
+cd /tmp/src/
+
+if [ -f "pom.xml" ]; then
+	echo "---> Building application from source..."
+	$MAVEN_HOME/bin/mvn clean package -Pnative -s $KOGITO_HOME/.m2/settings.xml \
+    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
+else
+	echo "---> Generating project structure..."
+
+	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-quarkus-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
+
+	# copy resources into the generated project
+	for item in *
+	do
+		if [ -d $item ] && [ "$item" == "project" ]; then
+			echo "--> Skipping generated project ..."
+		else
+			echo "--> Coping resource $item"
+			cp -R $item project/src/main/resources
+		fi
+	done
+
+	# move all project content into the current directory
+	mv project/* .
+
+	echo "---> Building application from source..."
+	$MAVEN_HOME/bin/mvn clean package -Pnative -s $KOGITO_HOME/.m2/settings.xml \
+    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
+
+fi
+
+
+echo "---> Installing application binaries"
+mkdir $KOGITO_HOME/bin
+cp -v target/*-runner $KOGITO_HOME/bin
+chmod +x $KOGITO_HOME/bin/*-runner
+
+
+echo "---> Copy image metadata file..."
+if [ -e /tmp/src/target/image_metadata.json ]; then
+    mkdir /tmp/.s2i
+    cp -v /tmp/src/target/image_metadata.json /tmp/.s2i
+    cp -v /tmp/src/target/image_metadata.json $KOGITO_HOME/bin
+else
+    echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
+fi
+
+echo "---> Copy native java libraries for ssl handling..."
+cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/bin
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/run b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/run
new file mode 100644
index 00000000000..fc8eefefd74
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/run
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+#
+# S2I run script for the 'kogito-quarkus-centos-s2i' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/save-artifacts
new file mode 100644
index 00000000000..c9441b3d02c
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/save-artifacts
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+pushd ${HOME} > /dev/null
+if [ -d .m2 ]; then
+    tar cf - .m2
+    echo "--> Maven artifacts saved"
+    ls -l
+fi
+popd > /dev/null
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usasge b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usasge
new file mode 100644
index 00000000000..a5dfc996336
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usasge
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+cat <<EOF
+This is the kogito-quarkus-centos S2I image:
+
+Build native image based on project source either complete maven project or just set of business assets
+such as processes, rules, decisions.
+
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+This image is intended to build application binaries only that are later on transfered to runtime image.
+
+
+s2i build -c <source code path/URL> kogito-quarkus-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/kogito/bin
+
+Sample invocation:
+
+s2i build -c /Development/project/ kogito-quarkus-centos-s2i application --runtime-image kogito-quarkus-centos --runtime-artifact /home/kogito/bin
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
\ No newline at end of file
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/assemble b/s2i/modules/kogito-quarkus-centos/s2i/bin/assemble
old mode 100755
new mode 100644
similarity index 100%
rename from s2i/modules/kaas-springboot-centos/s2i/bin/assemble
rename to s2i/modules/kogito-quarkus-centos/s2i/bin/assemble
diff --git a/s2i/modules/kogito-quarkus-centos/s2i/bin/assemble-runtime b/s2i/modules/kogito-quarkus-centos/s2i/bin/assemble-runtime
new file mode 100644
index 00000000000..ff9c9e828f0
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-centos/s2i/bin/assemble-runtime
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+#
+# S2I assemble-runtime script for the 'kogito-quarkus-centos' image.
+# The assemble-runtime script executes preparation for running the container on runtime image.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+
+if [ -d "$KOGITO_HOME/bin" ]; then
+  echo "---> Application binaries found and ready to use"
+
+  echo "---> Adding custom labels..."
+  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
+    mkdir /tmp/.s2i
+    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+  else
+    echo "-----> Failed to copy metada file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+  fi
+else
+  echo "---> Application binaries NOT found, failing build..."
+  exit 1
+fi
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-centos/s2i/bin/run b/s2i/modules/kogito-quarkus-centos/s2i/bin/run
new file mode 100755
index 00000000000..0151fc92f8c
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-centos/s2i/bin/run
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+#
+# S2I run script for the 'kogito-quarkus-centos' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/bin
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-centos/s2i/bin/usage b/s2i/modules/kogito-quarkus-centos/s2i/bin/usage
new file mode 100644
index 00000000000..c55d6703dfa
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-centos/s2i/bin/usage
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+cat <<EOF
+This is the kogito-quarkus-centos S2I image:
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+Sample invocation:
+
+s2i build <source code path/URL> kogito-quarkus-centos <application image>
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
\ No newline at end of file
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble
similarity index 100%
rename from s2i/modules/kaas-springboot-centos-s2i/s2i/bin/assemble
rename to s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run b/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/run
similarity index 100%
rename from s2i/modules/kaas-springboot-centos-s2i/s2i/bin/run
rename to s2i/modules/kogito-springboot-centos-s2i/s2i/bin/run
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/save-artifacts
similarity index 100%
rename from s2i/modules/kaas-springboot-centos-s2i/s2i/bin/save-artifacts
rename to s2i/modules/kogito-springboot-centos-s2i/s2i/bin/save-artifacts
diff --git a/s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage b/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/usage
similarity index 100%
rename from s2i/modules/kaas-springboot-centos-s2i/s2i/bin/usage
rename to s2i/modules/kogito-springboot-centos-s2i/s2i/bin/usage
diff --git a/s2i/modules/kogito-springboot-centos/s2i/bin/assemble b/s2i/modules/kogito-springboot-centos/s2i/bin/assemble
new file mode 100755
index 00000000000..eddd94e36b9
--- /dev/null
+++ b/s2i/modules/kogito-springboot-centos/s2i/bin/assemble
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+# this script is used by OpenShift with chained builds
+# to transfer data from builder image into the runtime image
+
+cp -R /tmp/src/bin/ $KOGITO_HOME
+
+if [ -d "$KOGITO_HOME/bin" ]; then
+  echo "---> Application binaries found and ready to use"
+  
+  echo "---> Adding custom labels..."
+  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
+    mkdir /tmp/.s2i
+    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+  else
+    echo "-----> Failed to copy metada file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+  fi
+else
+  echo "---> Application binaries NOT found, failing build..."
+  exit 1
+fi
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime b/s2i/modules/kogito-springboot-centos/s2i/bin/assemble-runtime
similarity index 90%
rename from s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime
rename to s2i/modules/kogito-springboot-centos/s2i/bin/assemble-runtime
index 492dfd690da..3f7bd75056e 100755
--- a/s2i/modules/kaas-springboot-centos/s2i/bin/assemble-runtime
+++ b/s2i/modules/kogito-springboot-centos/s2i/bin/assemble-runtime
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# S2I assemble-runtime script for the 'kaas-springboot-centos' image.
+# S2I assemble-runtime script for the 'kogito-springboot-centos' image.
 # The assemble-runtime script executes preparation for running the container on runtime image.
 #
 # For more information see the documentation:
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/run b/s2i/modules/kogito-springboot-centos/s2i/bin/run
similarity index 80%
rename from s2i/modules/kaas-springboot-centos/s2i/bin/run
rename to s2i/modules/kogito-springboot-centos/s2i/bin/run
index 9c2c4f73153..42ca87db0ee 100755
--- a/s2i/modules/kaas-springboot-centos/s2i/bin/run
+++ b/s2i/modules/kogito-springboot-centos/s2i/bin/run
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# S2I run script for the 'kaas-springboot-centos' image.
+# S2I run script for the 'kogito-springboot-centos' image.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
diff --git a/s2i/modules/kaas-springboot-centos/s2i/bin/usage b/s2i/modules/kogito-springboot-centos/s2i/bin/usage
similarity index 61%
rename from s2i/modules/kaas-springboot-centos/s2i/bin/usage
rename to s2i/modules/kogito-springboot-centos/s2i/bin/usage
index 99d159ba98f..5c827268655 100755
--- a/s2i/modules/kaas-springboot-centos/s2i/bin/usage
+++ b/s2i/modules/kogito-springboot-centos/s2i/bin/usage
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 cat <<EOF
-This is the kaas-quarkus-centos S2I image:
+This is the kogito-quarkus-centos S2I image:
 To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build <source code path/URL> kaas-quarkus-centos <application image>
+s2i build <source code path/URL> kogito-quarkus-centos <application image>
 
 You can then run the resulting image via:
 docker run <application image>

From 70f483c9c58588a001b351c6fc067cb414bb21c7 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Thu, 6 Jun 2019 11:30:52 +0200
Subject: [PATCH 023/709] add missing pom.xml configuration to meet release
 rules for repository (#20)

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 21843a63c02..0604f03f4b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,6 @@
     <version>8.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.kie.kogito</groupId>
   <artifactId>kogito-cloud</artifactId>
   <packaging>pom</packaging>
 
@@ -35,6 +34,12 @@
       </snapshots>
     </repository>
   </repositories>
+  
+  <scm>
+    <connection>scm:git:https://github.com/kiegroup/kogito-cloud.git</connection>
+    <developerConnection>scm:git:git@github.com:kiegroup/kogito-cloud.git</developerConnection>
+    <url>https://github.com/kiegroup/kogito-cloud</url>
+  </scm>
 
   <modules>
     <module>kogito-cloud-services</module>

From 2a6d511bb65d3586c7a6f0782fd1f4e221fdc663 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 11 Jun 2019 12:39:35 -0300
Subject: [PATCH 024/709] [JBPM-8549] - Adding test cases mocking kubernetes
 api calls to be able to replace clients in the future, preserving behavior
 (#19)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 .../kogito-cloud-workitems/pom.xml            |  7 ++
 .../BaseKubernetesDiscoveredServiceTest.java  | 74 +++++++++++++++++++
 ...sDiscoveredServiceWorkItemHandlerTest.java | 70 ++++++++++++++++++
 3 files changed, 151 insertions(+)
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java

diff --git a/kogito-cloud-services/kogito-cloud-workitems/pom.xml b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
index 18b6c73cea4..f4f8689a9d2 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/pom.xml
+++ b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
@@ -40,5 +40,12 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Fabric8 client used exclusively for tests purposes only -->
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-server-mock</artifactId>
+      <version>${version.kubernetes-client}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
new file mode 100644
index 00000000000..5c0c9637e0e
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+
+package org.kie.kogito.cloud.workitems;
+
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.junit.After;
+import org.junit.Before;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemManager;
+
+/**
+ * Base class for tests with Kubernetes API. In this scenario, nor Istio or KNative is available.
+ */
+public abstract class BaseKubernetesDiscoveredServiceTest {
+
+    public KubernetesServer server = new KubernetesServer(true, true);
+
+    public static final String MOCK_NAMESPACE = "mock-namespace";
+
+    // will be changed to junit5 extensions once migrated
+    @Before
+    public void before() {
+        server.before();
+    }
+
+    // will be changed to junit5 extensions once migrated
+    @After
+    public void after() {
+        server.after();
+    }
+
+    protected KubernetesClient getClient() {
+
+        return server.getClient().inNamespace(MOCK_NAMESPACE);
+    }
+
+    protected static class TestDiscoveredServiceWorkItemHandler extends DiscoveredServiceWorkItemHandler {
+
+        private final BaseKubernetesDiscoveredServiceTest testCase;
+
+        public TestDiscoveredServiceWorkItemHandler(BaseKubernetesDiscoveredServiceTest testCase) {
+            super();
+            this.testCase = testCase;
+        }
+
+        @Override
+        public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {}
+
+        @Override
+        public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {}
+
+        @Override
+        protected KubernetesClient getKubeClient() {
+            this.istionGatewayClusterIp = null;
+            return this.testCase.getClient();
+        }
+
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
new file mode 100644
index 00000000000..5af84176df9
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+
+package org.kie.kogito.cloud.workitems;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.LoadBalancerStatus;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.api.model.ServicePort;
+import io.fabric8.kubernetes.api.model.ServiceSpec;
+import io.fabric8.kubernetes.api.model.ServiceStatus;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+public class KubernetesDiscoveredServiceWorkItemHandlerTest extends BaseKubernetesDiscoveredServiceTest {
+
+    @Test
+    public void testGivenServiceExists() {
+        final ServiceSpec serviceSpec = new ServiceSpec();
+        serviceSpec.setPorts(Collections.singletonList(new ServicePort("http", 0, 8080, "http", new IntOrString(8080))));
+        serviceSpec.setClusterIP("172.30.158.31");
+        serviceSpec.setType("ClusterIP");
+        serviceSpec.setSessionAffinity("ClientIP");
+
+        final ObjectMeta metadata = new ObjectMeta();
+        metadata.setName("test-kieserver");
+        metadata.setNamespace(MOCK_NAMESPACE);
+        metadata.setLabels(Collections.singletonMap("service", "test-kieserver"));
+
+        final Service service = new Service("v1", "Service", metadata, serviceSpec, new ServiceStatus(new LoadBalancerStatus()));
+        getClient().services().create(service);
+
+        final DiscoveredServiceWorkItemHandler handler = new TestDiscoveredServiceWorkItemHandler(this);
+        final ServiceInfo serviceInfo = handler.findEndpoint(MOCK_NAMESPACE, "test-kieserver");
+        assertThat(serviceInfo, notNullValue());
+        assertThat(serviceInfo.getUrl(), is("http://172.30.158.31:8080/test-kieserver"));
+    }
+
+    @Test
+    public void testGivenServiceNotExists() throws IOException {
+        final DiscoveredServiceWorkItemHandler handler = new TestDiscoveredServiceWorkItemHandler(this);
+        try {
+            handler.findEndpoint(MOCK_NAMESPACE, "test-kieserver");
+            fail("Finding of non existing endpoint should throw RuntimeException.");
+        } catch (RuntimeException ex) {
+            assertThat(ex.getMessage(), containsString("No endpoint found"));
+        }
+    }
+}

From fe88f517dc79e325f9ff971625e0969e3e7ab9e8 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 28 Jun 2019 07:24:01 -0300
Subject: [PATCH 025/709] Remove cekit2 and use only cekit3 (#21)

A few bugs on cekit that was preventing to build and squash images
are now fixed, we can use only cekit3.
---
 s2i/Makefile | 42 ++++++------------------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/s2i/Makefile b/s2i/Makefile
index b874173458b..0d44cf592c9 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -1,5 +1,5 @@
 IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
-
+BUILD_ENGINE := docker
 .DEFAULT_GOAL := build
 
 # Build all images
@@ -7,49 +7,21 @@ IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
 build: kogito-quarkus-centos kogito-quarkus-centos-s2i kogito-springboot-centos kogito-springboot-centos-s2i
 
 kogito-quarkus-centos:
-	cekit build -v --overrides-file kogito-quarkus-centos-overrides.yaml
-	docker-squash quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION} --tag=quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION}
-	docker tag quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-centos:latest
+	cekit -v build --overrides-file kogito-quarkus-centos-overrides.yaml ${BUILD_ENGINE}
 
 kogito-quarkus-centos-s2i:
-	cekit build -v --overrides-file kogito-quarkus-centos-s2i-overrides.yaml
-	docker-squash quay.io/kiegroup/kogito-quarkus-centos-s2i:${IMAGE_VERSION} --tag=quay.io/kiegroup/kogito-quarkus-centos-s2i:${IMAGE_VERSION}
-	docker tag quay.io/kiegroup/kogito-quarkus-centos-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-centos-s2i:latest
+	cekit -v build --overrides-file kogito-quarkus-centos-s2i-overrides.yaml ${BUILD_ENGINE}
 
 kogito-springboot-centos:
-	cekit build -v --overrides-file kogito-springboot-centos-overrides.yaml
-	docker-squash quay.io/kiegroup/kogito-springboot-centos:${IMAGE_VERSION} --tag=quay.io/kiegroup/kogito-springboot-centos:${IMAGE_VERSION}
-	docker tag quay.io/kiegroup/kogito-springboot-centos:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-centos:latest
+	cekit -v build --overrides-file kogito-springboot-centos-overrides.yaml ${BUILD_ENGINE}
 
 kogito-springboot-centos-s2i:
-	cekit build -v --overrides-file kogito-springboot-centos-s2i-overrides.yaml
-	docker-squash quay.io/kiegroup/kogito-springboot-centos-s2i:${IMAGE_VERSION} --tag=quay.io/kiegroup/kogito-springboot-centos-s2i:${IMAGE_VERSION}
-	docker tag quay.io/kiegroup/kogito-springboot-centos-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-centos-s2i:latest
-
-.PHONY: build-cekit
-build-cekit3:
-	cekit -v build --overrides-file kogito-quarkus-centos-overrides.yaml docker
-	cekit -v build --overrides-file kogito-quarkus-centos-s2i-overrides.yaml docker
-	cekit -v build --overrides-file kogito-springboot-centos-overrides.yaml docker
-	cekit -v build --overrides-file kogito-springboot-centos-s2i-overrides.yaml docker
+	cekit -v build --overrides-file kogito-springboot-centos-s2i-overrides.yaml ${BUILD_ENGINE}
 
 
 # Build and test all images
 .PHONY: test
 test:
-	cekit build -v --overrides-file kogito-quarkus-centos-overrides.yaml
-	modules/kogito-quarkus-centos/test/run
-
-	cekit build -v --overrides-file kogito-quarkus-centos-s2i-overrides.yaml
-	modules/kogito-quarkus-centos-s2i/test/run
-
-	cekit build -v --overrides-file kogito-springboot-centos-overrides.yaml
-	modules/kogito-springboot-centos/test/run
-
-	cekit build -v --overrides-file kogito-springboot-centos-s2i-overrides.yaml
-	modules/kogito-springboot-centos-s2i-/test/run
-
-test-cekit3:
 	cekit -v build --overrides-file kogito-quarkus-centos-overrides.yaml --overrides 'name: kogito-quarkus-centos-candidate' docker --no-squash
 	modules/kogito-quarkus-centos/test/run
 	cekit -v build --overrides-file kogito-quarkus-centos-s2i-overrides.yaml --overrides 'name: kogito-quarkus-centos-s2i-candidate' docker --no-squash
@@ -59,12 +31,10 @@ test-cekit3:
 	cekit -v build --overrides-file kogito-springboot-centos-s2i-overrides.yaml --overrides 'name: kogito-springboot-centos-s2i-candidate' docker --no-squash
 	modules/kogito-springboot-centos-s2i-/test/run
 
+
 # push images to quay.io, this requires permissions under kiegroup organization
 .PHONY: push
 push: build _push
-
-push-cekit3: build-cekit3 _push
-
 _push:
 	docker push quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-quarkus-centos:latest

From c7fc5ff792696637192eaf6a8236d16013fd6170 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 16 Jul 2019 21:38:01 -0300
Subject: [PATCH 026/709] [KOGITO-58] Upgrading GraalVM libraries (#23)

---
 s2i/kogito-quarkus-centos-s2i-overrides.yaml  |  2 +-
 s2i/modules/graalvm/19.x/configure            |  9 ++++++++
 s2i/modules/graalvm/19.x/module.yaml          | 23 +++++++++++++++++++
 .../s2i/bin/{usasge => usage}                 |  0
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 s2i/modules/graalvm/19.x/configure
 create mode 100644 s2i/modules/graalvm/19.x/module.yaml
 rename s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/{usasge => usage} (100%)

diff --git a/s2i/kogito-quarkus-centos-s2i-overrides.yaml b/s2i/kogito-quarkus-centos-s2i-overrides.yaml
index 1f9f6222f12..3e259cbe18f 100644
--- a/s2i/kogito-quarkus-centos-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-centos-s2i-overrides.yaml
@@ -15,7 +15,7 @@ modules:
   install:
   - name: add-kogito-user
   - name: graalvm
-    version: "1.0.0-rc16"
+    version: "19.0.2"
   - name: maven
     version: "3.6.0"
   - name: kogito-quarkus-centos-s2i
diff --git a/s2i/modules/graalvm/19.x/configure b/s2i/modules/graalvm/19.x/configure
new file mode 100644
index 00000000000..a0195649d02
--- /dev/null
+++ b/s2i/modules/graalvm/19.x/configure
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+
+tar xzf ${SOURCES_DIR}/graalvm-ce-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
+
+/usr/share/graalvm/bin/gu -L install ${SOURCES_DIR}/native-image-installable-svm-linux-amd64-${GRAALVM_VERSION}.jar
\ No newline at end of file
diff --git a/s2i/modules/graalvm/19.x/module.yaml b/s2i/modules/graalvm/19.x/module.yaml
new file mode 100644
index 00000000000..70d635e2716
--- /dev/null
+++ b/s2i/modules/graalvm/19.x/module.yaml
@@ -0,0 +1,23 @@
+schema_version: 1
+name: graalvm
+version: "19.0.2"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/usr/share/graalvm"
+  #version without prefix ce
+  - name: "GRAALVM_VERSION"
+    value: "19.0.2"
+
+artifacts:
+- name: graalvm-ce-linux-amd64-19.0.2.tar.gz
+  url: https://github.com/oracle/graal/releases/download/vm-19.0.2/graalvm-ce-linux-amd64-19.0.2.tar.gz
+  md5: fd4d5f28d3fe8391b93681a61f824f16
+- name: native-image-installable-svm-linux-amd64-19.0.2.jar
+  url: https://github.com/oracle/graal/releases/download/vm-19.0.2/native-image-installable-svm-linux-amd64-19.0.2.jar
+  md5: ef96ea375bd7838e3d4cccec9b0f4370
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usasge b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usage
similarity index 100%
rename from s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usasge
rename to s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usage

From 291b2443d6668b550a356bbaeed26e49a235f8c9 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 17 Jul 2019 18:50:31 -0300
Subject: [PATCH 027/709] [KOGITO-34] - Update KOGITO images on quay.io (#24)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/README.md               |  7 +------
 s2i/image.yaml              |  2 +-
 s2i/kogito-imagestream.yaml | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/s2i/README.md b/s2i/README.md
index 08c43f6adf9..7e7b133fc5a 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -162,7 +162,7 @@ MAVEN_MIRROR_URL environment variable when starting a new build.
 
 ## Building the images locally:
 
-CeKit2 or 3 (Not fully tested) and docker-squash are required to build the images, how to install: https://docs.cekit.io/en/latest/handbook/installation/instructions.html
+CeKit3 is required to build the images, how to install: https://docs.cekit.io/en/latest/handbook/installation/instructions.html
 
 To build all images:
 ```bash
@@ -174,11 +174,6 @@ To build a single image, use `make build image-name`, example:
 $ make kogito-quarkus-centos
 ```
 
-To build all images using cekit3:
-```bash
-$ make build-cekit3
-```
-
 Testing the images (WIP):
 ```bash
 $ make test
diff --git a/s2i/image.yaml b/s2i/image.yaml
index 98379087402..af53a2b021b 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "1.0"
+version: "0.2.0"
 from: "centos:latest"
 
 labels:
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index bf9e2f108f3..34081a79629 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '1.0'
+    - name: '0.2.0'
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
         tags: builder,runtime,kogito,quarkus
         supports: quarkus
-        version: '1.0'
+        version: '0.2.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-centos:1.0
+        name: quay.io/kiegroup/kogito-quarkus-centos:0.2.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -36,18 +36,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '1.0'
+    - name: '0.2.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,quarkus
         supports: quarkus
-        version: '1.0'
+        version: '0.2.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-centos-s2i:1.0
+        name: quay.io/kiegroup/kogito-quarkus-centos-s2i:0.2.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -57,18 +57,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '1.0'
+    - name: '0.2.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,runtime,kogito,springboot
         supports: springboot
-        version: '1.0'
+        version: '0.2.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-centos:1.0
+        name: quay.io/kiegroup/kogito-springboot-centos:0.2.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -78,15 +78,15 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '1.0'
+    - name: '0.2.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,springboot
         supports: springboot
-        version: '1.0'
+        version: '0.2.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-centos-s2i:1.0
+        name: quay.io/kiegroup/kogito-springboot-centos-s2i:0.2.0

From f245cafeef96be7cd9bb5e60116d467fb409bb07 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Thu, 18 Jul 2019 18:51:05 -0300
Subject: [PATCH 028/709] [JBPM-8549] - Introducing Kogito Kubernetes Client
 (#22)

---
 .../kogito-cloud-kubernetes-client/.gitignore |  32 +++
 .../kogito-cloud-kubernetes-client/README.md  |  10 +
 .../kogito-cloud-kubernetes-client/pom.xml    |  56 +++++
 .../client/DefaultKogitoKubeClient.java       |  72 +++++++
 .../kubernetes/client/KogitoKubeClient.java   |  36 ++++
 .../client/KogitoKubeClientException.java     |  42 ++++
 .../kubernetes/client/KogitoKubeConfig.java   |  83 +++++++
 .../kubernetes/client/OperationsUtils.java    |  23 ++
 .../client/operations/BaseListOperations.java |  37 ++++
 .../client/operations/BaseOperations.java     | 115 ++++++++++
 .../operations/IstioGatewayOperations.java    |  36 ++++
 .../operations/KNativeServiceOperations.java  |  31 +++
 .../client/operations/ListOperations.java     |  41 ++++
 .../client/operations/MapWalker.java          | 121 +++++++++++
 .../client/operations/Operations.java         |  22 ++
 .../operations/OperationsResponseParser.java  |  91 ++++++++
 .../client/operations/ServiceOperations.java  |  35 +++
 .../client/KubeClientConfigTest.java          |  68 ++++++
 .../client/MockKubernetesServerSupport.java   | 134 ++++++++++++
 .../client/operations/MapWalkerTest.java      |  44 ++++
 ...rviceOperationsStatusCodeHandlingTest.java |  74 +++++++
 .../operations/ServiceOperationsTest.java     | 112 ++++++++++
 .../src/test/resources/logback-test.xml       |  14 ++
 .../kogito-cloud-workitems/pom.xml            |  12 +-
 .../DiscoveredServiceWorkItemHandler.java     | 203 ++++++------------
 .../discovery/BaseServiceDiscovery.java       |  90 ++++++++
 .../discovery/IstioServiceDiscovery.java      |  75 +++++++
 .../discovery/KubernetesServiceDiscovery.java |  60 ++++++
 .../service/discovery/ServiceDiscovery.java   |  49 +++++
 .../discovery/ServiceDiscoveryFactory.java    |  90 ++++++++
 .../BaseKubernetesDiscoveredServiceTest.java  |  49 ++++-
 .../DiscoveredServiceWorkItemHandlerTest.java |  25 ++-
 ...eDiscoveredServiceWorkItemHandlerTest.java |  45 ++++
 .../src/test/resources/logback-test.xml       |  14 ++
 .../istio/services-istio-ingressgateway.json  | 112 ++++++++++
 .../knative/serving.knative.dev-services.json |  91 ++++++++
 kogito-cloud-services/pom.xml                 |   5 +-
 37 files changed, 2088 insertions(+), 161 deletions(-)
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/.gitignore
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/README.md
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/DefaultKogitoKubeClient.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClient.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClientException.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeConfig.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/OperationsUtils.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseListOperations.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseOperations.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/IstioGatewayOperations.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/KNativeServiceOperations.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ListOperations.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalker.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/Operations.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/OperationsResponseParser.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperations.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/resources/logback-test.xml
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/BaseServiceDiscovery.java
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscovery.java
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscovery.java
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/resources/logback-test.xml
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/knative/serving.knative.dev-services.json

diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/.gitignore b/kogito-cloud-services/kogito-cloud-kubernetes-client/.gitignore
new file mode 100644
index 00000000000..0d73459cf99
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/.gitignore
@@ -0,0 +1,32 @@
+bin/
+/target
+/local
+
+# Eclipse, Netbeans and IntelliJ files
+/.*
+!.gitignore
+/nbproject
+/*.ipr
+/*.iws
+/*.iml
+
+# Repository wide ignore mac DS_Store files
+.DS_Store
+
+# Original jbpm ignores
+*~
+
+# Test info
+/settings*.xml
+/lib-jdbc/
+*.db
+*.tlog
+
+# modules that don't exist in this branch
+/jbpm-human-task-war/
+/jbpm-bam/
+/jbpm-gwt/
+
+# files used for external db testing
+jdbc_driver.jar
+db-settings.xml
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/README.md b/kogito-cloud-services/kogito-cloud-kubernetes-client/README.md
new file mode 100644
index 00000000000..3fc8ec36655
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/README.md
@@ -0,0 +1,10 @@
+# Kogito Cloud Kubernetes Client
+
+This library is designed to be used with Kogito Cloud module, but also as a standalone library as an alternative Kubernetes client on [native images](https://www.graalvm.org/docs/reference-manual/aot-compilation/).
+
+It's a wrapper around the [Fabric8 Kubernetes Client API](https://github.com/fabric8io/kubernetes-client), with some tweaks:
+
+1. Removes the Kube Config file parsing as an alternative to connect to the cluster because of [its reflection usage](https://github.com/fabric8io/kubernetes-client/issues/1591).
+2. Parse JSON API responses as simple Maps to avoid using reflection to build domain objects during runtime like Jackson does. As an alternative, uses Yasson to parse JSON responses and a simple utility to walk into the resulted map.
+
+It's meant to be simple to support simple use cases.
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml b/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
new file mode 100644
index 00000000000..42374698d47
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.kie.kogito</groupId>
+    <artifactId>kogito-cloud-services</artifactId>
+    <version>8.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>kogito-cloud-kubernetes-client</artifactId>
+  <name>Kogito Cloud Kubernetes Client</name>
+  <description>Kogito Cloud Kubernetes Client</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-server-mock</artifactId>
+      <version>${version.kubernetes-client}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- Logging -->
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/DefaultKogitoKubeClient.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/DefaultKogitoKubeClient.java
new file mode 100644
index 00000000000..ca23645266c
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/DefaultKogitoKubeClient.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client;
+
+import org.kie.kogito.cloud.kubernetes.client.operations.IstioGatewayOperations;
+import org.kie.kogito.cloud.kubernetes.client.operations.KNativeServiceOperations;
+import org.kie.kogito.cloud.kubernetes.client.operations.ServiceOperations;
+
+/**
+ * Default {@link KogitoKubeClient} implementation.
+ */
+public class DefaultKogitoKubeClient implements KogitoKubeClient {
+
+    private ServiceOperations serviceOperation;
+    private IstioGatewayOperations istioGatewayOperations;
+    private KNativeServiceOperations kNativeServiceOperations;
+    private KogitoKubeConfig clientConfig;
+
+    public DefaultKogitoKubeClient() {
+        this.clientConfig = new KogitoKubeConfig();
+    }
+
+    @Override
+    public KogitoKubeConfig getConfig() {
+        return this.clientConfig;
+    }
+
+    @Override
+    public DefaultKogitoKubeClient withConfig(KogitoKubeConfig clientConfig) {
+        this.clientConfig = clientConfig;
+        return this;
+    }
+
+    /**
+     * The Services Operations
+     */
+    @Override
+    public ServiceOperations services() {
+        if (serviceOperation == null) {
+            this.serviceOperation = new ServiceOperations(clientConfig);
+        }
+        return this.serviceOperation;
+    }
+
+    @Override
+    public IstioGatewayOperations istioGateway() {
+        if (istioGatewayOperations == null) {
+            this.istioGatewayOperations = new IstioGatewayOperations(clientConfig);
+        }
+        return this.istioGatewayOperations;
+    }
+
+    @Override
+    public KNativeServiceOperations knativeService() {
+        if (kNativeServiceOperations == null) {
+            this.kNativeServiceOperations = new KNativeServiceOperations(clientConfig);
+        }
+        return this.kNativeServiceOperations;
+    }
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClient.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClient.java
new file mode 100644
index 00000000000..740f6f087a7
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClient.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client;
+
+import org.kie.kogito.cloud.kubernetes.client.operations.IstioGatewayOperations;
+import org.kie.kogito.cloud.kubernetes.client.operations.KNativeServiceOperations;
+import org.kie.kogito.cloud.kubernetes.client.operations.ServiceOperations;
+
+/**
+ * Main interface to communicate with Kubernetes Cluster API.
+ */
+public interface KogitoKubeClient {
+
+    ServiceOperations services();
+
+    IstioGatewayOperations istioGateway();
+
+    KNativeServiceOperations knativeService();
+
+    KogitoKubeClient withConfig(KogitoKubeConfig config);
+
+    KogitoKubeConfig getConfig();
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClientException.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClientException.java
new file mode 100644
index 00000000000..696a523967d
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClientException.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client;
+
+/**
+ * Generic exception for the Kube Client
+ */
+public class KogitoKubeClientException extends RuntimeException {
+
+    private static final long serialVersionUID = 5121838037390778349L;
+
+    public KogitoKubeClientException() {}
+
+    public KogitoKubeClientException(String message) {
+        super(message);
+    }
+
+    public KogitoKubeClientException(Throwable cause) {
+        super(cause);
+    }
+
+    public KogitoKubeClientException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public KogitoKubeClientException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeConfig.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeConfig.java
new file mode 100644
index 00000000000..6adbb069546
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeConfig.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import io.fabric8.kubernetes.client.BaseClient;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.dsl.base.OperationSupport;
+import okhttp3.OkHttpClient;
+
+/**
+ * Wraps the Kubernetes Client setup and configuration, exposing infrastructure components to connect to a Kubernetes cluster reliably. 
+ * Most used when there's a need to customize the Fabric8 Kubernetes Client.
+ */
+public final class KogitoKubeConfig {
+
+    public static final String KNATIVE_ISTIO_NAMESPACE = "istio-system";
+    private static final String NAMESPACE_REPLACE = "@ns@";
+    private static final String KNATIVE_SERVICE_SERVICE_URL = "apis/serving.knative.dev/v1alpha1/namespaces/" + NAMESPACE_REPLACE + "/services";
+    private static final String KNATIVE_ISTIO_GATEWAY_URL = "api/v1/namespaces/" + KNATIVE_ISTIO_NAMESPACE + "/services/istio-ingressgateway";
+
+    private KubernetesClient kubernetesClient;
+
+    public KogitoKubeConfig() {
+        // disable kube config file deserialization due to reflection usage
+        System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
+        this.kubernetesClient = new DefaultKubernetesClient();
+    }
+
+    /**
+     * Highly customizable config client. Most used in integration tests. 90% of the time you won't need to use this constructor.
+     * 
+     * @param kubernetesClient
+     */
+    public KogitoKubeConfig(KubernetesClient kubernetesClient) {
+        this.kubernetesClient = kubernetesClient;
+    }
+
+    public OkHttpClient getHttpClient() {
+        return ((BaseClient) this.kubernetesClient).getHttpClient();
+    }
+
+    public URL getMasterUrl() {
+        return this.kubernetesClient.getMasterUrl();
+    }
+
+    public String getKNativeServiceServiceURL(String namespace) throws MalformedURLException {
+        if (namespace == null || namespace.isEmpty()) {
+            throw new IllegalArgumentException("A namespace should be provided when using KNative service operations");
+        }
+        final StringBuilder sb = new StringBuilder(this.getMasterUrl().toString());
+        sb.append(KNATIVE_SERVICE_SERVICE_URL.replaceFirst(NAMESPACE_REPLACE, namespace));
+        return sb.toString();
+    }
+
+    public String getKNativeIstioGatewayURL() throws MalformedURLException {
+        final StringBuilder sb = new StringBuilder(this.getMasterUrl().toString());
+        sb.append(KNATIVE_ISTIO_GATEWAY_URL);
+        return sb.toString();
+    }
+
+    public URL getServiceOperationURL(final String namespace) throws MalformedURLException {
+        final OperationSupport services = ((OperationSupport) this.kubernetesClient.services());
+        return services.getNamespacedUrl(namespace);
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/OperationsUtils.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/OperationsUtils.java
new file mode 100644
index 00000000000..f66ba67bf5d
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/OperationsUtils.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client;
+
+public final class OperationsUtils {
+
+    public static final String LABEL_SELECTOR_PARAM = "labelSelector";
+
+    private OperationsUtils() {}
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseListOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseListOperations.java
new file mode 100644
index 00000000000..80c25114ef7
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseListOperations.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.util.Map;
+
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
+
+public abstract class BaseListOperations extends BaseOperations implements ListOperations {
+
+    public BaseListOperations(KogitoKubeConfig clientConfig) {
+        super(clientConfig);
+    }
+
+    @Override
+    public OperationsResponseParser listNamespaced(String namespace, Map<String, String> labels) {
+        return this.execute(namespace, labels);
+    }
+
+    @Override
+    public OperationsResponseParser list(Map<String, String> labels) {
+        return this.listNamespaced(null, labels);
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseOperations.java
new file mode 100644
index 00000000000..1b5b13eb5a3
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseOperations.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import okhttp3.Request;
+import okhttp3.Response;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClientException;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
+import org.kie.kogito.cloud.kubernetes.client.OperationsUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Base class for all operations
+ */
+public abstract class BaseOperations implements Operations {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(BaseOperations.class);
+    private static final String EMPTY_JSON = "{}";
+
+    private final KogitoKubeConfig clientConfig;
+
+    public BaseOperations(final KogitoKubeConfig clientConfig) {
+        this.clientConfig = clientConfig;
+    }
+
+    public final KogitoKubeConfig getClientConfig() {
+        return clientConfig;
+    }
+
+    private URL doBuildUrl(final String namespace, final Map<String, String> labels) {
+        try {
+            StringBuilder sb = new StringBuilder(this.buildBaseUrl(namespace));
+            if (labels != null) {
+                sb.append("?").append(OperationsUtils.LABEL_SELECTOR_PARAM).append("=");
+                sb.append(this.buildLabelSelectorParam(labels));
+            }
+            return new URL(sb.toString());
+        } catch (Exception e) {
+            throw new KogitoKubeClientException(String.format("Error while trying to build URL for the Service API: '%s'", e.getMessage()), e);
+        }
+    }
+
+    private String buildLabelSelectorParam(final Map<String, String> labels) {
+        if (labels != null) {
+            return labels.entrySet()
+                         .stream()
+                         .map(label -> String.format(label.getValue() == null || label.getValue().isEmpty() ? "%s" : "%s=%s", label.getKey(), label.getValue()))
+                         .collect(Collectors.joining(","));
+        }
+        return "";
+    }
+
+    private Response doExecute(final String namespace, final Map<String, String> labels) throws IOException {
+        final URL url = this.doBuildUrl(namespace, labels);
+        final Request request = new Request.Builder().url(url).build();
+
+        LOGGER.debug("About to query the Kubernetes API with url {} with label selector {} in namespace  '{}'", url, labels, namespace);
+
+        return clientConfig.getHttpClient().newCall(request).execute();
+    }
+
+    protected OperationsResponseParser execute(final String namespace, final Map<String, String> labels) {
+        try (Response response = this.doExecute(namespace, labels)) {
+            LOGGER.debug("Response Headers received from the Kube cluster: {}", response.headers());
+            if (response.isSuccessful()) {
+                final String data = response.body().string();
+                LOGGER.debug("Received response data from Kube API: {}", data);
+                return new OperationsResponseParser(data);
+            }
+            if (response.code() == HttpURLConnection.HTTP_NOT_FOUND) {
+                LOGGER.debug("No resources found in namespace '{}' with labels {}", namespace, labels);
+                return new OperationsResponseParser(EMPTY_JSON);
+            }
+            if (response.code() == HttpURLConnection.HTTP_FORBIDDEN || response.code() == HttpURLConnection.HTTP_UNAUTHORIZED) {
+                throw new KogitoKubeClientException(String.format("Tried to fetch for resources, got unauthorized/forbidden response: %s. Make sure to correctly set a Service Account with permissions to fetch the resource.",
+                                                                  response));
+            }
+            throw new KogitoKubeClientException(String.format("Error trying to fetch the Kubernetes API. Response is: %s", response));
+        } catch (KogitoKubeClientException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new KogitoKubeClientException(String.format("Error trying to fetch the Kubernetes API - '%s: %s'", e.getClass(), e.getMessage()), e);
+        }
+    }
+
+    /**
+     * URL builder for the API calls. Normally composed by the Master URL + Resource Path.
+     * 
+     * @param namespace
+     * @return
+     * @throws MalformedURLException
+     * @see {@link ServiceOperations#buildBaseUrl(String)}
+     */
+    protected abstract String buildBaseUrl(final String namespace) throws MalformedURLException;
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/IstioGatewayOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/IstioGatewayOperations.java
new file mode 100644
index 00000000000..8e89eebb053
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/IstioGatewayOperations.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.net.MalformedURLException;
+
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
+
+public class IstioGatewayOperations extends BaseOperations {
+
+    public IstioGatewayOperations(final KogitoKubeConfig config) {
+        super(config);
+    }
+
+    public OperationsResponseParser get() {
+        return this.execute(null, null);
+    }
+
+    @Override
+    protected String buildBaseUrl(String namespace) throws MalformedURLException {
+        return this.getClientConfig().getKNativeIstioGatewayURL();
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/KNativeServiceOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/KNativeServiceOperations.java
new file mode 100644
index 00000000000..073b493a818
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/KNativeServiceOperations.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.net.MalformedURLException;
+
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
+
+public class KNativeServiceOperations extends BaseListOperations {
+
+    public KNativeServiceOperations(KogitoKubeConfig clientConfig) {
+        super(clientConfig);
+    }
+
+    @Override
+    protected String buildBaseUrl(String namespace) throws MalformedURLException {
+        return this.getClientConfig().getKNativeServiceServiceURL(namespace);
+    }
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ListOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ListOperations.java
new file mode 100644
index 00000000000..8b68b20c2cf
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ListOperations.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.util.Map;
+
+/**
+ * Operations that return a list of objects. Normally a <code>kind: List</code> with <code>items</code> attribute.
+ */
+public interface ListOperations extends Operations {
+
+    /**
+     * Query for a list of services within a namespace.
+     * 
+     * @param namespace
+     * @param labels
+     * @return A JSON Document reference of the Service API response
+     */
+    OperationsResponseParser listNamespaced(final String namespace, final Map<String, String> labels);
+
+    /**
+     * Queries for a list of services in the entire cluster. A service account with permissions to query the cluster might be needed. 
+     * 
+     * @param labels
+     * @return A JSON Document reference of the Service API response
+     */
+    OperationsResponseParser list(final Map<String, String> labels);
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalker.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalker.java
new file mode 100644
index 00000000000..487f25b1685
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalker.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Utility to avoid chaining conversion in code
+ */
+@SuppressWarnings("unchecked")
+public final class MapWalker {
+
+    private Object theMap;
+    private boolean safeNull;
+
+    /**
+     * Walker with safe null
+     * @param theMap that we're going to walk into
+     * @param safeNull whether to return a null value at the end of the walk, otherwise if the key isn't expected a NPE or an {@link IllegalArgumentException} might raise.
+     */
+    public MapWalker(Object theMap, boolean safeNull) {
+        this.theMap = theMap;
+        this.safeNull = safeNull;
+    }
+
+    public MapWalker(Object theMap) {
+        this(theMap, false);
+    }
+
+    /**
+     * Return the object as a Map.
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    public <K, V> Map<K, V> asMap() {
+        if (theMap instanceof Map) {
+            return (Map<K, V>) theMap;
+        }
+        throw new IllegalArgumentException(String.format("The object %s is not a map. Impossible to get", theMap));
+    }
+
+    /**
+     * Return the object as a list
+     * @param <K>
+     * @param <V>
+     * @return
+     */
+    public <K, V> List<Map<K, V>> asList() {
+        if (theMap instanceof List) {
+            return (List<Map<K, V>>) theMap;
+        }
+        throw new IllegalArgumentException(String.format("The object %s is not a list. Impossible to get", theMap));
+    }
+
+    /**
+     * The key value is another map 
+     */
+    public MapWalker mapToMap(String key) {
+        if (theMap instanceof Map) {
+            this.theMap = ((Map<String, ?>) theMap).get(key);
+            if (safeNull && this.theMap == null) {
+                this.theMap = new HashMap<>();
+            }
+            return this;
+        }
+        throw new IllegalArgumentException(String.format("The object %s is not a map. Impossible to walk to the key '%s'", theMap, key));
+    }
+
+    /**
+     * The key value is a list map.
+     * 
+     * @param key
+     * @return
+     */
+    public MapWalker mapToListMap(final String key) {
+        if (theMap instanceof Map) {
+            theMap = (List<Map<?, ?>>) ((Map<?, ?>) theMap).get(key);
+            if (safeNull && this.theMap == null) {
+                this.theMap = new ArrayList<Map<?, ?>>();
+            }
+            return this;
+        }
+        throw new IllegalArgumentException(String.format("The object %s is not a list. Impossible to walk to the key %s", theMap, key));
+    }
+
+    /**
+     * In a list, we take the index that is a map
+     * @param index
+     * @return
+     */
+    public MapWalker listToMap(final int index) {
+        if (theMap instanceof List) {
+            final List<Map<?, ?>> theList = ((List<Map<?, ?>>) theMap);
+            if (theList != null && theList.size() > index) {
+                theMap = (Map<?, ?>) theList.get(index);
+            } else {
+                this.theMap = new HashMap<>();
+            }
+
+            return this;
+        }
+        throw new IllegalArgumentException(String.format("The object %s is not a list. Impossible to walk to the index '%d'", theMap, index));
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/Operations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/Operations.java
new file mode 100644
index 00000000000..6b4526486f1
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/Operations.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+/**
+ * Common interface for operations on the Kubernetes API.
+ */
+public interface Operations {
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/OperationsResponseParser.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/OperationsResponseParser.java
new file mode 100644
index 00000000000..5f141334f70
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/OperationsResponseParser.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClientException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class OperationsResponseParser {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OperationsResponseParser.class);
+
+    private final String response;
+    private final ObjectMapper mapper;
+
+    public OperationsResponseParser(final String response) {
+        this.response = response;
+        this.mapper = new ObjectMapper();
+        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
+    }
+
+    /**
+     * Returns the raw JSON Document Response from the API
+     *  
+     * @return
+     */
+    public String asJson() {
+        return response;
+    }
+
+    /**
+     * Returns the JSON Document as a list of map
+     * 
+     * @return
+     */
+    public Map<String, Object> asMap() {
+        if (response == null || response.isEmpty()) {
+            return new HashMap<>();
+        }
+        try {
+            final TypeReference<HashMap<String, Object>> typeRef = new TypeReference<HashMap<String, Object>>() {
+            };
+            LOGGER.debug("Trying to parse API response {}", response);
+            return mapper.readValue(response, typeRef);
+        } catch (IOException e) {
+            throw new KogitoKubeClientException("Error while trying to parse API response", e);
+        }
+    }
+
+    /**
+     * Default {@link MapWalker} that explodes an {@link IllegalArgumentException} in case the wrong path is taken
+     * 
+     * @return
+     */
+    public MapWalker asMapWalker() {
+        return this.asMapWalker(false);
+    }
+
+    /**
+     * A {@link MapWalker} with the option to turn on/off safe nulls
+     * @param safeNull
+     * @return
+     */
+    public MapWalker asMapWalker(final boolean safeNull) {
+        if (response == null || response.isEmpty()) {
+            return new MapWalker(new HashMap<>(), safeNull);
+        }
+        return new MapWalker(this.asMap(), safeNull);
+    }
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperations.java
new file mode 100644
index 00000000000..701197c3b1b
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperations.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.net.MalformedURLException;
+
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
+
+/**
+ * Wrapper for service operations on Kubernetes Client that resolves the responses from the API calls to Maps.
+ * @see <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.14/#service-v1-core">Kubernetes API Reference - Services</a>
+ */
+public class ServiceOperations extends BaseListOperations {
+
+    public ServiceOperations(final KogitoKubeConfig clientConfig) {
+        super(clientConfig);
+    }
+
+    @Override
+    protected String buildBaseUrl(String namespace) throws MalformedURLException {
+        return this.getClientConfig().getServiceOperationURL(namespace).toExternalForm();
+    }
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java
new file mode 100644
index 00000000000..c5a93b1d938
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class KubeClientConfigTest {
+
+    public static final Path KUBE_CONFIG_PATH = Paths.get(System.getProperty("user.home") + "/.kube/config");
+    public static final Path KUBE_CONFIG_DIR = Paths.get(System.getProperty("user.home") + "/.kube");
+
+    @Before
+    public void setup() throws IOException {
+        if (!Files.exists(KUBE_CONFIG_PATH)) {
+            if(!Files.exists(KUBE_CONFIG_DIR)) {
+                Files.createDirectories(KUBE_CONFIG_DIR);
+            }
+            Files.createFile(KUBE_CONFIG_PATH);
+        }
+    }
+
+    @After
+    public void teardown() throws IOException {
+        if (Files.exists(KUBE_CONFIG_PATH) && Files.readAllBytes(KUBE_CONFIG_PATH).length == 0) {
+            Files.delete(KUBE_CONFIG_PATH);
+            Files.delete(KUBE_CONFIG_DIR);
+        }
+        System.clearProperty("kubernetes.master");
+    }
+
+    @Test
+    public void whenCreateNewConfigurationIgnoresKubeConfigFile() {
+        final KogitoKubeConfig config = new KogitoKubeConfig();
+        assertThat(config.getHttpClient(), notNullValue());
+        assertThat(config.getMasterUrl().toString(), containsString("kubernetes.default.svc"));
+    }
+
+    @Test
+    public void whenGetFromSystemProps() {
+        System.setProperty("kubernetes.master", "localhost");
+        final KogitoKubeConfig config = new KogitoKubeConfig();
+        assertThat(config.getMasterUrl().toString(), containsString("localhost"));
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java
new file mode 100644
index 00000000000..a03ab0ee9a2
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client;
+
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.Map;
+
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.KubernetesList;
+import io.fabric8.kubernetes.api.model.LoadBalancerStatus;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.api.model.ServicePort;
+import io.fabric8.kubernetes.api.model.ServiceSpec;
+import io.fabric8.kubernetes.api.model.ServiceStatus;
+import io.fabric8.kubernetes.client.dsl.RecreateFromServerGettable;
+import io.fabric8.kubernetes.client.dsl.ServiceResource;
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.junit.After;
+import org.junit.Before;
+
+/**
+ * Base class to test use cases that need to query the API
+ */
+public abstract class MockKubernetesServerSupport {
+
+    public static final String MOCK_NAMESPACE = "test";
+    private KubernetesServer server;
+    private KogitoKubeClient kubeClient;
+
+    public MockKubernetesServerSupport() {
+        this.initializeServer(true);
+    }
+
+    public MockKubernetesServerSupport(final boolean crudMode) {
+        this.initializeServer(crudMode);
+    }
+
+    public KogitoKubeClient getKubeClient() {
+        return this.kubeClient;
+    }
+
+    public KubernetesServer getServer() {
+        return server;
+    }
+
+    /**
+     * Override to setup a different kind of server
+     */
+    protected final void initializeServer(final boolean crudMode) {
+        this.server = new KubernetesServer(false, crudMode);
+    }
+
+    @Before
+    public void before() {
+        server.before();
+        this.kubeClient = new DefaultKogitoKubeClient().withConfig(new KogitoKubeConfig(server.getClient()));
+    }
+
+    @After
+    public void after() {
+        server.after();
+    }
+
+    /**
+     * Creates a new mock service in the {@value #MOCK_NAMESPACE} with 127.0.0.1:8080 address
+     */
+    protected void createMockService() {
+        this.createMockService("test", "127.0.0.1", Collections.singletonMap("service", "test"), MOCK_NAMESPACE);
+    }
+
+    /**
+     * Same as {@link #createMockService()}, but let you choose the namespace. 
+     * @param namespace null to not specify where.
+     */
+    protected void createMockService(final String namespace) {
+        this.createMockService("test", "127.0.0.1", Collections.singletonMap("service", "test"), namespace);
+    }
+
+    /**
+     * Creates a service based on an {@link InputStream} of a json service response.
+     * 
+     * @param mockJsonResponse
+     */
+    protected void createMockService(final InputStream mockJsonResponse, final String namespace) {
+        final ServiceResource<Service, ?> serviceResource = this.server.getClient().inNamespace(namespace).services().load(mockJsonResponse);
+        this.server.getClient().inNamespace(namespace).services().create(serviceResource.get());
+    }
+
+    /**
+     * Creates a list of services based on a {@link InputStream} of a json servicelist response
+     * 
+     * @param mockJsonResponse
+     * @param namespace
+     */
+    protected void createMockServices(final InputStream mockJsonResponse, final String namespace) {
+        final RecreateFromServerGettable<KubernetesList, KubernetesList, ?> serviceResource = this.server.getClient().inNamespace(namespace).lists().load(mockJsonResponse);
+        this.server.getClient().inNamespace(namespace).lists().create(serviceResource.get());
+    }
+
+    protected void createMockService(final String serviceName, final String ip, final Map<String, String> labels, final String namespace) {
+        final ServiceSpec serviceSpec = new ServiceSpec();
+        serviceSpec.setPorts(Collections.singletonList(new ServicePort("http", 0, 8080, "http", new IntOrString(8080))));
+        serviceSpec.setClusterIP(ip);
+        serviceSpec.setType("ClusterIP");
+        serviceSpec.setSessionAffinity("ClientIP");
+
+        final ObjectMeta metadata = new ObjectMeta();
+        metadata.setName(serviceName);
+        metadata.setNamespace(MOCK_NAMESPACE);
+        metadata.setLabels(labels);
+
+        final Service service = new Service("v1", "Service", metadata, serviceSpec, new ServiceStatus(new LoadBalancerStatus()));
+        if (namespace != null) {
+            this.server.getClient().inNamespace(namespace).services().create(service);
+        } else {
+            this.server.getClient().services().create(service);
+        }
+
+    }
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java
new file mode 100644
index 00000000000..55a227b5d70
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.util.HashMap;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+public class MapWalkerTest {
+
+    public MapWalkerTest() {
+
+    }
+
+    @Test
+    public void whenMapIsEmptyAndIsSafe() {
+        final MapWalker walker = new MapWalker(new HashMap<>(), true);
+        assertThat(walker.mapToListMap("test").listToMap(0).asMap(), notNullValue());
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    public void whenMapIsEmptyAndIsNotSafe() {
+        final MapWalker walker = new MapWalker(new HashMap<>());
+       walker.mapToListMap("test").listToMap(0).asMap();
+       fail("Should explode an exception while is not safe walking through an empty map");
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java
new file mode 100644
index 00000000000..28a6f856892
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.net.HttpURLConnection;
+import java.util.Map;
+
+import org.junit.Test;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClientException;
+import org.kie.kogito.cloud.kubernetes.client.MockKubernetesServerSupport;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+/**
+ * Test cases where
+ */
+public class ServiceOperationsStatusCodeHandlingTest extends MockKubernetesServerSupport {
+
+    public ServiceOperationsStatusCodeHandlingTest() {
+        super(false);
+    }
+
+    @Test
+    public void whenNotFoundResponse() {
+        getServer().expect().get().withPath("/api/v1/services").andReturn(404, null).once();
+        Map<String, Object> services = this.getKubeClient().services().list(null).asMap();
+        assertThat(services, notNullValue());
+        assertThat(services.size(), is(0));
+    }
+
+    @Test
+    public void whenForbiddenResponse() {
+        try {
+            getServer().expect().get().withPath("/api/v1/services").andReturn(HttpURLConnection.HTTP_FORBIDDEN, null).once();
+            this.getKubeClient().services().list(null).asMap();
+            fail("Should explode a forbidden exception");
+        } catch (KogitoKubeClientException e) {
+            assertThat(e.getMessage(), containsString("forbidden"));
+        }
+    }
+
+    @Test
+    public void whenUnauthorizedResponse() {
+        try {
+            getServer().expect().get().withPath("/api/v1/services").andReturn(HttpURLConnection.HTTP_UNAUTHORIZED, null).once();
+            this.getKubeClient().services().list(null).asMap();
+            fail("Should explode a forbidden exception");
+        } catch (KogitoKubeClientException e) {
+            assertThat(e.getMessage(), containsString("unauthorized"));
+        }
+    }
+
+    @Test(expected = KogitoKubeClientException.class)
+    public void whenServerError() {
+        getServer().expect().get().withPath("/api/v1/services").andReturn(HttpURLConnection.HTTP_BAD_GATEWAY, null).once();
+        this.getKubeClient().services().list(null).asMap();
+    }
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java
new file mode 100644
index 00000000000..3fc161ad3e1
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.operations;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+import org.kie.kogito.cloud.kubernetes.client.MockKubernetesServerSupport;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class ServiceOperationsTest extends MockKubernetesServerSupport {
+
+    private void assertDefaultServiceCreated(final String services) throws JsonParseException, JsonMappingException, IOException {
+        this.assertDefaultServiceCreated(services, "127.0.0.1");
+    }
+
+    private void assertDefaultServiceCreated(final String services, final String assertIp) throws JsonParseException, JsonMappingException, IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        assertThat(services, notNullValue());
+        assertThat(services.isEmpty(), not(true));
+        final TypeReference<HashMap<String, Object>> typeRef = new TypeReference<HashMap<String, Object>>() {
+        };
+        Map<String, Object> servicesMap = mapper.readValue(services, typeRef);
+        Map<String, Object> spec =
+                new MapWalker(servicesMap)
+                                          .mapToListMap("items")
+                                          .listToMap(0)
+                                          .mapToMap("spec")
+                                          .asMap();
+        assertThat(spec.get("clusterIP"), is(assertIp));
+        assertThat(Integer.parseInt(new MapWalker(spec).mapToListMap("ports").listToMap(0).asMap().get("port").toString()), is(8080));
+    }
+
+    @Test
+    public void whenThereIsOneSingleServiceNamespaced() throws JsonParseException, JsonMappingException, IOException {
+        this.createMockService();
+        String services = this.getKubeClient().services().listNamespaced(MOCK_NAMESPACE, null).asJson();
+        this.assertDefaultServiceCreated(services);
+    }
+
+    @Test
+    public void whenThereIsAListOfServicesNamespaced() throws JsonParseException, JsonMappingException, IOException {
+        this.createMockService();
+        this.createMockService("service2", "192.168.0.1", Collections.singletonMap("service", "test2"), MOCK_NAMESPACE);
+        String services = this.getKubeClient().services().listNamespaced(MOCK_NAMESPACE, null).asJson();
+        this.assertDefaultServiceCreated(services, "192.168.0.1");
+    }
+    
+    @Test
+    public void whenThereIsAListOfServicesNamespacedLookingForLabelKey() throws JsonParseException, JsonMappingException, IOException {
+        this.createMockService("service2", "192.168.0.1", Collections.singletonMap("service", null), MOCK_NAMESPACE);
+        String services = this.getKubeClient().services().listNamespaced(MOCK_NAMESPACE, Collections.singletonMap("service", null)).asJson();
+        this.assertDefaultServiceCreated(services, "192.168.0.1");
+    }
+
+    @Test
+    public void whenThereIsAListOfServicesNamespacedWithLabel() throws JsonParseException, JsonMappingException, IOException {
+        this.createMockService();
+        this.createMockService("service2", "192.168.0.1", Collections.singletonMap("service", "test2"), MOCK_NAMESPACE);
+        String servicesJson = this.getKubeClient()
+                                  .services()
+                                  .listNamespaced(MOCK_NAMESPACE, Collections.singletonMap("service", "test2"))
+                                  .asJson();
+        this.assertDefaultServiceCreated(servicesJson, "192.168.0.1");
+    }
+
+    @Test
+    public void whenThereIsOneServiceNamespacedReturnedAsMap() {
+        this.createMockService();
+        Map<String, Object> services =
+                this.getKubeClient()
+                    .services()
+                    .listNamespaced(MOCK_NAMESPACE, null)
+                    .asMap();
+        assertThat(services, notNullValue());
+        assertThat(services.size(), is(3));
+        assertThat(services.get("items"), instanceOf(ArrayList.class));
+    }
+
+    @Test
+    public void whenThereIsOneSingleService() throws JsonParseException, JsonMappingException, IOException {
+        this.createMockService("");
+        String services = this.getKubeClient().services().list(null).asJson();
+        this.assertDefaultServiceCreated(services);
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/resources/logback-test.xml b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..1d010883b43
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-workitems/pom.xml b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
index f4f8689a9d2..7e4cd6d4b2c 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/pom.xml
+++ b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
@@ -21,8 +21,8 @@
       <artifactId>kogito-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-client</artifactId>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-cloud-kubernetes-client</artifactId>
     </dependency>
 
     <dependency>
@@ -40,6 +40,14 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- Logging -->
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <!-- Fabric8 client used exclusively for tests purposes only -->
     <dependency>
       <groupId>io.fabric8</groupId>
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
index 5c8e2ee5171..e4e9ce583ff 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
@@ -24,60 +24,70 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.kie.api.runtime.process.WorkItem;
-import org.kie.api.runtime.process.WorkItemHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.util.StdDateFormat;
-
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Request.Builder;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemHandler;
+import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
+import org.kie.kogito.cloud.workitems.service.discovery.ServiceDiscovery;
+import org.kie.kogito.cloud.workitems.service.discovery.ServiceDiscoveryFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class DiscoveredServiceWorkItemHandler implements WorkItemHandler {
-    
+
     private static final Logger LOGGER = LoggerFactory.getLogger(DiscoveredServiceWorkItemHandler.class);
-    
+
     protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
     protected static final List<String> INTERNAL_FIELDS = Arrays.asList("TaskName", "ActorId", "GroupId", "Priority", "Comment", "Skippable", "Content", "Model", "Namespace");
-    
-    protected static final String KNATIVE_SERVICE_SERVICE_URL = "apis/serving.knative.dev/v1alpha1/namespaces/@ns@/services?labelSelector=";
-    protected static final String KNATIVE_ISTIO_GATEWAY_URL = "api/v1/namespaces/istio-system/services/istio-ingressgateway";
-    protected static final String SERVICE_URL = "api/v1/namespaces/@ns@/services?labelSelector=";
-    
-    protected String istionGatewayClusterIp;
-    
+
     protected Map<String, ServiceInfo> serviceEndpoints = new ConcurrentHashMap<>();
-    
-    private volatile KubernetesClient client;
+
     private OkHttpClient http;
     private ObjectMapper mapper = new ObjectMapper();
+    private ServiceDiscovery serviceDiscovery;
 
-    
     public DiscoveredServiceWorkItemHandler() {
+        this(null);
+    }
+
+    protected DiscoveredServiceWorkItemHandler(final KogitoKubeClient kubeClient) {
         mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
         mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
-        
+
         http = buildHttpClient();
+
+        if (kubeClient == null) {
+            serviceDiscovery = this.buildServiceDiscovery(new DefaultKogitoKubeClient());
+        } else {
+            serviceDiscovery = this.buildServiceDiscovery(kubeClient);
+        }
     }
-    
+
+    /**
+     * Returns the {@link ServiceDiscovery} reference that will be used during the endpoint discovery.
+     * @return
+     */
+    protected ServiceDiscovery buildServiceDiscovery(KogitoKubeClient kubeClient) {
+        return ServiceDiscoveryFactory.build(kubeClient);
+    }
+
     protected OkHttpClient buildHttpClient() {
         return new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
-                .build();
+                                         .connectTimeout(60, TimeUnit.SECONDS)
+                                         .writeTimeout(60, TimeUnit.SECONDS)
+                                         .readTimeout(60, TimeUnit.SECONDS)
+                                         .build();
     }
-    
+
     /**
      * Looks up service's endpoint (cluster ip + port) using label selector - meaning returns services that have given label.
      * Services are looked up only in given namespace. 
@@ -85,64 +95,7 @@ protected OkHttpClient buildHttpClient() {
      * @return valid endpoint (in URL form) if found or runtime exception in case of no services found
      */
     protected ServiceInfo findEndpoint(String namespace, String service) {
-        
-        LOGGER.debug("Looking up for service {} in namespace {}", service, namespace);
-        DefaultKubernetesClient kubeClient = (DefaultKubernetesClient) getKubeClient();
-        String host = null;
-        Integer port = null;
-        Map<String, String> headers = null;
-        if (istionGatewayClusterIp != null) {
-            LOGGER.debug("Knative environment found, looking up for ingresgateway {} and host for serving service", istionGatewayClusterIp);
-            host = istionGatewayClusterIp;
-            port = 80;
-            headers = new HashMap<>();
-            
-            Request request = new Request.Builder().url(kubeClient.getMasterUrl() + KNATIVE_SERVICE_SERVICE_URL.replaceFirst("@ns@", namespace) + service)
-                                                   .build();
-            LOGGER.debug("About to call a search for services labeled with {}, complete url is {}", service, request.url());
-            try (Response response = kubeClient.getHttpClient().newCall(request).execute()) {
-                String out = response.body().string();
-                if (response.isSuccessful()) {
-                    Map<?, ?> data = mapper.readValue(out, Map.class);
-                    headers.put("HOST", ((Map<?, ?>)((Map<?, ?>)((List<?>)data.get("items")).get(0)).get("status")).get("domain").toString());
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            LOGGER.debug("Headers to be used for requests {}", headers);
-            
-        } else {
-            LOGGER.debug("Looking up for service in regular kube/openshift environment");
-            
-            Request request = new Request.Builder()
-                                                   .url(kubeClient.getMasterUrl() + SERVICE_URL.replaceFirst("@ns@", namespace) + service)
-                                                   .build();
-
-            try (Response response = kubeClient.getHttpClient().newCall(request).execute()) {
-                String out = response.body().string();
-
-                if (response.isSuccessful()) {
-                    Map<?, ?> data = mapper.readValue(out, Map.class);
-                    
-                    Map<?, ?> spec = ((Map<?, ?>) ((Map<?, ?>) ((List<?>) data.get("items")).get(0)).get("spec"));
-                    host = spec.get("clusterIP").toString();
-                    port = (Integer) ((Map<?, ?>) ((List<?>)spec.get("ports")).get(0)).get("port");
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }            
-        }
-        if (host == null) {
-          throw new RuntimeException("No endpoint found for service " + service);
-        }
-        StringBuilder location = new StringBuilder("http://")
-                .append(host)
-                .append(":")
-                .append(port)
-                .append("/")
-                .append(service);
-        LOGGER.debug("Host {} and port {} found for service {} in namespace {}", host, port, service, namespace);
-       return new ServiceInfo(location.toString(), headers);
+        return serviceDiscovery.findEndpoint(namespace, service).orElseThrow(() -> new RuntimeException("No endpoint found for service " + service));
     }
 
     /**
@@ -158,17 +111,17 @@ protected ServiceInfo findEndpoint(String namespace, String service) {
     protected Map<String, Object> discoverAndCall(WorkItem workItem, String namespace, String serviceName, HttpMethods method) {
         Map<String, Object> data = new HashMap<>(workItem.getParameters());
         String service = (String) data.remove(serviceName);
-        
+
         // remove all internal fields before sending
         INTERNAL_FIELDS.forEach(field -> data.remove(field));
-        
+
         // discover service endpoint
         ServiceInfo endpoint = serviceEndpoints.computeIfAbsent(service, (s) -> findEndpoint(namespace, s));
         LOGGER.debug("Found endpoint for service {} with location {}", service, endpoint);
-        
+
         RequestBody body = produceRequestPayload(data);
         Request request = null;
-        
+
         switch (method) {
             case POST:
                 request = producePostRequest(endpoint, body);
@@ -187,16 +140,16 @@ protected Map<String, Object> discoverAndCall(WorkItem workItem, String namespac
         }
 
         try (Response response = http.newCall(request).execute()) {
-            
+
             Map<String, Object> results = produceResultsFromResponse(response);
-            
+
             return results;
 
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }
-    
+
     protected RequestBody produceRequestPayload(Map<String, Object> data) {
         if (data == null) {
             return null;
@@ -205,59 +158,59 @@ protected RequestBody produceRequestPayload(Map<String, Object> data) {
             String json = mapper.writeValueAsString(data);
             LOGGER.debug("Sending body {}", json);
             RequestBody body = RequestBody.create(JSON, json);
-            
+
             return body;
         } catch (Exception e) {
             throw new RuntimeException("Unexpected error when producing request payload", e);
         }
     }
-    
+
     @SuppressWarnings("unchecked")
     protected Map<String, Object> produceResultsFromResponse(Response response) throws IOException {
-        String payload = response.body().string();            
+        String payload = response.body().string();
         LOGGER.debug("Resonse code {} and payload {}", response.code(), payload);
-        
+
         if (!response.isSuccessful()) {
             throw new RuntimeException("Unsuccessful response from service " + response.message() + " (code " + response.code() + ")");
         }
-        
+
         Map<String, Object> results = mapper.readValue(payload, Map.class);
-        
+
         return results;
     }
-    
+
     protected Request producePostRequest(ServiceInfo endpoint, RequestBody body) {
         Builder builder = new Request.Builder().url(endpoint.getUrl())
-                .post(body);
+                                               .post(body);
         applyHeaders(endpoint, builder);
-        
+
         return builder.build();
     }
-    
+
     protected Request produceGetRequest(ServiceInfo endpoint) {
         Builder builder = new Request.Builder().url(endpoint.getUrl())
-                .get();
+                                               .get();
         applyHeaders(endpoint, builder);
-        
+
         return builder.build();
     }
-    
+
     protected Request producePutRequest(ServiceInfo endpoint, RequestBody body) {
         Builder builder = new Request.Builder().url(endpoint.getUrl())
-                .put(body);
+                                               .put(body);
         applyHeaders(endpoint, builder);
-        
+
         return builder.build();
     }
-    
+
     protected Request produceDeleteRequest(ServiceInfo endpoint, RequestBody body) {
         Builder builder = new Request.Builder().url(endpoint.getUrl())
-                .delete(body);
+                                               .delete(body);
         applyHeaders(endpoint, builder);
-        
+
         return builder.build();
     }
-    
+
     protected void applyHeaders(ServiceInfo endpoint, Builder builder) {
 
         if (endpoint.getHeaders() != null) {
@@ -266,31 +219,5 @@ protected void applyHeaders(ServiceInfo endpoint, Builder builder) {
             }
         }
     }
-    
-    protected KubernetesClient getKubeClient() {
-        if (client == null) {
-            synchronized (this) {
-                if (client == null) {
-                    client = new DefaultKubernetesClient();
-                    LOGGER.debug("Kube Client created, looking up istio ingressgateway...");
-                    Request request = new Request.Builder().url(client.getMasterUrl() + KNATIVE_ISTIO_GATEWAY_URL)
-                                                           .build();
-
-                    try (Response response = ((DefaultKubernetesClient) client).getHttpClient().newCall(request).execute()) {
-                        String out = response.body().string();
-                        LOGGER.debug("Request {} completed with code {}, and response {}", request.url().toString(), response.code(), out);
-                        if (response.isSuccessful()) {
-                            Map<?, ?> data = mapper.readValue(out, Map.class);
-                            this.istionGatewayClusterIp = ((Map<?, ?>) data.get("spec")).get("clusterIP").toString();
-                        }
-                        LOGGER.debug("Istio geteway is " + istionGatewayClusterIp);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-        return client;
 
-    }
 }
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/BaseServiceDiscovery.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/BaseServiceDiscovery.java
new file mode 100644
index 00000000000..859c74edd32
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/BaseServiceDiscovery.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.workitems.service.discovery;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
+import org.kie.kogito.cloud.workitems.ServiceInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class BaseServiceDiscovery implements ServiceDiscovery {
+
+    protected static final Logger LOGGER = LoggerFactory.getLogger(BaseServiceDiscovery.class);
+    static final String KEY_ITEMS = "items";
+    static final String KEY_SPEC = "spec";
+    static final String KEY_CLUSTER_IP = "clusterIP";
+    static final String DEFAULT_PROTOCOL = "http://";
+    static final int DEFAULT_PORT = 80;
+
+    protected KogitoKubeClient kubeClient;
+
+    public BaseServiceDiscovery(final KogitoKubeClient kubeClient) {
+        this.kubeClient = kubeClient;
+    }
+
+    /**
+     * Should implement the Services API query logic according to the infrastructure.   
+     * 
+     * @see {@link KubernetesServiceDiscovery} for reference
+     * @param namespace the namespace where to query the service from
+     * @param labelKey an optional label key specified by the service
+     * @param labelValue an optional label value specified by the service
+     * @return a list of <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#service-v1-core">Service specification</a> in a map structure based on the JSON server response
+     */
+    protected abstract List<Map<String, Object>> query(final String namespace, Map<String, String> labels);
+
+    /**
+     * Should build the {@link ServiceInfo} object based on the {@link #query(String, Map)} returned value.
+     * 
+     * @param services
+     * @return
+     */
+    protected abstract ServiceInfo buildService(final List<Map<String, Object>> services, final String service);
+
+    private Map<String, String> buildLabelMap(final String labelKey, final String labelValue) {
+        if (labelKey == null || labelKey.isEmpty()) {
+            return null;
+        } else {
+            return Collections.singletonMap(labelKey, labelValue);
+        }
+    }
+
+    public final Optional<ServiceInfo> findEndpoint(String namespace, String labelKey, String labelValue) {
+        LOGGER.debug("About to query for endpoints in namespace {} with labels {}:{}", namespace, labelKey, labelValue);
+        final List<Map<String, Object>> services = query(namespace, this.buildLabelMap(labelKey, labelValue));
+        LOGGER.debug("Result of services query: {}", services);
+
+        if (services.size() > 1) {
+            LOGGER.warn("Found more than one endpoint using labels {}:{}. Returning the first one in the list. Try to be more specific in the query search.",
+                        labelKey,
+                        labelValue);
+        } else if (services.isEmpty()) {
+            LOGGER.warn("Haven't found any endpoint in the namespace {} with labels {}:{}", namespace, labelKey, labelValue);
+            return Optional.empty();
+        }
+
+        return Optional.of(this.buildService(services, labelValue == null || labelValue.isEmpty() ? labelKey : labelValue));
+    }
+
+    public final Optional<ServiceInfo> findEndpoint(String namespace, String service) {
+        return this.findEndpoint(namespace, service, null);
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java
new file mode 100644
index 00000000000..b6816ad2286
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.workitems.service.discovery;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
+import org.kie.kogito.cloud.kubernetes.client.operations.MapWalker;
+import org.kie.kogito.cloud.workitems.ServiceInfo;
+
+public class IstioServiceDiscovery extends BaseServiceDiscovery {
+
+    private static final String SERVICE_KEY_HOST = "HOST";
+    private static final String KEY_STATUS = "status";
+    /**
+     * Key field for service endpoint on KNative Serving 0.6.x and bellow
+     */
+    private static final String KEY_DOMAIN = "domain";
+    /**
+     * Key field for service endpoint on KNative Serving 0.7+
+     * 
+     * @see <a href="https://github.com/knative/serving/blob/master/docs/spec/spec.md#service">KNative Serving Service spec</a>
+     */
+    private static final String KEY_URL = "url";
+    private static final String PROTOCOL_REGEX = "^(http:\\/\\/www\\.|https:\\/\\/www\\.|http:\\/\\/|https:\\/\\/)";
+    private static final String SLASH_REGEX = "\\/$";
+
+    private final String istioGatewayUrl;
+
+    public IstioServiceDiscovery(final KogitoKubeClient kubeClient, final String istioGatewayUrl) {
+        super(kubeClient);
+        this.istioGatewayUrl = istioGatewayUrl;
+    }
+
+    @Override
+    protected List<Map<String, Object>> query(String namespace, Map<String, String> labels) {
+        return kubeClient.knativeService()
+                         .listNamespaced(namespace, labels)
+                         .asMapWalker()
+                         .mapToListMap(KEY_ITEMS)
+                         .asList();
+    }
+
+    @Override
+    protected ServiceInfo buildService(List<Map<String, Object>> services, final String service) {
+        final Map<String, String> headers = new HashMap<>();
+        final Map<String, Object> response = new MapWalker(services.get(0)).mapToMap(KEY_STATUS).asMap();
+        String endpoint = "";
+        if (response.containsKey(KEY_URL)) {
+            endpoint = response.get(KEY_URL).toString().replaceAll(PROTOCOL_REGEX, "").replaceAll(PROTOCOL_REGEX, "");
+            LOGGER.debug("Found key {} using endpoint: {}", KEY_URL, endpoint);
+        } else {
+            endpoint = response.get(KEY_DOMAIN).toString();
+            LOGGER.debug("Found key {} using endpoint: {}", KEY_DOMAIN, endpoint);
+        }
+        headers.put(SERVICE_KEY_HOST, endpoint);
+        LOGGER.debug("Headers to be used for requests {}", headers);
+        return new ServiceInfo(String.format("%s%s", this.istioGatewayUrl, service), headers);
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscovery.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscovery.java
new file mode 100644
index 00000000000..766f9751d73
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscovery.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.workitems.service.discovery;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
+import org.kie.kogito.cloud.kubernetes.client.operations.MapWalker;
+import org.kie.kogito.cloud.workitems.ServiceInfo;
+
+public class KubernetesServiceDiscovery extends BaseServiceDiscovery {
+
+    private static final String KEY_PORTS = "ports";
+    private static final String KEY_PORT = "port";
+
+    public KubernetesServiceDiscovery(final KogitoKubeClient kubeClient) {
+        super(kubeClient);
+    }
+
+    @Override
+    protected List<Map<String, Object>> query(String namespace, Map<String, String> labels) {
+        return kubeClient.services()
+                         .listNamespaced(namespace, labels)
+                         .asMapWalker()
+                         .mapToListMap(KEY_ITEMS)
+                         .asList();
+    }
+
+    @Override
+    protected ServiceInfo buildService(List<Map<String, Object>> services, String service) {
+        final StringBuilder url = new StringBuilder();
+        url
+           .append(DEFAULT_PROTOCOL)
+           .append(new MapWalker(services.get(0)).mapToMap(KEY_SPEC).asMap().get(KEY_CLUSTER_IP))
+           .append(":")
+           .append(new MapWalker(services.get(0)).mapToMap(KEY_SPEC)
+                                                 .mapToListMap(KEY_PORTS)
+                                                 .listToMap(0)
+                                                 .asMap().get(KEY_PORT))
+           .append("/")
+           .append(service);
+
+        return new ServiceInfo(url.toString(), new HashMap<>());
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscovery.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscovery.java
new file mode 100644
index 00000000000..220ddc97623
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscovery.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.workitems.service.discovery;
+
+import java.util.Optional;
+
+import org.kie.kogito.cloud.workitems.ServiceInfo;
+
+/**
+ * Service Discovery mechanism: tries to discover the desired endpoint based on the cluster infrastructure: Kubernetes, OpenShift, Istio/KNative or Operators. 
+ */
+public interface ServiceDiscovery {
+
+    /**
+     * Finds an endpoint based on a namespace and the specified label. 
+     * If more than one service is found, the first one is returned.  
+     * The service must reside within the namespace. 
+     * 
+     * @param namespace the namespace where to look for the namespace. Can't be null.
+     * @param labelKey optional label key.
+     * @param labelValue optional label value. Ignored if key is empty.
+     * @return
+     */
+    public Optional<ServiceInfo> findEndpoint(final String namespace, final String labelKey, final String labelValue);
+
+    /**
+     * Finds an endpoint based on a namespace with a label key equals to the name of the service. 
+     * If more than one service is found, the first one is returned. 
+     * The service must reside within the namespace.   
+     * 
+     * @param namespace the namespace where to look for the namespace. Can't be null.
+     * @param service the service name that should match with any label in the Kubernetes Service.    
+     * @return
+     */
+    public Optional<ServiceInfo> findEndpoint(final String namespace, final String service);
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java
new file mode 100644
index 00000000000..7be5ce389b1
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.workitems.service.discovery;
+
+import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class ServiceDiscoveryFactory {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ServiceDiscoveryFactory.class);
+
+    private static ServiceDiscoveryFactory factory;
+    private KogitoKubeClient kubeClient;
+    private boolean istioEnv;
+    private String istioGatewayUrl;
+
+    private ServiceDiscoveryFactory(final KogitoKubeClient kubeClient) {
+        this.kubeClient = kubeClient;
+        this.discoverIstioGatewayUrl();
+    }
+
+    public static ServiceDiscovery build() {
+        return build(new DefaultKogitoKubeClient());
+    }
+
+    public static ServiceDiscovery build(final KogitoKubeClient kubeClient) {
+        factory = new ServiceDiscoveryFactory(kubeClient);
+        if (factory.isIstioEnv()) {
+            return new IstioServiceDiscovery(kubeClient, factory.getIstioGatewayUrl());
+        } else {
+            return new KubernetesServiceDiscovery(kubeClient);
+        }
+    }
+
+    public boolean isIstioEnv() {
+        return istioEnv;
+    }
+
+    public String getIstioGatewayUrl() {
+        return istioGatewayUrl;
+    }
+
+    private void discoverIstioGatewayUrl() {
+        LOGGER.debug("Trying to discover Istio Gateway URL");
+        try {
+            final String clusterIp =
+                    (String) kubeClient.istioGateway()
+                                       .get()
+                                       .asMapWalker(true)
+                                       .mapToMap(BaseServiceDiscovery.KEY_SPEC)
+                                       .asMap()
+                                       .get(BaseServiceDiscovery.KEY_CLUSTER_IP);
+            if (clusterIp == null || clusterIp.isEmpty()) {
+                LOGGER.info("Not in Istio environment");
+                this.istioEnv = false;
+                this.istioGatewayUrl = null;
+            } else {
+                this.istioEnv = true;
+                this.istioGatewayUrl =
+                        new StringBuilder()
+                                           .append(BaseServiceDiscovery.DEFAULT_PROTOCOL)
+                                           .append(clusterIp)
+                                           .append(":")
+                                           .append(BaseServiceDiscovery.DEFAULT_PORT)
+                                           .append("/")
+                                           .toString();
+                LOGGER.info("Discovered Istio Gateway URL {}. Will use Istio as default service discovery mechanism", this.istioGatewayUrl);
+            }
+        } catch (Exception ex) {
+            this.istioEnv = false;
+            this.istioGatewayUrl = null;
+            LOGGER.warn("Failed to look up for Istio Gateway URL: '{}'. Enable debug logging to view the full stack trace. Failing back to standard Service API.", ex.getMessage());
+            LOGGER.debug("Error while trying to fetch for Istio Gateway URL", ex);
+        }
+    }
+}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
index 5c0c9637e0e..a8efa1fc9be 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
@@ -15,12 +15,16 @@
 
 package org.kie.kogito.cloud.workitems;
 
+import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.dsl.ServiceResource;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
 import org.junit.After;
 import org.junit.Before;
 import org.kie.api.runtime.process.WorkItem;
 import org.kie.api.runtime.process.WorkItemManager;
+import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
 
 /**
  * Base class for tests with Kubernetes API. In this scenario, nor Istio or KNative is available.
@@ -31,10 +35,24 @@ public abstract class BaseKubernetesDiscoveredServiceTest {
 
     public static final String MOCK_NAMESPACE = "mock-namespace";
 
+    private boolean enableIstio;
+    private boolean istioEnabled;
+
+    public BaseKubernetesDiscoveredServiceTest() {
+        this.enableIstio = false;
+    }
+
+    public BaseKubernetesDiscoveredServiceTest(final boolean enableIstio) {
+        this.enableIstio = enableIstio;
+    }
+
     // will be changed to junit5 extensions once migrated
     @Before
     public void before() {
         server.before();
+        if (this.enableIstio) {
+            this.createsIstioIngressGateway();
+        }
     }
 
     // will be changed to junit5 extensions once migrated
@@ -43,18 +61,33 @@ public void after() {
         server.after();
     }
 
-    protected KubernetesClient getClient() {
+    public boolean isIstioEnabled() {
+        return istioEnabled;
+    }
 
+    protected KubernetesClient getClient() {
         return server.getClient().inNamespace(MOCK_NAMESPACE);
     }
 
-    protected static class TestDiscoveredServiceWorkItemHandler extends DiscoveredServiceWorkItemHandler {
+    /**
+     * Enables Istio in the test environment.
+     */
+    private void createsIstioIngressGateway() {
+        final ServiceResource<Service, ?> serviceResource =
+                this.server.getClient()
+                           .inNamespace(KogitoKubeConfig.KNATIVE_ISTIO_NAMESPACE)
+                           .services()
+                           .load(this.getClass().getResource("/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json"));
+        this.server.getClient()
+                   .inNamespace(KogitoKubeConfig.KNATIVE_ISTIO_NAMESPACE)
+                   .services().create(serviceResource.get());
+        this.istioEnabled = true;
+    }
 
-        private final BaseKubernetesDiscoveredServiceTest testCase;
+    protected static class TestDiscoveredServiceWorkItemHandler extends DiscoveredServiceWorkItemHandler {
 
         public TestDiscoveredServiceWorkItemHandler(BaseKubernetesDiscoveredServiceTest testCase) {
-            super();
-            this.testCase = testCase;
+            super(new DefaultKogitoKubeClient().withConfig(new KogitoKubeConfig(testCase.getClient())));
         }
 
         @Override
@@ -63,12 +96,6 @@ public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {}
         @Override
         public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {}
 
-        @Override
-        protected KubernetesClient getKubeClient() {
-            this.istionGatewayClusterIp = null;
-            return this.testCase.getClient();
-        }
-
     }
 
 }
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
index bd57d30b505..9c10bcfa6f2 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
@@ -15,19 +15,10 @@
 
 package org.kie.kogito.cloud.workitems;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.kie.api.runtime.process.WorkItem;
-import org.kie.api.runtime.process.WorkItemManager;
-import org.mockito.Mockito;
-
 import okhttp3.Call;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -37,6 +28,18 @@
 import okhttp3.ResponseBody;
 import okio.Buffer;
 import okio.BufferedSource;
+import org.junit.Before;
+import org.junit.Test;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemManager;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
+import org.kie.kogito.cloud.workitems.service.discovery.ServiceDiscovery;
+import org.mockito.Mockito;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class DiscoveredServiceWorkItemHandlerTest {
     
@@ -106,5 +109,9 @@ protected OkHttpClient buildHttpClient() {
             return httpClient;
         }
         
+        @Override
+        protected ServiceDiscovery buildServiceDiscovery(KogitoKubeClient kubeClient) {
+            return mock(ServiceDiscovery.class);
+        }
     }
 }
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java
new file mode 100644
index 00000000000..7b2bb6822d2
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+
+package org.kie.kogito.cloud.workitems;
+
+import io.fabric8.kubernetes.api.model.KubernetesList;
+import io.fabric8.kubernetes.client.dsl.RecreateFromServerGettable;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class KNativeDiscoveredServiceWorkItemHandlerTest extends BaseKubernetesDiscoveredServiceTest {
+
+    public KNativeDiscoveredServiceWorkItemHandlerTest() {
+        super(true);
+    }
+
+    @Test
+    public void whenExistsAServiceWithKNative() {
+        final RecreateFromServerGettable<KubernetesList, KubernetesList, ?> serviceResource =
+                this.getClient().lists().load(this.getClass().getResource("/mock/responses/ocp4.x/knative/serving.knative.dev-services.json"));
+        this.getClient().lists().create(serviceResource.get());
+
+        final DiscoveredServiceWorkItemHandler handler = new TestDiscoveredServiceWorkItemHandler(this);
+        final ServiceInfo serviceInfo = handler.findEndpoint(MOCK_NAMESPACE, "employeeValidation");
+        assertThat(serviceInfo, notNullValue());
+        assertThat(serviceInfo.getUrl(), is("http://172.30.101.218:80/employeeValidation"));
+        assertThat(serviceInfo.getHeaders().get("HOST"), is("onboarding-hr.test.apps.example.com"));
+    }
+
+}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/logback-test.xml b/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..1d010883b43
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json b/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json
new file mode 100644
index 00000000000..b7981abee6b
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json
@@ -0,0 +1,112 @@
+{
+	"kind": "Service",
+	"apiVersion": "v1",
+	"metadata": {
+		"name": "istio-ingressgateway",
+		"namespace": "istio-system",
+		"labels": {
+			"app": "istio-ingressgateway",
+			"chart": "gateways",
+			"heritage": "Tiller",
+			"istio": "ingressgateway",
+			"maistra-version": "0.10.0",
+			"release": "istio"
+		},
+		"ownerReferences": [
+			{
+				"apiVersion": "istio.openshift.com/v1alpha3",
+				"kind": "ControlPlane",
+				"name": "minimal-istio",
+				"uid": "be2b0fc2-a7d9-11e9-b86c-02ff077e3f52",
+				"controller": true,
+				"blockOwnerDeletion": true
+			}
+		]
+	},
+	"spec": {
+		"ports": [
+			{
+				"name": "http2",
+				"protocol": "TCP",
+				"port": 80,
+				"targetPort": 80,
+				"nodePort": 31380
+			},
+			{
+				"name": "https",
+				"protocol": "TCP",
+				"port": 443,
+				"targetPort": 443,
+				"nodePort": 31390
+			},
+			{
+				"name": "tcp",
+				"protocol": "TCP",
+				"port": 31400,
+				"targetPort": 31400,
+				"nodePort": 31400
+			},
+			{
+				"name": "https-kiali",
+				"protocol": "TCP",
+				"port": 15029,
+				"targetPort": 15029,
+				"nodePort": 31184
+			},
+			{
+				"name": "https-prometheus",
+				"protocol": "TCP",
+				"port": 15030,
+				"targetPort": 15030,
+				"nodePort": 32448
+			},
+			{
+				"name": "https-grafana",
+				"protocol": "TCP",
+				"port": 15031,
+				"targetPort": 15031,
+				"nodePort": 32364
+			},
+			{
+				"name": "https-tracing",
+				"protocol": "TCP",
+				"port": 15032,
+				"targetPort": 15032,
+				"nodePort": 32760
+			},
+			{
+				"name": "tls",
+				"protocol": "TCP",
+				"port": 15443,
+				"targetPort": 15443,
+				"nodePort": 31520
+			},
+			{
+				"name": "status-port",
+				"protocol": "TCP",
+				"port": 15020,
+				"targetPort": 15020,
+				"nodePort": 31358
+			}
+		],
+		"selector": {
+			"app": "istio-ingressgateway",
+			"istio": "ingressgateway",
+			"maistra-version": "0.10.0",
+			"release": "istio"
+		},
+		"clusterIP": "172.30.101.218",
+		"type": "LoadBalancer",
+		"sessionAffinity": "None",
+		"externalTrafficPolicy": "Cluster"
+	},
+	"status": {
+		"loadBalancer": {
+			"ingress": [
+				{
+					"hostname": "example.com"
+				}
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/knative/serving.knative.dev-services.json b/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/knative/serving.knative.dev-services.json
new file mode 100644
index 00000000000..465860e1145
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/knative/serving.knative.dev-services.json
@@ -0,0 +1,91 @@
+{
+	"apiVersion": "serving.knative.dev/v1alpha1",
+	"kind": "ServiceList",
+	"metadata": {
+		"continue": ""
+	},
+	"items": [
+		{
+			"apiVersion": "serving.knative.dev/v1alpha1",
+			"kind": "Service",
+			"metadata": {
+				"annotations": {
+					"serving.knative.dev/creator": "kube:admin",
+					"serving.knative.dev/lastModifier": "kube:admin"
+				},
+				"labels": {
+					"department": "process",
+					"employeeValidation": "process",
+					"id": "process"
+				},
+				"name": "onboarding-hr",
+				"uid": "3c62c345-a8bd-11e9-83df-02ff077e3f52"
+			},
+			"spec": {
+				"template": {
+					"spec": {
+						"containers": [
+							{
+								"env": [
+									{
+										"name": "NAMESPACE",
+										"value": "test"
+									}
+								],
+								"image": "docker.io/mswiderski/onboarding-hr:0.1",
+								"name": "user-container",
+								"resources": {
+									"limits": {
+										"cpu": "1",
+										"memory": "200M"
+									},
+									"requests": {
+										"cpu": "400m",
+										"memory": "100M"
+									}
+								}
+							}
+						],
+						"timeoutSeconds": 300
+					}
+				},
+				"traffic": [
+					{
+						"latestRevision": true,
+						"percent": 100
+					}
+				]
+			},
+			"status": {
+				"address": {
+					"url": "http://onboarding-hr.test.svc.cluster.local"
+				},
+				"conditions": [
+					{
+						"status": "True",
+						"type": "ConfigurationsReady"
+					},
+					{
+						"status": "True",
+						"type": "Ready"
+					},
+					{
+						"status": "True",
+						"type": "RoutesReady"
+					}
+				],
+				"latestCreatedRevisionName": "onboarding-hr-zgjk8",
+				"latestReadyRevisionName": "onboarding-hr-zgjk8",
+				"observedGeneration": 1,
+				"traffic": [
+					{
+						"latestRevision": true,
+						"percent": 100,
+						"revisionName": "onboarding-hr-zgjk8"
+					}
+				],
+				"url": "http://onboarding-hr.test.apps.example.com"
+			}
+		}
+	]
+}
diff --git a/kogito-cloud-services/pom.xml b/kogito-cloud-services/pom.xml
index 7221296ddbf..3ad58061553 100644
--- a/kogito-cloud-services/pom.xml
+++ b/kogito-cloud-services/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.kie.kogito</groupId>
@@ -12,6 +14,7 @@
 
   <modules>
     <module>kogito-cloud-workitems</module>
+    <module>kogito-cloud-kubernetes-client</module>
   </modules>
 
   <dependencyManagement>

From edcb09d601336a42c1fa6f561076b885731856eb Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 23 Jul 2019 18:20:17 -0300
Subject: [PATCH 029/709] [JBPM-8624] - Removing EC Keys support from
 Kubernetes Client (#25)

---
 .../kogito-cloud-kubernetes-client/pom.xml    |  5 +++
 ...ubernetesClientCertUtilsSubstitutions.java | 38 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/graal/KubernetesClientCertUtilsSubstitutions.java

diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml b/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
index 42374698d47..222359220fe 100644
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
@@ -24,6 +24,11 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.oracle.substratevm</groupId>
+      <artifactId>svm</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/graal/KubernetesClientCertUtilsSubstitutions.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/graal/KubernetesClientCertUtilsSubstitutions.java
new file mode 100644
index 00000000000..871b7603b13
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/graal/KubernetesClientCertUtilsSubstitutions.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+package org.kie.kogito.cloud.kubernetes.client.graal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.PrivateKey;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+/**
+ * Removes EC Keys support from Fabric8 Kubernetes client dependency on native binaries. 
+ * This avoids clients to add <code>--allow-incomplete-classpath</code> option on their build configuration.
+ * <p/>
+ * Cloned from <a href="https://github.com/quarkusio/quarkus/blob/master/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/graal/CertUtilsSubstitutions.java">Quarkus Kubernetes Extension</a> to not add Quarkus dependencies to this project
+ */
+@TargetClass(className = "io.fabric8.kubernetes.client.internal.CertUtils")
+public final class KubernetesClientCertUtilsSubstitutions {
+
+    @Substitute
+    static PrivateKey handleECKey(InputStream keyInputStream) throws IOException {
+        throw new RuntimeException("EC Keys are not supported when using the native binary");
+    }
+
+}

From f697f3ba54758df6bc2e109278967c96390c499c Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 23 Jul 2019 18:30:08 -0300
Subject: [PATCH 030/709] [KOGITO-7] Migrating to JUnit 5 (#26)

---
 .../kogito-cloud-kubernetes-client/pom.xml           |  4 ++--
 .../kubernetes/client/KubeClientConfigTest.java      | 12 ++++++------
 .../client/MockKubernetesServerSupport.java          |  8 ++++----
 .../kubernetes/client/operations/MapWalkerTest.java  | 11 +++++------
 .../ServiceOperationsStatusCodeHandlingTest.java     | 11 ++++++-----
 .../client/operations/ServiceOperationsTest.java     |  2 +-
 kogito-cloud-services/kogito-cloud-workitems/pom.xml |  4 ++--
 .../BaseKubernetesDiscoveredServiceTest.java         | 10 ++++------
 .../DiscoveredServiceWorkItemHandlerTest.java        |  6 +++---
 .../KNativeDiscoveredServiceWorkItemHandlerTest.java |  4 ++--
 ...bernetesDiscoveredServiceWorkItemHandlerTest.java |  7 ++++---
 11 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml b/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
index 222359220fe..43215dc42b6 100644
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
@@ -30,8 +30,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java
index c5a93b1d938..20c74d790b7 100644
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java
@@ -19,9 +19,9 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -32,17 +32,17 @@ public class KubeClientConfigTest {
     public static final Path KUBE_CONFIG_PATH = Paths.get(System.getProperty("user.home") + "/.kube/config");
     public static final Path KUBE_CONFIG_DIR = Paths.get(System.getProperty("user.home") + "/.kube");
 
-    @Before
+    @BeforeEach
     public void setup() throws IOException {
         if (!Files.exists(KUBE_CONFIG_PATH)) {
-            if(!Files.exists(KUBE_CONFIG_DIR)) {
+            if (!Files.exists(KUBE_CONFIG_DIR)) {
                 Files.createDirectories(KUBE_CONFIG_DIR);
             }
             Files.createFile(KUBE_CONFIG_PATH);
         }
     }
 
-    @After
+    @AfterEach
     public void teardown() throws IOException {
         if (Files.exists(KUBE_CONFIG_PATH) && Files.readAllBytes(KUBE_CONFIG_PATH).length == 0) {
             Files.delete(KUBE_CONFIG_PATH);
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java
index a03ab0ee9a2..2d6a4bfa1ed 100644
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java
@@ -29,8 +29,8 @@
 import io.fabric8.kubernetes.client.dsl.RecreateFromServerGettable;
 import io.fabric8.kubernetes.client.dsl.ServiceResource;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
  * Base class to test use cases that need to query the API
@@ -64,13 +64,13 @@ protected final void initializeServer(final boolean crudMode) {
         this.server = new KubernetesServer(false, crudMode);
     }
 
-    @Before
+    @BeforeEach
     public void before() {
         server.before();
         this.kubeClient = new DefaultKogitoKubeClient().withConfig(new KogitoKubeConfig(server.getClient()));
     }
 
-    @After
+    @AfterEach
     public void after() {
         server.after();
     }
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java
index 55a227b5d70..9a76b2d1eeb 100644
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java
@@ -16,11 +16,11 @@
 
 import java.util.HashMap;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class MapWalkerTest {
 
@@ -33,12 +33,11 @@ public void whenMapIsEmptyAndIsSafe() {
         final MapWalker walker = new MapWalker(new HashMap<>(), true);
         assertThat(walker.mapToListMap("test").listToMap(0).asMap(), notNullValue());
     }
-    
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void whenMapIsEmptyAndIsNotSafe() {
         final MapWalker walker = new MapWalker(new HashMap<>());
-       walker.mapToListMap("test").listToMap(0).asMap();
-       fail("Should explode an exception while is not safe walking through an empty map");
+        assertThrows(IllegalArgumentException.class, () -> walker.mapToListMap("test").listToMap(0).asMap());
     }
 
 }
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java
index 28a6f856892..214e60aba39 100644
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java
@@ -17,7 +17,7 @@
 import java.net.HttpURLConnection;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClientException;
 import org.kie.kogito.cloud.kubernetes.client.MockKubernetesServerSupport;
 
@@ -25,10 +25,11 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
- * Test cases where
+ * Service Operations test cases that integrates with a mock Kubernetes server to validate HTTP Rest API handling.
  */
 public class ServiceOperationsStatusCodeHandlingTest extends MockKubernetesServerSupport {
 
@@ -66,9 +67,9 @@ public void whenUnauthorizedResponse() {
         }
     }
 
-    @Test(expected = KogitoKubeClientException.class)
+    @Test
     public void whenServerError() {
         getServer().expect().get().withPath("/api/v1/services").andReturn(HttpURLConnection.HTTP_BAD_GATEWAY, null).once();
-        this.getKubeClient().services().list(null).asMap();
+        assertThrows(KogitoKubeClientException.class, () -> this.getKubeClient().services().list(null).asMap());
     }
 }
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java
index 3fc161ad3e1..418bda10d47 100644
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java
@@ -24,7 +24,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kie.kogito.cloud.kubernetes.client.MockKubernetesServerSupport;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
diff --git a/kogito-cloud-services/kogito-cloud-workitems/pom.xml b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
index 7e4cd6d4b2c..0cc60b073b4 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/pom.xml
+++ b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
@@ -26,8 +26,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
index a8efa1fc9be..8610840107d 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
@@ -19,8 +19,8 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.ServiceResource;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.kie.api.runtime.process.WorkItem;
 import org.kie.api.runtime.process.WorkItemManager;
 import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
@@ -46,8 +46,7 @@ public BaseKubernetesDiscoveredServiceTest(final boolean enableIstio) {
         this.enableIstio = enableIstio;
     }
 
-    // will be changed to junit5 extensions once migrated
-    @Before
+    @BeforeEach
     public void before() {
         server.before();
         if (this.enableIstio) {
@@ -55,8 +54,7 @@ public void before() {
         }
     }
 
-    // will be changed to junit5 extensions once migrated
-    @After
+    @AfterEach
     public void after() {
         server.after();
     }
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
index 9c10bcfa6f2..f5893e1cbd0 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
@@ -28,8 +28,8 @@
 import okhttp3.ResponseBody;
 import okio.Buffer;
 import okio.BufferedSource;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.kie.api.runtime.process.WorkItem;
 import org.kie.api.runtime.process.WorkItemManager;
 import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
@@ -46,7 +46,7 @@ public class DiscoveredServiceWorkItemHandlerTest {
     
     private OkHttpClient httpClient;
 
-    @Before
+    @BeforeEach
     public void setup() {
         httpClient = mock(OkHttpClient.class);
     }
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java
index 7b2bb6822d2..00a17a5904c 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java
@@ -17,11 +17,11 @@
 
 import io.fabric8.kubernetes.api.model.KubernetesList;
 import io.fabric8.kubernetes.client.dsl.RecreateFromServerGettable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class KNativeDiscoveredServiceWorkItemHandlerTest extends BaseKubernetesDiscoveredServiceTest {
 
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
index 5af84176df9..c496c65bf5d 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
@@ -25,13 +25,14 @@
 import io.fabric8.kubernetes.api.model.ServicePort;
 import io.fabric8.kubernetes.api.model.ServiceSpec;
 import io.fabric8.kubernetes.api.model.ServiceStatus;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
+
 
 public class KubernetesDiscoveredServiceWorkItemHandlerTest extends BaseKubernetesDiscoveredServiceTest {
 

From a3513d5bc88c8edc9033392c1b81b386b0ae2731 Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Tue, 30 Jul 2019 14:23:39 +0200
Subject: [PATCH 031/709] [KOGITO-65] Use maven.test.skip to skip the test
 phase (#27)

maven.test.skip makes sure that test jar is not created.

Signed-off-by: Karel Suta <ksuta@redhat.com>
---
 s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble
index 257e95465aa..3fbc34473cd 100755
--- a/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble
@@ -32,7 +32,7 @@ cd /tmp/src/
 if [ -f "pom.xml" ]; then
 	echo "---> Building application from source..."
 	$MAVEN_HOME/bin/mvn clean package -s $KOGITO_HOME/.m2/settings.xml \
-    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
     -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 else
 	echo "---> Generating project structure..."
@@ -55,7 +55,7 @@ else
 
 	echo "---> Building application from source..."
 	$MAVEN_HOME/bin/mvn clean package -s $KOGITO_HOME/.m2/settings.xml \
-    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+    -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
     -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 fi
 

From adc1667bcb39e0a89755703ca2ab0583746233fb Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 6 Aug 2019 12:33:11 -0300
Subject: [PATCH 032/709] [KOGITO-109][KOGITO-91] - Removing static
 initializations to okhttp3 and WARN msgs (#28)

---
 .../DiscoveredServiceWorkItemHandler.java     | 96 +++++++++++++++----
 .../discovery/IstioServiceDiscovery.java      |  1 -
 .../discovery/ServiceDiscoveryFactory.java    | 32 ++++---
 .../DiscoveredServiceWorkItemHandlerTest.java |  2 +-
 4 files changed, 98 insertions(+), 33 deletions(-)

diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
index e4e9ce583ff..72d796882f6 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,45 +50,103 @@ public abstract class DiscoveredServiceWorkItemHandler implements WorkItemHandle
     protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
     protected static final List<String> INTERNAL_FIELDS = Arrays.asList("TaskName", "ActorId", "GroupId", "Priority", "Comment", "Skippable", "Content", "Model", "Namespace");
 
-    protected Map<String, ServiceInfo> serviceEndpoints = new ConcurrentHashMap<>();
+    private Map<String, ServiceInfo> serviceEndpoints;
 
     private OkHttpClient http;
-    private ObjectMapper mapper = new ObjectMapper();
+    private ObjectMapper mapper;
     private ServiceDiscovery serviceDiscovery;
+    private KogitoKubeClient kubeClient;
 
     public DiscoveredServiceWorkItemHandler() {
         this(null);
     }
 
     protected DiscoveredServiceWorkItemHandler(final KogitoKubeClient kubeClient) {
+        LOGGER.debug("New instance of discovered service work item with kubeclient: {}", kubeClient);
+        mapper = new ObjectMapper();
         mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
         mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
-
-        http = buildHttpClient();
-
+        /*
+         *  Delaying buildServiceDiscovery and buildHttpClient to avoid problems with okhttp3 dependency during GraalVM native builds. 
+         *  OKHttp3 references SSLContextFactory in static fields, which lead to errors. See: https://quarkus.io/guides/writing-native-applications-tips#delaying-class-initialization
+         *  We're trying to not use static fields that depends on unknown and uncontrolled dependencies to avoid errors like this.
+         *  That's why we're just holding the kube reference in the constructor, thus lazy building the HTTP objects. 
+         */ 
+        this.kubeClient = kubeClient;
+        this.serviceEndpoints = new ConcurrentHashMap<>();
+    }
+    
+    /**
+     * Returns the {@link ServiceDiscovery} reference that will be used during the endpoint discovery.
+     * @return
+     */
+    protected ServiceDiscovery buildServiceDiscovery() {
         if (kubeClient == null) {
-            serviceDiscovery = this.buildServiceDiscovery(new DefaultKogitoKubeClient());
-        } else {
-            serviceDiscovery = this.buildServiceDiscovery(kubeClient);
+            LOGGER.debug("Kubernetes client configuration is null, using default values");
+            kubeClient = new DefaultKogitoKubeClient();
+        }
+        if (serviceDiscovery == null) {
+            LOGGER.debug("Creating and caching a new reference of ServiceDiscoveryFactory");
+            serviceDiscovery = new ServiceDiscoveryFactory(kubeClient).build();
         }
+        return serviceDiscovery;
     }
-
+    
     /**
-     * Returns the {@link ServiceDiscovery} reference that will be used during the endpoint discovery.
+     * Build a {@link ServiceDiscovery} reference with the custom {@link KogitoKubeClient}.
+     * @see #buildServiceDiscovery()
+     * @param kubeClient
      * @return
      */
     protected ServiceDiscovery buildServiceDiscovery(KogitoKubeClient kubeClient) {
-        return ServiceDiscoveryFactory.build(kubeClient);
+        this.kubeClient = kubeClient;
+        return this.buildServiceDiscovery();
     }
 
     protected OkHttpClient buildHttpClient() {
-        return new OkHttpClient.Builder()
-                                         .connectTimeout(60, TimeUnit.SECONDS)
-                                         .writeTimeout(60, TimeUnit.SECONDS)
-                                         .readTimeout(60, TimeUnit.SECONDS)
-                                         .build();
+        if (http == null) {
+            LOGGER.debug("Creating and caching a new reference of OkHttpClient");
+            http = new OkHttpClient.Builder()
+                                             .connectTimeout(60, TimeUnit.SECONDS)
+                                             .writeTimeout(60, TimeUnit.SECONDS)
+                                             .readTimeout(60, TimeUnit.SECONDS)
+                                             .build();
+        }
+        return http;
+    }
+    
+    /**
+     * Removes a service from the registry
+     *  
+     * @param serviceName
+     * @return true if removed successfully
+     */
+    protected boolean removeService(String serviceName) {
+        return this.serviceEndpoints.remove(serviceName) != null;
     }
 
+    /**
+     * Add a new service into the internal registry
+     * 
+     * @param serviceName
+     * @param service
+     */
+    protected void addServices(String serviceName, ServiceInfo service) {
+        if(service != null) {
+            LOGGER.debug("Adding a new service '{}' to the registry: {}", serviceName, service);
+            this.serviceEndpoints.put(serviceName, service);
+        }
+    }
+    
+    /**
+     * Retrieves a immutable list of services added to this reference. 
+     * 
+     * @return
+     */
+    protected Map<String, ServiceInfo> getServices() {
+        return Collections.unmodifiableMap(this.serviceEndpoints);
+    }
+    
     /**
      * Looks up service's endpoint (cluster ip + port) using label selector - meaning returns services that have given label.
      * Services are looked up only in given namespace. 
@@ -95,7 +154,8 @@ protected OkHttpClient buildHttpClient() {
      * @return valid endpoint (in URL form) if found or runtime exception in case of no services found
      */
     protected ServiceInfo findEndpoint(String namespace, String service) {
-        return serviceDiscovery.findEndpoint(namespace, service).orElseThrow(() -> new RuntimeException("No endpoint found for service " + service));
+        LOGGER.debug("Looking for services. Services discovered so far {}", this.serviceEndpoints);
+        return this.buildServiceDiscovery().findEndpoint(namespace, service).orElseThrow(() -> new RuntimeException("No endpoint found for service " + service));
     }
 
     /**
@@ -139,7 +199,7 @@ protected Map<String, Object> discoverAndCall(WorkItem workItem, String namespac
                 break;
         }
 
-        try (Response response = http.newCall(request).execute()) {
+        try (Response response = this.buildHttpClient().newCall(request).execute()) {
 
             Map<String, Object> results = produceResultsFromResponse(response);
 
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java
index b6816ad2286..5c143a4d217 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java
@@ -37,7 +37,6 @@ public class IstioServiceDiscovery extends BaseServiceDiscovery {
      */
     private static final String KEY_URL = "url";
     private static final String PROTOCOL_REGEX = "^(http:\\/\\/www\\.|https:\\/\\/www\\.|http:\\/\\/|https:\\/\\/)";
-    private static final String SLASH_REGEX = "\\/$";
 
     private final String istioGatewayUrl;
 
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java
index 7be5ce389b1..0f669fe2692 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java
@@ -23,24 +23,30 @@ public final class ServiceDiscoveryFactory {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ServiceDiscoveryFactory.class);
 
-    private static ServiceDiscoveryFactory factory;
     private KogitoKubeClient kubeClient;
     private boolean istioEnv;
     private String istioGatewayUrl;
 
-    private ServiceDiscoveryFactory(final KogitoKubeClient kubeClient) {
+    /**
+     * Creates a new {@link ServiceDiscovery} reference for service discovery across a Kubernetes cluster
+     * @param kubeClient the {@link KogitoKubeClient} reference. If null, a new {@link DefaultKogitoKubeClient} will be created for you during the {@link ServiceDiscovery} {@link #build()}
+     */
+    public ServiceDiscoveryFactory(final KogitoKubeClient kubeClient) {
         this.kubeClient = kubeClient;
         this.discoverIstioGatewayUrl();
     }
 
-    public static ServiceDiscovery build() {
-        return build(new DefaultKogitoKubeClient());
-    }
-
-    public static ServiceDiscovery build(final KogitoKubeClient kubeClient) {
-        factory = new ServiceDiscoveryFactory(kubeClient);
-        if (factory.isIstioEnv()) {
-            return new IstioServiceDiscovery(kubeClient, factory.getIstioGatewayUrl());
+    /**
+     * Creates the {@link ServiceDiscovery} reference based on {@link KogitoKubeClient} for this instance
+     * @return
+     */
+    public ServiceDiscovery build() {
+        if(kubeClient == null) {
+            this.kubeClient = new DefaultKogitoKubeClient();
+        }
+        
+        if (this.isIstioEnv()) {
+            return new IstioServiceDiscovery(kubeClient, this.getIstioGatewayUrl());
         } else {
             return new KubernetesServiceDiscovery(kubeClient);
         }
@@ -65,7 +71,7 @@ private void discoverIstioGatewayUrl() {
                                        .asMap()
                                        .get(BaseServiceDiscovery.KEY_CLUSTER_IP);
             if (clusterIp == null || clusterIp.isEmpty()) {
-                LOGGER.info("Not in Istio environment");
+                LOGGER.debug("Not in Istio environment");
                 this.istioEnv = false;
                 this.istioGatewayUrl = null;
             } else {
@@ -78,12 +84,12 @@ private void discoverIstioGatewayUrl() {
                                            .append(BaseServiceDiscovery.DEFAULT_PORT)
                                            .append("/")
                                            .toString();
-                LOGGER.info("Discovered Istio Gateway URL {}. Will use Istio as default service discovery mechanism", this.istioGatewayUrl);
+                LOGGER.debug("Discovered Istio Gateway URL {}. Will use Istio as default service discovery mechanism", this.istioGatewayUrl);
             }
         } catch (Exception ex) {
             this.istioEnv = false;
             this.istioGatewayUrl = null;
-            LOGGER.warn("Failed to look up for Istio Gateway URL: '{}'. Enable debug logging to view the full stack trace. Failing back to standard Service API.", ex.getMessage());
+            LOGGER.debug("Failed to look up for Istio Gateway URL: '{}'. Enable debug logging to view the full stack trace. Failing back to standard Service API.", ex.getMessage());
             LOGGER.debug("Error while trying to fetch for Istio Gateway URL", ex);
         }
     }
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
index f5893e1cbd0..43c96e032db 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
@@ -93,7 +93,7 @@ private class TestDiscoveredServiceWorkItemHandler extends DiscoveredServiceWork
 
         public TestDiscoveredServiceWorkItemHandler(String service, String endpoint) {
             super();
-            this.serviceEndpoints.put(service, new ServiceInfo(endpoint, null));
+            this.addServices(service, new ServiceInfo(endpoint, null));
         }
         
         @Override

From 39460266c8621e3ed320d2c8237a89b7a84c7d4b Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 21 Aug 2019 16:20:05 -0300
Subject: [PATCH 033/709] [KOGITO-98] - Upgrading images to GraalVM 19.1.1
 (#31)

---
 s2i/kogito-quarkus-centos-s2i-overrides.yaml |  2 +-
 s2i/modules/graalvm/19.x/module.yaml         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/s2i/kogito-quarkus-centos-s2i-overrides.yaml b/s2i/kogito-quarkus-centos-s2i-overrides.yaml
index 3e259cbe18f..8371ac3d35f 100644
--- a/s2i/kogito-quarkus-centos-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-centos-s2i-overrides.yaml
@@ -15,7 +15,7 @@ modules:
   install:
   - name: add-kogito-user
   - name: graalvm
-    version: "19.0.2"
+    version: "19.1.1"
   - name: maven
     version: "3.6.0"
   - name: kogito-quarkus-centos-s2i
diff --git a/s2i/modules/graalvm/19.x/module.yaml b/s2i/modules/graalvm/19.x/module.yaml
index 70d635e2716..ed389260edd 100644
--- a/s2i/modules/graalvm/19.x/module.yaml
+++ b/s2i/modules/graalvm/19.x/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: graalvm
-version: "19.0.2"
+version: "19.1.1"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,15 +9,15 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "19.0.2"
+    value: "19.1.1"
 
 artifacts:
-- name: graalvm-ce-linux-amd64-19.0.2.tar.gz
-  url: https://github.com/oracle/graal/releases/download/vm-19.0.2/graalvm-ce-linux-amd64-19.0.2.tar.gz
-  md5: fd4d5f28d3fe8391b93681a61f824f16
-- name: native-image-installable-svm-linux-amd64-19.0.2.jar
-  url: https://github.com/oracle/graal/releases/download/vm-19.0.2/native-image-installable-svm-linux-amd64-19.0.2.jar
-  md5: ef96ea375bd7838e3d4cccec9b0f4370
+- name: graalvm-ce-linux-amd64-19.1.1.tar.gz
+  url: https://github.com/oracle/graal/releases/download/vm-19.1.1/graalvm-ce-linux-amd64-19.1.1.tar.gz
+  md5: d3dd24358dc495f83df5cdd2c46bd876
+- name: native-image-installable-svm-linux-amd64-19.1.1.jar
+  url: https://github.com/oracle/graal/releases/download/vm-19.1.1/native-image-installable-svm-linux-amd64-19.1.1.jar
+  md5: 69bf7407dc5115e557901444b10ad03a
 
 execute:
 - script: configure
\ No newline at end of file

From 2d4ff4e75d2326065573744f8620df909ff105de Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 21 Aug 2019 16:36:51 -0300
Subject: [PATCH 034/709] [KOGITO-162] - Migrate the Kogito base images from
 centos to ubi8 (#30)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile                                  | 67 ++++++++++------
 s2i/README.md                                 | 33 ++++----
 s2i/image.yaml                                |  8 +-
 s2i/kogito-imagestream.yaml                   | 32 ++++----
 ...aml => kogito-quarkus-ubi8-overrides.yaml} | 13 ++-
 ...=> kogito-quarkus-ubi8-s2i-overrides.yaml} |  5 +-
 ... => kogito-springboot-ubi8-overrides.yaml} | 12 ++-
 ...kogito-springboot-ubi8-s2i-overrides.yaml} |  5 +-
 s2i/modules/add-kogito-user/add-user          |  3 +-
 s2i/modules/add-kogito-user/module.yaml       |  4 +
 s2i/modules/install-rpm-dependencies/clean.sh |  4 +
 .../install-rpm-dependencies/module.yaml      | 13 +++
 .../s2i/bin/assemble                          | 80 -------------------
 .../s2i/bin/assemble-runtime                  | 23 ------
 .../README.md                                 |  2 +-
 .../configure                                 |  3 +
 .../module.yaml                               |  3 +-
 .../kogito-quarkus-ubi8-s2i/s2i/bin/assemble  | 79 ++++++++++++++++++
 .../s2i/bin/run                               |  2 +-
 .../s2i/bin/save-artifacts                    |  0
 .../s2i/bin/usage                             |  6 +-
 .../test/run                                  |  2 +-
 .../test/test-app/index.html                  |  0
 .../README.md                                 |  4 +-
 .../configure                                 |  1 +
 .../module.yaml                               |  4 +-
 .../s2i/bin/assemble                          |  2 +-
 .../s2i/bin/assemble-runtime                  | 23 ++++++
 .../s2i/bin/run                               |  2 +-
 .../s2i/bin/usage                             |  4 +-
 .../test/run                                  |  2 +-
 .../test/test-app/index.html                  |  0
 .../kogito-springboot-centos/module.yaml      |  4 -
 .../README.md                                 |  2 +-
 .../configure                                 |  2 +
 .../kogito-springboot-ubi8-s2i/module.yaml    |  5 ++
 .../s2i/bin/assemble                          |  9 ++-
 .../s2i/bin/run                               |  2 +-
 .../s2i/bin/save-artifacts                    |  0
 .../s2i/bin/usage                             |  6 +-
 .../test/run                                  |  2 +-
 .../test/test-app/index.html                  |  0
 .../README.md                                 |  4 +-
 .../configure                                 |  0
 .../module.yaml                               |  3 +-
 .../s2i/bin/assemble                          |  3 +-
 .../s2i/bin/assemble-runtime                  |  6 +-
 .../s2i/bin/run                               |  2 +-
 .../s2i/bin/usage                             |  4 +-
 .../test/run                                  |  2 +-
 .../test/test-app/index.html                  |  0
 51 files changed, 282 insertions(+), 215 deletions(-)
 rename s2i/{kogito-quarkus-centos-overrides.yaml => kogito-quarkus-ubi8-overrides.yaml} (53%)
 rename s2i/{kogito-quarkus-centos-s2i-overrides.yaml => kogito-quarkus-ubi8-s2i-overrides.yaml} (80%)
 rename s2i/{kogito-springboot-centos-overrides.yaml => kogito-springboot-ubi8-overrides.yaml} (55%)
 rename s2i/{kogito-springboot-centos-s2i-overrides.yaml => kogito-springboot-ubi8-s2i-overrides.yaml} (78%)
 create mode 100644 s2i/modules/install-rpm-dependencies/clean.sh
 create mode 100644 s2i/modules/install-rpm-dependencies/module.yaml
 delete mode 100644 s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/assemble
 delete mode 100644 s2i/modules/kogito-quarkus-centos/s2i/bin/assemble-runtime
 rename s2i/modules/{kogito-quarkus-centos-s2i => kogito-quarkus-ubi8-s2i}/README.md (80%)
 rename s2i/modules/{kogito-springboot-centos => kogito-quarkus-ubi8-s2i}/configure (87%)
 rename s2i/modules/{kogito-springboot-centos-s2i => kogito-quarkus-ubi8-s2i}/module.yaml (51%)
 create mode 100644 s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
 rename s2i/modules/{kogito-quarkus-centos-s2i => kogito-quarkus-ubi8-s2i}/s2i/bin/run (81%)
 rename s2i/modules/{kogito-quarkus-centos-s2i => kogito-quarkus-ubi8-s2i}/s2i/bin/save-artifacts (100%)
 rename s2i/modules/{kogito-quarkus-centos-s2i => kogito-quarkus-ubi8-s2i}/s2i/bin/usage (56%)
 rename s2i/modules/{kogito-springboot-centos => kogito-quarkus-ubi8-s2i}/test/run (98%)
 rename s2i/modules/{kogito-quarkus-centos-s2i => kogito-quarkus-ubi8-s2i}/test/test-app/index.html (100%)
 rename s2i/modules/{kogito-quarkus-centos => kogito-quarkus-ubi8}/README.md (64%)
 rename s2i/modules/{kogito-quarkus-centos => kogito-quarkus-ubi8}/configure (99%)
 rename s2i/modules/{kogito-quarkus-centos => kogito-quarkus-ubi8}/module.yaml (51%)
 rename s2i/modules/{kogito-springboot-centos => kogito-quarkus-ubi8}/s2i/bin/assemble (84%)
 mode change 100755 => 100644
 create mode 100644 s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble-runtime
 rename s2i/modules/{kogito-quarkus-centos => kogito-quarkus-ubi8}/s2i/bin/run (84%)
 rename s2i/modules/{kogito-quarkus-centos => kogito-quarkus-ubi8}/s2i/bin/usage (56%)
 rename s2i/modules/{kogito-quarkus-centos => kogito-quarkus-ubi8}/test/run (98%)
 rename s2i/modules/{kogito-quarkus-centos => kogito-quarkus-ubi8}/test/test-app/index.html (100%)
 delete mode 100644 s2i/modules/kogito-springboot-centos/module.yaml
 rename s2i/modules/{kogito-springboot-centos-s2i => kogito-springboot-ubi8-s2i}/README.md (80%)
 rename s2i/modules/{kogito-springboot-centos-s2i => kogito-springboot-ubi8-s2i}/configure (88%)
 create mode 100644 s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
 rename s2i/modules/{kogito-springboot-centos-s2i => kogito-springboot-ubi8-s2i}/s2i/bin/assemble (89%)
 rename s2i/modules/{kogito-springboot-centos-s2i => kogito-springboot-ubi8-s2i}/s2i/bin/run (79%)
 rename s2i/modules/{kogito-springboot-centos-s2i => kogito-springboot-ubi8-s2i}/s2i/bin/save-artifacts (100%)
 rename s2i/modules/{kogito-springboot-centos-s2i => kogito-springboot-ubi8-s2i}/s2i/bin/usage (52%)
 rename s2i/modules/{kogito-springboot-centos-s2i => kogito-springboot-ubi8-s2i}/test/run (98%)
 rename s2i/modules/{kogito-springboot-centos-s2i => kogito-springboot-ubi8-s2i}/test/test-app/index.html (100%)
 rename s2i/modules/{kogito-springboot-centos => kogito-springboot-ubi8}/README.md (65%)
 rename s2i/modules/{kogito-quarkus-centos-s2i => kogito-springboot-ubi8}/configure (100%)
 rename s2i/modules/{kogito-quarkus-centos-s2i => kogito-springboot-ubi8}/module.yaml (51%)
 rename s2i/modules/{kogito-quarkus-centos => kogito-springboot-ubi8}/s2i/bin/assemble (84%)
 mode change 100644 => 100755
 rename s2i/modules/{kogito-springboot-centos => kogito-springboot-ubi8}/s2i/bin/assemble-runtime (70%)
 rename s2i/modules/{kogito-springboot-centos => kogito-springboot-ubi8}/s2i/bin/run (80%)
 rename s2i/modules/{kogito-springboot-centos => kogito-springboot-ubi8}/s2i/bin/usage (55%)
 rename s2i/modules/{kogito-quarkus-centos-s2i => kogito-springboot-ubi8}/test/run (98%)
 rename s2i/modules/{kogito-springboot-centos => kogito-springboot-ubi8}/test/test-app/index.html (100%)

diff --git a/s2i/Makefile b/s2i/Makefile
index 0d44cf592c9..64af3712140 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -4,43 +4,60 @@ BUILD_ENGINE := docker
 
 # Build all images
 .PHONY: build
-build: kogito-quarkus-centos kogito-quarkus-centos-s2i kogito-springboot-centos kogito-springboot-centos-s2i
+build: kogito-quarkus-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i
 
-kogito-quarkus-centos:
-	cekit -v build --overrides-file kogito-quarkus-centos-overrides.yaml ${BUILD_ENGINE}
+kogito-quarkus-ubi8:
+	cekit -v build --overrides-file kogito-quarkus-ubi8-overrides.yaml ${BUILD_ENGINE}
 
-kogito-quarkus-centos-s2i:
-	cekit -v build --overrides-file kogito-quarkus-centos-s2i-overrides.yaml ${BUILD_ENGINE}
+kogito-quarkus-ubi8-s2i:
+	cekit -v build --overrides-file kogito-quarkus-ubi8-s2i-overrides.yaml ${BUILD_ENGINE}
 
-kogito-springboot-centos:
-	cekit -v build --overrides-file kogito-springboot-centos-overrides.yaml ${BUILD_ENGINE}
+kogito-springboot-ubi8:
+	cekit -v build --overrides-file kogito-springboot-ubi8-overrides.yaml ${BUILD_ENGINE}
 
-kogito-springboot-centos-s2i:
-	cekit -v build --overrides-file kogito-springboot-centos-s2i-overrides.yaml ${BUILD_ENGINE}
+kogito-springboot-ubi8-s2i:
+	cekit -v build --overrides-file kogito-springboot-ubi8-s2i-overrides.yaml ${BUILD_ENGINE}
 
 
 # Build and test all images
 .PHONY: test
 test:
-	cekit -v build --overrides-file kogito-quarkus-centos-overrides.yaml --overrides 'name: kogito-quarkus-centos-candidate' docker --no-squash
-	modules/kogito-quarkus-centos/test/run
-	cekit -v build --overrides-file kogito-quarkus-centos-s2i-overrides.yaml --overrides 'name: kogito-quarkus-centos-s2i-candidate' docker --no-squash
-	modules/kogito-quarkus-centos-s2i/test/run
-	cekit -v build --overrides-file kogito-springboot-centos-overrides.yaml --overrides 'name: kogito-springboot-centos-candidate' docker --no-squash
-	modules/kogito-springboot-centos/test/run
-	cekit -v build --overrides-file kogito-springboot-centos-s2i-overrides.yaml --overrides 'name: kogito-springboot-centos-s2i-candidate' docker --no-squash
-	modules/kogito-springboot-centos-s2i-/test/run
+	cekit -v build --overrides-file kogito-quarkus-ubi8-overrides.yaml --overrides 'name: kogito-quarkus-ubi8-candidate' docker --no-squash
+	modules/kogito-quarkus-ubi8/test/run
+	cekit -v build --overrides-file kogito-quarkus-ubi8-s2i-overrides.yaml --overrides 'name: kogito-quarkus-ubi8-s2i-candidate' docker --no-squash
+	modules/kogito-quarkus-ubi8-s2i/test/run
+	cekit -v build --overrides-file kogito-springboot-ubi8-overrides.yaml --overrides 'name: kogito-springboot-ubi8-candidate' docker --no-squash
+	modules/kogito-springboot-ubi8/test/run
+	cekit -v build --overrides-file kogito-springboot-ubi8-s2i-overrides.yaml --overrides 'name: kogito-springboot-ubi8-s2i-candidate' docker --no-squash
+	modules/kogito-springboot-ubi8-s2i-/test/run
 
 
 # push images to quay.io, this requires permissions under kiegroup organization
 .PHONY: push
 push: build _push
 _push:
-	docker push quay.io/kiegroup/kogito-quarkus-centos:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-quarkus-centos:latest
-	docker push quay.io/kiegroup/kogito-quarkus-centos-s2i:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-quarkus-centos-s2i:latest
-	docker push quay.io/kiegroup/kogito-springboot-centos:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-springboot-centos:latest
-	docker push quay.io/kiegroup/kogito-springboot-centos-s2i:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-springboot-centos-s2i:latest
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:$(IMAGE_VERSION)
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:latest
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:latest
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest
+
+
+# push staging images to quay.io, done before release, this requires permissions under kiegroup organization
+.PHONY: push-staging
+push-staging: build _push-staging
+_push-staging:
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
+
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
+
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
+
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
\ No newline at end of file
diff --git a/s2i/README.md b/s2i/README.md
index 7e7b133fc5a..3bb8543b927 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -5,50 +5,49 @@ of builder images to perform the build and to run the result binaries.
 
 Images are grouped by the runtime that will run the binaries and the OS level
 
-## Centos 7
 
 ## Quarkus
 
-### kogito-quarkus-centos-s2i
+### kogito-quarkus-ubi8-s2i
 
 Builder image that is responsible for building the project
 with Apache Maven and generate native image using GraalVM/SubstrateVM
 
-Image location: quay.io/kiegroup/kogito-quarkus-centos-s2i:latest
+Image location: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest
 
-For more details have a look at [README.md](modules/kogito-quarkus-centos-s2i/README.md)
+For more details have a look at [README.md](modules/kogito-quarkus-ubi8-s2i/README.md)
 
-### kogito-quarkus-centos
+### kogito-quarkus-ubi8
 
 Runtime image that is responsible for just running the binaries taken from the
 builder image. That approach is giving small and compact image that does not
 not carry on any of the build tools or artefacts (like local maven repository).
 
-Image location: quay.io/kiegroup/kogito-quarkus-centos:latest
+Image location: quay.io/kiegroup/kogito-quarkus-ubi8:latest
 
-For more details have a look at [README.md](kogito-quarkus-centos/README.md)
+For more details have a look at [README.md](kogito-quarkus-ubi8/README.md)
 
 ## SpringBoot
 
-### kogito-springboot-centos-s2i
+### kogito-springboot-ubi8-s2i
 
 Builder image that is responsible for building the project
 with Apache Maven and generate fat jar.
 
-Image location: quay.io/kiegroup/kogito-springboot-centos-s2i:latest
+Image location: quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest
 
-For more details have a look at [README.md](kogito-springboot-centos-s2i/README.md)
+For more details have a look at [README.md](kogito-springboot-ubi8-s2i/README.md)
 
-### kogito-springboot-centos
+### kogito-springboot-ubi8
 
 Runtime image that is responsible for just running the fat jar taken from the
 builder image. It has JRE installed on the container to allow java executable.
 That approach is giving small and compact image that does not
 not carry on any of the build tools or artefacts (like local maven repository).
 
-Image location: quay.io/kiegroup/kogito-springboot-centos:latest
+Image location: quay.io/kiegroup/kogito-springboot-ubi8:latest
 
-For more details have a look at [README.md](kogito-springboot-centos/README.md)
+For more details have a look at [README.md](kogito-springboot-ubi8/README.md)
 
 # Supported source structure
 
@@ -88,7 +87,7 @@ Best way is to use maven archetypes to generate project structure (same archetyp
 Once the images are built and imported into registry (docker hub or internal OpenShift registry)
 new applications can be build and deployed with this few steps
 
-`oc new-build quay.io/kiegroup/kogito-quarkus-centos-s2i~https://github.com/user/project --name=builder-app-name`
+`oc new-build quay.io/kiegroup/kogito-quarkus-ubi8-s2i~https://github.com/user/project --name=builder-app-name`
 
 Modify accordingly following
 - repository is the docker repository the images are available in (could be OpenShift project or docker hub user)
@@ -100,7 +99,7 @@ Modify accordingly following
 
 Once the build is finished, create another build config to produce runtime image
 
-`oc new-build --name app-name --source-image=builder-app-name --source-image-path=/home/kogito/bin:. --image-stream=kogito-quarkus-centos`
+`oc new-build --name app-name --source-image=builder-app-name --source-image-path=/home/kogito/bin:. --image-stream=kogito-quarkus-ubi8`
 
 Modify accordingly following
 - app-name is the final name of the image that will be deployed
@@ -171,7 +170,7 @@ $ make
 
 To build a single image, use `make build image-name`, example:
 ```bash
-$ make kogito-quarkus-centos
+$ make kogito-quarkus-ubi8
 ```
 
 Testing the images (WIP):
@@ -204,7 +203,7 @@ $ docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)
 
 Tag the built image, example
 ```bash
-$ docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kogito-quarkus-centos
+$ docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kogito-quarkus-ubi8
 ```
 
 Modify accordingly
diff --git a/s2i/image.yaml b/s2i/image.yaml
index af53a2b021b..d09d790f3be 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,8 +1,8 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.2.0"
-from: "centos:latest"
+version: "0.3.0"
+from: "registry.redhat.io/ubi8-minimal:latest"
 
 labels:
 - name: "maintainer"
@@ -19,9 +19,7 @@ modules:
   - path: modules
 
 packages:
-  repositories:
-  - name: scl
-    rpm: centos-release-scl
+  manager: microdnf
 
 run:
   user: 1001
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 34081a79629..d9cf00c0189 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -9,84 +9,84 @@ items:
 - kind: ImageStream
   apiVersion: v1
   metadata:
-    name: kogito-quarkus-centos
+    name: kogito-quarkus-ubi8
     annotations:
       openshift.io/display-name: Runtime image for Kogito based on Quarkus native image
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.2.0'
+    - name: '0.3.0'
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
         tags: builder,runtime,kogito,quarkus
         supports: quarkus
-        version: '0.2.0'
+        version: '0.3.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-centos:0.2.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.3.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
-    name: kogito-quarkus-centos-s2i
+    name: kogito-quarkus-ubi8-s2i
     annotations:
       openshift.io/display-name: Platform for building Kogito based on Quarkus
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.2.0'
+    - name: '0.3.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,quarkus
         supports: quarkus
-        version: '0.2.0'
+        version: '0.3.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-centos-s2i:0.2.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.3.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
-    name: kogito-springboot-centos
+    name: kogito-springboot-ubi8
     annotations:
       openshift.io/display-name: Runtime image for Kogito based on SpringBoot native image
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.2.0'
+    - name: '0.3.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,runtime,kogito,springboot
         supports: springboot
-        version: '0.2.0'
+        version: '0.3.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-centos:0.2.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8:0.3.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
-    name: kogito-springboot-centos-s2i
+    name: kogito-springboot-ubi8-s2i
     annotations:
       openshift.io/display-name: Platform for building Kogito based on SpringBoot
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.2.0'
+    - name: '0.3.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,springboot
         supports: springboot
-        version: '0.2.0'
+        version: '0.3.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-centos-s2i:0.2.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.3.0
diff --git a/s2i/kogito-quarkus-centos-overrides.yaml b/s2i/kogito-quarkus-ubi8-overrides.yaml
similarity index 53%
rename from s2i/kogito-quarkus-centos-overrides.yaml
rename to s2i/kogito-quarkus-ubi8-overrides.yaml
index d6ccdeb211c..b51554a9f42 100644
--- a/s2i/kogito-quarkus-centos-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-overrides.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-quarkus-centos"
+name: "quay.io/kiegroup/kogito-quarkus-ubi8"
 description: "Runtime image for Kogito based on Quarkus native image"
 
 labels:
@@ -10,11 +10,20 @@ labels:
   value: "Kogito based on Quarkus native image"
 - name: "io.openshift.tags"
   value: "builder,runtime,kogito,quarkus"
+- name: "io.openshift.s2i.assemble-input-files"
+  value: "/home/kogito/bin"
 
 ports:
 - value: 8080
 
 modules:
   install:
+  - name: install-rpm-dependencies
   - name: add-kogito-user
-  - name: kogito-quarkus-centos
+  - name: kogito-quarkus-ubi8
+
+
+## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.3.0 kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:0.3.0
+run:
+  workdir: "/home/kogito/"
+
diff --git a/s2i/kogito-quarkus-centos-s2i-overrides.yaml b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
similarity index 80%
rename from s2i/kogito-quarkus-centos-s2i-overrides.yaml
rename to s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
index 8371ac3d35f..e6a715bf1e8 100644
--- a/s2i/kogito-quarkus-centos-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-quarkus-centos-s2i"
+name: "quay.io/kiegroup/kogito-quarkus-ubi8-s2i"
 description: "Platform for building Kogito based on Quarkus"
 
 labels:
@@ -13,12 +13,13 @@ labels:
 
 modules:
   install:
+  - name: install-rpm-dependencies
   - name: add-kogito-user
   - name: graalvm
     version: "19.1.1"
   - name: maven
     version: "3.6.0"
-  - name: kogito-quarkus-centos-s2i
+  - name: kogito-quarkus-ubi8-s2i
 
 packages:
   install:
diff --git a/s2i/kogito-springboot-centos-overrides.yaml b/s2i/kogito-springboot-ubi8-overrides.yaml
similarity index 55%
rename from s2i/kogito-springboot-centos-overrides.yaml
rename to s2i/kogito-springboot-ubi8-overrides.yaml
index 18e1d19c725..dfb9d58f97b 100644
--- a/s2i/kogito-springboot-centos-overrides.yaml
+++ b/s2i/kogito-springboot-ubi8-overrides.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-springboot-centos"
+name: "quay.io/kiegroup/kogito-springboot-ubi8"
 description: "Runtime image for Kogito based on SpringBoot native image"
 
 labels:
@@ -10,13 +10,21 @@ labels:
   value: "Kogito based on SpringBoot native image"
 - name: "io.openshift.tags"
   value: "builder,runtime,kogito,springboot"
+- name: "io.openshift.s2i.assemble-input-files"
+  value: "/home/kogito/bin"
 
 ports:
 - value: 8080
 
 modules:
   install:
+  - name: install-rpm-dependencies
   - name: add-kogito-user
   - name: java-openjdk
     version: "1.8.0"
-  - name: kogito-springboot-centos
+  - name: kogito-springboot-ubi8
+
+# s2i build . quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.3.0 kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-springboot-ubi8:0.3.0
+run:
+  workdir: "/home/kogito"
+
diff --git a/s2i/kogito-springboot-centos-s2i-overrides.yaml b/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
similarity index 78%
rename from s2i/kogito-springboot-centos-s2i-overrides.yaml
rename to s2i/kogito-springboot-ubi8-s2i-overrides.yaml
index f8594ad38b0..7d4c2279e24 100644
--- a/s2i/kogito-springboot-centos-s2i-overrides.yaml
+++ b/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-springboot-centos-s2i"
+name: "quay.io/kiegroup/kogito-springboot-ubi8-s2i"
 description: "Platform for building Kogito based on SpringBoot"
 
 labels:
@@ -13,9 +13,10 @@ labels:
 
 modules:
   install:
+  - name: install-rpm-dependencies
   - name: add-kogito-user
   - name: maven
     version: "3.6.0"
   - name: java-openjdk
     version: "1.8.0"
-  - name: kogito-springboot-centos-s2i
+  - name: kogito-springboot-ubi8-s2i
diff --git a/s2i/modules/add-kogito-user/add-user b/s2i/modules/add-kogito-user/add-user
index 194d0c33273..3a410212364 100644
--- a/s2i/modules/add-kogito-user/add-user
+++ b/s2i/modules/add-kogito-user/add-user
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-groupadd -r kogito -g 1001 && useradd -u 1001 -r -g 1001 -m -d ${KOGITO_HOME} -s /sbin/nologin -c "Kogito user" kogito
+groupadd -r kogito -g 1001 && useradd -u 1001 -r -g 1001 -m -d ${KOGITO_HOME} -s /sbin/nologin -c "Kogito user" ${USER}
+
diff --git a/s2i/modules/add-kogito-user/module.yaml b/s2i/modules/add-kogito-user/module.yaml
index de1b70eb21a..4070b0e553c 100644
--- a/s2i/modules/add-kogito-user/module.yaml
+++ b/s2i/modules/add-kogito-user/module.yaml
@@ -1,4 +1,5 @@
 schema_version: 1
+version: "0.3.0"
 name: add-kogito-user
 execute:
 - script: add-user
@@ -6,3 +7,6 @@ execute:
 envs:
 - name: "KOGITO_HOME"
   value: "/home/kogito"
+- name: "USER"
+  value: "kogito"
+
diff --git a/s2i/modules/install-rpm-dependencies/clean.sh b/s2i/modules/install-rpm-dependencies/clean.sh
new file mode 100644
index 00000000000..d99eb4fb10e
--- /dev/null
+++ b/s2i/modules/install-rpm-dependencies/clean.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+microdnf clean all
+rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/s2i/modules/install-rpm-dependencies/module.yaml b/s2i/modules/install-rpm-dependencies/module.yaml
new file mode 100644
index 00000000000..f55cbfd5710
--- /dev/null
+++ b/s2i/modules/install-rpm-dependencies/module.yaml
@@ -0,0 +1,13 @@
+schema_version: 1
+name: install-rpm-dependencies
+
+execute:
+  - script: clean.sh
+
+# holds common dependencies across images
+packages:
+  install:
+    - shadow-utils
+    - tar
+    - gzip
+
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/assemble
deleted file mode 100644
index 296fe0ad530..00000000000
--- a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/assemble
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble script for the 'kaas-quarkus-centos-s2i' image.
-# The 'assemble' script builds your application source so that it is ready to run.
-#
-# For more information refer to the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-#############################################
-# Configure maven - for a complete list of
-# supported values, please refer the module.yaml
-# file.
-CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/.m2/configure-maven.sh
-)
-source ${KOGITO_HOME}/.m2/configure.sh
-#############################################
-
-# If the 'kaas-quarkus-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
-if [[ "$1" == "-h" ]]; then
-	exec /usr/libexec/s2i/usage
-fi
-
-if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
-    echo "---> Restore build artifacts"
-    mv /tmp/artifacts/.m2 $HOME
-fi
-
-echo "---> Installing application source..."
-cd /tmp/src/
-
-if [ -f "pom.xml" ]; then
-	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -Pnative -s $KOGITO_HOME/.m2/settings.xml \
-    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-else
-	echo "---> Generating project structure..."
-
-	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-quarkus-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
-
-	# copy resources into the generated project
-	for item in *
-	do
-		if [ -d $item ] && [ "$item" == "project" ]; then
-			echo "--> Skipping generated project ..."
-		else
-			echo "--> Coping resource $item"
-			cp -R $item project/src/main/resources
-		fi
-	done
-
-	# move all project content into the current directory
-	mv project/* .
-
-	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -Pnative -s $KOGITO_HOME/.m2/settings.xml \
-    -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-
-fi
-
-
-echo "---> Installing application binaries"
-mkdir $KOGITO_HOME/bin
-cp -v target/*-runner $KOGITO_HOME/bin
-chmod +x $KOGITO_HOME/bin/*-runner
-
-
-echo "---> Copy image metadata file..."
-if [ -e /tmp/src/target/image_metadata.json ]; then
-    mkdir /tmp/.s2i
-    cp -v /tmp/src/target/image_metadata.json /tmp/.s2i
-    cp -v /tmp/src/target/image_metadata.json $KOGITO_HOME/bin
-else
-    echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
-fi
-
-echo "---> Copy native java libraries for ssl handling..."
-cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/bin
diff --git a/s2i/modules/kogito-quarkus-centos/s2i/bin/assemble-runtime b/s2i/modules/kogito-quarkus-centos/s2i/bin/assemble-runtime
deleted file mode 100644
index ff9c9e828f0..00000000000
--- a/s2i/modules/kogito-quarkus-centos/s2i/bin/assemble-runtime
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble-runtime script for the 'kogito-quarkus-centos' image.
-# The assemble-runtime script executes preparation for running the container on runtime image.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-
-if [ -d "$KOGITO_HOME/bin" ]; then
-  echo "---> Application binaries found and ready to use"
-
-  echo "---> Adding custom labels..."
-  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
-    mkdir /tmp/.s2i
-    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-  else
-    echo "-----> Failed to copy metada file, $KOGITO_HOME/bin/image_metadata.json does not exist"
-  fi
-else
-  echo "---> Application binaries NOT found, failing build..."
-  exit 1
-fi
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/README.md b/s2i/modules/kogito-quarkus-ubi8-s2i/README.md
similarity index 80%
rename from s2i/modules/kogito-quarkus-centos-s2i/README.md
rename to s2i/modules/kogito-quarkus-ubi8-s2i/README.md
index 723ff946926..a818f0e9b41 100644
--- a/s2i/modules/kogito-quarkus-centos-s2i/README.md
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/README.md
@@ -1,4 +1,4 @@
-# S2I image to build builder image based on Centos 7
+# S2I image to build builder image based on ubi8
 
 This S2I is considered image builder that is equipped with build tools
 
diff --git a/s2i/modules/kogito-springboot-centos/configure b/s2i/modules/kogito-quarkus-ubi8-s2i/configure
similarity index 87%
rename from s2i/modules/kogito-springboot-centos/configure
rename to s2i/modules/kogito-quarkus-ubi8-s2i/configure
index 0fe63c4ce07..4d48177eaef 100644
--- a/s2i/modules/kogito-springboot-centos/configure
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/configure
@@ -5,6 +5,9 @@ SCRIPT_DIR=$(dirname $0)
 
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
+mkdir $KOGITO_HOME/bin
+
 chmod 755 /usr/local/s2i/*
 chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
+
diff --git a/s2i/modules/kogito-springboot-centos-s2i/module.yaml b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
similarity index 51%
rename from s2i/modules/kogito-springboot-centos-s2i/module.yaml
rename to s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
index bce54b2601f..3c3e70ade94 100644
--- a/s2i/modules/kogito-springboot-centos-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
@@ -1,4 +1,5 @@
 schema_version: 1
-name: kogito-springboot-centos-s2i
+version: "0.3.0"
+name: kogito-quarkus-ubi8-s2i
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
new file mode 100644
index 00000000000..3b45454584b
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
@@ -0,0 +1,79 @@
+#!/bin/bash -e
+#
+# S2I assemble script for the 'kaas-quarkus-centos-s2i' image.
+# The 'assemble' script builds your application source so that it is ready to run.
+#
+# For more information refer to the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+#############################################
+# Configure maven - for a complete list of
+# supported values, please refer the module.yaml
+# file.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/.m2/configure-maven.sh
+)
+source ${KOGITO_HOME}/.m2/configure.sh
+#############################################
+
+# If the 'kaas-quarkus-ubi8-s2i' assemble script is executed with the '-h' flag, print the usage.
+if [[ "$1" == "-h" ]]; then
+    exec /usr/libexec/s2i/usage
+fi
+
+if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
+    echo "---> Restore build artifacts"
+    mv /tmp/artifacts/.m2 $HOME
+fi
+
+echo "---> Installing application source..."
+cd /tmp/src/
+
+if [ -f "pom.xml" ]; then
+    echo "---> Building application from source..."
+    $MAVEN_HOME/bin/mvn clean package -Pnative -s $KOGITO_HOME/.m2/settings.xml \
+        -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+        -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
+else
+    echo "---> Generating project structure..."
+
+    $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-quarkus-archetype \
+	-DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
+
+    # copy resources into the generated project
+    for item in *
+    do
+        if [ -d $item ] && [ "$item" == "project" ]; then
+            echo "--> Skipping generated project ..."
+        else
+            echo "--> Coping resource $item"
+            cp -R $item project/src/main/resources
+        fi
+    done
+
+    # move all project content into the current directory
+    mv project/* .
+
+    echo "---> Building application from source..."
+    $MAVEN_HOME/bin/mvn clean package -Pnative -s $KOGITO_HOME/.m2/settings.xml \
+        -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+        -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
+
+fi
+
+echo "---> Installing application binaries"
+cp -v target/*-runner $KOGITO_HOME/bin
+chmod +x $KOGITO_HOME/bin/*-runner
+
+echo "---> Copy image metadata file..."
+if [ -e /tmp/src/target/image_metadata.json ]; then
+    mkdir /tmp/.s2i
+    cp -v /tmp/src/target/image_metadata.json /tmp/.s2i
+    cp -v /tmp/src/target/image_metadata.json $KOGITO_HOME/bin
+else
+    echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
+fi
+
+echo "---> Copy native java libraries for ssl handling..."
+cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/bin
+
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
similarity index 81%
rename from s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/run
rename to s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
index fc8eefefd74..aa8ed9e5945 100644
--- a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# S2I run script for the 'kogito-quarkus-centos-s2i' image.
+# S2I run script for the 'kogito-quarkus-ubi8-s2i' image.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
similarity index 100%
rename from s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/save-artifacts
rename to s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usage b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage
similarity index 56%
rename from s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usage
rename to s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage
index a5dfc996336..e465dcdbef7 100644
--- a/s2i/modules/kogito-quarkus-centos-s2i/s2i/bin/usage
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 cat <<EOF
-This is the kogito-quarkus-centos S2I image:
+This is the quay.io/kiegroup/kogito-quarkus-ubi8 S2I image:
 
 Build native image based on project source either complete maven project or just set of business assets
 such as processes, rules, decisions.
@@ -10,11 +10,11 @@ To use it, install S2I: https://github.com/openshift/source-to-image
 This image is intended to build application binaries only that are later on transfered to runtime image.
 
 
-s2i build -c <source code path/URL> kogito-quarkus-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/kogito/bin
+s2i build -c <source code path/URL> quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image name> --runtime-image <image name>
 
 Sample invocation:
 
-s2i build -c /Development/project/ kogito-quarkus-centos-s2i application --runtime-image kogito-quarkus-centos --runtime-artifact /home/kogito/bin
+s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i application --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8
 
 You can then run the resulting image via:
 docker run <application image>
diff --git a/s2i/modules/kogito-springboot-centos/test/run b/s2i/modules/kogito-quarkus-ubi8-s2i/test/run
similarity index 98%
rename from s2i/modules/kogito-springboot-centos/test/run
rename to s2i/modules/kogito-quarkus-ubi8-s2i/test/run
index 051794ef1ed..488e670fb8d 100755
--- a/s2i/modules/kogito-springboot-centos/test/run
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME-kogito-springboot-centos-candidate}
+IMAGE_NAME=${IMAGE_NAME:-kogito-quarkus-ubi8-s2i-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/test/test-app/index.html b/s2i/modules/kogito-quarkus-ubi8-s2i/test/test-app/index.html
similarity index 100%
rename from s2i/modules/kogito-quarkus-centos-s2i/test/test-app/index.html
rename to s2i/modules/kogito-quarkus-ubi8-s2i/test/test-app/index.html
diff --git a/s2i/modules/kogito-quarkus-centos/README.md b/s2i/modules/kogito-quarkus-ubi8/README.md
similarity index 64%
rename from s2i/modules/kogito-quarkus-centos/README.md
rename to s2i/modules/kogito-quarkus-ubi8/README.md
index 8f806643417..5eee8920d9e 100644
--- a/s2i/modules/kogito-quarkus-centos/README.md
+++ b/s2i/modules/kogito-quarkus-ubi8/README.md
@@ -1,7 +1,7 @@
-# S2I image to build runtime image based on Centos 7
+# S2I image to build runtime image based on ubi8
 
 This S2I is considered a runtime image builder as it relies on another image
-(built with `kogito-quarkus-centos-s2i`) that actually produced the binaries to be executed
+(built with `kogito-quarkus-ubi8-s2i`) that actually produced the binaries to be executed
 (the native image based on Quarkus runtime). So this one will only get the binaries
 and place into the container.
 
diff --git a/s2i/modules/kogito-quarkus-centos/configure b/s2i/modules/kogito-quarkus-ubi8/configure
similarity index 99%
rename from s2i/modules/kogito-quarkus-centos/configure
rename to s2i/modules/kogito-quarkus-ubi8/configure
index 902a6c1d521..286c6c2e034 100644
--- a/s2i/modules/kogito-quarkus-centos/configure
+++ b/s2i/modules/kogito-quarkus-ubi8/configure
@@ -7,3 +7,4 @@ cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 chmod 755 /usr/local/s2i/*
 chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
+
diff --git a/s2i/modules/kogito-quarkus-centos/module.yaml b/s2i/modules/kogito-quarkus-ubi8/module.yaml
similarity index 51%
rename from s2i/modules/kogito-quarkus-centos/module.yaml
rename to s2i/modules/kogito-quarkus-ubi8/module.yaml
index a7890ce0e17..5d9804d3ea5 100644
--- a/s2i/modules/kogito-quarkus-centos/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8/module.yaml
@@ -1,4 +1,6 @@
 schema_version: 1
-name: kogito-quarkus-centos
+version: "0.3.0"
+name: kogito-quarkus-ubi8
 execute:
 - script: configure
+
diff --git a/s2i/modules/kogito-springboot-centos/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble
old mode 100755
new mode 100644
similarity index 84%
rename from s2i/modules/kogito-springboot-centos/s2i/bin/assemble
rename to s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble
index eddd94e36b9..f1f0a931361
--- a/s2i/modules/kogito-springboot-centos/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble
@@ -12,7 +12,7 @@ if [ -d "$KOGITO_HOME/bin" ]; then
     mkdir /tmp/.s2i
     mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
   else
-    echo "-----> Failed to copy metada file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+    echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
   fi
 else
   echo "---> Application binaries NOT found, failing build..."
diff --git a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble-runtime b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble-runtime
new file mode 100644
index 00000000000..89688b8cb33
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble-runtime
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+#
+# S2I assemble-runtime script for the 'kogito-quarkus-ubi8' image.
+# The assemble-runtime script executes preparation for running the container on runtime image.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+
+if [ -d "$KOGITO_HOME/bin" ]; then
+    echo "---> Application binaries found and ready to use"
+
+    echo "---> Adding custom labels..."
+    if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
+        mkdir /tmp/.s2i
+        cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+    else
+        echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+    fi
+else
+    echo "---> Application binaries NOT found, failing build..."
+    exit 1
+fi
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-centos/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
similarity index 84%
rename from s2i/modules/kogito-quarkus-centos/s2i/bin/run
rename to s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
index 0151fc92f8c..89b05b6b947 100755
--- a/s2i/modules/kogito-quarkus-centos/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# S2I run script for the 'kogito-quarkus-centos' image.
+# S2I run script for the 'kogito-quarkus-ubi8' image.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
diff --git a/s2i/modules/kogito-quarkus-centos/s2i/bin/usage b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/usage
similarity index 56%
rename from s2i/modules/kogito-quarkus-centos/s2i/bin/usage
rename to s2i/modules/kogito-quarkus-ubi8/s2i/bin/usage
index c55d6703dfa..279b136ead6 100644
--- a/s2i/modules/kogito-quarkus-centos/s2i/bin/usage
+++ b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/usage
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 cat <<EOF
-This is the kogito-quarkus-centos S2I image:
+This is the quay.io/kiegroup/kogito-quarkus-ubi8 S2I image:
 To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build <source code path/URL> kogito-quarkus-centos <application image>
+s2i build <source code path/URL> quay.io/kiegroup/kogito-quarkus-ubi8 <application image>
 
 You can then run the resulting image via:
 docker run <application image>
diff --git a/s2i/modules/kogito-quarkus-centos/test/run b/s2i/modules/kogito-quarkus-ubi8/test/run
similarity index 98%
rename from s2i/modules/kogito-quarkus-centos/test/run
rename to s2i/modules/kogito-quarkus-ubi8/test/run
index c4d141279ce..dbdddbab686 100755
--- a/s2i/modules/kogito-quarkus-centos/test/run
+++ b/s2i/modules/kogito-quarkus-ubi8/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME:-kogito-quarkus-centos-candidate}
+IMAGE_NAME=${IMAGE_NAME:-kogito-quarkus-ubi8-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
diff --git a/s2i/modules/kogito-quarkus-centos/test/test-app/index.html b/s2i/modules/kogito-quarkus-ubi8/test/test-app/index.html
similarity index 100%
rename from s2i/modules/kogito-quarkus-centos/test/test-app/index.html
rename to s2i/modules/kogito-quarkus-ubi8/test/test-app/index.html
diff --git a/s2i/modules/kogito-springboot-centos/module.yaml b/s2i/modules/kogito-springboot-centos/module.yaml
deleted file mode 100644
index a410c65e82d..00000000000
--- a/s2i/modules/kogito-springboot-centos/module.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-schema_version: 1
-name: kogito-springboot-centos
-execute:
-  - script: configure
diff --git a/s2i/modules/kogito-springboot-centos-s2i/README.md b/s2i/modules/kogito-springboot-ubi8-s2i/README.md
similarity index 80%
rename from s2i/modules/kogito-springboot-centos-s2i/README.md
rename to s2i/modules/kogito-springboot-ubi8-s2i/README.md
index 6cc3ba2fb86..2145a131919 100644
--- a/s2i/modules/kogito-springboot-centos-s2i/README.md
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/README.md
@@ -1,4 +1,4 @@
-# S2I image to build builder image based on Centos 7
+# S2I image to build builder image based on ubi8
 
 This S2I is considered image builder that is equipped with build tools
 
diff --git a/s2i/modules/kogito-springboot-centos-s2i/configure b/s2i/modules/kogito-springboot-ubi8-s2i/configure
similarity index 88%
rename from s2i/modules/kogito-springboot-centos-s2i/configure
rename to s2i/modules/kogito-springboot-ubi8-s2i/configure
index ff7734d3446..ece25125aae 100644
--- a/s2i/modules/kogito-springboot-centos-s2i/configure
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/configure
@@ -5,6 +5,8 @@ SCRIPT_DIR=$(dirname $0)
 
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
+mkdir $KOGITO_HOME/bin
+
 chmod 755 /usr/local/s2i/*
 chown -R 1001:1001 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
new file mode 100644
index 00000000000..80c72e0972a
--- /dev/null
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
@@ -0,0 +1,5 @@
+schema_version: 1
+version: "0.3.0"
+name: kogito-springboot-ubi8-s2i
+execute:
+  - script: configure
diff --git a/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
similarity index 89%
rename from s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble
rename to s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
index 3fbc34473cd..d6ef6280f68 100755
--- a/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
@@ -11,7 +11,7 @@
 # supported values, please refer the module.yaml
 # file.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/.m2/configure-maven.sh
+    ${KOGITO_HOME}/.m2/configure-maven.sh
 )
 source ${KOGITO_HOME}/.m2/configure.sh
 #############################################
@@ -22,7 +22,7 @@ if [[ "$1" == "-h" ]]; then
 fi
 
 if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
-		echo "---> Restore build artifacts"
+    echo "---> Restore build artifacts"
     mv /tmp/artifacts/.m2 $HOME
 fi
 
@@ -37,7 +37,9 @@ if [ -f "pom.xml" ]; then
 else
 	echo "---> Generating project structure..."
 
-	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=kogito-springboot-archetype -DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
+	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito \
+	-DarchetypeArtifactId=kogito-springboot-archetype -DarchetypeVersion=8.0.0-SNAPSHOT \
+	-DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
 
 	# copy resources into the generated project
 	for item in *
@@ -60,7 +62,6 @@ else
 fi
 
 echo "---> Installing application binaries"
-mkdir $KOGITO_HOME/bin
 cp -v target/*.jar $KOGITO_HOME/bin
 
 echo "---> Copy image metadata file..."
diff --git a/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/run b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run
similarity index 79%
rename from s2i/modules/kogito-springboot-centos-s2i/s2i/bin/run
rename to s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run
index 8f72eec78c0..f2bc44477fc 100755
--- a/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/run
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# S2I run script for the 'kogito-springboot-centos-s2i' image.
+# S2I run script for the 'kogito-springboot-ubi8-s2i' image.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
diff --git a/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
similarity index 100%
rename from s2i/modules/kogito-springboot-centos-s2i/s2i/bin/save-artifacts
rename to s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
diff --git a/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/usage b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage
similarity index 52%
rename from s2i/modules/kogito-springboot-centos-s2i/s2i/bin/usage
rename to s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage
index dd3e20411ac..a7032fda74c 100755
--- a/s2i/modules/kogito-springboot-centos-s2i/s2i/bin/usage
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 cat <<EOF
-This is the kogito-springboot-centos S2I image:
+This is the quay.io/kiegroup/kogito-springboot-ubi8 S2I image:
 
 Build executable jar based on project source either complete maven project or just set of business assets 
 such as processes, rules, decisions.
@@ -9,11 +9,11 @@ To use it, install S2I: https://github.com/openshift/source-to-image
 
 This image is intended to build application binaries only that are later on transfered to runtime image.
 
-s2i build -c <source code path/URL> kogito-springboot-centos-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/kogito/bin
+s2i build -c <source code path/URL> quay.io/kiegroup/kogito-springboot-ubi8-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/kogito/bin
 
 Sample invocation:
 
-s2i build -c /Development/project/ kogito-springboot-centos-s2i application --runtime-image kogito-springboot-centos --runtime-artifact /home/kogito/bin
+s2i build -c /Development/project/ quay.io/kiegroup/kogito-springboot-ubi8-s2i application --runtime-image kogito-springboot-ubi8 --runtime-artifact /home/kogito/bin
 
 You can then run the resulting image via:
 docker run <application image>
diff --git a/s2i/modules/kogito-springboot-centos-s2i/test/run b/s2i/modules/kogito-springboot-ubi8-s2i/test/run
similarity index 98%
rename from s2i/modules/kogito-springboot-centos-s2i/test/run
rename to s2i/modules/kogito-springboot-ubi8-s2i/test/run
index 60bc2f41ff1..fbd9d5b1f3d 100755
--- a/s2i/modules/kogito-springboot-centos-s2i/test/run
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME:-kogito-springboot-centos-s2i-candidate}
+IMAGE_NAME=${IMAGE_NAME:-kogito-springboot-ubi8-s2i-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
diff --git a/s2i/modules/kogito-springboot-centos-s2i/test/test-app/index.html b/s2i/modules/kogito-springboot-ubi8-s2i/test/test-app/index.html
similarity index 100%
rename from s2i/modules/kogito-springboot-centos-s2i/test/test-app/index.html
rename to s2i/modules/kogito-springboot-ubi8-s2i/test/test-app/index.html
diff --git a/s2i/modules/kogito-springboot-centos/README.md b/s2i/modules/kogito-springboot-ubi8/README.md
similarity index 65%
rename from s2i/modules/kogito-springboot-centos/README.md
rename to s2i/modules/kogito-springboot-ubi8/README.md
index 2cdd0c7a742..c8f8970e44d 100644
--- a/s2i/modules/kogito-springboot-centos/README.md
+++ b/s2i/modules/kogito-springboot-ubi8/README.md
@@ -1,7 +1,7 @@
-# S2I image to build runtime image based on Centos 7
+# S2I image to build runtime image based on ubi8
 
 This S2I is considered a runtime image builder as it relies on another image
-(built with `kogito-springboot-centos-s2i`) that actually produced the binaries to be executed
+(built with `kogito-springboot-ubi8-s2i`) that actually produced the binaries to be executed
 (the fat jar based on SpringBoot 2.1.x runtime). So this one will only get the binaries
 and place into the container.
 
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/configure b/s2i/modules/kogito-springboot-ubi8/configure
similarity index 100%
rename from s2i/modules/kogito-quarkus-centos-s2i/configure
rename to s2i/modules/kogito-springboot-ubi8/configure
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/module.yaml b/s2i/modules/kogito-springboot-ubi8/module.yaml
similarity index 51%
rename from s2i/modules/kogito-quarkus-centos-s2i/module.yaml
rename to s2i/modules/kogito-springboot-ubi8/module.yaml
index 94a98650239..d50656f030a 100644
--- a/s2i/modules/kogito-quarkus-centos-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8/module.yaml
@@ -1,4 +1,5 @@
 schema_version: 1
-name: kogito-quarkus-centos-s2i
+version: "0.3.0"
+name: kogito-springboot-ubi8
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-quarkus-centos/s2i/bin/assemble b/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble
old mode 100644
new mode 100755
similarity index 84%
rename from s2i/modules/kogito-quarkus-centos/s2i/bin/assemble
rename to s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble
index eddd94e36b9..9d7c4daed57
--- a/s2i/modules/kogito-quarkus-centos/s2i/bin/assemble
+++ b/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble
@@ -12,9 +12,10 @@ if [ -d "$KOGITO_HOME/bin" ]; then
     mkdir /tmp/.s2i
     mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
   else
-    echo "-----> Failed to copy metada file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+    echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
   fi
 else
   echo "---> Application binaries NOT found, failing build..."
   exit 1
 fi
+
diff --git a/s2i/modules/kogito-springboot-centos/s2i/bin/assemble-runtime b/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble-runtime
similarity index 70%
rename from s2i/modules/kogito-springboot-centos/s2i/bin/assemble-runtime
rename to s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble-runtime
index 3f7bd75056e..b792ef679f1 100755
--- a/s2i/modules/kogito-springboot-centos/s2i/bin/assemble-runtime
+++ b/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble-runtime
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# S2I assemble-runtime script for the 'kogito-springboot-centos' image.
+# S2I assemble-runtime script for the 'kogito-springboot-ubi8' image.
 # The assemble-runtime script executes preparation for running the container on runtime image.
 #
 # For more information see the documentation:
@@ -12,9 +12,9 @@ if [ -d "$KOGITO_HOME/bin" ]; then
   echo "---> Adding custom labels..."
   if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
     mkdir /tmp/.s2i
-    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+    cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
   else
-    echo "-----> Failed to copy metada file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+    echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
   fi
 else
   echo "---> Application binaries NOT found, failing build..."
diff --git a/s2i/modules/kogito-springboot-centos/s2i/bin/run b/s2i/modules/kogito-springboot-ubi8/s2i/bin/run
similarity index 80%
rename from s2i/modules/kogito-springboot-centos/s2i/bin/run
rename to s2i/modules/kogito-springboot-ubi8/s2i/bin/run
index 42ca87db0ee..56d24b7622a 100755
--- a/s2i/modules/kogito-springboot-centos/s2i/bin/run
+++ b/s2i/modules/kogito-springboot-ubi8/s2i/bin/run
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# S2I run script for the 'kogito-springboot-centos' image.
+# S2I run script for the 'kogito-springboot-ubi8' image.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
diff --git a/s2i/modules/kogito-springboot-centos/s2i/bin/usage b/s2i/modules/kogito-springboot-ubi8/s2i/bin/usage
similarity index 55%
rename from s2i/modules/kogito-springboot-centos/s2i/bin/usage
rename to s2i/modules/kogito-springboot-ubi8/s2i/bin/usage
index 5c827268655..2da28318e65 100755
--- a/s2i/modules/kogito-springboot-centos/s2i/bin/usage
+++ b/s2i/modules/kogito-springboot-ubi8/s2i/bin/usage
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 cat <<EOF
-This is the kogito-quarkus-centos S2I image:
+This is the quay.io/kiegroup/kogito-springboot-ubi8 S2I image:
 To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build <source code path/URL> kogito-quarkus-centos <application image>
+s2i build <source code path/URL> quay.io/kiegroup/kogito-springboot-ubi8 <application image>
 
 You can then run the resulting image via:
 docker run <application image>
diff --git a/s2i/modules/kogito-quarkus-centos-s2i/test/run b/s2i/modules/kogito-springboot-ubi8/test/run
similarity index 98%
rename from s2i/modules/kogito-quarkus-centos-s2i/test/run
rename to s2i/modules/kogito-springboot-ubi8/test/run
index fd9c1c88865..337416dfc03 100755
--- a/s2i/modules/kogito-quarkus-centos-s2i/test/run
+++ b/s2i/modules/kogito-springboot-ubi8/test/run
@@ -9,7 +9,7 @@
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
 #
-IMAGE_NAME=${IMAGE_NAME:-kogito-quarkus-centos-s2i-candidate}
+IMAGE_NAME=${IMAGE_NAME-kogito-springboot-ubi8-candidate}
 
 # Determining system utility executables (darwin compatibility check)
 READLINK_EXEC="readlink -zf"
diff --git a/s2i/modules/kogito-springboot-centos/test/test-app/index.html b/s2i/modules/kogito-springboot-ubi8/test/test-app/index.html
similarity index 100%
rename from s2i/modules/kogito-springboot-centos/test/test-app/index.html
rename to s2i/modules/kogito-springboot-ubi8/test/test-app/index.html

From 681175aca8c64374eb1ff724d7a106de7839304f Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 21 Aug 2019 17:50:33 -0300
Subject: [PATCH 035/709] [KOGITO-262] - missing version on
 install-rpm-depencies module (#32)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/modules/install-rpm-dependencies/module.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/s2i/modules/install-rpm-dependencies/module.yaml b/s2i/modules/install-rpm-dependencies/module.yaml
index f55cbfd5710..ea49b04414e 100644
--- a/s2i/modules/install-rpm-dependencies/module.yaml
+++ b/s2i/modules/install-rpm-dependencies/module.yaml
@@ -1,4 +1,5 @@
 schema_version: 1
+version: "0.3.0"
 name: install-rpm-dependencies
 
 execute:

From d4ee273a571eda4caca3c18409a59f4f103bc0d7 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 28 Aug 2019 12:53:20 -0300
Subject: [PATCH 036/709] [KOGITO-196] Introducing kogito-data-index image
 (#33)

---
 s2i/Makefile                              | 12 +++++++--
 s2i/README.md                             |  6 +++--
 s2i/kogito-data-index-overrides.yaml      | 32 +++++++++++++++++++++++
 s2i/kogito-imagestream.yaml               | 20 ++++++++++++++
 s2i/modules/kogito-data-index/added/start |  3 +++
 s2i/modules/kogito-data-index/configure   | 13 +++++++++
 s2i/modules/kogito-data-index/module.yaml | 11 ++++++++
 7 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 s2i/kogito-data-index-overrides.yaml
 create mode 100755 s2i/modules/kogito-data-index/added/start
 create mode 100644 s2i/modules/kogito-data-index/configure
 create mode 100644 s2i/modules/kogito-data-index/module.yaml

diff --git a/s2i/Makefile b/s2i/Makefile
index 64af3712140..9f98e18d554 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -4,7 +4,7 @@ BUILD_ENGINE := docker
 
 # Build all images
 .PHONY: build
-build: kogito-quarkus-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i
+build: kogito-quarkus-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index
 
 kogito-quarkus-ubi8:
 	cekit -v build --overrides-file kogito-quarkus-ubi8-overrides.yaml ${BUILD_ENGINE}
@@ -18,6 +18,9 @@ kogito-springboot-ubi8:
 kogito-springboot-ubi8-s2i:
 	cekit -v build --overrides-file kogito-springboot-ubi8-s2i-overrides.yaml ${BUILD_ENGINE}
 
+kogito-data-index:
+	cekit -v build --overrides-file kogito-data-index-overrides.yaml ${BUILD_ENGINE}
+
 
 # Build and test all images
 .PHONY: test
@@ -44,6 +47,8 @@ _push:
 	docker push quay.io/kiegroup/kogito-springboot-ubi8:latest
 	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest
+	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-data-index:latest
 
 
 # push staging images to quay.io, done before release, this requires permissions under kiegroup organization
@@ -60,4 +65,7 @@ _push-staging:
 	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
 
 	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
\ No newline at end of file
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
+
+	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
\ No newline at end of file
diff --git a/s2i/README.md b/s2i/README.md
index 3bb8543b927..c2723de55ab 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -49,6 +49,10 @@ Image location: quay.io/kiegroup/kogito-springboot-ubi8:latest
 
 For more details have a look at [README.md](kogito-springboot-ubi8/README.md)
 
+## Data Index Service
+
+Runtime image that is responsibile for just running the [Data Index Service](https://github.com/kiegroup/kogito-runtimes/wiki/Data-Index-Service). Solely used by the [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) to deploy data index capabilities to Kogito Services.
+
 # Supported source structure
 
 Images can be build based on two types of source structure
@@ -157,8 +161,6 @@ already downloaded artifacts. By that improving overall build time significantly
 You can also use a maven mirror, if available on your internal network, just set the
 MAVEN_MIRROR_URL environment variable when starting a new build.
 
-
-
 ## Building the images locally:
 
 CeKit3 is required to build the images, how to install: https://docs.cekit.io/en/latest/handbook/installation/instructions.html
diff --git a/s2i/kogito-data-index-overrides.yaml b/s2i/kogito-data-index-overrides.yaml
new file mode 100644
index 00000000000..e7b5ef6a21e
--- /dev/null
+++ b/s2i/kogito-data-index-overrides.yaml
@@ -0,0 +1,32 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-data-index"
+description: "Runtime image for Kogito Data Index Service"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Data Index Service"
+- name: "io.k8s.display-name"
+  value: "Kogito Data Index Service"
+- name: "io.openshift.tags"
+  value: "kogito,data-index"
+- name: "io.openshift.expose-services"
+  value: "8180:http"
+
+ports:
+- value: 8180
+
+modules:
+  install:
+  - name: install-rpm-dependencies
+  - name: add-kogito-user
+  - name: kogito-data-index
+
+packages:
+  install:
+  - java-1.8.0-openjdk
+
+run:
+  user: 1001
+  cmd: 
+    - "/home/kogito/bin/start"
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index d9cf00c0189..31ec0e6206b 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -90,3 +90,23 @@ items:
       from:
         kind: DockerImage
         name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.3.0
+- kind: ImageStream
+  apiVersion: v1
+  metadata:
+    name: kogito-data-index
+    annotations:
+      openshift.io/display-name: Runtime image for the Kogito Data Index Service
+      openshift.io/provider-display-name: Kie Group.
+  spec:
+    tags:
+    - name: '0.3.0'
+      annotations:
+        description: Runtime image for the Kogito Data Index Service
+        iconClass: icon-jbpm
+        tags: kogito,data-index
+        version: '0.3.0'
+      referencePolicy:
+        type: Local
+      from:
+        kind: DockerImage
+        name: quay.io/kiegroup/kogito-data-index:0.3.0
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/added/start b/s2i/modules/kogito-data-index/added/start
new file mode 100755
index 00000000000..22b13741407
--- /dev/null
+++ b/s2i/modules/kogito-data-index/added/start
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+java -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/bin -jar $KOGITO_HOME/bin/*-runner.jar
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/configure b/s2i/modules/kogito-data-index/configure
new file mode 100644
index 00000000000..dfbaa763f02
--- /dev/null
+++ b/s2i/modules/kogito-data-index/configure
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+mkdir ${KOGITO_HOME}/bin
+mv ${SOURCES_DIR}/data-index-service-*-runner.jar ${KOGITO_HOME}/bin/
+mv ${ADDED_DIR}/* ${KOGITO_HOME}/bin/
+
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
new file mode 100644
index 00000000000..452e836078b
--- /dev/null
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -0,0 +1,11 @@
+schema_version: 1
+name: kogito-data-index
+version: "0.3.0"
+
+artifacts:
+- name: data-index-service-0.3.0-runner.jar
+  url: https://repo.maven.apache.org/maven2/org/kie/kogito/data-index-service/0.3.0/data-index-service-0.3.0-runner.jar
+  md5: 12126dee53783fe09279f46f299611a1
+
+execute:
+- script: configure
\ No newline at end of file

From 7ac55babbc0e388fec36101d84e1e2acf53226f1 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 3 Sep 2019 11:16:58 -0300
Subject: [PATCH 037/709] [KOGITO-239] - Error after building springboot
 application with latest ubi8 images (#35)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/modules/kogito-springboot-ubi8-s2i/configure     | 2 +-
 s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage | 4 ++--
 s2i/modules/kogito-springboot-ubi8/configure         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/configure b/s2i/modules/kogito-springboot-ubi8-s2i/configure
index ece25125aae..bb04fbc0716 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/configure
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/configure
@@ -8,5 +8,5 @@ cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 mkdir $KOGITO_HOME/bin
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:1001 ${KOGITO_HOME}
+chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage
index a7032fda74c..1bcbd121fad 100755
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage
@@ -9,11 +9,11 @@ To use it, install S2I: https://github.com/openshift/source-to-image
 
 This image is intended to build application binaries only that are later on transfered to runtime image.
 
-s2i build -c <source code path/URL> quay.io/kiegroup/kogito-springboot-ubi8-s2i <application image name> --runtime-image <image name> --runtime-artifact /home/kogito/bin
+s2i build -c <source code path/URL> quay.io/kiegroup/kogito-springboot-ubi8-s2i <application image name> --runtime-image <image name>
 
 Sample invocation:
 
-s2i build -c /Development/project/ quay.io/kiegroup/kogito-springboot-ubi8-s2i application --runtime-image kogito-springboot-ubi8 --runtime-artifact /home/kogito/bin
+s2i build -c /Development/project/ quay.io/kiegroup/kogito-springboot-ubi8-s2i application --runtime-image kogito-springboot-ubi8
 
 You can then run the resulting image via:
 docker run <application image>
diff --git a/s2i/modules/kogito-springboot-ubi8/configure b/s2i/modules/kogito-springboot-ubi8/configure
index ff7734d3446..0fe63c4ce07 100644
--- a/s2i/modules/kogito-springboot-ubi8/configure
+++ b/s2i/modules/kogito-springboot-ubi8/configure
@@ -6,5 +6,5 @@ SCRIPT_DIR=$(dirname $0)
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:1001 ${KOGITO_HOME}
+chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}

From 403e203dd4bca394b054ef42354cc72fc3cc4294 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 4 Sep 2019 16:42:24 -0300
Subject: [PATCH 038/709] [KOGITO-222] - Export Infinispan authentication
 options (#34)

---
 s2i/kogito-data-index-overrides.yaml          | 17 ++++
 s2i/modules/kogito-data-index/added/start     | 37 +++++++-
 .../kogito-data-index/tests/bats/start.bats   | 94 +++++++++++++++++++
 3 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 s2i/modules/kogito-data-index/tests/bats/start.bats

diff --git a/s2i/kogito-data-index-overrides.yaml b/s2i/kogito-data-index-overrides.yaml
index e7b5ef6a21e..15564d2f14e 100644
--- a/s2i/kogito-data-index-overrides.yaml
+++ b/s2i/kogito-data-index-overrides.yaml
@@ -13,6 +13,23 @@ labels:
 - name: "io.openshift.expose-services"
   value: "8180:http"
 
+envs:
+- name: "INFINISPAN_USEAUTH"
+  value: "false"
+  description: "Flag that signals to Infinispan Hotrod client to use authentication (Used to set the infinispan.client.hotrod.use_auth system property)"
+- name: "INFINISPAN_USERNAME"
+  value: ""
+  description: "Username for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_username system property)"
+- name: "INFINISPAN_PASSWORD"
+  value: ""
+  description: "Password for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_password system property)"
+- name: "INFINISPAN_AUTHREALM"
+  value: ""
+  description: "Infinispan authentication realm (Used to set the infinispan.client.hotrod.auth_realm system property)"
+- name: "INFINISPAN_SASLMECHANISM"
+  value: ""
+  description: "Sasl mechanism to use during authentication. Example: PLAIN (Used to set the infinispan.client.hotrod.sasl_mechanism system property)"
+
 ports:
 - value: 8180
 
diff --git a/s2i/modules/kogito-data-index/added/start b/s2i/modules/kogito-data-index/added/start
index 22b13741407..2d96c860556 100755
--- a/s2i/modules/kogito-data-index/added/start
+++ b/s2i/modules/kogito-data-index/added/start
@@ -1,3 +1,38 @@
 #!/bin/bash -e
 
-java -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/bin -jar $KOGITO_HOME/bin/*-runner.jar
\ No newline at end of file
+function set_infinispan_props() {
+    local infinispan_props=""
+
+    if [[ "${INFINISPAN_USEAUTH}" == "true" &&  -z "${INFINISPAN_USERNAME}" ]]; then
+        echo "[ERROR] Flag INFINISPAN_USEAUTH set to true, but no username informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
+        exit 1
+    fi
+
+    if [ -z "${INFINISPAN_USERNAME}" ]; then
+        if [ ! -z "${INFINISPAN_USEAUTH}" ]; then
+            INFINISPAN_USEAUTH="false"
+        fi
+    fi
+ 
+    if [ ! -z "${INFINISPAN_USERNAME}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_username=${INFINISPAN_USERNAME}"); INFINISPAN_USEAUTH="true"; fi
+    if [ ! -z "${INFINISPAN_PASSWORD}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_password=${INFINISPAN_PASSWORD}"); fi
+    if [ ! -z "${INFINISPAN_USEAUTH}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_useauth=${INFINISPAN_USEAUTH}"); fi
+    if [ ! -z "${INFINISPAN_AUTHREALM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_authrealm=${INFINISPAN_AUTHREALM}"); fi
+    if [ ! -z "${INFINISPAN_SASLMECHANISM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_saslmechanism=${INFINISPAN_SASLMECHANISM}"); fi
+
+    echo $infinispan_props
+}
+
+function start() {
+    local infinispan_props=$(set_infinispan_props)
+
+    java -Djava.library.path=$KOGITO_HOME/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        ${infinispan_props} \
+        ${JAVA_OPTS} \
+        -jar $KOGITO_HOME/bin/*-runner.jar
+}
+
+if [ -z "${TEST}" ]; then
+    start
+fi
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/tests/bats/start.bats b/s2i/modules/kogito-data-index/tests/bats/start.bats
new file mode 100644
index 00000000000..0cb002cda50
--- /dev/null
+++ b/s2i/modules/kogito-data-index/tests/bats/start.bats
@@ -0,0 +1,94 @@
+#!/usr/bin/env bats
+
+export TEST=true
+
+# import
+load $BATS_TEST_DIRNAME/../../added/start
+
+function clear_vars() {
+    unset INFINISPAN_USEAUTH
+    unset INFINISPAN_USERNAME
+    unset INFINISPAN_PASSWORD
+    unset INFINISPAN_AUTHREALM
+    unset INFINISPAN_SASLMECHANISM
+}
+
+@test "check if infinispan properties is blank" {
+    clear_vars
+    local expected=""
+    run set_infinispan_props
+    
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+
+@test "check if infinispan auth is false" {
+    clear_vars
+    export INFINISPAN_USEAUTH="false"
+    local expected="-Dinfinispan_useauth=false"
+    run set_infinispan_props
+    
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "check if infinispan has auth props" {
+    clear_vars
+    export INFINISPAN_USERNAME="developer"
+    export INFINISPAN_USEAUTH="true"
+    export INFINISPAN_PASSWORD="developer"
+    export INFINISPAN_AUTHREALM="default"
+    export INFINISPAN_SASLMECHANISM="PLAIN"
+    
+    local expected="-Dinfinispan_username=developer -Dinfinispan_password=developer -Dinfinispan_useauth=true -Dinfinispan_authrealm=default -Dinfinispan_saslmechanism=PLAIN"
+    run set_infinispan_props
+    
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "setting username, useauth is true" {
+    clear_vars
+    export INFINISPAN_USERNAME="developer"
+    export INFINISPAN_USEAUTH="false"
+    local expected="-Dinfinispan_username=developer -Dinfinispan_useauth=true"
+
+    run set_infinispan_props
+    
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "when use auth is set to nonsense and no credentials" {
+    clear_vars
+    export INFINISPAN_USEAUTH="dsadsadasdsa"
+    local expected="-Dinfinispan_useauth=false"
+
+    run set_infinispan_props
+    
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "when use auth is set to nonsense and has credentials" {
+    clear_vars
+    export INFINISPAN_USEAUTH="dsadsadasdsa"
+    export INFINISPAN_USERNAME="developer"
+    local expected="-Dinfinispan_username=developer -Dinfinispan_useauth=true"
+
+    run set_infinispan_props
+    
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "when use auth is set to true and no credentials" {
+    clear_vars
+    export INFINISPAN_USEAUTH="true"
+    local expected="-Dinfinispan_username=developer -Dinfinispan_useauth=true"
+
+    run set_infinispan_props
+    # exit(1)
+    [ "$status" -eq 1 ]
+}
\ No newline at end of file

From a72681a16391ac1c784b512bed2811d0fce32fb0 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 10 Sep 2019 11:57:35 -0300
Subject: [PATCH 039/709] [KOGITO-240] - include s2i and some behave tests for
 the Kogito images (#37)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile                                  |  13 +-
 s2i/modules/kogito-data-index/added/start     |  15 +-
 s2i/modules/kogito-quarkus-ubi8-s2i/test/run  | 154 -----------------
 .../test/test-app/index.html                  |  10 --
 s2i/modules/kogito-quarkus-ubi8/test/run      | 155 ------------------
 .../test/test-app/index.html                  |  10 --
 .../kogito-springboot-ubi8-s2i/test/run       | 154 -----------------
 .../test/test-app/index.html                  |  10 --
 s2i/modules/kogito-springboot-ubi8/test/run   | 154 -----------------
 .../test/test-app/index.html                  |  10 --
 s2i/tests/features/common.feature             |   9 +
 .../features/kogito-quarkus-index.feature     |  65 ++++++++
 .../features/kogito-quarkus-ubi8-s2i.feature  |  27 +++
 .../features/kogito-quarkus-ubi8.feature      |  15 ++
 .../kogito-springboot-ubi8-s2i.feature        |  25 +++
 .../features/kogito-springboot-ubi8.feature   |  22 +++
 16 files changed, 180 insertions(+), 668 deletions(-)
 delete mode 100755 s2i/modules/kogito-quarkus-ubi8-s2i/test/run
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8-s2i/test/test-app/index.html
 delete mode 100755 s2i/modules/kogito-quarkus-ubi8/test/run
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8/test/test-app/index.html
 delete mode 100755 s2i/modules/kogito-springboot-ubi8-s2i/test/run
 delete mode 100644 s2i/modules/kogito-springboot-ubi8-s2i/test/test-app/index.html
 delete mode 100755 s2i/modules/kogito-springboot-ubi8/test/run
 delete mode 100644 s2i/modules/kogito-springboot-ubi8/test/test-app/index.html
 create mode 100644 s2i/tests/features/common.feature
 create mode 100644 s2i/tests/features/kogito-quarkus-index.feature
 create mode 100644 s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
 create mode 100644 s2i/tests/features/kogito-quarkus-ubi8.feature
 create mode 100644 s2i/tests/features/kogito-springboot-ubi8-s2i.feature
 create mode 100644 s2i/tests/features/kogito-springboot-ubi8.feature

diff --git a/s2i/Makefile b/s2i/Makefile
index 9f98e18d554..229d02f9818 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -25,14 +25,11 @@ kogito-data-index:
 # Build and test all images
 .PHONY: test
 test:
-	cekit -v build --overrides-file kogito-quarkus-ubi8-overrides.yaml --overrides 'name: kogito-quarkus-ubi8-candidate' docker --no-squash
-	modules/kogito-quarkus-ubi8/test/run
-	cekit -v build --overrides-file kogito-quarkus-ubi8-s2i-overrides.yaml --overrides 'name: kogito-quarkus-ubi8-s2i-candidate' docker --no-squash
-	modules/kogito-quarkus-ubi8-s2i/test/run
-	cekit -v build --overrides-file kogito-springboot-ubi8-overrides.yaml --overrides 'name: kogito-springboot-ubi8-candidate' docker --no-squash
-	modules/kogito-springboot-ubi8/test/run
-	cekit -v build --overrides-file kogito-springboot-ubi8-s2i-overrides.yaml --overrides 'name: kogito-springboot-ubi8-s2i-candidate' docker --no-squash
-	modules/kogito-springboot-ubi8-s2i-/test/run
+	cekit -v test --overrides-file kogito-quarkus-ubi8-overrides.yaml behave
+	cekit -v test --overrides-file kogito-quarkus-ubi8-s2i-overrides.yaml behave
+	cekit -v test --overrides-file kogito-springboot-ubi8-overrides.yaml behave
+	cekit -v test --overrides-file kogito-springboot-ubi8-s2i-overrides.yaml behave
+	cekit -v test --overrides-file kogito-data-index-overrides.yaml behave
 
 
 # push images to quay.io, this requires permissions under kiegroup organization
diff --git a/s2i/modules/kogito-data-index/added/start b/s2i/modules/kogito-data-index/added/start
index 2d96c860556..c369980af05 100755
--- a/s2i/modules/kogito-data-index/added/start
+++ b/s2i/modules/kogito-data-index/added/start
@@ -3,8 +3,8 @@
 function set_infinispan_props() {
     local infinispan_props=""
 
-    if [[ "${INFINISPAN_USEAUTH}" == "true" &&  -z "${INFINISPAN_USERNAME}" ]]; then
-        echo "[ERROR] Flag INFINISPAN_USEAUTH set to true, but no username informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
+    if [[ "${INFINISPAN_USEAUTH}" == "true" ]] && [[ -z "${INFINISPAN_USERNAME}"  || -z "${INFINISPAN_PASSWORD}" ]]; then
+        echo "[ERROR] Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
         exit 1
     fi
 
@@ -24,9 +24,18 @@ function set_infinispan_props() {
 }
 
 function start() {
+
+    if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+        set -x
+        SHOW_JVM_SETTINGS="-XshowSettings:properties"
+        echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+        echo "JVM settings debug is enabled."
+    fi
+
+
     local infinispan_props=$(set_infinispan_props)
 
-    java -Djava.library.path=$KOGITO_HOME/lib \
+    java ${SHOW_JVM_SETTINGS} -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
         ${infinispan_props} \
         ${JAVA_OPTS} \
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/test/run b/s2i/modules/kogito-quarkus-ubi8-s2i/test/run
deleted file mode 100755
index 488e670fb8d..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/test/run
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-#
-# The 'run' performs a simple test that verifies the S2I image.
-# The main focus here is to exercise the S2I scripts.
-#
-# For more information see the documentation:
-# https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# IMAGE_NAME specifies a name of the candidate image used for testing.
-# The image has to be available before this script is executed.
-#
-IMAGE_NAME=${IMAGE_NAME:-kogito-quarkus-ubi8-s2i-candidate}
-
-# Determining system utility executables (darwin compatibility check)
-READLINK_EXEC="readlink -zf"
-MKTEMP_EXEC="mktemp --suffix=.cid"
-if [[ "$OSTYPE" =~ 'darwin' ]]; then
-  READLINK_EXEC="readlink"
-  MKTEMP_EXEC="mktemp"
-  ! type -a "greadlink" &>"/dev/null" || READLINK_EXEC="greadlink"
-  ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
-fi
-
-_dir="$(dirname "${BASH_SOURCE[0]}")"
-test_dir="$($READLINK_EXEC ${_dir} || echo ${_dir})"
-image_dir=$($READLINK_EXEC ${test_dir}/.. || echo ${test_dir}/..)
-scripts_url="${image_dir}/.s2i/bin"
-cid_file=$($MKTEMP_EXEC -u)
-
-# Since we built the candidate image locally, we don't want S2I to attempt to pull
-# it from Docker hub
-s2i_args="--pull-policy=never --loglevel=2"
-
-# Port the image exposes service to be tested
-test_port=8080
-
-image_exists() {
-  docker inspect $1 &>/dev/null
-}
-
-container_exists() {
-  image_exists $(cat $cid_file)
-}
-
-container_ip() {
-  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostIp }}" $(cat $cid_file) | sed 's/0.0.0.0/localhost/'
-}
-
-container_port() {
-  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostPort }}" "$(cat "${cid_file}")"
-}
-
-run_s2i_build() {
-  s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
-}
-
-prepare() {
-  if ! image_exists ${IMAGE_NAME}; then
-    echo "ERROR: The image ${IMAGE_NAME} must exist before this script is executed."
-    exit 1
-  fi
-  # s2i build requires the application is a valid 'Git' repository
-  pushd ${test_dir}/test-app >/dev/null
-  git init
-  git config user.email "build@localhost" && git config user.name "builder"
-  git add -A && git commit -m "Sample commit"
-  popd >/dev/null
-  run_s2i_build
-}
-
-run_test_application() {
-  docker run --rm --cidfile=${cid_file} -p ${test_port}:${test_port} ${IMAGE_NAME}-testapp
-}
-
-cleanup() {
-  if [ -f $cid_file ]; then
-    if container_exists; then
-      docker stop $(cat $cid_file)
-    fi
-  fi
-  if image_exists ${IMAGE_NAME}-testapp; then
-    docker rmi ${IMAGE_NAME}-testapp
-  fi
-}
-
-check_result() {
-  local result="$1"
-  if [[ "$result" != "0" ]]; then
-    echo "S2I image '${IMAGE_NAME}' test FAILED (exit code: ${result})"
-    cleanup
-    exit $result
-  fi
-}
-
-wait_for_cid() {
-  local max_attempts=10
-  local sleep_time=1
-  local attempt=1
-  local result=1
-  while [ $attempt -le $max_attempts ]; do
-    [ -f $cid_file ] && break
-    echo "Waiting for container to start..."
-    attempt=$(( $attempt + 1 ))
-    sleep $sleep_time
-  done
-}
-
-test_usage() {
-  echo "Testing 's2i usage'..."
-  s2i usage ${s2i_args} ${IMAGE_NAME} &>/dev/null
-}
-
-test_connection() {
-  echo "Testing HTTP connection (http://$(container_ip):$(container_port))"
-  local max_attempts=10
-  local sleep_time=1
-  local attempt=1
-  local result=1
-  while [ $attempt -le $max_attempts ]; do
-    echo "Sending GET request to http://$(container_ip):$(container_port)/"
-    response_code=$(curl -s -w %{http_code} -o /dev/null http://$(container_ip):$(container_port)/)
-    status=$?
-    if [ $status -eq 0 ]; then
-      if [ $response_code -eq 200 ]; then
-        result=0
-      fi
-      break
-    fi
-    attempt=$(( $attempt + 1 ))
-    sleep $sleep_time
-  done
-  return $result
-}
-
-# Build the application image twice to ensure the 'save-artifacts' and
-# 'restore-artifacts' scripts are working properly
-prepare
-run_s2i_build
-check_result $?
-
-# Verify the 'usage' script is working properly
-test_usage
-check_result $?
-
-# Verify that the HTTP connection can be established to test application container
-run_test_application &
-
-# Wait for the container to write its CID file
-wait_for_cid
-
-test_connection
-check_result $?
-
-cleanup
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/test/test-app/index.html b/s2i/modules/kogito-quarkus-ubi8-s2i/test/test-app/index.html
deleted file mode 100644
index 7bca10c2d5b..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/test/test-app/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-	<head>
-		<title>Hello World!</title>
-	</head>
-	<body>
-		<h1>Hello World!</h1>
-	</body>
-</html>
- 
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8/test/run b/s2i/modules/kogito-quarkus-ubi8/test/run
deleted file mode 100755
index dbdddbab686..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8/test/run
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash
-#
-# The 'run' performs a simple test that verifies the S2I image.
-# The main focus here is to exercise the S2I scripts.
-#
-# For more information see the documentation:
-# https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# IMAGE_NAME specifies a name of the candidate image used for testing.
-# The image has to be available before this script is executed.
-#
-IMAGE_NAME=${IMAGE_NAME:-kogito-quarkus-ubi8-candidate}
-
-# Determining system utility executables (darwin compatibility check)
-READLINK_EXEC="readlink -zf"
-MKTEMP_EXEC="mktemp --suffix=.cid"
-if [[ "$OSTYPE" =~ 'darwin' ]]; then
-  READLINK_EXEC="readlink"
-  MKTEMP_EXEC="mktemp"
-  ! type -a "greadlink" &>"/dev/null" || READLINK_EXEC="greadlink"
-  ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
-fi
-
-_dir="$(dirname "${BASH_SOURCE[0]}")"
-test_dir="$(${READLINK_EXEC} ${_dir} || echo ${_dir})"
-image_dir=$($READLINK_EXEC ${test_dir}/.. || echo ${test_dir}/..)
-scripts_url="${image_dir}/.s2i/bin"
-cid_file=$($MKTEMP_EXEC -u)
-
-# Since we built the candidate image locally, we don't want S2I to attempt to pull
-# it from Docker hub
-s2i_args="--pull-policy=never --loglevel=2"
-
-# Port the image exposes service to be tested
-test_port=8080
-
-image_exists() {
-  docker inspect $1 &>/dev/null
-}
-
-container_exists() {
-  image_exists $(cat $cid_file)
-}
-
-container_ip() {
-  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostIp }}" $(cat $cid_file) | sed 's/0.0.0.0/localhost/'
-}
-
-container_port() {
-  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostPort }}" "$(cat "${cid_file}")"
-}
-
-run_s2i_build() {
-echo "s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp"
-  s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
-}
-
-prepare() {
-  if ! image_exists ${IMAGE_NAME}; then
-    echo "ERROR: The image ${IMAGE_NAME} must exist before this script is executed."
-    exit 1
-  fi
-  # s2i build requires the application is a valid 'Git' repository
-  pushd ${test_dir}/test-app >/dev/null
-  git init
-  git config user.email "build@localhost" && git config user.name "builder"
-  git add -A && git commit -m "Sample commit"
-  popd >/dev/null
-  run_s2i_build
-}
-
-run_test_application() {
-  docker run --rm --cidfile=${cid_file} -p ${test_port}:${test_port} ${IMAGE_NAME}-testapp
-}
-
-cleanup() {
-  if [ -f $cid_file ]; then
-    if container_exists; then
-      docker stop $(cat $cid_file)
-    fi
-  fi
-  if image_exists ${IMAGE_NAME}-testapp; then
-    docker rmi ${IMAGE_NAME}-testapp
-  fi
-}
-
-check_result() {
-  local result="$1"
-  if [[ "$result" != "0" ]]; then
-    echo "S2I image '${IMAGE_NAME}' test FAILED (exit code: ${result})"
-    cleanup
-    exit $result
-  fi
-}
-
-wait_for_cid() {
-  local max_attempts=10
-  local sleep_time=1
-  local attempt=1
-  local result=1
-  while [ $attempt -le $max_attempts ]; do
-    [ -f $cid_file ] && break
-    echo "Waiting for container to start..."
-    attempt=$(( $attempt + 1 ))
-    sleep $sleep_time
-  done
-}
-
-test_usage() {
-  echo "Testing 's2i usage'..."
-  s2i usage ${s2i_args} ${IMAGE_NAME} &>/dev/null
-}
-
-test_connection() {
-  echo "Testing HTTP connection (http://$(container_ip):$(container_port))"
-  local max_attempts=10
-  local sleep_time=1
-  local attempt=1
-  local result=1
-  while [ $attempt -le $max_attempts ]; do
-    echo "Sending GET request to http://$(container_ip):$(container_port)/"
-    response_code=$(curl -s -w %{http_code} -o /dev/null http://$(container_ip):$(container_port)/)
-    status=$?
-    if [ $status -eq 0 ]; then
-      if [ $response_code -eq 200 ]; then
-        result=0
-      fi
-      break
-    fi
-    attempt=$(( $attempt + 1 ))
-    sleep $sleep_time
-  done
-  return $result
-}
-
-# Build the application image twice to ensure the 'save-artifacts' and
-# 'restore-artifacts' scripts are working properly
-prepare
-run_s2i_build
-check_result $?
-
-# Verify the 'usage' script is working properly
-test_usage
-check_result $?
-
-# Verify that the HTTP connection can be established to test application container
-run_test_application &
-
-# Wait for the container to write its CID file
-wait_for_cid
-
-test_connection
-check_result $?
-
-cleanup
diff --git a/s2i/modules/kogito-quarkus-ubi8/test/test-app/index.html b/s2i/modules/kogito-quarkus-ubi8/test/test-app/index.html
deleted file mode 100644
index 7bca10c2d5b..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8/test/test-app/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-	<head>
-		<title>Hello World!</title>
-	</head>
-	<body>
-		<h1>Hello World!</h1>
-	</body>
-</html>
- 
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/test/run b/s2i/modules/kogito-springboot-ubi8-s2i/test/run
deleted file mode 100755
index fbd9d5b1f3d..00000000000
--- a/s2i/modules/kogito-springboot-ubi8-s2i/test/run
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-#
-# The 'run' performs a simple test that verifies the S2I image.
-# The main focus here is to exercise the S2I scripts.
-#
-# For more information see the documentation:
-# https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# IMAGE_NAME specifies a name of the candidate image used for testing.
-# The image has to be available before this script is executed.
-#
-IMAGE_NAME=${IMAGE_NAME:-kogito-springboot-ubi8-s2i-candidate}
-
-# Determining system utility executables (darwin compatibility check)
-READLINK_EXEC="readlink -zf"
-MKTEMP_EXEC="mktemp --suffix=.cid"
-if [[ "$OSTYPE" =~ 'darwin' ]]; then
-  READLINK_EXEC="readlink"
-  MKTEMP_EXEC="mktemp"
-  ! type -a "greadlink" &>"/dev/null" || READLINK_EXEC="greadlink"
-  ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
-fi
-
-_dir="$(dirname "${BASH_SOURCE[0]}")"
-test_dir="$($READLINK_EXEC ${_dir} || echo ${_dir})"
-image_dir=$($READLINK_EXEC ${test_dir}/.. || echo ${test_dir}/..)
-scripts_url="${image_dir}/.s2i/bin"
-cid_file=$($MKTEMP_EXEC -u)
-
-# Since we built the candidate image locally, we don't want S2I to attempt to pull
-# it from Docker hub
-s2i_args="--pull-policy=never --loglevel=2"
-
-# Port the image exposes service to be tested
-test_port=8080
-
-image_exists() {
-  docker inspect $1 &>/dev/null
-}
-
-container_exists() {
-  image_exists $(cat $cid_file)
-}
-
-container_ip() {
-  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostIp }}" $(cat $cid_file) | sed 's/0.0.0.0/localhost/'
-}
-
-container_port() {
-  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostPort }}" "$(cat "${cid_file}")"
-}
-
-run_s2i_build() {
-  s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
-}
-
-prepare() {
-  if ! image_exists ${IMAGE_NAME}; then
-    echo "ERROR: The image ${IMAGE_NAME} must exist before this script is executed."
-    exit 1
-  fi
-  # s2i build requires the application is a valid 'Git' repository
-  pushd ${test_dir}/test-app >/dev/null
-  git init
-  git config user.email "build@localhost" && git config user.name "builder"
-  git add -A && git commit -m "Sample commit"
-  popd >/dev/null
-  run_s2i_build
-}
-
-run_test_application() {
-  docker run --rm --cidfile=${cid_file} -p ${test_port}:${test_port} ${IMAGE_NAME}-testapp
-}
-
-cleanup() {
-  if [ -f $cid_file ]; then
-    if container_exists; then
-      docker stop $(cat $cid_file)
-    fi
-  fi
-  if image_exists ${IMAGE_NAME}-testapp; then
-    docker rmi ${IMAGE_NAME}-testapp
-  fi
-}
-
-check_result() {
-  local result="$1"
-  if [[ "$result" != "0" ]]; then
-    echo "S2I image '${IMAGE_NAME}' test FAILED (exit code: ${result})"
-    cleanup
-    exit $result
-  fi
-}
-
-wait_for_cid() {
-  local max_attempts=10
-  local sleep_time=1
-  local attempt=1
-  local result=1
-  while [ $attempt -le $max_attempts ]; do
-    [ -f $cid_file ] && break
-    echo "Waiting for container to start..."
-    attempt=$(( $attempt + 1 ))
-    sleep $sleep_time
-  done
-}
-
-test_usage() {
-  echo "Testing 's2i usage'..."
-  s2i usage ${s2i_args} ${IMAGE_NAME} &>/dev/null
-}
-
-test_connection() {
-  echo "Testing HTTP connection (http://$(container_ip):$(container_port))"
-  local max_attempts=10
-  local sleep_time=1
-  local attempt=1
-  local result=1
-  while [ $attempt -le $max_attempts ]; do
-    echo "Sending GET request to http://$(container_ip):$(container_port)/"
-    response_code=$(curl -s -w %{http_code} -o /dev/null http://$(container_ip):$(container_port)/)
-    status=$?
-    if [ $status -eq 0 ]; then
-      if [ $response_code -eq 200 ]; then
-        result=0
-      fi
-      break
-    fi
-    attempt=$(( $attempt + 1 ))
-    sleep $sleep_time
-  done
-  return $result
-}
-
-# Build the application image twice to ensure the 'save-artifacts' and
-# 'restore-artifacts' scripts are working properly
-prepare
-run_s2i_build
-check_result $?
-
-# Verify the 'usage' script is working properly
-test_usage
-check_result $?
-
-# Verify that the HTTP connection can be established to test application container
-run_test_application &
-
-# Wait for the container to write its CID file
-wait_for_cid
-
-test_connection
-check_result $?
-
-cleanup
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/test/test-app/index.html b/s2i/modules/kogito-springboot-ubi8-s2i/test/test-app/index.html
deleted file mode 100644
index 7bca10c2d5b..00000000000
--- a/s2i/modules/kogito-springboot-ubi8-s2i/test/test-app/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-	<head>
-		<title>Hello World!</title>
-	</head>
-	<body>
-		<h1>Hello World!</h1>
-	</body>
-</html>
- 
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot-ubi8/test/run b/s2i/modules/kogito-springboot-ubi8/test/run
deleted file mode 100755
index 337416dfc03..00000000000
--- a/s2i/modules/kogito-springboot-ubi8/test/run
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-#
-# The 'run' performs a simple test that verifies the S2I image.
-# The main focus here is to exercise the S2I scripts.
-#
-# For more information see the documentation:
-# https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# IMAGE_NAME specifies a name of the candidate image used for testing.
-# The image has to be available before this script is executed.
-#
-IMAGE_NAME=${IMAGE_NAME-kogito-springboot-ubi8-candidate}
-
-# Determining system utility executables (darwin compatibility check)
-READLINK_EXEC="readlink -zf"
-MKTEMP_EXEC="mktemp --suffix=.cid"
-if [[ "$OSTYPE" =~ 'darwin' ]]; then
-  READLINK_EXEC="readlink"
-  MKTEMP_EXEC="mktemp"
-  ! type -a "greadlink" &>"/dev/null" || READLINK_EXEC="greadlink"
-  ! type -a "gmktemp" &>"/dev/null" || MKTEMP_EXEC="gmktemp"
-fi
-
-_dir="$(dirname "${BASH_SOURCE[0]}")"
-test_dir="$($READLINK_EXEC ${_dir} || echo ${_dir})"
-image_dir=$($READLINK_EXEC ${test_dir}/.. || echo ${test_dir}/..)
-scripts_url="${image_dir}/.s2i/bin"
-cid_file=$($MKTEMP_EXEC -u)
-
-# Since we built the candidate image locally, we don't want S2I to attempt to pull
-# it from Docker hub
-s2i_args="--pull-policy=never --loglevel=2"
-
-# Port the image exposes service to be tested
-test_port=8080
-
-image_exists() {
-  docker inspect $1 &>/dev/null
-}
-
-container_exists() {
-  image_exists $(cat $cid_file)
-}
-
-container_ip() {
-  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostIp }}" $(cat $cid_file) | sed 's/0.0.0.0/localhost/'
-}
-
-container_port() {
-  docker inspect --format="{{(index .NetworkSettings.Ports \"$test_port/tcp\" 0).HostPort }}" "$(cat "${cid_file}")"
-}
-
-run_s2i_build() {
-  s2i build --incremental=true ${s2i_args} ${test_dir}/test-app ${IMAGE_NAME} ${IMAGE_NAME}-testapp
-}
-
-prepare() {
-  if ! image_exists ${IMAGE_NAME}; then
-    echo "ERROR: The image ${IMAGE_NAME} must exist before this script is executed."
-    exit 1
-  fi
-  # s2i build requires the application is a valid 'Git' repository
-  pushd ${test_dir}/test-app >/dev/null
-  git init
-  git config user.email "build@localhost" && git config user.name "builder"
-  git add -A && git commit -m "Sample commit"
-  popd >/dev/null
-  run_s2i_build
-}
-
-run_test_application() {
-  docker run --rm --cidfile=${cid_file} -p ${test_port}:${test_port} ${IMAGE_NAME}-testapp
-}
-
-cleanup() {
-  if [ -f $cid_file ]; then
-    if container_exists; then
-      docker stop $(cat $cid_file)
-    fi
-  fi
-  if image_exists ${IMAGE_NAME}-testapp; then
-    docker rmi ${IMAGE_NAME}-testapp
-  fi
-}
-
-check_result() {
-  local result="$1"
-  if [[ "$result" != "0" ]]; then
-    echo "S2I image '${IMAGE_NAME}' test FAILED (exit code: ${result})"
-    cleanup
-    exit $result
-  fi
-}
-
-wait_for_cid() {
-  local max_attempts=10
-  local sleep_time=1
-  local attempt=1
-  local result=1
-  while [ $attempt -le $max_attempts ]; do
-    [ -f $cid_file ] && break
-    echo "Waiting for container to start..."
-    attempt=$(( $attempt + 1 ))
-    sleep $sleep_time
-  done
-}
-
-test_usage() {
-  echo "Testing 's2i usage'..."
-  s2i usage ${s2i_args} ${IMAGE_NAME} &>/dev/null
-}
-
-test_connection() {
-  echo "Testing HTTP connection (http://$(container_ip):$(container_port))"
-  local max_attempts=10
-  local sleep_time=1
-  local attempt=1
-  local result=1
-  while [ $attempt -le $max_attempts ]; do
-    echo "Sending GET request to http://$(container_ip):$(container_port)/"
-    response_code=$(curl -s -w %{http_code} -o /dev/null http://$(container_ip):$(container_port)/)
-    status=$?
-    if [ $status -eq 0 ]; then
-      if [ $response_code -eq 200 ]; then
-        result=0
-      fi
-      break
-    fi
-    attempt=$(( $attempt + 1 ))
-    sleep $sleep_time
-  done
-  return $result
-}
-
-# Build the application image twice to ensure the 'save-artifacts' and
-# 'restore-artifacts' scripts are working properly
-prepare
-run_s2i_build
-check_result $?
-
-# Verify the 'usage' script is working properly
-test_usage
-check_result $?
-
-# Verify that the HTTP connection can be established to test application container
-run_test_application &
-
-# Wait for the container to write its CID file
-wait_for_cid
-
-test_connection
-check_result $?
-
-cleanup
diff --git a/s2i/modules/kogito-springboot-ubi8/test/test-app/index.html b/s2i/modules/kogito-springboot-ubi8/test/test-app/index.html
deleted file mode 100644
index 7bca10c2d5b..00000000000
--- a/s2i/modules/kogito-springboot-ubi8/test/test-app/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!doctype html>
-<html>
-	<head>
-		<title>Hello World!</title>
-	</head>
-	<body>
-		<h1>Hello World!</h1>
-	</body>
-</html>
- 
\ No newline at end of file
diff --git a/s2i/tests/features/common.feature b/s2i/tests/features/common.feature
new file mode 100644
index 00000000000..70fa0d8b29c
--- /dev/null
+++ b/s2i/tests/features/common.feature
@@ -0,0 +1,9 @@
+@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kiegroup/kogito-data-index
+
+Feature: Common tests for Kogito images
+
+  Scenario: Verify if Kogito user is correctly configured
+    When container is started with command bash
+    Then run bash -c 'echo $USER' in container and check its output for kogito
+     And run sh -c 'echo $HOME' in container and check its output for /home/kogito
+     And run sh -c 'id' in container and check its output for uid=1001(kogito) gid=1001(kogito) groups=1001(kogito)
diff --git a/s2i/tests/features/kogito-quarkus-index.feature b/s2i/tests/features/kogito-quarkus-index.feature
new file mode 100644
index 00000000000..5d1d4f7e100
--- /dev/null
+++ b/s2i/tests/features/kogito-quarkus-index.feature
@@ -0,0 +1,65 @@
+@quay.io/kiegroup/kogito-data-index
+
+Feature: Kogito-quarkus-ubi8 feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8180:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service
+    And the image should contain label io.k8s.display-name with value Kogito Data Index Service
+    And the image should contain label io.openshift.tags with value kogito,data-index
+
+  Scenario: verify if the binary index is available on /home/kogito
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.3.0-runner.jar
+
+  Scenario: Verify data-index default configuration
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain Listening on: http://0.0.0.0:8180
+    And container log should contain infinispan_useauth = false
+
+  Scenario: verify if auth is correctly set
+    When container is started with env
+      | variable            | value       |
+      | SCRIPT_DEBUG        | true        |
+      | INFINISPAN_USEAUTH  | true        |
+      | INFINISPAN_USERNAME | IamNotExist |
+      | INFINISPAN_PASSWORD | hard2guess  |
+    Then container log should contain Listening on: http://0.0.0.0:8180
+    And container log should contain infinispan_useauth = true
+    And container log should contain infinispan_password = hard2guess
+    And container log should contain infinispan_username = IamNotExist
+
+  Scenario: verify if all parameters are correctly set
+    When container is started with env
+      | variable                 | value       |
+      | SCRIPT_DEBUG             | true        |
+      | INFINISPAN_USEAUTH       | true        |
+      | INFINISPAN_USERNAME      | IamNotExist |
+      | INFINISPAN_PASSWORD      | hard2guess  |
+      | INFINISPAN_AUTHREALM     | SecretRealm |
+      | INFINISPAN_SASLMECHANISM | COOLGSSAPI  |
+    Then container log should contain Listening on: http://0.0.0.0:8180
+    And container log should contain infinispan_useauth = true
+    And container log should contain infinispan_password = hard2guess
+    And container log should contain infinispan_username = IamNotExist
+    And container log should contain infinispan_authrealm = SecretRealm
+    And container log should contain infinispan_saslmechanism = COOLGSSAPI
+
+  Scenario: verify if all parameters are correctly set
+    When container is started with env
+      | variable                                                               | value                  |
+      | INFINISPAN_CREDENTIAL_SECRET                                           | infinispan-credentials |
+      | INFINISPAN_AUTHREALM                                                   | default                |
+      | INFINISPAN_USEAUTH                                                     | true                   |
+      | INFINISPAN_SASLMECHANISM                                               | PLAIN                  |
+      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST                                  | server:11222           |
+      | MP_MESSAGING_INCOMING_KOGITO_PROCESSINSTANCES_EVENTS_BOOTSTRAP_SERVERS | mycluster:9092         |
+      | KOGITO_PROTOBUF_FOLDER                                                 | /home/kogito           |
+      | KOGITO_PROTOBUF_WATCH                                                  | true                   |
+     Then container log should contain Error: Could not find or load main class [ERROR]
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
new file mode 100644
index 00000000000..720e1f078fe
--- /dev/null
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -0,0 +1,27 @@
+@quay.io/kiegroup/kogito-quarkus-ubi8-s2i
+
+Feature: kogito-quarkus-ubi8-s2i image tests
+
+  Scenario: Verify if the s2i build is finished as expected
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner should exist
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Platform for building Kogito based on Quarkus
+    And the image should contain label io.k8s.display-name with value Kogito based on Quarkus
+    And the image should contain label io.openshift.tags with value builder,kogito,quarkus
+
+  Scenario: verify if the maven and graal vm settings are correct
+    When container is started with command bash
+    Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.0
+    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/share/graalvm
+    And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.1.1
+
+
diff --git a/s2i/tests/features/kogito-quarkus-ubi8.feature b/s2i/tests/features/kogito-quarkus-ubi8.feature
new file mode 100644
index 00000000000..cd017fe6fad
--- /dev/null
+++ b/s2i/tests/features/kogito-quarkus-ubi8.feature
@@ -0,0 +1,15 @@
+@quay.io/kiegroup/kogito-quarkus-ubi8
+
+Feature: Kogito-quarkus-ubi8 feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+     And the image should contain label io.openshift.s2i.destination with value /tmp
+     And the image should contain label io.openshift.expose-services with value 8080:http
+     And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus native image
+     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus native image
+     And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus
+     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
+
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
new file mode 100644
index 00000000000..51a2f8e5931
--- /dev/null
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -0,0 +1,25 @@
+@quay.io/kiegroup/kogito-springboot-ubi8-s2i
+
+Feature: kogito-springboot-ubi8-s2i image tests
+
+  Scenario: Verify if the s2i build is finished as expected
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Then file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Platform for building Kogito based on SpringBoot
+    And the image should contain label io.k8s.display-name with value Kogito based on SpringBoot
+    And the image should contain label io.openshift.tags with value builder,kogito,springboot
+
+  Scenario: verify if the maven and java installation is correct
+    When container is started with command bash
+    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
+    And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
+    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
+    And run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
+
diff --git a/s2i/tests/features/kogito-springboot-ubi8.feature b/s2i/tests/features/kogito-springboot-ubi8.feature
new file mode 100644
index 00000000000..d0cbfa8ff69
--- /dev/null
+++ b/s2i/tests/features/kogito-springboot-ubi8.feature
@@ -0,0 +1,22 @@
+@quay.io/kiegroup/kogito-springboot-ubi8
+
+Feature: springboot-quarkus-ubi8 feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito based on SpringBoot native image
+    And the image should contain label io.k8s.display-name with value Kogito based on SpringBoot native image
+    And the image should contain label io.openshift.tags with value builder,runtime,kogito,springboot
+    And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
+
+  Scenario: verify if the java installation is correct
+    When container is started with command bash
+    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
+    And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
+    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
+
+

From 6c0e02d6ba182542c64f6e2bef88d4fd09f3c4c0 Mon Sep 17 00:00:00 2001
From: Matteo Mortari <matteo.mortari@gmail.com>
Date: Wed, 11 Sep 2019 21:57:02 +0200
Subject: [PATCH 040/709] Update from kaas-quarkus-archetype to
 kogito-quarkus-archetype (#36)

---
 s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
index 3b45454584b..74a347908a5 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
@@ -37,7 +37,7 @@ if [ -f "pom.xml" ]; then
 else
     echo "---> Generating project structure..."
 
-    $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie -DarchetypeArtifactId=kaas-quarkus-archetype \
+    $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=kogito-quarkus-archetype \
 	-DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
 
     # copy resources into the generated project

From c4c09ef38990c9914c7e5d509d6809cec2415ef0 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 11 Sep 2019 18:55:48 -0300
Subject: [PATCH 041/709] [KOGITO-186] - Allow jvm based executable on runtime
 Quarkus image (#38)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile                                  | 11 +++-
 s2i/image.yaml                                |  2 +-
 s2i/kogito-imagestream.yaml                   | 51 +++++++++++++------
 s2i/kogito-quarkus-jvm-ubi8-overrides.yaml    | 32 ++++++++++++
 s2i/kogito-quarkus-ubi8-overrides.yaml        |  5 +-
 s2i/kogito-quarkus-ubi8-s2i-overrides.yaml    |  5 ++
 s2i/kogito-springboot-ubi8-overrides.yaml     |  2 +-
 s2i/modules/add-kogito-user/module.yaml       |  2 +-
 .../install-rpm-dependencies/module.yaml      |  2 +-
 s2i/modules/java-openjdk/1.8.0/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-jvm-ubi8/README.md |  7 +++
 s2i/modules/kogito-quarkus-jvm-ubi8/configure | 10 ++++
 .../kogito-quarkus-jvm-ubi8/module.yaml       |  6 +++
 .../kogito-quarkus-jvm-ubi8/s2i/bin/assemble  | 20 ++++++++
 .../s2i/bin/assemble-runtime                  | 22 ++++++++
 .../kogito-quarkus-jvm-ubi8/s2i/bin/run       | 10 ++++
 .../kogito-quarkus-jvm-ubi8/s2i/bin/usage     | 12 +++++
 s2i/modules/kogito-quarkus-ubi8-s2i/README.md |  3 ++
 .../kogito-quarkus-ubi8-s2i/module.yaml       |  2 +-
 .../kogito-quarkus-ubi8-s2i/s2i/bin/assemble  | 28 +++++++---
 .../kogito-quarkus-ubi8-s2i/s2i/bin/usage     |  3 ++
 s2i/modules/kogito-quarkus-ubi8/module.yaml   |  2 +-
 s2i/modules/kogito-quarkus-ubi8/s2i/bin/run   |  3 +-
 .../kogito-springboot-ubi8-s2i/module.yaml    |  2 +-
 .../kogito-springboot-ubi8/module.yaml        |  2 +-
 s2i/tests/features/common.feature             |  2 +-
 .../features/kogito-quarkus-jvm-ubi8.feature  | 20 ++++++++
 .../features/kogito-quarkus-ubi8-s2i.feature  | 10 +++-
 .../features/kogito-quarkus-ubi8.feature      |  2 +-
 29 files changed, 240 insertions(+), 40 deletions(-)
 create mode 100644 s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
 create mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/README.md
 create mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/configure
 create mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
 create mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble
 create mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble-runtime
 create mode 100755 s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
 create mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/usage
 create mode 100644 s2i/tests/features/kogito-quarkus-jvm-ubi8.feature

diff --git a/s2i/Makefile b/s2i/Makefile
index 229d02f9818..47b10eebfb5 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -4,11 +4,14 @@ BUILD_ENGINE := docker
 
 # Build all images
 .PHONY: build
-build: kogito-quarkus-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index
+build: kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index
 
 kogito-quarkus-ubi8:
 	cekit -v build --overrides-file kogito-quarkus-ubi8-overrides.yaml ${BUILD_ENGINE}
 
+kogito-quarkus-jvm-ubi8:
+	cekit -v build --overrides-file kogito-quarkus-jvm-ubi8-overrides.yaml ${BUILD_ENGINE}
+
 kogito-quarkus-ubi8-s2i:
 	cekit -v build --overrides-file kogito-quarkus-ubi8-s2i-overrides.yaml ${BUILD_ENGINE}
 
@@ -26,6 +29,7 @@ kogito-data-index:
 .PHONY: test
 test:
 	cekit -v test --overrides-file kogito-quarkus-ubi8-overrides.yaml behave
+	cekit -v test --overrides-file kogito-quarkus-jvm-ubi8-overrides.yaml behave
 	cekit -v test --overrides-file kogito-quarkus-ubi8-s2i-overrides.yaml behave
 	cekit -v test --overrides-file kogito-springboot-ubi8-overrides.yaml behave
 	cekit -v test --overrides-file kogito-springboot-ubi8-s2i-overrides.yaml behave
@@ -38,6 +42,8 @@ push: build _push
 _push:
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8:$(IMAGE_VERSION)
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8:latest
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:$(IMAGE_VERSION)
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest
 	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}
@@ -55,6 +61,9 @@ _push-staging:
 	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
 
+	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
+
 	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
 
diff --git a/s2i/image.yaml b/s2i/image.yaml
index d09d790f3be..a8dd9b5be9e 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.3.0"
+version: "0.4.0"
 from: "registry.redhat.io/ubi8-minimal:latest"
 
 labels:
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 31ec0e6206b..57c93a0fc60 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,39 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.3.0'
+    - name: '0.4.0'
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
         tags: builder,runtime,kogito,quarkus
         supports: quarkus
-        version: '0.3.0'
+        version: '0.4.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.3.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.4.0
+- kind: ImageStream
+  apiVersion: v1
+  metadata:
+    name: kogito-quarkus-jvm-ubi8
+    annotations:
+      openshift.io/display-name: Runtime image for Kogito based on Quarkus JVM image
+      openshift.io/provider-display-name: Kie Group.
+  spec:
+    tags:
+      - name: '0.4.0'
+        annotations:
+          description: Runtime image for Kogito based on Quarkus JVM image
+          iconClass: icon-jbpm
+          tags: builder,runtime,kogito,quarkus,jvm
+          supports: quarkus
+          version: '0.4.0'
+        referencePolicy:
+          type: Local
+        from:
+          kind: DockerImage
+          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.4.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -36,18 +57,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.3.0'
+    - name: '0.4.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,quarkus
         supports: quarkus
-        version: '0.3.0'
+        version: '0.4.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.3.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.4.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -57,18 +78,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.3.0'
+    - name: '0.4.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,runtime,kogito,springboot
         supports: springboot
-        version: '0.3.0'
+        version: '0.4.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8:0.3.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8:0.4.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -78,18 +99,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.3.0'
+    - name: '0.4.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,springboot
         supports: springboot
-        version: '0.3.0'
+        version: '0.4.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.3.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.4.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -99,14 +120,14 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.3.0'
+    - name: '0.4.0'
       annotations:
         description: Runtime image for the Kogito Data Index Service
         iconClass: icon-jbpm
         tags: kogito,data-index
-        version: '0.3.0'
+        version: '0.4.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-data-index:0.3.0
\ No newline at end of file
+        name: quay.io/kiegroup/kogito-data-index:0.4.0
\ No newline at end of file
diff --git a/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml b/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
new file mode 100644
index 00000000000..ce58e7b4640
--- /dev/null
+++ b/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
@@ -0,0 +1,32 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-quarkus-jvm-ubi8"
+description: "Runtime image for Kogito based on Quarkus JVM image"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito based on Quarkus JVM image"
+- name: "io.k8s.display-name"
+  value: "Kogito based on Quarkus JVM image"
+- name: "io.openshift.tags"
+  value: "builder,runtime,kogito,quarkus,jvm"
+- name: "io.openshift.s2i.assemble-input-files"
+  value: "/home/kogito/bin"
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: install-rpm-dependencies
+  - name: add-kogito-user
+  - name: java-openjdk
+    version: "1.8.0"
+  - name: kogito-quarkus-jvm-ubi8
+
+
+## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/drools-quarkus-example
+run:
+  workdir: "/home/kogito/"
+
diff --git a/s2i/kogito-quarkus-ubi8-overrides.yaml b/s2i/kogito-quarkus-ubi8-overrides.yaml
index b51554a9f42..88f8c341e65 100644
--- a/s2i/kogito-quarkus-ubi8-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-overrides.yaml
@@ -9,7 +9,7 @@ labels:
 - name: "io.k8s.display-name"
   value: "Kogito based on Quarkus native image"
 - name: "io.openshift.tags"
-  value: "builder,runtime,kogito,quarkus"
+  value: "builder,runtime,kogito,quarkus,native"
 - name: "io.openshift.s2i.assemble-input-files"
   value: "/home/kogito/bin"
 
@@ -23,7 +23,8 @@ modules:
   - name: kogito-quarkus-ubi8
 
 
-## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.3.0 kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:0.3.0
+## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/drools-quarkus-example
 run:
   workdir: "/home/kogito/"
 
diff --git a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
index e6a715bf1e8..d3003b8360a 100644
--- a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
@@ -11,6 +11,11 @@ labels:
 - name: "io.openshift.tags"
   value: "builder,kogito,quarkus"
 
+envs:
+- name: NATIVE
+  example: false
+  description: If set to false, perform a non native build.
+
 modules:
   install:
   - name: install-rpm-dependencies
diff --git a/s2i/kogito-springboot-ubi8-overrides.yaml b/s2i/kogito-springboot-ubi8-overrides.yaml
index dfb9d58f97b..865b45ec429 100644
--- a/s2i/kogito-springboot-ubi8-overrides.yaml
+++ b/s2i/kogito-springboot-ubi8-overrides.yaml
@@ -24,7 +24,7 @@ modules:
     version: "1.8.0"
   - name: kogito-springboot-ubi8
 
-# s2i build . quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.3.0 kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-springboot-ubi8:0.3.0
+# s2i build . quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
 run:
   workdir: "/home/kogito"
 
diff --git a/s2i/modules/add-kogito-user/module.yaml b/s2i/modules/add-kogito-user/module.yaml
index 4070b0e553c..e466877cfc4 100644
--- a/s2i/modules/add-kogito-user/module.yaml
+++ b/s2i/modules/add-kogito-user/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.3.0"
+version: "0.4.0"
 name: add-kogito-user
 execute:
 - script: add-user
diff --git a/s2i/modules/install-rpm-dependencies/module.yaml b/s2i/modules/install-rpm-dependencies/module.yaml
index ea49b04414e..7fd1d2b9699 100644
--- a/s2i/modules/install-rpm-dependencies/module.yaml
+++ b/s2i/modules/install-rpm-dependencies/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.3.0"
+version: "0.4.0"
 name: install-rpm-dependencies
 
 execute:
diff --git a/s2i/modules/java-openjdk/1.8.0/module.yaml b/s2i/modules/java-openjdk/1.8.0/module.yaml
index e1f464a2cda..41511810bc8 100644
--- a/s2i/modules/java-openjdk/1.8.0/module.yaml
+++ b/s2i/modules/java-openjdk/1.8.0/module.yaml
@@ -22,4 +22,4 @@ envs:
 
 packages:
   install:
-  - java-1.8.0-openjdk-devel
\ No newline at end of file
+  - java-1.8.0-openjdk-headless
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/README.md b/s2i/modules/kogito-quarkus-jvm-ubi8/README.md
new file mode 100644
index 00000000000..29e2b6e2d5a
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/README.md
@@ -0,0 +1,7 @@
+# S2I image to build jvm runtime image based on ubi8
+
+This S2I is considered a runtime image builder as it relies on another image
+(built with `kogito-quarkus-ubi8-s2i`) that actually produced the binaries to be executed. So this one will only get the binaries
+and place into the container.
+
+With that it produces lightweight and compact application container image.
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/configure b/s2i/modules/kogito-quarkus-jvm-ubi8/configure
new file mode 100644
index 00000000000..286c6c2e034
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/configure
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+SCRIPT_DIR=$(dirname $0)
+
+cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
+
+chmod 755 /usr/local/s2i/*
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml b/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
new file mode 100644
index 00000000000..eff45d01219
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
@@ -0,0 +1,6 @@
+schema_version: 1
+version: "0.4.0"
+name: kogito-quarkus-jvm-ubi8
+execute:
+- script: configure
+
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble
new file mode 100644
index 00000000000..f1f0a931361
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+# this script is used by OpenShift with chained builds
+# to transfer data from builder image into the runtime image
+
+cp -R /tmp/src/bin/ $KOGITO_HOME
+
+if [ -d "$KOGITO_HOME/bin" ]; then
+  echo "---> Application binaries found and ready to use"
+  
+  echo "---> Adding custom labels..."
+  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
+    mkdir /tmp/.s2i
+    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+  else
+    echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+  fi
+else
+  echo "---> Application binaries NOT found, failing build..."
+  exit 1
+fi
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble-runtime b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble-runtime
new file mode 100644
index 00000000000..96cbe83ddab
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble-runtime
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+#
+# S2I assemble-runtime script for the 'kogito-quarkus-ubi8' image.
+# The assemble-runtime script executes preparation for running the container on runtime image.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+if [ -d "$KOGITO_HOME/bin" ]; then
+    echo "---> Application binaries found and ready to use"
+
+    echo "---> Adding custom labels..."
+    if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
+        mkdir /tmp/.s2i
+        cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+    else
+        echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+    fi
+else
+    echo "---> Application binaries NOT found, failing build..."
+    exit 1
+fi
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
new file mode 100755
index 00000000000..b6268fb0f0a
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+#
+# S2I run script for the 'kogito-quarkus-ubi8' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+exec java -jar $KOGITO_HOME/bin/*runner.jar -Dquarkus.http.host=0.0.0.0
+
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/usage b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/usage
new file mode 100644
index 00000000000..2f455ab84dd
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/usage
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+cat <<EOF
+This is the quay.io/kiegroup/kogito-quarkus-ubi8 S2I image:
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+Sample invocation:
+
+s2i build <source code path/URL> quay.io/kiegroup/kogito-quarkus-jvm-ubi8 <application image>
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/README.md b/s2i/modules/kogito-quarkus-ubi8-s2i/README.md
index a818f0e9b41..e4275beccee 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/README.md
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/README.md
@@ -4,6 +4,9 @@ This S2I is considered image builder that is equipped with build tools
 
 - GraalVM
 - Apache Maven
+- JRE
+
+To perform non native builds set the env **NATIVE** to **false**.
 
 So it is equipped with all required tools to build a runnable native image of
 KaaS (Knowledge as a Service) type of projects.
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
index 3c3e70ade94..3f825518f47 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.3.0"
+version: "0.4.0"
 name: kogito-quarkus-ubi8-s2i
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
index 74a347908a5..6b45845b946 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
@@ -16,7 +16,7 @@ CONFIGURE_SCRIPTS=(
 source ${KOGITO_HOME}/.m2/configure.sh
 #############################################
 
-# If the 'kaas-quarkus-ubi8-s2i' assemble script is executed with the '-h' flag, print the usage.
+# If the 'kogito-quarkus-ubi8-s2i' assemble script is executed with the '-h' flag, print the usage.
 if [[ "$1" == "-h" ]]; then
     exec /usr/libexec/s2i/usage
 fi
@@ -30,8 +30,14 @@ echo "---> Installing application source..."
 cd /tmp/src/
 
 if [ -f "pom.xml" ]; then
+
+    nativeBuild="-Pnative"
+    if [ "${NATIVE^^}" == "FALSE" ]; then
+        nativeBuild=""
+    fi
+
     echo "---> Building application from source..."
-    $MAVEN_HOME/bin/mvn clean package -Pnative -s $KOGITO_HOME/.m2/settings.xml \
+    $MAVEN_HOME/bin/mvn clean package ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
         -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
         -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 else
@@ -55,15 +61,23 @@ else
     mv project/* .
 
     echo "---> Building application from source..."
-    $MAVEN_HOME/bin/mvn clean package -Pnative -s $KOGITO_HOME/.m2/settings.xml \
+    $MAVEN_HOME/bin/mvn clean package ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
         -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
         -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 
 fi
 
-echo "---> Installing application binaries"
-cp -v target/*-runner $KOGITO_HOME/bin
-chmod +x $KOGITO_HOME/bin/*-runner
+if [ "${NATIVE^^}" == "FALSE" ]; then
+    cp -v target/*-runner.jar $KOGITO_HOME/bin
+    cp -r target/lib/ $KOGITO_HOME/bin/
+else
+    echo "---> Installing application binaries"
+    cp -v target/*-runner $KOGITO_HOME/bin
+    chmod +x $KOGITO_HOME/bin/*-runner
+    echo "---> Copy native java libraries for ssl handling..."
+    cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/bin
+fi
+
 
 echo "---> Copy image metadata file..."
 if [ -e /tmp/src/target/image_metadata.json ]; then
@@ -74,6 +88,4 @@ else
     echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
 fi
 
-echo "---> Copy native java libraries for ssl handling..."
-cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/bin
 
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage
index e465dcdbef7..14f066da3ef 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage
@@ -16,6 +16,9 @@ Sample invocation:
 
 s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i application --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8
 
+For non native build, just set the NATIVE environment variable to false and use the quay.io/kiegroup/kogito-quarkus-jvm-ubi8
+image as runtime-image, in that way a *runner.jar will be produced and copied to the runtime image.
+
 You can then run the resulting image via:
 docker run <application image>
 EOF
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8/module.yaml b/s2i/modules/kogito-quarkus-ubi8/module.yaml
index 5d9804d3ea5..fe8fbf9d99f 100644
--- a/s2i/modules/kogito-quarkus-ubi8/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.3.0"
+version: "0.4.0"
 name: kogito-quarkus-ubi8
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
index 89b05b6b947..0ac41cd5c27 100755
--- a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
@@ -6,4 +6,5 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/bin
\ No newline at end of file
+exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/bin
+
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
index 80c72e0972a..21db14216f4 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.3.0"
+version: "0.4.0"
 name: kogito-springboot-ubi8-s2i
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-springboot-ubi8/module.yaml b/s2i/modules/kogito-springboot-ubi8/module.yaml
index d50656f030a..636617a3b7b 100644
--- a/s2i/modules/kogito-springboot-ubi8/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.3.0"
+version: "0.4.0"
 name: kogito-springboot-ubi8
 execute:
   - script: configure
diff --git a/s2i/tests/features/common.feature b/s2i/tests/features/common.feature
index 70fa0d8b29c..4f719217118 100644
--- a/s2i/tests/features/common.feature
+++ b/s2i/tests/features/common.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kiegroup/kogito-data-index
+@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8 @quay.io/kiegroup/kiegroup/kogito-data-index
 
 Feature: Common tests for Kogito images
 
diff --git a/s2i/tests/features/kogito-quarkus-jvm-ubi8.feature b/s2i/tests/features/kogito-quarkus-jvm-ubi8.feature
new file mode 100644
index 00000000000..13e0e166c45
--- /dev/null
+++ b/s2i/tests/features/kogito-quarkus-jvm-ubi8.feature
@@ -0,0 +1,20 @@
+@quay.io/kiegroup/kogito-quarkus-jvm-ubi8
+
+Feature: Kogito-quarkus-ubi8 feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+     And the image should contain label io.openshift.s2i.destination with value /tmp
+     And the image should contain label io.openshift.expose-services with value 8080:http
+     And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus JVM image
+     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus JVM image
+     And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,jvm
+     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
+
+  Scenario: verify if the java installation is correct
+    When container is started with command bash
+    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
+    And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
+    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
\ No newline at end of file
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 720e1f078fe..e21c1e5903f 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -3,8 +3,14 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner should exist
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:0.4.0
+    Then file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
+
+  Scenario: Verify if the s2i build is finished as expected performing a non native build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.4.0
+      | variable | value |
+      | NATIVE   | false |
+    Then file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
 
   Scenario: verify if all labels are correctly set.
     Given image is built
diff --git a/s2i/tests/features/kogito-quarkus-ubi8.feature b/s2i/tests/features/kogito-quarkus-ubi8.feature
index cd017fe6fad..8719905f6b3 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8.feature
@@ -10,6 +10,6 @@ Feature: Kogito-quarkus-ubi8 feature.
      And the image should contain label io.openshift.expose-services with value 8080:http
      And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus native image
      And the image should contain label io.k8s.display-name with value Kogito based on Quarkus native image
-     And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus
+     And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,native
      And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
 

From 94aba6eb8b51d5623b2c5fb22fed21014ba05162 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 16 Sep 2019 16:20:27 -0300
Subject: [PATCH 042/709] [KOGITO-186] - follow up issue fix (#40)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/kogito-quarkus-jvm-ubi8-overrides.yaml    |  2 +-
 s2i/kogito-springboot-ubi8-overrides.yaml     |  2 +-
 .../java-openjdk/1.8.0-headless/module.yaml   | 25 +++++++++++++++++++
 s2i/modules/java-openjdk/1.8.0/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-ubi8-s2i/README.md |  2 +-
 .../kogito-springboot-ubi8-s2i/README.md      |  1 +
 6 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 s2i/modules/java-openjdk/1.8.0-headless/module.yaml

diff --git a/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml b/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
index ce58e7b4640..0e2454437c0 100644
--- a/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
+++ b/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
@@ -21,7 +21,7 @@ modules:
   - name: install-rpm-dependencies
   - name: add-kogito-user
   - name: java-openjdk
-    version: "1.8.0"
+    version: "1.8.0-headless"
   - name: kogito-quarkus-jvm-ubi8
 
 
diff --git a/s2i/kogito-springboot-ubi8-overrides.yaml b/s2i/kogito-springboot-ubi8-overrides.yaml
index 865b45ec429..adfbee62c85 100644
--- a/s2i/kogito-springboot-ubi8-overrides.yaml
+++ b/s2i/kogito-springboot-ubi8-overrides.yaml
@@ -21,7 +21,7 @@ modules:
   - name: install-rpm-dependencies
   - name: add-kogito-user
   - name: java-openjdk
-    version: "1.8.0"
+    version: "1.8.0-headless"
   - name: kogito-springboot-ubi8
 
 # s2i build . quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
diff --git a/s2i/modules/java-openjdk/1.8.0-headless/module.yaml b/s2i/modules/java-openjdk/1.8.0-headless/module.yaml
new file mode 100644
index 00000000000..2de6d566247
--- /dev/null
+++ b/s2i/modules/java-openjdk/1.8.0-headless/module.yaml
@@ -0,0 +1,25 @@
+schema_version: 1
+name: java-openjdk
+version: "1.8.0-headless"
+
+labels:
+  - name: "com.redhat.component"
+    value: "jboss-openjdk18-rhel7-container"
+  - name: "org.jboss.product"
+    value: "openjdk"
+  - name: "org.jboss.product.version"
+    value: "1.8.0"
+  - name: "org.jboss.product.openjdk.version"
+    value: "1.8.0"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/lib/jvm/java-1.8.0"
+  - name: "JAVA_VENDOR"
+    value: "openjdk"
+  - name: "JAVA_VERSION"
+    value: "1.8.0"
+
+packages:
+  install:
+  - java-1.8.0-openjdk-headless
\ No newline at end of file
diff --git a/s2i/modules/java-openjdk/1.8.0/module.yaml b/s2i/modules/java-openjdk/1.8.0/module.yaml
index 41511810bc8..e1f464a2cda 100644
--- a/s2i/modules/java-openjdk/1.8.0/module.yaml
+++ b/s2i/modules/java-openjdk/1.8.0/module.yaml
@@ -22,4 +22,4 @@ envs:
 
 packages:
   install:
-  - java-1.8.0-openjdk-headless
\ No newline at end of file
+  - java-1.8.0-openjdk-devel
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/README.md b/s2i/modules/kogito-quarkus-ubi8-s2i/README.md
index e4275beccee..8d2551e279f 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/README.md
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/README.md
@@ -4,7 +4,7 @@ This S2I is considered image builder that is equipped with build tools
 
 - GraalVM
 - Apache Maven
-- JRE
+- JDK
 
 To perform non native builds set the env **NATIVE** to **false**.
 
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/README.md b/s2i/modules/kogito-springboot-ubi8-s2i/README.md
index 2145a131919..43fae99b6f6 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/README.md
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/README.md
@@ -4,6 +4,7 @@ This S2I is considered image builder that is equipped with build tools
 
 - OpenJDK 1.8
 - Apache Maven
+- JDK
 
 So it is equipped with all required tools to build a runnable fat jar of
 KaaS (Knowledge as a Service) type of projects.

From c571b773d8b8beea39c7fb3105d91a9113b9ab65 Mon Sep 17 00:00:00 2001
From: Cristiano Nicolai <cristiano.nicolai@gmail.com>
Date: Wed, 18 Sep 2019 09:47:52 +1000
Subject: [PATCH 043/709] KOGITO-253- Consolidate drools-bom and jbpm-bom into
 kogito-bom (#39)

---
 kogito-cloud-services/pom.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/kogito-cloud-services/pom.xml b/kogito-cloud-services/pom.xml
index 3ad58061553..4c8d5911dfb 100644
--- a/kogito-cloud-services/pom.xml
+++ b/kogito-cloud-services/pom.xml
@@ -21,14 +21,7 @@
     <dependencies>
       <dependency>
         <groupId>org.kie.kogito</groupId>
-        <artifactId>jbpm-bom</artifactId>
-        <version>${version.org.kie.kogito}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>drools-bom</artifactId>
+        <artifactId>kogito-bom</artifactId>
         <version>${version.org.kie.kogito}</version>
         <type>pom</type>
         <scope>import</scope>

From e4b9d82cd33ca7313e0350401fd42319ce8dec61 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 19 Sep 2019 13:43:23 -0300
Subject: [PATCH 044/709] [KOGITO-301] - Force Kogito runtime images to start
 on port 8080 (#41)

* [KOGITO-301] - Force Kogito runtime images to start on port 8080

Signed-off-by: Filippe Spolti <fspolti@redhat.com>

* add app test to force quarkus to use a different port than default

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile                                  |  24 ++--
 s2i/modules/kogito-data-index/added/start     |   2 +-
 .../kogito-quarkus-jvm-ubi8/s2i/bin/run       |   2 +-
 .../kogito-quarkus-ubi8-s2i/s2i/bin/run       |   2 +-
 s2i/modules/kogito-quarkus-ubi8/s2i/bin/run   |   2 +-
 .../kogito-springboot-ubi8/s2i/bin/run        |   2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  |  42 +++++-
 .../kogito-springboot-ubi8-s2i.feature        |   8 +-
 .../drools-quarkus-example/Dockerfile         |   6 +
 .../drools-quarkus-example/README.md          | 111 +++++++++++++++
 .../test-apps/drools-quarkus-example/hello    |   1 +
 .../test-apps/drools-quarkus-example/pom.xml  | 132 ++++++++++++++++++
 .../java/org/kie/kogito/quickstart/Adult.java |  14 ++
 .../kogito/quickstart/AdultCheckResource.java |  39 ++++++
 .../kogito/quickstart/AdultCheckService.java  |  65 +++++++++
 .../kogito/quickstart/CanDrinkResource.java   |  32 +++++
 .../kogito/quickstart/GreetingResource.java   |  20 +++
 .../kogito/quickstart/GreetingService.java    |  12 ++
 .../kie/kogito/quickstart/HealthCheck.java    |  14 ++
 .../kogito/quickstart/HelloRuleService.java   |  31 ++++
 .../org/kie/kogito/quickstart/Person.java     |  28 ++++
 .../org/kie/kogito/quickstart/Result.java     |  65 +++++++++
 .../src/main/resources/META-INF/kmodule.xml   |   9 ++
 .../src/main/resources/application.properties |   1 +
 .../org/drools/simple/candrink/CanDrink.xls   | Bin 0 -> 11264 bytes
 .../org/drools/simple/project/Sample.drl      |  13 ++
 26 files changed, 655 insertions(+), 22 deletions(-)
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/Dockerfile
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/README.md
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/hello
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/pom.xml
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Adult.java
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckResource.java
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckService.java
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/CanDrinkResource.java
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingResource.java
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingService.java
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HealthCheck.java
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HelloRuleService.java
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Person.java
 create mode 100755 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Result.java
 create mode 100755 s2i/tests/test-apps/drools-quarkus-example/src/main/resources/META-INF/kmodule.xml
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/resources/application.properties
 create mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/candrink/CanDrink.xls
 create mode 100755 s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/project/Sample.drl

diff --git a/s2i/Makefile b/s2i/Makefile
index 47b10eebfb5..d04eb80a0c8 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -58,20 +58,20 @@ _push:
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
\ No newline at end of file
+	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc2
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/added/start b/s2i/modules/kogito-data-index/added/start
index c369980af05..23e6bb8e145 100755
--- a/s2i/modules/kogito-data-index/added/start
+++ b/s2i/modules/kogito-data-index/added/start
@@ -36,7 +36,7 @@ function start() {
     local infinispan_props=$(set_infinispan_props)
 
     java ${SHOW_JVM_SETTINGS} -Djava.library.path=$KOGITO_HOME/lib \
-        -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 \
         ${infinispan_props} \
         ${JAVA_OPTS} \
         -jar $KOGITO_HOME/bin/*-runner.jar
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
index b6268fb0f0a..d20b1c66280 100755
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
@@ -6,5 +6,5 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec java -jar $KOGITO_HOME/bin/*runner.jar -Dquarkus.http.host=0.0.0.0
+exec java -jar -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 $KOGITO_HOME/bin/*runner.jar
 
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
index aa8ed9e5945..87527257ce0 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
@@ -6,4 +6,4 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0
\ No newline at end of file
+exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
index 0ac41cd5c27..ac5c8f86052 100755
--- a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
@@ -6,5 +6,5 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/bin
+exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/bin
 
diff --git a/s2i/modules/kogito-springboot-ubi8/s2i/bin/run b/s2i/modules/kogito-springboot-ubi8/s2i/bin/run
index 56d24b7622a..7c60009add3 100755
--- a/s2i/modules/kogito-springboot-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-springboot-ubi8/s2i/bin/run
@@ -6,4 +6,4 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec java -jar $KOGITO_HOME/bin/*.jar
+exec java -jar -Dserver.port=8080 $KOGITO_HOME/bin/*.jar
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index e21c1e5903f..5e210f5d9b5 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -3,14 +3,48 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:0.4.0
-    Then file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | wait            | 80                       |
+      | expected_phrase | Mario is older than Mark |
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.4.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
-    Then file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | wait            | 80                       |
+      | expected_phrase | Mario is older than Mark |
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+
+  Scenario: Verify if the s2i build is finished as expected performing a non native build  and if it is listening on the expected port
+    Given s2i build https://github.com/kiegroup/kogito-cloud.git from s2i/tests/test-apps/drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable | value |
+      | NATIVE   | false |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | wait            | 80                       |
+      | expected_phrase | Mario is older than Mark |
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+
+  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
+    Given s2i build https://github.com/kiegroup/kogito-cloud.git from s2i/tests/test-apps/drools-quarkus-example using master and runtime-image  quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | wait            | 80                       |
+      | expected_phrase | Mario is older than Mark |
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
 
   Scenario: verify if all labels are correctly set.
     Given image is built
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index 51a2f8e5931..ace4d1b2efd 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -4,7 +4,13 @@ Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
     Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-    Then file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    Then check that page is served
+      | property             | value     |
+      | port                 | 8080      |
+      | path                 | /orders/1 |
+      | wait                 | 80        |
+      | expected_status_code | 204       |
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
 
   Scenario: verify if all labels are correctly set.
     Given image is built
diff --git a/s2i/tests/test-apps/drools-quarkus-example/Dockerfile b/s2i/tests/test-apps/drools-quarkus-example/Dockerfile
new file mode 100644
index 00000000000..8918974993e
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/Dockerfile
@@ -0,0 +1,6 @@
+FROM registry.fedoraproject.org/fedora-minimal
+WORKDIR /work/
+COPY target/*-runner /work/application
+RUN chmod 775 /work
+EXPOSE 8080
+CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/s2i/tests/test-apps/drools-quarkus-example/README.md b/s2i/tests/test-apps/drools-quarkus-example/README.md
new file mode 100644
index 00000000000..0d3e45d86c1
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/README.md
@@ -0,0 +1,111 @@
+# Drools + Quarkus Hello World
+## This is a app used by s2i tests
+
+## Installing and Running
+
+- Prerequisites: install qs-playground 8.0-SNAPSHOT
+
+- Compile and Run
+
+    ```
+     mvn clean compile quarkus:dev    
+    ```
+
+- Native Image (requires JAVA_HOME to point to a valid GraalVM)
+
+    ```
+    mvn package -Pnative
+    ```
+  
+  native executable (and runnable jar) generated in `target/`
+
+## Examples
+
+### Hello World
+
+Point to http://localhost:8080/hello for Drools hello world
+
+### More complex example
+
+- post 
+
+```sh
+curl -d '{"name":"edo", "age":32}' -H "Content-Type: application/json" \
+    -X POST http://localhost:8080/persons                                                                                                    ~
+```
+
+- http://localhost:8080/persons/all returns a list of all persons
+
+- http://localhost:8080/persons/adults returns a list of all adults
+
+### Manual Deploy on Openshift
+
+#### Build Container on docker
+```sh
+docker build -t kogito-examples/drools-quarkus .
+docker images | grep drools-quarkus
+```
+
+#### Deploy on Openshift
+By default will be created under project called "My Project"
+```sh
+kubectl create -f kubernetes/deployment.yml 
+kubectl create -f kubernetes/service.yml 
+```
+In the pod's log you could see
+```
+2019-03-07 15:51:40,720 INFO  [io.quarkus] (main) Quarkus 0.11.0 started in 0.019s. Listening on: http://[::]:8080
+2019-03-07 15:51:40,720 INFO [io.quarkus] (main) Installed features: [cdi, resteasy]
+```
+
+Let's go to expose the service
+```
+oc expose service drools-quarkus
+```
+this create a yaml file and the route for us on openshift, like this (in routes section on My Project)
+ ```yaml
+ 
+ apiVersion: route.openshift.io/v1
+ kind: Route
+ metadata:
+   annotations:
+     openshift.io/host.generated: 'true'
+   creationTimestamp: '2019-02-20T10:25:59Z'
+   labels:
+     app: drools-quarkus
+   name: drools-quarkus
+   namespace: myproject
+   resourceVersion: '30743'
+   selfLink: /apis/route.openshift.io/v1/namespaces/myproject/routes/drools-quarkus
+   uid: ea2676d6-34f9-11e9-bd97-08002709a920
+ spec:
+   host: drools-quarkus-myproject.192.168.99.109.nip.io
+   port:
+     targetPort: http
+   to:
+     kind: Service
+     name: drools-quarkus
+     weight: 100
+   wildcardPolicy: None
+ status:
+   ingress:
+     - conditions:
+         - lastTransitionTime: '2019-02-20T10:25:59Z'
+           status: 'True'
+           type: Admitted
+       host: drools-quarkus-myproject.192.168.99.109.nip.io
+       routerName: router
+       wildcardPolicy: None
+
+ ```
+ ```
+ oc get route
+ 
+  NAME             HOST/PORT                                        PATH             SERVICES       PORT      TERMINATION   WILDCARD
+  drools-quarkus   drools-quarkus-myproject.192.168.99.109.nip.io   drools-quarkus   http           None
+  ```
+
+  Your address will be
+  http://drools-quarkus-myproject.192.168.99.109.nip.io/hello
+  
+  
diff --git a/s2i/tests/test-apps/drools-quarkus-example/hello b/s2i/tests/test-apps/drools-quarkus-example/hello
new file mode 100644
index 00000000000..6b926623456
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/hello
@@ -0,0 +1 @@
+Mario is older than Mark
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/pom.xml b/s2i/tests/test-apps/drools-quarkus-example/pom.xml
new file mode 100644
index 00000000000..3c4e029e70b
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/pom.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.kie.kogito.examples</groupId>
+  <artifactId>drools-quarkus-example</artifactId>
+  <version>8.0.0-SNAPSHOT</version>
+  <name>Drools example running on Quarkus</name>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+    <version.io.quarkus>0.22.0</version.io.quarkus>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>${version.io.quarkus}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-maven-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>drools-decisiontables</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-jsonb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>drools-core-static</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>drools-model-compiler</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.kie.kogito</groupId>
+          <artifactId>drools-core-dynamic</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.thoughtworks.xstream</groupId>
+          <artifactId>xstream</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>native</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>native-image</goal>
+                </goals>
+                <configuration>
+                  <additionalBuildArgs>--allow-incomplete-classpath</additionalBuildArgs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Adult.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Adult.java
new file mode 100644
index 00000000000..a545a894998
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Adult.java
@@ -0,0 +1,14 @@
+package org.kie.kogito.quickstart;
+
+public class Adult {
+
+    private final Person person;
+
+    public Adult(Person p) {
+        person = p;
+    }
+
+    public Person getPerson() {
+        return person;
+    }
+}
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckResource.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckResource.java
new file mode 100644
index 00000000000..26a498f18fd
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckResource.java
@@ -0,0 +1,39 @@
+package org.kie.kogito.quickstart;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/persons")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+public class AdultCheckResource {
+
+    @Inject
+    AdultCheckService service;
+
+    @POST
+    public Response post(Person p) {
+        service.post(p);
+        return Response.status(Response.Status.OK).build();
+    }
+
+    @GET
+    @Path("/adults")
+    public List<Person> adults() {
+        return service.adults();
+    }
+
+    @GET
+    @Path("/all")
+    public List<Person> all() {
+        return service.persons();
+    }
+}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckService.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckService.java
new file mode 100644
index 00000000000..ebfaffc4f28
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckService.java
@@ -0,0 +1,65 @@
+package org.kie.kogito.quickstart;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.drools.core.RuleBaseConfiguration;
+import org.drools.core.impl.InternalKnowledgeBase;
+import org.drools.model.DSL;
+import org.drools.model.Model;
+import org.drools.model.Rule;
+import org.drools.model.Variable;
+import org.drools.model.impl.ModelImpl;
+import org.drools.modelcompiler.KiePackagesBuilder;
+import org.drools.modelcompiler.builder.KieBaseBuilder;
+import org.kie.api.runtime.KieSession;
+
+import static org.drools.model.DSL.declarationOf;
+import static org.drools.model.DSL.on;
+import static org.drools.model.PatternDSL.pattern;
+import static org.drools.model.PatternDSL.rule;
+
+@ApplicationScoped
+public class AdultCheckService {
+    final KieSession ksession;
+
+    AdultCheckService() {
+        Variable<Person> pv = declarationOf(Person.class );
+
+        Rule adult = rule("adult" ).build(
+                        pattern(pv).expr(p -> p.getAge() > 18),
+                        DSL.on(pv).execute( p -> session().insert(new Adult(p))));
+
+        Model model = new ModelImpl().addRule(adult);
+        RuleBaseConfiguration kieBaseConf = new RuleBaseConfiguration();
+        KiePackagesBuilder builder = new KiePackagesBuilder(kieBaseConf);
+        builder.addModel( model );
+        InternalKnowledgeBase kieBase = new KieBaseBuilder(kieBaseConf).createKieBase(builder.build());
+
+        ksession = kieBase.newKieSession();
+
+    }
+
+    KieSession session() {
+        return ksession;
+    }
+
+    public void post(Person p) {
+        ksession.insert(p);
+        ksession.fireAllRules();
+    }
+
+    public List<Person> adults() {
+        return ksession.getObjects(p -> p instanceof Adult)
+                .stream().map(p -> ((Adult)p).getPerson())
+                .collect(Collectors.toList());
+    }
+
+    public List<Person> persons() {
+        return ksession.getObjects(p -> p instanceof Person)
+                .stream().map(p -> ((Person)p))
+                .collect(Collectors.toList());
+    }
+}
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/CanDrinkResource.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/CanDrinkResource.java
new file mode 100644
index 00000000000..b9ba9ac52c8
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/CanDrinkResource.java
@@ -0,0 +1,32 @@
+package org.kie.kogito.quickstart;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.kie.kogito.rules.RuleUnit;
+import org.kie.kogito.rules.impl.SessionMemory;
+
+@Path("/candrink/{name}/{age}")
+public class CanDrinkResource {
+
+    @Inject @Named("canDrinkKS")
+    RuleUnit<SessionMemory> ruleUnit;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String canDrink( @PathParam("name") String name, @PathParam("age") int age ) {
+        SessionMemory memory = new SessionMemory();
+
+        Result result = new Result();
+        memory.add(result);
+        memory.add(new Person( name, age ));
+
+        ruleUnit.evaluate(memory);
+
+        return result.toString();
+    }
+}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingResource.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingResource.java
new file mode 100644
index 00000000000..e1c1e4eec02
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingResource.java
@@ -0,0 +1,20 @@
+package org.kie.kogito.quickstart;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class GreetingResource {
+
+    @Inject
+    HelloRuleService service;
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return service.run();
+    }
+}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingService.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingService.java
new file mode 100644
index 00000000000..b91b11315c2
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingService.java
@@ -0,0 +1,12 @@
+package org.kie.kogito.quickstart;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class GreetingService {
+
+    public String greeting(String name) {
+        return "hello " + name;
+    }
+
+}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HealthCheck.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HealthCheck.java
new file mode 100644
index 00000000000..88fed044ada
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HealthCheck.java
@@ -0,0 +1,14 @@
+package org.kie.kogito.quickstart;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+@Path("/health")
+public class HealthCheck {
+
+    @GET
+    public Response check() {
+        return Response.ok().build();
+    }
+}
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HelloRuleService.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HelloRuleService.java
new file mode 100644
index 00000000000..0aab2335140
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HelloRuleService.java
@@ -0,0 +1,31 @@
+package org.kie.kogito.quickstart;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Named;
+import org.kie.kogito.rules.RuleUnit;
+import org.kie.kogito.rules.impl.SessionMemory;
+
+@ApplicationScoped
+public class HelloRuleService {
+
+    @Named("simpleKS")
+    RuleUnit<SessionMemory> ruleUnit;
+
+    public String run() {
+
+        Result result = new Result();
+        Person mark = new Person("Mark", 37);
+        Person edson = new Person("Edson", 35);
+        Person mario = new Person("Mario", 40);
+
+        SessionMemory memory = new SessionMemory();
+        memory.add(result);
+        memory.add(mark);
+        memory.add(edson);
+        memory.add(mario);
+
+        ruleUnit.evaluate(memory);
+
+        return result.toString();
+    }
+}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Person.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Person.java
new file mode 100644
index 00000000000..c4a6bacaa44
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Person.java
@@ -0,0 +1,28 @@
+package org.kie.kogito.quickstart;
+
+public class Person {
+    String name;
+    int age;
+
+    public Person() {}
+
+    public Person(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Result.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Result.java
new file mode 100755
index 00000000000..df0a8f483e1
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Result.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed 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.
+ */
+
+package org.kie.kogito.quickstart;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class Result {
+    private Object value;
+
+    public Result() {
+        // empty constructor.
+    }
+
+    public Result( Object value ) {
+        this.value = value;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue( Object value ) {
+        this.value = value;
+    }
+
+    public void addValue( Object value ) {
+        if (!(this.value instanceof Collection)) {
+            this.value = new ArrayList<>();
+        }
+        ( ( Collection ) this.value ).add(value);
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    @Override
+    public boolean equals( Object o ) {
+        if ( this == o ) return true;
+        if ( o == null || getClass() != o.getClass() ) return false;
+        Result result = ( Result ) o;
+        return value != null ? value.equals( result.value ) : result.value == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return value != null ? value.hashCode() : 0;
+    }
+}
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/META-INF/kmodule.xml b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/META-INF/kmodule.xml
new file mode 100755
index 00000000000..f08404c4136
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/META-INF/kmodule.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
+    <kbase name="simpleKB" packages="org.drools.simple.project">
+        <ksession name="simpleKS" default="true"/>
+    </kbase>
+    <kbase name="canDrinkKB" packages="org.drools.simple.candrink">
+        <ksession name="canDrinkKS"/>
+    </kbase>
+</kmodule>
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/application.properties b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/application.properties
new file mode 100644
index 00000000000..893b32bf115
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/application.properties
@@ -0,0 +1 @@
+quarkus.http.port=10000
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/candrink/CanDrink.xls b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/candrink/CanDrink.xls
new file mode 100644
index 0000000000000000000000000000000000000000..e55608745df0f65717857a3e0b0c1e93d9c04d86
GIT binary patch
literal 11264
zcmeHNeQaFC5ubNH+h^y)AA}@?By3DVzRZOXq=pcP9otC`CAM+QXQAQw{A@pbch9|h
z#<&IH6r%o7kZ4g=HAM<ksZ?5t(pI8>6p;i}3N00sk|O#?6)IJ21udouR6vsJ?>F!6
ze7?lQp{NC#wRhj{?Ck99%<Sy!yZ6$Ibw?ig@q*W-BwZn8aw1zL6-96h^>gy=S`qvU
zVJEWLY#xm2+4L!r!0{ZfWl&%kxg41~uSAX@S0Ps;&p@7uJPUa?at$)|&Rn0X&&fSM
zMa%!cXSGW_{P|*}O;UKKWfWSRewqu5DHh^%Mi%>v>ENFZ=j{9w5;&c#*k3IFstCMz
zMY;TZ)(hP7y7ym~kUSnfgi_>B$T!OneM5_#h@1ab+N?a-7I`>`L*_~=jI$;r4<XN%
zA1VAvEw2>%AEYKR>$PIZQL71fBKK?Apyh0omi$b|{6QgWWq~{gtnA$n@EF5@a;q6T
zz!h5(Qql{AkFR&3+&5|73acA)4qzuH@mwoGf0aDRMIe{<lkYJ6G5O|#CUbUCZdE!O
zj(vvJ0?Na>G6$uRc5!5+Fi-aGspg5w!(bp1@PWB%z^4ly9my1^7@-d#-ziYck5GwD
zW5nX{Oxe%VW~-BO(sp8TxI(@MJxS9M;d!!O-pLv~^XZ@=9Q^_O==9(eqtYqCp9)T@
zr^5g2!uLa_hRe&Pyqs4Dau_d#ubcwjI0byw6!5B3!YlK7FVR=I+J*^25oIahGl0Vn
zES$_I?MK&j$z*t7W1y3$uaATyVF^bT(XI;cJL{%^TlEo{z^?>9*I1x)Y%2OW_(}99
z!z1~1mGD2oj|STXJ`3v_It^Tk<pVwwwRKo4=&YH+^%mrrsH+R)Py*jRd0heiN|8J3
zEZ`$#EXH3kHT>qubgFc{&{u)Zcjl0v0KT9IzIs*wryhwP3PJuLmR}d)s{p5$oPbxU
z-WyKB59kw~TW^j|0lskp{$L1a-k4<htQ{-UXWdwZKI_NA`aEZ>QlE3i%Jq5fSR{KZ
z9I_>Qa7q~l&akO&yC>mf_8@kCWga2rvfa)2nfu_vE&M%(qYXpC^RNIqHp1r1Qesv!
z?9Qc@gzYA~M~9ru6%5sbi`jg+oZS}`;kDfncM`ic54#CJmfE#z3!YB8)%NWkJLBxS
zv}o`lD<X$5WB2`*ydgb|>Bn!<*($~jpAabT1-ui`Q<6Ezq)=ZcGsb!L9spuQc3ZeB
zL=NKQl}M8;ew(*L+!i9ZHAJxN$iHx5JSO*8ivWj)>GQjW6V6V@N6Sn1M|;zrm&imj
zZgME$MB{d<H|?edvCdd>$V>a@2Uvry6CL#WUEhm-aoCLyW_&yCM^}NzcF%V*xSx`$
zirmCnO?<#k^*i9KrK7zy)*b6;2f^kRR?Zb!n%>amWQG&|ij`*R(1uPYo$*r8n%(c9
zZKv(zaw0`Dj(?q<7<N_w8tr%dc01`{$ZFG&Lu*)h1tb(}1@V+Kf{7uwjceCq{aA--
z@8~wV7;t&jm1gaF@I$!5AoW-(Gn}?lamT2BA-T@98+TLvW^>w(4?2DZgtmKe+jqT`
zNxPXrv|BoMbau6EYir*byRHq>ZSS}qoNtMBwe9NO*0!Y^pdD?kFpTbPv98u#oy}d{
zH$r>cVq3Rmaiv=zUxIp}9EnHHMMfo;AQw#`nr{#v)=r8KXTkz{VJ)=tI<<yc=>OQG
zZ@;{wr*qRTg^vM3P1A0caVJSucB6GDyh>rKwfqW73;SM#lis7Sd$qg><JW0=X47)i
zuikeww(sbnO)F6U{Nv^L|K+BYsPFwY)AO4ikp_5=UQpro2}z^XXw7)yR{S5?lz&=s
zEqW^DE?u_BALq^0x!C5Y)@2jz5G?;|^%HHlOsShQuYg~UUGa2Le+4$={<;bLO3ah2
znP_u|?5~|@SApAP5k6#X&94gjCBz$c{*dFVl}L!Yi82J6NMqJqg|U$(6zNb7Mv0fg
zU<(CUvsI&G!&qS{J?`|ZEYmrx93CAFXew;CwM@ri@16vs1%*fv>5v6IfoIsc9G4Ab
z2~m8&Gp*{lyhBg{M)y?=drIFi2;5-sSB5B;e4K#Q9f$Ffne&i2iY*J~OxRP}3d#8x
zSB4h#T8^NAf0atZD$pQP=cztPgLb$8V*(l>v?pkUN@#=%G>E@QeIhvqm$Ddt<T<Rf
zm%%C)$_4m?YsU)kP7Nzyjnbc&tL0Zk=^M;N9%}KlWC^S~_$$}7mCFYhUxRRiG|CHn
zP&OB0u0S3Y7`c@GRi(q{g_s{I#282ceOxgi7v(g>mL<yp4aQJ!EA^cZF{{wGO7{%q
zTUFqJeH^h`-wFjSOBz*o#H^l#NgZDd-h&xtfM%lxFT|Wt!2B~#c{LZ{QJ&OarMxL~
zVU3~jpP&oAW}Lj!r<9?nk+Si<fY(TPd<9^ZRE-C_1&yK<l4>2tfs`@vpT+aLGXpqI
zVSUvVw`Ppri|QD%;2bA6Uj^0tId=oA*nuo}TiNVEoM|GP<bYKR-VQ39r>Z4Sqc<zR
zwjNk2@{+}lm$m$zmcQ5XRV}j?Z3ck@(xy-uR(_xi{GwH>CoHXVD~#<z^!yzf;Q3iM
zPV8IcGWgDVSh7w`P%h1qxw7Y1Yae_3K+6l?tb64L7hLauKi?;iC}lWHX*^-o=kL&f
zwSX6<jnZmKvl(<oN4#{e@%l^yPgWd-4JPT>sf_UlY#)W2F~Ati3^<N&(6CK9z-u%(
z!;R~k0h`bi4o%~xFv2k@=MLW>PDvO$p7t`CsEGv~eO@BrjqvD8xG5*oXhs~vqjJE$
z9fLIx0MJVt4`kB$nM|*ncH+K!yOS|)AIGE|r`PzNu~7~<NzU6h><_1%XmvG?`2l-~
z{DWKkr#xTrG2-F^Mdg+=_c-Q;?K_qG+=2owjGe|b7@BtML}D~gA?am&3X7}s-J}!U
z2+aoXP(=>wo}!FZ#L&XCC)uGMmQejC)ei5s=$T-uIHlgeGD_`GjW}4ImbAm3S6kk_
zY46tE-xz&<Z$oF<x{2<o?XaU@hn*IJA8*jW+F(ITmYA6FX*#3cFvJXK%-Bg4xCVoi
zeqe(JL2tqdv^GLS4e1=j!x@Z8I|v}5!zI-#Xs1w^n>IcJ?3K~#Zm3V~T_eec!Zt__
zL%sIUkYmFHVY1#(UfF$a8eMTO)$3}Q7WWdv$rQ}(MzC2hVeEvYof<8oooO%taxDpW
z5X|1j88Qx8^<hFZ-kwn`i2DK5807}5hSlk!gNb0yo;DLsU(Ntw+CiTgae)g%cKcIa
z+UcESlV8Z$WXFftB>gPi(I?d=pU3Y~<FLsOLhDZH8_OmPPHVKu-`;fHiZ8#`VIF<^
z-ROBQUY(D6(Lc3KzF)A(4@zvZ`jj?lPqqh`gP~!m_e*;trq>&xYojZ2)bp4I-@)|<
znuk>cMrnxH<G?EhYF7^%_mW8`<ws3(AFNqB8tG}-302bpn_k@c%y7zg;bc<=Wc^V!
zA{cy;6~SF%a%=;2gux&<OKc!-q>)|p%W6q^!|wIqW$E~^4HBbKQ(f)Y@d0HMJ8xoY
z@Yq8i4(sy=Krp{D8fwxWbO0*smZ)hvB@Jv*$U<$~HX{QbmZcLYhpk=PO`nUqB3S6)
zBJ$?0n|Ol>u6d27y?IAlqv`C5b#%qLZ)`NJ*LF4Y0!VM~^ih1C8Swp~4Qtlq?x47i
zu4#4RZU*<Q)#?E<rVocsujAWpB2(<rXXm!h`?>A25W!GTW$+>f@!u?sHy9lk01VZF
z00$UXh3e%Ag)}MnIV~SXpu!Q07~$wpG#Hp#RzEJ({XD;O2{8Twz!qbM|K!e=qxg~U
zY;XO8=`VU`%h!2ldwKa?_<u|9Z23CxY}Ogx*^brm-YI&Aqkv~tO|&VTYl`|AM-}(;
z4mZDc0v}PJmG9?iMlZo=IfxH=e<1|FZz)U)_okC!j3-O+sL)~<<73jR!JRpXfy=;e
zjYeKUUl=X^zRngMZd7l^K`Vq7T~yEt7qvL|8u+uIuN*X^xLM>|#LTzIQB<Q5QmIf(
z-lBpQG1+=kI>AS1d>iT}7i+_AaS07#?MqOdcC3vt<WDV}G^9z(=d{dQc(Yn<V83O7
zy;D#Op{YV%u>z$jh#dm+|IjTEAe}8wD*<XY|2sZyj@qJ~5C-MxlfLC_`fN%7??bX>
zI5fDr+DH()AB5hKw&0Dc>~MKM^AJ+%du4O^=Pt&1i0Io<GuiC+^#wn=>X0)pV1K0-
zhBG2^LSJE>OoDcOWY4~TzSl8O`@^qCWcBi&zDCdW5Hfu{`<swy^V^X5#^Y9Go}US1
zzOA?enJ-B1MaBzPc>tL+{q4BmEl=?M({>LpZXL5D9&7LJ*tt#NbXk{Pmh*LgZHV#%
znI^!-ZkscDOZP7<)@8hL-!ta~_3FKQUs+avm@J)fnri*zGj#YjhaZZbU;E&<u>QvP
z9%}`xyadJ{W_Um4<jl3m`87@j2g=#>8Ii!p`TdXDPl*pXm6#a+G||YAuE)0nX&J<?
zPy7yPFaVxG$+v|h#eGa4Hl3lwf0eJ$kSyW15lMXE(g7ZB3xH=(a(?c2&doI4p|KpI
zg?SVBp5mh>zPS!&4$A4!;rjWT3sbr5#FrsS{eFYre#P(=N1y5>i7z^QeC^=@GId&!
yo1byRbk|RLy^teWF0Gg$t~@yU1=^YMv;HHjpZ?#^&Hr&c&Q$)z-(UT&=l?f-uOBb~

literal 0
HcmV?d00001

diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/project/Sample.drl b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/project/Sample.drl
new file mode 100755
index 00000000000..669f8803e2e
--- /dev/null
+++ b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/project/Sample.drl
@@ -0,0 +1,13 @@
+package org.drools.simple.project
+
+import org.kie.kogito.quickstart.Person
+import org.kie.kogito.quickstart.Result
+
+rule R when
+        $r : Result()
+        $p1 : Person( name == "Mark" )
+        $p2 : Person( name != "Mark", age > $p1.age )
+    then
+        $r.setValue( $p2.getName() + " is older than " + $p1.getName());
+end
+

From 6a87bd0e0691e97c9b627825798d1cc3c400dc1a Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 20 Sep 2019 15:15:57 -0300
Subject: [PATCH 045/709] [KOGITO-303] - Incremental builds in Kogito Runtime
 images not working (#42)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile                                  | 24 +++++++++----------
 .../kogito-quarkus-ubi8-s2i/s2i/bin/assemble  |  8 +++----
 .../s2i/bin/save-artifacts                    |  9 ++-----
 .../s2i/bin/assemble                          |  8 +++----
 .../s2i/bin/save-artifacts                    |  9 ++-----
 .../maven/3.6.0/added/configure-maven.sh      | 13 ++++++++++
 .../features/kogito-quarkus-ubi8-s2i.feature  | 14 +++++++++++
 .../kogito-springboot-ubi8-s2i.feature        | 16 +++++++++++++
 8 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/s2i/Makefile b/s2i/Makefile
index d04eb80a0c8..06a4cff6667 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -58,20 +58,20 @@ _push:
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc2
\ No newline at end of file
+	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc3
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
index 6b45845b946..3afd7cb44a0 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
@@ -21,10 +21,10 @@ if [[ "$1" == "-h" ]]; then
     exec /usr/libexec/s2i/usage
 fi
 
-if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
-    echo "---> Restore build artifacts"
-    mv /tmp/artifacts/.m2 $HOME
-fi
+######################
+# incremental builds
+# import ${KOGITO_HOME}/.m2/configure-maven.sh
+manage_incremental_build
 
 echo "---> Installing application source..."
 cd /tmp/src/
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
index c9441b3d02c..8c3c58fea40 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
@@ -1,9 +1,4 @@
 #!/bin/bash
 
-pushd ${HOME} > /dev/null
-if [ -d .m2 ]; then
-    tar cf - .m2
-    echo "--> Maven artifacts saved"
-    ls -l
-fi
-popd > /dev/null
\ No newline at end of file
+source ${KOGITO_HOME}/.m2/configure-maven.sh
+s2i_save_build_artifacts
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
index d6ef6280f68..546a4f57a43 100755
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
@@ -21,10 +21,10 @@ if [[ "$1" == "-h" ]]; then
 	exec /usr/libexec/s2i/usage
 fi
 
-if [ "$(ls /tmp/artifacts/.m2 2>/dev/null)" ]; then
-    echo "---> Restore build artifacts"
-    mv /tmp/artifacts/.m2 $HOME
-fi
+######################
+# incremental builds
+# import ${KOGITO_HOME}/.m2/configure-maven.sh
+manage_incremental_build
 
 echo "---> Installing application source..."
 cd /tmp/src/
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
index d06c9a151cf..7365c757e58 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
@@ -1,9 +1,4 @@
 #!/bin/bash
 
-pushd ${HOME} > /dev/null
-if [ -d .m2 ]; then
-    tar cf - .m2
-    echo "--> Maven artifacts saved"
-    ls -l
-fi
-popd > /dev/null
+source ${KOGITO_HOME}/.m2/configure-maven.sh
+s2i_save_build_artifacts
diff --git a/s2i/modules/maven/3.6.0/added/configure-maven.sh b/s2i/modules/maven/3.6.0/added/configure-maven.sh
index 30819af2c84..46baf82512f 100644
--- a/s2i/modules/maven/3.6.0/added/configure-maven.sh
+++ b/s2i/modules/maven/3.6.0/added/configure-maven.sh
@@ -69,4 +69,17 @@ function configure_mirrors() {
     </mirror>"
     sed -i "s|<!-- ### configured mirrors ### -->|$xml|" $HOME/.m2/settings.xml
   fi
+}
+
+function manage_incremental_build() {
+    if [ -d /tmp/artifacts ]; then
+        echo "Expanding artifacts from incremental build..."
+        ( cd /tmp/artifacts && tar cf - . ) | ( cd ${HOME} && tar xvf - )
+        rm -rf /tmp/artifacts
+    fi
+}
+
+function s2i_save_build_artifacts() {
+    cd ${HOME}
+    tar cf - .m2
 }
\ No newline at end of file
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 5e210f5d9b5..d58e604ef9f 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -46,6 +46,20 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | Mario is older than Mark |
     And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
 
+  Scenario: Perform a incremental s2i build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using master
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | wait            | 80                       |
+      | expected_phrase | Mario is older than Mark |
+
+  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
+  Scenario: Perform a second incremental s2i build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using master
+    Then s2i build log should contain Expanding artifacts from incremental build...
+
   Scenario: verify if all labels are correctly set.
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index ace4d1b2efd..77ffefc3858 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -12,6 +12,22 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | expected_status_code | 204       |
     And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
 
+  Scenario: Scenario: Perform a incremental s2i build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
+    Then check that page is served
+      | property             | value     |
+      | port                 | 8080      |
+      | path                 | /orders/1 |
+      | wait                 | 80        |
+      | expected_status_code | 204       |
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+
+  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
+  Scenario: Perform a second incremental s2i build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
+    Then s2i build log should contain Expanding artifacts from incremental build...
+
+
   Scenario: verify if all labels are correctly set.
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>

From 8a75961e2e9bc38cbfa480343f3c59408e4669d7 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 23 Sep 2019 17:06:50 -0300
Subject: [PATCH 046/709] [KOGITO-320] -  Release Kogito images version 0.4.0
 (#43)

incorporates KOGITO-323

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile                                  |  25 ++--
 s2i/modules/kogito-data-index/module.yaml     |   8 +-
 .../features/kogito-quarkus-index.feature     |   2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  |   5 +-
 .../resources => }/application.properties     |   0
 s2i/tests/test-apps/clone-repo.sh             |  16 +++
 .../drools-quarkus-example/Dockerfile         |   6 -
 .../drools-quarkus-example/README.md          | 111 ---------------
 .../test-apps/drools-quarkus-example/hello    |   1 -
 .../test-apps/drools-quarkus-example/pom.xml  | 132 ------------------
 .../java/org/kie/kogito/quickstart/Adult.java |  14 --
 .../kogito/quickstart/AdultCheckResource.java |  39 ------
 .../kogito/quickstart/AdultCheckService.java  |  65 ---------
 .../kogito/quickstart/CanDrinkResource.java   |  32 -----
 .../kogito/quickstart/GreetingResource.java   |  20 ---
 .../kogito/quickstart/GreetingService.java    |  12 --
 .../kie/kogito/quickstart/HealthCheck.java    |  14 --
 .../kogito/quickstart/HelloRuleService.java   |  31 ----
 .../org/kie/kogito/quickstart/Person.java     |  28 ----
 .../org/kie/kogito/quickstart/Result.java     |  65 ---------
 .../src/main/resources/META-INF/kmodule.xml   |   9 --
 .../org/drools/simple/candrink/CanDrink.xls   | Bin 11264 -> 0 bytes
 .../org/drools/simple/project/Sample.drl      |  13 --
 23 files changed, 37 insertions(+), 611 deletions(-)
 rename s2i/tests/test-apps/{drools-quarkus-example/src/main/resources => }/application.properties (100%)
 create mode 100644 s2i/tests/test-apps/clone-repo.sh
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/Dockerfile
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/README.md
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/hello
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/pom.xml
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Adult.java
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckResource.java
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckService.java
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/CanDrinkResource.java
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingResource.java
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingService.java
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HealthCheck.java
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HelloRuleService.java
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Person.java
 delete mode 100755 s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Result.java
 delete mode 100755 s2i/tests/test-apps/drools-quarkus-example/src/main/resources/META-INF/kmodule.xml
 delete mode 100644 s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/candrink/CanDrink.xls
 delete mode 100755 s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/project/Sample.drl

diff --git a/s2i/Makefile b/s2i/Makefile
index 06a4cff6667..9c1a7d72258 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -30,6 +30,7 @@ kogito-data-index:
 test:
 	cekit -v test --overrides-file kogito-quarkus-ubi8-overrides.yaml behave
 	cekit -v test --overrides-file kogito-quarkus-jvm-ubi8-overrides.yaml behave
+	cd tests/test-apps && sh clone-repo.sh
 	cekit -v test --overrides-file kogito-quarkus-ubi8-s2i-overrides.yaml behave
 	cekit -v test --overrides-file kogito-springboot-ubi8-overrides.yaml behave
 	cekit -v test --overrides-file kogito-springboot-ubi8-s2i-overrides.yaml behave
@@ -58,20 +59,20 @@ _push:
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc3
\ No newline at end of file
+	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index 452e836078b..5bd8cdb5b70 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: kogito-data-index
-version: "0.3.0"
+version: "0.4.0"
 
 artifacts:
-- name: data-index-service-0.3.0-runner.jar
-  url: https://repo.maven.apache.org/maven2/org/kie/kogito/data-index-service/0.3.0/data-index-service-0.3.0-runner.jar
-  md5: 12126dee53783fe09279f46f299611a1
+- name: data-index-service-0.4.0-runner.jar
+  url: https://repo.maven.apache.org/maven2/org/kie/kogito/data-index-service/0.4.0/data-index-service-0.4.0-runner.jar
+  md5: f13b55e7b9e1dc3f8ee106bf4d655e51
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/tests/features/kogito-quarkus-index.feature b/s2i/tests/features/kogito-quarkus-index.feature
index 5d1d4f7e100..a250c2ab6bf 100644
--- a/s2i/tests/features/kogito-quarkus-index.feature
+++ b/s2i/tests/features/kogito-quarkus-index.feature
@@ -14,7 +14,7 @@ Feature: Kogito-quarkus-ubi8 feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.3.0-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.4.0-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index d58e604ef9f..2eee8680275 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -24,8 +24,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | Mario is older than Mark |
     And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
 
+    @wip
   Scenario: Verify if the s2i build is finished as expected performing a non native build  and if it is listening on the expected port
-    Given s2i build https://github.com/kiegroup/kogito-cloud.git from s2i/tests/test-apps/drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -37,7 +38,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build https://github.com/kiegroup/kogito-cloud.git from s2i/tests/test-apps/drools-quarkus-example using master and runtime-image  quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/application.properties b/s2i/tests/test-apps/application.properties
similarity index 100%
rename from s2i/tests/test-apps/drools-quarkus-example/src/main/resources/application.properties
rename to s2i/tests/test-apps/application.properties
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
new file mode 100644
index 00000000000..2ad55cfbc10
--- /dev/null
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Clone the kogito-examples and edit the drools-quarkus-example
+# by adding the application.properties file telling quarkus to start on
+# port 10000, the purpose of this tests is make sure that the images
+# will ensure the use of the port 8080.
+
+CURRENT_DIR=`pwd`
+cd /tmp
+rm -rf kogito-examples/
+git clone https://github.com/kiegroup/kogito-examples.git
+cd kogito-examples/drools-quarkus-example
+cp ${CURRENT_DIR}/application.properties src/main/resources/META-INF/
+git add --all
+git commit -am "test"
+
diff --git a/s2i/tests/test-apps/drools-quarkus-example/Dockerfile b/s2i/tests/test-apps/drools-quarkus-example/Dockerfile
deleted file mode 100644
index 8918974993e..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM registry.fedoraproject.org/fedora-minimal
-WORKDIR /work/
-COPY target/*-runner /work/application
-RUN chmod 775 /work
-EXPOSE 8080
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git a/s2i/tests/test-apps/drools-quarkus-example/README.md b/s2i/tests/test-apps/drools-quarkus-example/README.md
deleted file mode 100644
index 0d3e45d86c1..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/README.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# Drools + Quarkus Hello World
-## This is a app used by s2i tests
-
-## Installing and Running
-
-- Prerequisites: install qs-playground 8.0-SNAPSHOT
-
-- Compile and Run
-
-    ```
-     mvn clean compile quarkus:dev    
-    ```
-
-- Native Image (requires JAVA_HOME to point to a valid GraalVM)
-
-    ```
-    mvn package -Pnative
-    ```
-  
-  native executable (and runnable jar) generated in `target/`
-
-## Examples
-
-### Hello World
-
-Point to http://localhost:8080/hello for Drools hello world
-
-### More complex example
-
-- post 
-
-```sh
-curl -d '{"name":"edo", "age":32}' -H "Content-Type: application/json" \
-    -X POST http://localhost:8080/persons                                                                                                    ~
-```
-
-- http://localhost:8080/persons/all returns a list of all persons
-
-- http://localhost:8080/persons/adults returns a list of all adults
-
-### Manual Deploy on Openshift
-
-#### Build Container on docker
-```sh
-docker build -t kogito-examples/drools-quarkus .
-docker images | grep drools-quarkus
-```
-
-#### Deploy on Openshift
-By default will be created under project called "My Project"
-```sh
-kubectl create -f kubernetes/deployment.yml 
-kubectl create -f kubernetes/service.yml 
-```
-In the pod's log you could see
-```
-2019-03-07 15:51:40,720 INFO  [io.quarkus] (main) Quarkus 0.11.0 started in 0.019s. Listening on: http://[::]:8080
-2019-03-07 15:51:40,720 INFO [io.quarkus] (main) Installed features: [cdi, resteasy]
-```
-
-Let's go to expose the service
-```
-oc expose service drools-quarkus
-```
-this create a yaml file and the route for us on openshift, like this (in routes section on My Project)
- ```yaml
- 
- apiVersion: route.openshift.io/v1
- kind: Route
- metadata:
-   annotations:
-     openshift.io/host.generated: 'true'
-   creationTimestamp: '2019-02-20T10:25:59Z'
-   labels:
-     app: drools-quarkus
-   name: drools-quarkus
-   namespace: myproject
-   resourceVersion: '30743'
-   selfLink: /apis/route.openshift.io/v1/namespaces/myproject/routes/drools-quarkus
-   uid: ea2676d6-34f9-11e9-bd97-08002709a920
- spec:
-   host: drools-quarkus-myproject.192.168.99.109.nip.io
-   port:
-     targetPort: http
-   to:
-     kind: Service
-     name: drools-quarkus
-     weight: 100
-   wildcardPolicy: None
- status:
-   ingress:
-     - conditions:
-         - lastTransitionTime: '2019-02-20T10:25:59Z'
-           status: 'True'
-           type: Admitted
-       host: drools-quarkus-myproject.192.168.99.109.nip.io
-       routerName: router
-       wildcardPolicy: None
-
- ```
- ```
- oc get route
- 
-  NAME             HOST/PORT                                        PATH             SERVICES       PORT      TERMINATION   WILDCARD
-  drools-quarkus   drools-quarkus-myproject.192.168.99.109.nip.io   drools-quarkus   http           None
-  ```
-
-  Your address will be
-  http://drools-quarkus-myproject.192.168.99.109.nip.io/hello
-  
-  
diff --git a/s2i/tests/test-apps/drools-quarkus-example/hello b/s2i/tests/test-apps/drools-quarkus-example/hello
deleted file mode 100644
index 6b926623456..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/hello
+++ /dev/null
@@ -1 +0,0 @@
-Mario is older than Mark
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/pom.xml b/s2i/tests/test-apps/drools-quarkus-example/pom.xml
deleted file mode 100644
index 3c4e029e70b..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.kie.kogito.examples</groupId>
-  <artifactId>drools-quarkus-example</artifactId>
-  <version>8.0.0-SNAPSHOT</version>
-  <name>Drools example running on Quarkus</name>
-
-  <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-    <version.io.quarkus>0.22.0</version.io.quarkus>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bom</artifactId>
-        <version>${version.io.quarkus}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-maven-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>drools-decisiontables</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-jsonb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-arc</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>drools-core-static</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>drools-model-compiler</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.kie.kogito</groupId>
-          <artifactId>drools-core-dynamic</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.thoughtworks.xstream</groupId>
-          <artifactId>xstream</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.rest-assured</groupId>
-      <artifactId>rest-assured</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>native</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <additionalBuildArgs>--allow-incomplete-classpath</additionalBuildArgs>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Adult.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Adult.java
deleted file mode 100644
index a545a894998..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Adult.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.kie.kogito.quickstart;
-
-public class Adult {
-
-    private final Person person;
-
-    public Adult(Person p) {
-        person = p;
-    }
-
-    public Person getPerson() {
-        return person;
-    }
-}
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckResource.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckResource.java
deleted file mode 100644
index 26a498f18fd..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckResource.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.kie.kogito.quickstart;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-@Path("/persons")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-public class AdultCheckResource {
-
-    @Inject
-    AdultCheckService service;
-
-    @POST
-    public Response post(Person p) {
-        service.post(p);
-        return Response.status(Response.Status.OK).build();
-    }
-
-    @GET
-    @Path("/adults")
-    public List<Person> adults() {
-        return service.adults();
-    }
-
-    @GET
-    @Path("/all")
-    public List<Person> all() {
-        return service.persons();
-    }
-}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckService.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckService.java
deleted file mode 100644
index ebfaffc4f28..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/AdultCheckService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.kie.kogito.quickstart;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import org.drools.core.RuleBaseConfiguration;
-import org.drools.core.impl.InternalKnowledgeBase;
-import org.drools.model.DSL;
-import org.drools.model.Model;
-import org.drools.model.Rule;
-import org.drools.model.Variable;
-import org.drools.model.impl.ModelImpl;
-import org.drools.modelcompiler.KiePackagesBuilder;
-import org.drools.modelcompiler.builder.KieBaseBuilder;
-import org.kie.api.runtime.KieSession;
-
-import static org.drools.model.DSL.declarationOf;
-import static org.drools.model.DSL.on;
-import static org.drools.model.PatternDSL.pattern;
-import static org.drools.model.PatternDSL.rule;
-
-@ApplicationScoped
-public class AdultCheckService {
-    final KieSession ksession;
-
-    AdultCheckService() {
-        Variable<Person> pv = declarationOf(Person.class );
-
-        Rule adult = rule("adult" ).build(
-                        pattern(pv).expr(p -> p.getAge() > 18),
-                        DSL.on(pv).execute( p -> session().insert(new Adult(p))));
-
-        Model model = new ModelImpl().addRule(adult);
-        RuleBaseConfiguration kieBaseConf = new RuleBaseConfiguration();
-        KiePackagesBuilder builder = new KiePackagesBuilder(kieBaseConf);
-        builder.addModel( model );
-        InternalKnowledgeBase kieBase = new KieBaseBuilder(kieBaseConf).createKieBase(builder.build());
-
-        ksession = kieBase.newKieSession();
-
-    }
-
-    KieSession session() {
-        return ksession;
-    }
-
-    public void post(Person p) {
-        ksession.insert(p);
-        ksession.fireAllRules();
-    }
-
-    public List<Person> adults() {
-        return ksession.getObjects(p -> p instanceof Adult)
-                .stream().map(p -> ((Adult)p).getPerson())
-                .collect(Collectors.toList());
-    }
-
-    public List<Person> persons() {
-        return ksession.getObjects(p -> p instanceof Person)
-                .stream().map(p -> ((Person)p))
-                .collect(Collectors.toList());
-    }
-}
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/CanDrinkResource.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/CanDrinkResource.java
deleted file mode 100644
index b9ba9ac52c8..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/CanDrinkResource.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.kie.kogito.quickstart;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import org.kie.kogito.rules.RuleUnit;
-import org.kie.kogito.rules.impl.SessionMemory;
-
-@Path("/candrink/{name}/{age}")
-public class CanDrinkResource {
-
-    @Inject @Named("canDrinkKS")
-    RuleUnit<SessionMemory> ruleUnit;
-
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    public String canDrink( @PathParam("name") String name, @PathParam("age") int age ) {
-        SessionMemory memory = new SessionMemory();
-
-        Result result = new Result();
-        memory.add(result);
-        memory.add(new Person( name, age ));
-
-        ruleUnit.evaluate(memory);
-
-        return result.toString();
-    }
-}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingResource.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingResource.java
deleted file mode 100644
index e1c1e4eec02..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingResource.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.kie.kogito.quickstart;
-
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-@Path("/hello")
-public class GreetingResource {
-
-    @Inject
-    HelloRuleService service;
-
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    public String hello() {
-        return service.run();
-    }
-}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingService.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingService.java
deleted file mode 100644
index b91b11315c2..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/GreetingService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.kie.kogito.quickstart;
-
-import javax.enterprise.context.ApplicationScoped;
-
-@ApplicationScoped
-public class GreetingService {
-
-    public String greeting(String name) {
-        return "hello " + name;
-    }
-
-}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HealthCheck.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HealthCheck.java
deleted file mode 100644
index 88fed044ada..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HealthCheck.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.kie.kogito.quickstart;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-
-@Path("/health")
-public class HealthCheck {
-
-    @GET
-    public Response check() {
-        return Response.ok().build();
-    }
-}
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HelloRuleService.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HelloRuleService.java
deleted file mode 100644
index 0aab2335140..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/HelloRuleService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.kie.kogito.quickstart;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
-import org.kie.kogito.rules.RuleUnit;
-import org.kie.kogito.rules.impl.SessionMemory;
-
-@ApplicationScoped
-public class HelloRuleService {
-
-    @Named("simpleKS")
-    RuleUnit<SessionMemory> ruleUnit;
-
-    public String run() {
-
-        Result result = new Result();
-        Person mark = new Person("Mark", 37);
-        Person edson = new Person("Edson", 35);
-        Person mario = new Person("Mario", 40);
-
-        SessionMemory memory = new SessionMemory();
-        memory.add(result);
-        memory.add(mark);
-        memory.add(edson);
-        memory.add(mario);
-
-        ruleUnit.evaluate(memory);
-
-        return result.toString();
-    }
-}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Person.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Person.java
deleted file mode 100644
index c4a6bacaa44..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Person.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.kie.kogito.quickstart;
-
-public class Person {
-    String name;
-    int age;
-
-    public Person() {}
-
-    public Person(String name, int age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-}
\ No newline at end of file
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Result.java b/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Result.java
deleted file mode 100755
index df0a8f483e1..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/java/org/kie/kogito/quickstart/Result.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed 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.
- */
-
-package org.kie.kogito.quickstart;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-public class Result {
-    private Object value;
-
-    public Result() {
-        // empty constructor.
-    }
-
-    public Result( Object value ) {
-        this.value = value;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue( Object value ) {
-        this.value = value;
-    }
-
-    public void addValue( Object value ) {
-        if (!(this.value instanceof Collection)) {
-            this.value = new ArrayList<>();
-        }
-        ( ( Collection ) this.value ).add(value);
-    }
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-
-    @Override
-    public boolean equals( Object o ) {
-        if ( this == o ) return true;
-        if ( o == null || getClass() != o.getClass() ) return false;
-        Result result = ( Result ) o;
-        return value != null ? value.equals( result.value ) : result.value == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return value != null ? value.hashCode() : 0;
-    }
-}
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/META-INF/kmodule.xml b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/META-INF/kmodule.xml
deleted file mode 100755
index f08404c4136..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/META-INF/kmodule.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
-    <kbase name="simpleKB" packages="org.drools.simple.project">
-        <ksession name="simpleKS" default="true"/>
-    </kbase>
-    <kbase name="canDrinkKB" packages="org.drools.simple.candrink">
-        <ksession name="canDrinkKS"/>
-    </kbase>
-</kmodule>
diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/candrink/CanDrink.xls b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/candrink/CanDrink.xls
deleted file mode 100644
index e55608745df0f65717857a3e0b0c1e93d9c04d86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11264
zcmeHNeQaFC5ubNH+h^y)AA}@?By3DVzRZOXq=pcP9otC`CAM+QXQAQw{A@pbch9|h
z#<&IH6r%o7kZ4g=HAM<ksZ?5t(pI8>6p;i}3N00sk|O#?6)IJ21udouR6vsJ?>F!6
ze7?lQp{NC#wRhj{?Ck99%<Sy!yZ6$Ibw?ig@q*W-BwZn8aw1zL6-96h^>gy=S`qvU
zVJEWLY#xm2+4L!r!0{ZfWl&%kxg41~uSAX@S0Ps;&p@7uJPUa?at$)|&Rn0X&&fSM
zMa%!cXSGW_{P|*}O;UKKWfWSRewqu5DHh^%Mi%>v>ENFZ=j{9w5;&c#*k3IFstCMz
zMY;TZ)(hP7y7ym~kUSnfgi_>B$T!OneM5_#h@1ab+N?a-7I`>`L*_~=jI$;r4<XN%
zA1VAvEw2>%AEYKR>$PIZQL71fBKK?Apyh0omi$b|{6QgWWq~{gtnA$n@EF5@a;q6T
zz!h5(Qql{AkFR&3+&5|73acA)4qzuH@mwoGf0aDRMIe{<lkYJ6G5O|#CUbUCZdE!O
zj(vvJ0?Na>G6$uRc5!5+Fi-aGspg5w!(bp1@PWB%z^4ly9my1^7@-d#-ziYck5GwD
zW5nX{Oxe%VW~-BO(sp8TxI(@MJxS9M;d!!O-pLv~^XZ@=9Q^_O==9(eqtYqCp9)T@
zr^5g2!uLa_hRe&Pyqs4Dau_d#ubcwjI0byw6!5B3!YlK7FVR=I+J*^25oIahGl0Vn
zES$_I?MK&j$z*t7W1y3$uaATyVF^bT(XI;cJL{%^TlEo{z^?>9*I1x)Y%2OW_(}99
z!z1~1mGD2oj|STXJ`3v_It^Tk<pVwwwRKo4=&YH+^%mrrsH+R)Py*jRd0heiN|8J3
zEZ`$#EXH3kHT>qubgFc{&{u)Zcjl0v0KT9IzIs*wryhwP3PJuLmR}d)s{p5$oPbxU
z-WyKB59kw~TW^j|0lskp{$L1a-k4<htQ{-UXWdwZKI_NA`aEZ>QlE3i%Jq5fSR{KZ
z9I_>Qa7q~l&akO&yC>mf_8@kCWga2rvfa)2nfu_vE&M%(qYXpC^RNIqHp1r1Qesv!
z?9Qc@gzYA~M~9ru6%5sbi`jg+oZS}`;kDfncM`ic54#CJmfE#z3!YB8)%NWkJLBxS
zv}o`lD<X$5WB2`*ydgb|>Bn!<*($~jpAabT1-ui`Q<6Ezq)=ZcGsb!L9spuQc3ZeB
zL=NKQl}M8;ew(*L+!i9ZHAJxN$iHx5JSO*8ivWj)>GQjW6V6V@N6Sn1M|;zrm&imj
zZgME$MB{d<H|?edvCdd>$V>a@2Uvry6CL#WUEhm-aoCLyW_&yCM^}NzcF%V*xSx`$
zirmCnO?<#k^*i9KrK7zy)*b6;2f^kRR?Zb!n%>amWQG&|ij`*R(1uPYo$*r8n%(c9
zZKv(zaw0`Dj(?q<7<N_w8tr%dc01`{$ZFG&Lu*)h1tb(}1@V+Kf{7uwjceCq{aA--
z@8~wV7;t&jm1gaF@I$!5AoW-(Gn}?lamT2BA-T@98+TLvW^>w(4?2DZgtmKe+jqT`
zNxPXrv|BoMbau6EYir*byRHq>ZSS}qoNtMBwe9NO*0!Y^pdD?kFpTbPv98u#oy}d{
zH$r>cVq3Rmaiv=zUxIp}9EnHHMMfo;AQw#`nr{#v)=r8KXTkz{VJ)=tI<<yc=>OQG
zZ@;{wr*qRTg^vM3P1A0caVJSucB6GDyh>rKwfqW73;SM#lis7Sd$qg><JW0=X47)i
zuikeww(sbnO)F6U{Nv^L|K+BYsPFwY)AO4ikp_5=UQpro2}z^XXw7)yR{S5?lz&=s
zEqW^DE?u_BALq^0x!C5Y)@2jz5G?;|^%HHlOsShQuYg~UUGa2Le+4$={<;bLO3ah2
znP_u|?5~|@SApAP5k6#X&94gjCBz$c{*dFVl}L!Yi82J6NMqJqg|U$(6zNb7Mv0fg
zU<(CUvsI&G!&qS{J?`|ZEYmrx93CAFXew;CwM@ri@16vs1%*fv>5v6IfoIsc9G4Ab
z2~m8&Gp*{lyhBg{M)y?=drIFi2;5-sSB5B;e4K#Q9f$Ffne&i2iY*J~OxRP}3d#8x
zSB4h#T8^NAf0atZD$pQP=cztPgLb$8V*(l>v?pkUN@#=%G>E@QeIhvqm$Ddt<T<Rf
zm%%C)$_4m?YsU)kP7Nzyjnbc&tL0Zk=^M;N9%}KlWC^S~_$$}7mCFYhUxRRiG|CHn
zP&OB0u0S3Y7`c@GRi(q{g_s{I#282ceOxgi7v(g>mL<yp4aQJ!EA^cZF{{wGO7{%q
zTUFqJeH^h`-wFjSOBz*o#H^l#NgZDd-h&xtfM%lxFT|Wt!2B~#c{LZ{QJ&OarMxL~
zVU3~jpP&oAW}Lj!r<9?nk+Si<fY(TPd<9^ZRE-C_1&yK<l4>2tfs`@vpT+aLGXpqI
zVSUvVw`Ppri|QD%;2bA6Uj^0tId=oA*nuo}TiNVEoM|GP<bYKR-VQ39r>Z4Sqc<zR
zwjNk2@{+}lm$m$zmcQ5XRV}j?Z3ck@(xy-uR(_xi{GwH>CoHXVD~#<z^!yzf;Q3iM
zPV8IcGWgDVSh7w`P%h1qxw7Y1Yae_3K+6l?tb64L7hLauKi?;iC}lWHX*^-o=kL&f
zwSX6<jnZmKvl(<oN4#{e@%l^yPgWd-4JPT>sf_UlY#)W2F~Ati3^<N&(6CK9z-u%(
z!;R~k0h`bi4o%~xFv2k@=MLW>PDvO$p7t`CsEGv~eO@BrjqvD8xG5*oXhs~vqjJE$
z9fLIx0MJVt4`kB$nM|*ncH+K!yOS|)AIGE|r`PzNu~7~<NzU6h><_1%XmvG?`2l-~
z{DWKkr#xTrG2-F^Mdg+=_c-Q;?K_qG+=2owjGe|b7@BtML}D~gA?am&3X7}s-J}!U
z2+aoXP(=>wo}!FZ#L&XCC)uGMmQejC)ei5s=$T-uIHlgeGD_`GjW}4ImbAm3S6kk_
zY46tE-xz&<Z$oF<x{2<o?XaU@hn*IJA8*jW+F(ITmYA6FX*#3cFvJXK%-Bg4xCVoi
zeqe(JL2tqdv^GLS4e1=j!x@Z8I|v}5!zI-#Xs1w^n>IcJ?3K~#Zm3V~T_eec!Zt__
zL%sIUkYmFHVY1#(UfF$a8eMTO)$3}Q7WWdv$rQ}(MzC2hVeEvYof<8oooO%taxDpW
z5X|1j88Qx8^<hFZ-kwn`i2DK5807}5hSlk!gNb0yo;DLsU(Ntw+CiTgae)g%cKcIa
z+UcESlV8Z$WXFftB>gPi(I?d=pU3Y~<FLsOLhDZH8_OmPPHVKu-`;fHiZ8#`VIF<^
z-ROBQUY(D6(Lc3KzF)A(4@zvZ`jj?lPqqh`gP~!m_e*;trq>&xYojZ2)bp4I-@)|<
znuk>cMrnxH<G?EhYF7^%_mW8`<ws3(AFNqB8tG}-302bpn_k@c%y7zg;bc<=Wc^V!
zA{cy;6~SF%a%=;2gux&<OKc!-q>)|p%W6q^!|wIqW$E~^4HBbKQ(f)Y@d0HMJ8xoY
z@Yq8i4(sy=Krp{D8fwxWbO0*smZ)hvB@Jv*$U<$~HX{QbmZcLYhpk=PO`nUqB3S6)
zBJ$?0n|Ol>u6d27y?IAlqv`C5b#%qLZ)`NJ*LF4Y0!VM~^ih1C8Swp~4Qtlq?x47i
zu4#4RZU*<Q)#?E<rVocsujAWpB2(<rXXm!h`?>A25W!GTW$+>f@!u?sHy9lk01VZF
z00$UXh3e%Ag)}MnIV~SXpu!Q07~$wpG#Hp#RzEJ({XD;O2{8Twz!qbM|K!e=qxg~U
zY;XO8=`VU`%h!2ldwKa?_<u|9Z23CxY}Ogx*^brm-YI&Aqkv~tO|&VTYl`|AM-}(;
z4mZDc0v}PJmG9?iMlZo=IfxH=e<1|FZz)U)_okC!j3-O+sL)~<<73jR!JRpXfy=;e
zjYeKUUl=X^zRngMZd7l^K`Vq7T~yEt7qvL|8u+uIuN*X^xLM>|#LTzIQB<Q5QmIf(
z-lBpQG1+=kI>AS1d>iT}7i+_AaS07#?MqOdcC3vt<WDV}G^9z(=d{dQc(Yn<V83O7
zy;D#Op{YV%u>z$jh#dm+|IjTEAe}8wD*<XY|2sZyj@qJ~5C-MxlfLC_`fN%7??bX>
zI5fDr+DH()AB5hKw&0Dc>~MKM^AJ+%du4O^=Pt&1i0Io<GuiC+^#wn=>X0)pV1K0-
zhBG2^LSJE>OoDcOWY4~TzSl8O`@^qCWcBi&zDCdW5Hfu{`<swy^V^X5#^Y9Go}US1
zzOA?enJ-B1MaBzPc>tL+{q4BmEl=?M({>LpZXL5D9&7LJ*tt#NbXk{Pmh*LgZHV#%
znI^!-ZkscDOZP7<)@8hL-!ta~_3FKQUs+avm@J)fnri*zGj#YjhaZZbU;E&<u>QvP
z9%}`xyadJ{W_Um4<jl3m`87@j2g=#>8Ii!p`TdXDPl*pXm6#a+G||YAuE)0nX&J<?
zPy7yPFaVxG$+v|h#eGa4Hl3lwf0eJ$kSyW15lMXE(g7ZB3xH=(a(?c2&doI4p|KpI
zg?SVBp5mh>zPS!&4$A4!;rjWT3sbr5#FrsS{eFYre#P(=N1y5>i7z^QeC^=@GId&!
yo1byRbk|RLy^teWF0Gg$t~@yU1=^YMv;HHjpZ?#^&Hr&c&Q$)z-(UT&=l?f-uOBb~

diff --git a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/project/Sample.drl b/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/project/Sample.drl
deleted file mode 100755
index 669f8803e2e..00000000000
--- a/s2i/tests/test-apps/drools-quarkus-example/src/main/resources/org/drools/simple/project/Sample.drl
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.drools.simple.project
-
-import org.kie.kogito.quickstart.Person
-import org.kie.kogito.quickstart.Result
-
-rule R when
-        $r : Result()
-        $p1 : Person( name == "Mark" )
-        $p2 : Person( name != "Mark", age > $p1.age )
-    then
-        $r.setValue( $p2.getName() + " is older than " + $p1.getName());
-end
-

From 98aa2a6e2f5268a622036abc6d8cd272ff21d0ba Mon Sep 17 00:00:00 2001
From: Cristiano Nicolai <cristiano.nicolai@gmail.com>
Date: Fri, 27 Sep 2019 10:09:58 +1000
Subject: [PATCH 047/709] KOGITO-333 - Separate external dependencies into its
 on BOM (#44)

---
 .../kogito-cloud-kubernetes-client/pom.xml                 | 1 -
 kogito-cloud-services/kogito-cloud-workitems/pom.xml       | 1 -
 kogito-cloud-services/pom.xml                              | 7 +++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml b/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
index 43215dc42b6..7416652048a 100644
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
+++ b/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
@@ -47,7 +47,6 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-server-mock</artifactId>
-      <version>${version.kubernetes-client}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kogito-cloud-services/kogito-cloud-workitems/pom.xml b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
index 0cc60b073b4..2e4160d5a65 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/pom.xml
+++ b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
@@ -52,7 +52,6 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-server-mock</artifactId>
-      <version>${version.kubernetes-client}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/kogito-cloud-services/pom.xml b/kogito-cloud-services/pom.xml
index 4c8d5911dfb..d9c5650d0c3 100644
--- a/kogito-cloud-services/pom.xml
+++ b/kogito-cloud-services/pom.xml
@@ -19,6 +19,13 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-deps-bom</artifactId>
+        <version>${version.org.kie.kogito}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.kie.kogito</groupId>
         <artifactId>kogito-bom</artifactId>

From 417300585bcd9218788bde834f6927577c9e0ce1 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 30 Sep 2019 13:24:37 -0300
Subject: [PATCH 048/709] [KOGITO-346] - Use stable branches on kogito-examples
 for s2i image tests (#45)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 .../features/kogito-quarkus-ubi8-s2i.feature  | 21 +++++++++----------
 .../kogito-springboot-ubi8-s2i.feature        | 10 ++++-----
 s2i/tests/test-apps/clone-repo.sh             |  2 ++
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 2eee8680275..d324dd683d1 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -3,17 +3,17 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -22,11 +22,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner.jar should exist
 
-    @wip
   Scenario: Verify if the s2i build is finished as expected performing a non native build  and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -35,20 +34,20 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.4.0
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
@@ -58,7 +57,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.4.0
     Then s2i build log should contain Expanding artifacts from incremental build...
 
   Scenario: verify if all labels are correctly set.
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index 77ffefc3858..d875182f7b0 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,28 +3,28 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.4.0.jar should exist
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.4.0
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.4.0.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.4.0
     Then s2i build log should contain Expanding artifacts from incremental build...
 
 
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index 2ad55cfbc10..02e27fc6698 100644
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -10,6 +10,8 @@ cd /tmp
 rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
+git fetch origin --tags
+git checkout 0.4.0
 cp ${CURRENT_DIR}/application.properties src/main/resources/META-INF/
 git add --all
 git commit -am "test"

From e13e291bcc7cdac310d0e05dc8d5df52e5b2f4c3 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 8 Oct 2019 11:30:26 -0300
Subject: [PATCH 049/709] [KOGITO-358] Add JAVA_OPTIONS to java images (#49)

---
 s2i/kogito-quarkus-jvm-ubi8-overrides.yaml            | 5 +++++
 s2i/kogito-quarkus-ubi8-overrides.yaml                | 5 +++++
 s2i/kogito-quarkus-ubi8-s2i-overrides.yaml            | 3 +++
 s2i/kogito-springboot-ubi8-overrides.yaml             | 5 +++++
 s2i/kogito-springboot-ubi8-s2i-overrides.yaml         | 5 +++++
 s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run       | 2 +-
 s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run       | 2 +-
 s2i/modules/kogito-quarkus-ubi8/s2i/bin/run           | 2 +-
 s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run    | 2 +-
 s2i/modules/kogito-springboot-ubi8/s2i/bin/run        | 2 +-
 s2i/tests/features/kogito-quarkus-ubi8-s2i.feature    | 7 +++++--
 s2i/tests/features/kogito-springboot-ubi8-s2i.feature | 4 ++++
 12 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml b/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
index 0e2454437c0..94687a099ae 100644
--- a/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
+++ b/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
@@ -13,6 +13,11 @@ labels:
 - name: "io.openshift.s2i.assemble-input-files"
   value: "/home/kogito/bin"
 
+envs:
+- name: JAVA_OPTIONS
+  example: "-Dquarkus.log.level=DEBUG"
+  description: JVM options passed to the Java command.
+
 ports:
 - value: 8080
 
diff --git a/s2i/kogito-quarkus-ubi8-overrides.yaml b/s2i/kogito-quarkus-ubi8-overrides.yaml
index 88f8c341e65..347751f28dc 100644
--- a/s2i/kogito-quarkus-ubi8-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-overrides.yaml
@@ -13,6 +13,11 @@ labels:
 - name: "io.openshift.s2i.assemble-input-files"
   value: "/home/kogito/bin"
 
+envs:
+- name: JAVA_OPTIONS
+  example: "-Dquarkus.log.level=DEBUG"
+  description: JVM options passed to the Java command.
+
 ports:
 - value: 8080
 
diff --git a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
index d3003b8360a..b8d6115f7ba 100644
--- a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
@@ -15,6 +15,9 @@ envs:
 - name: NATIVE
   example: false
   description: If set to false, perform a non native build.
+- name: JAVA_OPTIONS
+  example: "-Dquarkus.log.level=DEBUG"
+  description: JVM options passed to the Java command.
 
 modules:
   install:
diff --git a/s2i/kogito-springboot-ubi8-overrides.yaml b/s2i/kogito-springboot-ubi8-overrides.yaml
index adfbee62c85..ad999936062 100644
--- a/s2i/kogito-springboot-ubi8-overrides.yaml
+++ b/s2i/kogito-springboot-ubi8-overrides.yaml
@@ -13,6 +13,11 @@ labels:
 - name: "io.openshift.s2i.assemble-input-files"
   value: "/home/kogito/bin"
 
+envs:
+- name: JAVA_OPTIONS
+  example: "-Ddebug=true"
+  description: JVM options passed to the Java command.
+
 ports:
 - value: 8080
 
diff --git a/s2i/kogito-springboot-ubi8-s2i-overrides.yaml b/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
index 7d4c2279e24..371e0f73561 100644
--- a/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
@@ -11,6 +11,11 @@ labels:
 - name: "io.openshift.tags"
   value: "builder,kogito,springboot"
 
+envs:
+- name: JAVA_OPTIONS
+  example: "-Ddebug=true"
+  description: JVM options passed to the Java command.
+
 modules:
   install:
   - name: install-rpm-dependencies
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
index d20b1c66280..1eeb6a2a41f 100755
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
@@ -6,5 +6,5 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec java -jar -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 $KOGITO_HOME/bin/*runner.jar
+exec java ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
 
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
index 87527257ce0..828fb7a6a45 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
@@ -6,4 +6,4 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
\ No newline at end of file
+exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
index ac5c8f86052..80dfe5bd61e 100755
--- a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
@@ -6,5 +6,5 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec $KOGITO_HOME/bin/*-runner -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/bin
+exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/bin
 
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run
index f2bc44477fc..55fda45ca55 100755
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run
@@ -6,4 +6,4 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec java -jar $KOGITO_HOME/bin/*.jar
+exec java ${JAVA_OPTIONS} -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
diff --git a/s2i/modules/kogito-springboot-ubi8/s2i/bin/run b/s2i/modules/kogito-springboot-ubi8/s2i/bin/run
index 7c60009add3..db0431d6def 100755
--- a/s2i/modules/kogito-springboot-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-springboot-ubi8/s2i/bin/run
@@ -6,4 +6,4 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec java -jar -Dserver.port=8080 $KOGITO_HOME/bin/*.jar
+exec java ${JAVA_OPTIONS} -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index d324dd683d1..d22c8b14071 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -14,8 +14,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable | value |
-      | NATIVE   | false |
+      | variable            | value                     |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
@@ -23,6 +24,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
     And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner.jar should exist
+    And container log should contain DEBUG [io.qua.
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build  and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index d875182f7b0..6c130de7dc2 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -4,6 +4,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
     Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable            | value        |
+      | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
@@ -11,6 +13,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | wait                 | 80        |
       | expected_status_code | 204       |
     And file /home/kogito/bin/jbpm-springboot-example-0.4.0.jar should exist
+    And container log should contain DEBUG o.s.boot.SpringApplication.load
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.4.0

From d0f73012a4245cc1b628e6a10357cf8fd4318eec Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 8 Oct 2019 11:56:35 -0300
Subject: [PATCH 050/709] [KOGITO-374] - Update GraalVM to 19.2.0.1 (#48)

---
 s2i/image.yaml                                |  2 +-
 s2i/kogito-imagestream.yaml                   | 36 +++++++++----------
 s2i/kogito-quarkus-ubi8-s2i-overrides.yaml    |  2 +-
 s2i/modules/add-kogito-user/module.yaml       |  2 +-
 s2i/modules/graalvm/19.x/module.yaml          | 16 ++++-----
 .../install-rpm-dependencies/module.yaml      |  2 +-
 s2i/modules/kogito-data-index/module.yaml     |  2 +-
 .../kogito-quarkus-jvm-ubi8/module.yaml       |  2 +-
 .../kogito-quarkus-ubi8-s2i/module.yaml       |  2 +-
 s2i/modules/kogito-quarkus-ubi8/module.yaml   |  2 +-
 .../kogito-springboot-ubi8-s2i/module.yaml    |  2 +-
 .../kogito-springboot-ubi8/module.yaml        |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  |  2 +-
 13 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index a8dd9b5be9e..2e73fa41d5d 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.4.0"
+version: "0.5.0"
 from: "registry.redhat.io/ubi8-minimal:latest"
 
 labels:
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 57c93a0fc60..7d7ad537001 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.4.0'
+    - name: '0.5.0'
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
         tags: builder,runtime,kogito,quarkus
         supports: quarkus
-        version: '0.4.0'
+        version: '0.5.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.4.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.5.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -36,18 +36,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.4.0'
+      - name: '0.5.0'
         annotations:
           description: Runtime image for Kogito based on Quarkus JVM image
           iconClass: icon-jbpm
           tags: builder,runtime,kogito,quarkus,jvm
           supports: quarkus
-          version: '0.4.0'
+          version: '0.5.0'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.4.0
+          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.5.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -57,18 +57,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.4.0'
+    - name: '0.5.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,quarkus
         supports: quarkus
-        version: '0.4.0'
+        version: '0.5.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.4.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.5.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -78,18 +78,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.4.0'
+    - name: '0.5.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,runtime,kogito,springboot
         supports: springboot
-        version: '0.4.0'
+        version: '0.5.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8:0.4.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8:0.5.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -99,18 +99,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.4.0'
+    - name: '0.5.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,springboot
         supports: springboot
-        version: '0.4.0'
+        version: '0.5.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.4.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.5.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -120,14 +120,14 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.4.0'
+    - name: '0.5.0'
       annotations:
         description: Runtime image for the Kogito Data Index Service
         iconClass: icon-jbpm
         tags: kogito,data-index
-        version: '0.4.0'
+        version: '0.5.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-data-index:0.4.0
\ No newline at end of file
+        name: quay.io/kiegroup/kogito-data-index:0.5.0
\ No newline at end of file
diff --git a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
index b8d6115f7ba..dee7d71ac36 100644
--- a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
@@ -24,7 +24,7 @@ modules:
   - name: install-rpm-dependencies
   - name: add-kogito-user
   - name: graalvm
-    version: "19.1.1"
+    version: "19.2.0.1"
   - name: maven
     version: "3.6.0"
   - name: kogito-quarkus-ubi8-s2i
diff --git a/s2i/modules/add-kogito-user/module.yaml b/s2i/modules/add-kogito-user/module.yaml
index e466877cfc4..86c37c812a6 100644
--- a/s2i/modules/add-kogito-user/module.yaml
+++ b/s2i/modules/add-kogito-user/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.4.0"
+version: "0.5.0"
 name: add-kogito-user
 execute:
 - script: add-user
diff --git a/s2i/modules/graalvm/19.x/module.yaml b/s2i/modules/graalvm/19.x/module.yaml
index ed389260edd..18a4614aceb 100644
--- a/s2i/modules/graalvm/19.x/module.yaml
+++ b/s2i/modules/graalvm/19.x/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: graalvm
-version: "19.1.1"
+version: "19.2.0.1"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,15 +9,15 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "19.1.1"
+    value: "19.2.0.1"
 
 artifacts:
-- name: graalvm-ce-linux-amd64-19.1.1.tar.gz
-  url: https://github.com/oracle/graal/releases/download/vm-19.1.1/graalvm-ce-linux-amd64-19.1.1.tar.gz
-  md5: d3dd24358dc495f83df5cdd2c46bd876
-- name: native-image-installable-svm-linux-amd64-19.1.1.jar
-  url: https://github.com/oracle/graal/releases/download/vm-19.1.1/native-image-installable-svm-linux-amd64-19.1.1.jar
-  md5: 69bf7407dc5115e557901444b10ad03a
+- name: graalvm-ce-linux-amd64-19.2.0.1.tar.gz
+  url: https://github.com/oracle/graal/releases/download/vm-19.2.0.1/graalvm-ce-linux-amd64-19.2.0.1.tar.gz
+  md5: 2569d33794ce431009feae1e36b8d75d
+- name: native-image-installable-svm-linux-amd64-19.2.0.1.jar
+  url: https://github.com/oracle/graal/releases/download/vm-19.2.0.1/native-image-installable-svm-linux-amd64-19.2.0.1.jar
+  md5: bc991b312710656397c4b42c5df44dbc
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/install-rpm-dependencies/module.yaml b/s2i/modules/install-rpm-dependencies/module.yaml
index 7fd1d2b9699..9acafe69049 100644
--- a/s2i/modules/install-rpm-dependencies/module.yaml
+++ b/s2i/modules/install-rpm-dependencies/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.4.0"
+version: "0.5.0"
 name: install-rpm-dependencies
 
 execute:
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index 5bd8cdb5b70..a9291254574 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: kogito-data-index
-version: "0.4.0"
+version: "0.5.0"
 
 artifacts:
 - name: data-index-service-0.4.0-runner.jar
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml b/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
index eff45d01219..49ffb938418 100644
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.4.0"
+version: "0.5.0"
 name: kogito-quarkus-jvm-ubi8
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
index 3f825518f47..9b14ce19a3f 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.4.0"
+version: "0.5.0"
 name: kogito-quarkus-ubi8-s2i
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-quarkus-ubi8/module.yaml b/s2i/modules/kogito-quarkus-ubi8/module.yaml
index fe8fbf9d99f..054461e4f4e 100644
--- a/s2i/modules/kogito-quarkus-ubi8/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.4.0"
+version: "0.5.0"
 name: kogito-quarkus-ubi8
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
index 21db14216f4..24d4a6656fd 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.4.0"
+version: "0.5.0"
 name: kogito-springboot-ubi8-s2i
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-springboot-ubi8/module.yaml b/s2i/modules/kogito-springboot-ubi8/module.yaml
index 636617a3b7b..abe1c80eba2 100644
--- a/s2i/modules/kogito-springboot-ubi8/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.4.0"
+version: "0.5.0"
 name: kogito-springboot-ubi8
 execute:
   - script: configure
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index d22c8b14071..714d880051e 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -79,6 +79,6 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.0
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.1.1
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.0.1
 
 

From 52739e4c2f780497aabf8f7afa309107ba26fd7b Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 9 Oct 2019 09:28:23 -0300
Subject: [PATCH 051/709] [KOGITO-258] - Create job to execute build and tests
 the Kogito images and a PR is created. (#47)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 Jenkinsfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index d4852ca78f1..7d99821445b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -44,6 +44,19 @@ pipeline {
                     maven.runMavenWithSubmarineSettings('clean install', false)
                 }
             }
+
+        }
+        stage('Build kogito-cloud-s2i') {
+            steps {
+                script {
+                     build job: 'KIE/master/kogito-deploy/kogito-cloud-s2i-images-master',
+                        propagate: true,
+                        parameters: [
+                            string(name: 'mainBranch', value: "$CHANGE_BRANCH"),
+                            string(name: 'ghOrgUnit', value: "$CHANGE_AUTHOR")
+                        ]
+                }
+            }
         }
     }
     post {

From 09909622f857721fe784e3b61ec4092f0a4ec343 Mon Sep 17 00:00:00 2001
From: Duncan Doyle <Duncan.Doyle@gmail.com>
Date: Mon, 14 Oct 2019 16:20:42 +0200
Subject: [PATCH 052/709] Fixed links to README files. (#51)

---
 s2i/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/s2i/README.md b/s2i/README.md
index c2723de55ab..9bbac880366 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -25,7 +25,7 @@ not carry on any of the build tools or artefacts (like local maven repository).
 
 Image location: quay.io/kiegroup/kogito-quarkus-ubi8:latest
 
-For more details have a look at [README.md](kogito-quarkus-ubi8/README.md)
+For more details have a look at [README.md](modules/kogito-quarkus-ubi8/README.md)
 
 ## SpringBoot
 
@@ -36,7 +36,7 @@ with Apache Maven and generate fat jar.
 
 Image location: quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest
 
-For more details have a look at [README.md](kogito-springboot-ubi8-s2i/README.md)
+For more details have a look at [README.md](modules/kogito-springboot-ubi8-s2i/README.md)
 
 ### kogito-springboot-ubi8
 
@@ -47,7 +47,7 @@ not carry on any of the build tools or artefacts (like local maven repository).
 
 Image location: quay.io/kiegroup/kogito-springboot-ubi8:latest
 
-For more details have a look at [README.md](kogito-springboot-ubi8/README.md)
+For more details have a look at [README.md](modules/kogito-springboot-ubi8/README.md)
 
 ## Data Index Service
 

From d2172f5ae2d4aa5e7527126d67f6d9ebd3b2b64f Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 14 Oct 2019 17:10:52 -0300
Subject: [PATCH 053/709] [KOGITO-306] - Limiting GraalVM memory usage on
 Quarkus s2i images builds (#50)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/kogito-quarkus-ubi8-s2i-overrides.yaml    |  1 +
 s2i/kogito-springboot-ubi8-s2i-overrides.yaml |  1 +
 .../graalvm/19.x/added/memory-limit.sh        | 27 +++++++++++++++
 s2i/modules/graalvm/19.x/configure            |  3 ++
 .../added/configure.sh                        |  0
 s2i/modules/kogito-launch/configure           |  8 +++++
 s2i/modules/kogito-launch/module.yaml         |  6 ++++
 .../kogito-quarkus-ubi8-s2i/s2i/bin/assemble  | 14 ++++----
 .../s2i/bin/assemble                          |  4 +--
 s2i/modules/maven/3.6.0/configure             |  2 +-
 s2i/tests/bats/memory-limits.bats             | 33 +++++++++++++++++++
 .../features/kogito-quarkus-ubi8-s2i.feature  | 15 ++++++++-
 12 files changed, 103 insertions(+), 11 deletions(-)
 create mode 100644 s2i/modules/graalvm/19.x/added/memory-limit.sh
 rename s2i/modules/{maven/3.6.0 => kogito-launch}/added/configure.sh (100%)
 create mode 100644 s2i/modules/kogito-launch/configure
 create mode 100644 s2i/modules/kogito-launch/module.yaml
 create mode 100644 s2i/tests/bats/memory-limits.bats

diff --git a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
index dee7d71ac36..d0f389a5ab1 100644
--- a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
@@ -23,6 +23,7 @@ modules:
   install:
   - name: install-rpm-dependencies
   - name: add-kogito-user
+  - name: kogito-launch
   - name: graalvm
     version: "19.2.0.1"
   - name: maven
diff --git a/s2i/kogito-springboot-ubi8-s2i-overrides.yaml b/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
index 371e0f73561..5d6c3637e98 100644
--- a/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
@@ -20,6 +20,7 @@ modules:
   install:
   - name: install-rpm-dependencies
   - name: add-kogito-user
+  - name: kogito-launch
   - name: maven
     version: "3.6.0"
   - name: java-openjdk
diff --git a/s2i/modules/graalvm/19.x/added/memory-limit.sh b/s2i/modules/graalvm/19.x/added/memory-limit.sh
new file mode 100644
index 00000000000..b628ef7beea
--- /dev/null
+++ b/s2i/modules/graalvm/19.x/added/memory-limit.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# Limit memory usage for Graal VM native builds
+# for more info access https://issues.jboss.org/browse/KOGITO-306
+#
+# For now we only limit the memory usage based on the LIMIT_MEMORY env which is set by the operator in bytes.
+# the default value is JVM builds 1Gi and for 4Gi for native builds
+#
+# TODO: rely on cgroups to detect the container limits to define the memory usage based on the total memory available on the container.
+
+# configure the GraalVM build memory usage limit based on the LIMIT_MEMORY env
+# its value must be in binary bytes.
+
+function configure() {
+    # native builds requires at least 1024m (1073741824=1024MB - 1 MB = 2^20 B in base 2)
+    # does not accepts
+    if [[  "${LIMIT_MEMORY}" =~ ^[-+]?[0-9]+{9}$ ]]; then
+        if [ "${LIMIT_MEMORY}" -lt 1073741824 ]; then
+            echo "Provided memory (${LIMIT_MEMORY}) limit is too small, native build will use all available memory"
+        else
+            export KOGITO_OPTS="${KOGITO_OPTS} -Dnative-image.xmx=${LIMIT_MEMORY}"
+        fi
+    else
+        echo "Provided memory (${LIMIT_MEMORY}) limit is not valid, native build will use all available memory"
+    fi
+}
+
diff --git a/s2i/modules/graalvm/19.x/configure b/s2i/modules/graalvm/19.x/configure
index a0195649d02..41ec80bc6fd 100644
--- a/s2i/modules/graalvm/19.x/configure
+++ b/s2i/modules/graalvm/19.x/configure
@@ -2,8 +2,11 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
 
 tar xzf ${SOURCES_DIR}/graalvm-ce-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
 mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
 
+cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
+
 /usr/share/graalvm/bin/gu -L install ${SOURCES_DIR}/native-image-installable-svm-linux-amd64-${GRAALVM_VERSION}.jar
\ No newline at end of file
diff --git a/s2i/modules/maven/3.6.0/added/configure.sh b/s2i/modules/kogito-launch/added/configure.sh
similarity index 100%
rename from s2i/modules/maven/3.6.0/added/configure.sh
rename to s2i/modules/kogito-launch/added/configure.sh
diff --git a/s2i/modules/kogito-launch/configure b/s2i/modules/kogito-launch/configure
new file mode 100644
index 00000000000..606002e0cb6
--- /dev/null
+++ b/s2i/modules/kogito-launch/configure
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+
+mkdir ${KOGITO_HOME}/launch
+cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch
\ No newline at end of file
diff --git a/s2i/modules/kogito-launch/module.yaml b/s2i/modules/kogito-launch/module.yaml
new file mode 100644
index 00000000000..49ae9f59780
--- /dev/null
+++ b/s2i/modules/kogito-launch/module.yaml
@@ -0,0 +1,6 @@
+schema_version: 1
+name: kogito-launch
+version: "0.5.0"
+
+execute:
+  - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
index 3afd7cb44a0..5ab15fbef01 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
@@ -10,10 +10,12 @@
 # Configure maven - for a complete list of
 # supported values, please refer the module.yaml
 # file.
+
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/.m2/configure-maven.sh
+  ${KOGITO_HOME}/launch/configure-maven.sh
+  ${KOGITO_HOME}/launch/memory-limit.sh
 )
-source ${KOGITO_HOME}/.m2/configure.sh
+source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
 # If the 'kogito-quarkus-ubi8-s2i' assemble script is executed with the '-h' flag, print the usage.
@@ -23,7 +25,7 @@ fi
 
 ######################
 # incremental builds
-# import ${KOGITO_HOME}/.m2/configure-maven.sh
+# import ${KOGITO_HOME}/launch/configure-maven.sh
 manage_incremental_build
 
 echo "---> Installing application source..."
@@ -37,7 +39,7 @@ if [ -f "pom.xml" ]; then
     fi
 
     echo "---> Building application from source..."
-    $MAVEN_HOME/bin/mvn clean package ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
+    $MAVEN_HOME/bin/mvn clean package ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
         -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
         -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 else
@@ -61,10 +63,9 @@ else
     mv project/* .
 
     echo "---> Building application from source..."
-    $MAVEN_HOME/bin/mvn clean package ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
+    $MAVEN_HOME/bin/mvn clean package ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
         -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
         -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-
 fi
 
 if [ "${NATIVE^^}" == "FALSE" ]; then
@@ -88,4 +89,3 @@ else
     echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
 fi
 
-
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
index 546a4f57a43..ec786e05cb8 100755
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
@@ -11,9 +11,9 @@
 # supported values, please refer the module.yaml
 # file.
 CONFIGURE_SCRIPTS=(
-    ${KOGITO_HOME}/.m2/configure-maven.sh
+    ${KOGITO_HOME}/launch/configure-maven.sh
 )
-source ${KOGITO_HOME}/.m2/configure.sh
+source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
 # If the 'kaas-springboot-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
diff --git a/s2i/modules/maven/3.6.0/configure b/s2i/modules/maven/3.6.0/configure
index e130133ac63..5a70a5b1b45 100644
--- a/s2i/modules/maven/3.6.0/configure
+++ b/s2i/modules/maven/3.6.0/configure
@@ -9,4 +9,4 @@ mv /usr/share/apache-maven-${MAVEN_VERSION} /usr/share/maven
 
 mkdir ${KOGITO_HOME}/.m2
 cp -v ${SCRIPT_DIR}/maven/* ${KOGITO_HOME}/.m2
-cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/.m2
\ No newline at end of file
+cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
\ No newline at end of file
diff --git a/s2i/tests/bats/memory-limits.bats b/s2i/tests/bats/memory-limits.bats
new file mode 100644
index 00000000000..2ebd0c08dba
--- /dev/null
+++ b/s2i/tests/bats/memory-limits.bats
@@ -0,0 +1,33 @@
+#!/usr/bin/env bats
+
+# imports
+source $BATS_TEST_DIRNAME/../../modules/graalvm/19.x/added/memory-limit.sh
+
+@test "test a valid memory limit value" {
+    export LIMIT_MEMORY="1073741824"
+    local expected=" -Dnative-image.xmx=1073741824"
+    configure
+    echo "Expected: ${expected}"
+    echo "Result: ${KOGITO_OPTS}"
+    [ "${expected}" = "${KOGITO_OPTS}" ]
+}
+
+
+@test "test a small memory limit value" {
+    export LIMIT_MEMORY="1073741600"
+    local expected="Provided memory (1073741600) limit is too small, native build will use all available memory"
+    local result=$(configure)
+    echo "Expected: ${expected}"
+    echo "Result: ${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+
+@test "test a invalid memory limit value" {
+    export LIMIT_MEMORY="1024m"
+    local expected="Provided memory (1024m) limit is not valid, native build will use all available memory"
+    local result=$(configure)
+    echo "Expected: ${expected}"
+    echo "Result: ${result}"
+    [ "${expected}" = "${result}" ]
+}
\ No newline at end of file
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 714d880051e..c44cd38a988 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -27,7 +27,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
-  Scenario: Verify if the s2i build is finished as expected performing a non native build  and if it is listening on the expected port
+  Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
@@ -58,6 +58,19 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
 
+  Scenario: Verify if the memory limit is correctly applied
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable       | value       |
+      | LIMIT_MEMORY   | 2147483648  |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | wait            | 80                       |
+      | expected_phrase | Mario is older than Mark |
+    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner should exist
+    And s2i build log should contain -J-Xmx2147483648
+
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.4.0

From 0905e4e15473a7000c04551dc099d6833016769b Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 14 Oct 2019 22:32:58 -0300
Subject: [PATCH 054/709] [KOGITO-413] -bump kogito images version and publish
 it on quay.io (#53)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/modules/kogito-data-index/module.yaml     |  6 ++---
 .../features/kogito-quarkus-index.feature     | 11 ++++-----
 .../features/kogito-quarkus-ubi8-s2i.feature  | 24 +++++++++----------
 .../kogito-springboot-ubi8-s2i.feature        | 10 ++++----
 s2i/tests/test-apps/clone-repo.sh             |  2 +-
 5 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index a9291254574..99652259c0e 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -3,9 +3,9 @@ name: kogito-data-index
 version: "0.5.0"
 
 artifacts:
-- name: data-index-service-0.4.0-runner.jar
-  url: https://repo.maven.apache.org/maven2/org/kie/kogito/data-index-service/0.4.0/data-index-service-0.4.0-runner.jar
-  md5: f13b55e7b9e1dc3f8ee106bf4d655e51
+- name: data-index-service-0.5.0-runner.jar
+  url: https://repo.maven.apache.org/maven2/org/kie/kogito/data-index-service/0.5.0/data-index-service-0.5.0-runner.jar
+  md5: 1e71c52ffe16ad07481c790d80609e58
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/tests/features/kogito-quarkus-index.feature b/s2i/tests/features/kogito-quarkus-index.feature
index a250c2ab6bf..482eefea7c0 100644
--- a/s2i/tests/features/kogito-quarkus-index.feature
+++ b/s2i/tests/features/kogito-quarkus-index.feature
@@ -14,14 +14,13 @@ Feature: Kogito-quarkus-ubi8 feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.4.0-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.5.0-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain Listening on: http://0.0.0.0:8180
-    And container log should contain infinispan_useauth = false
+    Then container log should contain infinispan_useauth = false
 
   Scenario: verify if auth is correctly set
     When container is started with env
@@ -30,8 +29,7 @@ Feature: Kogito-quarkus-ubi8 feature.
       | INFINISPAN_USEAUTH  | true        |
       | INFINISPAN_USERNAME | IamNotExist |
       | INFINISPAN_PASSWORD | hard2guess  |
-    Then container log should contain Listening on: http://0.0.0.0:8180
-    And container log should contain infinispan_useauth = true
+    Then container log should contain infinispan_useauth = true
     And container log should contain infinispan_password = hard2guess
     And container log should contain infinispan_username = IamNotExist
 
@@ -44,8 +42,7 @@ Feature: Kogito-quarkus-ubi8 feature.
       | INFINISPAN_PASSWORD      | hard2guess  |
       | INFINISPAN_AUTHREALM     | SecretRealm |
       | INFINISPAN_SASLMECHANISM | COOLGSSAPI  |
-    Then container log should contain Listening on: http://0.0.0.0:8180
-    And container log should contain infinispan_useauth = true
+    Then container log should contain infinispan_useauth = true
     And container log should contain infinispan_password = hard2guess
     And container log should contain infinispan_username = IamNotExist
     And container log should contain infinispan_authrealm = SecretRealm
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index c44cd38a988..e19f699b106 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -3,17 +3,17 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -23,12 +23,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -37,20 +37,20 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.4.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.0
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
@@ -59,7 +59,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | Mario is older than Mark |
 
   Scenario: Verify if the memory limit is correctly applied
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value       |
       | LIMIT_MEMORY   | 2147483648  |
     Then check that page is served
@@ -68,12 +68,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.4.0-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner should exist
     And s2i build log should contain -J-Xmx2147483648
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.4.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.0
     Then s2i build log should contain Expanding artifacts from incremental build...
 
   Scenario: verify if all labels are correctly set.
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index 6c130de7dc2..eea3fddefce 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,7 +3,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.4.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -12,23 +12,23 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.4.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.5.0.jar should exist
     And container log should contain DEBUG o.s.boot.SpringApplication.load
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.4.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.0
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.4.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.5.0.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.4.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.0
     Then s2i build log should contain Expanding artifacts from incremental build...
 
 
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index 02e27fc6698..3e644939235 100644
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -11,7 +11,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
 git fetch origin --tags
-git checkout 0.4.0
+git checkout 0.5.0
 cp ${CURRENT_DIR}/application.properties src/main/resources/META-INF/
 git add --all
 git commit -am "test"

From 9da1c0f0aec90dc3feb3c4d9876595955dce79ba Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 21 Oct 2019 14:15:02 +0200
Subject: [PATCH 055/709] Setup Integration Tests for Service Discovery & Work
 Items (#29)

---
 .gitignore                                    |   3 +
 kogito-cloud-services/pom.xml                 |  19 --
 kogito-cloud-tests/.gitignore                 |  33 +++
 kogito-cloud-tests/README.md                  |  21 ++
 kogito-cloud-tests/pom.xml                    | 232 ++++++++++++++++++
 .../workitems/HttpCallsServiceOperations.java | 112 +++++++++
 .../cloud/workitems/OpenshiftOperations.java  | 142 +++++++++++
 .../kogito/cloud/workitems/TestConfig.java    |  68 +++++
 ...ServiceWorkItemHandlerIntegrationTest.java | 170 +++++++++++++
 ...rnetesServiceDiscoveryIntegrationTest.java | 220 +++++++++++++++++
 .../src/test/resources/logback-test.xml       |  14 ++
 .../src/test/resources/services/README.md     |   5 +
 .../.gitignore                                |  32 +++
 .../httpcalls-cloud-workitems-common/pom.xml  |  16 ++
 .../cloud/workitems/httpcalls/HttpCall.java   |  53 ++++
 .../.gitignore                                |  32 +++
 .../pom.xml                                   | 110 +++++++++
 .../httpcalls/HttpCallsEndpoint.java          |  67 +++++
 .../.gitignore                                |  32 +++
 .../pom.xml                                   | 104 ++++++++
 .../httpcalls/HttpCallsApplication.java       |  13 +
 .../httpcalls/HttpCallsEndpoint.java          |  68 +++++
 .../services/persons-crud-service/.gitignore  |  32 +++
 .../services/persons-crud-service/pom.xml     |  82 +++++++
 .../org/kie/kogito/cloud/persons/Person.java  |  39 +++
 .../kogito/cloud/persons/PersonEndpoint.java  |  83 +++++++
 pom.xml                                       |  23 +-
 27 files changed, 1804 insertions(+), 21 deletions(-)
 create mode 100644 kogito-cloud-tests/.gitignore
 create mode 100644 kogito-cloud-tests/README.md
 create mode 100644 kogito-cloud-tests/pom.xml
 create mode 100644 kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/HttpCallsServiceOperations.java
 create mode 100644 kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/OpenshiftOperations.java
 create mode 100644 kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/TestConfig.java
 create mode 100644 kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerIntegrationTest.java
 create mode 100644 kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryIntegrationTest.java
 create mode 100644 kogito-cloud-tests/src/test/resources/logback-test.xml
 create mode 100644 kogito-cloud-tests/src/test/resources/services/README.md
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/.gitignore
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/pom.xml
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCall.java
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/.gitignore
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/pom.xml
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/.gitignore
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/pom.xml
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsApplication.java
 create mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
 create mode 100644 kogito-cloud-tests/src/test/resources/services/persons-crud-service/.gitignore
 create mode 100644 kogito-cloud-tests/src/test/resources/services/persons-crud-service/pom.xml
 create mode 100644 kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/Person.java
 create mode 100644 kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/PersonEndpoint.java

diff --git a/.gitignore b/.gitignore
index 9e3cd0af4f4..625fb9452dd 100755
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ target/
 # files used for external db testing
 jdbc_driver.jar
 db-settings.xml
+
+# integration test properties file
+test.properties
diff --git a/kogito-cloud-services/pom.xml b/kogito-cloud-services/pom.xml
index d9c5650d0c3..fc39320db6c 100644
--- a/kogito-cloud-services/pom.xml
+++ b/kogito-cloud-services/pom.xml
@@ -16,23 +16,4 @@
     <module>kogito-cloud-workitems</module>
     <module>kogito-cloud-kubernetes-client</module>
   </modules>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-deps-bom</artifactId>
-        <version>${version.org.kie.kogito}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-bom</artifactId>
-        <version>${version.org.kie.kogito}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
 </project>
diff --git a/kogito-cloud-tests/.gitignore b/kogito-cloud-tests/.gitignore
new file mode 100644
index 00000000000..67f288fc0f4
--- /dev/null
+++ b/kogito-cloud-tests/.gitignore
@@ -0,0 +1,33 @@
+bin/
+/target
+/local
+tmp/
+
+# Eclipse, Netbeans and IntelliJ files
+/.*
+!.gitignore
+/nbproject
+/*.ipr
+/*.iws
+/*.iml
+
+# Repository wide ignore mac DS_Store files
+.DS_Store
+
+# Original jbpm ignores
+*~
+
+# Test info
+/settings*.xml
+/lib-jdbc/
+*.db
+*.tlog
+
+# modules that don't exist in this branch
+/jbpm-human-task-war/
+/jbpm-bam/
+/jbpm-gwt/
+
+# files used for external db testing
+jdbc_driver.jar
+db-settings.xml
diff --git a/kogito-cloud-tests/README.md b/kogito-cloud-tests/README.md
new file mode 100644
index 00000000000..18e7a44b011
--- /dev/null
+++ b/kogito-cloud-tests/README.md
@@ -0,0 +1,21 @@
+# How to execute test
+
+The integration tests are bound to Failsafe plugin. They can be executed as part of the build by running `mvn clean install -Popenshift`.
+Another way is to run the tests using IDE as usual JUnit test.
+
+Tests are using XTF framework for communication with OpenShift (which is based on Fabric8)
+
+To properly configure OpenShift, user needs to specify these properties:
+* xtf.openshift.url
+* xtf.openshift.admin.username - Username of user with admin rights
+* xtf.openshift.admin.password
+* xtf.openshift.master.username - Username for user without admin rights (can be used admin user from above)
+* xtf.openshift.master.password
+* xtf.openshift.binary.path - Path to OC binary client (test/framework will be refactored in future to get rid of this)
+* image.kogito.quarkus.builder.s2i - Tag for S2I Quarkus image, for example built from https://github.com/kiegroup/kogito-cloud/tree/master/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
+* image.kogito.quarkus.runtime - Tag for Quarkus runtime image, for example built from https://github.com/kiegroup/kogito-cloud/tree/master/s2i/kogito-quarkus-ubi8-overrides.yaml
+* image.kogito.springboot.builder.s2i - Tag for S2I image, for example buil from https://github.com/kiegroup/kogito-cloud/tree/master/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
+* image.kogito.springboot.runtime - Tag for runtime image, for example built from https://github.com/kiegroup/kogito-cloud/tree/master/s2i/kogito-springboot-ubi8-overrides.yaml
+* maven.mirror.url - URL for Maven mirror. This mirror is used in S2I build.
+
+These properties need to be set as system property or they can be placed in test.properties file (with appropriate values). test.properties file can be placed next to pom.xml of the parent directory. It is added to .gitignore.
diff --git a/kogito-cloud-tests/pom.xml b/kogito-cloud-tests/pom.xml
new file mode 100644
index 00000000000..a6afe3c54dd
--- /dev/null
+++ b/kogito-cloud-tests/pom.xml
@@ -0,0 +1,232 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.kie.kogito</groupId>
+    <artifactId>kogito-cloud</artifactId>
+    <version>8.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>kogito-cloud-tests</artifactId>
+  <name>Kogito Cloud Integration</name>
+  <description>Kogito Cloud Integration Tests</description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <!-- Skip tests by default. -->
+    <skipITs>true</skipITs>
+
+    <!-- used by test services -->
+    <cxf.version>3.2.6</cxf.version>
+    <springboot.version>2.1.8.RELEASE</springboot.version>
+
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-cloud-workitems</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- XTF dependencies. -->
+    <dependency>
+      <groupId>cz.xtf</groupId>
+      <artifactId>core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>cz.xtf</groupId>
+      <artifactId>builder</artifactId>
+    </dependency>
+
+    <!-- Logging -->
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- Fabric8 client used exclusively for tests purposes only -->
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-server-mock</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <id>bintray-xtf-cz-xtf</id>
+      <name>Bintray XTF</name>
+      <url>https://dl.bintray.com/xtf-cz/xtf</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>oss-jfrog-snapshots</id>
+      <name>oss-jfrog-artifactory-snapshots</name>
+      <url>https://oss.jfrog.org/artifactory/oss-snapshot-local</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
+  <profiles>
+    <profile>
+      <id>openshift</id>
+      <properties>
+        <skipITs>false</skipITs>
+      </properties>
+    </profile>
+  </profiles>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <!-- XTF use tmp folder as temp folder, need to be deleted too when 
+          rerunning tests. -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <configuration>
+            <filesets>
+              <fileset>
+                <directory>${project.basedir}/tmp</directory>
+              </fileset>
+            </filesets>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <executions>
+            <execution>
+              <!-- Copy source code from libraries to be tested into the 
+                test service. we need to run the code in a container and code is deployed 
+                via S2I. Also in the specified project, libraries' dependencies are directly 
+                mentioned into the native profile in order for the whole to be correctly 
+                compiled -->
+              <id>quarkus-copy-deps-libs-classes</id>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>copy-resources</goal>
+              </goals>
+              <configuration>
+                <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-quarkus-service/src/main/java</outputDirectory>
+                <overwrite>true</overwrite>
+                <resources>
+                  <resource>
+                    <directory>${project.basedir}/../kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java</directory>
+                  </resource>
+                  <resource>
+                    <directory>${project.basedir}/../kogito-cloud-services/kogito-cloud-workitems/src/main/java</directory>
+                  </resource>
+                </resources>
+              </configuration>
+            </execution>
+            <execution>
+              <!-- Copy source code from libraries to be tested into the 
+                test service. we need to run the code in a container and code is deployed 
+                via S2I. Also in the specified project, libraries' dependencies are directly 
+                mentioned into the native profile in order for the whole to be correctly 
+                compiled -->
+              <id>springboot-copy-deps-libs-classes</id>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>copy-resources</goal>
+              </goals>
+              <configuration>
+                <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-springboot-service/src/main/java</outputDirectory>
+                <overwrite>true</overwrite>
+                <resources>
+                  <resource>
+                    <directory>${project.basedir}/../kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java</directory>
+                  </resource>
+                  <resource>
+                    <directory>${project.basedir}/../kogito-cloud-services/kogito-cloud-workitems/src/main/java</directory>
+                  </resource>
+                </resources>
+              </configuration>
+            </execution>
+            <execution>
+              <id>copy-test-resources</id>
+              <phase>generate-test-resources</phase>
+              <goals>
+                <goal>testResources</goal>
+              </goals>
+              <configuration>
+                <resources>
+                  <testResource>
+                    <directory>src/test/resources</directory>
+                    <excludes>
+                      <exclude>**/target/</exclude>
+                    </excludes>
+                    <filtering>true</filtering>
+                  </testResource>
+                </resources>
+                <escapeString>\</escapeString>
+              </configuration>
+            </execution>
+            <execution>
+              <id>quarkus-merge-common-test-resources</id>
+              <phase>generate-test-resources</phase>
+              <goals>
+                <goal>copy-resources</goal>
+              </goals>
+              <configuration>
+                <overwrite>true</overwrite>
+                <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-quarkus-service/src/main/java</outputDirectory>
+                <resources>
+                  <resource>
+                    <directory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-common/src/main/java</directory>
+                  </resource>
+                </resources>
+              </configuration>
+            </execution>
+            <execution>
+              <id>springboot-merge-common-test-resources</id>
+              <phase>generate-test-resources</phase>
+              <goals>
+                <goal>copy-resources</goal>
+              </goals>
+              <configuration>
+                <overwrite>true</overwrite>
+                <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-springboot-service/src/main/java</outputDirectory>
+                <resources>
+                  <resource>
+                    <directory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-common/src/main/java</directory>
+                  </resource>
+                </resources>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+
+</project>
diff --git a/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/HttpCallsServiceOperations.java b/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/HttpCallsServiceOperations.java
new file mode 100644
index 00000000000..615aa5f4a9c
--- /dev/null
+++ b/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/HttpCallsServiceOperations.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * 
+ * Licensed 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.
+ */
+package org.kie.kogito.cloud.workitems;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Request.Builder;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HttpCallsServiceOperations {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(HttpCallsServiceOperations.class);
+
+    private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+
+    private String url;
+
+    private ObjectMapper mapper;
+    private OkHttpClient httpClient;
+
+    public HttpCallsServiceOperations(String serviceBaseUrl) {
+        // Setup full url to crud service
+        StringBuilder sb = new StringBuilder(serviceBaseUrl);
+        sb.append("/");
+        sb.append("httpcall");
+        url = sb.toString();
+        LOGGER.info("Got URL {}", url);
+
+        mapper = new ObjectMapper();
+        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
+
+        httpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
+    }
+
+    @SuppressWarnings("unchecked")
+    public Map<String, Object> call(String service, HttpMethods httpMethod, Map<String, Object> serviceCallParams) {
+        RequestBody body = createRequestPayload(service, httpMethod, serviceCallParams);
+        Builder requestBuilder = new Request.Builder().url(url).post(body);
+
+        try (Response response = httpClient.newCall(requestBuilder.build()).execute()) {
+            String payload = response.body().string();
+            LOGGER.debug("Resonse code {} and payload {}", response.code(), payload);
+
+            if (!response.isSuccessful()) {
+                throw new RuntimeException("Unsuccessful response from service " + response.message() + " (code " + response.code() + ")");
+            }
+
+            return mapper.readValue(payload, Map.class);
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public boolean isRouteAvailable() {
+        Builder requestBuilder = new Request.Builder().url(url).method("OPTIONS", null);
+        try (Response response = httpClient.newCall(requestBuilder.build()).execute()) {
+            String payload = response.body().string();
+            LOGGER.debug("Resonse code {} and payload {}", response.code(), payload);
+            return response.isSuccessful();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private RequestBody createRequestPayload(String service, HttpMethods httpMethod, Map<String, Object> serviceCallParams) {
+        Map<String, Object> data = new HashMap<>();
+        data.put("httpMethod", httpMethod.toString().toUpperCase());
+        data.put("service", service);
+        data.put("data", serviceCallParams);
+
+        try {
+            String json = mapper.writeValueAsString(data);
+            LOGGER.debug("Sending body {}", json);
+            RequestBody body = RequestBody.create(JSON, json);
+
+            return body;
+        } catch (Exception e) {
+            throw new RuntimeException("Unexpected error when producing request payload", e);
+        }
+    }
+}
diff --git a/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/OpenshiftOperations.java b/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/OpenshiftOperations.java
new file mode 100644
index 00000000000..2c66d8d04c3
--- /dev/null
+++ b/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/OpenshiftOperations.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * 
+ * Licensed 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.
+ */
+package org.kie.kogito.cloud.workitems;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BooleanSupplier;
+import java.util.stream.Collectors;
+
+import cz.xtf.core.openshift.OpenShift;
+import cz.xtf.core.openshift.OpenShiftBinary;
+import cz.xtf.core.openshift.OpenShifts;
+import cz.xtf.core.waiting.SimpleWaiter;
+import io.fabric8.openshift.api.model.Route;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class OpenshiftOperations {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenshiftOperations.class);
+
+    private OpenShift openShift;
+    private OpenShiftBinary masterBinary;
+
+    public void init(String projectName) {
+        openShift = OpenShifts.master();
+        if (openShift.getProject(projectName) == null) {
+            LOGGER.info("Create project {}", projectName);
+            openShift.createProjectRequest(projectName);
+            waitFor(() -> openShift.getProject(projectName) != null, "Waiting for project to be created.", 5);
+        }
+        openShift = OpenShifts.master(projectName);
+        openShift.addRoleToServiceAccount("view", "default");
+        masterBinary = OpenShifts.masterBinary(openShift.getNamespace());
+    }
+
+    public void delete() {
+        openShift.deleteProject();
+    }
+
+    public OpenShift getOpenshift() {
+        return openShift;
+    }
+
+    public String startS2IBinaryBuild(String builderImageTag, String buildName, String projectDir) {
+        List<String> command = new ArrayList<>(Arrays.asList("new-build", builderImageTag, "--binary=true", "--name=" + buildName));
+        TestConfig.getMavenMirrorUrl().ifPresent(url -> {
+            command.add("-e");
+            command.add("MAVEN_MIRROR_URL=" + url);
+        });
+
+        launchBinaryCommand(command);
+        launchBinaryCommand(Arrays.asList("start-build", buildName, "--from-dir", projectDir));
+        return buildName;
+    }
+
+    public void startRuntimeBuild(String builderImageTag, String buildName, String sourceImageName) {
+        launchBinaryCommand(Arrays.asList("new-build", "--name=" + buildName,
+                                          "--source-image=" + sourceImageName,
+                                          "--source-image-path=/home/kogito/bin:.",
+                                          "--docker-image=" + builderImageTag));
+    }
+
+    public void startApp(String imageName, Map<String, String> envVariables, Map<String, String> serviceLabels) {
+        List<String> command = new ArrayList<>(Arrays.asList("new-app", imageName + ":latest"));
+        if (!envVariables.isEmpty()) {
+            command.add("-e");
+            command.add(getParameterKeyValueString(envVariables));
+        }
+        if (!serviceLabels.isEmpty()) {
+            command.add("-l");
+            command.add(getParameterKeyValueString(serviceLabels));
+        }
+        launchBinaryCommand(command);
+    }
+
+    public void waitForBuildCompleted(String buildName, long timeoutInMinutes) {
+        // Small bug with openshift.waiters().hasBuildCompleted(buildName) in case build has not started yet ...
+        openShift.waiters().isLatestBuildPresent(buildName).timeout(TimeUnit.MINUTES, 5L).waitFor();
+        openShift.waiters().hasBuildCompleted(buildName).timeout(TimeUnit.MINUTES, timeoutInMinutes).waitFor();
+    }
+
+    public void waitFor(BooleanSupplier supplier, String reason, long timeoutInMinutes) {
+        new SimpleWaiter(supplier).reason(reason).timeout(TimeUnit.MINUTES, timeoutInMinutes).waitFor();
+    }
+
+    public void launchBinaryCommand(List<String> command) {
+        LOGGER.debug("{}", command);
+        masterBinary.execute(command.toArray(new String[0]));
+    }
+
+    public void waitForPod(String deploymentName, int nbInstances, long timeoutInMinutes) {
+        openShift.waiters().areExactlyNPodsRunning(nbInstances, deploymentName).timeout(TimeUnit.MINUTES, timeoutInMinutes).waitFor();
+    }
+
+    public void waitForService(String serviceName, long timeoutInMinutes) {
+        waitFor(() -> openShift.getService(serviceName) != null, "Waiting for service " + serviceName, timeoutInMinutes);
+    }
+
+    public void exposeService(String serviceName) {
+        masterBinary.execute("expose", "svc/" + serviceName);
+    }
+
+    public String getHttpRoute(String serviceName) {
+        List<Route> routes = openShift.getRoutes();
+        Optional<Route> route = routes.stream()
+                .filter(n -> n.getSpec().getTls() == null)
+                .filter(n -> n.getSpec().getTo().getName().equals(serviceName))
+                .findAny();
+        String routeHost = null;
+        if (route.isPresent()) {
+            routeHost = route.get().getSpec().getHost();
+        } else {
+            String routeNames = routes.stream()
+                    .map(n -> n.getMetadata().getName())
+                    .collect(Collectors.joining(", "));
+            throw new RuntimeException("HTTP route leading to service " + serviceName + " not found. Available routes " + routeNames);
+        }
+        return "http://" + routeHost + ":80";
+    }
+
+    private static String getParameterKeyValueString(Map<String, String> parameters) {
+        return parameters.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining(","));
+    }
+}
diff --git a/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/TestConfig.java b/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/TestConfig.java
new file mode 100644
index 00000000000..c98bdca8528
--- /dev/null
+++ b/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/TestConfig.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+
+package org.kie.kogito.cloud.workitems;
+
+import java.util.Optional;
+
+import cz.xtf.core.config.XTFConfig;
+
+public class TestConfig {
+
+    private TestConfig() {}
+
+    private static final String IMAGE_KAAS_QUARKUS_BUILDER_S2I = "image.kaas.quarkus.builder.s2i";
+    private static final String IMAGE_KAAS_QUARKUS_RUNTIME = "image.kaas.quarkus.runtime";
+    private static final String IMAGE_KAAS_SPRINGBOOT_BUILDER_S2I = "image.kaas.springboot.builder.s2i";
+    private static final String IMAGE_KAAS_SPRINGBOOT_RUNTIME = "image.kaas.springboot.runtime";
+
+    private static final String MAVEN_MIRROR_URL = "maven.mirror.url";
+
+    public static String getKaasS2iQuarkusBuilderImage() {
+        return getMandatoryProperty(IMAGE_KAAS_QUARKUS_BUILDER_S2I);
+    }
+
+    public static String getKaasQuarkusRuntimeImage() {
+        return getMandatoryProperty(IMAGE_KAAS_QUARKUS_RUNTIME);
+    }
+
+    public static String getKaasS2iSpringBootBuilderImage() {
+        return getMandatoryProperty(IMAGE_KAAS_SPRINGBOOT_BUILDER_S2I);
+    }
+
+    public static String getKaasSpringBootRuntimeImage() {
+        return getMandatoryProperty(IMAGE_KAAS_SPRINGBOOT_RUNTIME);
+    }
+
+    public static Optional<String> getMavenMirrorUrl() {
+        return getOptionalProperty(MAVEN_MIRROR_URL);
+    }
+
+    private static String getMandatoryProperty(String propertyName) {
+        String propertyValue = XTFConfig.get(propertyName);
+        if (propertyValue == null || propertyValue.isEmpty()) {
+            throw new RuntimeException("Required property with name " + propertyName + " is not set.");
+        }
+        return propertyValue;
+    }
+
+    private static Optional<String> getOptionalProperty(String propertyName) {
+        String propertyValue = XTFConfig.get(propertyName);
+        if (propertyValue == null || propertyValue.isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(propertyValue);
+    }
+}
diff --git a/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerIntegrationTest.java b/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerIntegrationTest.java
new file mode 100644
index 00000000000..a82badba300
--- /dev/null
+++ b/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerIntegrationTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * 
+ * Licensed 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.
+ */
+package org.kie.kogito.cloud.workitems;
+
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.RandomStringUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DiscoveredServiceWorkItemHandlerIntegrationTest {
+
+    private static final String personsCrudServiceResourcePath = "/services/persons-crud-service";
+    private static final String httpCallsQuarkusServiceResourcePath = "/services/httpcalls-cloud-workitems-quarkus-service";
+    private static final String httpCallsSpringbootServiceResourcePath = "/services/httpcalls-cloud-workitems-springboot-service";
+
+    private static final String DEFAULT_NAME = "DEFAULT_NAME";
+    private static final String NEW_NAME = "NEW_NAME";
+
+    private static final String personsSvcName = "persons-service";
+    private static final String personsSvcBuilderName = personsSvcName + "-builder";
+    private static final String httpCallsQuarkusSvcName = "httpcalls-service-quarkus";
+    private static final String httpCallsQuarkusSvcBuilderName = httpCallsQuarkusSvcName + "-builder";
+    private static final String httpCallsSpringbootSvcName = "httpcalls-service-springboot";
+    private static final String httpCallsSpringbootSvcBuilderName = httpCallsSpringbootSvcName + "-builder";
+
+    private static OpenshiftOperations openshiftOps;
+    private static HttpCallsServiceOperations httpCallsQuarkusServiceOps;
+    private static HttpCallsServiceOperations httpCallsSpringbootServiceOps;
+
+    @BeforeAll
+    public static void setupProject() throws UnsupportedEncodingException, InterruptedException {
+        String projectName = "kogito-workitems-" + getRandom();
+        openshiftOps = new OpenshiftOperations();
+        openshiftOps.init(projectName);
+        buildAndLoadServices();
+        httpCallsQuarkusServiceOps = new HttpCallsServiceOperations(openshiftOps.getHttpRoute(httpCallsQuarkusSvcName));
+        httpCallsSpringbootServiceOps = new HttpCallsServiceOperations(openshiftOps.getHttpRoute(httpCallsSpringbootSvcName));
+
+        // Wait for httproute to be available
+        openshiftOps.waitFor(() -> httpCallsQuarkusServiceOps.isRouteAvailable(), "Waiting for route to be available for service " + httpCallsQuarkusSvcName, 5L);
+        openshiftOps.waitFor(() -> httpCallsSpringbootServiceOps.isRouteAvailable(), "Waiting for route to be available for service " + httpCallsSpringbootSvcName, 5L);
+    }
+
+    private static void buildAndLoadServices() {
+        // Create Crud & httpcalls builder builds
+        openshiftOps.startS2IBinaryBuild(TestConfig.getKaasS2iQuarkusBuilderImage(), personsSvcBuilderName, getResource(personsCrudServiceResourcePath));
+        openshiftOps.startS2IBinaryBuild(TestConfig.getKaasS2iQuarkusBuilderImage(), httpCallsQuarkusSvcBuilderName, getResource(httpCallsQuarkusServiceResourcePath));
+        openshiftOps.startS2IBinaryBuild(TestConfig.getKaasS2iSpringBootBuilderImage(), httpCallsSpringbootSvcBuilderName, getResource(httpCallsSpringbootServiceResourcePath));
+        openshiftOps.waitForBuildCompleted(personsSvcBuilderName, 20L);
+        openshiftOps.waitForBuildCompleted(httpCallsQuarkusSvcBuilderName, 20L);
+        openshiftOps.waitForBuildCompleted(httpCallsSpringbootSvcBuilderName, 20L);
+
+        // Build final httpcalls image
+        openshiftOps.startRuntimeBuild(TestConfig.getKaasQuarkusRuntimeImage(), personsSvcName, personsSvcBuilderName);
+        openshiftOps.startRuntimeBuild(TestConfig.getKaasQuarkusRuntimeImage(), httpCallsQuarkusSvcName, httpCallsQuarkusSvcBuilderName);
+        openshiftOps.startRuntimeBuild(TestConfig.getKaasSpringBootRuntimeImage(), httpCallsSpringbootSvcName, httpCallsSpringbootSvcBuilderName);
+        openshiftOps.waitForBuildCompleted(personsSvcName, 5L);
+        openshiftOps.waitForBuildCompleted(httpCallsQuarkusSvcName, 5L);
+        openshiftOps.waitForBuildCompleted(httpCallsSpringbootSvcName, 5L);
+
+        Map<String, String> svcLabels = new HashMap<String, String>();
+        svcLabels.put("persons", "service");
+        openshiftOps.startApp(personsSvcName, new HashMap<>(), svcLabels);
+        Map<String, String> envVariables = new HashMap<String, String>();
+        envVariables.put("NAMESPACE", openshiftOps.getOpenshift().getNamespace());
+        openshiftOps.startApp(httpCallsQuarkusSvcName, envVariables, new HashMap<>());
+        openshiftOps.startApp(httpCallsSpringbootSvcName, envVariables, new HashMap<>());
+        openshiftOps.waitForPod(personsSvcName, 1, 5L);
+        openshiftOps.waitForPod(httpCallsQuarkusSvcName, 1, 5L);
+        openshiftOps.waitForPod(httpCallsSpringbootSvcName, 1, 5L);
+
+        openshiftOps.exposeService(httpCallsQuarkusSvcName);
+        openshiftOps.exposeService(httpCallsSpringbootSvcName);
+        openshiftOps.waitForService(httpCallsQuarkusSvcName, 5L);
+        openshiftOps.waitForService(httpCallsSpringbootSvcName, 5L);
+    }
+
+    @AfterAll
+    private static void removeProject() {
+        openshiftOps.delete();
+    }
+
+    @Test
+    public void testCrudOnPersonsQuarkusService() {
+        launchTestCrudOnService(httpCallsQuarkusServiceOps);
+    }
+
+    @Test
+    public void testCrudOnPersonsSpringbootService() {
+        launchTestCrudOnService(httpCallsSpringbootServiceOps);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void launchTestCrudOnService(HttpCallsServiceOperations httpCallsServiceOperations) {
+        // Create person
+        Map<String, Object> personMap = new HashMap<>();
+        personMap.put("name", DEFAULT_NAME);
+        personMap = httpCallsServiceOperations.call("persons", HttpMethods.POST, personMap);
+        String personId = retrieveId(personMap);
+        assertNotNull(personId);
+        assertEquals(DEFAULT_NAME, retrieveName(personMap));
+
+        // Check person exists
+        personMap = httpCallsServiceOperations.call("persons", HttpMethods.GET, new HashMap<>());
+        List<Map<String, Object>> persons = (List<Map<String, Object>>) personMap.get("persons");
+        personMap = persons.stream()
+                .filter(p -> personId.equals(retrieveId(p)))
+                .findFirst()
+                .get();
+        assertEquals(DEFAULT_NAME, retrieveName(personMap));
+
+        // Update name
+        personMap.put("name", NEW_NAME);
+        personMap = httpCallsServiceOperations.call("persons", HttpMethods.PUT, personMap);
+        assertEquals(personId, retrieveId(personMap));
+        assertEquals(NEW_NAME, retrieveName(personMap));
+
+        // check id exist and its name updated
+        personMap = httpCallsServiceOperations.call("persons", HttpMethods.GET, new HashMap<>());
+        persons = (List<Map<String, Object>>) personMap.get("persons");
+        personMap = persons.stream()
+                .filter(p -> personId.equals(retrieveId(p)))
+                .findFirst()
+                .get();
+        assertEquals(NEW_NAME, retrieveName(personMap));
+
+        // delete person & check it has been removed
+        personMap = httpCallsServiceOperations.call("persons", HttpMethods.DELETE, personMap);
+        personMap = httpCallsServiceOperations.call("persons", HttpMethods.GET, new HashMap<>());
+        persons = (List<Map<String, Object>>) personMap.get("persons");
+        assertEquals(0, persons.size());
+    }
+
+    private static String retrieveId(Map<String, Object> personMap) {
+        return (String) personMap.get("id");
+    }
+
+    private static String retrieveName(Map<String, Object> personMap) {
+        return (String) personMap.get("name");
+    }
+
+    private static String getRandom() {
+        return RandomStringUtils.randomAlphanumeric(4).toLowerCase();
+    }
+
+    private static String getResource(String resourcePath) {
+        return DiscoveredServiceWorkItemHandlerIntegrationTest.class.getResource(resourcePath).getFile();
+    }
+}
diff --git a/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryIntegrationTest.java b/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryIntegrationTest.java
new file mode 100644
index 00000000000..135494e624d
--- /dev/null
+++ b/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryIntegrationTest.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * 
+ * Licensed 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.
+ */
+package org.kie.kogito.cloud.workitems.service.discovery;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import cz.xtf.builder.builders.ServiceBuilder;
+import cz.xtf.core.config.OpenShiftConfig;
+import cz.xtf.core.openshift.OpenShift;
+import cz.xtf.core.openshift.OpenShifts;
+import cz.xtf.core.waiting.SimpleWaiter;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.ConfigBuilder;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
+import org.kie.kogito.cloud.workitems.ServiceInfo;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * 
+ */
+public class KubernetesServiceDiscoveryIntegrationTest {
+
+    private static final String SERVICE1_NAME = "service1";
+    private static final String SERVICE2_NAME = "service2";
+
+    private static final String DEFAULT_LABEL_KEY = "keyLabel1";
+    private static final String DEFAULT_LABEL_VALUE = "valueLabel1";
+
+    private static KubernetesServiceDiscovery kubernetesServiceDiscovery;
+    private static OpenShift openshift;
+
+    private ServiceManager svcManager;
+
+    @BeforeAll
+    public static void setupProject() throws UnsupportedEncodingException {
+        // Create project
+        String projectName = "kogito-discovery-" + RandomStringUtils.randomAlphanumeric(4).toLowerCase();
+        OpenShifts.master().createProjectRequest(projectName);
+        openshift = OpenShifts.master(projectName);
+
+        // give default serviceaccount view rights
+        openshift.addRoleToServiceAccount("view", "default");
+
+        String tokenSecretName = openshift.getServiceAccount("default").getSecrets().stream().map(ObjectReference::getName).filter(secretName -> secretName.contains("token")).findFirst().get();
+        String tokenBase64 = openshift.getSecret(tokenSecretName).getData().get("token");
+        String token = new String(Base64.decodeBase64(tokenBase64), "UTF-8");
+
+        // Setup Kubernetes service discovery  
+        Config config = new ConfigBuilder().withMasterUrl(OpenShiftConfig.url())
+                .withOauthToken(token)
+                .withTrustCerts(true)
+                .build();
+        kubernetesServiceDiscovery = new KubernetesServiceDiscovery(new DefaultKogitoKubeClient().withConfig(new KogitoKubeConfig(new DefaultKubernetesClient(config))));
+    }
+
+    @AfterAll
+    public static void tearDownProject() {
+        openshift.deleteProject();
+    }
+
+    @BeforeEach
+    public void setUp() {
+        svcManager = new ServiceManager(openshift);
+    }
+
+    @AfterEach
+    public void tearDown() {
+        svcManager.clearServices();
+        svcManager = null;
+    }
+
+    @Test
+    public void findSingleEndpoint() {
+        Service service = svcManager.createSimpleService(SERVICE1_NAME, DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
+
+        assertExistingEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
+        assertEndpointUrlWithServices(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE, service);
+    }
+
+    @Test
+    public void findEndpointFrom2ServicesWithSameLabel() {
+        Service service1 = svcManager.createSimpleService(SERVICE1_NAME, DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
+        Service service2 = svcManager.createSimpleService(SERVICE2_NAME, DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
+
+        assertExistingEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
+        assertEndpointUrlWithServices(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE, service1, service2);
+    }
+
+    @Test
+    public void findEndpointFrom2ServicesWithSameLabelButDifferentValues() {
+        String otherLabelValue = "otherLabelValue";
+        Service service1 = svcManager.createSimpleService(SERVICE1_NAME, DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
+        Service service2 = svcManager.createSimpleService(SERVICE2_NAME, DEFAULT_LABEL_KEY, otherLabelValue);
+
+        assertExistingEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
+        assertExistingEndpoint(DEFAULT_LABEL_KEY, otherLabelValue);
+        assertEndpointUrlWithServices(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE, service1);
+        assertEndpointUrlWithServices(DEFAULT_LABEL_KEY, otherLabelValue, service2);
+    }
+
+    @Test
+    public void findEndpointNoServiceDeployed() {
+        assertNoEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
+    }
+
+    @Test
+    public void findEndpointServiceDeployedWithDifferentValue() {
+        String otherLabelValue = "otherLabelValue";
+        svcManager.createSimpleService(SERVICE1_NAME, DEFAULT_LABEL_KEY, otherLabelValue);
+
+        assertNoEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
+    }
+
+    private void assertExistingEndpoint(String label, String value) {
+        Optional<ServiceInfo> optEndpoint = getExistingEndpoint(label, value);
+        assertTrue("No service with label " + label + " and value " + value + " defined", optEndpoint.isPresent());
+    }
+
+    private void assertNoEndpoint(String label, String value) {
+        Optional<ServiceInfo> optEndpoint = getExistingEndpoint(label, value);
+        assertFalse("There should not be any service with label " + label + " and value " + value, optEndpoint.isPresent());
+    }
+
+    private void assertEndpointUrlWithServices(String label, String value, Service... services) {
+        if (services == null || services.length < 1) {
+            throw new RuntimeException("No service given to check with");
+        }
+
+        String endpointUrl = getEndpointUrl(label, value);
+        String errStr = "Endpoint url shoud start with " + Arrays.stream(services).map(this::buildClusterIPUrl).collect(Collectors.joining(" or "));
+        errStr += ". Got: " + endpointUrl;
+        assertTrue(errStr, Arrays.stream(services).map(this::buildClusterIPUrl).anyMatch(endpointUrl::startsWith));
+    }
+
+    private Optional<ServiceInfo> getExistingEndpoint(String label, String value) {
+        return kubernetesServiceDiscovery.findEndpoint(openshift.getNamespace(), label, value);
+    }
+
+    private String getEndpointUrl(String label, String value) {
+        Optional<ServiceInfo> optEndpoint = getExistingEndpoint(label, value);
+        if (optEndpoint.isPresent()) {
+            return optEndpoint.get().getUrl();
+        } else {
+            throw new RuntimeException("No endpoint defined with label " + label + " and value " + value);
+        }
+
+    }
+
+    private String buildClusterIPUrl(Service service) {
+        return "http://" + service.getSpec().getClusterIP() + ":8080";
+    }
+
+    static class ServiceManager {
+
+        private OpenShift openshift;
+        private Set<Service> services = new HashSet<>();
+
+        public ServiceManager(OpenShift openshift) {
+            super();
+            this.openshift = openshift;
+        }
+
+        public Service createSimpleService(String name, String defaultLabelKey, String defaultLabelValue) {
+            Map<String, String> labels = new HashMap<>();
+            labels.put(defaultLabelKey, defaultLabelValue);
+            return createSimpleService(name, labels);
+        }
+
+        public Service createSimpleService(String name, Map<String, String> labels) {
+            ServiceBuilder builder = new ServiceBuilder(name).port(8080);
+            labels.entrySet().forEach(e -> builder.addLabel(e.getKey(), e.getValue()));
+            Service service = openshift.createService(builder.build());
+            services.add(service);
+            return service;
+        }
+
+        public void clearServices() {
+            services.stream().forEach(service -> {
+                String svcName = service.getMetadata().getName();
+                assertTrue("Problem deleting service " + svcName, openshift.deleteService(service));
+                // Be sure service is deleted, to avoid future conflicts
+                assertTrue(new SimpleWaiter(() -> openshift.getService(svcName) == null, TimeUnit.SECONDS, 5, "Wait for service1 to be deleted").waitFor());
+            });
+        }
+    }
+}
diff --git a/kogito-cloud-tests/src/test/resources/logback-test.xml b/kogito-cloud-tests/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..1d010883b43
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/README.md b/kogito-cloud-tests/src/test/resources/services/README.md
new file mode 100644
index 00000000000..1928325c9ee
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/README.md
@@ -0,0 +1,5 @@
+# Test services
+
+If you want to work on those services, you can work with Maven profile `local`.
+
+Please, update the dependencies versions if needed in `local` profile. 
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/.gitignore b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/.gitignore
new file mode 100644
index 00000000000..0d73459cf99
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/.gitignore
@@ -0,0 +1,32 @@
+bin/
+/target
+/local
+
+# Eclipse, Netbeans and IntelliJ files
+/.*
+!.gitignore
+/nbproject
+/*.ipr
+/*.iws
+/*.iml
+
+# Repository wide ignore mac DS_Store files
+.DS_Store
+
+# Original jbpm ignores
+*~
+
+# Test info
+/settings*.xml
+/lib-jdbc/
+*.db
+*.tlog
+
+# modules that don't exist in this branch
+/jbpm-human-task-war/
+/jbpm-bam/
+/jbpm-gwt/
+
+# files used for external db testing
+jdbc_driver.jar
+db-settings.xml
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/pom.xml b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/pom.xml
new file mode 100644
index 00000000000..797737d0893
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.kie.kogito.tests</groupId>
+  <artifactId>httpcalls-cloud-workitems-common</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+</project>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCall.java b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCall.java
new file mode 100644
index 00000000000..424cfebf6f2
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCall.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * 
+ * Licensed 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.
+ */
+package org.kie.kogito.cloud.workitems.httpcalls;
+
+import java.util.Map;
+
+/**
+ * 
+ */
+public class HttpCall {
+
+    private String httpMethod;
+    private String service;
+    private Map<String, Object> data;
+
+    public String getHttpMethod() {
+        return httpMethod;
+    }
+
+    public void setHttpMethod(String httpMethod) {
+        this.httpMethod = httpMethod;
+    }
+
+    public String getService() {
+        return service;
+    }
+
+    public void setService(String service) {
+        this.service = service;
+    }
+
+    public Map<String, Object> getData() {
+        return data;
+    }
+
+    public void setData(Map<String, Object> data) {
+        this.data = data;
+    }
+
+}
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/.gitignore b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/.gitignore
new file mode 100644
index 00000000000..0d73459cf99
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/.gitignore
@@ -0,0 +1,32 @@
+bin/
+/target
+/local
+
+# Eclipse, Netbeans and IntelliJ files
+/.*
+!.gitignore
+/nbproject
+/*.ipr
+/*.iws
+/*.iml
+
+# Repository wide ignore mac DS_Store files
+.DS_Store
+
+# Original jbpm ignores
+*~
+
+# Test info
+/settings*.xml
+/lib-jdbc/
+*.db
+*.tlog
+
+# modules that don't exist in this branch
+/jbpm-human-task-war/
+/jbpm-bam/
+/jbpm-gwt/
+
+# files used for external db testing
+jdbc_driver.jar
+db-settings.xml
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/pom.xml b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/pom.xml
new file mode 100644
index 00000000000..c48a92fcf4f
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.kie.kogito.tests</groupId>
+  <artifactId>httpcalls-cloud-workitems-quarkus-service</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>${version.io.quarkus}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-jsonb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>drools-core</artifactId>
+    </dependency>
+
+    <!-- include dependencies from kogito-cloud-kubernetes-client and kogito-cloud-workitems 
+      projects here as we are copying directly source code for s2i deployments -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.oracle.substratevm</groupId>
+      <artifactId>svm</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-api</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${version.io.quarkus}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-maven-plugin</artifactId>
+            <version>${version.io.quarkus}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>native-image</goal>
+                </goals>
+                <configuration>
+                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
+                  <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
+                  <enableJni>true</enableJni>
+                  <enableAllSecurityServices>true</enableAllSecurityServices>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
new file mode 100644
index 00000000000..e88717be1bb
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * 
+ * Licensed 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.
+ */
+package org.kie.kogito.cloud.workitems.httpcalls;
+
+import java.util.Map;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemManager;
+import org.kie.kogito.cloud.workitems.DiscoveredServiceWorkItemHandler;
+import org.kie.kogito.cloud.workitems.HttpMethods;
+
+@Path("/httpcall")
+public class HttpCallsEndpoint {
+
+    private static final String SERVICE_KEY = "ServiceToCall";
+
+    private String namespace = System.getenv("NAMESPACE");
+
+    DiscoveredServiceWorkItemHandlerImpl workItemHandler = new DiscoveredServiceWorkItemHandlerImpl();
+
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Path("")
+    public Map<String, Object> callServiceForWorkItem(HttpCall httpCallData) {
+        Map<String, Object> params = httpCallData.getData();
+        params.put(SERVICE_KEY, httpCallData.getService());
+
+        return workItemHandler.makeCall(namespace, SERVICE_KEY, HttpMethods.valueOf(httpCallData.getHttpMethod().toUpperCase()), params);
+    }
+
+    static class DiscoveredServiceWorkItemHandlerImpl extends DiscoveredServiceWorkItemHandler {
+
+        @Override
+        public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {}
+
+        @Override
+        public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {}
+
+        public Map<String, Object> makeCall(String namespace, String serviceName, HttpMethods method, Map<String, Object> params) {
+            WorkItem item = new WorkItemImpl();
+            item.getParameters().putAll(params);
+
+            return discoverAndCall(item, namespace, serviceName, method);
+        }
+    }
+}
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/.gitignore b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/.gitignore
new file mode 100644
index 00000000000..0d73459cf99
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/.gitignore
@@ -0,0 +1,32 @@
+bin/
+/target
+/local
+
+# Eclipse, Netbeans and IntelliJ files
+/.*
+!.gitignore
+/nbproject
+/*.ipr
+/*.iws
+/*.iml
+
+# Repository wide ignore mac DS_Store files
+.DS_Store
+
+# Original jbpm ignores
+*~
+
+# Test info
+/settings*.xml
+/lib-jdbc/
+*.db
+*.tlog
+
+# modules that don't exist in this branch
+/jbpm-human-task-war/
+/jbpm-bam/
+/jbpm-gwt/
+
+# files used for external db testing
+jdbc_driver.jar
+db-settings.xml
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/pom.xml b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/pom.xml
new file mode 100644
index 00000000000..ffcd5082762
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.kie.kogito.tests</groupId>
+  <artifactId>httpcalls-cloud-workitems-springboot-service</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${springboot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-deps-bom</artifactId>
+        <version>${version.org.kie.kogito}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-bom</artifactId>
+        <version>${version.org.kie.kogito}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
+      <version>${cxf.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>drools-core</artifactId>
+    </dependency>
+
+    <!-- include dependencies from kogito-cloud-kubernetes-client and kogito-cloud-workitems 
+      projects here as we are copying directly source code for s2i deployments -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.oracle.substratevm</groupId>
+      <artifactId>svm</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-api</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>${springboot.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>${start-class}</mainClass>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsApplication.java b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsApplication.java
new file mode 100644
index 00000000000..7c3defa747f
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsApplication.java
@@ -0,0 +1,13 @@
+package org.kie.kogito.cloud.workitems.httpcalls;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication(scanBasePackages={"org.kie.kogito.**"})
+public class HttpCallsApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(HttpCallsApplication.class, args);
+	}
+
+}
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
new file mode 100644
index 00000000000..d3a12bfc557
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * 
+ * Licensed 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.
+ */
+package org.kie.kogito.cloud.workitems.httpcalls;
+
+import java.util.Map;
+
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemManager;
+import org.kie.kogito.cloud.workitems.DiscoveredServiceWorkItemHandler;
+import org.kie.kogito.cloud.workitems.HttpMethods;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/httpcall")
+public class HttpCallsEndpoint {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(HttpCallsEndpoint.class);
+
+    private static final String SERVICE_KEY = "ServiceToCall";
+
+    private String namespace = System.getenv("NAMESPACE");
+
+    DiscoveredServiceWorkItemHandlerImpl workItemHandler = new DiscoveredServiceWorkItemHandlerImpl();
+
+    @PostMapping("")
+    public Map<String, Object> callServiceForWorkItem(@RequestBody HttpCall httpCallData) {
+        LOGGER.info("Got httpcall data {}", httpCallData);
+        Map<String, Object> params = httpCallData.getData();
+        params.put(SERVICE_KEY, httpCallData.getService());
+
+        return workItemHandler.makeCall(namespace, SERVICE_KEY, HttpMethods.valueOf(httpCallData.getHttpMethod().toUpperCase()), params);
+    }
+
+    static class DiscoveredServiceWorkItemHandlerImpl extends DiscoveredServiceWorkItemHandler {
+
+        @Override
+        public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {}
+
+        @Override
+        public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {}
+
+        public Map<String, Object> makeCall(String namespace, String serviceName, HttpMethods method, Map<String, Object> params) {
+            WorkItem item = new WorkItemImpl();
+            item.getParameters().putAll(params);
+
+            return discoverAndCall(item, namespace, serviceName, method);
+        }
+    }
+}
diff --git a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/.gitignore b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/.gitignore
new file mode 100644
index 00000000000..0d73459cf99
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/.gitignore
@@ -0,0 +1,32 @@
+bin/
+/target
+/local
+
+# Eclipse, Netbeans and IntelliJ files
+/.*
+!.gitignore
+/nbproject
+/*.ipr
+/*.iws
+/*.iml
+
+# Repository wide ignore mac DS_Store files
+.DS_Store
+
+# Original jbpm ignores
+*~
+
+# Test info
+/settings*.xml
+/lib-jdbc/
+*.db
+*.tlog
+
+# modules that don't exist in this branch
+/jbpm-human-task-war/
+/jbpm-bam/
+/jbpm-gwt/
+
+# files used for external db testing
+jdbc_driver.jar
+db-settings.xml
diff --git a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/pom.xml b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/pom.xml
new file mode 100644
index 00000000000..25c80e2c418
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.kie.kogito.tests</groupId>
+  <artifactId>persons-crud-service</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-bom</artifactId>
+        <version>${version.io.quarkus}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-resteasy-jsonb</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${version.io.quarkus}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>native</id>
+      <activation>
+        <property>
+          <name>native</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-maven-plugin</artifactId>
+            <version>${version.io.quarkus}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>native-image</goal>
+                </goals>
+                <configuration>
+                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/Person.java b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/Person.java
new file mode 100644
index 00000000000..c240abd8ba9
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/Person.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * 
+ * Licensed 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.
+ */
+package org.kie.kogito.cloud.persons;
+
+public class Person {
+
+    private String id;
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/PersonEndpoint.java b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/PersonEndpoint.java
new file mode 100644
index 00000000000..fc5824f4b95
--- /dev/null
+++ b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/PersonEndpoint.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2019 Red Hat, Inc. and/or its affiliates.
+ * 
+ * Licensed 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.
+ */
+package org.kie.kogito.cloud.persons;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/persons")
+public class PersonEndpoint {
+
+    private List<Person> persons = new ArrayList<>();
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("")
+    public Map<String, List<Person>> getAll() {
+        Map<String, List<Person>> map = new HashMap<>();
+        map.put("persons", persons);
+        return map;
+    }
+
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Path("")
+    public Person createPerson(Person person) {
+        person.setId(UUID.randomUUID().toString());
+        persons.add(person);
+        return person;
+    }
+
+    @PUT
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Path("")
+    public Person updatePerson(Person person) {
+        findPerson(person.getId()).ifPresent(persons::remove);
+        persons.add(person);
+        return person;
+    }
+
+    @DELETE
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Path("")
+    public Person deletePerson(Person person) {
+        findPerson(person.getId()).ifPresent(persons::remove);
+
+        // Return person with no id, meaning it is unregistered  
+        person.setId(null);
+        return person;
+    }
+
+    private Optional<Person> findPerson(String id) {
+        return persons.stream().filter(p -> p.getId().equals(id)).findFirst();
+    }
+}
diff --git a/pom.xml b/pom.xml
index 0604f03f4b0..511d60f4b98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   <description>Kogito Cloud</description>
 
   <repositories>
-    <!-- Bootstrap repository to locate the parent pom when the parent pom
+    <!-- Bootstrap repository to locate the parent pom when the parent pom 
       has not been build locally. -->
     <repository>
       <id>jboss-public-repository-group</id>
@@ -34,7 +34,7 @@
       </snapshots>
     </repository>
   </repositories>
-  
+
   <scm>
     <connection>scm:git:https://github.com/kiegroup/kogito-cloud.git</connection>
     <developerConnection>scm:git:git@github.com:kiegroup/kogito-cloud.git</developerConnection>
@@ -43,6 +43,25 @@
 
   <modules>
     <module>kogito-cloud-services</module>
+    <module>kogito-cloud-tests</module>
   </modules>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-deps-bom</artifactId>
+        <version>${version.org.kie.kogito}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-bom</artifactId>
+        <version>${version.org.kie.kogito}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>

From ab0839d7ad348b727b65e2d2ca7d1c46fbacd058 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 22 Oct 2019 15:35:13 -0300
Subject: [PATCH 056/709] little imagestream fix (#54)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/kogito-imagestream.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 7d7ad537001..112fdd181c2 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -19,7 +19,7 @@ items:
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
-        tags: builder,runtime,kogito,quarkus
+        tags: runtime,kogito,quarkus
         supports: quarkus
         version: '0.5.0'
       referencePolicy:
@@ -40,7 +40,7 @@ items:
         annotations:
           description: Runtime image for Kogito based on Quarkus JVM image
           iconClass: icon-jbpm
-          tags: builder,runtime,kogito,quarkus,jvm
+          tags: runtime,kogito,quarkus,jvm
           supports: quarkus
           version: '0.5.0'
         referencePolicy:
@@ -74,15 +74,15 @@ items:
   metadata:
     name: kogito-springboot-ubi8
     annotations:
-      openshift.io/display-name: Runtime image for Kogito based on SpringBoot native image
+      openshift.io/display-name: Runtime image for Kogito based on SpringBoot
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
     - name: '0.5.0'
       annotations:
-        description: Platform for building Kogito based on Quarkus
+        description: Runtime image for Kogito based on SpringBoot
         iconClass: icon-jbpm
-        tags: builder,runtime,kogito,springboot
+        tags: runtime,kogito,springboot
         supports: springboot
         version: '0.5.0'
       referencePolicy:

From 6e0c3baa7eccddca5a88f9ecb41a1814670788b0 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 23 Oct 2019 15:07:26 -0300
Subject: [PATCH 057/709] [KOGITO-419] - Limiting jvm xmx for native in 80% of
 container memory limit (#55)

---
 .../graalvm/19.x/added/memory-limit.sh        | 13 +++++++++----
 s2i/tests/bats/memory-limits.bats             | 19 +++++++++++++------
 .../features/kogito-quarkus-ubi8-s2i.feature  |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/s2i/modules/graalvm/19.x/added/memory-limit.sh b/s2i/modules/graalvm/19.x/added/memory-limit.sh
index b628ef7beea..9053363ae66 100644
--- a/s2i/modules/graalvm/19.x/added/memory-limit.sh
+++ b/s2i/modules/graalvm/19.x/added/memory-limit.sh
@@ -12,13 +12,18 @@
 # its value must be in binary bytes.
 
 function configure() {
-    # native builds requires at least 1024m (1073741824=1024MB - 1 MB = 2^20 B in base 2)
     # does not accepts
     if [[  "${LIMIT_MEMORY}" =~ ^[-+]?[0-9]+{9}$ ]]; then
-        if [ "${LIMIT_MEMORY}" -lt 1073741824 ]; then
-            echo "Provided memory (${LIMIT_MEMORY}) limit is too small, native build will use all available memory"
+        # native builds requires at least 1024m (1073741824=1024MB - 1 MB = 2^20 B in base 2)
+        local limit=1073741824
+        # only 80% of the actual limit will be used for the JVM
+        local jvm_limit_memory=$(($LIMIT_MEMORY*80/100))
+        echo "Limit memory for this container is set to ${LIMIT_MEMORY}. Allocated memory for JVM will be set to ${jvm_limit_memory}."
+        if [ "${jvm_limit_memory}" -lt "${limit}" ]; then
+            limit=$(echo "scale=1; ${limit} / (80/100)" | bc -l)
+            printf "Provided memory (${LIMIT_MEMORY}) limit is too small (should be greater then %.0f bytes), native build will use all available memory.\n" $limit
         else
-            export KOGITO_OPTS="${KOGITO_OPTS} -Dnative-image.xmx=${LIMIT_MEMORY}"
+            export KOGITO_OPTS="${KOGITO_OPTS} -Dnative-image.xmx=${jvm_limit_memory}"
         fi
     else
         echo "Provided memory (${LIMIT_MEMORY}) limit is not valid, native build will use all available memory"
diff --git a/s2i/tests/bats/memory-limits.bats b/s2i/tests/bats/memory-limits.bats
index 2ebd0c08dba..f1a0b2334e2 100644
--- a/s2i/tests/bats/memory-limits.bats
+++ b/s2i/tests/bats/memory-limits.bats
@@ -4,25 +4,32 @@
 source $BATS_TEST_DIRNAME/../../modules/graalvm/19.x/added/memory-limit.sh
 
 @test "test a valid memory limit value" {
-    export LIMIT_MEMORY="1073741824"
-    local expected=" -Dnative-image.xmx=1073741824"
+    export LIMIT_MEMORY="1342177280"
+    local expected=" -Dnative-image.xmx=1073741824" # 80% of LIMIT_MEMORY, top expected by JVM
     configure
     echo "Expected: ${expected}"
     echo "Result: ${KOGITO_OPTS}"
     [ "${expected}" = "${KOGITO_OPTS}" ]
 }
 
+@test "test a result jvm memory with float points" {
+    export LIMIT_MEMORY="2147483648" # 80% is 1717986918.4
+    local expected=" -Dnative-image.xmx=1717986918"
+    configure
+    echo "Expected: ${expected}"
+    echo "Result: ${KOGITO_OPTS}"
+    [ "${expected}" = "${KOGITO_OPTS}" ]
+}
 
 @test "test a small memory limit value" {
     export LIMIT_MEMORY="1073741600"
-    local expected="Provided memory (1073741600) limit is too small, native build will use all available memory"
+    local expected="Provided memory (1073741600) limit is too small"
     local result=$(configure)
     echo "Expected: ${expected}"
     echo "Result: ${result}"
-    [ "${expected}" = "${result}" ]
+    [[ ${result} == *"${expected}"* ]]
 }
 
-
 @test "test a invalid memory limit value" {
     export LIMIT_MEMORY="1024m"
     local expected="Provided memory (1024m) limit is not valid, native build will use all available memory"
@@ -30,4 +37,4 @@ source $BATS_TEST_DIRNAME/../../modules/graalvm/19.x/added/memory-limit.sh
     echo "Expected: ${expected}"
     echo "Result: ${result}"
     [ "${expected}" = "${result}" ]
-}
\ No newline at end of file
+}
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index e19f699b106..bbe0c7407eb 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -69,7 +69,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
     And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner should exist
-    And s2i build log should contain -J-Xmx2147483648
+    And s2i build log should contain -J-Xmx1717986918
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build

From bda9a0b6a4a49b4b6eacb620a00b45aa251841bd Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 23 Oct 2019 20:05:53 -0300
Subject: [PATCH 058/709] [KOGITO-477] - Setting the default port to 8080 (#56)

---
 s2i/kogito-data-index-overrides.yaml            | 4 ++--
 s2i/tests/features/kogito-quarkus-index.feature | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/s2i/kogito-data-index-overrides.yaml b/s2i/kogito-data-index-overrides.yaml
index 15564d2f14e..a91f4ad61a7 100644
--- a/s2i/kogito-data-index-overrides.yaml
+++ b/s2i/kogito-data-index-overrides.yaml
@@ -11,7 +11,7 @@ labels:
 - name: "io.openshift.tags"
   value: "kogito,data-index"
 - name: "io.openshift.expose-services"
-  value: "8180:http"
+  value: "8080:http"
 
 envs:
 - name: "INFINISPAN_USEAUTH"
@@ -31,7 +31,7 @@ envs:
   description: "Sasl mechanism to use during authentication. Example: PLAIN (Used to set the infinispan.client.hotrod.sasl_mechanism system property)"
 
 ports:
-- value: 8180
+- value: 8080
 
 modules:
   install:
diff --git a/s2i/tests/features/kogito-quarkus-index.feature b/s2i/tests/features/kogito-quarkus-index.feature
index 482eefea7c0..76b15b34f91 100644
--- a/s2i/tests/features/kogito-quarkus-index.feature
+++ b/s2i/tests/features/kogito-quarkus-index.feature
@@ -7,7 +7,7 @@ Feature: Kogito-quarkus-ubi8 feature.
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
-    And the image should contain label io.openshift.expose-services with value 8180:http
+    And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service
     And the image should contain label io.k8s.display-name with value Kogito Data Index Service
     And the image should contain label io.openshift.tags with value kogito,data-index

From d61af9318a85c42198660129b776d6a637d39845 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Thu, 24 Oct 2019 11:39:07 -0300
Subject: [PATCH 059/709] [KOGITO-343] - Support for multi-module builds (#57)

---
 s2i/kogito-quarkus-ubi8-s2i-overrides.yaml    |  6 +++++
 s2i/kogito-springboot-ubi8-s2i-overrides.yaml |  6 +++++
 .../kogito-quarkus-ubi8-s2i/s2i/bin/assemble  | 27 ++++++++++++-------
 .../s2i/bin/assemble                          | 19 ++++++++-----
 .../features/kogito-quarkus-ubi8-s2i.feature  | 14 ++++++++++
 .../kogito-springboot-ubi8-s2i.feature        | 16 +++++++++++
 6 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
index d0f389a5ab1..eadb104479c 100644
--- a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
@@ -18,6 +18,12 @@ envs:
 - name: JAVA_OPTIONS
   example: "-Dquarkus.log.level=DEBUG"
   description: JVM options passed to the Java command.
+- name: MAVEN_ARGS_APPEND
+  example: "-pl mymodule -am"
+  description: Additional Maven arguments
+- name: ARTIFACT_DIR
+  example: mymodule/target
+  description:  Path to target/ where the jar files are created for multi-module builds
 
 modules:
   install:
diff --git a/s2i/kogito-springboot-ubi8-s2i-overrides.yaml b/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
index 5d6c3637e98..9ed3bad4894 100644
--- a/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
@@ -15,6 +15,12 @@ envs:
 - name: JAVA_OPTIONS
   example: "-Ddebug=true"
   description: JVM options passed to the Java command.
+- name: MAVEN_ARGS_APPEND
+  example: "-pl mymodule -am"
+  description: Additional Maven arguments
+- name: ARTIFACT_DIR
+  example: mymodule/target
+  description:  Path to target/ where the jar files are created for multi-module builds
 
 modules:
   install:
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
index 5ab15fbef01..0c8323913f2 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
@@ -39,7 +39,7 @@ if [ -f "pom.xml" ]; then
     fi
 
     echo "---> Building application from source..."
-    $MAVEN_HOME/bin/mvn clean package ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
+    $MAVEN_HOME/bin/mvn clean package $MAVEN_ARGS_APPEND ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
         -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
         -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 else
@@ -63,17 +63,26 @@ else
     mv project/* .
 
     echo "---> Building application from source..."
-    $MAVEN_HOME/bin/mvn clean package ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
+    $MAVEN_HOME/bin/mvn clean package $MAVEN_ARGS_APPEND ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
         -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
         -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 fi
 
+echo "---> Build finished, installing application from path $(pwd)"
+
+artifactDir="target"
+if [ ! -z "${ARTIFACT_DIR}" ]; then
+    artifactDir="${ARTIFACT_DIR}"
+fi
+
 if [ "${NATIVE^^}" == "FALSE" ]; then
-    cp -v target/*-runner.jar $KOGITO_HOME/bin
-    cp -r target/lib/ $KOGITO_HOME/bin/
+    echo "---> Installing jar file"
+    cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin
+    echo "---> Copying application libraries"
+    cp -r $artifactDir/lib/ $KOGITO_HOME/bin/
 else
     echo "---> Installing application binaries"
-    cp -v target/*-runner $KOGITO_HOME/bin
+    cp -v $artifactDir/*-runner $KOGITO_HOME/bin
     chmod +x $KOGITO_HOME/bin/*-runner
     echo "---> Copy native java libraries for ssl handling..."
     cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/bin
@@ -81,11 +90,11 @@ fi
 
 
 echo "---> Copy image metadata file..."
-if [ -e /tmp/src/target/image_metadata.json ]; then
+if [ -e "/tmp/src/${artifactDir}/image_metadata.json" ]; then
     mkdir /tmp/.s2i
-    cp -v /tmp/src/target/image_metadata.json /tmp/.s2i
-    cp -v /tmp/src/target/image_metadata.json $KOGITO_HOME/bin
+    cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/.s2i
+    cp -v /tmp/src/$artifactDir/image_metadata.json $KOGITO_HOME/bin
 else
-    echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
+    echo "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
 fi
 
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
index ec786e05cb8..cdbf815a0eb 100755
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
@@ -31,7 +31,7 @@ cd /tmp/src/
 
 if [ -f "pom.xml" ]; then
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -s $KOGITO_HOME/.m2/settings.xml \
+	$MAVEN_HOME/bin/mvn clean package $MAVEN_ARGS_APPEND -s $KOGITO_HOME/.m2/settings.xml \
     -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
     -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 else
@@ -56,19 +56,24 @@ else
 	mv project/* .
 
 	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package -s $KOGITO_HOME/.m2/settings.xml \
+	$MAVEN_HOME/bin/mvn clean package $MAVEN_ARGS_APPEND -s $KOGITO_HOME/.m2/settings.xml \
     -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
     -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 fi
 
+artifactDir="target"
+if [ ! -z "${ARTIFACT_DIR}" ]; then
+    artifactDir="${ARTIFACT_DIR}"
+fi
+
 echo "---> Installing application binaries"
-cp -v target/*.jar $KOGITO_HOME/bin
+cp -v $artifactDir/*.jar $KOGITO_HOME/bin
 
 echo "---> Copy image metadata file..."
-if [ -e /tmp/src/target/image_metadata.json ]; then
+if [ -e "/tmp/src/${artifactDir}/image_metadata.json" ]; then
     mkdir /tmp/.s2i
-    cp -v /tmp/src/target/image_metadata.json /tmp/.s2i
-    cp -v /tmp/src/target/image_metadata.json $KOGITO_HOME/bin
+    cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/.s2i
+    cp -v /tmp/src/$artifactDir/image_metadata.json $KOGITO_HOME/bin
 else
-    echo "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found."
+    echo "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
 fi
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index bbe0c7407eb..6874c41bc84 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -39,6 +39,20 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | Mario is older than Mark |
     And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner.jar should exist
 
+    Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples from . using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable          | value                           |
+      | NATIVE            | false                           |
+      | ARTIFACT_DIR      | drools-quarkus-example/target   |
+      | MAVEN_ARGS_APPEND | -pl drools-quarkus-example -am  |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | wait            | 80                       |
+      | expected_phrase | Mario is older than Mark |
+    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner.jar should exist
+
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
     Then check that page is served
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index eea3fddefce..39cfbff86d5 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -16,6 +16,22 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And container log should contain DEBUG o.s.boot.SpringApplication.load
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
+  Scenario: Verify if the s2i build is finished as expected using multi-module build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.5.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable            | value                           |
+      | JAVA_OPTIONS        | -Ddebug=true                    |
+      | ARTIFACT_DIR        | jbpm-springboot-example/target   |
+      | MAVEN_ARGS_APPEND   | -pl jbpm-springboot-example -am  |
+    Then check that page is served
+      | property             | value     |
+      | port                 | 8080      |
+      | path                 | /orders/1 |
+      | wait                 | 80        |
+      | expected_status_code | 204       |
+    And file /home/kogito/bin/jbpm-springboot-example-0.5.0.jar should exist
+    And container log should contain DEBUG o.s.boot.SpringApplication.load
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+
   Scenario: Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.0
     Then check that page is served

From a861106d4bc29557ffc9114a90a76fda80fba2b5 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 30 Oct 2019 18:00:59 -0300
Subject: [PATCH 060/709] [KOGITO-382] - Removing snapshot builds from maven
 archetypes (#58)

---
 .../kogito-quarkus-ubi8-s2i/module.yaml       |  4 ++++
 .../kogito-quarkus-ubi8-s2i/s2i/bin/assemble  |  4 ++--
 .../kogito-springboot-ubi8-s2i/module.yaml    |  4 ++++
 .../s2i/bin/assemble                          |  4 ++--
 .../features/kogito-quarkus-ubi8-s2i.feature  |  8 +++++--
 s2i/tests/test-apps/clone-repo.sh             | 22 ++++++++++++-------
 6 files changed, 32 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 s2i/tests/test-apps/clone-repo.sh

diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
index 9b14ce19a3f..1a1f100ec15 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
@@ -3,3 +3,7 @@ version: "0.5.0"
 name: kogito-quarkus-ubi8-s2i
 execute:
   - script: configure
+
+envs:
+- name: "KOGITO_VERSION"
+  value: "0.5.0"
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
index 0c8323913f2..afc6d4ab563 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
@@ -46,7 +46,7 @@ else
     echo "---> Generating project structure..."
 
     $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=kogito-quarkus-archetype \
-	-DarchetypeVersion=8.0.0-SNAPSHOT -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
+	-DarchetypeVersion=$KOGITO_VERSION -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
 
     # copy resources into the generated project
     for item in *
@@ -55,7 +55,7 @@ else
             echo "--> Skipping generated project ..."
         else
             echo "--> Coping resource $item"
-            cp -R $item project/src/main/resources
+            cp -R "$item" project/src/main/resources
         fi
     done
 
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
index 24d4a6656fd..50cc82cfb22 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
@@ -3,3 +3,7 @@ version: "0.5.0"
 name: kogito-springboot-ubi8-s2i
 execute:
   - script: configure
+
+envs:
+- name: "KOGITO_VERSION"
+  value: "0.5.0"
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
index cdbf815a0eb..db69ea3d318 100755
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
@@ -38,7 +38,7 @@ else
 	echo "---> Generating project structure..."
 
 	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito \
-	-DarchetypeArtifactId=kogito-springboot-archetype -DarchetypeVersion=8.0.0-SNAPSHOT \
+	-DarchetypeArtifactId=kogito-springboot-archetype -DarchetypeVersion=$KOGITO_VERSION \
 	-DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
 
 	# copy resources into the generated project
@@ -48,7 +48,7 @@ else
 			echo "--> Skipping generated project ..."
 		else
 			echo "--> Coping resource $item"
-			cp -R $item project/src/main/resources
+			cp -R "$item" project/src/main/resources
 		fi
 	done
 
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 6874c41bc84..4362e9c6f88 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -40,7 +40,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner.jar should exist
 
     Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from . using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | ARTIFACT_DIR      | drools-quarkus-example/target   |
@@ -108,4 +108,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.0.1
 
-
+    Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable          | value                           |
+      | NATIVE            | false                           |
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
\ No newline at end of file
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
old mode 100644
new mode 100755
index 3e644939235..486bba88db1
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -1,18 +1,24 @@
 #!/bin/bash
 #
-# Clone the kogito-examples and edit the drools-quarkus-example
-# by adding the application.properties file telling quarkus to start on
-# port 10000, the purpose of this tests is make sure that the images
-# will ensure the use of the port 8080.
+# Clone the kogito-examples and edit the drools-quarkus-example and dmn-quarkus-example for testing purposes
 
-CURRENT_DIR=`pwd`
+TEST_DIR=`pwd`
 cd /tmp
 rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
 git fetch origin --tags
-git checkout 0.5.0
-cp ${CURRENT_DIR}/application.properties src/main/resources/META-INF/
+git checkout -b 0.5.0 0.5.0
+
+# by adding the application.properties file telling quarkus to start on
+# port 10000, the purpose of this tests is make sure that the images
+# will ensure the use of the port 8080.
+cp ${TEST_DIR}/application.properties src/main/resources/META-INF/
+
+# preparing directory to run kogito maven archetypes tests
+cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-quarkus-example/
+rm -rf /tmp/kogito-examples/dmn-quarkus-example/src
+rm -rf /tmp/kogito-examples/dmn-quarkus-example/pom.xml
+
 git add --all
 git commit -am "test"
-

From 4df191c49938702e727fb2127e4738cace9bb1fc Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 1 Nov 2019 12:25:51 -0300
Subject: [PATCH 061/709] [KOGITO-521] - Bump Kogito Images to 0.5.1 version
 (#60)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/image.yaml                                |  2 +-
 s2i/kogito-imagestream.yaml                   | 36 +++++++++----------
 s2i/modules/add-kogito-user/module.yaml       |  2 +-
 .../install-rpm-dependencies/module.yaml      |  2 +-
 s2i/modules/kogito-data-index/module.yaml     |  8 ++---
 s2i/modules/kogito-launch/module.yaml         |  2 +-
 .../kogito-quarkus-jvm-ubi8/module.yaml       |  2 +-
 .../kogito-quarkus-ubi8-s2i/module.yaml       |  4 +--
 s2i/modules/kogito-quarkus-ubi8/module.yaml   |  2 +-
 .../kogito-springboot-ubi8-s2i/module.yaml    |  4 +--
 .../kogito-springboot-ubi8/module.yaml        |  2 +-
 .../features/kogito-quarkus-index.feature     |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 30 ++++++++--------
 .../kogito-springboot-ubi8-s2i.feature        | 14 ++++----
 s2i/tests/test-apps/clone-repo.sh             |  2 +-
 15 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index 2e73fa41d5d..cad9861512c 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.5.0"
+version: "0.5.1"
 from: "registry.redhat.io/ubi8-minimal:latest"
 
 labels:
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 112fdd181c2..ae08b811e9a 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.0'
+    - name: '0.5.1'
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
         tags: runtime,kogito,quarkus
         supports: quarkus
-        version: '0.5.0'
+        version: '0.5.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.5.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.5.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -36,18 +36,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.5.0'
+      - name: '0.5.1'
         annotations:
           description: Runtime image for Kogito based on Quarkus JVM image
           iconClass: icon-jbpm
           tags: runtime,kogito,quarkus,jvm
           supports: quarkus
-          version: '0.5.0'
+          version: '0.5.1'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.5.0
+          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.5.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -57,18 +57,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.0'
+    - name: '0.5.1'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,quarkus
         supports: quarkus
-        version: '0.5.0'
+        version: '0.5.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.5.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.5.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -78,18 +78,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.0'
+    - name: '0.5.1'
       annotations:
         description: Runtime image for Kogito based on SpringBoot
         iconClass: icon-jbpm
         tags: runtime,kogito,springboot
         supports: springboot
-        version: '0.5.0'
+        version: '0.5.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8:0.5.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8:0.5.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -99,18 +99,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.0'
+    - name: '0.5.1'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,springboot
         supports: springboot
-        version: '0.5.0'
+        version: '0.5.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.5.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.5.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -120,14 +120,14 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.0'
+    - name: '0.5.1'
       annotations:
         description: Runtime image for the Kogito Data Index Service
         iconClass: icon-jbpm
         tags: kogito,data-index
-        version: '0.5.0'
+        version: '0.5.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-data-index:0.5.0
\ No newline at end of file
+        name: quay.io/kiegroup/kogito-data-index:0.5.1
\ No newline at end of file
diff --git a/s2i/modules/add-kogito-user/module.yaml b/s2i/modules/add-kogito-user/module.yaml
index 86c37c812a6..4518d879adb 100644
--- a/s2i/modules/add-kogito-user/module.yaml
+++ b/s2i/modules/add-kogito-user/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.0"
+version: "0.5.1"
 name: add-kogito-user
 execute:
 - script: add-user
diff --git a/s2i/modules/install-rpm-dependencies/module.yaml b/s2i/modules/install-rpm-dependencies/module.yaml
index 9acafe69049..6727bf81d21 100644
--- a/s2i/modules/install-rpm-dependencies/module.yaml
+++ b/s2i/modules/install-rpm-dependencies/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.0"
+version: "0.5.1"
 name: install-rpm-dependencies
 
 execute:
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index 99652259c0e..b69acceea44 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: kogito-data-index
-version: "0.5.0"
+version: "0.5.1"
 
 artifacts:
-- name: data-index-service-0.5.0-runner.jar
-  url: https://repo.maven.apache.org/maven2/org/kie/kogito/data-index-service/0.5.0/data-index-service-0.5.0-runner.jar
-  md5: 1e71c52ffe16ad07481c790d80609e58
+- name: data-index-service-0.5.1-runner.jar
+  url: https://repo.maven.apache.org/maven2/org/kie/kogito/data-index-service/0.5.1/data-index-service-0.5.1-runner.jar
+  md5: e2c86af6ebfd4bb95ed4db50cea87a05
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-launch/module.yaml b/s2i/modules/kogito-launch/module.yaml
index 49ae9f59780..5b73e8ceacb 100644
--- a/s2i/modules/kogito-launch/module.yaml
+++ b/s2i/modules/kogito-launch/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: kogito-launch
-version: "0.5.0"
+version: "0.5.1"
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml b/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
index 49ffb938418..0811659adc3 100644
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.0"
+version: "0.5.1"
 name: kogito-quarkus-jvm-ubi8
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
index 1a1f100ec15..4ae2d1be89a 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
@@ -1,9 +1,9 @@
 schema_version: 1
-version: "0.5.0"
+version: "0.5.1"
 name: kogito-quarkus-ubi8-s2i
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.5.0"
\ No newline at end of file
+  value: "0.5.1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8/module.yaml b/s2i/modules/kogito-quarkus-ubi8/module.yaml
index 054461e4f4e..882e05a64df 100644
--- a/s2i/modules/kogito-quarkus-ubi8/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.0"
+version: "0.5.1"
 name: kogito-quarkus-ubi8
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
index 50cc82cfb22..2056924acb1 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
@@ -1,9 +1,9 @@
 schema_version: 1
-version: "0.5.0"
+version: "0.5.1"
 name: kogito-springboot-ubi8-s2i
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.5.0"
\ No newline at end of file
+  value: "0.5.1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot-ubi8/module.yaml b/s2i/modules/kogito-springboot-ubi8/module.yaml
index abe1c80eba2..62b2a9a776b 100644
--- a/s2i/modules/kogito-springboot-ubi8/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.0"
+version: "0.5.1"
 name: kogito-springboot-ubi8
 execute:
   - script: configure
diff --git a/s2i/tests/features/kogito-quarkus-index.feature b/s2i/tests/features/kogito-quarkus-index.feature
index 76b15b34f91..e37066edae4 100644
--- a/s2i/tests/features/kogito-quarkus-index.feature
+++ b/s2i/tests/features/kogito-quarkus-index.feature
@@ -14,7 +14,7 @@ Feature: Kogito-quarkus-ubi8 feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.5.0-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.5.1-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 4362e9c6f88..4142abb00c6 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -3,17 +3,17 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -23,12 +23,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -37,10 +37,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner.jar should exist
 
     Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | ARTIFACT_DIR      | drools-quarkus-example/target   |
@@ -51,20 +51,20 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.1
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
@@ -73,7 +73,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | Mario is older than Mark |
 
   Scenario: Verify if the memory limit is correctly applied
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value       |
       | LIMIT_MEMORY   | 2147483648  |
     Then check that page is served
@@ -82,12 +82,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.0-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner should exist
     And s2i build log should contain -J-Xmx1717986918
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.1
     Then s2i build log should contain Expanding artifacts from incremental build...
 
   Scenario: verify if all labels are correctly set.
@@ -109,7 +109,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.0.1
 
     Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
\ No newline at end of file
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index 39cfbff86d5..15b452bb3e0 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,7 +3,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.5.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -12,12 +12,12 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.5.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.5.1.jar should exist
     And container log should contain DEBUG o.s.boot.SpringApplication.load
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.5.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.5.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value                           |
       | JAVA_OPTIONS        | -Ddebug=true                    |
       | ARTIFACT_DIR        | jbpm-springboot-example/target   |
@@ -28,23 +28,23 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.5.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.5.1.jar should exist
     And container log should contain DEBUG o.s.boot.SpringApplication.load
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.1
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.5.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.5.1.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.1
     Then s2i build log should contain Expanding artifacts from incremental build...
 
 
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index 486bba88db1..ac550c4ad72 100755
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -8,7 +8,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
 git fetch origin --tags
-git checkout -b 0.5.0 0.5.0
+git checkout -b 0.5.1 0.5.1
 
 # by adding the application.properties file telling quarkus to start on
 # port 10000, the purpose of this tests is make sure that the images

From 856d02baec098fb5b2389a53913fa06643d6e313 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 1 Nov 2019 14:27:24 -0300
Subject: [PATCH 062/709] [KOGITO-525] - Upgrade to GraalVM 19.2.1 (#59)

---
 s2i/kogito-quarkus-ubi8-s2i-overrides.yaml    |  2 +-
 s2i/modules/graalvm/1.0.0-rc14/configure      |  8 -------
 s2i/modules/graalvm/1.0.0-rc14/module.yaml    | 21 -------------------
 s2i/modules/graalvm/1.0.0-rc15/configure      |  7 -------
 s2i/modules/graalvm/1.0.0-rc15/module.yaml    | 20 ------------------
 s2i/modules/graalvm/1.0.0-rc16/configure      |  7 -------
 s2i/modules/graalvm/1.0.0-rc16/module.yaml    | 20 ------------------
 s2i/modules/graalvm/19.x/module.yaml          | 16 +++++++-------
 .../features/kogito-quarkus-ubi8-s2i.feature  |  2 +-
 9 files changed, 10 insertions(+), 93 deletions(-)
 delete mode 100644 s2i/modules/graalvm/1.0.0-rc14/configure
 delete mode 100644 s2i/modules/graalvm/1.0.0-rc14/module.yaml
 delete mode 100644 s2i/modules/graalvm/1.0.0-rc15/configure
 delete mode 100644 s2i/modules/graalvm/1.0.0-rc15/module.yaml
 delete mode 100644 s2i/modules/graalvm/1.0.0-rc16/configure
 delete mode 100644 s2i/modules/graalvm/1.0.0-rc16/module.yaml

diff --git a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
index eadb104479c..0a16deccf53 100644
--- a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
@@ -31,7 +31,7 @@ modules:
   - name: add-kogito-user
   - name: kogito-launch
   - name: graalvm
-    version: "19.2.0.1"
+    version: "19.2.1"
   - name: maven
     version: "3.6.0"
   - name: kogito-quarkus-ubi8-s2i
diff --git a/s2i/modules/graalvm/1.0.0-rc14/configure b/s2i/modules/graalvm/1.0.0-rc14/configure
deleted file mode 100644
index 15d479548b8..00000000000
--- a/s2i/modules/graalvm/1.0.0-rc14/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-
-tar xzf ${SOURCES_DIR}/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
-
diff --git a/s2i/modules/graalvm/1.0.0-rc14/module.yaml b/s2i/modules/graalvm/1.0.0-rc14/module.yaml
deleted file mode 100644
index 085baa4a141..00000000000
--- a/s2i/modules/graalvm/1.0.0-rc14/module.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-schema_version: 1
-name: graalvm
-version: "1.0.0-rc14"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_HOME"
-    value: "/usr/share/graalvm"
-    #version without prefix ce
-  - name: "GRAALVM_VERSION"
-    value: "1.0.0-rc14"
-
-# unfortunately by now the version needs to be hardcoded.
-artifacts:
-  - name: graalvm-ce-1.0.0-rc14-linux-amd64.tar.gz
-    url: https://github.com/oracle/graal/releases/download/vm-1.0.0-rc14/graalvm-ce-1.0.0-rc14-linux-amd64.tar.gz
-    md5: 89e562717a7ca3f54a1799f5c2a0167b
-
-execute:
-  - script: configure
\ No newline at end of file
diff --git a/s2i/modules/graalvm/1.0.0-rc15/configure b/s2i/modules/graalvm/1.0.0-rc15/configure
deleted file mode 100644
index a41b91383db..00000000000
--- a/s2i/modules/graalvm/1.0.0-rc15/configure
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-
-tar xzf ${SOURCES_DIR}/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
\ No newline at end of file
diff --git a/s2i/modules/graalvm/1.0.0-rc15/module.yaml b/s2i/modules/graalvm/1.0.0-rc15/module.yaml
deleted file mode 100644
index cf298ef7426..00000000000
--- a/s2i/modules/graalvm/1.0.0-rc15/module.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-schema_version: 1
-name: graalvm
-version: "1.0.0-rc15"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_HOME"
-    value: "/usr/share/graalvm"
-  #version without prefix ce
-  - name: "GRAALVM_VERSION"
-    value: "1.0.0-rc15"
-
-artifacts:
-- name: graalvm-ce-1.0.0-rc15-linux-amd64.tar.gz
-  url: https://github.com/oracle/graal/releases/download/vm-1.0.0-rc15/graalvm-ce-1.0.0-rc15-linux-amd64.tar.gz
-  md5: 904ce54888e49296364dc6f9ff5081a6
-
-execute:
-- script: configure
\ No newline at end of file
diff --git a/s2i/modules/graalvm/1.0.0-rc16/configure b/s2i/modules/graalvm/1.0.0-rc16/configure
deleted file mode 100644
index a41b91383db..00000000000
--- a/s2i/modules/graalvm/1.0.0-rc16/configure
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-
-tar xzf ${SOURCES_DIR}/graalvm-ce-${GRAALVM_VERSION}-linux-amd64.tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
\ No newline at end of file
diff --git a/s2i/modules/graalvm/1.0.0-rc16/module.yaml b/s2i/modules/graalvm/1.0.0-rc16/module.yaml
deleted file mode 100644
index 2594043c5c0..00000000000
--- a/s2i/modules/graalvm/1.0.0-rc16/module.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-schema_version: 1
-name: graalvm
-version: "1.0.0-rc16"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_HOME"
-    value: "/usr/share/graalvm"
-  #version without prefix ce
-  - name: "GRAALVM_VERSION"
-    value: "1.0.0-rc16"
-
-artifacts:
-- name: graalvm-ce-1.0.0-rc16-linux-amd64.tar.gz
-  url: https://github.com/oracle/graal/releases/download/vm-1.0.0-rc16/graalvm-ce-1.0.0-rc16-linux-amd64.tar.gz
-  md5: 42376d71746ef62525d51eeca84f508c
-
-execute:
-- script: configure
\ No newline at end of file
diff --git a/s2i/modules/graalvm/19.x/module.yaml b/s2i/modules/graalvm/19.x/module.yaml
index 18a4614aceb..c8f16828ee7 100644
--- a/s2i/modules/graalvm/19.x/module.yaml
+++ b/s2i/modules/graalvm/19.x/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: graalvm
-version: "19.2.0.1"
+version: "19.2.1"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,15 +9,15 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "19.2.0.1"
+    value: "19.2.1"
 
 artifacts:
-- name: graalvm-ce-linux-amd64-19.2.0.1.tar.gz
-  url: https://github.com/oracle/graal/releases/download/vm-19.2.0.1/graalvm-ce-linux-amd64-19.2.0.1.tar.gz
-  md5: 2569d33794ce431009feae1e36b8d75d
-- name: native-image-installable-svm-linux-amd64-19.2.0.1.jar
-  url: https://github.com/oracle/graal/releases/download/vm-19.2.0.1/native-image-installable-svm-linux-amd64-19.2.0.1.jar
-  md5: bc991b312710656397c4b42c5df44dbc
+- name: graalvm-ce-linux-amd64-19.2.1.tar.gz
+  url: https://github.com/oracle/graal/releases/download/vm-19.2.1/graalvm-ce-linux-amd64-19.2.1.tar.gz
+  md5: 30a33f6c66ff05e324ec348f62358abb
+- name: native-image-installable-svm-linux-amd64-19.2.1.jar
+  url: https://github.com/oracle/graal/releases/download/vm-19.2.1/native-image-installable-svm-linux-amd64-19.2.1.jar
+  md5: 98d19c4d01d0a3c5b622638ac17ac1b8
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 4142abb00c6..988ab05b40f 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -106,7 +106,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.0
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.0.1
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.1
 
     Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
     Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest

From 48844fdc1bcac9334a19c5dc4bdc4970334b3258 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 1 Nov 2019 14:27:39 -0300
Subject: [PATCH 063/709] [KOGITO-309] Using quarkus infinispan extension to
 set credentials to data index client (#46)

---
 s2i/modules/kogito-data-index/added/start      | 11 ++++++-----
 .../kogito-data-index/tests/bats/start.bats    | 12 ++++++------
 .../features/kogito-quarkus-index.feature      | 18 +++++++++---------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/s2i/modules/kogito-data-index/added/start b/s2i/modules/kogito-data-index/added/start
index 23e6bb8e145..148ed736a24 100755
--- a/s2i/modules/kogito-data-index/added/start
+++ b/s2i/modules/kogito-data-index/added/start
@@ -1,5 +1,6 @@
 #!/bin/bash -e
 
+# see https://quarkus.io/guides/infinispan-client-guide#quarkus-infinispan-client_configuration
 function set_infinispan_props() {
     local infinispan_props=""
 
@@ -14,11 +15,11 @@ function set_infinispan_props() {
         fi
     fi
  
-    if [ ! -z "${INFINISPAN_USERNAME}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_username=${INFINISPAN_USERNAME}"); INFINISPAN_USEAUTH="true"; fi
-    if [ ! -z "${INFINISPAN_PASSWORD}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_password=${INFINISPAN_PASSWORD}"); fi
-    if [ ! -z "${INFINISPAN_USEAUTH}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_useauth=${INFINISPAN_USEAUTH}"); fi
-    if [ ! -z "${INFINISPAN_AUTHREALM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_authrealm=${INFINISPAN_AUTHREALM}"); fi
-    if [ ! -z "${INFINISPAN_SASLMECHANISM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dinfinispan_saslmechanism=${INFINISPAN_SASLMECHANISM}"); fi
+    if [ ! -z "${INFINISPAN_USERNAME}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-username=${INFINISPAN_USERNAME}"); INFINISPAN_USEAUTH="true"; fi
+    if [ ! -z "${INFINISPAN_PASSWORD}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-password=${INFINISPAN_PASSWORD}"); fi
+    if [ ! -z "${INFINISPAN_USEAUTH}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.use-auth=${INFINISPAN_USEAUTH}"); fi
+    if [ ! -z "${INFINISPAN_AUTHREALM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-realm=${INFINISPAN_AUTHREALM}"); fi
+    if [ ! -z "${INFINISPAN_SASLMECHANISM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.sasl-mechanism=${INFINISPAN_SASLMECHANISM}"); fi
 
     echo $infinispan_props
 }
diff --git a/s2i/modules/kogito-data-index/tests/bats/start.bats b/s2i/modules/kogito-data-index/tests/bats/start.bats
index 0cb002cda50..769996b545e 100644
--- a/s2i/modules/kogito-data-index/tests/bats/start.bats
+++ b/s2i/modules/kogito-data-index/tests/bats/start.bats
@@ -26,7 +26,7 @@ function clear_vars() {
 @test "check if infinispan auth is false" {
     clear_vars
     export INFINISPAN_USEAUTH="false"
-    local expected="-Dinfinispan_useauth=false"
+    local expected="-Dquarkus.infinispan-client.use-auth=false"
     run set_infinispan_props
     
     echo "Result is ${output} and expected is ${expected}" >&2
@@ -41,7 +41,7 @@ function clear_vars() {
     export INFINISPAN_AUTHREALM="default"
     export INFINISPAN_SASLMECHANISM="PLAIN"
     
-    local expected="-Dinfinispan_username=developer -Dinfinispan_password=developer -Dinfinispan_useauth=true -Dinfinispan_authrealm=default -Dinfinispan_saslmechanism=PLAIN"
+    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.auth-password=developer -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.auth-realm=default -Dquarkus.infinispan-client.sasl-mechanism=PLAIN"
     run set_infinispan_props
     
     echo "Result is ${output} and expected is ${expected}" >&2
@@ -52,7 +52,7 @@ function clear_vars() {
     clear_vars
     export INFINISPAN_USERNAME="developer"
     export INFINISPAN_USEAUTH="false"
-    local expected="-Dinfinispan_username=developer -Dinfinispan_useauth=true"
+    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
 
     run set_infinispan_props
     
@@ -63,7 +63,7 @@ function clear_vars() {
 @test "when use auth is set to nonsense and no credentials" {
     clear_vars
     export INFINISPAN_USEAUTH="dsadsadasdsa"
-    local expected="-Dinfinispan_useauth=false"
+    local expected="-Dquarkus.infinispan-client.use-auth=false"
 
     run set_infinispan_props
     
@@ -75,7 +75,7 @@ function clear_vars() {
     clear_vars
     export INFINISPAN_USEAUTH="dsadsadasdsa"
     export INFINISPAN_USERNAME="developer"
-    local expected="-Dinfinispan_username=developer -Dinfinispan_useauth=true"
+    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
 
     run set_infinispan_props
     
@@ -86,7 +86,7 @@ function clear_vars() {
 @test "when use auth is set to true and no credentials" {
     clear_vars
     export INFINISPAN_USEAUTH="true"
-    local expected="-Dinfinispan_username=developer -Dinfinispan_useauth=true"
+    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
 
     run set_infinispan_props
     # exit(1)
diff --git a/s2i/tests/features/kogito-quarkus-index.feature b/s2i/tests/features/kogito-quarkus-index.feature
index e37066edae4..ee8c41c7a30 100644
--- a/s2i/tests/features/kogito-quarkus-index.feature
+++ b/s2i/tests/features/kogito-quarkus-index.feature
@@ -20,7 +20,7 @@ Feature: Kogito-quarkus-ubi8 feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain infinispan_useauth = false
+    Then container log should contain quarkus.infinispan-client.use-auth = false
 
   Scenario: verify if auth is correctly set
     When container is started with env
@@ -29,9 +29,9 @@ Feature: Kogito-quarkus-ubi8 feature.
       | INFINISPAN_USEAUTH  | true        |
       | INFINISPAN_USERNAME | IamNotExist |
       | INFINISPAN_PASSWORD | hard2guess  |
-    Then container log should contain infinispan_useauth = true
-    And container log should contain infinispan_password = hard2guess
-    And container log should contain infinispan_username = IamNotExist
+    Then container log should contain quarkus.infinispan-client.use-auth = true
+    And container log should contain quarkus.infinispan-client.auth-password = hard2guess
+    And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
 
   Scenario: verify if all parameters are correctly set
     When container is started with env
@@ -42,11 +42,11 @@ Feature: Kogito-quarkus-ubi8 feature.
       | INFINISPAN_PASSWORD      | hard2guess  |
       | INFINISPAN_AUTHREALM     | SecretRealm |
       | INFINISPAN_SASLMECHANISM | COOLGSSAPI  |
-    Then container log should contain infinispan_useauth = true
-    And container log should contain infinispan_password = hard2guess
-    And container log should contain infinispan_username = IamNotExist
-    And container log should contain infinispan_authrealm = SecretRealm
-    And container log should contain infinispan_saslmechanism = COOLGSSAPI
+    Then container log should contain quarkus.infinispan-client.use-auth = true
+    And container log should contain quarkus.infinispan-client.auth-password = hard2guess
+    And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
+    And container log should contain quarkus.infinispan-client.auth-realm = SecretRealm
+    And container log should contain quarkus.infinispan-client.sasl-mechanism = COOLGSSAPI
 
   Scenario: verify if all parameters are correctly set
     When container is started with env

From 085964f78225601a38ee9eaa3fb243d3d1748b61 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 8 Nov 2019 11:18:25 -0300
Subject: [PATCH 064/709] [KOGITO-506] - bump kogito image version to 0.6.0
 (#62)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/image.yaml                                |  7 ++--
 s2i/kogito-imagestream.yaml                   | 36 +++++++++----------
 s2i/modules/add-kogito-user/module.yaml       |  2 +-
 .../install-rpm-dependencies/module.yaml      |  2 +-
 s2i/modules/kogito-data-index/module.yaml     |  8 ++---
 s2i/modules/kogito-launch/module.yaml         |  2 +-
 .../kogito-quarkus-jvm-ubi8/module.yaml       |  2 +-
 .../kogito-quarkus-ubi8-s2i/module.yaml       |  4 +--
 s2i/modules/kogito-quarkus-ubi8/module.yaml   |  2 +-
 .../kogito-springboot-ubi8-s2i/module.yaml    |  4 +--
 .../kogito-springboot-ubi8/module.yaml        |  2 +-
 .../features/kogito-quarkus-index.feature     |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  |  3 +-
 13 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index cad9861512c..70a166c61bb 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,8 +1,11 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.5.1"
-from: "registry.redhat.io/ubi8-minimal:latest"
+version: "0.6.0"
+# until this issue is not fixed use 8.0 tag.
+# https://github.com/rpm-software-management/microdnf/issues/50
+# https://bugzilla.redhat.com/show_bug.cgi?id=1769831
+from: "registry.redhat.io/ubi8/ubi-minimal:8.0"
 
 labels:
 - name: "maintainer"
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index ae08b811e9a..d8a7347234f 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.1'
+    - name: '0.6.0'
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
         tags: runtime,kogito,quarkus
         supports: quarkus
-        version: '0.5.1'
+        version: '0.6.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.5.1
+        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.6.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -36,18 +36,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.5.1'
+      - name: '0.6.0'
         annotations:
           description: Runtime image for Kogito based on Quarkus JVM image
           iconClass: icon-jbpm
           tags: runtime,kogito,quarkus,jvm
           supports: quarkus
-          version: '0.5.1'
+          version: '0.6.0'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.5.1
+          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.6.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -57,18 +57,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.1'
+    - name: '0.6.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,quarkus
         supports: quarkus
-        version: '0.5.1'
+        version: '0.6.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.5.1
+        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.6.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -78,18 +78,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.1'
+    - name: '0.6.0'
       annotations:
         description: Runtime image for Kogito based on SpringBoot
         iconClass: icon-jbpm
         tags: runtime,kogito,springboot
         supports: springboot
-        version: '0.5.1'
+        version: '0.6.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8:0.5.1
+        name: quay.io/kiegroup/kogito-springboot-ubi8:0.6.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -99,18 +99,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.1'
+    - name: '0.6.0'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,springboot
         supports: springboot
-        version: '0.5.1'
+        version: '0.6.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.5.1
+        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.6.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -120,14 +120,14 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.5.1'
+    - name: '0.6.0'
       annotations:
         description: Runtime image for the Kogito Data Index Service
         iconClass: icon-jbpm
         tags: kogito,data-index
-        version: '0.5.1'
+        version: '0.6.0'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-data-index:0.5.1
\ No newline at end of file
+        name: quay.io/kiegroup/kogito-data-index:0.6.0
\ No newline at end of file
diff --git a/s2i/modules/add-kogito-user/module.yaml b/s2i/modules/add-kogito-user/module.yaml
index 4518d879adb..441fe2fc082 100644
--- a/s2i/modules/add-kogito-user/module.yaml
+++ b/s2i/modules/add-kogito-user/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.1"
+version: "0.6.0"
 name: add-kogito-user
 execute:
 - script: add-user
diff --git a/s2i/modules/install-rpm-dependencies/module.yaml b/s2i/modules/install-rpm-dependencies/module.yaml
index 6727bf81d21..862bbbec664 100644
--- a/s2i/modules/install-rpm-dependencies/module.yaml
+++ b/s2i/modules/install-rpm-dependencies/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.1"
+version: "0.6.0"
 name: install-rpm-dependencies
 
 execute:
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index b69acceea44..697feabe122 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: kogito-data-index
-version: "0.5.1"
+version: "0.6.0"
 
 artifacts:
-- name: data-index-service-0.5.1-runner.jar
-  url: https://repo.maven.apache.org/maven2/org/kie/kogito/data-index-service/0.5.1/data-index-service-0.5.1-runner.jar
-  md5: e2c86af6ebfd4bb95ed4db50cea87a05
+- name: data-index-service-8.0.0-SNAPSHOT-runner.jar
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191104.210837-62.jar
+  md5: cded9a9f3aa6a96341f69a12e4ed482d
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-launch/module.yaml b/s2i/modules/kogito-launch/module.yaml
index 5b73e8ceacb..7d97923071a 100644
--- a/s2i/modules/kogito-launch/module.yaml
+++ b/s2i/modules/kogito-launch/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: kogito-launch
-version: "0.5.1"
+version: "0.6.0"
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml b/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
index 0811659adc3..e5c63e004c9 100644
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.1"
+version: "0.6.0"
 name: kogito-quarkus-jvm-ubi8
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
index 4ae2d1be89a..bdcd000e755 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
@@ -1,9 +1,9 @@
 schema_version: 1
-version: "0.5.1"
+version: "0.6.0"
 name: kogito-quarkus-ubi8-s2i
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.5.1"
\ No newline at end of file
+  value: "0.6.0"
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8/module.yaml b/s2i/modules/kogito-quarkus-ubi8/module.yaml
index 882e05a64df..98fe52b1ef0 100644
--- a/s2i/modules/kogito-quarkus-ubi8/module.yaml
+++ b/s2i/modules/kogito-quarkus-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.1"
+version: "0.6.0"
 name: kogito-quarkus-ubi8
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
index 2056924acb1..c57d79c1b75 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
@@ -1,9 +1,9 @@
 schema_version: 1
-version: "0.5.1"
+version: "0.6.0"
 name: kogito-springboot-ubi8-s2i
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.5.1"
\ No newline at end of file
+  value: "0.6.0"
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot-ubi8/module.yaml b/s2i/modules/kogito-springboot-ubi8/module.yaml
index 62b2a9a776b..e87a075ab58 100644
--- a/s2i/modules/kogito-springboot-ubi8/module.yaml
+++ b/s2i/modules/kogito-springboot-ubi8/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-version: "0.5.1"
+version: "0.6.0"
 name: kogito-springboot-ubi8
 execute:
   - script: configure
diff --git a/s2i/tests/features/kogito-quarkus-index.feature b/s2i/tests/features/kogito-quarkus-index.feature
index ee8c41c7a30..c798d1a34ed 100644
--- a/s2i/tests/features/kogito-quarkus-index.feature
+++ b/s2i/tests/features/kogito-quarkus-index.feature
@@ -14,7 +14,7 @@ Feature: Kogito-quarkus-ubi8 feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.5.1-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-8.0.0-SNAPSHOT-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 988ab05b40f..22ea435e98e 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -108,8 +108,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.1
 
-    Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
     Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
+      | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
\ No newline at end of file

From 994f541d8fb390725f52eaf554ebfde4131169df Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 8 Nov 2019 14:06:14 -0300
Subject: [PATCH 065/709] [KOGITO-506] - Incremental builds are not working on
 OpenShift (#63)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 .../kogito-quarkus-ubi8-s2i/s2i/bin/assemble  |  1 -
 .../s2i/bin/save-artifacts                    |  2 +-
 .../s2i/bin/assemble                          |  1 -
 .../s2i/bin/save-artifacts                    |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 23 +++++++++----------
 .../kogito-springboot-ubi8-s2i.feature        |  2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
index afc6d4ab563..b61a1bd4b6b 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
@@ -25,7 +25,6 @@ fi
 
 ######################
 # incremental builds
-# import ${KOGITO_HOME}/launch/configure-maven.sh
 manage_incremental_build
 
 echo "---> Installing application source..."
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
index 8c3c58fea40..2817bd9d298 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-source ${KOGITO_HOME}/.m2/configure-maven.sh
+source ${KOGITO_HOME}/launch/configure-maven.sh
 s2i_save_build_artifacts
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
index db69ea3d318..4b5f4f71b07 100755
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
@@ -23,7 +23,6 @@ fi
 
 ######################
 # incremental builds
-# import ${KOGITO_HOME}/.m2/configure-maven.sh
 manage_incremental_build
 
 echo "---> Installing application source..."
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
index 7365c757e58..727bf235338 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-source ${KOGITO_HOME}/.m2/configure-maven.sh
+source ${KOGITO_HOME}/launch/configure-maven.sh
 s2i_save_build_artifacts
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 22ea435e98e..a1e130e979d 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i
-
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
@@ -65,12 +64,17 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.1
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | wait            | 80                       |
-      | expected_phrase | Mario is older than Mark |
+      | variable          | value                  |
+      | NATIVE            | false                  |
+    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+
+  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
+  Scenario: Perform a second incremental s2i build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.1
+      | variable          | value    |
+      | NATIVE            | false    |
+    Then s2i build log should contain Expanding artifacts from incremental build...
+    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   Scenario: Verify if the memory limit is correctly applied
     Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
@@ -85,11 +89,6 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner should exist
     And s2i build log should contain -J-Xmx1717986918
 
-  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
-  Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.1
-    Then s2i build log should contain Expanding artifacts from incremental build...
-
   Scenario: verify if all labels are correctly set.
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index 15b452bb3e0..e06cfb3f13c 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -46,7 +46,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
   Scenario: Perform a second incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.1
     Then s2i build log should contain Expanding artifacts from incremental build...
-
+    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   Scenario: verify if all labels are correctly set.
     Given image is built

From 1e4f0b87139b8d681b43dd3e81f4ebbe96c6cb70 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 8 Nov 2019 17:59:44 -0300
Subject: [PATCH 066/709] use the correct runnable jar for dataindex service
 (#64)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/modules/kogito-data-index/module.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index 697feabe122..ac2adb94b39 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -4,8 +4,8 @@ version: "0.6.0"
 
 artifacts:
 - name: data-index-service-8.0.0-SNAPSHOT-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191104.210837-62.jar
-  md5: cded9a9f3aa6a96341f69a12e4ed482d
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191107.210031-64-runner.jar
+  md5: 1cef83fbb6e8ab61e8fdd1f3dd49c3a3
 
 execute:
 - script: configure
\ No newline at end of file

From 8d911361431137f14b768d022d10368e81b3fa7f Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 19 Nov 2019 09:37:34 -0300
Subject: [PATCH 067/709] [KOGITO-384] - Add libsunec.so and cacerts to Kogito
 runtime native image (#65)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/kogito-quarkus-ubi8-overrides.yaml              |  2 ++
 s2i/kogito-quarkus-ubi8-s2i-overrides.yaml          |  3 ++-
 s2i/modules/add-kogito-user/add-user                |  3 +++
 s2i/modules/graalvm-binary/19.x/configure           | 13 +++++++++++++
 .../{graalvm => graalvm-binary}/19.x/module.yaml    |  2 +-
 s2i/modules/graalvm/19.x/configure                  | 12 ------------
 .../graalvm/{19.x => }/added/memory-limit.sh        |  0
 s2i/modules/graalvm/configure                       |  9 +++++++++
 s2i/modules/graalvm/module.yaml                     |  6 ++++++
 s2i/modules/kogito-data-index/configure             |  1 -
 s2i/modules/kogito-quarkus-ubi8-s2i/configure       |  2 --
 .../kogito-quarkus-ubi8-s2i/s2i/bin/assemble        |  6 ++----
 s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run     |  4 +++-
 s2i/modules/kogito-quarkus-ubi8/configure           |  5 +++++
 s2i/modules/kogito-quarkus-ubi8/s2i/bin/run         |  4 +++-
 s2i/modules/kogito-springboot-ubi8-s2i/configure    |  2 --
 s2i/tests/features/kogito-quarkus-ubi8-s2i.feature  |  7 +++++++
 s2i/tests/features/kogito-quarkus-ubi8.feature      |  4 ++++
 18 files changed, 60 insertions(+), 25 deletions(-)
 create mode 100644 s2i/modules/graalvm-binary/19.x/configure
 rename s2i/modules/{graalvm => graalvm-binary}/19.x/module.yaml (97%)
 delete mode 100644 s2i/modules/graalvm/19.x/configure
 rename s2i/modules/graalvm/{19.x => }/added/memory-limit.sh (100%)
 create mode 100644 s2i/modules/graalvm/configure
 create mode 100644 s2i/modules/graalvm/module.yaml

diff --git a/s2i/kogito-quarkus-ubi8-overrides.yaml b/s2i/kogito-quarkus-ubi8-overrides.yaml
index 347751f28dc..2b254e40065 100644
--- a/s2i/kogito-quarkus-ubi8-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-overrides.yaml
@@ -25,6 +25,8 @@ modules:
   install:
   - name: install-rpm-dependencies
   - name: add-kogito-user
+  - name: graalvm-binary
+    version: "19.2.1"
   - name: kogito-quarkus-ubi8
 
 
diff --git a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
index 0a16deccf53..b3679274999 100644
--- a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
@@ -30,8 +30,9 @@ modules:
   - name: install-rpm-dependencies
   - name: add-kogito-user
   - name: kogito-launch
-  - name: graalvm
+  - name: graalvm-binary
     version: "19.2.1"
+  - name: graalvm
   - name: maven
     version: "3.6.0"
   - name: kogito-quarkus-ubi8-s2i
diff --git a/s2i/modules/add-kogito-user/add-user b/s2i/modules/add-kogito-user/add-user
index 3a410212364..ea8304aff28 100644
--- a/s2i/modules/add-kogito-user/add-user
+++ b/s2i/modules/add-kogito-user/add-user
@@ -2,3 +2,6 @@
 
 groupadd -r kogito -g 1001 && useradd -u 1001 -r -g 1001 -m -d ${KOGITO_HOME} -s /sbin/nologin -c "Kogito user" ${USER}
 
+mkdir ${KOGITO_HOME}/bin
+chown -R 1001:0 ${KOGITO_HOME}
+
diff --git a/s2i/modules/graalvm-binary/19.x/configure b/s2i/modules/graalvm-binary/19.x/configure
new file mode 100644
index 00000000000..715d79ed616
--- /dev/null
+++ b/s2i/modules/graalvm-binary/19.x/configure
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+
+tar xzf ${SOURCES_DIR}/graalvm-ce-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
+
+#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
+mkdir -p $KOGITO_HOME/ssl-libs
+cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/ssl-libs
+cp -v $GRAALVM_HOME/jre/lib/security/cacerts $KOGITO_HOME/
diff --git a/s2i/modules/graalvm/19.x/module.yaml b/s2i/modules/graalvm-binary/19.x/module.yaml
similarity index 97%
rename from s2i/modules/graalvm/19.x/module.yaml
rename to s2i/modules/graalvm-binary/19.x/module.yaml
index c8f16828ee7..7d995c006a2 100644
--- a/s2i/modules/graalvm/19.x/module.yaml
+++ b/s2i/modules/graalvm-binary/19.x/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: graalvm
+name: graalvm-binary
 version: "19.2.1"
 
 envs:
diff --git a/s2i/modules/graalvm/19.x/configure b/s2i/modules/graalvm/19.x/configure
deleted file mode 100644
index 41ec80bc6fd..00000000000
--- a/s2i/modules/graalvm/19.x/configure
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-
-tar xzf ${SOURCES_DIR}/graalvm-ce-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
-
-cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
-
-/usr/share/graalvm/bin/gu -L install ${SOURCES_DIR}/native-image-installable-svm-linux-amd64-${GRAALVM_VERSION}.jar
\ No newline at end of file
diff --git a/s2i/modules/graalvm/19.x/added/memory-limit.sh b/s2i/modules/graalvm/added/memory-limit.sh
similarity index 100%
rename from s2i/modules/graalvm/19.x/added/memory-limit.sh
rename to s2i/modules/graalvm/added/memory-limit.sh
diff --git a/s2i/modules/graalvm/configure b/s2i/modules/graalvm/configure
new file mode 100644
index 00000000000..74fa893d2e2
--- /dev/null
+++ b/s2i/modules/graalvm/configure
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+
+cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
+
+/usr/share/graalvm/bin/gu -L install ${SOURCES_DIR}/native-image-installable-svm-linux-amd64-${GRAALVM_VERSION}.jar
diff --git a/s2i/modules/graalvm/module.yaml b/s2i/modules/graalvm/module.yaml
new file mode 100644
index 00000000000..b8dd7eb81ea
--- /dev/null
+++ b/s2i/modules/graalvm/module.yaml
@@ -0,0 +1,6 @@
+schema_version: 1
+name: graalvm
+version: "19.2.1"
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/configure b/s2i/modules/kogito-data-index/configure
index dfbaa763f02..a34371eebe3 100644
--- a/s2i/modules/kogito-data-index/configure
+++ b/s2i/modules/kogito-data-index/configure
@@ -5,7 +5,6 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname $0)
 ADDED_DIR=${SCRIPT_DIR}/added
 
-mkdir ${KOGITO_HOME}/bin
 mv ${SOURCES_DIR}/data-index-service-*-runner.jar ${KOGITO_HOME}/bin/
 mv ${ADDED_DIR}/* ${KOGITO_HOME}/bin/
 
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/configure b/s2i/modules/kogito-quarkus-ubi8-s2i/configure
index 4d48177eaef..0637d802521 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/configure
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/configure
@@ -5,8 +5,6 @@ SCRIPT_DIR=$(dirname $0)
 
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
-mkdir $KOGITO_HOME/bin
-
 chmod 755 /usr/local/s2i/*
 chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
index b61a1bd4b6b..215da021e4c 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
@@ -76,15 +76,13 @@ fi
 
 if [ "${NATIVE^^}" == "FALSE" ]; then
     echo "---> Installing jar file"
-    cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin
+    cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin/
     echo "---> Copying application libraries"
     cp -r $artifactDir/lib/ $KOGITO_HOME/bin/
 else
     echo "---> Installing application binaries"
-    cp -v $artifactDir/*-runner $KOGITO_HOME/bin
+    cp -v $artifactDir/*-runner $KOGITO_HOME/bin/
     chmod +x $KOGITO_HOME/bin/*-runner
-    echo "---> Copy native java libraries for ssl handling..."
-    cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/bin
 fi
 
 
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
index 828fb7a6a45..b4541e33ae6 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
@@ -6,4 +6,6 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
\ No newline at end of file
+exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 \
+    -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/ssl-libs \
+    -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8/configure b/s2i/modules/kogito-quarkus-ubi8/configure
index 286c6c2e034..e8254a32c95 100644
--- a/s2i/modules/kogito-quarkus-ubi8/configure
+++ b/s2i/modules/kogito-quarkus-ubi8/configure
@@ -8,3 +8,8 @@ chmod 755 /usr/local/s2i/*
 chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
 
+rm -rf  ${KOGITO_HOME}/launch/memory-limit.sh
+rm -rf /usr/share/graalvm
+
+unset JAVA_HOME
+unset GRAALVM_HOME
diff --git a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
index 80dfe5bd61e..bfbcd381ff3 100755
--- a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
@@ -6,5 +6,7 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/bin
+exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 \
+    -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/ssl-libs \
+    -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
 
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/configure b/s2i/modules/kogito-springboot-ubi8-s2i/configure
index bb04fbc0716..0fe63c4ce07 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/configure
+++ b/s2i/modules/kogito-springboot-ubi8-s2i/configure
@@ -5,8 +5,6 @@ SCRIPT_DIR=$(dirname $0)
 
 cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
 
-mkdir $KOGITO_HOME/bin
-
 chmod 755 /usr/local/s2i/*
 chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index a1e130e979d..36ef61735a5 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -61,6 +61,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
     And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner should exist
+    And file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
 
   Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.1
@@ -99,6 +101,11 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus
     And the image should contain label io.openshift.tags with value builder,kogito,quarkus
 
+  Scenario: verify java cacerts and libsunec are available in the given container.
+    When container is started with command bash
+    Then  file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+
   Scenario: verify if the maven and graal vm settings are correct
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
diff --git a/s2i/tests/features/kogito-quarkus-ubi8.feature b/s2i/tests/features/kogito-quarkus-ubi8.feature
index 8719905f6b3..9363d6a0da5 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8.feature
@@ -13,3 +13,7 @@ Feature: Kogito-quarkus-ubi8 feature.
      And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,native
      And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
 
+  Scenario: verify java cacerts and libsunec are available in the given container.
+    When container is started with command bash
+    Then  file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
\ No newline at end of file

From a833d2dadcd2a942212d9f72bc5ad656858f0fd8 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 19 Nov 2019 17:36:58 -0300
Subject: [PATCH 068/709] [KOGITO-516] - Remove native builds from behave tests
 on s2i modules (#66)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/README.md                                 |  1 -
 .../features/kogito-quarkus-ubi8-s2i.feature  | 37 +++++--------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/s2i/README.md b/s2i/README.md
index 9bbac880366..12d99b1eda1 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -70,7 +70,6 @@ Business assets are:
 - process definition - bpmn2
 - rule definition - drl
 - decision definition - dmn
-- etc
 
 Upon build these assets will be copied to generated kjar maven project and build with maven to produce the runnable binary.
 
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 36ef61735a5..895537da0f7 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -1,8 +1,10 @@
 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i
 Feature: kogito-quarkus-ubi8-s2i image tests
 
-  Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable       | value                     |
+      | LIMIT_MEMORY   | 2147483648                |
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
@@ -10,6 +12,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
     And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner should exist
+    And file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+    And s2i build log should contain -J-Xmx1717986918
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
@@ -52,18 +57,6 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | Mario is older than Mark |
     And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner.jar should exist
 
-  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | wait            | 80                       |
-      | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner should exist
-    And file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
-
   Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.1
       | variable          | value                  |
@@ -78,19 +71,6 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
-  Scenario: Verify if the memory limit is correctly applied
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable       | value       |
-      | LIMIT_MEMORY   | 2147483648  |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | wait            | 80                       |
-      | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner should exist
-    And s2i build log should contain -J-Xmx1717986918
-
   Scenario: verify if all labels are correctly set.
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
@@ -119,4 +99,5 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | variable          | value                           |
       | NATIVE            | false                           |
       | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
\ No newline at end of file
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
+

From f343cd8bc371718aac075cd9a0e7d33768d490c9 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 5 Dec 2019 13:41:27 -0300
Subject: [PATCH 069/709] [KOGITO-515] - Refactoring s2i modules to have a
 common module (#67)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile                                  |  44 ++--
 s2i/README.md                                 |   3 +-
 s2i/kogito-data-index-overrides.yaml          |   6 +-
 ...yaml => kogito-quarkus-jvm-overrides.yaml} |   9 +-
 ...des.yaml => kogito-quarkus-overrides.yaml} |   9 +-
 ...yaml => kogito-quarkus-s2i-overrides.yaml} |  18 +-
 ....yaml => kogito-springboot-overrides.yaml} |   9 +-
 ...l => kogito-springboot-s2i-overrides.yaml} |  13 +-
 s2i/modules/kogito-data-index/module.yaml     |   6 +-
 ...start.bats => kogito-dataindex-start.bats} |  14 +-
 .../19.x/configure                            |   0
 .../19.x/module.yaml                          |   2 +-
 .../added/memory-limit.sh                     |   0
 .../configure                                 |   0
 .../module.yaml                               |   2 +-
 .../tests/bats/memory-limits.bats             |   2 +-
 .../clean.sh                                  |   0
 .../module.yaml                               |   4 +-
 .../added/configure.sh                        |   1 -
 .../configure                                 |   0
 .../module.yaml                               |   2 +-
 .../3.6.0/added/configure-maven.sh            |  75 +++++++
 .../{maven => kogito-maven}/3.6.0/configure   |   0
 .../3.6.0/maven/settings.xml                  |   0
 .../{maven => kogito-maven}/3.6.0/module.yaml |   2 +-
 .../tests/bats/maven-settings.bats            | 138 ++++++++++++
 .../1.8.0-headless/module.yaml                |   2 +-
 s2i/modules/kogito-openjdk/1.8.0/clean.sh     |   4 +
 .../1.8.0/module.yaml                         |   8 +-
 s2i/modules/kogito-quarkus-jvm-ubi8/README.md |   7 -
 s2i/modules/kogito-quarkus-jvm-ubi8/configure |  10 -
 .../kogito-quarkus-jvm-ubi8/s2i/bin/assemble  |  20 --
 .../s2i/bin/assemble-runtime                  |  22 --
 s2i/modules/kogito-quarkus-jvm/README.md      |  14 ++
 .../added/kogito-app-launch.sh}               |  11 +-
 s2i/modules/kogito-quarkus-jvm/configure      |  15 ++
 .../module.yaml                               |   3 +-
 .../kogito-quarkus-jvm/s2i/bin/assemble       |   7 +
 s2i/modules/kogito-quarkus-jvm/s2i/bin/usage  |  16 ++
 .../README.md                                 |   8 +-
 .../added/kogito-app-launch.sh                |  22 ++
 s2i/modules/kogito-quarkus-s2i/configure      |  17 ++
 .../module.yaml                               |   3 +-
 .../kogito-quarkus-s2i/s2i/bin/assemble       |  36 ++++
 .../s2i/bin/usage                             |   6 +-
 s2i/modules/kogito-quarkus-ubi8-s2i/configure |  11 -
 .../kogito-quarkus-ubi8-s2i/s2i/bin/assemble  |  97 ---------
 .../kogito-quarkus-ubi8-s2i/s2i/bin/run       |  11 -
 .../s2i/bin/save-artifacts                    |   4 -
 s2i/modules/kogito-quarkus-ubi8/README.md     |   8 -
 .../kogito-quarkus-ubi8/s2i/bin/assemble      |  20 --
 .../s2i/bin/assemble-runtime                  |  23 --
 s2i/modules/kogito-quarkus-ubi8/s2i/bin/usage |  12 --
 s2i/modules/kogito-quarkus/README.md          |  14 ++
 .../added/kogito-app-launch.sh}               |  11 +-
 .../configure                                 |   7 +-
 .../module.yaml                               |   3 +-
 s2i/modules/kogito-quarkus/s2i/bin/assemble   |   7 +
 .../s2i/bin/usage                             |   6 +-
 s2i/modules/kogito-s2i-core/added/s2i-core    | 132 ++++++++++++
 s2i/modules/kogito-s2i-core/configure.sh      |  12 ++
 s2i/modules/kogito-s2i-core/module.yaml       |  41 ++++
 .../kogito-s2i-core/s2i/bin/assemble-runtime  |  12 ++
 s2i/modules/kogito-s2i-core/s2i/bin/run       |   2 +
 .../kogito-s2i-core/s2i/bin/save-artifacts    |   5 +
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 198 ++++++++++++++++++
 .../README.md                                 |   7 +-
 .../added/kogito-app-launch.sh}               |   9 +-
 s2i/modules/kogito-springboot-s2i/configure   |  15 ++
 .../module.yaml                               |   3 +-
 .../kogito-springboot-s2i/s2i/bin/assemble    |  34 +++
 .../s2i/bin/usage                             |   0
 .../kogito-springboot-ubi8-s2i/configure      |  10 -
 .../s2i/bin/assemble                          |  78 -------
 .../s2i/bin/save-artifacts                    |   4 -
 s2i/modules/kogito-springboot-ubi8/configure  |  10 -
 .../kogito-springboot-ubi8/s2i/bin/assemble   |  21 --
 .../s2i/bin/assemble-runtime                  |  22 --
 .../README.md                                 |   8 +
 .../added/kogito-app-launch.sh}               |  10 +-
 s2i/modules/kogito-springboot/configure       |  16 ++
 .../module.yaml                               |   4 +-
 .../kogito-springboot/s2i/bin/assemble        |   7 +
 .../s2i/bin/usage                             |   2 +-
 .../add-user                                  |   0
 .../module.yaml                               |   2 +-
 .../maven/3.6.0/added/configure-maven.sh      |  85 --------
 s2i/tests/features/common.feature             |   4 +
 .../features/kogito-quarkus-index.feature     |   2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  |   2 +-
 90 files changed, 1008 insertions(+), 573 deletions(-)
 rename s2i/{kogito-quarkus-jvm-ubi8-overrides.yaml => kogito-quarkus-jvm-overrides.yaml} (83%)
 rename s2i/{kogito-quarkus-ubi8-overrides.yaml => kogito-quarkus-overrides.yaml} (82%)
 rename s2i/{kogito-quarkus-ubi8-s2i-overrides.yaml => kogito-quarkus-s2i-overrides.yaml} (71%)
 rename s2i/{kogito-springboot-ubi8-overrides.yaml => kogito-springboot-overrides.yaml} (81%)
 rename s2i/{kogito-springboot-ubi8-s2i-overrides.yaml => kogito-springboot-s2i-overrides.yaml} (74%)
 rename s2i/modules/kogito-data-index/tests/bats/{start.bats => kogito-dataindex-start.bats} (98%)
 rename s2i/modules/{graalvm-binary => kogito-graalvm-installer}/19.x/configure (100%)
 rename s2i/modules/{graalvm-binary => kogito-graalvm-installer}/19.x/module.yaml (94%)
 rename s2i/modules/{graalvm => kogito-graalvm-scripts}/added/memory-limit.sh (100%)
 rename s2i/modules/{graalvm => kogito-graalvm-scripts}/configure (100%)
 rename s2i/modules/{graalvm => kogito-graalvm-scripts}/module.yaml (63%)
 rename s2i/{ => modules/kogito-graalvm-scripts}/tests/bats/memory-limits.bats (94%)
 rename s2i/modules/{install-rpm-dependencies => kogito-image-dependencies}/clean.sh (100%)
 rename s2i/modules/{install-rpm-dependencies => kogito-image-dependencies}/module.yaml (58%)
 rename s2i/modules/{kogito-launch => kogito-launch-scripts}/added/configure.sh (99%)
 rename s2i/modules/{kogito-launch => kogito-launch-scripts}/configure (100%)
 rename s2i/modules/{kogito-launch => kogito-launch-scripts}/module.yaml (64%)
 create mode 100644 s2i/modules/kogito-maven/3.6.0/added/configure-maven.sh
 rename s2i/modules/{maven => kogito-maven}/3.6.0/configure (100%)
 rename s2i/modules/{maven => kogito-maven}/3.6.0/maven/settings.xml (100%)
 rename s2i/modules/{maven => kogito-maven}/3.6.0/module.yaml (97%)
 create mode 100644 s2i/modules/kogito-maven/tests/bats/maven-settings.bats
 rename s2i/modules/{java-openjdk => kogito-openjdk}/1.8.0-headless/module.yaml (94%)
 create mode 100644 s2i/modules/kogito-openjdk/1.8.0/clean.sh
 rename s2i/modules/{java-openjdk => kogito-openjdk}/1.8.0/module.yaml (83%)
 delete mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/README.md
 delete mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/configure
 delete mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble
 delete mode 100644 s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble-runtime
 create mode 100644 s2i/modules/kogito-quarkus-jvm/README.md
 rename s2i/modules/{kogito-quarkus-jvm-ubi8/s2i/bin/run => kogito-quarkus-jvm/added/kogito-app-launch.sh} (66%)
 mode change 100755 => 100644
 create mode 100644 s2i/modules/kogito-quarkus-jvm/configure
 rename s2i/modules/{kogito-quarkus-jvm-ubi8 => kogito-quarkus-jvm}/module.yaml (65%)
 create mode 100755 s2i/modules/kogito-quarkus-jvm/s2i/bin/assemble
 create mode 100644 s2i/modules/kogito-quarkus-jvm/s2i/bin/usage
 rename s2i/modules/{kogito-quarkus-ubi8-s2i => kogito-quarkus-s2i}/README.md (68%)
 create mode 100644 s2i/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
 create mode 100644 s2i/modules/kogito-quarkus-s2i/configure
 rename s2i/modules/{kogito-springboot-ubi8-s2i => kogito-quarkus-s2i}/module.yaml (77%)
 create mode 100644 s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble
 rename s2i/modules/{kogito-quarkus-ubi8-s2i => kogito-quarkus-s2i}/s2i/bin/usage (83%)
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8-s2i/configure
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8/README.md
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble-runtime
 delete mode 100644 s2i/modules/kogito-quarkus-ubi8/s2i/bin/usage
 create mode 100644 s2i/modules/kogito-quarkus/README.md
 rename s2i/modules/{kogito-quarkus-ubi8/s2i/bin/run => kogito-quarkus/added/kogito-app-launch.sh} (71%)
 mode change 100755 => 100644
 rename s2i/modules/{kogito-quarkus-ubi8 => kogito-quarkus}/configure (54%)
 rename s2i/modules/{kogito-quarkus-ubi8 => kogito-quarkus}/module.yaml (68%)
 create mode 100755 s2i/modules/kogito-quarkus/s2i/bin/assemble
 rename s2i/modules/{kogito-quarkus-jvm-ubi8 => kogito-quarkus}/s2i/bin/usage (55%)
 create mode 100644 s2i/modules/kogito-s2i-core/added/s2i-core
 create mode 100644 s2i/modules/kogito-s2i-core/configure.sh
 create mode 100644 s2i/modules/kogito-s2i-core/module.yaml
 create mode 100644 s2i/modules/kogito-s2i-core/s2i/bin/assemble-runtime
 create mode 100644 s2i/modules/kogito-s2i-core/s2i/bin/run
 create mode 100644 s2i/modules/kogito-s2i-core/s2i/bin/save-artifacts
 create mode 100644 s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
 rename s2i/modules/{kogito-springboot-ubi8-s2i => kogito-springboot-s2i}/README.md (61%)
 rename s2i/modules/{kogito-springboot-ubi8-s2i/s2i/bin/run => kogito-springboot-s2i/added/kogito-app-launch.sh} (75%)
 mode change 100755 => 100644
 create mode 100644 s2i/modules/kogito-springboot-s2i/configure
 rename s2i/modules/{kogito-quarkus-ubi8-s2i => kogito-springboot-s2i}/module.yaml (75%)
 create mode 100755 s2i/modules/kogito-springboot-s2i/s2i/bin/assemble
 rename s2i/modules/{kogito-springboot-ubi8-s2i => kogito-springboot-s2i}/s2i/bin/usage (100%)
 delete mode 100644 s2i/modules/kogito-springboot-ubi8-s2i/configure
 delete mode 100755 s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
 delete mode 100644 s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
 delete mode 100644 s2i/modules/kogito-springboot-ubi8/configure
 delete mode 100755 s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble
 delete mode 100755 s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble-runtime
 rename s2i/modules/{kogito-springboot-ubi8 => kogito-springboot}/README.md (57%)
 rename s2i/modules/{kogito-springboot-ubi8/s2i/bin/run => kogito-springboot/added/kogito-app-launch.sh} (62%)
 mode change 100755 => 100644
 create mode 100644 s2i/modules/kogito-springboot/configure
 rename s2i/modules/{kogito-springboot-ubi8 => kogito-springboot}/module.yaml (66%)
 create mode 100755 s2i/modules/kogito-springboot/s2i/bin/assemble
 rename s2i/modules/{kogito-springboot-ubi8 => kogito-springboot}/s2i/bin/usage (94%)
 rename s2i/modules/{add-kogito-user => kogito-system-user}/add-user (100%)
 rename s2i/modules/{add-kogito-user => kogito-system-user}/module.yaml (81%)
 delete mode 100644 s2i/modules/maven/3.6.0/added/configure-maven.sh

diff --git a/s2i/Makefile b/s2i/Makefile
index 9c1a7d72258..c48be26d48b 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -7,19 +7,19 @@ BUILD_ENGINE := docker
 build: kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index
 
 kogito-quarkus-ubi8:
-	cekit -v build --overrides-file kogito-quarkus-ubi8-overrides.yaml ${BUILD_ENGINE}
+	cekit -v build --overrides-file kogito-quarkus-overrides.yaml ${BUILD_ENGINE}
 
 kogito-quarkus-jvm-ubi8:
-	cekit -v build --overrides-file kogito-quarkus-jvm-ubi8-overrides.yaml ${BUILD_ENGINE}
+	cekit -v build --overrides-file kogito-quarkus-jvm-overrides.yaml ${BUILD_ENGINE}
 
 kogito-quarkus-ubi8-s2i:
-	cekit -v build --overrides-file kogito-quarkus-ubi8-s2i-overrides.yaml ${BUILD_ENGINE}
+	cekit -v build --overrides-file kogito-quarkus-s2i-overrides.yaml ${BUILD_ENGINE}
 
 kogito-springboot-ubi8:
-	cekit -v build --overrides-file kogito-springboot-ubi8-overrides.yaml ${BUILD_ENGINE}
+	cekit -v build --overrides-file kogito-springboot-overrides.yaml ${BUILD_ENGINE}
 
 kogito-springboot-ubi8-s2i:
-	cekit -v build --overrides-file kogito-springboot-ubi8-s2i-overrides.yaml ${BUILD_ENGINE}
+	cekit -v build --overrides-file kogito-springboot-s2i-overrides.yaml ${BUILD_ENGINE}
 
 kogito-data-index:
 	cekit -v build --overrides-file kogito-data-index-overrides.yaml ${BUILD_ENGINE}
@@ -28,12 +28,12 @@ kogito-data-index:
 # Build and test all images
 .PHONY: test
 test:
-	cekit -v test --overrides-file kogito-quarkus-ubi8-overrides.yaml behave
-	cekit -v test --overrides-file kogito-quarkus-jvm-ubi8-overrides.yaml behave
+	cekit -v test --overrides-file kogito-quarkus-overrides.yaml behave
+	cekit -v test --overrides-file kogito-quarkus-jvm-overrides.yaml behave
 	cd tests/test-apps && sh clone-repo.sh
-	cekit -v test --overrides-file kogito-quarkus-ubi8-s2i-overrides.yaml behave
-	cekit -v test --overrides-file kogito-springboot-ubi8-overrides.yaml behave
-	cekit -v test --overrides-file kogito-springboot-ubi8-s2i-overrides.yaml behave
+	cekit -v test --overrides-file kogito-quarkus-s2i-overrides.yaml behave
+	cekit -v test --overrides-file kogito-springboot-overrides.yaml behave
+	cekit -v test --overrides-file kogito-springboot-s2i-overrides.yaml behave
 	cekit -v test --overrides-file kogito-data-index-overrides.yaml behave
 
 
@@ -59,20 +59,20 @@ _push:
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc2
 
-	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
\ No newline at end of file
+	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc2
+	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc2
\ No newline at end of file
diff --git a/s2i/README.md b/s2i/README.md
index 12d99b1eda1..69f23f36ff7 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -3,7 +3,8 @@
 To be able to produce efficient container images for Kogito there are following sets
 of builder images to perform the build and to run the result binaries.
 
-Images are grouped by the runtime that will run the binaries and the OS level
+Images are grouped by the runtime that will run the binaries and the builders which will actually build the 
+binaries and copy it to the runtime image.
 
 
 ## Quarkus
diff --git a/s2i/kogito-data-index-overrides.yaml b/s2i/kogito-data-index-overrides.yaml
index a91f4ad61a7..9ea48d20f1d 100644
--- a/s2i/kogito-data-index-overrides.yaml
+++ b/s2i/kogito-data-index-overrides.yaml
@@ -35,9 +35,9 @@ ports:
 
 modules:
   install:
-  - name: install-rpm-dependencies
-  - name: add-kogito-user
-  - name: kogito-data-index
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.dataindex
 
 packages:
   install:
diff --git a/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml b/s2i/kogito-quarkus-jvm-overrides.yaml
similarity index 83%
rename from s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
rename to s2i/kogito-quarkus-jvm-overrides.yaml
index 94687a099ae..3f90c054d67 100644
--- a/s2i/kogito-quarkus-jvm-ubi8-overrides.yaml
+++ b/s2i/kogito-quarkus-jvm-overrides.yaml
@@ -23,11 +23,12 @@ ports:
 
 modules:
   install:
-  - name: install-rpm-dependencies
-  - name: add-kogito-user
-  - name: java-openjdk
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.openjdk
     version: "1.8.0-headless"
-  - name: kogito-quarkus-jvm-ubi8
+  - name: org.kie.kogito.s2i.core
+  - name: org.kie.kogito.quarkus.jvm
 
 
 ## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
diff --git a/s2i/kogito-quarkus-ubi8-overrides.yaml b/s2i/kogito-quarkus-overrides.yaml
similarity index 82%
rename from s2i/kogito-quarkus-ubi8-overrides.yaml
rename to s2i/kogito-quarkus-overrides.yaml
index 2b254e40065..2f0c6a67607 100644
--- a/s2i/kogito-quarkus-ubi8-overrides.yaml
+++ b/s2i/kogito-quarkus-overrides.yaml
@@ -23,11 +23,12 @@ ports:
 
 modules:
   install:
-  - name: install-rpm-dependencies
-  - name: add-kogito-user
-  - name: graalvm-binary
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.graalvm.installer
     version: "19.2.1"
-  - name: kogito-quarkus-ubi8
+  - name: org.kie.kogito.s2i.core
+  - name: org.kie.kogito.quarkus
 
 
 ## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
diff --git a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml b/s2i/kogito-quarkus-s2i-overrides.yaml
similarity index 71%
rename from s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
rename to s2i/kogito-quarkus-s2i-overrides.yaml
index b3679274999..c93a0890e55 100644
--- a/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-s2i-overrides.yaml
@@ -27,18 +27,22 @@ envs:
 
 modules:
   install:
-  - name: install-rpm-dependencies
-  - name: add-kogito-user
-  - name: kogito-launch
-  - name: graalvm-binary
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.graalvm.installer
     version: "19.2.1"
-  - name: graalvm
-  - name: maven
+  - name: org.kie.kogito.graalvm.scripts
+  - name: org.kie.kogito.openjdk
+    version: "1.8.0"
+  - name: org.kie.kogito.maven
     version: "3.6.0"
-  - name: kogito-quarkus-ubi8-s2i
+  - name: org.kie.kogito.s2i.core
+  - name: org.kie.kogito.quarkus.s2i
 
 packages:
   install:
+  - bc
   - gcc
   - glibc-devel
   - zlib-devel
diff --git a/s2i/kogito-springboot-ubi8-overrides.yaml b/s2i/kogito-springboot-overrides.yaml
similarity index 81%
rename from s2i/kogito-springboot-ubi8-overrides.yaml
rename to s2i/kogito-springboot-overrides.yaml
index ad999936062..2b9431ee86e 100644
--- a/s2i/kogito-springboot-ubi8-overrides.yaml
+++ b/s2i/kogito-springboot-overrides.yaml
@@ -23,11 +23,12 @@ ports:
 
 modules:
   install:
-  - name: install-rpm-dependencies
-  - name: add-kogito-user
-  - name: java-openjdk
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.openjdk
     version: "1.8.0-headless"
-  - name: kogito-springboot-ubi8
+  - name: org.kie.kogito.s2i.core
+  - name: org.kie.kogito.springboot
 
 # s2i build . quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
 run:
diff --git a/s2i/kogito-springboot-ubi8-s2i-overrides.yaml b/s2i/kogito-springboot-s2i-overrides.yaml
similarity index 74%
rename from s2i/kogito-springboot-ubi8-s2i-overrides.yaml
rename to s2i/kogito-springboot-s2i-overrides.yaml
index 9ed3bad4894..6acc286a648 100644
--- a/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
+++ b/s2i/kogito-springboot-s2i-overrides.yaml
@@ -24,11 +24,12 @@ envs:
 
 modules:
   install:
-  - name: install-rpm-dependencies
-  - name: add-kogito-user
-  - name: kogito-launch
-  - name: maven
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.maven
     version: "3.6.0"
-  - name: java-openjdk
+  - name: org.kie.kogito.openjdk
     version: "1.8.0"
-  - name: kogito-springboot-ubi8-s2i
+  - name: org.kie.kogito.s2i.core
+  - name: org.kie.kogito.springboot.s2i
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index ac2adb94b39..1ba2c903ac6 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
-name: kogito-data-index
+name: org.kie.kogito.dataindex
 version: "0.6.0"
 
 artifacts:
 - name: data-index-service-8.0.0-SNAPSHOT-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191107.210031-64-runner.jar
-  md5: 1cef83fbb6e8ab61e8fdd1f3dd49c3a3
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191203.211509-90-runner.jar
+  md5: bf541da0f17e2c783385c0cfe968cfd0
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/tests/bats/start.bats b/s2i/modules/kogito-data-index/tests/bats/kogito-dataindex-start.bats
similarity index 98%
rename from s2i/modules/kogito-data-index/tests/bats/start.bats
rename to s2i/modules/kogito-data-index/tests/bats/kogito-dataindex-start.bats
index 769996b545e..6e7d85c0e0f 100644
--- a/s2i/modules/kogito-data-index/tests/bats/start.bats
+++ b/s2i/modules/kogito-data-index/tests/bats/kogito-dataindex-start.bats
@@ -17,7 +17,7 @@ function clear_vars() {
     clear_vars
     local expected=""
     run set_infinispan_props
-    
+
     echo "Result is ${output} and expected is ${expected}" >&2
     [ "${expected}" = "${output}" ]
 }
@@ -28,7 +28,7 @@ function clear_vars() {
     export INFINISPAN_USEAUTH="false"
     local expected="-Dquarkus.infinispan-client.use-auth=false"
     run set_infinispan_props
-    
+
     echo "Result is ${output} and expected is ${expected}" >&2
     [ "${expected}" = "${output}" ]
 }
@@ -40,10 +40,10 @@ function clear_vars() {
     export INFINISPAN_PASSWORD="developer"
     export INFINISPAN_AUTHREALM="default"
     export INFINISPAN_SASLMECHANISM="PLAIN"
-    
+
     local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.auth-password=developer -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.auth-realm=default -Dquarkus.infinispan-client.sasl-mechanism=PLAIN"
     run set_infinispan_props
-    
+
     echo "Result is ${output} and expected is ${expected}" >&2
     [ "${expected}" = "${output}" ]
 }
@@ -55,7 +55,7 @@ function clear_vars() {
     local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
 
     run set_infinispan_props
-    
+
     echo "Result is ${output} and expected is ${expected}" >&2
     [ "${expected}" = "${output}" ]
 }
@@ -66,7 +66,7 @@ function clear_vars() {
     local expected="-Dquarkus.infinispan-client.use-auth=false"
 
     run set_infinispan_props
-    
+
     echo "Result is ${output} and expected is ${expected}" >&2
     [ "${expected}" = "${output}" ]
 }
@@ -78,7 +78,7 @@ function clear_vars() {
     local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
 
     run set_infinispan_props
-    
+
     echo "Result is ${output} and expected is ${expected}" >&2
     [ "${expected}" = "${output}" ]
 }
diff --git a/s2i/modules/graalvm-binary/19.x/configure b/s2i/modules/kogito-graalvm-installer/19.x/configure
similarity index 100%
rename from s2i/modules/graalvm-binary/19.x/configure
rename to s2i/modules/kogito-graalvm-installer/19.x/configure
diff --git a/s2i/modules/graalvm-binary/19.x/module.yaml b/s2i/modules/kogito-graalvm-installer/19.x/module.yaml
similarity index 94%
rename from s2i/modules/graalvm-binary/19.x/module.yaml
rename to s2i/modules/kogito-graalvm-installer/19.x/module.yaml
index 7d995c006a2..2829a31d358 100644
--- a/s2i/modules/graalvm-binary/19.x/module.yaml
+++ b/s2i/modules/kogito-graalvm-installer/19.x/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: graalvm-binary
+name: org.kie.kogito.graalvm.installer
 version: "19.2.1"
 
 envs:
diff --git a/s2i/modules/graalvm/added/memory-limit.sh b/s2i/modules/kogito-graalvm-scripts/added/memory-limit.sh
similarity index 100%
rename from s2i/modules/graalvm/added/memory-limit.sh
rename to s2i/modules/kogito-graalvm-scripts/added/memory-limit.sh
diff --git a/s2i/modules/graalvm/configure b/s2i/modules/kogito-graalvm-scripts/configure
similarity index 100%
rename from s2i/modules/graalvm/configure
rename to s2i/modules/kogito-graalvm-scripts/configure
diff --git a/s2i/modules/graalvm/module.yaml b/s2i/modules/kogito-graalvm-scripts/module.yaml
similarity index 63%
rename from s2i/modules/graalvm/module.yaml
rename to s2i/modules/kogito-graalvm-scripts/module.yaml
index b8dd7eb81ea..1124674e392 100644
--- a/s2i/modules/graalvm/module.yaml
+++ b/s2i/modules/kogito-graalvm-scripts/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: graalvm
+name: org.kie.kogito.graalvm.scripts
 version: "19.2.1"
 
 execute:
diff --git a/s2i/tests/bats/memory-limits.bats b/s2i/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
similarity index 94%
rename from s2i/tests/bats/memory-limits.bats
rename to s2i/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
index f1a0b2334e2..b20ae95649b 100644
--- a/s2i/tests/bats/memory-limits.bats
+++ b/s2i/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 
 # imports
-source $BATS_TEST_DIRNAME/../../modules/graalvm/19.x/added/memory-limit.sh
+source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
 
 @test "test a valid memory limit value" {
     export LIMIT_MEMORY="1342177280"
diff --git a/s2i/modules/install-rpm-dependencies/clean.sh b/s2i/modules/kogito-image-dependencies/clean.sh
similarity index 100%
rename from s2i/modules/install-rpm-dependencies/clean.sh
rename to s2i/modules/kogito-image-dependencies/clean.sh
diff --git a/s2i/modules/install-rpm-dependencies/module.yaml b/s2i/modules/kogito-image-dependencies/module.yaml
similarity index 58%
rename from s2i/modules/install-rpm-dependencies/module.yaml
rename to s2i/modules/kogito-image-dependencies/module.yaml
index 862bbbec664..f1ece4b1f11 100644
--- a/s2i/modules/install-rpm-dependencies/module.yaml
+++ b/s2i/modules/kogito-image-dependencies/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
+name: org.kie.kogito.image.dependencies
 version: "0.6.0"
-name: install-rpm-dependencies
+description: holds common dependencies across images
 
 execute:
   - script: clean.sh
 
-# holds common dependencies across images
 packages:
   install:
     - shadow-utils
diff --git a/s2i/modules/kogito-launch/added/configure.sh b/s2i/modules/kogito-launch-scripts/added/configure.sh
similarity index 99%
rename from s2i/modules/kogito-launch/added/configure.sh
rename to s2i/modules/kogito-launch-scripts/added/configure.sh
index 8be292b0b81..b97f3427cb4 100644
--- a/s2i/modules/kogito-launch/added/configure.sh
+++ b/s2i/modules/kogito-launch-scripts/added/configure.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # This script executes a list of modules defined by CONFIGURE_SCRIPTS.
 #
 # Configuration occurs over three basic phases: preConfigure, configure and
diff --git a/s2i/modules/kogito-launch/configure b/s2i/modules/kogito-launch-scripts/configure
similarity index 100%
rename from s2i/modules/kogito-launch/configure
rename to s2i/modules/kogito-launch-scripts/configure
diff --git a/s2i/modules/kogito-launch/module.yaml b/s2i/modules/kogito-launch-scripts/module.yaml
similarity index 64%
rename from s2i/modules/kogito-launch/module.yaml
rename to s2i/modules/kogito-launch-scripts/module.yaml
index 7d97923071a..07fe8b2f563 100644
--- a/s2i/modules/kogito-launch/module.yaml
+++ b/s2i/modules/kogito-launch-scripts/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: kogito-launch
+name: org.kie.kogito.launch.scripts
 version: "0.6.0"
 
 execute:
diff --git a/s2i/modules/kogito-maven/3.6.0/added/configure-maven.sh b/s2i/modules/kogito-maven/3.6.0/added/configure-maven.sh
new file mode 100644
index 00000000000..3b9f981a6e1
--- /dev/null
+++ b/s2i/modules/kogito-maven/3.6.0/added/configure-maven.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+function prepareEnv() {
+    unset HTTPS_PROXY
+    unset HTTP_PROXY_HOST
+    unset HTTP_PROXY_PORT
+    unset HTTP_PROXY_PASSWORD
+    unset HTTP_PROXY_USERNAME
+    unset HTTP_PROXY_NONPROXYHOSTS
+    unset MAVEN_MIRROR_URL
+}
+
+function configure() {
+    configure_proxy
+    configure_mirrors
+}
+
+# insert settings for HTTP proxy into maven settings.xml if supplied
+function configure_proxy() {
+    # prefer old http_proxy_ format for username/password, but
+    # also allow proxy_ format.
+    HTTP_PROXY_USERNAME=${HTTP_PROXY_USERNAME:-$PROXY_USERNAME}
+    HTTP_PROXY_PASSWORD=${HTTP_PROXY_PASSWORD:-$PROXY_PASSWORD}
+
+    proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}}
+    # if http_proxy_host/port is set, prefer that (oldest mechanism)
+    # before looking at HTTP(S)_PROXY
+    proxyhost=${HTTP_PROXY_HOST:-$(echo $proxy | cut -d : -f 1,2)}
+    proxyport=${HTTP_PROXY_PORT:-$(echo $proxy | cut -d : -f 3)}
+
+    if [ -n "$proxyhost" ]; then
+        if [[ `echo $proxyhost | grep -i https://` ]]; then
+          proxyport=${proxyport:-443}
+          proxyprotocol="https"
+        else
+          proxyport=${proxyport:-80}
+          proxyprotocol="http"
+        fi
+
+        xml="<proxy>\
+         <id>genproxy</id>\
+         <active>true</active>\
+         <protocol>$proxyprotocol</protocol>\
+         <host>$proxyhost</host>\
+         <port>$proxyport</port>"
+
+        if [ -n "$HTTP_PROXY_USERNAME" -a -n "$HTTP_PROXY_PASSWORD" ]; then
+            xml="$xml\
+         <username>$HTTP_PROXY_USERNAME</username>\
+         <password>$HTTP_PROXY_PASSWORD</password>"
+        fi
+        if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then
+            nonproxyhosts=$(echo ${HTTP_PROXY_NONPROXYHOSTS} | sed -e 's/|/\\|/')
+            xml="$xml\
+         <nonProxyHosts>$nonproxyhosts</nonProxyHosts>"
+        fi
+        xml="$xml\
+       </proxy>"
+        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" $HOME/.m2/settings.xml
+    fi
+}
+
+# insert settings for mirrors/repository managers into settings.xml if supplied
+function configure_mirrors() {
+    if [ -n "$MAVEN_MIRROR_URL" ]; then
+        xml="    <mirror>\
+      <id>mirror.default</id>\
+      <url>$MAVEN_MIRROR_URL</url>\
+      <mirrorOf>external:*</mirrorOf>\
+    </mirror>"
+        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" $HOME/.m2/settings.xml
+    fi
+}
+
+
diff --git a/s2i/modules/maven/3.6.0/configure b/s2i/modules/kogito-maven/3.6.0/configure
similarity index 100%
rename from s2i/modules/maven/3.6.0/configure
rename to s2i/modules/kogito-maven/3.6.0/configure
diff --git a/s2i/modules/maven/3.6.0/maven/settings.xml b/s2i/modules/kogito-maven/3.6.0/maven/settings.xml
similarity index 100%
rename from s2i/modules/maven/3.6.0/maven/settings.xml
rename to s2i/modules/kogito-maven/3.6.0/maven/settings.xml
diff --git a/s2i/modules/maven/3.6.0/module.yaml b/s2i/modules/kogito-maven/3.6.0/module.yaml
similarity index 97%
rename from s2i/modules/maven/3.6.0/module.yaml
rename to s2i/modules/kogito-maven/3.6.0/module.yaml
index 2d60839bc97..a73bb8f685b 100644
--- a/s2i/modules/maven/3.6.0/module.yaml
+++ b/s2i/modules/kogito-maven/3.6.0/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: maven
+name: org.kie.kogito.maven
 version: "3.6.0"
 
 envs:
diff --git a/s2i/modules/kogito-maven/tests/bats/maven-settings.bats b/s2i/modules/kogito-maven/tests/bats/maven-settings.bats
new file mode 100644
index 00000000000..f4be1ed29a5
--- /dev/null
+++ b/s2i/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -0,0 +1,138 @@
+#!/usr/bin/env bats
+
+# imports
+source $BATS_TEST_DIRNAME/../../3.6.0/added/configure-maven.sh
+
+
+setup() {
+    export HOME=$BATS_TMPDIR/maven
+    mkdir -p ${HOME}/.m2/
+    cp $BATS_TEST_DIRNAME/../../3.6.0/maven/settings.xml ${HOME}/.m2/
+}
+
+teardown() {
+    rm -rf ${HOME}
+}
+
+@test "test maven mirror configuration" {
+    prepareEnv
+    MAVEN_MIRROR_URL="http://localhost:8081/nexus/custom/repo/public"
+    run configure_mirrors
+    expected="<mirror>      <id>mirror.default</id>      <url>http://localhost:8081/nexus/custom/repo/public</url>      <mirrorOf>external:*</mirrorOf>    </mirror>"
+    result=$(xmllint --xpath "//*[local-name()='mirrors']//*[local-name()='mirror']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "expected=${result}"
+     [ "${expected}" = "${result}" ]
+}
+
+@test "test maven proxy configuration with HTTPS_PROXY env custom port https" {
+    prepareEnv
+    HTTPS_PROXY="https://10.10.10.10:8443"
+    run configure_proxy
+    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>https</protocol>         <host>https://10.10.10.10</host>         <port>8443</port>       </proxy>"
+    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven proxy configuration with HTTPS_PROXY env default port https" {
+    prepareEnv
+    HTTPS_PROXY="https://10.10.10.10:"
+    run configure_proxy
+    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>https</protocol>         <host>https://10.10.10.10</host>         <port>443</port>       </proxy>"
+    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven proxy configuration with HTTPS_PROXY env custom port https with username and password" {
+    prepareEnv
+    HTTPS_PROXY="https://10.10.10.10:8443"
+    PROXY_USERNAME="hello"
+    PROXY_PASSWORD="impossible2guess"
+    run configure_proxy
+    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>https</protocol>         <host>https://10.10.10.10</host>         <port>8443</port>         <username>hello</username>         <password>impossible2guess</password>       </proxy>"
+    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven proxy configuration with HTTP_PROXY env custom port http" {
+    prepareEnv
+    HTTP_PROXY="http://10.10.10.20:8003"
+    run configure_proxy
+    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>http://10.10.10.20</host>         <port>8003</port>       </proxy>"
+    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven proxy configuration with HTTP_PROXY env default port http with password" {
+    prepareEnv
+    HTTP_PROXY="http://10.10.10.20"
+    PROXY_USERNAME="hello"
+    PROXY_PASSWORD="impossible2guess"
+    run configure_proxy
+    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>http://10.10.10.20</host>         <port>80</port>         <username>hello</username>         <password>impossible2guess</password>       </proxy>"
+    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven proxy configuration with HTTP_PROXY env custom port http with username" {
+    prepareEnv
+    HTTP_PROXY="http://10.10.10.20:8003"
+    run configure_proxy
+    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>http://10.10.10.20</host>         <port>8003</port>       </proxy>"
+    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven proxy configuration with PROXY_ envs http" {
+    prepareEnv
+    HTTP_PROXY_HOST="10.10.10.20"
+    HTTP_PROXY_PORT="8080"
+    HTTP_PROXY_PASSWORD="impossible2guess"
+    HTTP_PROXY_USERNAME="beleza_pura"
+    HTTP_PROXY_NONPROXYHOSTS="127.0.0.1|10.1.1.1"
+    run configure_proxy
+    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>10.10.10.20</host>         <port>8080</port>         <username>beleza_pura</username>         <password>impossible2guess</password>         <nonProxyHosts>127.0.0.1|10.1.1.1</nonProxyHosts>       </proxy>"
+    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven proxy configuration with PROXY_ envs default port http no username" {
+    prepareEnv
+    HTTP_PROXY_HOST="10.10.10.20"
+    HTTP_PROXY_NONPROXYHOSTS="127.0.0.1|10.1.1.1"
+    run configure_proxy
+    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>10.10.10.20</host>         <port>80</port>         <nonProxyHosts>127.0.0.1|10.1.1.1</nonProxyHosts>       </proxy>"
+    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven proxy configuration with PROXY_ envs https" {
+    prepareEnv
+    HTTP_PROXY_HOST="https://10.10.10.20"
+    HTTP_PROXY_PORT="8443"
+    HTTP_PROXY_PASSWORD="impossible2guess"
+    HTTP_PROXY_USERNAME="beleza_pura"
+    HTTP_PROXY_NONPROXYHOSTS="127.0.0.1|10.1.1.1"
+    run configure_proxy
+    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>https</protocol>         <host>https://10.10.10.20</host>         <port>8443</port>         <username>beleza_pura</username>         <password>impossible2guess</password>         <nonProxyHosts>127.0.0.1|10.1.1.1</nonProxyHosts>       </proxy>"
+    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
\ No newline at end of file
diff --git a/s2i/modules/java-openjdk/1.8.0-headless/module.yaml b/s2i/modules/kogito-openjdk/1.8.0-headless/module.yaml
similarity index 94%
rename from s2i/modules/java-openjdk/1.8.0-headless/module.yaml
rename to s2i/modules/kogito-openjdk/1.8.0-headless/module.yaml
index 2de6d566247..1747f223366 100644
--- a/s2i/modules/java-openjdk/1.8.0-headless/module.yaml
+++ b/s2i/modules/kogito-openjdk/1.8.0-headless/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: java-openjdk
+name: org.kie.kogito.openjdk
 version: "1.8.0-headless"
 
 labels:
diff --git a/s2i/modules/kogito-openjdk/1.8.0/clean.sh b/s2i/modules/kogito-openjdk/1.8.0/clean.sh
new file mode 100644
index 00000000000..d99eb4fb10e
--- /dev/null
+++ b/s2i/modules/kogito-openjdk/1.8.0/clean.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+microdnf clean all
+rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/s2i/modules/java-openjdk/1.8.0/module.yaml b/s2i/modules/kogito-openjdk/1.8.0/module.yaml
similarity index 83%
rename from s2i/modules/java-openjdk/1.8.0/module.yaml
rename to s2i/modules/kogito-openjdk/1.8.0/module.yaml
index e1f464a2cda..5687dda4c2e 100644
--- a/s2i/modules/java-openjdk/1.8.0/module.yaml
+++ b/s2i/modules/kogito-openjdk/1.8.0/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: java-openjdk
+name: org.kie.kogito.openjdk
 version: "1.8.0"
 
 labels:
@@ -20,6 +20,10 @@ envs:
   - name: "JAVA_VERSION"
     value: "1.8.0"
 
+execute:
+  - script: clean.sh
+
 packages:
   install:
-  - java-1.8.0-openjdk-devel
\ No newline at end of file
+  - java-1.8.0-openjdk-devel
+
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/README.md b/s2i/modules/kogito-quarkus-jvm-ubi8/README.md
deleted file mode 100644
index 29e2b6e2d5a..00000000000
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# S2I image to build jvm runtime image based on ubi8
-
-This S2I is considered a runtime image builder as it relies on another image
-(built with `kogito-quarkus-ubi8-s2i`) that actually produced the binaries to be executed. So this one will only get the binaries
-and place into the container.
-
-With that it produces lightweight and compact application container image.
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/configure b/s2i/modules/kogito-quarkus-jvm-ubi8/configure
deleted file mode 100644
index 286c6c2e034..00000000000
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-SCRIPT_DIR=$(dirname $0)
-
-cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
-
-chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
-
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble
deleted file mode 100644
index f1f0a931361..00000000000
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -e
-# this script is used by OpenShift with chained builds
-# to transfer data from builder image into the runtime image
-
-cp -R /tmp/src/bin/ $KOGITO_HOME
-
-if [ -d "$KOGITO_HOME/bin" ]; then
-  echo "---> Application binaries found and ready to use"
-  
-  echo "---> Adding custom labels..."
-  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
-    mkdir /tmp/.s2i
-    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-  else
-    echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
-  fi
-else
-  echo "---> Application binaries NOT found, failing build..."
-  exit 1
-fi
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble-runtime b/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble-runtime
deleted file mode 100644
index 96cbe83ddab..00000000000
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/assemble-runtime
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble-runtime script for the 'kogito-quarkus-ubi8' image.
-# The assemble-runtime script executes preparation for running the container on runtime image.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-if [ -d "$KOGITO_HOME/bin" ]; then
-    echo "---> Application binaries found and ready to use"
-
-    echo "---> Adding custom labels..."
-    if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
-        mkdir /tmp/.s2i
-        cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-    else
-        echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
-    fi
-else
-    echo "---> Application binaries NOT found, failing build..."
-    exit 1
-fi
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-jvm/README.md b/s2i/modules/kogito-quarkus-jvm/README.md
new file mode 100644
index 00000000000..c094210fdd1
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm/README.md
@@ -0,0 +1,14 @@
+# JVM Runtime image for Kogito apps
+
+This Runtime image is considered a runtime image as it only contains the needed
+files used to execute a pre built Kogito application in native mode.
+
+This is a lightweight and compact application container image.
+
+This image can be used without the image builder, this image has the ability to copy
+built artifacts and files into the image so you can perform faster image builds to test your application.
+
+### Usage information:
+
+docker run -it quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest /home/kogito/kogito-app-launch.sh -h
+
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run b/s2i/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
old mode 100755
new mode 100644
similarity index 66%
rename from s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
rename to s2i/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
index 1eeb6a2a41f..2c0e0c27150
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
@@ -1,10 +1,15 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 #
-# S2I run script for the 'kogito-quarkus-ubi8' image.
+# S2I run script for the 'kogito-quarkus-jvm' images.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
-exec java ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
+# Image help.
+if [[ "$1" == "-h" ]]; then
+    exec /usr/local/s2i/usage
+    exit 0
+fi
 
+exec java ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
diff --git a/s2i/modules/kogito-quarkus-jvm/configure b/s2i/modules/kogito-quarkus-jvm/configure
new file mode 100644
index 00000000000..b3a28b4803e
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm/configure
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+# kogito-launch
+cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
+cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
+
+chmod 755 /usr/local/s2i/*
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml b/s2i/modules/kogito-quarkus-jvm/module.yaml
similarity index 65%
rename from s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
rename to s2i/modules/kogito-quarkus-jvm/module.yaml
index e5c63e004c9..bbdacca03a2 100644
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,7 @@
 schema_version: 1
+name: org.kie.kogito.quarkus.jvm
 version: "0.6.0"
-name: kogito-quarkus-jvm-ubi8
+
 execute:
 - script: configure
 
diff --git a/s2i/modules/kogito-quarkus-jvm/s2i/bin/assemble b/s2i/modules/kogito-quarkus-jvm/s2i/bin/assemble
new file mode 100755
index 00000000000..1a2513dea5c
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm/s2i/bin/assemble
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+# this script is used by OpenShift with chained builds
+# to transfer data from builder image into the runtime image
+
+source ${S2I_MODULE_LOCATION}/s2i-core
+runtime_assemble
+
diff --git a/s2i/modules/kogito-quarkus-jvm/s2i/bin/usage b/s2i/modules/kogito-quarkus-jvm/s2i/bin/usage
new file mode 100644
index 00000000000..046e5139fc2
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-jvm/s2i/bin/usage
@@ -0,0 +1,16 @@
+#!/bin/bash -e
+cat <<EOF
+This is the quay.io/kiegroup/kogito-quarkus-jvm-ubi8 S2I image:
+To use it, install S2I: https://github.com/openshift/source-to-image
+
+Sample invocation:
+
+s2i build <binary path/URL> quay.io/kiegroup/kogito-quarkus-jvm-ubi8 <application image>
+
+Where the binary path/URL is the built artifact that you want to copy to your image.
+Note that, for quarkus non Uberjar builds, you also must add the target/lib on the current directory
+so the s2i build can copy it into the image.
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/README.md b/s2i/modules/kogito-quarkus-s2i/README.md
similarity index 68%
rename from s2i/modules/kogito-quarkus-ubi8-s2i/README.md
rename to s2i/modules/kogito-quarkus-s2i/README.md
index 8d2551e279f..c9efcf3940f 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/README.md
+++ b/s2i/modules/kogito-quarkus-s2i/README.md
@@ -9,4 +9,10 @@ This S2I is considered image builder that is equipped with build tools
 To perform non native builds set the env **NATIVE** to **false**.
 
 So it is equipped with all required tools to build a runnable native image of
-KaaS (Knowledge as a Service) type of projects.
+Kogito type of projects.
+
+
+### Usage:
+
+docker run -it quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest /home/kogito/kogito-app-launch.sh -h
+
diff --git a/s2i/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh b/s2i/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..a7947aeedb7
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# S2I run script for the 'kogito-quarkus-s2i' images.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+# Image help.
+if [[ "$1" == "-h" ]]; then
+    exec /usr/local/s2i/usage
+    exit 0
+fi
+
+if [ "${NATIVE^^}" == "FALSE" ]; then
+    exec java ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
+else
+    exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/ssl-libs \
+        -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
+fi
+
diff --git a/s2i/modules/kogito-quarkus-s2i/configure b/s2i/modules/kogito-quarkus-s2i/configure
new file mode 100644
index 00000000000..6879dba19ed
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-s2i/configure
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+# kogito-launch
+cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
+chmod +x ${KOGITO_HOME}/kogito-app-launch.sh
+
+cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
+
+chmod 755 /usr/local/s2i/*
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml b/s2i/modules/kogito-quarkus-s2i/module.yaml
similarity index 77%
rename from s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
rename to s2i/modules/kogito-quarkus-s2i/module.yaml
index c57d79c1b75..052c26629fb 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-s2i/module.yaml
@@ -1,6 +1,7 @@
 schema_version: 1
+name: org.kie.kogito.quarkus.s2i
 version: "0.6.0"
-name: kogito-springboot-ubi8-s2i
+
 execute:
   - script: configure
 
diff --git a/s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble
new file mode 100644
index 00000000000..d7ad17fbb0c
--- /dev/null
+++ b/s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble
@@ -0,0 +1,36 @@
+#!/bin/bash -e
+#
+# S2I assemble script for the 'kogito-quarkus-ubi8-s2i' image.
+# The 'assemble' script builds your application source so that it is ready to run.
+#
+# For more information refer to the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+
+source ${S2I_MODULE_LOCATION}/s2i-core
+
+#############################################
+# Configure maven - for a complete list of
+# supported values, please refer the module.yaml
+# file.
+# Configure GraalVM memory limits
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/configure-maven.sh
+  ${KOGITO_HOME}/launch/memory-limit.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+
+# incremental builds
+manage_incremental_build
+
+# kogito app build
+build_kogito_app
+
+# copy kogito app to ${KOGITO_HOME}/bin dir
+copy_kogito_app
+
+# handle custom image-metadata.json
+handle_image_metadata_json
+
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage b/s2i/modules/kogito-quarkus-s2i/s2i/bin/usage
similarity index 83%
rename from s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage
rename to s2i/modules/kogito-quarkus-s2i/s2i/bin/usage
index 14f066da3ef..477737eaa37 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/usage
+++ b/s2i/modules/kogito-quarkus-s2i/s2i/bin/usage
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 cat <<EOF
 This is the quay.io/kiegroup/kogito-quarkus-ubi8 S2I image:
 
@@ -10,11 +10,11 @@ To use it, install S2I: https://github.com/openshift/source-to-image
 This image is intended to build application binaries only that are later on transfered to runtime image.
 
 
-s2i build -c <source code path/URL> quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image name> --runtime-image <image name>
+s2i build -c <source code path/URL> quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image <image name>
 
 Sample invocation:
 
-s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i application --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8
+s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8
 
 For non native build, just set the NATIVE environment variable to false and use the quay.io/kiegroup/kogito-quarkus-jvm-ubi8
 image as runtime-image, in that way a *runner.jar will be produced and copied to the runtime image.
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/configure b/s2i/modules/kogito-quarkus-ubi8-s2i/configure
deleted file mode 100644
index 0637d802521..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/configure
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-
-SCRIPT_DIR=$(dirname $0)
-
-cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
-
-chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
-
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
deleted file mode 100644
index 215da021e4c..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/assemble
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble script for the 'kaas-quarkus-centos-s2i' image.
-# The 'assemble' script builds your application source so that it is ready to run.
-#
-# For more information refer to the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-#############################################
-# Configure maven - for a complete list of
-# supported values, please refer the module.yaml
-# file.
-
-CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/configure-maven.sh
-  ${KOGITO_HOME}/launch/memory-limit.sh
-)
-source ${KOGITO_HOME}/launch/configure.sh
-#############################################
-
-# If the 'kogito-quarkus-ubi8-s2i' assemble script is executed with the '-h' flag, print the usage.
-if [[ "$1" == "-h" ]]; then
-    exec /usr/libexec/s2i/usage
-fi
-
-######################
-# incremental builds
-manage_incremental_build
-
-echo "---> Installing application source..."
-cd /tmp/src/
-
-if [ -f "pom.xml" ]; then
-
-    nativeBuild="-Pnative"
-    if [ "${NATIVE^^}" == "FALSE" ]; then
-        nativeBuild=""
-    fi
-
-    echo "---> Building application from source..."
-    $MAVEN_HOME/bin/mvn clean package $MAVEN_ARGS_APPEND ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
-        -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-        -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-else
-    echo "---> Generating project structure..."
-
-    $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=kogito-quarkus-archetype \
-	-DarchetypeVersion=$KOGITO_VERSION -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
-
-    # copy resources into the generated project
-    for item in *
-    do
-        if [ -d $item ] && [ "$item" == "project" ]; then
-            echo "--> Skipping generated project ..."
-        else
-            echo "--> Coping resource $item"
-            cp -R "$item" project/src/main/resources
-        fi
-    done
-
-    # move all project content into the current directory
-    mv project/* .
-
-    echo "---> Building application from source..."
-    $MAVEN_HOME/bin/mvn clean package $MAVEN_ARGS_APPEND ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
-        -DskipTests -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-        -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-fi
-
-echo "---> Build finished, installing application from path $(pwd)"
-
-artifactDir="target"
-if [ ! -z "${ARTIFACT_DIR}" ]; then
-    artifactDir="${ARTIFACT_DIR}"
-fi
-
-if [ "${NATIVE^^}" == "FALSE" ]; then
-    echo "---> Installing jar file"
-    cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin/
-    echo "---> Copying application libraries"
-    cp -r $artifactDir/lib/ $KOGITO_HOME/bin/
-else
-    echo "---> Installing application binaries"
-    cp -v $artifactDir/*-runner $KOGITO_HOME/bin/
-    chmod +x $KOGITO_HOME/bin/*-runner
-fi
-
-
-echo "---> Copy image metadata file..."
-if [ -e "/tmp/src/${artifactDir}/image_metadata.json" ]; then
-    mkdir /tmp/.s2i
-    cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/.s2i
-    cp -v /tmp/src/$artifactDir/image_metadata.json $KOGITO_HOME/bin
-else
-    echo "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
-fi
-
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
deleted file mode 100644
index b4541e33ae6..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash -e
-#
-# S2I run script for the 'kogito-quarkus-ubi8-s2i' image.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 \
-    -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/ssl-libs \
-    -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
deleted file mode 100644
index 2817bd9d298..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/s2i/bin/save-artifacts
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-source ${KOGITO_HOME}/launch/configure-maven.sh
-s2i_save_build_artifacts
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8/README.md b/s2i/modules/kogito-quarkus-ubi8/README.md
deleted file mode 100644
index 5eee8920d9e..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# S2I image to build runtime image based on ubi8
-
-This S2I is considered a runtime image builder as it relies on another image
-(built with `kogito-quarkus-ubi8-s2i`) that actually produced the binaries to be executed
-(the native image based on Quarkus runtime). So this one will only get the binaries
-and place into the container.
-
-With that it produces lightweight and compact application container image.
diff --git a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble
deleted file mode 100644
index f1f0a931361..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -e
-# this script is used by OpenShift with chained builds
-# to transfer data from builder image into the runtime image
-
-cp -R /tmp/src/bin/ $KOGITO_HOME
-
-if [ -d "$KOGITO_HOME/bin" ]; then
-  echo "---> Application binaries found and ready to use"
-  
-  echo "---> Adding custom labels..."
-  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
-    mkdir /tmp/.s2i
-    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-  else
-    echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
-  fi
-else
-  echo "---> Application binaries NOT found, failing build..."
-  exit 1
-fi
diff --git a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble-runtime b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble-runtime
deleted file mode 100644
index 89688b8cb33..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/assemble-runtime
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble-runtime script for the 'kogito-quarkus-ubi8' image.
-# The assemble-runtime script executes preparation for running the container on runtime image.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-
-if [ -d "$KOGITO_HOME/bin" ]; then
-    echo "---> Application binaries found and ready to use"
-
-    echo "---> Adding custom labels..."
-    if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
-        mkdir /tmp/.s2i
-        cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-    else
-        echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
-    fi
-else
-    echo "---> Application binaries NOT found, failing build..."
-    exit 1
-fi
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/usage b/s2i/modules/kogito-quarkus-ubi8/s2i/bin/usage
deleted file mode 100644
index 279b136ead6..00000000000
--- a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/usage
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-cat <<EOF
-This is the quay.io/kiegroup/kogito-quarkus-ubi8 S2I image:
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-Sample invocation:
-
-s2i build <source code path/URL> quay.io/kiegroup/kogito-quarkus-ubi8 <application image>
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus/README.md b/s2i/modules/kogito-quarkus/README.md
new file mode 100644
index 00000000000..039f6ed4d7b
--- /dev/null
+++ b/s2i/modules/kogito-quarkus/README.md
@@ -0,0 +1,14 @@
+# Native Runtime image for Kogito apps
+
+This Runtime image is considered a runtime image as it only contains the needed
+files used to execute a pre built Kogito application.
+
+This is a lightweight and compact application container image.
+
+This image can be used without the image builder, this image has the ability to copy
+built artifacts and files into the image so you can perform faster image builds to test your application.
+
+### Usage information:
+
+docker run -it quay.io/kiegroup/kogito-quarkus-ubi8:latest /home/kogito/kogito-app-launch.sh -h
+
diff --git a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run b/s2i/modules/kogito-quarkus/added/kogito-app-launch.sh
old mode 100755
new mode 100644
similarity index 71%
rename from s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
rename to s2i/modules/kogito-quarkus/added/kogito-app-launch.sh
index bfbcd381ff3..d898862dc1d
--- a/s2i/modules/kogito-quarkus-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-quarkus/added/kogito-app-launch.sh
@@ -1,12 +1,17 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 #
-# S2I run script for the 'kogito-quarkus-ubi8' image.
+# S2I run script for the 'kogito-quarkus' images.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
+# Image help.
+if [[ "$1" == "-h" ]]; then
+    exec /usr/local/s2i/usage
+    exit 0
+fi
+
 exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 \
     -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/ssl-libs \
     -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
-
diff --git a/s2i/modules/kogito-quarkus-ubi8/configure b/s2i/modules/kogito-quarkus/configure
similarity index 54%
rename from s2i/modules/kogito-quarkus-ubi8/configure
rename to s2i/modules/kogito-quarkus/configure
index e8254a32c95..cf8dec725ca 100644
--- a/s2i/modules/kogito-quarkus-ubi8/configure
+++ b/s2i/modules/kogito-quarkus/configure
@@ -1,8 +1,13 @@
 #!/bin/sh
 
 SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
 
-cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
+# kogito-launch
+cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
+cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
 chown -R 1001:0 ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-quarkus-ubi8/module.yaml b/s2i/modules/kogito-quarkus/module.yaml
similarity index 68%
rename from s2i/modules/kogito-quarkus-ubi8/module.yaml
rename to s2i/modules/kogito-quarkus/module.yaml
index 98fe52b1ef0..e1311dec0de 100644
--- a/s2i/modules/kogito-quarkus-ubi8/module.yaml
+++ b/s2i/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,7 @@
 schema_version: 1
+name: org.kie.kogito.quarkus
 version: "0.6.0"
-name: kogito-quarkus-ubi8
+
 execute:
 - script: configure
 
diff --git a/s2i/modules/kogito-quarkus/s2i/bin/assemble b/s2i/modules/kogito-quarkus/s2i/bin/assemble
new file mode 100755
index 00000000000..1a2513dea5c
--- /dev/null
+++ b/s2i/modules/kogito-quarkus/s2i/bin/assemble
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+# this script is used by OpenShift with chained builds
+# to transfer data from builder image into the runtime image
+
+source ${S2I_MODULE_LOCATION}/s2i-core
+runtime_assemble
+
diff --git a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/usage b/s2i/modules/kogito-quarkus/s2i/bin/usage
similarity index 55%
rename from s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/usage
rename to s2i/modules/kogito-quarkus/s2i/bin/usage
index 2f455ab84dd..a13844bacb7 100644
--- a/s2i/modules/kogito-quarkus-jvm-ubi8/s2i/bin/usage
+++ b/s2i/modules/kogito-quarkus/s2i/bin/usage
@@ -1,11 +1,13 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 cat <<EOF
 This is the quay.io/kiegroup/kogito-quarkus-ubi8 S2I image:
 To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build <source code path/URL> quay.io/kiegroup/kogito-quarkus-jvm-ubi8 <application image>
+s2i build <binary path/URL> quay.io/kiegroup/kogito-quarkus-ubi8 <application image>
+
+Where the binary path/URL is the built artifact that you want to copy to your image.
 
 You can then run the resulting image via:
 docker run <application image>
diff --git a/s2i/modules/kogito-s2i-core/added/s2i-core b/s2i/modules/kogito-s2i-core/added/s2i-core
new file mode 100644
index 00000000000..5f79bb4eeb6
--- /dev/null
+++ b/s2i/modules/kogito-s2i-core/added/s2i-core
@@ -0,0 +1,132 @@
+#!/usr/bin/env bash
+
+S2I_DESTINATION_DIR="${S2I_DESTINATION_DIR:-/tmp}"
+S2I_ARTIFACTS_DIR="${S2I_DESTINATION_DIR}/artifacts"
+S2I_SOURCE_DIR="${S2I_DESTINATION_DIR}/src"
+artifactDir="target"
+if [ ! -z "${ARTIFACT_DIR}" ]; then
+    artifactDir="${ARTIFACT_DIR}"
+fi
+
+# setup file permissions for injected content
+if [ -d "${S2I_ARTIFACTS_DIR}" ]; then
+    chmod -R ug+rwX "${S2I_ARTIFACTS_DIR}"
+fi
+
+
+function manage_incremental_build() {
+    if [ -d /tmp/artifacts ]; then
+        echo "Expanding artifacts from incremental build..."
+        ( cd /tmp/artifacts && tar cf - . ) | ( cd ${HOME} && tar xvf - )
+        rm -rf /tmp/artifacts
+    fi
+}
+
+
+function assemble_runtime() {
+    if [ -d "$KOGITO_HOME/bin" ]; then
+        echo "---> Application binaries found and ready to use"
+
+        echo "---> [s2i-core] Adding custom labels..."
+        if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
+            mkdir -v /tmp/.s2i
+            cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+        else
+            echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+        fi
+    else
+        echo "---> Application binaries NOT found, failing build..."
+        exit 1
+    fi
+}
+
+
+# copy already built artifacts to the runtime image.
+function runtime_assemble() {
+    cd ${S2I_DESTINATION_DIR}/src
+    cp -Rv --parents ./* ${KOGITO_HOME}/
+    assemble_runtime
+}
+
+
+function handle_image_metadata_json() {
+    echo "---> [s2i-core] Copy image metadata file..."
+    if [ -e "/tmp/src/${artifactDir}/image_metadata.json" ]; then
+        mkdir /tmp/.s2i
+        cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/.s2i
+        cp -v /tmp/src/$artifactDir/image_metadata.json $KOGITO_HOME/bin
+    else
+        echo "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
+    fi
+}
+
+
+function build_kogito_app() {
+    cd "${S2I_SOURCE_DIR}"
+
+    nativeBuild="-Pnative"
+    if [ "${NATIVE^^}" == "FALSE" ]; then
+        nativeBuild=""
+    fi
+
+    if [ -f "pom.xml" ]; then
+
+        echo "---> Building application from source..."
+        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
+            -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+            -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
+
+    else
+
+        echo "---> Generating project structure..."
+
+        $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=kogito-quarkus-archetype \
+        -DarchetypeVersion=$KOGITO_VERSION -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
+
+        # copy resources into the generated project
+        for item in *
+        do
+            if [ -d "${item}" ] && [ "${item}" == "project" ]; then
+                echo "--> Skipping generated project ..."
+            else
+                echo "--> Coping resource "${item}""
+                cp -Rv "${item}" project/src/main/resources
+            fi
+        done
+
+        # move all project content into the current directory
+        mv -v project/* .
+
+        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
+            -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+            -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
+    fi
+
+    echo "---> Build finished, installing application from path $(pwd)"
+}
+
+function copy_kogito_app() {
+
+    if [ "${NATIVE^^}" == "FALSE" ]; then
+        # handle quarkus java build
+        if ls $artifactDir/*-runner.jar 1> /dev/null 2>&1; then
+            echo "---> Installing jar file"
+            cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin/
+            echo "---> Copying application libraries"
+            cp -r $artifactDir/lib/ $KOGITO_HOME/bin/
+        fi
+
+    elif ls $artifactDir/*-runner 1> /dev/null 2>&1; then
+        # quarkus native builds
+        echo "---> Installing application binaries"
+        cp -v $artifactDir/*-runner $KOGITO_HOME/bin/
+        chmod +x $KOGITO_HOME/bin/*-runner
+
+    else
+        # handle non default java builds
+        echo "---> Installing application binaries"
+        cp -v $artifactDir/*.jar $KOGITO_HOME/bin
+
+    fi
+}
+
diff --git a/s2i/modules/kogito-s2i-core/configure.sh b/s2i/modules/kogito-s2i-core/configure.sh
new file mode 100644
index 00000000000..a36c6a60e01
--- /dev/null
+++ b/s2i/modules/kogito-s2i-core/configure.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR="${SCRIPT_DIR}/added"
+
+mkdir "${S2I_MODULE_LOCATION}"
+
+cp -v "${ADDED_DIR}/s2i-core" "${S2I_MODULE_LOCATION}"
+cp -rv ${SCRIPT_DIR}/s2i/bin/* "${S2I_MODULE_LOCATION}"
+chmod 755 ${S2I_MODULE_LOCATION}/*
\ No newline at end of file
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml
new file mode 100644
index 00000000000..fd493d7c39f
--- /dev/null
+++ b/s2i/modules/kogito-s2i-core/module.yaml
@@ -0,0 +1,41 @@
+schema_version: 1
+name: org.kie.kogito.s2i.core
+version: '0.6.0'
+description: Kogito s2i core module. All s2i files shoul be placed here.
+
+labels:
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.openshift.s2i.assemble-input-files"
+    value: "/home/kogito/bin"
+
+envs:
+  - name : S2I_MODULE_LOCATION
+    value: "/usr/local/s2i"
+  - name: S2I_DESTINATION_DIR
+    description: ^
+      Root directory for S2I mount, as specified by the
+      **io.openshift.s2i.destination** label.  This should not be overridden by
+      end users.
+    example: /tmp
+
+  - name: S2I_ARTIFACTS_DIR
+    description: ^
+      Location mount for artifacts persisted with **save-artifacts** script, which
+      are used with incremental builds.  This should not be overridden by end users.
+    example: "${S2I_DESTINATION_DIR}/artifacts}"
+
+  - name: S2I_SOURCE_DIR
+    description: ^
+      Location of mount for source code to be built.  This should not be
+      overridden by end users.
+    example: "${S2I_DESTINATION_DIR}/src}"
+
+run:
+  cmd:
+    - "/usr/local/s2i/run"
+
+execute:
+  - script: configure.sh
\ No newline at end of file
diff --git a/s2i/modules/kogito-s2i-core/s2i/bin/assemble-runtime b/s2i/modules/kogito-s2i-core/s2i/bin/assemble-runtime
new file mode 100644
index 00000000000..a980be8d43f
--- /dev/null
+++ b/s2i/modules/kogito-s2i-core/s2i/bin/assemble-runtime
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+#
+# S2I assemble-runtime script for the 'kogito-quarkus-ubi8' image.
+# The assemble-runtime script executes preparation for running the container on runtime image.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+
+source ${S2I_MODULE_LOCATION}/s2i-core
+assemble_runtime
+
diff --git a/s2i/modules/kogito-s2i-core/s2i/bin/run b/s2i/modules/kogito-s2i-core/s2i/bin/run
new file mode 100644
index 00000000000..c4da5b28200
--- /dev/null
+++ b/s2i/modules/kogito-s2i-core/s2i/bin/run
@@ -0,0 +1,2 @@
+#!/bin/bash -e
+exec $KOGITO_HOME/kogito-app-launch.sh ${1}
\ No newline at end of file
diff --git a/s2i/modules/kogito-s2i-core/s2i/bin/save-artifacts b/s2i/modules/kogito-s2i-core/s2i/bin/save-artifacts
new file mode 100644
index 00000000000..a610901f6cf
--- /dev/null
+++ b/s2i/modules/kogito-s2i-core/s2i/bin/save-artifacts
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd ${HOME}
+tar cf - .m2
+
diff --git a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
new file mode 100644
index 00000000000..86843c0d1c6
--- /dev/null
+++ b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -0,0 +1,198 @@
+#!/usr/bin/env bats
+
+# imports
+source $BATS_TEST_DIRNAME/../../added/s2i-core
+
+setup() {
+    export KOGITO_HOME=/tmp/kogito
+    export HOME=$KOGITO_HOME
+    mkdir -p ${KOGITO_HOME}
+}
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+    rm -rf /tmp/.s2i
+    rm -rf /tmp/src
+    rm -rf $KOGITO_HOME/bin/*
+}
+
+
+@test "test manage_incremental_builds" {
+    rm -rf /tmp/artifacts && mkdir /tmp/artifacts
+    touch /tmp/artifacts/{file,file1,file2,file3}
+    run manage_incremental_build
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "Expanding artifacts from incremental build..." ]
+    [ "${lines[1]}" = "./" ]
+    [ "${lines[2]}" = "./file3" ]
+    [ "${lines[3]}" = "./file2" ]
+    [ "${lines[4]}" = "./file1" ]
+    [ "${lines[5]}" = "./file" ]
+}
+
+
+@test "test assemble_runtime no binaries" {
+    run assemble_runtime
+    echo "result= ${lines[@]}"
+    [ "${lines[0]}" = "---> Application binaries NOT found, failing build..." ]
+    [ "$status" -eq 1 ]
+}
+
+
+@test "test assemble_runtime with binaries binaries" {
+    mkdir $KOGITO_HOME/bin
+    touch $KOGITO_HOME/bin/artifact.jar
+    KOGITO_HOME=/tmp/kogito
+
+    run assemble_runtime
+
+    rm -rf $KOGITO_HOME/bin/image_metadata.json
+    rm -rf $KOGITO_HOME/bin/artifact.jar
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "---> Application binaries found and ready to use" ]
+    [ "${lines[1]}" = "---> [s2i-core] Adding custom labels..." ]
+    [ "${lines[2]}" = "-----> Failed to copy metadata file, /tmp/kogito/bin/image_metadata.json does not exist" ]
+}
+
+
+@test "test assemble_runtime with binaries binaries and metadata" {
+    mkdir $KOGITO_HOME/bin
+    touch $KOGITO_HOME/bin/image_metadata.json
+    touch $KOGITO_HOME/bin/artifact.jar
+    KOGITO_HOME=/tmp/kogito
+
+    run assemble_runtime
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "---> Application binaries found and ready to use" ]
+    [ "${lines[1]}" = "---> [s2i-core] Adding custom labels..." ]
+    [ "${lines[2]}" = "mkdir: created directory '/tmp/.s2i'" ]
+    [ "${lines[3]}" = "'/tmp/kogito/bin/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
+}
+
+@test "test runtime_assemble" {
+    mkdir -p ${KOGITO_HOME}/bin
+    mkdir /tmp/src
+    touch /tmp/src/myapp.jar
+
+    run runtime_assemble
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "'./myapp.jar' -> '/tmp/kogito/bin/./myapp.jar'" ]
+}
+
+
+@test "test handle_image_metadata_json no metadata" {
+    mkdir -p /tmp/src/target
+    run handle_image_metadata_json
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "---> [s2i-core] Copy image metadata file..." ]
+    [ "${lines[1]}" = "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found." ]
+}
+
+
+@test "test handle_image_metadata_json with metadata" {
+    mkdir -p /tmp/src/target
+    touch /tmp/src/target/image_metadata.json
+    run handle_image_metadata_json
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "---> [s2i-core] Copy image metadata file..." ]
+    [ "${lines[1]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
+    [ "${lines[2]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/kogito/bin'" ]
+}
+
+@test "test copy_kogito_app default java build no jar file present" {
+    run copy_kogito_app
+
+    echo "result= ${lines[@]}"
+    echo "status= $status"
+    [ "$status" -eq 1 ]
+    [ "${lines[0]}" = "---> Installing application binaries" ]
+    [ "${lines[1]}" = "cp: cannot stat 'target/*.jar': No such file or directory" ]
+}
+
+@test "test copy_kogito_app default java build jar file present" {
+    touch target/app.jar
+    run copy_kogito_app
+
+    rm -rf target/app.jar
+
+    echo "result= ${lines[@]}"
+    echo "status= $status"
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "---> Installing application binaries" ]
+    [ "${lines[1]}" = "'target/app.jar' -> '/tmp/kogito/bin'" ]
+}
+
+
+@test "test copy_kogito_app default quarkus java build no jar file present" {
+    NATIVE="false"
+    mkdir $KOGITO_HOME/bin
+    touch target/app-runner.jar
+    mkdir target/lib
+    touch target/lib/{lib.jar,lib1.jar}
+
+    run copy_kogito_app
+    rm -rf target/*
+
+    echo "result= ${lines[@]}"
+    echo "status= $status"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "---> Installing jar file" ]
+    [ "${lines[1]}" = "'target/app-runner.jar' -> '/tmp/kogito/bin/app-runner.jar'" ]
+    [ "${lines[2]}" = "---> Copying application libraries" ]
+}
+
+@test "test copy_kogito_app default quarkus native builds file present" {
+
+    mkdir $KOGITO_HOME/bin
+    touch target/app-runner
+    mkdir target/lib
+    touch target/lib/{lib.jar,lib1.jar}
+
+    run copy_kogito_app
+    rm -rf target/*
+
+    echo "result= ${lines[@]}"
+    echo "status= $status"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "---> Installing application binaries" ]
+    [ "${lines[1]}" = "'target/app-runner' -> '/tmp/kogito/bin/app-runner'" ]
+}
+
+@test "build_kogito_app only checks if it will generated the project in case there's no pom.xml" {
+    mkdir /tmp/src
+
+    run build_kogito_app
+    rm -rf target/*
+
+    echo "result= ${lines[@]}"
+    [ "${lines[0]}" = "---> Generating project structure..." ]
+}
+
+
+@test "build_kogito_app only checks if it will a build will be triggered if a pom is found" {
+    mkdir /tmp/src
+    touch /tmp/src/pom.xml
+
+    run build_kogito_app
+    rm -rf target/*
+
+    echo "result= ${lines[@]}"
+    [ "${lines[0]}" = "---> Building application from source..." ]
+}
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/README.md b/s2i/modules/kogito-springboot-s2i/README.md
similarity index 61%
rename from s2i/modules/kogito-springboot-ubi8-s2i/README.md
rename to s2i/modules/kogito-springboot-s2i/README.md
index 43fae99b6f6..ff4f037958f 100644
--- a/s2i/modules/kogito-springboot-ubi8-s2i/README.md
+++ b/s2i/modules/kogito-springboot-s2i/README.md
@@ -7,4 +7,9 @@ This S2I is considered image builder that is equipped with build tools
 - JDK
 
 So it is equipped with all required tools to build a runnable fat jar of
-KaaS (Knowledge as a Service) type of projects.
+Kogito type of projects.
+
+### Usage:
+
+docker run -it quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest /home/kogito/kogito-app-launch.sh -h
+
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run b/s2i/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
old mode 100755
new mode 100644
similarity index 75%
rename from s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run
rename to s2i/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
index 55fda45ca55..13f5c37da14
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/run
+++ b/s2i/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 #
 # S2I run script for the 'kogito-springboot-ubi8-s2i' image.
 # The run script executes the server that runs your application.
@@ -6,4 +6,11 @@
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
+# Image help.
+if [[ "$1" == "-h" ]]; then
+    exec /usr/local/s2i/usage
+    exit 0
+fi
+
 exec java ${JAVA_OPTIONS} -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
+
diff --git a/s2i/modules/kogito-springboot-s2i/configure b/s2i/modules/kogito-springboot-s2i/configure
new file mode 100644
index 00000000000..744d336a65f
--- /dev/null
+++ b/s2i/modules/kogito-springboot-s2i/configure
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+# kogito-launch
+cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
+chmod +x ${KOGITO_HOME}/kogito-app-launch.sh
+
+cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
+
+chmod 755 /usr/local/s2i/*
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml b/s2i/modules/kogito-springboot-s2i/module.yaml
similarity index 75%
rename from s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
rename to s2i/modules/kogito-springboot-s2i/module.yaml
index bdcd000e755..242d57cfce8 100644
--- a/s2i/modules/kogito-quarkus-ubi8-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-s2i/module.yaml
@@ -1,6 +1,7 @@
 schema_version: 1
+name: org.kie.kogito.springboot.s2i
 version: "0.6.0"
-name: kogito-quarkus-ubi8-s2i
+
 execute:
   - script: configure
 
diff --git a/s2i/modules/kogito-springboot-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-s2i/s2i/bin/assemble
new file mode 100755
index 00000000000..8a880c733e4
--- /dev/null
+++ b/s2i/modules/kogito-springboot-s2i/s2i/bin/assemble
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+#
+# S2I assemble script for the '/kogito-springboot-ubi8-s2i' image.
+# The 'assemble' script builds your application source so that it is ready to run.
+#
+# For more information refer to the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+
+source ${S2I_MODULE_LOCATION}/s2i-core
+
+#############################################
+# Configure maven - for a complete list of
+# supported values, please refer the module.yaml
+# file.
+CONFIGURE_SCRIPTS=(
+    ${KOGITO_HOME}/launch/configure-maven.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+
+# incremental builds
+manage_incremental_build
+
+# kogito app build
+build_kogito_app
+
+# copy kogito app to ${KOGITO_HOME}/bin dir
+copy_kogito_app
+
+# handle custom image-metadata.json
+handle_image_metadata_json
+
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage b/s2i/modules/kogito-springboot-s2i/s2i/bin/usage
similarity index 100%
rename from s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/usage
rename to s2i/modules/kogito-springboot-s2i/s2i/bin/usage
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/configure b/s2i/modules/kogito-springboot-ubi8-s2i/configure
deleted file mode 100644
index 0fe63c4ce07..00000000000
--- a/s2i/modules/kogito-springboot-ubi8-s2i/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-SCRIPT_DIR=$(dirname $0)
-
-cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
-
-chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
deleted file mode 100755
index 4b5f4f71b07..00000000000
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/assemble
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble script for the 'kaas-springboot-centos-s2i' image.
-# The 'assemble' script builds your application source so that it is ready to run.
-#
-# For more information refer to the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-#############################################
-# Configure maven - for a complete list of
-# supported values, please refer the module.yaml
-# file.
-CONFIGURE_SCRIPTS=(
-    ${KOGITO_HOME}/launch/configure-maven.sh
-)
-source ${KOGITO_HOME}/launch/configure.sh
-#############################################
-
-# If the 'kaas-springboot-centos-s2i' assemble script is executed with the '-h' flag, print the usage.
-if [[ "$1" == "-h" ]]; then
-	exec /usr/libexec/s2i/usage
-fi
-
-######################
-# incremental builds
-manage_incremental_build
-
-echo "---> Installing application source..."
-cd /tmp/src/
-
-if [ -f "pom.xml" ]; then
-	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package $MAVEN_ARGS_APPEND -s $KOGITO_HOME/.m2/settings.xml \
-    -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-else
-	echo "---> Generating project structure..."
-
-	$MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito \
-	-DarchetypeArtifactId=kogito-springboot-archetype -DarchetypeVersion=$KOGITO_VERSION \
-	-DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
-
-	# copy resources into the generated project
-	for item in *
-	do
-		if [ -d $item ] && [ "$item" == "project" ]; then
-			echo "--> Skipping generated project ..."
-		else
-			echo "--> Coping resource $item"
-			cp -R "$item" project/src/main/resources
-		fi
-	done
-
-	# move all project content into the current directory
-	mv project/* .
-
-	echo "---> Building application from source..."
-	$MAVEN_HOME/bin/mvn clean package $MAVEN_ARGS_APPEND -s $KOGITO_HOME/.m2/settings.xml \
-    -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-fi
-
-artifactDir="target"
-if [ ! -z "${ARTIFACT_DIR}" ]; then
-    artifactDir="${ARTIFACT_DIR}"
-fi
-
-echo "---> Installing application binaries"
-cp -v $artifactDir/*.jar $KOGITO_HOME/bin
-
-echo "---> Copy image metadata file..."
-if [ -e "/tmp/src/${artifactDir}/image_metadata.json" ]; then
-    mkdir /tmp/.s2i
-    cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/.s2i
-    cp -v /tmp/src/$artifactDir/image_metadata.json $KOGITO_HOME/bin
-else
-    echo "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
-fi
diff --git a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts b/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
deleted file mode 100644
index 727bf235338..00000000000
--- a/s2i/modules/kogito-springboot-ubi8-s2i/s2i/bin/save-artifacts
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-source ${KOGITO_HOME}/launch/configure-maven.sh
-s2i_save_build_artifacts
diff --git a/s2i/modules/kogito-springboot-ubi8/configure b/s2i/modules/kogito-springboot-ubi8/configure
deleted file mode 100644
index 0fe63c4ce07..00000000000
--- a/s2i/modules/kogito-springboot-ubi8/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-SCRIPT_DIR=$(dirname $0)
-
-cp -rv ${SCRIPT_DIR}/s2i/bin /usr/local/s2i
-
-chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble b/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble
deleted file mode 100755
index 9d7c4daed57..00000000000
--- a/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-# this script is used by OpenShift with chained builds
-# to transfer data from builder image into the runtime image
-
-cp -R /tmp/src/bin/ $KOGITO_HOME
-
-if [ -d "$KOGITO_HOME/bin" ]; then
-  echo "---> Application binaries found and ready to use"
-  
-  echo "---> Adding custom labels..."
-  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
-    mkdir /tmp/.s2i
-    mv -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-  else
-    echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
-  fi
-else
-  echo "---> Application binaries NOT found, failing build..."
-  exit 1
-fi
-
diff --git a/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble-runtime b/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble-runtime
deleted file mode 100755
index b792ef679f1..00000000000
--- a/s2i/modules/kogito-springboot-ubi8/s2i/bin/assemble-runtime
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-#
-# S2I assemble-runtime script for the 'kogito-springboot-ubi8' image.
-# The assemble-runtime script executes preparation for running the container on runtime image.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-if [ -d "$KOGITO_HOME/bin" ]; then
-  echo "---> Application binaries found and ready to use"
-  
-  echo "---> Adding custom labels..."
-  if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
-    mkdir /tmp/.s2i
-    cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-  else
-    echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
-  fi
-else
-  echo "---> Application binaries NOT found, failing build..."
-  exit 1
-fi
diff --git a/s2i/modules/kogito-springboot-ubi8/README.md b/s2i/modules/kogito-springboot/README.md
similarity index 57%
rename from s2i/modules/kogito-springboot-ubi8/README.md
rename to s2i/modules/kogito-springboot/README.md
index c8f8970e44d..b4b48a40a32 100644
--- a/s2i/modules/kogito-springboot-ubi8/README.md
+++ b/s2i/modules/kogito-springboot/README.md
@@ -6,3 +6,11 @@ This S2I is considered a runtime image builder as it relies on another image
 and place into the container.
 
 On top of the OS it has JRE installed (OpenJDK 1.8) to be able to execute fat jar.
+
+This image can be used without the image builder, this image has the ability to copy
+built artifacts and files into the image so you can perform faster image builds to test your application.
+
+### Usage information:
+
+docker run -it quay.io/kiegroup/kogito-springboot-ubi8:latest /home/kogito/kogito-app-launch.sh -h
+
diff --git a/s2i/modules/kogito-springboot-ubi8/s2i/bin/run b/s2i/modules/kogito-springboot/added/kogito-app-launch.sh
old mode 100755
new mode 100644
similarity index 62%
rename from s2i/modules/kogito-springboot-ubi8/s2i/bin/run
rename to s2i/modules/kogito-springboot/added/kogito-app-launch.sh
index db0431d6def..1336f5ec8e0
--- a/s2i/modules/kogito-springboot-ubi8/s2i/bin/run
+++ b/s2i/modules/kogito-springboot/added/kogito-app-launch.sh
@@ -1,9 +1,15 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 #
-# S2I run script for the 'kogito-springboot-ubi8' image.
+# S2I run script for the 'kogito-springboot' images.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
+# Image help.
+if [[ "$1" == "-h" ]]; then
+    exec /usr/local/s2i/usage
+    exit 0
+fi
+
 exec java ${JAVA_OPTIONS} -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
diff --git a/s2i/modules/kogito-springboot/configure b/s2i/modules/kogito-springboot/configure
new file mode 100644
index 00000000000..ac80ff52500
--- /dev/null
+++ b/s2i/modules/kogito-springboot/configure
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+# kogito-launch
+cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
+cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
+
+chmod 755 /usr/local/s2i/*
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
diff --git a/s2i/modules/kogito-springboot-ubi8/module.yaml b/s2i/modules/kogito-springboot/module.yaml
similarity index 66%
rename from s2i/modules/kogito-springboot-ubi8/module.yaml
rename to s2i/modules/kogito-springboot/module.yaml
index e87a075ab58..153d0852dee 100644
--- a/s2i/modules/kogito-springboot-ubi8/module.yaml
+++ b/s2i/modules/kogito-springboot/module.yaml
@@ -1,5 +1,7 @@
 schema_version: 1
+name: org.kie.kogito.springboot
 version: "0.6.0"
-name: kogito-springboot-ubi8
+
 execute:
   - script: configure
+
diff --git a/s2i/modules/kogito-springboot/s2i/bin/assemble b/s2i/modules/kogito-springboot/s2i/bin/assemble
new file mode 100755
index 00000000000..1a2513dea5c
--- /dev/null
+++ b/s2i/modules/kogito-springboot/s2i/bin/assemble
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+# this script is used by OpenShift with chained builds
+# to transfer data from builder image into the runtime image
+
+source ${S2I_MODULE_LOCATION}/s2i-core
+runtime_assemble
+
diff --git a/s2i/modules/kogito-springboot-ubi8/s2i/bin/usage b/s2i/modules/kogito-springboot/s2i/bin/usage
similarity index 94%
rename from s2i/modules/kogito-springboot-ubi8/s2i/bin/usage
rename to s2i/modules/kogito-springboot/s2i/bin/usage
index 2da28318e65..6ba9bc3082e 100755
--- a/s2i/modules/kogito-springboot-ubi8/s2i/bin/usage
+++ b/s2i/modules/kogito-springboot/s2i/bin/usage
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 cat <<EOF
 This is the quay.io/kiegroup/kogito-springboot-ubi8 S2I image:
 To use it, install S2I: https://github.com/openshift/source-to-image
diff --git a/s2i/modules/add-kogito-user/add-user b/s2i/modules/kogito-system-user/add-user
similarity index 100%
rename from s2i/modules/add-kogito-user/add-user
rename to s2i/modules/kogito-system-user/add-user
diff --git a/s2i/modules/add-kogito-user/module.yaml b/s2i/modules/kogito-system-user/module.yaml
similarity index 81%
rename from s2i/modules/add-kogito-user/module.yaml
rename to s2i/modules/kogito-system-user/module.yaml
index 441fe2fc082..76eb78078e4 100644
--- a/s2i/modules/add-kogito-user/module.yaml
+++ b/s2i/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 version: "0.6.0"
-name: add-kogito-user
+name: org.kie.kogito.system.user
 execute:
 - script: add-user
 
diff --git a/s2i/modules/maven/3.6.0/added/configure-maven.sh b/s2i/modules/maven/3.6.0/added/configure-maven.sh
deleted file mode 100644
index 46baf82512f..00000000000
--- a/s2i/modules/maven/3.6.0/added/configure-maven.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-
-function prepareEnv() {
-    unset HTTPS_PROXY
-    unset HTTP_PROXY_HOST
-    unset HTTP_PROXY_PORT
-    unset HTTP_PROXY_PASSWORD
-    unset HTTP_PROXY_USERNAME
-    unset HTTP_PROXY_NONPROXYHOSTS
-    unset MAVEN_MIRROR_URL
-}
-
-function configure() {
-    configure_proxy
-    configure_mirrors
-}
-
-# insert settings for HTTP proxy into maven settings.xml if supplied
-function configure_proxy() {
-
-  # prefer old http_proxy_ format for username/password, but
-  # also allow proxy_ format.
-  HTTP_PROXY_USERNAME=${HTTP_PROXY_USERNAME:-$PROXY_USERNAME}
-  HTTP_PROXY_PASSWORD=${HTTP_PROXY_PASSWORD:-$PROXY_PASSWORD}
-
-  proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}}
-  # if http_proxy_host/port is set, prefer that (oldest mechanism)
-  # before looking at HTTP(S)_PROXY
-  proxyhost=${HTTP_PROXY_HOST:-$(echo $proxy | cut -d : -f 1,2)}
-  proxyport=${HTTP_PROXY_PORT:-$(echo $proxy | cut -d : -f 3)}
-
-   if [ -n "$proxyhost" ]; then
-    if [[ `echo $proxyhost | grep -i https://` ]]; then
-      proxyport=${proxyport:-443}
-      proxyprotocol="https"
-    else
-      proxyport=${proxyport:-80}
-      proxyprotocol="http"
-    fi
-
-     xml="<proxy>\
-         <id>genproxy</id>\
-         <active>true</active>\
-         <protocol>$proxyprotocol</protocol>\
-         <host>$proxyhost</host>\
-         <port>$proxyport</port>"
-    if [ -n "$HTTP_PROXY_USERNAME" -a -n "$HTTP_PROXY_PASSWORD" ]; then
-      xml="$xml\
-         <username>$HTTP_PROXY_USERNAME</username>\
-         <password>$HTTP_PROXY_PASSWORD</password>"
-    fi
-    if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then
-      xml="$xml\
-         <nonProxyHosts>$HTTP_PROXY_NONPROXYHOSTS</nonProxyHosts>"
-    fi
-  xml="$xml\
-       </proxy>"
-    sed -i "s|<!-- ### configured http proxy ### -->|$xml|" $HOME/.m2/settings.xml
-  fi
-}
-
- # insert settings for mirrors/repository managers into settings.xml if supplied
-function configure_mirrors() {
-  if [ -n "$MAVEN_MIRROR_URL" ]; then
-    xml="    <mirror>\
-      <id>mirror.default</id>\
-      <url>$MAVEN_MIRROR_URL</url>\
-      <mirrorOf>external:*</mirrorOf>\
-    </mirror>"
-    sed -i "s|<!-- ### configured mirrors ### -->|$xml|" $HOME/.m2/settings.xml
-  fi
-}
-
-function manage_incremental_build() {
-    if [ -d /tmp/artifacts ]; then
-        echo "Expanding artifacts from incremental build..."
-        ( cd /tmp/artifacts && tar cf - . ) | ( cd ${HOME} && tar xvf - )
-        rm -rf /tmp/artifacts
-    fi
-}
-
-function s2i_save_build_artifacts() {
-    cd ${HOME}
-    tar cf - .m2
-}
\ No newline at end of file
diff --git a/s2i/tests/features/common.feature b/s2i/tests/features/common.feature
index 4f719217118..537cf55cd67 100644
--- a/s2i/tests/features/common.feature
+++ b/s2i/tests/features/common.feature
@@ -7,3 +7,7 @@ Feature: Common tests for Kogito images
     Then run bash -c 'echo $USER' in container and check its output for kogito
      And run sh -c 'echo $HOME' in container and check its output for /home/kogito
      And run sh -c 'id' in container and check its output for uid=1001(kogito) gid=1001(kogito) groups=1001(kogito)
+
+  Scenario: Verify if usage help is correctly called
+    When container is started with command /home/kogito/kogito-app-launch.sh -h
+    Then container log should contain This is the
diff --git a/s2i/tests/features/kogito-quarkus-index.feature b/s2i/tests/features/kogito-quarkus-index.feature
index c798d1a34ed..17ca527e5d9 100644
--- a/s2i/tests/features/kogito-quarkus-index.feature
+++ b/s2i/tests/features/kogito-quarkus-index.feature
@@ -1,6 +1,6 @@
 @quay.io/kiegroup/kogito-data-index
 
-Feature: Kogito-quarkus-ubi8 feature.
+Feature: Kogito-data-index feature.
 
   Scenario: verify if all labels are correctly set.
     Given image is built
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 895537da0f7..1f19060be1f 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -90,7 +90,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.0
-    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/share/graalvm
+    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.1
 

From 506869d86851f6883e7a60b0eb05de360edd556b Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 9 Dec 2019 11:06:24 -0300
Subject: [PATCH 070/709] [KOGITO-676] - Create image and image stream for
 Kogito Job Service (#70)

* [KOGITO-676] - Create image and image stream for Kogito Job Service

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile                                  | 35 ++++---
 s2i/README.md                                 |  9 +-
 s2i/kogito-imagestream.yaml                   | 22 ++++-
 s2i/kogito-jobs-service-overrides.yaml        | 47 ++++++++++
 .../added/kogito-infinispan-properties.sh     | 26 +++++
 .../kogito-infinispan-properties/configure    | 10 ++
 .../kogito-infinispan-properties/module.yaml  | 23 +++++
 .../bats/kogito-infinispan-properties.bats    | 94 +++++++++++++++++++
 .../added/kogito-app-launch.sh                | 21 +++++
 .../added/launch/kogito-jobs-service.sh       | 42 +++++++++
 s2i/modules/kogito-jobs-service/configure     | 17 ++++
 s2i/modules/kogito-jobs-service/module.yaml   | 11 +++
 .../tests/bats/kogito-jobs-service.bats       | 68 ++++++++++++++
 ...ndex.feature => kogito-data-index.feature} |  0
 .../features/kogito-jobs-service.feature      | 71 ++++++++++++++
 15 files changed, 480 insertions(+), 16 deletions(-)
 create mode 100644 s2i/kogito-jobs-service-overrides.yaml
 create mode 100755 s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
 create mode 100644 s2i/modules/kogito-infinispan-properties/configure
 create mode 100644 s2i/modules/kogito-infinispan-properties/module.yaml
 create mode 100644 s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
 create mode 100644 s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh
 create mode 100644 s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
 create mode 100644 s2i/modules/kogito-jobs-service/configure
 create mode 100644 s2i/modules/kogito-jobs-service/module.yaml
 create mode 100644 s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
 rename s2i/tests/features/{kogito-quarkus-index.feature => kogito-data-index.feature} (100%)
 create mode 100644 s2i/tests/features/kogito-jobs-service.feature

diff --git a/s2i/Makefile b/s2i/Makefile
index c48be26d48b..ff25e1b7737 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -4,7 +4,7 @@ BUILD_ENGINE := docker
 
 # Build all images
 .PHONY: build
-build: kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index
+build: kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-jobs-service
 
 kogito-quarkus-ubi8:
 	cekit -v build --overrides-file kogito-quarkus-overrides.yaml ${BUILD_ENGINE}
@@ -24,6 +24,9 @@ kogito-springboot-ubi8-s2i:
 kogito-data-index:
 	cekit -v build --overrides-file kogito-data-index-overrides.yaml ${BUILD_ENGINE}
 
+kogito-jobs-service:
+	cekit -v build --overrides-file kogito-jobs-service-overrides.yaml ${BUILD_ENGINE}
+
 
 # Build and test all images
 .PHONY: test
@@ -35,6 +38,7 @@ test:
 	cekit -v test --overrides-file kogito-springboot-overrides.yaml behave
 	cekit -v test --overrides-file kogito-springboot-s2i-overrides.yaml behave
 	cekit -v test --overrides-file kogito-data-index-overrides.yaml behave
+	cekit -v test --overrides-file kogito-jobs-service-overrides.yaml behave
 
 
 # push images to quay.io, this requires permissions under kiegroup organization
@@ -53,26 +57,31 @@ _push:
 	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest
 	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-data-index:latest
+	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-jobs-service:latest
 
 
 # push staging images to quay.io, done before release, this requires permissions under kiegroup organization
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc2
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc3
 
-	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc2
-	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc2
\ No newline at end of file
+	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc3
+	
+	docker tag quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION} quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}-rc3
+	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}-rc3
\ No newline at end of file
diff --git a/s2i/README.md b/s2i/README.md
index 69f23f36ff7..9a4947f4bc2 100644
--- a/s2i/README.md
+++ b/s2i/README.md
@@ -50,9 +50,14 @@ Image location: quay.io/kiegroup/kogito-springboot-ubi8:latest
 
 For more details have a look at [README.md](modules/kogito-springboot-ubi8/README.md)
 
-## Data Index Service
+## Kogito Data Index Service
 
-Runtime image that is responsibile for just running the [Data Index Service](https://github.com/kiegroup/kogito-runtimes/wiki/Data-Index-Service). Solely used by the [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) to deploy data index capabilities to Kogito Services.
+Runtime image that is responsible for just running the [Data Index Service](https://github.com/kiegroup/kogito-runtimes/wiki/Data-Index-Service). Solely used by the [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) to deploy data index capabilities to Kogito Services.
+
+## Kogito Jobs Service
+
+Kogito Job Service is a dedicated lightweight service responsible for scheduling jobs that aim to be fired at a given time. The service does not execute the job itself, it triggers a callback that could be an HTTP request on a given endpoint specified on the job request, or any other callback that could be supported by the service.
+For more information please access this (link)[https://github.com/kiegroup/kogito-runtimes/wiki/Job-Service]
 
 # Supported source structure
 
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index d8a7347234f..39389c9261d 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -130,4 +130,24 @@ items:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-data-index:0.6.0
\ No newline at end of file
+        name: quay.io/kiegroup/kogito-data-index:0.6.0
+- kind: ImageStream
+  apiVersion: v1
+  metadata:
+    name: kogito-data-index
+    annotations:
+      openshift.io/display-name: Runtime image for the Kogito Data Index Service
+      openshift.io/provider-display-name: Kie Group.
+  spec:
+    tags:
+      - name: '0.6.0'
+        annotations:
+          description: Runtime image for the Kogito Jobs Service
+          iconClass: icon-jbpm
+          tags: kogito,jobs-service
+          version: '0.6.0'
+        referencePolicy:
+          type: Local
+        from:
+          kind: DockerImage
+          name: quay.io/kiegroup/kogito-jobs-service:0.6.0
\ No newline at end of file
diff --git a/s2i/kogito-jobs-service-overrides.yaml b/s2i/kogito-jobs-service-overrides.yaml
new file mode 100644
index 00000000000..ed819bd535c
--- /dev/null
+++ b/s2i/kogito-jobs-service-overrides.yaml
@@ -0,0 +1,47 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-jobs-service"
+description: "Runtime image for Kogito Jobs Service"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Jobs Service"
+- name: "io.k8s.display-name"
+  value: "Kogito Jobs Service"
+- name: "io.openshift.tags"
+  value: "kogito,jobs-service"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+- name: "ENABLE_PERSISTENCE"
+  example: "true"
+  description: "By default the Jobs services runs on memory only, if persistence is needed then set it to true. (Sets the property kogito.jobs-service.persistence to infinispan)."
+- name: "INFINISPAN_CLIENT_SERVER_LIST"
+  example: "localhost:11222,localhost:11223"
+  description: "Required when persisted is enabled. (Sets the property quarkus.infinispan-client.server-list)."
+- name: "MAX_INTERVAL_LIMIT_RETRY"
+  example: "localhost:11222,localhost:11223"
+  description: "Maximum interval in milliseconds when retrying to execute jobs, in case of failures, defaults to 60000ms. (Sets the property kogito.jobs-service.maxIntervalLimitToRetryMillis)."
+- name: "BACKOFF_RETRY"
+  example: "1000"
+  description: "Retry backoff time in milliseconds between the job execution attempts, in case of execution failure, defaults to 1000. (Sets the property kogito.jobs-service.backoffRetryMillis)."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.openjdk
+    version: "1.8.0-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.infinispan.properties
+  - name: org.kie.kogito.jobs.service
+
+run:
+  workdir: "/home/kogito/"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
diff --git a/s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh b/s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
new file mode 100755
index 00000000000..377faf0c295
--- /dev/null
+++ b/s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -e
+
+# see https://quarkus.io/guides/infinispan-client-guide#quarkus-infinispan-client_configuration
+function set_infinispan_props() {
+    local infinispan_props=""
+
+    if [[ "${INFINISPAN_USEAUTH}" == "true" ]] && [[ -z "${INFINISPAN_USERNAME}"  || -z "${INFINISPAN_PASSWORD}" ]]; then
+        echo "[ERROR] Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
+        exit 1
+    fi
+
+    if [ -z "${INFINISPAN_USERNAME}" ]; then
+        if [ ! -z "${INFINISPAN_USEAUTH}" ]; then
+            INFINISPAN_USEAUTH="false"
+        fi
+    fi
+ 
+    if [ ! -z "${INFINISPAN_USERNAME}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-username=${INFINISPAN_USERNAME}"); INFINISPAN_USEAUTH="true"; fi
+    if [ ! -z "${INFINISPAN_PASSWORD}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-password=${INFINISPAN_PASSWORD}"); fi
+    if [ ! -z "${INFINISPAN_USEAUTH}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.use-auth=${INFINISPAN_USEAUTH}"); fi
+    if [ ! -z "${INFINISPAN_AUTHREALM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-realm=${INFINISPAN_AUTHREALM}"); fi
+    if [ ! -z "${INFINISPAN_SASLMECHANISM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.sasl-mechanism=${INFINISPAN_SASLMECHANISM}"); fi
+
+    echo $infinispan_props
+}
+
diff --git a/s2i/modules/kogito-infinispan-properties/configure b/s2i/modules/kogito-infinispan-properties/configure
new file mode 100644
index 00000000000..549fdac3cd6
--- /dev/null
+++ b/s2i/modules/kogito-infinispan-properties/configure
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+
+cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch
+
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/s2i/modules/kogito-infinispan-properties/module.yaml
new file mode 100644
index 00000000000..37a7f466a60
--- /dev/null
+++ b/s2i/modules/kogito-infinispan-properties/module.yaml
@@ -0,0 +1,23 @@
+schema_version: 1
+name: org.kie.kogito.infinispan.properties
+version: "0.6.0"
+
+envs:
+  - name: "INFINISPAN_USEAUTH"
+    value: "false"
+    description: "Flag that signals to Infinispan Hotrod client to use authentication (Used to set the infinispan.client.hotrod.use_auth system property)"
+  - name: "INFINISPAN_USERNAME"
+    value: ""
+    description: "Username for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_username system property)"
+  - name: "INFINISPAN_PASSWORD"
+    value: ""
+    description: "Password for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_password system property)"
+  - name: "INFINISPAN_AUTHREALM"
+    value: ""
+    description: "Infinispan authentication realm (Used to set the infinispan.client.hotrod.auth_realm system property)"
+  - name: "INFINISPAN_SASLMECHANISM"
+    value: ""
+    description: "Sasl mechanism to use during authentication. Example: PLAIN (Used to set the infinispan.client.hotrod.sasl_mechanism system property)"
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats b/s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
new file mode 100644
index 00000000000..92bd3329390
--- /dev/null
+++ b/s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
@@ -0,0 +1,94 @@
+#!/usr/bin/env bats
+
+export TEST=true
+
+# import
+load $BATS_TEST_DIRNAME/../../added/kogito-infinispan-properties.sh
+
+function clear_vars() {
+    unset INFINISPAN_USEAUTH
+    unset INFINISPAN_USERNAME
+    unset INFINISPAN_PASSWORD
+    unset INFINISPAN_AUTHREALM
+    unset INFINISPAN_SASLMECHANISM
+}
+
+@test "check if infinispan properties is blank" {
+    clear_vars
+    local expected=""
+    run set_infinispan_props
+
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+
+@test "check if infinispan auth is false" {
+    clear_vars
+    export INFINISPAN_USEAUTH="false"
+    local expected="-Dquarkus.infinispan-client.use-auth=false"
+    run set_infinispan_props
+
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "check if infinispan has auth props" {
+    clear_vars
+    export INFINISPAN_USERNAME="developer"
+    export INFINISPAN_USEAUTH="true"
+    export INFINISPAN_PASSWORD="developer"
+    export INFINISPAN_AUTHREALM="default"
+    export INFINISPAN_SASLMECHANISM="PLAIN"
+
+    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.auth-password=developer -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.auth-realm=default -Dquarkus.infinispan-client.sasl-mechanism=PLAIN"
+    run set_infinispan_props
+
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "setting username, useauth is true" {
+    clear_vars
+    export INFINISPAN_USERNAME="developer"
+    export INFINISPAN_USEAUTH="false"
+    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
+
+    run set_infinispan_props
+
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "when use auth is set to nonsense and no credentials" {
+    clear_vars
+    export INFINISPAN_USEAUTH="dsadsadasdsa"
+    local expected="-Dquarkus.infinispan-client.use-auth=false"
+
+    run set_infinispan_props
+
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "when use auth is set to nonsense and has credentials" {
+    clear_vars
+    export INFINISPAN_USEAUTH="dsadsadasdsa"
+    export INFINISPAN_USERNAME="developer"
+    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
+
+    run set_infinispan_props
+
+    echo "Result is ${output} and expected is ${expected}" >&2
+    [ "${expected}" = "${output}" ]
+}
+
+@test "when use auth is set to true and no credentials" {
+    clear_vars
+    export INFINISPAN_USEAUTH="true"
+    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
+
+    run set_infinispan_props
+    # exit(1)
+    [ "$status" -eq 1 ]
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh b/s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..df122aaf25b
--- /dev/null
+++ b/s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    echo "JVM settings debug is enabled."
+fi
+
+
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-jobs-service.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} -jar $KOGITO_HOME/bin/kogito-jobs-service-runner.jar
+
diff --git a/s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
new file mode 100644
index 00000000000..ef80022f63e
--- /dev/null
+++ b/s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+# keep it here for now
+# TODO refactor data-index image to reuse it.
+source ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset BACKOFF_RETRY
+    unset ENABLE_PERSISTENCE
+    unset INFINISPAN_CLIENT_SERVER_LIST
+    unset MAX_INTERVAL_LIMIT_RETRY
+}
+
+function configure() {
+    configure_jobs_service
+}
+
+
+function configure_jobs_service() {
+    if [ "${ENABLE_PERSISTENCE^^}" == "TRUE" ]; then
+
+        if [ "${INFINISPAN_CLIENT_SERVER_LIST}x" = "x" ]; then
+            echo "INFINISPAN_CLIENT_SERVER_LIST env not found, please set it."
+            exit 1
+        else
+            infinispanProps=$(set_infinispan_props)
+            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.persistence=infinispan ${infinispanProps}"
+            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.infinispan-client.server-list=${INFINISPAN_CLIENT_SERVER_LIST}"
+        fi
+    fi
+
+    if [ "${BACKOFF_RETRY}x" != "x" ]; then
+        KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.backoffRetryMillis=${BACKOFF_RETRY}"
+    fi
+
+    if [ "${MAX_INTERVAL_LIMIT_RETRY}x" != "x" ]; then
+        KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.maxIntervalLimitToRetryMillis=${MAX_INTERVAL_LIMIT_RETRY}"
+    fi
+
+}
+
diff --git a/s2i/modules/kogito-jobs-service/configure b/s2i/modules/kogito-jobs-service/configure
new file mode 100644
index 00000000000..dbeef3afdef
--- /dev/null
+++ b/s2i/modules/kogito-jobs-service/configure
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+cp -v ${SOURCES_DIR}/kogito-jobs-service-runner.jar ${KOGITO_HOME}/bin/
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+
+
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
+cp ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
new file mode 100644
index 00000000000..c51079e39da
--- /dev/null
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -0,0 +1,11 @@
+schema_version: 1
+name: org.kie.kogito.jobs.service
+version: "0.6.0"
+
+artifacts:
+- name: kogito-jobs-service-runner.jar
+  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20191205.211123-17-runner.jar
+  md5: f01e3c76a9419a538087b66990753b3c
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
new file mode 100644
index 00000000000..463d11b8fec
--- /dev/null
+++ b/s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -0,0 +1,68 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME=$KOGITO_HOME
+mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-infinispan-properties/added/kogito-infinispan-properties.sh ${KOGITO_HOME}/launch/
+
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-jobs-service.sh
+
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+}
+
+
+@test "test enable persistence without set infinispan server list" {
+    export ENABLE_PERSISTENCE="true"
+    run configure_jobs_service
+    expected="INFINISPAN_CLIENT_SERVER_LIST env not found, please set it."
+    echo "Result is ${output} and expected is ${expected}"
+    [ "$status" -eq 1 ]
+    [ "${output}" = "${expected}" ]
+}
+
+
+@test "check if the backoffRetryMillis is correctly set" {
+    export BACKOFF_RETRY="2000"
+    configure_jobs_service
+    expected=" -Dkogito.jobs-service.backoffRetryMillis=2000"
+    echo "Result is ${KOGITO_JOBS_PROPS} and expected is ${expected}"
+    [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
+}
+
+
+@test "check if the maxIntervalLimitToRetryMillis is correctly set" {
+    export MAX_INTERVAL_LIMIT_RETRY="8000"
+    configure_jobs_service
+    expected=" -Dkogito.jobs-service.maxIntervalLimitToRetryMillis=8000"
+    echo "Result is ${KOGITO_JOBS_PROPS} and expected is ${expected}"
+    [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
+}
+
+
+@test "check if the maxIntervalLimitToRetryMillis and backoffRetryMillis are correctly set" {
+    export MAX_INTERVAL_LIMIT_RETRY="8000"
+    export BACKOFF_RETRY="2000"
+    configure_jobs_service
+    expected=" -Dkogito.jobs-service.backoffRetryMillis=2000 -Dkogito.jobs-service.maxIntervalLimitToRetryMillis=8000"
+    echo "Result is ${KOGITO_JOBS_PROPS} and expected is ${expected}"
+    [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
+}
+
+
+@test "check if the persistence is correctly configured with auth" {
+    export ENABLE_PERSISTENCE="true"
+    export INFINISPAN_CLIENT_SERVER_LIST="localhost:11222"
+    export INFINISPAN_USEAUTH="true"
+    export INFINISPAN_USERNAME="nevermind"
+    export INFINISPAN_PASSWORD="impossible2gues"
+    configure_jobs_service
+    expected=" -Dkogito.jobs-service.persistence=infinispan -Dquarkus.infinispan-client.auth-username=nevermind -Dquarkus.infinispan-client.auth-password=impossible2gues -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.server-list=localhost:11222"
+    echo "Result is ${KOGITO_JOBS_PROPS} and expected is ${expected}"
+    [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
+}
+
+
diff --git a/s2i/tests/features/kogito-quarkus-index.feature b/s2i/tests/features/kogito-data-index.feature
similarity index 100%
rename from s2i/tests/features/kogito-quarkus-index.feature
rename to s2i/tests/features/kogito-data-index.feature
diff --git a/s2i/tests/features/kogito-jobs-service.feature b/s2i/tests/features/kogito-jobs-service.feature
new file mode 100644
index 00000000000..5739af33c80
--- /dev/null
+++ b/s2i/tests/features/kogito-jobs-service.feature
@@ -0,0 +1,71 @@
+@quay.io/kiegroup/kogito-jobs-service
+
+Feature: Kogito-jobs-service feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+     And the image should contain label io.openshift.s2i.destination with value /tmp
+     And the image should contain label io.openshift.expose-services with value 8080:http
+     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service
+     And the image should contain label io.k8s.display-name with value Kogito Jobs Service
+     And the image should contain label io.openshift.tags with value kogito,jobs-service
+
+  Scenario: verify if the jobs service binary is available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/kogito-jobs-service-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-jobs-service-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain + exec java -XshowSettings:properties -jar /home/kogito/bin/kogito-jobs-service-runner.jar
+
+  Scenario: verify if container fails if persistence is enabled but there is no infinispan server list.
+    When container is started with env
+      | variable            | value |
+      | ENABLE_PERSISTENCE  | true  |
+     Then container log should contain INFINISPAN_CLIENT_SERVER_LIST env not found, please set it.
+
+  Scenario: verify if the persistence is correctly enabled without auth
+    When container is started with env
+      | variable                      | value           |
+      | SCRIPT_DEBUG                  | true            |
+      | ENABLE_PERSISTENCE            | true            |
+      | INFINISPAN_CLIENT_SERVER_LIST | localhost:11111 |
+    Then container log should contain quarkus.infinispan-client.server-list = localhost:11111
+     And container log should contain quarkus.infinispan-client.use-auth = false
+
+  Scenario: verify if auth is correctly set
+    When container is started with env
+      | variable                      | value           |
+      | SCRIPT_DEBUG                  | true            |
+      | ENABLE_PERSISTENCE            | true            |
+      | INFINISPAN_CLIENT_SERVER_LIST | localhost:11111 |
+      | INFINISPAN_USEAUTH            | true            |
+      | INFINISPAN_USERNAME           | IamNotExist     |
+      | INFINISPAN_PASSWORD           | hard2guess      |
+    Then container log should contain quarkus.infinispan-client.use-auth = true
+     And container log should contain quarkus.infinispan-client.auth-password = hard2guess
+     And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
+     And container log should contain quarkus.infinispan-client.server-list = localhost:11111
+
+  Scenario: verify if all parameters are correctly set
+    When container is started with env
+      | variable                      | value           |
+      | SCRIPT_DEBUG                  | true            |
+      | ENABLE_PERSISTENCE            | true            |
+      | INFINISPAN_CLIENT_SERVER_LIST | localhost:11111 |
+      | INFINISPAN_USEAUTH            | true            |
+      | INFINISPAN_USERNAME           | IamNotExist     |
+      | INFINISPAN_PASSWORD           | hard2guess      |
+      | INFINISPAN_AUTHREALM          | SecretRealm     |
+      | INFINISPAN_SASLMECHANISM      | COOLGSSAPI      |
+    Then container log should contain quarkus.infinispan-client.use-auth = true
+     And container log should contain quarkus.infinispan-client.auth-password = hard2guess
+     And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
+     And container log should contain quarkus.infinispan-client.auth-realm = SecretRealm
+     And container log should contain quarkus.infinispan-client.sasl-mechanism = COOLGSSAPI
+     And container log should contain quarkus.infinispan-client.server-list = localhost:11111
+

From 9de4f653dd6069589df3523ffcefabc824d8c15d Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 9 Dec 2019 17:22:37 -0300
Subject: [PATCH 071/709] [KOGITO-710] - Prepare Kogito 0.6.0 images release
 (#71)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/kogito-imagestream.yaml                   | 10 ++++-----
 s2i/modules/kogito-data-index/module.yaml     |  6 ++---
 s2i/tests/features/kogito-data-index.feature  |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 22 +++++++++----------
 .../kogito-springboot-ubi8-s2i.feature        | 14 ++++++------
 s2i/tests/test-apps/clone-repo.sh             |  2 +-
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 39389c9261d..d71143696bb 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -136,18 +136,18 @@ items:
   metadata:
     name: kogito-data-index
     annotations:
-      openshift.io/display-name: Runtime image for the Kogito Data Index Service
+      openshift.io/display-name: Runtime image for the Kogito Data Index Service - Tech preview
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.6.0'
+      - name: '0.6.0-TP'
         annotations:
-          description: Runtime image for the Kogito Jobs Service
+          description: Runtime image for the Kogito Jobs Service - Tech preview
           iconClass: icon-jbpm
           tags: kogito,jobs-service
-          version: '0.6.0'
+          version: '0.6.0-TP'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-jobs-service:0.6.0
\ No newline at end of file
+          name: quay.io/kiegroup/kogito-jobs-service:0.6.0-TP
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index 1ba2c903ac6..14f88a31804 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.dataindex
 version: "0.6.0"
 
 artifacts:
-- name: data-index-service-8.0.0-SNAPSHOT-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191203.211509-90-runner.jar
-  md5: bf541da0f17e2c783385c0cfe968cfd0
+- name: data-index-service-0.6.0-runner.jar
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.6.0/data-index-service-0.6.0-runner.jar
+  md5: ce2ef31e37255450d2f3bc891ab66475
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/tests/features/kogito-data-index.feature b/s2i/tests/features/kogito-data-index.feature
index 17ca527e5d9..8652dc6a3da 100644
--- a/s2i/tests/features/kogito-data-index.feature
+++ b/s2i/tests/features/kogito-data-index.feature
@@ -14,7 +14,7 @@ Feature: Kogito-data-index feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-8.0.0-SNAPSHOT-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.6.0-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 1f19060be1f..246f7127670 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value                     |
       | LIMIT_MEMORY   | 2147483648                |
     Then check that page is served
@@ -11,13 +11,13 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
     And s2i build log should contain -J-Xmx1717986918
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -27,12 +27,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -41,10 +41,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner.jar should exist
 
     Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | ARTIFACT_DIR      | drools-quarkus-example/target   |
@@ -55,17 +55,17 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.5.1-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner.jar should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.1
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.0
       | variable          | value                  |
       | NATIVE            | false                  |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.5.1
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.0
       | variable          | value    |
       | NATIVE            | false    |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -95,7 +95,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index e06cfb3f13c..9c729db9aa0 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,7 +3,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.5.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -12,12 +12,12 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.5.1.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.6.0.jar should exist
     And container log should contain DEBUG o.s.boot.SpringApplication.load
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.5.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value                           |
       | JAVA_OPTIONS        | -Ddebug=true                    |
       | ARTIFACT_DIR        | jbpm-springboot-example/target   |
@@ -28,23 +28,23 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.5.1.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.6.0.jar should exist
     And container log should contain DEBUG o.s.boot.SpringApplication.load
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.1
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.0
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.5.1.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.6.0.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.5.1
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.0
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index ac550c4ad72..c566cbe54d8 100755
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -8,7 +8,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
 git fetch origin --tags
-git checkout -b 0.5.1 0.5.1
+git checkout -b 0.6.0 0.6.0
 
 # by adding the application.properties file telling quarkus to start on
 # port 10000, the purpose of this tests is make sure that the images

From c4495213fb696345338ebcdff451cae6e89f78ae Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 11 Dec 2019 11:54:55 -0300
Subject: [PATCH 072/709] [KOGITO-728] - Bump Kogito images version to 0.7.0
 (#72)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile                                  | 28 ++++++-------
 s2i/image.yaml                                |  2 +-
 s2i/kogito-imagestream.yaml                   | 42 +++++++++----------
 s2i/modules/kogito-data-index/module.yaml     |  8 ++--
 .../kogito-image-dependencies/module.yaml     |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 s2i/modules/kogito-jobs-service/module.yaml   |  6 +--
 s2i/modules/kogito-launch-scripts/module.yaml |  2 +-
 s2i/modules/kogito-quarkus-jvm/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-s2i/module.yaml    |  4 +-
 s2i/modules/kogito-quarkus/module.yaml        |  2 +-
 s2i/modules/kogito-s2i-core/module.yaml       |  2 +-
 s2i/modules/kogito-springboot-s2i/module.yaml |  4 +-
 s2i/modules/kogito-springboot/module.yaml     |  2 +-
 s2i/modules/kogito-system-user/module.yaml    |  3 +-
 s2i/tests/features/kogito-data-index.feature  |  2 +-
 16 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/s2i/Makefile b/s2i/Makefile
index ff25e1b7737..5039fe32d3c 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -65,23 +65,23 @@ _push:
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
 
-	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc3
+	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
 	
-	docker tag quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION} quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}-rc3
-	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}-rc3
\ No newline at end of file
+	docker tag quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION} quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}-rc1
+	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}-rc1
\ No newline at end of file
diff --git a/s2i/image.yaml b/s2i/image.yaml
index 70a166c61bb..61431f77fbd 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.6.0"
+version: "0.7.0-rc1"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index d71143696bb..1e641671259 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.0'
+    - name: '0.7.0-rc1'
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
         tags: runtime,kogito,quarkus
         supports: quarkus
-        version: '0.6.0'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.6.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -36,18 +36,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.6.0'
+      - name: '0.7.0-rc1'
         annotations:
           description: Runtime image for Kogito based on Quarkus JVM image
           iconClass: icon-jbpm
           tags: runtime,kogito,quarkus,jvm
           supports: quarkus
-          version: '0.6.0'
+          version: '0.7.0-rc1'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.6.0
+          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -57,18 +57,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.0'
+    - name: '0.7.0-rc1'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,quarkus
         supports: quarkus
-        version: '0.6.0'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.6.0
+        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -78,18 +78,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.0'
+    - name: '0.7.0-rc1'
       annotations:
         description: Runtime image for Kogito based on SpringBoot
         iconClass: icon-jbpm
         tags: runtime,kogito,springboot
         supports: springboot
-        version: '0.6.0'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8:0.6.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -99,18 +99,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.0'
+    - name: '0.7.0-rc1'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,springboot
         supports: springboot
-        version: '0.6.0'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.6.0
+        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -120,17 +120,17 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.0'
+    - name: '0.7.0-rc1'
       annotations:
         description: Runtime image for the Kogito Data Index Service
         iconClass: icon-jbpm
         tags: kogito,data-index
-        version: '0.6.0'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-data-index:0.6.0
+        name: quay.io/kiegroup/kogito-data-index:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -140,14 +140,14 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.6.0-TP'
+      - name: '0.7.0-rc1'
         annotations:
           description: Runtime image for the Kogito Jobs Service - Tech preview
           iconClass: icon-jbpm
           tags: kogito,jobs-service
-          version: '0.6.0-TP'
+          version: '0.7.0-rc1'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-jobs-service:0.6.0-TP
\ No newline at end of file
+          name: quay.io/kiegroup/kogito-jobs-service:0.7.0-rc1
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index 14f88a31804..ee14a5032d0 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.6.0"
+version: "0.7.0-rc1"
 
 artifacts:
-- name: data-index-service-0.6.0-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.6.0/data-index-service-0.6.0-runner.jar
-  md5: ce2ef31e37255450d2f3bc891ab66475
+- name: data-index-service-8.0.0-SNAPSHOT-runner.jar
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191209.212221-96-runner.jar
+  md5: 38aa048cc16efadf178a9ca4b2a7bf42
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-image-dependencies/module.yaml b/s2i/modules/kogito-image-dependencies/module.yaml
index f1ece4b1f11..252e78117f2 100644
--- a/s2i/modules/kogito-image-dependencies/module.yaml
+++ b/s2i/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.6.0"
+version: "0.7.0-rc1"
 description: holds common dependencies across images
 
 execute:
diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/s2i/modules/kogito-infinispan-properties/module.yaml
index 37a7f466a60..1e798922a1c 100644
--- a/s2i/modules/kogito-infinispan-properties/module.yaml
+++ b/s2i/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.6.0"
+version: "0.7.0-rc1"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
index c51079e39da..18ccc4ca09a 100644
--- a/s2i/modules/kogito-jobs-service/module.yaml
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.6.0"
+version: "0.7.0-rc1"
 
 artifacts:
 - name: kogito-jobs-service-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20191205.211123-17-runner.jar
-  md5: f01e3c76a9419a538087b66990753b3c
+  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20191209.211907-21-runner.jar
+  md5: 6f2cef2c988acde3dc1a52d69cdb9f71
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-launch-scripts/module.yaml b/s2i/modules/kogito-launch-scripts/module.yaml
index 07fe8b2f563..e3d1d935baf 100644
--- a/s2i/modules/kogito-launch-scripts/module.yaml
+++ b/s2i/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.6.0"
+version: "0.7.0-rc1"
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-jvm/module.yaml b/s2i/modules/kogito-quarkus-jvm/module.yaml
index bbdacca03a2..06e8807d1bf 100644
--- a/s2i/modules/kogito-quarkus-jvm/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.6.0"
+version: "0.7.0-rc1"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-s2i/module.yaml b/s2i/modules/kogito-quarkus-s2i/module.yaml
index 052c26629fb..a65f82f13d8 100644
--- a/s2i/modules/kogito-quarkus-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.6.0"
+version: "0.7.0-rc1"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.6.0"
\ No newline at end of file
+  value: "0.7.0-rc1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus/module.yaml b/s2i/modules/kogito-quarkus/module.yaml
index e1311dec0de..ba6fe00a269 100644
--- a/s2i/modules/kogito-quarkus/module.yaml
+++ b/s2i/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.6.0"
+version: "0.7.0-rc1"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml
index fd493d7c39f..788a2d0cde1 100644
--- a/s2i/modules/kogito-s2i-core/module.yaml
+++ b/s2i/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.6.0'
+version: '0.7.0-rc1'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/s2i/modules/kogito-springboot-s2i/module.yaml b/s2i/modules/kogito-springboot-s2i/module.yaml
index 242d57cfce8..af2f569650c 100644
--- a/s2i/modules/kogito-springboot-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.6.0"
+version: "0.7.0-rc1"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.6.0"
\ No newline at end of file
+  value: "0.7.0-rc1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot/module.yaml b/s2i/modules/kogito-springboot/module.yaml
index 153d0852dee..3bdbc2fb98b 100644
--- a/s2i/modules/kogito-springboot/module.yaml
+++ b/s2i/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.6.0"
+version: "0.7.0-rc1"
 
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-system-user/module.yaml b/s2i/modules/kogito-system-user/module.yaml
index 76eb78078e4..521662928b9 100644
--- a/s2i/modules/kogito-system-user/module.yaml
+++ b/s2i/modules/kogito-system-user/module.yaml
@@ -1,6 +1,7 @@
 schema_version: 1
-version: "0.6.0"
 name: org.kie.kogito.system.user
+version: "0.7.0-rc1"
+
 execute:
 - script: add-user
 
diff --git a/s2i/tests/features/kogito-data-index.feature b/s2i/tests/features/kogito-data-index.feature
index 8652dc6a3da..17ca527e5d9 100644
--- a/s2i/tests/features/kogito-data-index.feature
+++ b/s2i/tests/features/kogito-data-index.feature
@@ -14,7 +14,7 @@ Feature: Kogito-data-index feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.6.0-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-8.0.0-SNAPSHOT-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env

From 20959af82bd71cedfbb3825afe2440429db443bc Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 12 Dec 2019 13:32:43 -0300
Subject: [PATCH 073/709] [KOGITO-695] - Improve the Kogito process for pushing
 rc images. (#74)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/Makefile        |  20 +------
 s2i/image.yaml      |   2 +-
 s2i/push-staging.py | 131 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+), 20 deletions(-)
 create mode 100644 s2i/push-staging.py

diff --git a/s2i/Makefile b/s2i/Makefile
index 5039fe32d3c..cd85a9a6876 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -65,23 +65,5 @@ _push:
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}-rc1
+	python3 push-staging.py
 
-	docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}-rc1
-
-	docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}-rc1
-
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}-rc1
-
-	docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}-rc1
-
-	docker tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}-rc1
-	
-	docker tag quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION} quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}-rc1
-	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}-rc1
\ No newline at end of file
diff --git a/s2i/image.yaml b/s2i/image.yaml
index 61431f77fbd..205e036ebe0 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.7.0-rc1"
+version: "0.7.0"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/s2i/push-staging.py b/s2i/push-staging.py
new file mode 100644
index 00000000000..0a4ce53c31c
--- /dev/null
+++ b/s2i/push-staging.py
@@ -0,0 +1,131 @@
+#!/usr/bin/python3
+# This script will be responsible to fetch the latest rc tags from each image and define the next
+# rc tag to avoid images get overriden.
+#
+# Requires QUAY_TOKEN env to be set.
+# export QUAY_TOKEN=XXXXX
+# this token can be retrieved from https://quay.io/repository/kiegroup
+#
+
+import docker
+import os
+import requests
+import yaml
+
+# All Kogito images
+IMAGES = ["kogito-quarkus-ubi8", "kogito-quarkus-jvm-ubi8", "kogito-quarkus-ubi8-s2i",
+          "kogito-springboot-ubi8", "kogito-springboot-ubi8-s2i", "kogito-data-index",
+          "kogito-jobs-service"]
+
+IMAGES_NEXT_RC_TAG = []
+QUAY_KOGITO_ORG_PLACE_HOLDER = "quay.io/kiegroup/{}:{}"
+QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG = "quay.io/kiegroup/{}"
+
+
+def find_next_tag():
+    '''
+    Populate the IMAGES_NEXT_RC_TAGS with the next rc tag for each image.
+    '''
+    global IMAGES_NEXT_RC_TAG
+    for image in IMAGES:
+        tag = fetch_tag(image)
+        print("Next tag for image %s is %s" % (image, tag))
+        IMAGES_NEXT_RC_TAG.append('{}:{}'.format(image, tag))
+
+
+def fetch_tag(image):
+    '''
+    fetch the rcX tag for the given image, keep increasing until no rc tag is found
+    then return the next tag to be used.
+    :param image: image to be verified
+    :return: the next rc tag
+    '''
+    version = CURRENT_IMAGE_VERSION
+    while True:
+        url = 'https://quay.io/api/v1/repository/kiegroup/{}/tag/{}/images'.format(image, version)
+        print("Defining latest rc tag for image %s with url %s" % (image, url))
+        authorization = 'Bearer %s'.format(os.environ['QUAY_TOKEN'])
+        headers = {'content-type': 'application/json', 'Authorization': authorization}
+        response = requests.get(url, headers=headers)
+        if response.status_code == 404:
+            return version
+        else:
+            # increase number
+            current_number = version[-1]
+            print("Image found, current rc tag number is %s, increasing..." % current_number)
+            version = str.replace(version, current_number, str(int(current_number) + 1))
+
+
+def tag_and_push_images():
+    '''
+    tag and push the images to quay.io
+    '''
+    cli = docker.client.from_env()
+    current_version = get_current_version()
+    print("New rc tags %s" % IMAGES_NEXT_RC_TAG)
+    if '-rc' not in current_version:
+        for next_tag in IMAGES_NEXT_RC_TAG:
+            iname = str.split(next_tag, ':')[0]
+            iversion_next_tag = str.split(next_tag, ':')[1]
+            iname_tag = QUAY_KOGITO_ORG_PLACE_HOLDER.format(iname, current_version)
+            try:
+                print("Tagging image %s as %s" % (iname_tag, iversion_next_tag))
+                cr_tag = QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG.format(iname)
+                cli.images.get(iname_tag).tag(cr_tag, iversion_next_tag)
+                print("Trying to push %s:%s" % (cr_tag, iversion_next_tag))
+                cli.images.push(cr_tag, iversion_next_tag)
+                print("Pushed")
+            except:
+                raise
+
+    else:
+        # if rc is already on the image version, just tag if needed and push it
+        for next_tag in IMAGES_NEXT_RC_TAG:
+            iname = str.split(next_tag, ':')[0]
+            iversion_next_tag = str.split(next_tag, ':')[1]
+            iname_tag = QUAY_KOGITO_ORG_PLACE_HOLDER.format(iname, current_version)
+            cr_tag = QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG.format(iname)
+            try:
+                if iversion_next_tag != get_current_version():
+                    print("Tagging image %s as %s" % (iname_tag, iversion_next_tag))
+                    cli.images.get(iname_tag).tag(cr_tag, iversion_next_tag)
+
+                print("Trying to push %s:%s" % (cr_tag, iversion_next_tag))
+                cli.images.push(cr_tag, iversion_next_tag)
+            except:
+                raise
+
+
+def get_current_version():
+    '''
+    get the current image version from image.yaml. The version defined there will be considered
+    the point of truth, update it carefully.
+    :return: current image.yaml defined version
+    '''
+    with open('image.yaml') as image_yaml:
+        data = yaml.load(image_yaml, Loader=yaml.FullLoader)
+        return data['version']
+
+
+def find_current_rc_version():
+    '''
+    If the current version already includes the rc tag, keep it, otherwise add it -rc1 tag.
+    :return: the current image tag version
+    '''
+    global CURRENT_IMAGE_VERSION
+    version = get_current_version()
+    if '-rc' in version:
+        CURRENT_IMAGE_VERSION = version
+    else:
+        CURRENT_IMAGE_VERSION = version+'-rc1'
+    print("Current initial version is %s" % CURRENT_IMAGE_VERSION)
+
+
+if __name__ == "__main__":
+    if 'QUAY_TOKEN' not in  os.environ:
+        print("Env QUAY_TOKEN not found, aborting...")
+        os._exit(1)
+    find_current_rc_version()
+    find_next_tag()
+    tag_and_push_images()
+

From b820d799d419dc12f4264dd87579a29a4fbf18a1 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 13 Dec 2019 15:34:45 -0300
Subject: [PATCH 074/709] [KOGITO-702] -Source To Image fails to add custom
 image labels with image_metadata.json file (#76)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/modules/kogito-s2i-core/added/s2i-core        |  4 ++++
 .../kogito-s2i-core/tests/bats/s2i-core.bats      | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/s2i/modules/kogito-s2i-core/added/s2i-core b/s2i/modules/kogito-s2i-core/added/s2i-core
index 5f79bb4eeb6..51779430fa3 100644
--- a/s2i/modules/kogito-s2i-core/added/s2i-core
+++ b/s2i/modules/kogito-s2i-core/added/s2i-core
@@ -30,7 +30,9 @@ function assemble_runtime() {
         echo "---> [s2i-core] Adding custom labels..."
         if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
             mkdir -v /tmp/.s2i
+            mkdir -pv /tmp/src/.s2i/
             cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+            cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/src/.s2i/image_metadata.json
         else
             echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
         fi
@@ -53,7 +55,9 @@ function handle_image_metadata_json() {
     echo "---> [s2i-core] Copy image metadata file..."
     if [ -e "/tmp/src/${artifactDir}/image_metadata.json" ]; then
         mkdir /tmp/.s2i
+        mkdir -p /tmp/src/.s2i/
         cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/.s2i
+        cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/src/.s2i
         cp -v /tmp/src/$artifactDir/image_metadata.json $KOGITO_HOME/bin
     else
         echo "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
diff --git a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 86843c0d1c6..2f52f2e5532 100644
--- a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -75,19 +75,23 @@ teardown() {
     [ "${lines[0]}" = "---> Application binaries found and ready to use" ]
     [ "${lines[1]}" = "---> [s2i-core] Adding custom labels..." ]
     [ "${lines[2]}" = "mkdir: created directory '/tmp/.s2i'" ]
-    [ "${lines[3]}" = "'/tmp/kogito/bin/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
+    [ "${lines[3]}" = "mkdir: created directory '/tmp/src'" ]
+    [ "${lines[4]}" = "mkdir: created directory '/tmp/src/.s2i/'" ]
+    [ "${lines[5]}" = "'/tmp/kogito/bin/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
+    [ "${lines[6]}" = "'/tmp/kogito/bin/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
+
 }
 
 @test "test runtime_assemble" {
     mkdir -p ${KOGITO_HOME}/bin
-    mkdir /tmp/src
-    touch /tmp/src/myapp.jar
+    mkdir -p /tmp/src/bin
+    touch /tmp/src/bin/myapp.jar
 
     run runtime_assemble
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "'./myapp.jar' -> '/tmp/kogito/bin/./myapp.jar'" ]
+    [ "${lines[0]}" = "'./bin/myapp.jar' -> '/tmp/kogito/./bin/myapp.jar'" ]
 }
 
 
@@ -111,7 +115,8 @@ teardown() {
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> [s2i-core] Copy image metadata file..." ]
     [ "${lines[1]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
-    [ "${lines[2]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/kogito/bin'" ]
+    [ "${lines[2]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
+    [ "${lines[3]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/kogito/bin'" ]
 }
 
 @test "test copy_kogito_app default java build no jar file present" {

From 5b838b4ec153b6cbbaa5cb5bd8169efeba442f43 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 16 Dec 2019 17:08:01 -0300
Subject: [PATCH 075/709] [KOGITO-782] - Prepare release 0.6.1 for Kogito
 images (#77)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/image.yaml                                |  2 +-
 s2i/kogito-imagestream.yaml                   | 42 +++++++++----------
 s2i/modules/kogito-data-index/module.yaml     |  8 ++--
 .../kogito-image-dependencies/module.yaml     |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 s2i/modules/kogito-jobs-service/module.yaml   |  6 +--
 s2i/modules/kogito-launch-scripts/module.yaml |  2 +-
 s2i/modules/kogito-quarkus-jvm/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-s2i/module.yaml    |  4 +-
 s2i/modules/kogito-quarkus/module.yaml        |  2 +-
 s2i/modules/kogito-s2i-core/module.yaml       |  2 +-
 s2i/modules/kogito-springboot-s2i/module.yaml |  4 +-
 s2i/modules/kogito-springboot/module.yaml     |  2 +-
 s2i/modules/kogito-system-user/module.yaml    |  2 +-
 s2i/tests/features/kogito-data-index.feature  |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 22 +++++-----
 .../kogito-springboot-ubi8-s2i.feature        | 14 +++----
 s2i/tests/test-apps/clone-repo.sh             |  2 +-
 18 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index 205e036ebe0..643bad96d40 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.7.0"
+version: "0.6.1"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 1e641671259..8998109a260 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.7.0-rc1'
+    - name: '0.6.1'
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
         tags: runtime,kogito,quarkus
         supports: quarkus
-        version: '0.7.0-rc1'
+        version: '0.6.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0-rc1
+        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.6.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -36,18 +36,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.7.0-rc1'
+      - name: '0.6.1'
         annotations:
           description: Runtime image for Kogito based on Quarkus JVM image
           iconClass: icon-jbpm
           tags: runtime,kogito,quarkus,jvm
           supports: quarkus
-          version: '0.7.0-rc1'
+          version: '0.6.1'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0-rc1
+          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.6.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -57,18 +57,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.7.0-rc1'
+    - name: '0.6.1'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,quarkus
         supports: quarkus
-        version: '0.7.0-rc1'
+        version: '0.6.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0-rc1
+        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.6.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -78,18 +78,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.7.0-rc1'
+    - name: '0.6.1'
       annotations:
         description: Runtime image for Kogito based on SpringBoot
         iconClass: icon-jbpm
         tags: runtime,kogito,springboot
         supports: springboot
-        version: '0.7.0-rc1'
+        version: '0.6.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0-rc1
+        name: quay.io/kiegroup/kogito-springboot-ubi8:0.6.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -99,18 +99,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.7.0-rc1'
+    - name: '0.6.1'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,springboot
         supports: springboot
-        version: '0.7.0-rc1'
+        version: '0.6.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0-rc1
+        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.6.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -120,17 +120,17 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.7.0-rc1'
+    - name: '0.6.1'
       annotations:
         description: Runtime image for the Kogito Data Index Service
         iconClass: icon-jbpm
         tags: kogito,data-index
-        version: '0.7.0-rc1'
+        version: '0.6.1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-data-index:0.7.0-rc1
+        name: quay.io/kiegroup/kogito-data-index:0.6.1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -140,14 +140,14 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.7.0-rc1'
+      - name: '0.6.1'
         annotations:
           description: Runtime image for the Kogito Jobs Service - Tech preview
           iconClass: icon-jbpm
           tags: kogito,jobs-service
-          version: '0.7.0-rc1'
+          version: '0.6.1'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-jobs-service:0.7.0-rc1
\ No newline at end of file
+          name: quay.io/kiegroup/kogito-jobs-service:0.6.1
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index ee14a5032d0..24aff023700 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 artifacts:
-- name: data-index-service-8.0.0-SNAPSHOT-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191209.212221-96-runner.jar
-  md5: 38aa048cc16efadf178a9ca4b2a7bf42
+- name: data-index-service-0.6.1-runner.jar
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.6.1/data-index-service-0.6.1-runner.jar
+  md5: ec8de0f37fc6e51137121e80ea112627
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-image-dependencies/module.yaml b/s2i/modules/kogito-image-dependencies/module.yaml
index 252e78117f2..550aa5b3c84 100644
--- a/s2i/modules/kogito-image-dependencies/module.yaml
+++ b/s2i/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.7.0-rc1"
+version: "0.6.1"
 description: holds common dependencies across images
 
 execute:
diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/s2i/modules/kogito-infinispan-properties/module.yaml
index 1e798922a1c..1d1cdf8067d 100644
--- a/s2i/modules/kogito-infinispan-properties/module.yaml
+++ b/s2i/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
index 18ccc4ca09a..9dca473cad2 100644
--- a/s2i/modules/kogito-jobs-service/module.yaml
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 artifacts:
 - name: kogito-jobs-service-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20191209.211907-21-runner.jar
-  md5: 6f2cef2c988acde3dc1a52d69cdb9f71
+  url: https://repository.jboss.org/org/kie/kogito/jobs-service/0.6.1/jobs-service-0.6.1-runner.jar
+  md5: d6ec689d4646f85e0c4c427662d19ef5
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-launch-scripts/module.yaml b/s2i/modules/kogito-launch-scripts/module.yaml
index e3d1d935baf..5cf3693979c 100644
--- a/s2i/modules/kogito-launch-scripts/module.yaml
+++ b/s2i/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-jvm/module.yaml b/s2i/modules/kogito-quarkus-jvm/module.yaml
index 06e8807d1bf..03bf263217b 100644
--- a/s2i/modules/kogito-quarkus-jvm/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-s2i/module.yaml b/s2i/modules/kogito-quarkus-s2i/module.yaml
index a65f82f13d8..734589e30b3 100644
--- a/s2i/modules/kogito-quarkus-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.7.0-rc1"
\ No newline at end of file
+  value: "0.6.1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus/module.yaml b/s2i/modules/kogito-quarkus/module.yaml
index ba6fe00a269..7cd06f58710 100644
--- a/s2i/modules/kogito-quarkus/module.yaml
+++ b/s2i/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml
index 788a2d0cde1..639191cb014 100644
--- a/s2i/modules/kogito-s2i-core/module.yaml
+++ b/s2i/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.7.0-rc1'
+version: '0.6.1'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/s2i/modules/kogito-springboot-s2i/module.yaml b/s2i/modules/kogito-springboot-s2i/module.yaml
index af2f569650c..0980f29a00a 100644
--- a/s2i/modules/kogito-springboot-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.7.0-rc1"
\ No newline at end of file
+  value: "0.6.1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot/module.yaml b/s2i/modules/kogito-springboot/module.yaml
index 3bdbc2fb98b..c7dcfe9b757 100644
--- a/s2i/modules/kogito-springboot/module.yaml
+++ b/s2i/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-system-user/module.yaml b/s2i/modules/kogito-system-user/module.yaml
index 521662928b9..ae274ee27b9 100644
--- a/s2i/modules/kogito-system-user/module.yaml
+++ b/s2i/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.7.0-rc1"
+version: "0.6.1"
 
 execute:
 - script: add-user
diff --git a/s2i/tests/features/kogito-data-index.feature b/s2i/tests/features/kogito-data-index.feature
index 17ca527e5d9..3f00d7b8e84 100644
--- a/s2i/tests/features/kogito-data-index.feature
+++ b/s2i/tests/features/kogito-data-index.feature
@@ -14,7 +14,7 @@ Feature: Kogito-data-index feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-8.0.0-SNAPSHOT-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.6.1-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 246f7127670..e1fc54bbdc2 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value                     |
       | LIMIT_MEMORY   | 2147483648                |
     Then check that page is served
@@ -11,13 +11,13 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
     And s2i build log should contain -J-Xmx1717986918
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -27,12 +27,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -41,10 +41,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist
 
     Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | ARTIFACT_DIR      | drools-quarkus-example/target   |
@@ -55,17 +55,17 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.1
       | variable          | value                  |
       | NATIVE            | false                  |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.1
       | variable          | value    |
       | NATIVE            | false    |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -95,7 +95,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index 9c729db9aa0..a2efbe211fa 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,7 +3,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -12,12 +12,12 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.6.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.6.1.jar should exist
     And container log should contain DEBUG o.s.boot.SpringApplication.load
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value                           |
       | JAVA_OPTIONS        | -Ddebug=true                    |
       | ARTIFACT_DIR        | jbpm-springboot-example/target   |
@@ -28,23 +28,23 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.6.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.6.1.jar should exist
     And container log should contain DEBUG o.s.boot.SpringApplication.load
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.1
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.6.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.6.1.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.1
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index c566cbe54d8..14e854755af 100755
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -8,7 +8,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
 git fetch origin --tags
-git checkout -b 0.6.0 0.6.0
+git checkout -b 0.6.1 0.6.1
 
 # by adding the application.properties file telling quarkus to start on
 # port 10000, the purpose of this tests is make sure that the images

From 3c7d7d5c661b13541beaa958fe40d011e3b15b0b Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Tue, 17 Dec 2019 17:07:52 +0100
Subject: [PATCH 076/709] Fix Kogito Jobs Service image stream (#79)

Signed-off-by: Karel Suta <ksuta@redhat.com>
---
 s2i/kogito-imagestream.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 8998109a260..f648c89e6b3 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -134,9 +134,9 @@ items:
 - kind: ImageStream
   apiVersion: v1
   metadata:
-    name: kogito-data-index
+    name: kogito-jobs-service
     annotations:
-      openshift.io/display-name: Runtime image for the Kogito Data Index Service - Tech preview
+      openshift.io/display-name: Runtime image for the Kogito Jobs Service - Tech preview
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:

From c4d94249ff739b7512cb4a94c81e83b425bc8396 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 17 Dec 2019 16:25:02 -0300
Subject: [PATCH 077/709] [KOGITO-682] - Add integration with a CI to run the
 Kgito Images bats tests (#80)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 .github/workflows/run-bats-tests.yml          | 40 +++++++++++++++++++
 .gitignore                                    |  1 +
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 28 +++++++++----
 3 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/run-bats-tests.yml

diff --git a/.github/workflows/run-bats-tests.yml b/.github/workflows/run-bats-tests.yml
new file mode 100644
index 00000000000..3ec62c5ddc2
--- /dev/null
+++ b/.github/workflows/run-bats-tests.yml
@@ -0,0 +1,40 @@
+name: Run S2I modules Bats Tests
+
+on: pull_request
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Install xmllint
+        run: sudo apt-get install libxml2-utils
+      - name: install bats
+        run: |
+          git clone https://github.com/bats-core/bats-core.git
+          cd bats-core
+          ./install.sh $HOME
+      - name: run kogito-data-index tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats s2i/modules/kogito-data-index/tests/bats
+      - name: run kogito-graalvm-scripts tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats s2i/modules/kogito-graalvm-scripts/tests/bats
+      - name: run kogito-infinispan-properties tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats s2i/modules/kogito-infinispan-properties/tests/bats
+      - name: run kogito-jobs-service tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats s2i/modules/kogito-jobs-service/tests/bats
+      - name: run kogito-maven tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats s2i/modules/kogito-maven/tests/bats
+      - name: run kogito-s2i-core tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats s2i/modules/kogito-s2i-core/tests/bats
diff --git a/.gitignore b/.gitignore
index 625fb9452dd..bf1a1af4e8f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ target/
 # Eclipse, Netbeans and IntelliJ files
 /.*
 !.gitignore
+!.github
 /nbproject
 /*.ipr
 /*.iws
diff --git a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 2f52f2e5532..4a6b394f9ca 100644
--- a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -7,12 +7,14 @@ setup() {
     export KOGITO_HOME=/tmp/kogito
     export HOME=$KOGITO_HOME
     mkdir -p ${KOGITO_HOME}
+    mkdir target
 }
 
 teardown() {
     rm -rf ${KOGITO_HOME}
     rm -rf /tmp/.s2i
     rm -rf /tmp/src
+    rm -rf target
     rm -rf $KOGITO_HOME/bin/*
 }
 
@@ -22,15 +24,27 @@ teardown() {
     touch /tmp/artifacts/{file,file1,file2,file3}
     run manage_incremental_build
 
-    echo "result= ${lines[@]}"
+    IFS=$'\n' sorted=($(sort <<<"${lines[*]}")); unset IFS
+    echo "result= ${sorted[@]}"
 
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "Expanding artifacts from incremental build..." ]
-    [ "${lines[1]}" = "./" ]
-    [ "${lines[2]}" = "./file3" ]
-    [ "${lines[3]}" = "./file2" ]
-    [ "${lines[4]}" = "./file1" ]
-    [ "${lines[5]}" = "./file" ]
+    if [ -z "${GITHUB_ACTIONS}" ]; then
+        [ "$status" -eq 0 ]
+        [ "${sorted[0]}" = "./" ]
+        [ "${sorted[1]}" = "Expanding artifacts from incremental build..." ]
+        [ "${sorted[2]}" = "./file" ]
+        [ "${sorted[3]}" = "./file1" ]
+        [ "${sorted[4]}" = "./file2" ]
+        [ "${sorted[5]}" = "./file3" ]
+    else
+        [ "${sorted[0]}" = "./" ]
+        [ "${sorted[1]}" = "./file" ]
+        [ "${sorted[2]}" = "./file1" ]
+        [ "${sorted[3]}" = "./file2" ]
+        [ "${sorted[4]}" = "./file3" ]
+        [ "${sorted[5]}" = "Expanding artifacts from incremental build..." ]
+    fi
+
 }
 
 

From 77aa9681453d3403d276ef3e07dd467a118f3eac Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 18 Dec 2019 19:31:31 +0100
Subject: [PATCH 078/709] corrected test (#81)

Put the service name as label key, as search for a service will be done
via the label key (see ServiceDiscovery#findEndpoint(namespace,service))
---
 .../KubernetesDiscoveredServiceWorkItemHandlerTest.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
index c496c65bf5d..edb616c15f5 100644
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
@@ -47,7 +47,7 @@ public void testGivenServiceExists() {
         final ObjectMeta metadata = new ObjectMeta();
         metadata.setName("test-kieserver");
         metadata.setNamespace(MOCK_NAMESPACE);
-        metadata.setLabels(Collections.singletonMap("service", "test-kieserver"));
+        metadata.setLabels(Collections.singletonMap("test-kieserver", "service"));
 
         final Service service = new Service("v1", "Service", metadata, serviceSpec, new ServiceStatus(new LoadBalancerStatus()));
         getClient().services().create(service);

From 72a5b25090a9e1ab1dfaa6a61b865e2a05789239 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 23 Dec 2019 14:49:31 -0300
Subject: [PATCH 079/709] [KOGITO-728] - Bump Kogito images version to
 0.7.0-rc1 (#78)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/image.yaml                                |  2 +-
 s2i/kogito-imagestream.yaml                   | 42 +++++++++----------
 s2i/modules/kogito-data-index/module.yaml     |  8 ++--
 .../kogito-image-dependencies/module.yaml     |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 s2i/modules/kogito-jobs-service/module.yaml   |  6 +--
 s2i/modules/kogito-launch-scripts/module.yaml |  2 +-
 s2i/modules/kogito-quarkus-jvm/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-s2i/module.yaml    |  4 +-
 s2i/modules/kogito-quarkus/module.yaml        |  2 +-
 s2i/modules/kogito-s2i-core/module.yaml       |  2 +-
 s2i/modules/kogito-springboot-s2i/module.yaml |  4 +-
 s2i/modules/kogito-springboot/module.yaml     |  2 +-
 s2i/modules/kogito-system-user/module.yaml    |  2 +-
 s2i/tests/features/kogito-data-index.feature  |  2 +-
 15 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index 643bad96d40..61431f77fbd 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.6.1"
+version: "0.7.0-rc1"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index f648c89e6b3..a941f879ee0 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.1'
+    - name: '0.7.0-rc1'
       annotations:
         description: Runtime image for Kogito based on Quarkus native image
         iconClass: icon-jbpm
         tags: runtime,kogito,quarkus
         supports: quarkus
-        version: '0.6.1'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.6.1
+        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -36,18 +36,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.6.1'
+      - name: '0.7.0-rc1'
         annotations:
           description: Runtime image for Kogito based on Quarkus JVM image
           iconClass: icon-jbpm
           tags: runtime,kogito,quarkus,jvm
           supports: quarkus
-          version: '0.6.1'
+          version: '0.7.0-rc1'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.6.1
+          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -57,18 +57,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.1'
+    - name: '0.7.0-rc1'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,quarkus
         supports: quarkus
-        version: '0.6.1'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.6.1
+        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -78,18 +78,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.1'
+    - name: '0.7.0-rc1'
       annotations:
         description: Runtime image for Kogito based on SpringBoot
         iconClass: icon-jbpm
         tags: runtime,kogito,springboot
         supports: springboot
-        version: '0.6.1'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8:0.6.1
+        name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -99,18 +99,18 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.1'
+    - name: '0.7.0-rc1'
       annotations:
         description: Platform for building Kogito based on Quarkus
         iconClass: icon-jbpm
         tags: builder,kogito,springboot
         supports: springboot
-        version: '0.6.1'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.6.1
+        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -120,17 +120,17 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-    - name: '0.6.1'
+    - name: '0.7.0-rc1'
       annotations:
         description: Runtime image for the Kogito Data Index Service
         iconClass: icon-jbpm
         tags: kogito,data-index
-        version: '0.6.1'
+        version: '0.7.0-rc1'
       referencePolicy:
         type: Local
       from:
         kind: DockerImage
-        name: quay.io/kiegroup/kogito-data-index:0.6.1
+        name: quay.io/kiegroup/kogito-data-index:0.7.0-rc1
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -140,14 +140,14 @@ items:
       openshift.io/provider-display-name: Kie Group.
   spec:
     tags:
-      - name: '0.6.1'
+      - name: '0.7.0-rc1'
         annotations:
           description: Runtime image for the Kogito Jobs Service - Tech preview
           iconClass: icon-jbpm
           tags: kogito,jobs-service
-          version: '0.6.1'
+          version: '0.7.0-rc1'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: quay.io/kiegroup/kogito-jobs-service:0.6.1
\ No newline at end of file
+          name: quay.io/kiegroup/kogito-jobs-service:0.7.0-rc1
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index 24aff023700..dda46f055c5 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 artifacts:
-- name: data-index-service-0.6.1-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.6.1/data-index-service-0.6.1-runner.jar
-  md5: ec8de0f37fc6e51137121e80ea112627
+- name: data-index-service-8.0.0-SNAPSHOT-runner.jar
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191216.211654-103-runner.jar
+  md5: aa73da330737993d08daf8046bffe728
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-image-dependencies/module.yaml b/s2i/modules/kogito-image-dependencies/module.yaml
index 550aa5b3c84..252e78117f2 100644
--- a/s2i/modules/kogito-image-dependencies/module.yaml
+++ b/s2i/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.6.1"
+version: "0.7.0-rc1"
 description: holds common dependencies across images
 
 execute:
diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/s2i/modules/kogito-infinispan-properties/module.yaml
index 1d1cdf8067d..1e798922a1c 100644
--- a/s2i/modules/kogito-infinispan-properties/module.yaml
+++ b/s2i/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
index 9dca473cad2..6925ba5b19d 100644
--- a/s2i/modules/kogito-jobs-service/module.yaml
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 artifacts:
 - name: kogito-jobs-service-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/jobs-service/0.6.1/jobs-service-0.6.1-runner.jar
-  md5: d6ec689d4646f85e0c4c427662d19ef5
+  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20191216.211304-28-runner.jar
+  md5: eb314bbcfc79248d8b7c7768982f6044
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-launch-scripts/module.yaml b/s2i/modules/kogito-launch-scripts/module.yaml
index 5cf3693979c..e3d1d935baf 100644
--- a/s2i/modules/kogito-launch-scripts/module.yaml
+++ b/s2i/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-jvm/module.yaml b/s2i/modules/kogito-quarkus-jvm/module.yaml
index 03bf263217b..06e8807d1bf 100644
--- a/s2i/modules/kogito-quarkus-jvm/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-s2i/module.yaml b/s2i/modules/kogito-quarkus-s2i/module.yaml
index 734589e30b3..a65f82f13d8 100644
--- a/s2i/modules/kogito-quarkus-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.6.1"
\ No newline at end of file
+  value: "0.7.0-rc1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus/module.yaml b/s2i/modules/kogito-quarkus/module.yaml
index 7cd06f58710..ba6fe00a269 100644
--- a/s2i/modules/kogito-quarkus/module.yaml
+++ b/s2i/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml
index 639191cb014..788a2d0cde1 100644
--- a/s2i/modules/kogito-s2i-core/module.yaml
+++ b/s2i/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.6.1'
+version: '0.7.0-rc1'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/s2i/modules/kogito-springboot-s2i/module.yaml b/s2i/modules/kogito-springboot-s2i/module.yaml
index 0980f29a00a..af2f569650c 100644
--- a/s2i/modules/kogito-springboot-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.6.1"
\ No newline at end of file
+  value: "0.7.0-rc1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot/module.yaml b/s2i/modules/kogito-springboot/module.yaml
index c7dcfe9b757..3bdbc2fb98b 100644
--- a/s2i/modules/kogito-springboot/module.yaml
+++ b/s2i/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-system-user/module.yaml b/s2i/modules/kogito-system-user/module.yaml
index ae274ee27b9..521662928b9 100644
--- a/s2i/modules/kogito-system-user/module.yaml
+++ b/s2i/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.6.1"
+version: "0.7.0-rc1"
 
 execute:
 - script: add-user
diff --git a/s2i/tests/features/kogito-data-index.feature b/s2i/tests/features/kogito-data-index.feature
index 3f00d7b8e84..17ca527e5d9 100644
--- a/s2i/tests/features/kogito-data-index.feature
+++ b/s2i/tests/features/kogito-data-index.feature
@@ -14,7 +14,7 @@ Feature: Kogito-data-index feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.6.1-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-8.0.0-SNAPSHOT-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env

From 82b9245f5fd050f9fefb164bd5c766ddca5b575f Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 23 Dec 2019 16:17:28 -0300
Subject: [PATCH 080/709] [KOGITO-705] - Refactor data-index image in the same
 way kogito-jobs-service image is structured (#82)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 s2i/kogito-data-index-overrides.yaml          |  31 ++----
 .../added/kogito-app-launch.sh                |  21 ++++
 s2i/modules/kogito-data-index/added/start     |  48 ---------
 s2i/modules/kogito-data-index/configure       |   8 +-
 s2i/modules/kogito-data-index/module.yaml     |   2 +-
 .../tests/bats/kogito-data-index.bats         | 101 ++++++++++++++++++
 .../tests/bats/kogito-dataindex-start.bats    |  94 ----------------
 .../added/kogito-infinispan-properties.sh     |  18 +++-
 .../bats/kogito-infinispan-properties.bats    |  53 +++++----
 .../added/kogito-app-launch.sh                |   5 +-
 .../added/launch/kogito-jobs-service.sh       |   7 +-
 s2i/modules/kogito-jobs-service/configure     |   1 -
 .../tests/bats/kogito-jobs-service.bats       |  11 +-
 s2i/tests/features/kogito-data-index.feature  |  26 ++---
 .../features/kogito-jobs-service.feature      |   2 +-
 15 files changed, 206 insertions(+), 222 deletions(-)
 create mode 100644 s2i/modules/kogito-data-index/added/kogito-app-launch.sh
 delete mode 100755 s2i/modules/kogito-data-index/added/start
 create mode 100644 s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats
 delete mode 100644 s2i/modules/kogito-data-index/tests/bats/kogito-dataindex-start.bats

diff --git a/s2i/kogito-data-index-overrides.yaml b/s2i/kogito-data-index-overrides.yaml
index 9ea48d20f1d..a3bfe932f29 100644
--- a/s2i/kogito-data-index-overrides.yaml
+++ b/s2i/kogito-data-index-overrides.yaml
@@ -13,23 +13,6 @@ labels:
 - name: "io.openshift.expose-services"
   value: "8080:http"
 
-envs:
-- name: "INFINISPAN_USEAUTH"
-  value: "false"
-  description: "Flag that signals to Infinispan Hotrod client to use authentication (Used to set the infinispan.client.hotrod.use_auth system property)"
-- name: "INFINISPAN_USERNAME"
-  value: ""
-  description: "Username for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_username system property)"
-- name: "INFINISPAN_PASSWORD"
-  value: ""
-  description: "Password for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_password system property)"
-- name: "INFINISPAN_AUTHREALM"
-  value: ""
-  description: "Infinispan authentication realm (Used to set the infinispan.client.hotrod.auth_realm system property)"
-- name: "INFINISPAN_SASLMECHANISM"
-  value: ""
-  description: "Sasl mechanism to use during authentication. Example: PLAIN (Used to set the infinispan.client.hotrod.sasl_mechanism system property)"
-
 ports:
 - value: 8080
 
@@ -37,13 +20,15 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.openjdk
+    version: "1.8.0-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.infinispan.properties
   - name: org.kie.kogito.dataindex
 
-packages:
-  install:
-  - java-1.8.0-openjdk
-
 run:
+  workdir: "/home/kogito/"
   user: 1001
-  cmd: 
-    - "/home/kogito/bin/start"
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/s2i/modules/kogito-data-index/added/kogito-app-launch.sh b/s2i/modules/kogito-data-index/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..1abcbb5844c
--- /dev/null
+++ b/s2i/modules/kogito-data-index/added/kogito-app-launch.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    echo "JVM settings debug is enabled."
+fi
+
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${INFINISPAN_PROPERTIES}-Djava.library.path=$KOGITO_HOME/lib \
+        -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 \
+        -jar $KOGITO_HOME/bin/kogito-data-index-runner.jar
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/added/start b/s2i/modules/kogito-data-index/added/start
deleted file mode 100755
index 148ed736a24..00000000000
--- a/s2i/modules/kogito-data-index/added/start
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash -e
-
-# see https://quarkus.io/guides/infinispan-client-guide#quarkus-infinispan-client_configuration
-function set_infinispan_props() {
-    local infinispan_props=""
-
-    if [[ "${INFINISPAN_USEAUTH}" == "true" ]] && [[ -z "${INFINISPAN_USERNAME}"  || -z "${INFINISPAN_PASSWORD}" ]]; then
-        echo "[ERROR] Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
-        exit 1
-    fi
-
-    if [ -z "${INFINISPAN_USERNAME}" ]; then
-        if [ ! -z "${INFINISPAN_USEAUTH}" ]; then
-            INFINISPAN_USEAUTH="false"
-        fi
-    fi
- 
-    if [ ! -z "${INFINISPAN_USERNAME}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-username=${INFINISPAN_USERNAME}"); INFINISPAN_USEAUTH="true"; fi
-    if [ ! -z "${INFINISPAN_PASSWORD}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-password=${INFINISPAN_PASSWORD}"); fi
-    if [ ! -z "${INFINISPAN_USEAUTH}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.use-auth=${INFINISPAN_USEAUTH}"); fi
-    if [ ! -z "${INFINISPAN_AUTHREALM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-realm=${INFINISPAN_AUTHREALM}"); fi
-    if [ ! -z "${INFINISPAN_SASLMECHANISM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.sasl-mechanism=${INFINISPAN_SASLMECHANISM}"); fi
-
-    echo $infinispan_props
-}
-
-function start() {
-
-    if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-        set -x
-        SHOW_JVM_SETTINGS="-XshowSettings:properties"
-        echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-        echo "JVM settings debug is enabled."
-    fi
-
-
-    local infinispan_props=$(set_infinispan_props)
-
-    java ${SHOW_JVM_SETTINGS} -Djava.library.path=$KOGITO_HOME/lib \
-        -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 \
-        ${infinispan_props} \
-        ${JAVA_OPTS} \
-        -jar $KOGITO_HOME/bin/*-runner.jar
-}
-
-if [ -z "${TEST}" ]; then
-    start
-fi
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/configure b/s2i/modules/kogito-data-index/configure
index a34371eebe3..f1a79110376 100644
--- a/s2i/modules/kogito-data-index/configure
+++ b/s2i/modules/kogito-data-index/configure
@@ -5,8 +5,12 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname $0)
 ADDED_DIR=${SCRIPT_DIR}/added
 
-mv ${SOURCES_DIR}/data-index-service-*-runner.jar ${KOGITO_HOME}/bin/
-mv ${ADDED_DIR}/* ${KOGITO_HOME}/bin/
+cp -v ${SOURCES_DIR}/kogito-data-index-runner.jar ${KOGITO_HOME}/bin/
 
 chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
+
+
+cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index dda46f055c5..2ea81584054 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -3,7 +3,7 @@ name: org.kie.kogito.dataindex
 version: "0.7.0-rc1"
 
 artifacts:
-- name: data-index-service-8.0.0-SNAPSHOT-runner.jar
+- name: kogito-data-index-runner.jar
   url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191216.211654-103-runner.jar
   md5: aa73da330737993d08daf8046bffe728
 
diff --git a/s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats
new file mode 100644
index 00000000000..27de61c0855
--- /dev/null
+++ b/s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats
@@ -0,0 +1,101 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME=$KOGITO_HOME
+mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-infinispan-properties/added/kogito-infinispan-properties.sh ${KOGITO_HOME}/launch/
+
+load ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+}
+
+function clear_vars() {
+    unset INFINISPAN_USEAUTH
+    unset INFINISPAN_USERNAME
+    unset INFINISPAN_PASSWORD
+    unset INFINISPAN_AUTHREALM
+    unset INFINISPAN_SASLMECHANISM
+}
+
+@test "check if infinispan properties is blank" {
+    clear_vars
+    local expected=""
+    configure_infinispan_props
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
+}
+
+
+@test "check if infinispan auth is false" {
+    clear_vars
+    export INFINISPAN_USEAUTH="false"
+    local expected=" -Dquarkus.infinispan-client.use-auth=false"
+    configure_infinispan_props
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
+}
+
+@test "check if infinispan has auth props" {
+    clear_vars
+    export INFINISPAN_USERNAME="developer"
+    export INFINISPAN_USEAUTH="true"
+    export INFINISPAN_PASSWORD="developer"
+    export INFINISPAN_AUTHREALM="default"
+    export INFINISPAN_SASLMECHANISM="PLAIN"
+
+    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.auth-password=developer -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.auth-realm=default -Dquarkus.infinispan-client.sasl-mechanism=PLAIN"
+    configure_infinispan_props
+
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
+}
+
+@test "setting username, useauth is true" {
+    clear_vars
+    export INFINISPAN_USERNAME="developer"
+    export INFINISPAN_USEAUTH="false"
+    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
+
+    configure_infinispan_props
+
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
+}
+
+@test "when use auth is set to nonsense and no credentials" {
+    clear_vars
+    export INFINISPAN_USEAUTH="dsadsadasdsa"
+    local expected=" -Dquarkus.infinispan-client.use-auth=false"
+
+    configure_infinispan_props
+
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
+}
+
+@test "when use auth is set to nonsense and has credentials" {
+    clear_vars
+    export INFINISPAN_USEAUTH="dsadsadasdsa"
+    export INFINISPAN_USERNAME="developer"
+    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
+
+    configure_infinispan_props
+
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
+}
+
+@test "when use auth is set to true and no credentials" {
+    clear_vars
+    export INFINISPAN_USEAUTH="true"
+
+    run configure_infinispan_props
+
+    expected="[ERROR] Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
+    echo "Result is ${output} and expected is ${expected}"
+    echo "Expected status is 1, outcome status is ${status}"
+    [ "$status" -eq 1 ]
+    [ "${output}" = "${expected}" ]
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/tests/bats/kogito-dataindex-start.bats b/s2i/modules/kogito-data-index/tests/bats/kogito-dataindex-start.bats
deleted file mode 100644
index 6e7d85c0e0f..00000000000
--- a/s2i/modules/kogito-data-index/tests/bats/kogito-dataindex-start.bats
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env bats
-
-export TEST=true
-
-# import
-load $BATS_TEST_DIRNAME/../../added/start
-
-function clear_vars() {
-    unset INFINISPAN_USEAUTH
-    unset INFINISPAN_USERNAME
-    unset INFINISPAN_PASSWORD
-    unset INFINISPAN_AUTHREALM
-    unset INFINISPAN_SASLMECHANISM
-}
-
-@test "check if infinispan properties is blank" {
-    clear_vars
-    local expected=""
-    run set_infinispan_props
-
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
-}
-
-
-@test "check if infinispan auth is false" {
-    clear_vars
-    export INFINISPAN_USEAUTH="false"
-    local expected="-Dquarkus.infinispan-client.use-auth=false"
-    run set_infinispan_props
-
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
-}
-
-@test "check if infinispan has auth props" {
-    clear_vars
-    export INFINISPAN_USERNAME="developer"
-    export INFINISPAN_USEAUTH="true"
-    export INFINISPAN_PASSWORD="developer"
-    export INFINISPAN_AUTHREALM="default"
-    export INFINISPAN_SASLMECHANISM="PLAIN"
-
-    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.auth-password=developer -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.auth-realm=default -Dquarkus.infinispan-client.sasl-mechanism=PLAIN"
-    run set_infinispan_props
-
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
-}
-
-@test "setting username, useauth is true" {
-    clear_vars
-    export INFINISPAN_USERNAME="developer"
-    export INFINISPAN_USEAUTH="false"
-    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
-
-    run set_infinispan_props
-
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
-}
-
-@test "when use auth is set to nonsense and no credentials" {
-    clear_vars
-    export INFINISPAN_USEAUTH="dsadsadasdsa"
-    local expected="-Dquarkus.infinispan-client.use-auth=false"
-
-    run set_infinispan_props
-
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
-}
-
-@test "when use auth is set to nonsense and has credentials" {
-    clear_vars
-    export INFINISPAN_USEAUTH="dsadsadasdsa"
-    export INFINISPAN_USERNAME="developer"
-    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
-
-    run set_infinispan_props
-
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
-}
-
-@test "when use auth is set to true and no credentials" {
-    clear_vars
-    export INFINISPAN_USEAUTH="true"
-    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
-
-    run set_infinispan_props
-    # exit(1)
-    [ "$status" -eq 1 ]
-}
\ No newline at end of file
diff --git a/s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh b/s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
index 377faf0c295..d1b564c64d3 100755
--- a/s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
+++ b/s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
@@ -1,7 +1,21 @@
 #!/bin/bash -e
 
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset INFINISPAN_AUTHREALM
+    unset INFINISPAN_PASSWORD
+    unset INFINISPAN_SASLMECHANISM
+    unset INFINISPAN_USEAUTH
+    unset INFINISPAN_USERNAME
+}
+
+function configure() {
+    configure_infinispan_props
+}
+
+
 # see https://quarkus.io/guides/infinispan-client-guide#quarkus-infinispan-client_configuration
-function set_infinispan_props() {
+function configure_infinispan_props() {
     local infinispan_props=""
 
     if [[ "${INFINISPAN_USEAUTH}" == "true" ]] && [[ -z "${INFINISPAN_USERNAME}"  || -z "${INFINISPAN_PASSWORD}" ]]; then
@@ -21,6 +35,6 @@ function set_infinispan_props() {
     if [ ! -z "${INFINISPAN_AUTHREALM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-realm=${INFINISPAN_AUTHREALM}"); fi
     if [ ! -z "${INFINISPAN_SASLMECHANISM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.sasl-mechanism=${INFINISPAN_SASLMECHANISM}"); fi
 
-    echo $infinispan_props
+    INFINISPAN_PROPERTIES="${infinispan_props}"
 }
 
diff --git a/s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats b/s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
index 92bd3329390..9502c089e8c 100644
--- a/s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
+++ b/s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
@@ -16,21 +16,21 @@ function clear_vars() {
 @test "check if infinispan properties is blank" {
     clear_vars
     local expected=""
-    run set_infinispan_props
+    configure_infinispan_props
 
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
 }
 
 
 @test "check if infinispan auth is false" {
     clear_vars
     export INFINISPAN_USEAUTH="false"
-    local expected="-Dquarkus.infinispan-client.use-auth=false"
-    run set_infinispan_props
+    local expected=" -Dquarkus.infinispan-client.use-auth=false"
+    configure_infinispan_props
 
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
 }
 
 @test "check if infinispan has auth props" {
@@ -41,54 +41,53 @@ function clear_vars() {
     export INFINISPAN_AUTHREALM="default"
     export INFINISPAN_SASLMECHANISM="PLAIN"
 
-    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.auth-password=developer -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.auth-realm=default -Dquarkus.infinispan-client.sasl-mechanism=PLAIN"
-    run set_infinispan_props
+    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.auth-password=developer -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.auth-realm=default -Dquarkus.infinispan-client.sasl-mechanism=PLAIN"
+    configure_infinispan_props
 
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
 }
 
 @test "setting username, useauth is true" {
     clear_vars
     export INFINISPAN_USERNAME="developer"
     export INFINISPAN_USEAUTH="false"
-    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
+    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
 
-    run set_infinispan_props
+    configure_infinispan_props
 
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
 }
 
 @test "when use auth is set to nonsense and no credentials" {
     clear_vars
     export INFINISPAN_USEAUTH="dsadsadasdsa"
-    local expected="-Dquarkus.infinispan-client.use-auth=false"
+    local expected=" -Dquarkus.infinispan-client.use-auth=false"
 
-    run set_infinispan_props
+    configure_infinispan_props
 
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
 }
 
 @test "when use auth is set to nonsense and has credentials" {
     clear_vars
     export INFINISPAN_USEAUTH="dsadsadasdsa"
     export INFINISPAN_USERNAME="developer"
-    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
+    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
 
-    run set_infinispan_props
+    configure_infinispan_props
 
-    echo "Result is ${output} and expected is ${expected}" >&2
-    [ "${expected}" = "${output}" ]
+    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
+    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
 }
 
 @test "when use auth is set to true and no credentials" {
     clear_vars
     export INFINISPAN_USEAUTH="true"
-    local expected="-Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
-
-    run set_infinispan_props
-    # exit(1)
+    run configure_infinispan_props
+    # exit
+    echo "Status: ${status}"
     [ "$status" -eq 1 ]
 }
\ No newline at end of file
diff --git a/s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh b/s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh
index df122aaf25b..95ea6989018 100644
--- a/s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh
+++ b/s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh
@@ -8,14 +8,15 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
 fi
 
 
-
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
   ${KOGITO_HOME}/launch/kogito-jobs-service.sh
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} -jar $KOGITO_HOME/bin/kogito-jobs-service-runner.jar
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${INFINISPAN_PROPERTIES} \
+    -jar $KOGITO_HOME/bin/kogito-jobs-service-runner.jar
 
diff --git a/s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
index ef80022f63e..4097c98ab6d 100644
--- a/s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
+++ b/s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-# keep it here for now
-# TODO refactor data-index image to reuse it.
-source ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
-
 function prepareEnv() {
     # keep it on alphabetical order
     unset BACKOFF_RETRY
@@ -24,8 +20,7 @@ function configure_jobs_service() {
             echo "INFINISPAN_CLIENT_SERVER_LIST env not found, please set it."
             exit 1
         else
-            infinispanProps=$(set_infinispan_props)
-            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.persistence=infinispan ${infinispanProps}"
+            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.persistence=infinispan"
             KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.infinispan-client.server-list=${INFINISPAN_CLIENT_SERVER_LIST}"
         fi
     fi
diff --git a/s2i/modules/kogito-jobs-service/configure b/s2i/modules/kogito-jobs-service/configure
index dbeef3afdef..5745ad982cf 100644
--- a/s2i/modules/kogito-jobs-service/configure
+++ b/s2i/modules/kogito-jobs-service/configure
@@ -8,7 +8,6 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -v ${SOURCES_DIR}/kogito-jobs-service-runner.jar ${KOGITO_HOME}/bin/
 cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 
-
 chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
 
diff --git a/s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index 463d11b8fec..1490c7f2e3b 100644
--- a/s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -8,6 +8,7 @@ cp $BATS_TEST_DIRNAME/../../../kogito-infinispan-properties/added/kogito-infinis
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-jobs-service.sh
+load ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
 
 
 teardown() {
@@ -60,9 +61,13 @@ teardown() {
     export INFINISPAN_USERNAME="nevermind"
     export INFINISPAN_PASSWORD="impossible2gues"
     configure_jobs_service
-    expected=" -Dkogito.jobs-service.persistence=infinispan -Dquarkus.infinispan-client.auth-username=nevermind -Dquarkus.infinispan-client.auth-password=impossible2gues -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.server-list=localhost:11222"
-    echo "Result is ${KOGITO_JOBS_PROPS} and expected is ${expected}"
-    [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
+    configure_infinispan_props
+
+    result="${KOGITO_JOBS_PROPS} ${INFINISPAN_PROPERTIES}"
+    expected=" -Dkogito.jobs-service.persistence=infinispan -Dquarkus.infinispan-client.server-list=localhost:11222  -Dquarkus.infinispan-client.auth-username=nevermind -Dquarkus.infinispan-client.auth-password=impossible2gues -Dquarkus.infinispan-client.use-auth=true"
+
+    echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
 }
 
 
diff --git a/s2i/tests/features/kogito-data-index.feature b/s2i/tests/features/kogito-data-index.feature
index 17ca527e5d9..cc0273609e2 100644
--- a/s2i/tests/features/kogito-data-index.feature
+++ b/s2i/tests/features/kogito-data-index.feature
@@ -14,7 +14,13 @@ Feature: Kogito-data-index feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-8.0.0-SNAPSHOT-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/kogito-data-index-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-data-index-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false-Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-data-index-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env
@@ -48,15 +54,11 @@ Feature: Kogito-data-index feature.
     And container log should contain quarkus.infinispan-client.auth-realm = SecretRealm
     And container log should contain quarkus.infinispan-client.sasl-mechanism = COOLGSSAPI
 
-  Scenario: verify if all parameters are correctly set
+  Scenario: verify if image is started
     When container is started with env
-      | variable                                                               | value                  |
-      | INFINISPAN_CREDENTIAL_SECRET                                           | infinispan-credentials |
-      | INFINISPAN_AUTHREALM                                                   | default                |
-      | INFINISPAN_USEAUTH                                                     | true                   |
-      | INFINISPAN_SASLMECHANISM                                               | PLAIN                  |
-      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST                                  | server:11222           |
-      | MP_MESSAGING_INCOMING_KOGITO_PROCESSINSTANCES_EVENTS_BOOTSTRAP_SERVERS | mycluster:9092         |
-      | KOGITO_PROTOBUF_FOLDER                                                 | /home/kogito           |
-      | KOGITO_PROTOBUF_WATCH                                                  | true                   |
-     Then container log should contain Error: Could not find or load main class [ERROR]
+      | variable                        | value                  |
+      | INFINISPAN_CREDENTIAL_SECRET    | infinispan-credentials |
+      | INFINISPAN_AUTHREALM            | default                |
+      | INFINISPAN_USEAUTH              | true                   |
+      | INFINISPAN_SASLMECHANISM        | PLAIN                  |
+     Then container log should not contain Error: Could not find or load main class [ERROR]
diff --git a/s2i/tests/features/kogito-jobs-service.feature b/s2i/tests/features/kogito-jobs-service.feature
index 5739af33c80..3bf8a762c40 100644
--- a/s2i/tests/features/kogito-jobs-service.feature
+++ b/s2i/tests/features/kogito-jobs-service.feature
@@ -20,7 +20,7 @@ Feature: Kogito-jobs-service feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -jar /home/kogito/bin/kogito-jobs-service-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false -jar /home/kogito/bin/kogito-jobs-service-runner.jar
 
   Scenario: verify if container fails if persistence is enabled but there is no infinispan server list.
     When container is started with env

From 2173fc4b51c7cd4c511ee21304377aa7562f906c Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 26 Dec 2019 16:49:25 -0300
Subject: [PATCH 081/709] [KOGITO-834] - Add imagestream validation of Kogito
 Images on the GH Actions (#84)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 .github/workflows/validate-imagestreams.yml |  20 ++
 s2i/kogito-imagestream.yaml                 | 282 ++++++++++----------
 2 files changed, 162 insertions(+), 140 deletions(-)
 create mode 100644 .github/workflows/validate-imagestreams.yml

diff --git a/.github/workflows/validate-imagestreams.yml b/.github/workflows/validate-imagestreams.yml
new file mode 100644
index 00000000000..99f7faec7e8
--- /dev/null
+++ b/.github/workflows/validate-imagestreams.yml
@@ -0,0 +1,20 @@
+name: Validate Kogito imagestreams
+
+on: pull_request
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Download openshift-validator-tool
+        run: |
+          wget https://github.com/jboss-container-images/jboss-kie-modules/raw/master/tools/openshift-template-validator/openshift-template-validator-linux-amd64
+      - name: Add execution permission to openshift-validator-tool
+        run: |
+          chmod +x openshift-template-validator-linux-amd64
+          mv openshift-template-validator-linux-amd64 ${HOME} 	
+      - name: validate imagestream
+        run: |
+          ${HOME}/openshift-template-validator-linux-amd64 validate -f s2i/kogito-imagestream.yaml
+
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index a941f879ee0..7759df4251b 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -6,148 +6,150 @@ metadata:
     description: ImageStream definitions for Kogito images
     openshift.io/provider-display-name: Kie Group.
 items:
-- kind: ImageStream
-  apiVersion: v1
-  metadata:
-    name: kogito-quarkus-ubi8
-    annotations:
-      openshift.io/display-name: Runtime image for Kogito based on Quarkus native image
-      openshift.io/provider-display-name: Kie Group.
-  spec:
-    tags:
-    - name: '0.7.0-rc1'
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-quarkus-ubi8
       annotations:
-        description: Runtime image for Kogito based on Quarkus native image
-        iconClass: icon-jbpm
-        tags: runtime,kogito,quarkus
-        supports: quarkus
-        version: '0.7.0-rc1'
-      referencePolicy:
-        type: Local
-      from:
-        kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0-rc1
-- kind: ImageStream
-  apiVersion: v1
-  metadata:
-    name: kogito-quarkus-jvm-ubi8
-    annotations:
-      openshift.io/display-name: Runtime image for Kogito based on Quarkus JVM image
-      openshift.io/provider-display-name: Kie Group.
-  spec:
-    tags:
-      - name: '0.7.0-rc1'
-        annotations:
-          description: Runtime image for Kogito based on Quarkus JVM image
-          iconClass: icon-jbpm
-          tags: runtime,kogito,quarkus,jvm
-          supports: quarkus
-          version: '0.7.0-rc1'
-        referencePolicy:
-          type: Local
-        from:
-          kind: DockerImage
-          name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0-rc1
-- kind: ImageStream
-  apiVersion: v1
-  metadata:
-    name: kogito-quarkus-ubi8-s2i
-    annotations:
-      openshift.io/display-name: Platform for building Kogito based on Quarkus
-      openshift.io/provider-display-name: Kie Group.
-  spec:
-    tags:
-    - name: '0.7.0-rc1'
+        openshift.io/display-name: Runtime image for Kogito based on Quarkus native image
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '0.7.0-rc1'
+          annotations:
+            description: Runtime image for Kogito based on Quarkus native image
+            iconClass: icon-jbpm
+            tags: runtime,kogito,quarkus
+            supports: quarkus
+            version: '0.7.0-rc1'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0-rc1
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-quarkus-jvm-ubi8
       annotations:
-        description: Platform for building Kogito based on Quarkus
-        iconClass: icon-jbpm
-        tags: builder,kogito,quarkus
-        supports: quarkus
-        version: '0.7.0-rc1'
-      referencePolicy:
-        type: Local
-      from:
-        kind: DockerImage
-        name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0-rc1
-- kind: ImageStream
-  apiVersion: v1
-  metadata:
-    name: kogito-springboot-ubi8
-    annotations:
-      openshift.io/display-name: Runtime image for Kogito based on SpringBoot
-      openshift.io/provider-display-name: Kie Group.
-  spec:
-    tags:
-    - name: '0.7.0-rc1'
+        openshift.io/display-name: Runtime image for Kogito based on Quarkus JVM image
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '0.7.0-rc1'
+          annotations:
+            description: Runtime image for Kogito based on Quarkus JVM image
+            iconClass: icon-jbpm
+            tags: runtime,kogito,quarkus,jvm
+            supports: quarkus
+            version: '0.7.0-rc1'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0-rc1
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-quarkus-ubi8-s2i
       annotations:
-        description: Runtime image for Kogito based on SpringBoot
-        iconClass: icon-jbpm
-        tags: runtime,kogito,springboot
-        supports: springboot
-        version: '0.7.0-rc1'
-      referencePolicy:
-        type: Local
-      from:
-        kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0-rc1
-- kind: ImageStream
-  apiVersion: v1
-  metadata:
-    name: kogito-springboot-ubi8-s2i
-    annotations:
-      openshift.io/display-name: Platform for building Kogito based on SpringBoot
-      openshift.io/provider-display-name: Kie Group.
-  spec:
-    tags:
-    - name: '0.7.0-rc1'
+        openshift.io/display-name: Platform for building Kogito based on Quarkus
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '0.7.0-rc1'
+          annotations:
+            description: Platform for building Kogito based on Quarkus
+            iconClass: icon-jbpm
+            tags: builder,kogito,quarkus
+            supports: quarkus
+            version: '0.7.0-rc1'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0-rc1
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-springboot-ubi8
       annotations:
-        description: Platform for building Kogito based on Quarkus
-        iconClass: icon-jbpm
-        tags: builder,kogito,springboot
-        supports: springboot
-        version: '0.7.0-rc1'
-      referencePolicy:
-        type: Local
-      from:
-        kind: DockerImage
-        name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0-rc1
-- kind: ImageStream
-  apiVersion: v1
-  metadata:
-    name: kogito-data-index
-    annotations:
-      openshift.io/display-name: Runtime image for the Kogito Data Index Service
-      openshift.io/provider-display-name: Kie Group.
-  spec:
-    tags:
-    - name: '0.7.0-rc1'
+        openshift.io/display-name: Runtime image for Kogito based on SpringBoot
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '0.7.0-rc1'
+          annotations:
+            description: Runtime image for Kogito based on SpringBoot
+            iconClass: icon-jbpm
+            tags: runtime,kogito,springboot
+            supports: springboot
+            version: '0.7.0-rc1'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0-rc1
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-springboot-ubi8-s2i
       annotations:
-        description: Runtime image for the Kogito Data Index Service
-        iconClass: icon-jbpm
-        tags: kogito,data-index
-        version: '0.7.0-rc1'
-      referencePolicy:
-        type: Local
-      from:
-        kind: DockerImage
-        name: quay.io/kiegroup/kogito-data-index:0.7.0-rc1
-- kind: ImageStream
-  apiVersion: v1
-  metadata:
-    name: kogito-jobs-service
-    annotations:
-      openshift.io/display-name: Runtime image for the Kogito Jobs Service - Tech preview
-      openshift.io/provider-display-name: Kie Group.
-  spec:
-    tags:
-      - name: '0.7.0-rc1'
-        annotations:
-          description: Runtime image for the Kogito Jobs Service - Tech preview
-          iconClass: icon-jbpm
-          tags: kogito,jobs-service
-          version: '0.7.0-rc1'
-        referencePolicy:
-          type: Local
-        from:
-          kind: DockerImage
-          name: quay.io/kiegroup/kogito-jobs-service:0.7.0-rc1
\ No newline at end of file
+        openshift.io/display-name: Platform for building Kogito based on SpringBoot
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '0.7.0-rc1'
+          annotations:
+            description: Platform for building Kogito based on Quarkus
+            iconClass: icon-jbpm
+            tags: builder,kogito,springboot
+            supports: springboot
+            version: '0.7.0-rc1'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0-rc1
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-data-index
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Data Index Service
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '0.7.0-rc1'
+          annotations:
+            description: Runtime image for the Kogito Data Index Service
+            iconClass: icon-jbpm
+            tags: kogito,data-index
+            supports: infinispan, persitence
+            version: '0.7.0-rc1'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-data-index:0.7.0-rc1
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-jobs-service
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Jobs Service - Tech preview
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '0.7.0-rc1'
+          annotations:
+            description: Runtime image for the Kogito Jobs Service - Tech preview
+            iconClass: icon-jbpm
+            tags: kogito,jobs-service
+            supports: out-of-box process timers
+            version: '0.7.0-rc1'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-jobs-service:0.7.0-rc1
\ No newline at end of file

From 28686af7b6cd733f497620210fc9024478049981 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 27 Dec 2019 11:53:17 -0300
Subject: [PATCH 082/709] [KOGITO-511] - Kogito Data Index image - allow
 quarkus.http.port to be defined via env variable (#83)

Signed-off-by: Filippe Spolti <fspolti@redhat.com>
---
 .../added/kogito-app-launch.sh                |  6 ++++--
 .../added/launch/kogito-data-index.sh         | 17 ++++++++++++++++
 s2i/modules/kogito-data-index/configure       |  2 +-
 .../tests/bats/kogito-data-index.bats         | 20 ++++++++++++++++++-
 s2i/tests/features/kogito-data-index.feature  | 11 ++++++++--
 5 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 s2i/modules/kogito-data-index/added/launch/kogito-data-index.sh

diff --git a/s2i/modules/kogito-data-index/added/kogito-app-launch.sh b/s2i/modules/kogito-data-index/added/kogito-app-launch.sh
index 1abcbb5844c..04034232707 100644
--- a/s2i/modules/kogito-data-index/added/kogito-app-launch.sh
+++ b/s2i/modules/kogito-data-index/added/kogito-app-launch.sh
@@ -12,10 +12,12 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
   ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
+  ${KOGITO_HOME}/launch/kogito-data-index.sh
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${INFINISPAN_PROPERTIES}-Djava.library.path=$KOGITO_HOME/lib \
-        -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${INFINISPAN_PROPERTIES} ${KOGITO_DATA_INDEX_PROPS} \
+        -Djava.library.path=$KOGITO_HOME/lib \
+        -Dquarkus.http.host=0.0.0.0 \
         -jar $KOGITO_HOME/bin/kogito-data-index-runner.jar
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/added/launch/kogito-data-index.sh b/s2i/modules/kogito-data-index/added/launch/kogito-data-index.sh
new file mode 100644
index 00000000000..fb3be84b38f
--- /dev/null
+++ b/s2i/modules/kogito-data-index/added/launch/kogito-data-index.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset KOGITO_DATA_INDEX_HTTP_PORT
+}
+
+function configure() {
+    configure_data_index_http_port
+}
+
+function configure_data_index_http_port {
+    local httpPort=${KOGITO_DATA_INDEX_HTTP_PORT:-8080}
+    KOGITO_DATA_INDEX_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dquarkus.http.port=${httpPort}"
+}
+
diff --git a/s2i/modules/kogito-data-index/configure b/s2i/modules/kogito-data-index/configure
index f1a79110376..efdf5175c7b 100644
--- a/s2i/modules/kogito-data-index/configure
+++ b/s2i/modules/kogito-data-index/configure
@@ -6,11 +6,11 @@ SCRIPT_DIR=$(dirname $0)
 ADDED_DIR=${SCRIPT_DIR}/added
 
 cp -v ${SOURCES_DIR}/kogito-data-index-runner.jar ${KOGITO_HOME}/bin/
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 
 chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
 
-
 cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
 chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
 
diff --git a/s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats
index 27de61c0855..cd6505c517b 100644
--- a/s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats
+++ b/s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats
@@ -5,7 +5,9 @@ export HOME=$KOGITO_HOME
 mkdir -p ${KOGITO_HOME}/launch
 cp $BATS_TEST_DIRNAME/../../../kogito-infinispan-properties/added/kogito-infinispan-properties.sh ${KOGITO_HOME}/launch/
 
+# imports
 load ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-data-index.sh
 
 teardown() {
     rm -rf ${KOGITO_HOME}
@@ -98,4 +100,20 @@ function clear_vars() {
     echo "Expected status is 1, outcome status is ${status}"
     [ "$status" -eq 1 ]
     [ "${output}" = "${expected}" ]
-}
\ No newline at end of file
+}
+
+@test "http port configuration default value" {
+    configure_data_index_http_port
+    expected=" -Dquarkus.http.port=8080"
+    echo "Result is ${KOGITO_DATA_INDEX_PROPS} and expected is ${expected}"
+    [ "${KOGITO_DATA_INDEX_PROPS}" = "${expected}" ]
+}
+
+@test "http port configuration custom value" {
+    export KOGITO_DATA_INDEX_HTTP_PORT="9090"
+    configure_data_index_http_port
+    expected=" -Dquarkus.http.port=9090"
+    echo "Result is ${KOGITO_DATA_INDEX_PROPS} and expected is ${expected}"
+    [ "${KOGITO_DATA_INDEX_PROPS}" = "${expected}" ]
+}
+
diff --git a/s2i/tests/features/kogito-data-index.feature b/s2i/tests/features/kogito-data-index.feature
index cc0273609e2..f8a81403726 100644
--- a/s2i/tests/features/kogito-data-index.feature
+++ b/s2i/tests/features/kogito-data-index.feature
@@ -16,11 +16,18 @@ Feature: Kogito-data-index feature.
     When container is started with command bash
     Then run sh -c 'ls /home/kogito/bin/kogito-data-index-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-data-index-runner.jar
 
-  Scenario: Verify if the debug is correctly enabled
+  Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false-Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-data-index-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-data-index-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port
+    When container is started with env
+      | variable                     | value |
+      | SCRIPT_DEBUG                 | true  |
+      | KOGITO_DATA_INDEX_HTTP_PORT  | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-data-index-runner.jar
 
   Scenario: Verify data-index default configuration
     When container is started with env

From d3a6f44f73e09b4d82ee095abe29b5ddd8a3228a Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Thu, 9 Jan 2020 17:30:58 -0300
Subject: [PATCH 083/709] [KOGITO-587] - Introducing persistence and k8s module
 to register proto files to configMaps (#75)

---
 go.mod                                        |   3 +
 s2i/modules/kogito-data-index/configure       |   2 +
 s2i/modules/kogito-epel/7/configure           |   7 +
 s2i/modules/kogito-epel/7/module.yaml         |   6 +
 s2i/modules/kogito-jq/clean.sh                |   4 +
 s2i/modules/kogito-jq/module.yaml             |  15 ++
 .../added/kogito-kubernetes-client.sh         |  68 +++++++
 .../kogito-kubernetes-client/configure        |   8 +
 .../kogito-kubernetes-client/module.yaml      |  10 +
 .../tests/bats/kogito-kubernetes-client.bats  |  29 +++
 s2i/modules/kogito-launch-scripts/configure   |   2 +-
 s2i/modules/kogito-logging/added/logging.sh   |  24 +++
 s2i/modules/kogito-logging/configure          |   8 +
 s2i/modules/kogito-logging/module.yaml        |   6 +
 .../added/kogito-persistence.sh               | 106 +++++++++++
 .../added/post-hook-persistence.sh            |   8 +
 s2i/modules/kogito-persistence/configure      |  12 ++
 s2i/modules/kogito-persistence/module.yaml    |  10 +
 .../bats/expected/patch_cm_travel_agency.json |   1 +
 .../tests/bats/expected/patch_empty_data.json |   1 +
 .../tests/bats/kogito-persistence.bats        | 174 ++++++++++++++++++
 .../tests/bats/mocks/config_map.json          |  33 ++++
 .../mocks/config_map_empty_annotations.json   |  26 +++
 .../bats/mocks/config_map_file1_only.json     |  31 ++++
 .../bats/mocks/config_map_no_annotations.json |  30 +++
 .../tests/bats/mocks/travels.proto            | 115 ++++++++++++
 .../tests/bats/mocks/visaApplications.proto   |  39 ++++
 .../tests/bats/post-hook-persistence.bats     |  26 +++
 .../kogito-quarkus-s2i/s2i/bin/assemble       |   2 +
 s2i/modules/kogito-s2i-core/added/s2i-core    |   6 +-
 s2i/modules/kogito-s2i-core/module.yaml       |   5 +
 .../kogito-s2i-core/tests/bats/s2i-core.bats  |  31 ++--
 .../kogito-springboot-s2i/s2i/bin/assemble    |   2 +
 .../features/kogito-quarkus-ubi8-s2i.feature  |  13 ++
 34 files changed, 847 insertions(+), 16 deletions(-)
 create mode 100644 go.mod
 create mode 100644 s2i/modules/kogito-epel/7/configure
 create mode 100644 s2i/modules/kogito-epel/7/module.yaml
 create mode 100644 s2i/modules/kogito-jq/clean.sh
 create mode 100644 s2i/modules/kogito-jq/module.yaml
 create mode 100644 s2i/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
 create mode 100644 s2i/modules/kogito-kubernetes-client/configure
 create mode 100644 s2i/modules/kogito-kubernetes-client/module.yaml
 create mode 100644 s2i/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
 create mode 100644 s2i/modules/kogito-logging/added/logging.sh
 create mode 100644 s2i/modules/kogito-logging/configure
 create mode 100644 s2i/modules/kogito-logging/module.yaml
 create mode 100644 s2i/modules/kogito-persistence/added/kogito-persistence.sh
 create mode 100755 s2i/modules/kogito-persistence/added/post-hook-persistence.sh
 create mode 100644 s2i/modules/kogito-persistence/configure
 create mode 100644 s2i/modules/kogito-persistence/module.yaml
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/kogito-persistence.bats
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/mocks/config_map.json
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/mocks/travels.proto
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto
 create mode 100644 s2i/modules/kogito-persistence/tests/bats/post-hook-persistence.bats

diff --git a/go.mod b/go.mod
new file mode 100644
index 00000000000..47e852d8db4
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module github.com/ricardozanini/kogito-cloud
+
+go 1.12
diff --git a/s2i/modules/kogito-data-index/configure b/s2i/modules/kogito-data-index/configure
index efdf5175c7b..308afeb581c 100644
--- a/s2i/modules/kogito-data-index/configure
+++ b/s2i/modules/kogito-data-index/configure
@@ -8,6 +8,8 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -v ${SOURCES_DIR}/kogito-data-index-runner.jar ${KOGITO_HOME}/bin/
 cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 
+mkdir -p ${KOGITO_HOME}/data/protobufs/
+
 chown -R 1001:0 ${KOGITO_HOME}
 chmod -R ug+rwX ${KOGITO_HOME}
 
diff --git a/s2i/modules/kogito-epel/7/configure b/s2i/modules/kogito-epel/7/configure
new file mode 100644
index 00000000000..daa8140d025
--- /dev/null
+++ b/s2i/modules/kogito-epel/7/configure
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+
+microdnf clean all
+rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/s2i/modules/kogito-epel/7/module.yaml b/s2i/modules/kogito-epel/7/module.yaml
new file mode 100644
index 00000000000..778eadfd090
--- /dev/null
+++ b/s2i/modules/kogito-epel/7/module.yaml
@@ -0,0 +1,6 @@
+schema_version: 1
+name: org.kie.kogito.epel
+version: "7"
+
+execute:
+  - script: configure
diff --git a/s2i/modules/kogito-jq/clean.sh b/s2i/modules/kogito-jq/clean.sh
new file mode 100644
index 00000000000..d99eb4fb10e
--- /dev/null
+++ b/s2i/modules/kogito-jq/clean.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+microdnf clean all
+rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/s2i/modules/kogito-jq/module.yaml b/s2i/modules/kogito-jq/module.yaml
new file mode 100644
index 00000000000..3390a053f9b
--- /dev/null
+++ b/s2i/modules/kogito-jq/module.yaml
@@ -0,0 +1,15 @@
+schema_version: 1
+name: org.kie.kogito.jq
+version: "0.7.0-rc1"
+
+modules:
+    install:
+    - name: org.kie.kogito.epel
+      version: "7"
+
+execute:
+  - script: clean.sh
+
+packages:
+  install:
+    - jq
diff --git a/s2i/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh b/s2i/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
new file mode 100644
index 00000000000..bb9ec36f90f
--- /dev/null
+++ b/s2i/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+# imports
+source ${KOGITO_HOME}/launch/logging.sh
+
+# checks if this script is running on a Kubernetes environment
+function is_running_on_kubernetes() {
+    if [ -e /var/run/secrets/kubernetes.io/serviceaccount/token ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# lists or gets a resource kind in the given api within the namespace and return a JSON response
+# ${1} api, e.g. "apis/apps" (for core APIs, use just "api")
+# ${2} resource, e.g. "deployments/${resource_name}". To list a resource, don't specify the resource name
+# ${3} labels (list only), restrict resources by these labels. e.g. app=myapp. Defaults to empty
+# ${4} fields (list only), restrict resources by these fields. e.g. metadata.name=${resource_name}. see: https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/
+# see: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.14/
+# to parse this response, use jq: https://stedolan.github.io/jq/tutorial/ (installed in this module)
+function list_or_get_k8s_resource() {
+    local api="${1}"
+    local resource="${2}"
+    local labels="${3}"
+    local fields="${4}"
+    
+    log_info "--> [k8s-client] Trying to fetch Kubernetes API ${api} for resource ${resource}"
+
+    if is_running_on_kubernetes; then 
+        local namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
+        local token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
+        local response=$(curl -s -w "%{http_code}" --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
+            -H "Authorization: Bearer $token" \
+            -H 'Accept: application/json' \
+            ${KUBERNETES_SERVICE_PROTOCOL:-https}://${KUBERNETES_SERVICE_HOST:-kubernetes.default.svc}:${KUBERNETES_SERVICE_PORT:-443}/${api}/v1/namespaces/${namespace}/${resource}?labelSelector=${labels}\&fieldSelector=${fields})
+        echo ${response}
+    else
+        log_info "--> [k8s-client] Not running on Kubernetes, skipping..."
+    fi
+}
+
+# sends a patch request to the Kubernetes API using JSON merge strategy
+# ${1} api, e.g. "apis/apps" (for core APIs, leave in blank)
+# ${2} resource, e.g. "deployments/${resource_name}"
+# ${3} json_body file in JSON Patch format: http://jsonpatch.com/ Example: [ { "op": "replace", "path": "/metadata/annotations", "value" : {} }, {"op": "replace", "path": "/data", "value": {"file1.proto", "file2.proto"}  } ]
+# see: https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/#use-a-json-merge-patch-to-update-a-deployment
+function patch_json_k8s_resource() {
+    local api="${1}"
+    local resource="${2}"
+    local file="${3}"
+    
+    log_info "--> [k8s-client] Trying to patch resource ${resource} in Kubernetes API ${api}"
+
+    if is_running_on_kubernetes; then
+        local namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
+        local token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
+        local response=$(curl --request PATCH -s -w "%{http_code}" --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
+            -H "Authorization: Bearer $token" \
+            -H 'Accept: application/json' \
+            -H 'Content-Type: application/json-patch+json' \
+            --data "@${file}" \
+            ${KUBERNETES_SERVICE_PROTOCOL:-https}://${KUBERNETES_SERVICE_HOST:-kubernetes.default.svc}:${KUBERNETES_SERVICE_PORT:-443}/${api}/v1/namespaces/${namespace}/${resource})
+        echo ${response}
+    else
+        log_info "--> [k8s-client] Not running on Kubernetes, skipping..."
+    fi
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-kubernetes-client/configure b/s2i/modules/kogito-kubernetes-client/configure
new file mode 100644
index 00000000000..5784df283c7
--- /dev/null
+++ b/s2i/modules/kogito-kubernetes-client/configure
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+SCRIPT_DIR=$(dirname $0)
+
+# kogito-kubernetes-client
+mkdir -p ${KOGITO_HOME}/launch/
+cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
+chmod +x-w ${KOGITO_HOME}/launch/kogito-kubernetes-client.sh
\ No newline at end of file
diff --git a/s2i/modules/kogito-kubernetes-client/module.yaml b/s2i/modules/kogito-kubernetes-client/module.yaml
new file mode 100644
index 00000000000..c51741b20a9
--- /dev/null
+++ b/s2i/modules/kogito-kubernetes-client/module.yaml
@@ -0,0 +1,10 @@
+schema_version: 1
+name: org.kie.kogito.kubernetes.client
+version: "0.7.0-rc1"
+
+execute:
+- script: configure
+
+modules:
+    install:
+    - name: org.kie.kogito.jq
\ No newline at end of file
diff --git a/s2i/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats b/s2i/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
new file mode 100644
index 00000000000..850030cefd6
--- /dev/null
+++ b/s2i/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
@@ -0,0 +1,29 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=$BATS_TMPDIR/kogito_home
+mkdir -p $KOGITO_HOME/launch
+
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh $KOGITO_HOME/launch/
+
+# imports
+source $BATS_TEST_DIRNAME/../../added/kogito-kubernetes-client.sh
+
+@test "list_or_get_k8s_resource sanity check" {
+    run list_or_get_k8s_resource "" "configmaps/my-config-map"
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "INFO --> [k8s-client] Trying to fetch Kubernetes API  for resource configmaps/my-config-map" ]
+    [ "${lines[1]}" = "INFO --> [k8s-client] Not running on Kubernetes, skipping..." ]
+}
+
+@test "patch_json_k8s_resource sanity check" {
+    run patch_json_k8s_resource "" "configmaps/my-config-map" "{ spec: {data: []}}"
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "INFO --> [k8s-client] Trying to patch resource configmaps/my-config-map in Kubernetes API " ]
+    [ "${lines[1]}" = "INFO --> [k8s-client] Not running on Kubernetes, skipping..." ]
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-launch-scripts/configure b/s2i/modules/kogito-launch-scripts/configure
index 606002e0cb6..079c3763968 100644
--- a/s2i/modules/kogito-launch-scripts/configure
+++ b/s2i/modules/kogito-launch-scripts/configure
@@ -4,5 +4,5 @@ set -e
 SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname $0)
 
-mkdir ${KOGITO_HOME}/launch
+mkdir -p ${KOGITO_HOME}/launch
 cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch
\ No newline at end of file
diff --git a/s2i/modules/kogito-logging/added/logging.sh b/s2i/modules/kogito-logging/added/logging.sh
new file mode 100644
index 00000000000..7d43595506c
--- /dev/null
+++ b/s2i/modules/kogito-logging/added/logging.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+BLACK='\033[0;30m'
+RED='\033[0;31m'
+YELLOW='\033[0;33m'
+DEFAULT='\033[0m'
+
+function log_warning() {
+  local message="${1}"
+
+  echo >&2 -e "${YELLOW}WARN ${message}${DEFAULT}"
+}
+
+function log_error() {
+  local message="${1}"
+
+  echo >&2 -e "${RED}ERROR ${message}${DEFAULT}"
+}
+
+function log_info() {
+  local message="${1}"
+
+  echo >&2 -e "INFO ${message}"
+}
diff --git a/s2i/modules/kogito-logging/configure b/s2i/modules/kogito-logging/configure
new file mode 100644
index 00000000000..12d94d9ade4
--- /dev/null
+++ b/s2i/modules/kogito-logging/configure
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+SCRIPT_DIR=$(dirname $0)
+
+# logging
+mkdir -p ${KOGITO_HOME}/launch/
+cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
+chmod +x-w ${KOGITO_HOME}/launch/logging.sh
\ No newline at end of file
diff --git a/s2i/modules/kogito-logging/module.yaml b/s2i/modules/kogito-logging/module.yaml
new file mode 100644
index 00000000000..fa0df068b3e
--- /dev/null
+++ b/s2i/modules/kogito-logging/module.yaml
@@ -0,0 +1,6 @@
+schema_version: 1
+name: org.kie.kogito.logging
+version: "0.7.0-rc1"
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/added/kogito-persistence.sh b/s2i/modules/kogito-persistence/added/kogito-persistence.sh
new file mode 100644
index 00000000000..05f91a01b33
--- /dev/null
+++ b/s2i/modules/kogito-persistence/added/kogito-persistence.sh
@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+
+# imports
+source ${KOGITO_HOME}/launch/kogito-kubernetes-client.sh
+source ${KOGITO_HOME}/launch/logging.sh
+
+# copies the generated persistence files to
+# $KOGITO_HOME/bin, that's the directory used to exchange files between builds
+# TODO: copy those files directly to the final dir only when bin is not used to exchange data anymore
+function copy_persistence_files() {
+    local persistenceDir="target"
+    if [ ! -z "${ARTIFACT_DIR}" ]; then
+        persistenceDir="${ARTIFACT_DIR}"
+    fi
+
+    log_info "---> [persistence] Copying persistence files..."
+    if [ -d /tmp/src/${persistenceDir}/classes/persistence ]; then
+        cp -v /tmp/src/${persistenceDir}/classes/persistence/* $KOGITO_HOME/bin/
+        # we don't need this file to be indexed
+        rm -rfv $KOGITO_HOME/bin/kogito-application.proto
+        move_persistence_files
+    else
+        log_info "---> [persistence] Skip copying files, persistence directory does not exist..."
+    fi
+}
+
+# move_persistence_files moves persistence files from $KOGITO_HOME/bin to the final directory
+# where those files will be handled by the runtime image.
+# TODO: remove this function when s2i build move the KOGITO_HOME instead bin directory between images in chained builds
+function move_persistence_files() {
+    log_info "---> [persistence] Moving persistence files to final directory"
+    if ls $KOGITO_HOME/bin/*.proto &>/dev/null; then
+        # copy to the final dir, so we keep bin clean
+        cp -v $KOGITO_HOME/bin/*.proto $KOGITO_HOME/data/protobufs/
+        generate_md5_persistence_files
+    else
+        log_info "---> [persistence] Skip copying files, $KOGITO_HOME/bin directory does not have proto files!"
+    fi
+}
+
+# generate_md5_persistence_files generates md5 files for each *.proto file found in $KOGITO_HOME/data/protobufs/
+function generate_md5_persistence_files() {
+    if ls $KOGITO_HOME/data/protobufs/*.proto &>/dev/null; then
+        log_info "---> [persistence] generating md5 for persistence files"
+        for entry in "$KOGITO_HOME/data/protobufs"/*.proto; do
+            md5sum ${entry} | awk '{ print $1 }' >${entry%.*}-md5.txt
+        done
+    fi
+}
+
+# Updates the configMap for this Kogito Runtime instance 
+# with the generated proto files mounted in the file system.
+# Can be called multiple times or outside of a k8s cluster.
+# If outside the cluster, just skips the update
+function update_configmap() {
+    if ! is_running_on_kubernetes; then
+        log_info "---> [persistence] Not running on kubernetes cluster, skipping config map update"
+        return 0
+    fi
+
+    local config_map=$(cat $KOGITO_HOME/podinfo/protobufcm)
+    local file_contents=""
+    local file_name=""
+    local md5=""
+    local annotation=""
+    local data=""
+    local metadata=""
+    local body=""
+
+    if ls $KOGITO_HOME/data/protobufs/*.proto &>/dev/null; then
+        for entry in "$KOGITO_HOME/data/protobufs"/*.proto; do
+            # sanitize input
+            file_contents=$(jq -aRs . <<<$(cat $entry))
+            file_name=$(basename $entry)
+            md5=$(cat ${entry%.*}-md5.txt)
+            annotation="org.kie.kogito.protobuf.hash/${file_name%.*}"
+            metadata="${metadata} \"${annotation}\": \"${md5}\","
+            # doesn't need quotes since jq already added
+            data="${data} \"${file_name}\": ${file_contents},"
+        done
+    fi
+
+    if [ "${metadata}" != "" ]; then
+        metadata="${metadata%,}" # cut last comma
+    fi
+
+    if [ "${data}" != "" ]; then
+        data="${data%,}"
+    fi
+
+    body="[ { \"op\": \"replace\", \"path\": \"/metadata/annotations\", \"value\": { ${metadata} } }, { \"op\": \"replace\", \"path\": \"/data\", \"value\": { ${data} } } ]"
+    log_info "---> [persistence] About to patch configMap ${config_map}"
+    # prints the raw data
+    echo "Body: ${body}"
+    printf "%s" "${body}" >$KOGITO_HOME/data/protobufs/configmap_patched.json
+    response=$(patch_json_k8s_resource "api" "configmaps/${config_map}" $KOGITO_HOME/data/protobufs/configmap_patched.json)
+    if [ "${response: -3}" != "200" ]; then
+        log_warning "---> [persistence] Fail to patch configMap ${config_map}, the Service Account might not have the necessary privileges"
+        if [ ! -z "${response}" ]; then
+            log_warning "---> [persistence] Response message: ${response::-3} - HTTP Status code: ${response: -3}"
+        fi
+        return 1
+    fi
+
+    return 0
+}
diff --git a/s2i/modules/kogito-persistence/added/post-hook-persistence.sh b/s2i/modules/kogito-persistence/added/post-hook-persistence.sh
new file mode 100755
index 00000000000..0e56d99cab7
--- /dev/null
+++ b/s2i/modules/kogito-persistence/added/post-hook-persistence.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Post Hook script that should be called by Kogito Service Kubernetes Pod upon initialization
+# Updates the Kogito Service protobuf configMap with the persistence files located at ${KOGITO_HOME}/data/protobufs
+
+source $KOGITO_HOME/launch/kogito-persistence.sh
+
+update_configmap
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/configure b/s2i/modules/kogito-persistence/configure
new file mode 100644
index 00000000000..88df0dc3785
--- /dev/null
+++ b/s2i/modules/kogito-persistence/configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+SCRIPT_DIR=$(dirname $0)
+
+# kogito-persistence
+mkdir -p ${KOGITO_HOME}/launch/
+cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
+chmod +x-w ${KOGITO_HOME}/launch/kogito-persistence.sh
+chmod +x-w ${KOGITO_HOME}/launch/post-hook-persistence.sh
+
+mkdir -p ${KOGITO_HOME}/data/protobufs
+chmod +w ${KOGITO_HOME}/data/protobufs
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/module.yaml b/s2i/modules/kogito-persistence/module.yaml
new file mode 100644
index 00000000000..5751082be4f
--- /dev/null
+++ b/s2i/modules/kogito-persistence/module.yaml
@@ -0,0 +1,10 @@
+schema_version: 1
+name: org.kie.kogito.persistence
+version: "0.7.0-rc1"
+
+modules:
+    install:
+    - name: org.kie.kogito.kubernetes.client
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json b/s2i/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json
new file mode 100644
index 00000000000..af0b7499960
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json
@@ -0,0 +1 @@
+[ { "op": "replace", "path": "/metadata/annotations", "value": {  "org.kie.kogito.protobuf.hash/travels": "8aa1ca180547a589d2d681fe111117e8", "org.kie.kogito.protobuf.hash/visaApplications": "62004537e95b23ddd4a9da5a13920250" } }, { "op": "replace", "path": "/data", "value": {  "travels.proto": "syntax = \"proto2\"; \npackage org.acme.travels.travels; \nimport \"kogito-index.proto\";\nimport \"kogito-types.proto\";\noption kogito_model = \"Travels\";\noption kogito_id = \"travels\";\n\n/* @Indexed */ \nmessage Address { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string city = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string country = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string street = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string zipCode = 4; \n}\n/* @Indexed */ \nmessage Flight { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional kogito.Date arrival = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional kogito.Date departure = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string flightNumber = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string gate = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string seat = 5; \n}\n/* @Indexed */ \nmessage Hotel { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Address address = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string bookingNumber = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string name = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string phone = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string room = 5; \n}\n/* @Indexed */ \nmessage Traveller { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Address address = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string email = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string firstName = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string lastName = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string nationality = 5; \n}\n/* @Indexed */ \nmessage Travels { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Flight flight = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Hotel hotel = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string id = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Traveller traveller = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Trip trip = 5; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional VisaApplication visaApplication = 6; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  repeated org.kie.kogito.index.model.ProcessInstanceMeta processInstances = 7; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  repeated org.kie.kogito.index.model.UserTaskInstanceMeta userTasks = 8; \n}\n/* @Indexed */ \nmessage Trip { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional kogito.Date begin = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string city = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string country = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional kogito.Date end = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional bool visaRequired = 5; \n}\n/* @Indexed */ \nmessage VisaApplication { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional bool approved = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string city = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string country = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional int32 duration = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string firstName = 5; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string lastName = 6; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string nationality = 7; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string passportNumber = 8; \n}\n", "visaApplications.proto": " syntax = \"proto2\"; \n    package org.acme.travels.visaApplications; \n    import \"kogito-index.proto\";\n    import \"kogito-types.proto\";\n    option kogito_model = \"VisaApplications\";\n    option kogito_id = \"visaApplications\";\n\n    /* @Indexed */ \n    message VisaApplication { \n      option java_package = \"org.acme.travels.visaApplications\";\n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional bool approved = 1; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string city = 2; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string country = 3; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional int32 duration = 4; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string firstName = 5; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string lastName = 6; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string nationality = 7; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string passportNumber = 8; \n    }\n    /* @Indexed */ \n    message VisaApplications { \n      option java_package = \"org.acme.travels.visaApplications\";\n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string id = 1; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional VisaApplication visaApplication = 2; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      repeated org.kie.kogito.index.model.ProcessInstanceMeta processInstances = 3; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      repeated org.kie.kogito.index.model.UserTaskInstanceMeta userTasks = 4; \n    }\n" } } ]
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json b/s2i/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json
new file mode 100644
index 00000000000..617ea60812a
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json
@@ -0,0 +1 @@
+[ { "op": "replace", "path": "/metadata/annotations", "value": {  } }, { "op": "replace", "path": "/data", "value": {  } } ]
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/s2i/modules/kogito-persistence/tests/bats/kogito-persistence.bats
new file mode 100644
index 00000000000..85b2c07b197
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/kogito-persistence.bats
@@ -0,0 +1,174 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=$BATS_TMPDIR/kogito_home
+export MOCK_RESPONSE=""
+mkdir -p $KOGITO_HOME/launch
+
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh $KOGITO_HOME/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh $KOGITO_HOME/launch/
+
+# imports
+source $BATS_TEST_DIRNAME/../../added/kogito-persistence.sh
+
+unset -f list_or_get_k8s_resource
+unset -f patch_json_k8s_resource
+unset -f is_running_on_kubernetes
+
+function is_running_on_kubernetes() {
+    # yes, we are :)
+    log_info "Yes, we are in kubernetes"
+    return 0
+}
+
+function patch_json_k8s_resource() {
+    local api="${1}"
+    local resource="${2}"
+    local body="${3}"
+
+    log_info "Calling k8s api '${api}', resource '${resource}'"
+    echo "${body}200"
+}
+
+function list_or_get_k8s_resource() {
+    local response=$(cat $BATS_TEST_DIRNAME/mocks/$MOCK_RESPONSE)
+    response="${response}200"
+    echo "${response}"
+}
+
+setup() {
+    export HOME=$KOGITO_HOME
+    mkdir -p ${KOGITO_HOME}
+    mkdir -p $KOGITO_HOME/bin
+    mkdir -p $KOGITO_HOME/data/protobufs/
+    mkdir -p $KOGITO_HOME/podinfo
+    echo "exampleapp-cm" > $KOGITO_HOME/podinfo/protobufcm
+}
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+    rm -rf /tmp/src
+    rm -rf $KOGITO_HOME/bin/*
+}
+
+@test "There's some proto files in the target directory" {
+    mkdir -p /tmp/src/target/classes/persistence
+    touch /tmp/src/target/classes/persistence/{file1.proto,kogito-application.proto}
+
+    run copy_persistence_files
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "INFO ---> [persistence] Copying persistence files..." ]
+    [ "${lines[1]}" = "'/tmp/src/target/classes/persistence/file1.proto' -> '${KOGITO_HOME}/bin/file1.proto'" ]
+    [ "${lines[2]}" = "'/tmp/src/target/classes/persistence/kogito-application.proto' -> '${KOGITO_HOME}/bin/kogito-application.proto'" ]
+    [ "${lines[3]}" = "removed '${KOGITO_HOME}/bin/kogito-application.proto'" ]
+    [ "${lines[4]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
+    [ "${lines[5]}" = "'${KOGITO_HOME}/bin/file1.proto' -> '${KOGITO_HOME}/data/protobufs/file1.proto'" ]
+    [ "${lines[6]}" = "INFO ---> [persistence] generating md5 for persistence files" ]
+    
+}
+
+@test "There are no persistence files" {
+    KOGITO_HOME=/tmp/kogito
+
+    run copy_persistence_files
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "INFO ---> [persistence] Copying persistence files..." ]
+    [ "${lines[1]}" = "INFO ---> [persistence] Skip copying files, persistence directory does not exist..." ]
+}
+
+@test "There's some proto files in the bin directory" {
+    touch $KOGITO_HOME/bin/file1.proto
+
+    run move_persistence_files
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
+    [ "${lines[1]}" = "'${KOGITO_HOME}/bin/file1.proto' -> '${KOGITO_HOME}/data/protobufs/file1.proto'" ]
+}
+
+@test "There's no proto files in the bin directory" {
+    run move_persistence_files
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
+    [ "${lines[1]}" = "INFO ---> [persistence] Skip copying files, ${KOGITO_HOME}/bin directory does not have proto files!" ]
+}
+
+@test "MD5 correctly generated for file1.proto" {
+    touch $KOGITO_HOME/data/protobufs/file1.proto
+
+    run generate_md5_persistence_files
+    
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ -e $KOGITO_HOME/data/protobufs/file1-md5.txt ]
+    # if md5 isn't generated, grep will fail to find the given string
+    grep -q "d41d8cd98f00b204e9800998ecf8427e" $KOGITO_HOME/data/protobufs/file1-md5.txt
+}
+
+@test "MD5 not generated for file1.proto1" {
+    touch $KOGITO_HOME/data/protobufs/file1.proto1
+
+    run generate_md5_persistence_files
+    
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ ! -e $KOGITO_HOME/data/protobufs/file1-md5.txt ]
+}
+
+@test "Patch a configMap when we have empty annotations and data" {
+    MOCK_RESPONSE="config_map_no_annotations.json"
+    cp -v $BATS_TEST_DIRNAME/mocks/travels.proto $KOGITO_HOME/data/protobufs/
+    cp -v $BATS_TEST_DIRNAME/mocks/visaApplications.proto $KOGITO_HOME/data/protobufs/
+    generate_md5_persistence_files
+
+    local expected=$(cat $BATS_TEST_DIRNAME/expected/patch_cm_travel_agency.json)
+
+    run update_configmap
+    
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[1]}" = "INFO ---> [persistence] About to patch configMap exampleapp-cm" ]
+    [ "${lines[2]}" = "Body: ${expected}" ]
+}
+
+@test "Patch a configMap with empty data" {
+    MOCK_RESPONSE="config_map.json" # we have annotations, but no files in the file system
+    
+    local expected=$(cat $BATS_TEST_DIRNAME/expected/patch_empty_data.json)
+
+    run update_configmap
+    
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[1]}" = "INFO ---> [persistence] About to patch configMap exampleapp-cm" ]
+    [ "${lines[2]}" = "Body: ${expected}" ]
+}
+
+@test "Patch with an empty annotations configmap with files in disk" {
+    MOCK_RESPONSE="config_map_empty_annotations.json" # we have empty annotations and files in disk
+    
+    cp -v $BATS_TEST_DIRNAME/mocks/travels.proto $KOGITO_HOME/data/protobufs/
+    cp -v $BATS_TEST_DIRNAME/mocks/visaApplications.proto $KOGITO_HOME/data/protobufs/
+    generate_md5_persistence_files
+
+    local expected=$(cat $BATS_TEST_DIRNAME/expected/patch_cm_travel_agency.json)
+
+    run update_configmap
+    
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[1]}" = "INFO ---> [persistence] About to patch configMap exampleapp-cm" ]
+    [ "${lines[2]}" = "Body: ${expected}" ]
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/config_map.json b/s2i/modules/kogito-persistence/tests/bats/mocks/config_map.json
new file mode 100644
index 00000000000..ad311b2404c
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/mocks/config_map.json
@@ -0,0 +1,33 @@
+{
+    "kind": "ConfigMap",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "example-quarkus-protobuf-files",
+        "namespace": "kogito-587",
+        "selfLink": "/api/v1/namespaces/kogito-587/configmaps/example-quarkus-protobuf-files",
+        "uid": "e9a77236-20fe-11ea-92d6-52fdfc072182",
+        "resourceVersion": "851604",
+        "creationTimestamp": "2019-12-17T18:56:20Z",
+        "labels": {
+            "app": "example-quarkus",
+            "kogito-protobuf": "true"
+        },
+        "annotations": {
+            "org.kie.kogito/managed-by": "Kogito Operator",
+            "org.kie.kogito/operator-crd": "KogitoApp",
+            "org.kie.kogito.protobuf.hash/visaApplications": "01010101",
+            "org.kie.kogito.protobuf.hash/travels": "0202020202",
+            "org.kie.kogito.protobuf.hash/file1" : "d41d8cd98f00b204e9800998ecf8427e"
+        },
+        "ownerReferences": [
+            {
+                "apiVersion": "app.kiegroup.org/v1alpha1",
+                "kind": "KogitoApp",
+                "name": "example-quarkus",
+                "uid": "e993c8b2-20fe-11ea-92d6-52fdfc072182",
+                "controller": true,
+                "blockOwnerDeletion": true
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json b/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json
new file mode 100644
index 00000000000..19fc44ed74d
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json
@@ -0,0 +1,26 @@
+{
+    "kind": "ConfigMap",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "example-quarkus-protobuf-files",
+        "namespace": "kogito-587",
+        "selfLink": "/api/v1/namespaces/kogito-587/configmaps/example-quarkus-protobuf-files",
+        "uid": "e9a77236-20fe-11ea-92d6-52fdfc072182",
+        "resourceVersion": "851604",
+        "creationTimestamp": "2019-12-17T18:56:20Z",
+        "labels": {
+            "app": "example-quarkus",
+            "kogito-protobuf": "true"
+        },
+        "ownerReferences": [
+            {
+                "apiVersion": "app.kiegroup.org/v1alpha1",
+                "kind": "KogitoApp",
+                "name": "example-quarkus",
+                "uid": "e993c8b2-20fe-11ea-92d6-52fdfc072182",
+                "controller": true,
+                "blockOwnerDeletion": true
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json b/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json
new file mode 100644
index 00000000000..921c3be9d7f
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json
@@ -0,0 +1,31 @@
+{
+    "kind": "ConfigMap",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "example-quarkus-protobuf-files",
+        "namespace": "kogito-587",
+        "selfLink": "/api/v1/namespaces/kogito-587/configmaps/example-quarkus-protobuf-files",
+        "uid": "e9a77236-20fe-11ea-92d6-52fdfc072182",
+        "resourceVersion": "851604",
+        "creationTimestamp": "2019-12-17T18:56:20Z",
+        "labels": {
+            "app": "example-quarkus",
+            "kogito-protobuf": "true"
+        },
+        "annotations": {
+            "org.kie.kogito/managed-by": "Kogito Operator",
+            "org.kie.kogito/operator-crd": "KogitoApp",
+            "org.kie.kogito.protobuf.hash/file1" : "d41d8cd98f00b204e9800998ecf8427e"
+        },
+        "ownerReferences": [
+            {
+                "apiVersion": "app.kiegroup.org/v1alpha1",
+                "kind": "KogitoApp",
+                "name": "example-quarkus",
+                "uid": "e993c8b2-20fe-11ea-92d6-52fdfc072182",
+                "controller": true,
+                "blockOwnerDeletion": true
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json b/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json
new file mode 100644
index 00000000000..3565bad5f0b
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json
@@ -0,0 +1,30 @@
+{
+    "kind": "ConfigMap",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "example-quarkus-protobuf-files",
+        "namespace": "kogito-587",
+        "selfLink": "/api/v1/namespaces/kogito-587/configmaps/example-quarkus-protobuf-files",
+        "uid": "e9a77236-20fe-11ea-92d6-52fdfc072182",
+        "resourceVersion": "851604",
+        "creationTimestamp": "2019-12-17T18:56:20Z",
+        "labels": {
+            "app": "example-quarkus",
+            "kogito-protobuf": "true"
+        },
+        "annotations": {
+            "org.kie.kogito/managed-by": "Kogito Operator",
+            "org.kie.kogito/operator-crd": "KogitoApp"
+        },
+        "ownerReferences": [
+            {
+                "apiVersion": "app.kiegroup.org/v1alpha1",
+                "kind": "KogitoApp",
+                "name": "example-quarkus",
+                "uid": "e993c8b2-20fe-11ea-92d6-52fdfc072182",
+                "controller": true,
+                "blockOwnerDeletion": true
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/travels.proto b/s2i/modules/kogito-persistence/tests/bats/mocks/travels.proto
new file mode 100644
index 00000000000..7cbe2f06559
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/mocks/travels.proto
@@ -0,0 +1,115 @@
+syntax = "proto2"; 
+package org.acme.travels.travels; 
+import "kogito-index.proto";
+import "kogito-types.proto";
+option kogito_model = "Travels";
+option kogito_id = "travels";
+
+/* @Indexed */ 
+message Address { 
+  option java_package = "org.acme.travels.travels";
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string city = 1; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string country = 2; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string street = 3; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string zipCode = 4; 
+}
+/* @Indexed */ 
+message Flight { 
+  option java_package = "org.acme.travels.travels";
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional kogito.Date arrival = 1; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional kogito.Date departure = 2; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string flightNumber = 3; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string gate = 4; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string seat = 5; 
+}
+/* @Indexed */ 
+message Hotel { 
+  option java_package = "org.acme.travels.travels";
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional Address address = 1; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string bookingNumber = 2; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string name = 3; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string phone = 4; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string room = 5; 
+}
+/* @Indexed */ 
+message Traveller { 
+  option java_package = "org.acme.travels.travels";
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional Address address = 1; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string email = 2; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string firstName = 3; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string lastName = 4; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string nationality = 5; 
+}
+/* @Indexed */ 
+message Travels { 
+  option java_package = "org.acme.travels.travels";
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional Flight flight = 1; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional Hotel hotel = 2; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string id = 3; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional Traveller traveller = 4; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional Trip trip = 5; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional VisaApplication visaApplication = 6; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  repeated org.kie.kogito.index.model.ProcessInstanceMeta processInstances = 7; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  repeated org.kie.kogito.index.model.UserTaskInstanceMeta userTasks = 8; 
+}
+/* @Indexed */ 
+message Trip { 
+  option java_package = "org.acme.travels.travels";
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional kogito.Date begin = 1; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string city = 2; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string country = 3; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional kogito.Date end = 4; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional bool visaRequired = 5; 
+}
+/* @Indexed */ 
+message VisaApplication { 
+  option java_package = "org.acme.travels.travels";
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional bool approved = 1; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string city = 2; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string country = 3; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional int32 duration = 4; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string firstName = 5; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string lastName = 6; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string nationality = 7; 
+  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+  optional string passportNumber = 8; 
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto b/s2i/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto
new file mode 100644
index 00000000000..09f201f81a4
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto
@@ -0,0 +1,39 @@
+ syntax = "proto2"; 
+    package org.acme.travels.visaApplications; 
+    import "kogito-index.proto";
+    import "kogito-types.proto";
+    option kogito_model = "VisaApplications";
+    option kogito_id = "visaApplications";
+
+    /* @Indexed */ 
+    message VisaApplication { 
+      option java_package = "org.acme.travels.visaApplications";
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional bool approved = 1; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional string city = 2; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional string country = 3; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional int32 duration = 4; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional string firstName = 5; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional string lastName = 6; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional string nationality = 7; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional string passportNumber = 8; 
+    }
+    /* @Indexed */ 
+    message VisaApplications { 
+      option java_package = "org.acme.travels.visaApplications";
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional string id = 1; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      optional VisaApplication visaApplication = 2; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      repeated org.kie.kogito.index.model.ProcessInstanceMeta processInstances = 3; 
+      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
+      repeated org.kie.kogito.index.model.UserTaskInstanceMeta userTasks = 4; 
+    }
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/tests/bats/post-hook-persistence.bats b/s2i/modules/kogito-persistence/tests/bats/post-hook-persistence.bats
new file mode 100644
index 00000000000..ae51110d635
--- /dev/null
+++ b/s2i/modules/kogito-persistence/tests/bats/post-hook-persistence.bats
@@ -0,0 +1,26 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=$BATS_TMPDIR/kogito_home
+mkdir -p $KOGITO_HOME/launch
+
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh $KOGITO_HOME/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh $KOGITO_HOME/launch/
+cp $BATS_TEST_DIRNAME/../../added/kogito-persistence.sh $KOGITO_HOME/launch/
+
+setup() {
+    export HOME=$KOGITO_HOME
+    mkdir -p ${KOGITO_HOME}
+}
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+}
+
+@test "Call post hook script (sanity check)" {
+    run $BATS_TEST_DIRNAME/../../added/post-hook-persistence.sh
+
+    echo "result= ${lines[@]}"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "INFO ---> [persistence] Not running on kubernetes cluster, skipping config map update" ]
+}
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble b/s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble
index d7ad17fbb0c..b1950a76cbe 100644
--- a/s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble
@@ -34,3 +34,5 @@ copy_kogito_app
 # handle custom image-metadata.json
 handle_image_metadata_json
 
+# handle persistence files
+copy_persistence_files
diff --git a/s2i/modules/kogito-s2i-core/added/s2i-core b/s2i/modules/kogito-s2i-core/added/s2i-core
index 51779430fa3..8c59fe76bbb 100644
--- a/s2i/modules/kogito-s2i-core/added/s2i-core
+++ b/s2i/modules/kogito-s2i-core/added/s2i-core
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# imports
+source $KOGITO_HOME/launch/kogito-persistence.sh
+
 S2I_DESTINATION_DIR="${S2I_DESTINATION_DIR:-/tmp}"
 S2I_ARTIFACTS_DIR="${S2I_DESTINATION_DIR}/artifacts"
 S2I_SOURCE_DIR="${S2I_DESTINATION_DIR}/src"
@@ -40,6 +43,8 @@ function assemble_runtime() {
         echo "---> Application binaries NOT found, failing build..."
         exit 1
     fi
+    # handle persistence files
+    move_persistence_files
 }
 
 
@@ -130,7 +135,6 @@ function copy_kogito_app() {
         # handle non default java builds
         echo "---> Installing application binaries"
         cp -v $artifactDir/*.jar $KOGITO_HOME/bin
-
     fi
 }
 
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml
index 788a2d0cde1..34468d3b73d 100644
--- a/s2i/modules/kogito-s2i-core/module.yaml
+++ b/s2i/modules/kogito-s2i-core/module.yaml
@@ -33,6 +33,11 @@ envs:
       overridden by end users.
     example: "${S2I_DESTINATION_DIR}/src}"
 
+modules:
+  install:
+  - name: org.kie.kogito.persistence
+  - name: org.kie.kogito.logging
+
 run:
   cmd:
     - "/usr/local/s2i/run"
diff --git a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 4a6b394f9ca..31983dad49e 100644
--- a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -1,17 +1,22 @@
 #!/usr/bin/env bats
 
+export KOGITO_HOME=$BATS_TMPDIR/kogito_home
+mkdir -p ${KOGITO_HOME}/launch/
+
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh $KOGITO_HOME/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-persistence/added/kogito-persistence.sh $KOGITO_HOME/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh $KOGITO_HOME/launch/
+
 # imports
 source $BATS_TEST_DIRNAME/../../added/s2i-core
 
 setup() {
-    export KOGITO_HOME=/tmp/kogito
     export HOME=$KOGITO_HOME
-    mkdir -p ${KOGITO_HOME}
-    mkdir target
+    mkdir -p target
 }
 
 teardown() {
-    rm -rf ${KOGITO_HOME}
+    rm -rf ${KOGITO_HOME}/bin
     rm -rf /tmp/.s2i
     rm -rf /tmp/src
     rm -rf target
@@ -59,7 +64,6 @@ teardown() {
 @test "test assemble_runtime with binaries binaries" {
     mkdir $KOGITO_HOME/bin
     touch $KOGITO_HOME/bin/artifact.jar
-    KOGITO_HOME=/tmp/kogito
 
     run assemble_runtime
 
@@ -71,7 +75,7 @@ teardown() {
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Application binaries found and ready to use" ]
     [ "${lines[1]}" = "---> [s2i-core] Adding custom labels..." ]
-    [ "${lines[2]}" = "-----> Failed to copy metadata file, /tmp/kogito/bin/image_metadata.json does not exist" ]
+    [ "${lines[2]}" = "-----> Failed to copy metadata file, ${KOGITO_HOME}/bin/image_metadata.json does not exist" ]
 }
 
 
@@ -79,7 +83,6 @@ teardown() {
     mkdir $KOGITO_HOME/bin
     touch $KOGITO_HOME/bin/image_metadata.json
     touch $KOGITO_HOME/bin/artifact.jar
-    KOGITO_HOME=/tmp/kogito
 
     run assemble_runtime
 
@@ -91,8 +94,8 @@ teardown() {
     [ "${lines[2]}" = "mkdir: created directory '/tmp/.s2i'" ]
     [ "${lines[3]}" = "mkdir: created directory '/tmp/src'" ]
     [ "${lines[4]}" = "mkdir: created directory '/tmp/src/.s2i/'" ]
-    [ "${lines[5]}" = "'/tmp/kogito/bin/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
-    [ "${lines[6]}" = "'/tmp/kogito/bin/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
+    [ "${lines[5]}" = "'$KOGITO_HOME/bin/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
+    [ "${lines[6]}" = "'$KOGITO_HOME/bin/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
 
 }
 
@@ -105,7 +108,7 @@ teardown() {
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "'./bin/myapp.jar' -> '/tmp/kogito/./bin/myapp.jar'" ]
+    [ "${lines[0]}" = "'./bin/myapp.jar' -> '$KOGITO_HOME/./bin/myapp.jar'" ]
 }
 
 
@@ -130,7 +133,7 @@ teardown() {
     [ "${lines[0]}" = "---> [s2i-core] Copy image metadata file..." ]
     [ "${lines[1]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
     [ "${lines[2]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
-    [ "${lines[3]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/kogito/bin'" ]
+    [ "${lines[3]}" = "'/tmp/src/target/image_metadata.json' -> '$KOGITO_HOME/bin'" ]
 }
 
 @test "test copy_kogito_app default java build no jar file present" {
@@ -153,7 +156,7 @@ teardown() {
     echo "status= $status"
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Installing application binaries" ]
-    [ "${lines[1]}" = "'target/app.jar' -> '/tmp/kogito/bin'" ]
+    [ "${lines[1]}" = "'target/app.jar' -> '$KOGITO_HOME/bin'" ]
 }
 
 
@@ -172,7 +175,7 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Installing jar file" ]
-    [ "${lines[1]}" = "'target/app-runner.jar' -> '/tmp/kogito/bin/app-runner.jar'" ]
+    [ "${lines[1]}" = "'target/app-runner.jar' -> '$KOGITO_HOME/bin/app-runner.jar'" ]
     [ "${lines[2]}" = "---> Copying application libraries" ]
 }
 
@@ -191,7 +194,7 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Installing application binaries" ]
-    [ "${lines[1]}" = "'target/app-runner' -> '/tmp/kogito/bin/app-runner'" ]
+    [ "${lines[1]}" = "'target/app-runner' -> '$KOGITO_HOME/bin/app-runner'" ]
 }
 
 @test "build_kogito_app only checks if it will generated the project in case there's no pom.xml" {
diff --git a/s2i/modules/kogito-springboot-s2i/s2i/bin/assemble b/s2i/modules/kogito-springboot-s2i/s2i/bin/assemble
index 8a880c733e4..2e85fb566f8 100755
--- a/s2i/modules/kogito-springboot-s2i/s2i/bin/assemble
+++ b/s2i/modules/kogito-springboot-s2i/s2i/bin/assemble
@@ -32,3 +32,5 @@ copy_kogito_app
 # handle custom image-metadata.json
 handle_image_metadata_json
 
+# handle persistence files
+copy_persistence_files
\ No newline at end of file
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index e1fc54bbdc2..69991e34db3 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -43,6 +43,19 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | Mario is older than Mark |
     And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist
 
+  Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable          | value |
+      | NATIVE            | false   |
+      | MAVEN_ARGS_APPEND | -Ppersistence |
+    Then file /home/kogito/bin/jbpm-quarkus-example-0.6.1-runner.jar should exist
+    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+    And s2i build log should contain ---> [persistence] generating md5 for persistence files
+    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for cd35391d447a67062c3914965254ebd2
+    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 318830fd04bce5b0f2a4727e001dbc21
+
+
     Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |

From 250d8cf295d292fac9f1b61ae437b5a2270335b2 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 15 Jan 2020 10:54:06 -0300
Subject: [PATCH 084/709] [KOGITO-873] - Update KOGITO images with the latest
 runtime artifacts (0.7.0-rc4) (#85)

Signed-off-by: spolti <filippespolti@gmail.com>
---
 go.mod                                      |  3 --
 s2i/kogito-imagestream.yaml                 | 42 ++++++++++-----------
 s2i/modules/kogito-data-index/module.yaml   |  4 +-
 s2i/modules/kogito-jobs-service/module.yaml |  4 +-
 4 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 go.mod

diff --git a/go.mod b/go.mod
deleted file mode 100644
index 47e852d8db4..00000000000
--- a/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module github.com/ricardozanini/kogito-cloud
-
-go 1.12
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 7759df4251b..903dd5e44ea 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc1'
+        - name: '0.7.0-rc4'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.7.0-rc1'
+            version: '0.7.0-rc4'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0-rc4
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc1'
+        - name: '0.7.0-rc4'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.7.0-rc1'
+            version: '0.7.0-rc4'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0-rc4
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc1'
+        - name: '0.7.0-rc4'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.7.0-rc1'
+            version: '0.7.0-rc4'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0-rc4
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc1'
+        - name: '0.7.0-rc4'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.7.0-rc1'
+            version: '0.7.0-rc4'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0-rc4
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc1'
+        - name: '0.7.0-rc4'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.7.0-rc1'
+            version: '0.7.0-rc4'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0-rc4
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc1'
+        - name: '0.7.0-rc4'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: infinispan, persitence
-            version: '0.7.0-rc1'
+            version: '0.7.0-rc4'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.7.0-rc1
+            name: quay.io/kiegroup/kogito-data-index:0.7.0-rc4
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,15 +141,15 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc1'
+        - name: '0.7.0-rc4'
           annotations:
             description: Runtime image for the Kogito Jobs Service - Tech preview
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.7.0-rc1'
+            version: '0.7.0-rc4'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.7.0-rc1
\ No newline at end of file
+            name: quay.io/kiegroup/kogito-jobs-service:0.7.0-rc4
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index 2ea81584054..85c88ecb9f3 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -4,8 +4,8 @@ version: "0.7.0-rc1"
 
 artifacts:
 - name: kogito-data-index-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191216.211654-103-runner.jar
-  md5: aa73da330737993d08daf8046bffe728
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200113.211042-130-runner.jar
+  md5: 360b85d8d6449d609ff7c32d101b51d2
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
index 6925ba5b19d..4b1f3e92926 100644
--- a/s2i/modules/kogito-jobs-service/module.yaml
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "0.7.0-rc1"
 
 artifacts:
 - name: kogito-jobs-service-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20191216.211304-28-runner.jar
-  md5: eb314bbcfc79248d8b7c7768982f6044
+  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200113.210709-55-runner.jar
+  md5: 96e1af902a518d3e01d22506a4f613ed
 
 execute:
 - script: configure
\ No newline at end of file

From 679e5f79cc50b910da6ad95e8ea8c7c4a2f3904a Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 20 Jan 2020 17:37:43 +0100
Subject: [PATCH 085/709] Setup as testResources phase (#86)

---
 kogito-cloud-tests/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kogito-cloud-tests/pom.xml b/kogito-cloud-tests/pom.xml
index a6afe3c54dd..0419db35fd4 100644
--- a/kogito-cloud-tests/pom.xml
+++ b/kogito-cloud-tests/pom.xml
@@ -132,7 +132,7 @@
               <id>quarkus-copy-deps-libs-classes</id>
               <phase>generate-resources</phase>
               <goals>
-                <goal>copy-resources</goal>
+                <goal>testResources</goal>
               </goals>
               <configuration>
                 <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-quarkus-service/src/main/java</outputDirectory>
@@ -156,7 +156,7 @@
               <id>springboot-copy-deps-libs-classes</id>
               <phase>generate-resources</phase>
               <goals>
-                <goal>copy-resources</goal>
+                <goal>testResources</goal>
               </goals>
               <configuration>
                 <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-springboot-service/src/main/java</outputDirectory>
@@ -194,7 +194,7 @@
               <id>quarkus-merge-common-test-resources</id>
               <phase>generate-test-resources</phase>
               <goals>
-                <goal>copy-resources</goal>
+                <goal>testResources</goal>
               </goals>
               <configuration>
                 <overwrite>true</overwrite>
@@ -210,7 +210,7 @@
               <id>springboot-merge-common-test-resources</id>
               <phase>generate-test-resources</phase>
               <goals>
-                <goal>copy-resources</goal>
+                <goal>testResources</goal>
               </goals>
               <configuration>
                 <overwrite>true</overwrite>

From 96d4833fefcf45e268953109fd845258ada0489b Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 21 Jan 2020 16:24:38 -0300
Subject: [PATCH 086/709] [KOGITO-920] - Release Kogito Images 0.7.0 (#87)

Signed-off-by: spolti <fspolti@redhat.com>
---
 s2i/image.yaml                                |  2 +-
 s2i/kogito-imagestream.yaml                   | 42 +++++++++----------
 s2i/kogito-quarkus-overrides.yaml             |  2 +-
 s2i/modules/kogito-data-index/module.yaml     |  6 +--
 .../kogito-image-dependencies/module.yaml     |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 s2i/modules/kogito-jobs-service/module.yaml   |  6 +--
 s2i/modules/kogito-jq/module.yaml             |  2 +-
 .../kogito-kubernetes-client/module.yaml      |  2 +-
 s2i/modules/kogito-launch-scripts/module.yaml |  2 +-
 s2i/modules/kogito-logging/module.yaml        |  2 +-
 s2i/modules/kogito-persistence/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-jvm/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-s2i/module.yaml    |  4 +-
 s2i/modules/kogito-quarkus/module.yaml        |  2 +-
 s2i/modules/kogito-s2i-core/module.yaml       |  2 +-
 s2i/modules/kogito-springboot-s2i/module.yaml |  4 +-
 s2i/modules/kogito-springboot/module.yaml     |  2 +-
 s2i/modules/kogito-system-user/module.yaml    |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 27 ++++++------
 .../kogito-springboot-ubi8-s2i.feature        | 18 ++++----
 s2i/tests/test-apps/clone-repo.sh             |  2 +-
 22 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index 61431f77fbd..205e036ebe0 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.7.0-rc1"
+version: "0.7.0"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 903dd5e44ea..7b8a0da2a57 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc4'
+        - name: '0.7.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.7.0-rc4'
+            version: '0.7.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0-rc4
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc4'
+        - name: '0.7.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.7.0-rc4'
+            version: '0.7.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0-rc4
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc4'
+        - name: '0.7.0'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.7.0-rc4'
+            version: '0.7.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0-rc4
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc4'
+        - name: '0.7.0'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.7.0-rc4'
+            version: '0.7.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0-rc4
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc4'
+        - name: '0.7.0'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.7.0-rc4'
+            version: '0.7.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0-rc4
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc4'
+        - name: '0.7.0'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: infinispan, persitence
-            version: '0.7.0-rc4'
+            version: '0.7.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.7.0-rc4
+            name: quay.io/kiegroup/kogito-data-index:0.7.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,15 +141,15 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0-rc4'
+        - name: '0.7.0'
           annotations:
             description: Runtime image for the Kogito Jobs Service - Tech preview
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.7.0-rc4'
+            version: '0.7.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.7.0-rc4
\ No newline at end of file
+            name: quay.io/kiegroup/kogito-jobs-service:0.7.0
\ No newline at end of file
diff --git a/s2i/kogito-quarkus-overrides.yaml b/s2i/kogito-quarkus-overrides.yaml
index 2f0c6a67607..899325ad5a2 100644
--- a/s2i/kogito-quarkus-overrides.yaml
+++ b/s2i/kogito-quarkus-overrides.yaml
@@ -34,5 +34,5 @@ modules:
 ## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/drools-quarkus-example
 run:
-  workdir: "/home/kogito/"
+  workdir: "/home/kogito"
 
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index 85c88ecb9f3..fa4d4999a3a 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 artifacts:
 - name: kogito-data-index-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200113.211042-130-runner.jar
-  md5: 360b85d8d6449d609ff7c32d101b51d2
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.7.0/data-index-service-0.7.0-runner.jar
+  md5: 3abf4d07a8679fae3745d3313590d1b9
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-image-dependencies/module.yaml b/s2i/modules/kogito-image-dependencies/module.yaml
index 252e78117f2..094e355a8e2 100644
--- a/s2i/modules/kogito-image-dependencies/module.yaml
+++ b/s2i/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.7.0-rc1"
+version: "0.7.0"
 description: holds common dependencies across images
 
 execute:
diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/s2i/modules/kogito-infinispan-properties/module.yaml
index 1e798922a1c..4802f6c3119 100644
--- a/s2i/modules/kogito-infinispan-properties/module.yaml
+++ b/s2i/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
index 4b1f3e92926..18da37eb829 100644
--- a/s2i/modules/kogito-jobs-service/module.yaml
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 artifacts:
 - name: kogito-jobs-service-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200113.210709-55-runner.jar
-  md5: 96e1af902a518d3e01d22506a4f613ed
+  url: https://repository.jboss.org/org/kie/kogito/jobs-service/0.7.0/jobs-service-0.7.0-runner.jar
+  md5: 05242d14bdcbaf0b5fa592293f723d12
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-jq/module.yaml b/s2i/modules/kogito-jq/module.yaml
index 3390a053f9b..3744f303527 100644
--- a/s2i/modules/kogito-jq/module.yaml
+++ b/s2i/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 modules:
     install:
diff --git a/s2i/modules/kogito-kubernetes-client/module.yaml b/s2i/modules/kogito-kubernetes-client/module.yaml
index c51741b20a9..c9a2ddaa451 100644
--- a/s2i/modules/kogito-kubernetes-client/module.yaml
+++ b/s2i/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-launch-scripts/module.yaml b/s2i/modules/kogito-launch-scripts/module.yaml
index e3d1d935baf..74b55efb45b 100644
--- a/s2i/modules/kogito-launch-scripts/module.yaml
+++ b/s2i/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-logging/module.yaml b/s2i/modules/kogito-logging/module.yaml
index fa0df068b3e..d23750235df 100644
--- a/s2i/modules/kogito-logging/module.yaml
+++ b/s2i/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/module.yaml b/s2i/modules/kogito-persistence/module.yaml
index 5751082be4f..ae77f94154c 100644
--- a/s2i/modules/kogito-persistence/module.yaml
+++ b/s2i/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 modules:
     install:
diff --git a/s2i/modules/kogito-quarkus-jvm/module.yaml b/s2i/modules/kogito-quarkus-jvm/module.yaml
index 06e8807d1bf..b315479a8cc 100644
--- a/s2i/modules/kogito-quarkus-jvm/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-s2i/module.yaml b/s2i/modules/kogito-quarkus-s2i/module.yaml
index a65f82f13d8..b41efc2aeec 100644
--- a/s2i/modules/kogito-quarkus-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.7.0-rc1"
\ No newline at end of file
+  value: "0.7.0"
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus/module.yaml b/s2i/modules/kogito-quarkus/module.yaml
index ba6fe00a269..7b6894df705 100644
--- a/s2i/modules/kogito-quarkus/module.yaml
+++ b/s2i/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml
index 34468d3b73d..439a22e4a2c 100644
--- a/s2i/modules/kogito-s2i-core/module.yaml
+++ b/s2i/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.7.0-rc1'
+version: '0.7.0'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/s2i/modules/kogito-springboot-s2i/module.yaml b/s2i/modules/kogito-springboot-s2i/module.yaml
index af2f569650c..6b406be9ba3 100644
--- a/s2i/modules/kogito-springboot-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.7.0-rc1"
\ No newline at end of file
+  value: "0.7.0"
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot/module.yaml b/s2i/modules/kogito-springboot/module.yaml
index 3bdbc2fb98b..218d41fb164 100644
--- a/s2i/modules/kogito-springboot/module.yaml
+++ b/s2i/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-system-user/module.yaml b/s2i/modules/kogito-system-user/module.yaml
index 521662928b9..5133e6cbb12 100644
--- a/s2i/modules/kogito-system-user/module.yaml
+++ b/s2i/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.7.0-rc1"
+version: "0.7.0"
 
 execute:
 - script: add-user
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 69991e34db3..79d1a4922e1 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -1,8 +1,7 @@
 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i
 Feature: kogito-quarkus-ubi8-s2i image tests
-
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value                     |
       | LIMIT_MEMORY   | 2147483648                |
     Then check that page is served
@@ -11,13 +10,13 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.7.0-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
     And s2i build log should contain -J-Xmx1717986918
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -27,12 +26,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.7.0-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -41,14 +40,14 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.7.0-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value |
       | NATIVE            | false   |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/jbpm-quarkus-example-0.6.1-runner.jar should exist
+    Then file /home/kogito/bin/jbpm-quarkus-example-0.7.0-runner.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
@@ -57,7 +56,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
 
     Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | ARTIFACT_DIR      | drools-quarkus-example/target   |
@@ -68,17 +67,17 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.7.0-runner.jar should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.1
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.7.0
       | variable          | value                  |
       | NATIVE            | false                  |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.1
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.7.0
       | variable          | value    |
       | NATIVE            | false    |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -108,7 +107,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index a2efbe211fa..e41709387c2 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,7 +3,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -12,12 +12,12 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.6.1.jar should exist
-    And container log should contain DEBUG o.s.boot.SpringApplication.load
+    And file /home/kogito/bin/jbpm-springboot-example-0.7.0.jar should exist
+    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.7.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value                           |
       | JAVA_OPTIONS        | -Ddebug=true                    |
       | ARTIFACT_DIR        | jbpm-springboot-example/target   |
@@ -28,23 +28,23 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.6.1.jar should exist
-    And container log should contain DEBUG o.s.boot.SpringApplication.load
+    And file /home/kogito/bin/jbpm-springboot-example-0.7.0.jar should exist
+    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.1
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.7.0
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.6.1.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.7.0.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.1
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.7.0
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index 14e854755af..92c642dfd0c 100755
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -8,7 +8,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
 git fetch origin --tags
-git checkout -b 0.6.1 0.6.1
+git checkout -b 0.7.0 0.7.0
 
 # by adding the application.properties file telling quarkus to start on
 # port 10000, the purpose of this tests is make sure that the images

From bbd46b397430519874310a881a1cb649e21ae2b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Biarn=C3=A9s=20Kiefer?= <mbiarnes@redhat.com>
Date: Thu, 30 Jan 2020 18:25:26 +0100
Subject: [PATCH 087/709] renamed agent submarine-static to kogito-static (#88)

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7d99821445b..4a7009ed72c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,7 @@
 
 pipeline {
     agent {
-        label 'submarine-static || kie-rhel7'
+        label 'kogito-static || kie-rhel7'
     }
     tools {
         maven 'kie-maven-3.5.4'

From 6ad6afe989c8d4bddd2c1016007ed63851442c3b Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 11 Feb 2020 15:04:43 -0300
Subject: [PATCH 088/709] [KOGITO-1146] - Bump Kogito images version to
 0.8.0.rc1 (#90)

Signed-off-by: spolti <fspolti@redhat.com>
---
 s2i/image.yaml                                |  2 +-
 s2i/kogito-imagestream.yaml                   | 42 +++++++++----------
 s2i/modules/kogito-data-index/module.yaml     |  9 ++--
 .../kogito-image-dependencies/module.yaml     |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 s2i/modules/kogito-jobs-service/module.yaml   |  9 ++--
 s2i/modules/kogito-jq/module.yaml             |  2 +-
 .../kogito-kubernetes-client/module.yaml      |  2 +-
 s2i/modules/kogito-launch-scripts/module.yaml |  2 +-
 s2i/modules/kogito-logging/module.yaml        |  2 +-
 s2i/modules/kogito-persistence/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-jvm/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-s2i/module.yaml    |  4 +-
 s2i/modules/kogito-quarkus/module.yaml        |  2 +-
 s2i/modules/kogito-s2i-core/module.yaml       |  2 +-
 s2i/modules/kogito-springboot-s2i/module.yaml |  4 +-
 s2i/modules/kogito-springboot/module.yaml     |  2 +-
 s2i/modules/kogito-system-user/module.yaml    |  2 +-
 18 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index 205e036ebe0..078149a34a4 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.7.0"
+version: "0.8.0-rc1"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 7b8a0da2a57..9fda04ce261 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0'
+        - name: '0.8.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.7.0'
+            version: '0.8.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.8.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0'
+        - name: '0.8.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.7.0'
+            version: '0.8.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.8.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0'
+        - name: '0.8.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.7.0'
+            version: '0.8.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.8.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0'
+        - name: '0.8.0-rc1'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.7.0'
+            version: '0.8.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.8.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0'
+        - name: '0.8.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.7.0'
+            version: '0.8.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.8.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0'
+        - name: '0.8.0-rc1'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: infinispan, persitence
-            version: '0.7.0'
+            version: '0.8.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.7.0
+            name: quay.io/kiegroup/kogito-data-index:0.8.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,15 +141,15 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.7.0'
+        - name: '0.8.0-rc1'
           annotations:
             description: Runtime image for the Kogito Jobs Service - Tech preview
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.7.0'
+            version: '0.8.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.7.0
\ No newline at end of file
+            name: quay.io/kiegroup/kogito-jobs-service:0.8.0-rc1
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index fa4d4999a3a..c2e7d7a3bfa 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,12 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 artifacts:
 - name: kogito-data-index-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.7.0/data-index-service-0.7.0-runner.jar
-  md5: 3abf4d07a8679fae3745d3313590d1b9
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200210.211020-160-runner.jar
+  md5: e0896b4048f250ada3589a91c9b2c8e1
 
 execute:
-- script: configure
\ No newline at end of file
+- script: configure
+
diff --git a/s2i/modules/kogito-image-dependencies/module.yaml b/s2i/modules/kogito-image-dependencies/module.yaml
index 094e355a8e2..de074409451 100644
--- a/s2i/modules/kogito-image-dependencies/module.yaml
+++ b/s2i/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.7.0"
+version: "0.8.0-rc1"
 description: holds common dependencies across images
 
 execute:
diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/s2i/modules/kogito-infinispan-properties/module.yaml
index 4802f6c3119..0ba4808a969 100644
--- a/s2i/modules/kogito-infinispan-properties/module.yaml
+++ b/s2i/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
index 18da37eb829..923dd1623fa 100644
--- a/s2i/modules/kogito-jobs-service/module.yaml
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,12 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 artifacts:
 - name: kogito-jobs-service-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/jobs-service/0.7.0/jobs-service-0.7.0-runner.jar
-  md5: 05242d14bdcbaf0b5fa592293f723d12
+  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200210.210529-85-runner.jar
+  md5: d0da24b615d2a6cdd99e40379d1ba6fa
 
 execute:
-- script: configure
\ No newline at end of file
+- script: configure
+
diff --git a/s2i/modules/kogito-jq/module.yaml b/s2i/modules/kogito-jq/module.yaml
index 3744f303527..a7a9c04779e 100644
--- a/s2i/modules/kogito-jq/module.yaml
+++ b/s2i/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 modules:
     install:
diff --git a/s2i/modules/kogito-kubernetes-client/module.yaml b/s2i/modules/kogito-kubernetes-client/module.yaml
index c9a2ddaa451..413cc478bcd 100644
--- a/s2i/modules/kogito-kubernetes-client/module.yaml
+++ b/s2i/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-launch-scripts/module.yaml b/s2i/modules/kogito-launch-scripts/module.yaml
index 74b55efb45b..ce3de8fc4a0 100644
--- a/s2i/modules/kogito-launch-scripts/module.yaml
+++ b/s2i/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-logging/module.yaml b/s2i/modules/kogito-logging/module.yaml
index d23750235df..685670953ad 100644
--- a/s2i/modules/kogito-logging/module.yaml
+++ b/s2i/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/module.yaml b/s2i/modules/kogito-persistence/module.yaml
index ae77f94154c..538a44ed465 100644
--- a/s2i/modules/kogito-persistence/module.yaml
+++ b/s2i/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 modules:
     install:
diff --git a/s2i/modules/kogito-quarkus-jvm/module.yaml b/s2i/modules/kogito-quarkus-jvm/module.yaml
index b315479a8cc..03c47ab47d5 100644
--- a/s2i/modules/kogito-quarkus-jvm/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-s2i/module.yaml b/s2i/modules/kogito-quarkus-s2i/module.yaml
index b41efc2aeec..868b44db4bf 100644
--- a/s2i/modules/kogito-quarkus-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.7.0"
\ No newline at end of file
+  value: "0.8.0-rc1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus/module.yaml b/s2i/modules/kogito-quarkus/module.yaml
index 7b6894df705..a280ed590d5 100644
--- a/s2i/modules/kogito-quarkus/module.yaml
+++ b/s2i/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml
index 439a22e4a2c..3e983b5ad35 100644
--- a/s2i/modules/kogito-s2i-core/module.yaml
+++ b/s2i/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.7.0'
+version: '0.8.0-rc1'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/s2i/modules/kogito-springboot-s2i/module.yaml b/s2i/modules/kogito-springboot-s2i/module.yaml
index 6b406be9ba3..4658fdc4788 100644
--- a/s2i/modules/kogito-springboot-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.7.0"
\ No newline at end of file
+  value: "0.8.0-rc1"
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot/module.yaml b/s2i/modules/kogito-springboot/module.yaml
index 218d41fb164..3b8496cf781 100644
--- a/s2i/modules/kogito-springboot/module.yaml
+++ b/s2i/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-system-user/module.yaml b/s2i/modules/kogito-system-user/module.yaml
index 5133e6cbb12..a4135b47f1d 100644
--- a/s2i/modules/kogito-system-user/module.yaml
+++ b/s2i/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.7.0"
+version: "0.8.0-rc1"
 
 execute:
 - script: add-user

From fc80d86b15075b22c05b279e50ff7627728f8db3 Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Tue, 18 Feb 2020 14:30:57 +0100
Subject: [PATCH 089/709] [KOGITO-951] Refactor
 KubernetesServiceDiscoveryIntegrationTest to use mocked OpenShift client
 (#91)

Signed-off-by: Karel Suta <ksuta@redhat.com>
---
 .../KubernetesServiceDiscoveryTest.java       | 162 +++++++++++++
 ...rnetesServiceDiscoveryIntegrationTest.java | 220 ------------------
 2 files changed, 162 insertions(+), 220 deletions(-)
 create mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryTest.java
 delete mode 100644 kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryIntegrationTest.java

diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryTest.java
new file mode 100644
index 00000000000..afdb6ae35e4
--- /dev/null
+++ b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2020 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      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.
+ */
+
+package org.kie.kogito.cloud.workitems.service.discovery;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+
+import io.fabric8.kubernetes.api.model.IntOrString;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.api.model.ServiceBuilder;
+import io.fabric8.kubernetes.api.model.ServicePort;
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
+import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
+import org.kie.kogito.cloud.workitems.ServiceInfo;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class KubernetesServiceDiscoveryTest {
+
+    public static final String NAMESPACE = "mockns";
+
+    public static final String SERVICE_PROTOCOL = "http";
+    public static final int SERVICE_PORT = 8080;
+
+    public KubernetesServer server = new KubernetesServer(true, true);
+
+    public KubernetesServiceDiscovery kubernetesServiceDiscovery;
+
+    @BeforeEach
+    public void before() {
+        server.before();
+        kubernetesServiceDiscovery = new KubernetesServiceDiscovery(new DefaultKogitoKubeClient().withConfig(new KogitoKubeConfig(server.getClient())));
+    }
+
+    @AfterEach
+    public void after() {
+        server.after();
+    }
+
+    @Test
+    public void findSingleEndpoint() {
+        String serviceLabelName = "test-kogito";
+        String serviceLabelValue = "service";
+        String serviceName = "test-kogito-service";
+        String serviceIp = "172.30.158.30";
+        String serviceUrl = getServiceUrl(serviceIp) + "/" + serviceLabelValue;
+
+        createServiceInMockServer(serviceName, serviceIp, Collections.singletonMap(serviceLabelName, serviceLabelValue));
+
+        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, serviceLabelName, serviceLabelValue);
+        assertThat(endpoint).hasValueSatisfying(serviceInfo -> {
+            assertThat(serviceInfo.getUrl()).isEqualTo(serviceUrl);
+        });
+    }
+
+    @Test
+    public void findEndpointFromTwoServicesWithSameLabel() {
+        String sharedServiceLabelName = "test-kogito";
+        String sharedServiceLabelValue = "service";
+        String serviceOneName = "test-kogito-service";
+        String serviceOneIp = "172.30.158.31";
+        String serviceOneUrl = getServiceUrl(serviceOneIp) + "/" + sharedServiceLabelValue;
+        String serviceTwoName = "test-kogito-service-two";
+        String serviceTwoIp = "172.30.158.32";
+        String serviceTwoUrl = getServiceUrl(serviceTwoIp) + "/" + sharedServiceLabelValue;
+
+        createServiceInMockServer(serviceOneName, serviceOneIp, Collections.singletonMap(sharedServiceLabelName, sharedServiceLabelValue));
+        createServiceInMockServer(serviceTwoName, serviceTwoIp, Collections.singletonMap(sharedServiceLabelName, sharedServiceLabelValue));
+
+        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, sharedServiceLabelName, sharedServiceLabelValue);
+        // Returns one of the endpoints (order is not specified)
+        assertThat(endpoint).hasValueSatisfying(serviceInfo -> {
+            assertThat(serviceInfo.getUrl()).isIn(serviceOneUrl, serviceTwoUrl);
+        });
+    }
+
+    @Test
+    public void findEndpointFromTwoServicesWithSameLabelsButDifferentValues() {
+        String sharedServiceLabelName = "test-kogito";
+        String serviceOneLabelValue = "service";
+        String serviceOneName = "test-kogito-service";
+        String serviceOneIp = "172.30.158.31";
+        String serviceOneUrl = getServiceUrl(serviceOneIp) + "/" + serviceOneLabelValue;
+        String serviceTwoLabelValue = "servicetwo";
+        String serviceTwoName = "test-kogito-service-two";
+        String serviceTwoIp = "172.30.158.32";
+        String serviceTwoUrl = getServiceUrl(serviceTwoIp) + "/" + serviceTwoLabelValue;
+
+        createServiceInMockServer(serviceOneName, serviceOneIp, Collections.singletonMap(sharedServiceLabelName, serviceOneLabelValue));
+        createServiceInMockServer(serviceTwoName, serviceTwoIp, Collections.singletonMap(sharedServiceLabelName, serviceTwoLabelValue));
+
+        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, sharedServiceLabelName, serviceOneLabelValue);
+        assertThat(endpoint).hasValueSatisfying(serviceInfo -> {
+            assertThat(serviceInfo.getUrl()).isEqualTo(serviceOneUrl);
+        });
+        Optional<ServiceInfo> endpointTwo = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, sharedServiceLabelName, serviceTwoLabelValue);
+        assertThat(endpointTwo).hasValueSatisfying(serviceInfo -> {
+            assertThat(serviceInfo.getUrl()).isEqualTo(serviceTwoUrl);
+        });
+    }
+
+    @Test
+    public void findEndpointNoServiceDeployed() {
+        String serviceLabelName = "test-kogito";
+        String serviceLabelValue = "service";
+
+        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, serviceLabelName, serviceLabelValue);
+        assertThat(endpoint).isEmpty();
+    }
+
+    @Test
+    public void findEndpointServiceDeployedWithDifferentValue() {
+        String sharedServiceLabelName = "test-kogito";
+        String serviceOneLabelValue = "service";
+        String serviceOneName = "test-kogito-service";
+        String serviceOneIp = "172.30.158.31";
+        String serviceTwoLabelValue = "servicetwo";
+
+        createServiceInMockServer(serviceOneName, serviceOneIp, Collections.singletonMap(sharedServiceLabelName, serviceOneLabelValue));
+
+        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, sharedServiceLabelName, serviceTwoLabelValue);
+        assertThat(endpoint).isEmpty();
+    }
+
+    private void createServiceInMockServer(String name, String serviceIp, Map<String,String> labels) {
+        final ServicePort port = new ServicePort(SERVICE_PROTOCOL, 0, SERVICE_PORT, SERVICE_PROTOCOL, new IntOrString(SERVICE_PORT));
+        final Service service = new ServiceBuilder().withNewMetadata()
+                                                        .withName(name)
+                                                        .withLabels(labels)
+                                                    .endMetadata()
+                                                    .withNewSpec()
+                                                        .withClusterIP(serviceIp)
+                                                        .withType("ClusterIP")
+                                                        .withSessionAffinity("ClientIP")
+                                                        .withPorts(port)
+                                                    .endSpec()
+                                                    .build();
+        server.getClient().services().inNamespace(NAMESPACE).create(service);
+    }
+
+    private String getServiceUrl(String serviceIp) {
+        return SERVICE_PROTOCOL + "://" + serviceIp + ":" + SERVICE_PORT;
+    }
+}
diff --git a/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryIntegrationTest.java b/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryIntegrationTest.java
deleted file mode 100644
index 135494e624d..00000000000
--- a/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryIntegrationTest.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- * 
- * Licensed 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.
- */
-package org.kie.kogito.cloud.workitems.service.discovery;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import cz.xtf.builder.builders.ServiceBuilder;
-import cz.xtf.core.config.OpenShiftConfig;
-import cz.xtf.core.openshift.OpenShift;
-import cz.xtf.core.openshift.OpenShifts;
-import cz.xtf.core.waiting.SimpleWaiter;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
-import org.kie.kogito.cloud.workitems.ServiceInfo;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * 
- */
-public class KubernetesServiceDiscoveryIntegrationTest {
-
-    private static final String SERVICE1_NAME = "service1";
-    private static final String SERVICE2_NAME = "service2";
-
-    private static final String DEFAULT_LABEL_KEY = "keyLabel1";
-    private static final String DEFAULT_LABEL_VALUE = "valueLabel1";
-
-    private static KubernetesServiceDiscovery kubernetesServiceDiscovery;
-    private static OpenShift openshift;
-
-    private ServiceManager svcManager;
-
-    @BeforeAll
-    public static void setupProject() throws UnsupportedEncodingException {
-        // Create project
-        String projectName = "kogito-discovery-" + RandomStringUtils.randomAlphanumeric(4).toLowerCase();
-        OpenShifts.master().createProjectRequest(projectName);
-        openshift = OpenShifts.master(projectName);
-
-        // give default serviceaccount view rights
-        openshift.addRoleToServiceAccount("view", "default");
-
-        String tokenSecretName = openshift.getServiceAccount("default").getSecrets().stream().map(ObjectReference::getName).filter(secretName -> secretName.contains("token")).findFirst().get();
-        String tokenBase64 = openshift.getSecret(tokenSecretName).getData().get("token");
-        String token = new String(Base64.decodeBase64(tokenBase64), "UTF-8");
-
-        // Setup Kubernetes service discovery  
-        Config config = new ConfigBuilder().withMasterUrl(OpenShiftConfig.url())
-                .withOauthToken(token)
-                .withTrustCerts(true)
-                .build();
-        kubernetesServiceDiscovery = new KubernetesServiceDiscovery(new DefaultKogitoKubeClient().withConfig(new KogitoKubeConfig(new DefaultKubernetesClient(config))));
-    }
-
-    @AfterAll
-    public static void tearDownProject() {
-        openshift.deleteProject();
-    }
-
-    @BeforeEach
-    public void setUp() {
-        svcManager = new ServiceManager(openshift);
-    }
-
-    @AfterEach
-    public void tearDown() {
-        svcManager.clearServices();
-        svcManager = null;
-    }
-
-    @Test
-    public void findSingleEndpoint() {
-        Service service = svcManager.createSimpleService(SERVICE1_NAME, DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
-
-        assertExistingEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
-        assertEndpointUrlWithServices(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE, service);
-    }
-
-    @Test
-    public void findEndpointFrom2ServicesWithSameLabel() {
-        Service service1 = svcManager.createSimpleService(SERVICE1_NAME, DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
-        Service service2 = svcManager.createSimpleService(SERVICE2_NAME, DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
-
-        assertExistingEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
-        assertEndpointUrlWithServices(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE, service1, service2);
-    }
-
-    @Test
-    public void findEndpointFrom2ServicesWithSameLabelButDifferentValues() {
-        String otherLabelValue = "otherLabelValue";
-        Service service1 = svcManager.createSimpleService(SERVICE1_NAME, DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
-        Service service2 = svcManager.createSimpleService(SERVICE2_NAME, DEFAULT_LABEL_KEY, otherLabelValue);
-
-        assertExistingEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
-        assertExistingEndpoint(DEFAULT_LABEL_KEY, otherLabelValue);
-        assertEndpointUrlWithServices(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE, service1);
-        assertEndpointUrlWithServices(DEFAULT_LABEL_KEY, otherLabelValue, service2);
-    }
-
-    @Test
-    public void findEndpointNoServiceDeployed() {
-        assertNoEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
-    }
-
-    @Test
-    public void findEndpointServiceDeployedWithDifferentValue() {
-        String otherLabelValue = "otherLabelValue";
-        svcManager.createSimpleService(SERVICE1_NAME, DEFAULT_LABEL_KEY, otherLabelValue);
-
-        assertNoEndpoint(DEFAULT_LABEL_KEY, DEFAULT_LABEL_VALUE);
-    }
-
-    private void assertExistingEndpoint(String label, String value) {
-        Optional<ServiceInfo> optEndpoint = getExistingEndpoint(label, value);
-        assertTrue("No service with label " + label + " and value " + value + " defined", optEndpoint.isPresent());
-    }
-
-    private void assertNoEndpoint(String label, String value) {
-        Optional<ServiceInfo> optEndpoint = getExistingEndpoint(label, value);
-        assertFalse("There should not be any service with label " + label + " and value " + value, optEndpoint.isPresent());
-    }
-
-    private void assertEndpointUrlWithServices(String label, String value, Service... services) {
-        if (services == null || services.length < 1) {
-            throw new RuntimeException("No service given to check with");
-        }
-
-        String endpointUrl = getEndpointUrl(label, value);
-        String errStr = "Endpoint url shoud start with " + Arrays.stream(services).map(this::buildClusterIPUrl).collect(Collectors.joining(" or "));
-        errStr += ". Got: " + endpointUrl;
-        assertTrue(errStr, Arrays.stream(services).map(this::buildClusterIPUrl).anyMatch(endpointUrl::startsWith));
-    }
-
-    private Optional<ServiceInfo> getExistingEndpoint(String label, String value) {
-        return kubernetesServiceDiscovery.findEndpoint(openshift.getNamespace(), label, value);
-    }
-
-    private String getEndpointUrl(String label, String value) {
-        Optional<ServiceInfo> optEndpoint = getExistingEndpoint(label, value);
-        if (optEndpoint.isPresent()) {
-            return optEndpoint.get().getUrl();
-        } else {
-            throw new RuntimeException("No endpoint defined with label " + label + " and value " + value);
-        }
-
-    }
-
-    private String buildClusterIPUrl(Service service) {
-        return "http://" + service.getSpec().getClusterIP() + ":8080";
-    }
-
-    static class ServiceManager {
-
-        private OpenShift openshift;
-        private Set<Service> services = new HashSet<>();
-
-        public ServiceManager(OpenShift openshift) {
-            super();
-            this.openshift = openshift;
-        }
-
-        public Service createSimpleService(String name, String defaultLabelKey, String defaultLabelValue) {
-            Map<String, String> labels = new HashMap<>();
-            labels.put(defaultLabelKey, defaultLabelValue);
-            return createSimpleService(name, labels);
-        }
-
-        public Service createSimpleService(String name, Map<String, String> labels) {
-            ServiceBuilder builder = new ServiceBuilder(name).port(8080);
-            labels.entrySet().forEach(e -> builder.addLabel(e.getKey(), e.getValue()));
-            Service service = openshift.createService(builder.build());
-            services.add(service);
-            return service;
-        }
-
-        public void clearServices() {
-            services.stream().forEach(service -> {
-                String svcName = service.getMetadata().getName();
-                assertTrue("Problem deleting service " + svcName, openshift.deleteService(service));
-                // Be sure service is deleted, to avoid future conflicts
-                assertTrue(new SimpleWaiter(() -> openshift.getService(svcName) == null, TimeUnit.SECONDS, 5, "Wait for service1 to be deleted").waitFor());
-            });
-        }
-    }
-}

From b08e255316505cfcbc9786003b379f2c8b5ee9b5 Mon Sep 17 00:00:00 2001
From: Mario Fusco <mario.fusco@gmail.com>
Date: Fri, 21 Feb 2020 18:55:18 +0100
Subject: [PATCH 090/709] [KOGITO-1023] consolidate kogito-bom and
 kogito-runtimes repos (#89)

[KOGITO-1023] consolidate kogito-bom and kogito-runtimes repos
---
 .gitignore  |  1 +
 Jenkinsfile | 10 ----------
 pom.xml     | 21 ++++++++-------------
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf1a1af4e8f..ef313c7cd48 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ target/
 /nbproject
 /*.ipr
 /*.iws
+*.iml
 */*.iml
 .idea/
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 4a7009ed72c..637c3213fa7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,16 +18,6 @@ pipeline {
                 sh 'printenv'
             }
         }
-        stage('Build kogito-bom') {
-            steps {
-                dir("kogito-bom") {
-                    script {
-                        githubscm.checkoutIfExists('kogito-bom', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
-                        maven.runMavenWithSubmarineSettings('clean install', true)
-                    }
-                }
-            }
-        }
         stage('Build kogito-runtimes') {
             steps {
                 dir("kogito-runtimes") {
diff --git a/pom.xml b/pom.xml
index 511d60f4b98..fd4577922d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,18 +4,20 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-bom-parent</artifactId>
-    <version>8.0.0-SNAPSHOT</version>
-  </parent>
 
+  <groupId>org.kie.kogito</groupId>
   <artifactId>kogito-cloud</artifactId>
+  <version>8.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Kogito Cloud</name>
   <description>Kogito Cloud</description>
 
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
   <repositories>
     <!-- Bootstrap repository to locate the parent pom when the parent pom 
       has not been build locally. -->
@@ -48,17 +50,10 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-deps-bom</artifactId>
-        <version>${version.org.kie.kogito}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.kie.kogito</groupId>
         <artifactId>kogito-bom</artifactId>
-        <version>${version.org.kie.kogito}</version>
+        <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From 00314ae4a689ede897c0bcb9587336e52955f5c4 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 26 Feb 2020 15:10:57 -0300
Subject: [PATCH 091/709] [KOGITO-1286] - Upgrade Git Hub actions/checkout@v1
 to v2 (#94)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .github/workflows/run-bats-tests.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run-bats-tests.yml b/.github/workflows/run-bats-tests.yml
index 3ec62c5ddc2..04ce9f1e99d 100644
--- a/.github/workflows/run-bats-tests.yml
+++ b/.github/workflows/run-bats-tests.yml
@@ -6,9 +6,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Install xmllint
-        run: sudo apt-get install libxml2-utils
+        run: |
+          sudo apt-get update
+          sudo apt-get install libxml2-utils --fix-missing
       - name: install bats
         run: |
           git clone https://github.com/bats-core/bats-core.git

From 18ea9e6786edfb1047637ce89b2a9eeec50aad66 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 27 Feb 2020 13:40:10 +0100
Subject: [PATCH 092/709] added missing distributionmanagement tag (#93)

---
 pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pom.xml b/pom.xml
index fd4577922d4..c79571a3c57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,20 @@
     <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
+  <!-- distributionManagement section -->
+  <distributionManagement>
+    <repository>
+      <id>jboss-releases-repository</id>
+      <name>JBoss Releases Repository</name>
+      <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+    </repository>
+    <snapshotRepository>
+      <id>jboss-snapshots-repository</id>
+      <name>JBoss Snapshot Repository</name>
+      <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
+
   <repositories>
     <!-- Bootstrap repository to locate the parent pom when the parent pom 
       has not been build locally. -->

From 2f5a45686b7f7506caa47dbf913008e38d1c91bf Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 28 Feb 2020 10:35:08 +0100
Subject: [PATCH 093/709] junit results only for maven command (#95)

---
 Jenkinsfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 637c3213fa7..6db815af5d9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,6 @@ pipeline {
                     maven.runMavenWithSubmarineSettings('clean install', false)
                 }
             }
-
         }
         stage('Build kogito-cloud-s2i') {
             steps {
@@ -61,8 +60,6 @@ pipeline {
             }
         }
         always {
-            // Currently there are no tests in submarine-cloud
-            junit '**/target/surefire-reports/**/*.xml'
             cleanWs()
         }
     }

From 50e614f6d54fa082e0e99ce375529ca274986663 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 28 Feb 2020 15:28:20 +0100
Subject: [PATCH 094/709] Removed openshift tests (done in operator) (#92)

---
 .gitignore                                    |   3 -
 kogito-cloud-tests/.gitignore                 |  33 ---
 kogito-cloud-tests/README.md                  |  21 --
 kogito-cloud-tests/pom.xml                    | 232 ------------------
 .../workitems/HttpCallsServiceOperations.java | 112 ---------
 .../cloud/workitems/OpenshiftOperations.java  | 142 -----------
 .../kogito/cloud/workitems/TestConfig.java    |  68 -----
 ...ServiceWorkItemHandlerIntegrationTest.java | 170 -------------
 .../src/test/resources/logback-test.xml       |  14 --
 .../src/test/resources/services/README.md     |   5 -
 .../.gitignore                                |  32 ---
 .../httpcalls-cloud-workitems-common/pom.xml  |  16 --
 .../cloud/workitems/httpcalls/HttpCall.java   |  53 ----
 .../.gitignore                                |  32 ---
 .../pom.xml                                   | 110 ---------
 .../httpcalls/HttpCallsEndpoint.java          |  67 -----
 .../.gitignore                                |  32 ---
 .../pom.xml                                   | 104 --------
 .../httpcalls/HttpCallsApplication.java       |  13 -
 .../httpcalls/HttpCallsEndpoint.java          |  68 -----
 .../services/persons-crud-service/.gitignore  |  32 ---
 .../services/persons-crud-service/pom.xml     |  82 -------
 .../org/kie/kogito/cloud/persons/Person.java  |  39 ---
 .../kogito/cloud/persons/PersonEndpoint.java  |  83 -------
 pom.xml                                       |   1 -
 25 files changed, 1564 deletions(-)
 delete mode 100644 kogito-cloud-tests/.gitignore
 delete mode 100644 kogito-cloud-tests/README.md
 delete mode 100644 kogito-cloud-tests/pom.xml
 delete mode 100644 kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/HttpCallsServiceOperations.java
 delete mode 100644 kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/OpenshiftOperations.java
 delete mode 100644 kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/TestConfig.java
 delete mode 100644 kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerIntegrationTest.java
 delete mode 100644 kogito-cloud-tests/src/test/resources/logback-test.xml
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/README.md
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/.gitignore
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/pom.xml
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCall.java
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/.gitignore
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/pom.xml
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/.gitignore
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/pom.xml
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsApplication.java
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/persons-crud-service/.gitignore
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/persons-crud-service/pom.xml
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/Person.java
 delete mode 100644 kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/PersonEndpoint.java

diff --git a/.gitignore b/.gitignore
index ef313c7cd48..28a7da2e36a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,3 @@ target/
 # files used for external db testing
 jdbc_driver.jar
 db-settings.xml
-
-# integration test properties file
-test.properties
diff --git a/kogito-cloud-tests/.gitignore b/kogito-cloud-tests/.gitignore
deleted file mode 100644
index 67f288fc0f4..00000000000
--- a/kogito-cloud-tests/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-bin/
-/target
-/local
-tmp/
-
-# Eclipse, Netbeans and IntelliJ files
-/.*
-!.gitignore
-/nbproject
-/*.ipr
-/*.iws
-/*.iml
-
-# Repository wide ignore mac DS_Store files
-.DS_Store
-
-# Original jbpm ignores
-*~
-
-# Test info
-/settings*.xml
-/lib-jdbc/
-*.db
-*.tlog
-
-# modules that don't exist in this branch
-/jbpm-human-task-war/
-/jbpm-bam/
-/jbpm-gwt/
-
-# files used for external db testing
-jdbc_driver.jar
-db-settings.xml
diff --git a/kogito-cloud-tests/README.md b/kogito-cloud-tests/README.md
deleted file mode 100644
index 18e7a44b011..00000000000
--- a/kogito-cloud-tests/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# How to execute test
-
-The integration tests are bound to Failsafe plugin. They can be executed as part of the build by running `mvn clean install -Popenshift`.
-Another way is to run the tests using IDE as usual JUnit test.
-
-Tests are using XTF framework for communication with OpenShift (which is based on Fabric8)
-
-To properly configure OpenShift, user needs to specify these properties:
-* xtf.openshift.url
-* xtf.openshift.admin.username - Username of user with admin rights
-* xtf.openshift.admin.password
-* xtf.openshift.master.username - Username for user without admin rights (can be used admin user from above)
-* xtf.openshift.master.password
-* xtf.openshift.binary.path - Path to OC binary client (test/framework will be refactored in future to get rid of this)
-* image.kogito.quarkus.builder.s2i - Tag for S2I Quarkus image, for example built from https://github.com/kiegroup/kogito-cloud/tree/master/s2i/kogito-quarkus-ubi8-s2i-overrides.yaml
-* image.kogito.quarkus.runtime - Tag for Quarkus runtime image, for example built from https://github.com/kiegroup/kogito-cloud/tree/master/s2i/kogito-quarkus-ubi8-overrides.yaml
-* image.kogito.springboot.builder.s2i - Tag for S2I image, for example buil from https://github.com/kiegroup/kogito-cloud/tree/master/s2i/kogito-springboot-ubi8-s2i-overrides.yaml
-* image.kogito.springboot.runtime - Tag for runtime image, for example built from https://github.com/kiegroup/kogito-cloud/tree/master/s2i/kogito-springboot-ubi8-overrides.yaml
-* maven.mirror.url - URL for Maven mirror. This mirror is used in S2I build.
-
-These properties need to be set as system property or they can be placed in test.properties file (with appropriate values). test.properties file can be placed next to pom.xml of the parent directory. It is added to .gitignore.
diff --git a/kogito-cloud-tests/pom.xml b/kogito-cloud-tests/pom.xml
deleted file mode 100644
index 0419db35fd4..00000000000
--- a/kogito-cloud-tests/pom.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-cloud</artifactId>
-    <version>8.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>kogito-cloud-tests</artifactId>
-  <name>Kogito Cloud Integration</name>
-  <description>Kogito Cloud Integration Tests</description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- Skip tests by default. -->
-    <skipITs>true</skipITs>
-
-    <!-- used by test services -->
-    <cxf.version>3.2.6</cxf.version>
-    <springboot.version>2.1.8.RELEASE</springboot.version>
-
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-cloud-workitems</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- XTF dependencies. -->
-    <dependency>
-      <groupId>cz.xtf</groupId>
-      <artifactId>core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>cz.xtf</groupId>
-      <artifactId>builder</artifactId>
-    </dependency>
-
-    <!-- Logging -->
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Fabric8 client used exclusively for tests purposes only -->
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-server-mock</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>bintray-xtf-cz-xtf</id>
-      <name>Bintray XTF</name>
-      <url>https://dl.bintray.com/xtf-cz/xtf</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>oss-jfrog-snapshots</id>
-      <name>oss-jfrog-artifactory-snapshots</name>
-      <url>https://oss.jfrog.org/artifactory/oss-snapshot-local</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-
-  <profiles>
-    <profile>
-      <id>openshift</id>
-      <properties>
-        <skipITs>false</skipITs>
-      </properties>
-    </profile>
-  </profiles>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <!-- XTF use tmp folder as temp folder, need to be deleted too when 
-          rerunning tests. -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <configuration>
-            <filesets>
-              <fileset>
-                <directory>${project.basedir}/tmp</directory>
-              </fileset>
-            </filesets>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <executions>
-            <execution>
-              <!-- Copy source code from libraries to be tested into the 
-                test service. we need to run the code in a container and code is deployed 
-                via S2I. Also in the specified project, libraries' dependencies are directly 
-                mentioned into the native profile in order for the whole to be correctly 
-                compiled -->
-              <id>quarkus-copy-deps-libs-classes</id>
-              <phase>generate-resources</phase>
-              <goals>
-                <goal>testResources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-quarkus-service/src/main/java</outputDirectory>
-                <overwrite>true</overwrite>
-                <resources>
-                  <resource>
-                    <directory>${project.basedir}/../kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java</directory>
-                  </resource>
-                  <resource>
-                    <directory>${project.basedir}/../kogito-cloud-services/kogito-cloud-workitems/src/main/java</directory>
-                  </resource>
-                </resources>
-              </configuration>
-            </execution>
-            <execution>
-              <!-- Copy source code from libraries to be tested into the 
-                test service. we need to run the code in a container and code is deployed 
-                via S2I. Also in the specified project, libraries' dependencies are directly 
-                mentioned into the native profile in order for the whole to be correctly 
-                compiled -->
-              <id>springboot-copy-deps-libs-classes</id>
-              <phase>generate-resources</phase>
-              <goals>
-                <goal>testResources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-springboot-service/src/main/java</outputDirectory>
-                <overwrite>true</overwrite>
-                <resources>
-                  <resource>
-                    <directory>${project.basedir}/../kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java</directory>
-                  </resource>
-                  <resource>
-                    <directory>${project.basedir}/../kogito-cloud-services/kogito-cloud-workitems/src/main/java</directory>
-                  </resource>
-                </resources>
-              </configuration>
-            </execution>
-            <execution>
-              <id>copy-test-resources</id>
-              <phase>generate-test-resources</phase>
-              <goals>
-                <goal>testResources</goal>
-              </goals>
-              <configuration>
-                <resources>
-                  <testResource>
-                    <directory>src/test/resources</directory>
-                    <excludes>
-                      <exclude>**/target/</exclude>
-                    </excludes>
-                    <filtering>true</filtering>
-                  </testResource>
-                </resources>
-                <escapeString>\</escapeString>
-              </configuration>
-            </execution>
-            <execution>
-              <id>quarkus-merge-common-test-resources</id>
-              <phase>generate-test-resources</phase>
-              <goals>
-                <goal>testResources</goal>
-              </goals>
-              <configuration>
-                <overwrite>true</overwrite>
-                <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-quarkus-service/src/main/java</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-common/src/main/java</directory>
-                  </resource>
-                </resources>
-              </configuration>
-            </execution>
-            <execution>
-              <id>springboot-merge-common-test-resources</id>
-              <phase>generate-test-resources</phase>
-              <goals>
-                <goal>testResources</goal>
-              </goals>
-              <configuration>
-                <overwrite>true</overwrite>
-                <outputDirectory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-springboot-service/src/main/java</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>${project.build.directory}/test-classes/services/httpcalls-cloud-workitems-common/src/main/java</directory>
-                  </resource>
-                </resources>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-
-</project>
diff --git a/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/HttpCallsServiceOperations.java b/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/HttpCallsServiceOperations.java
deleted file mode 100644
index 615aa5f4a9c..00000000000
--- a/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/HttpCallsServiceOperations.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- * 
- * Licensed 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.
- */
-package org.kie.kogito.cloud.workitems;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Request.Builder;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class HttpCallsServiceOperations {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(HttpCallsServiceOperations.class);
-
-    private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-
-    private String url;
-
-    private ObjectMapper mapper;
-    private OkHttpClient httpClient;
-
-    public HttpCallsServiceOperations(String serviceBaseUrl) {
-        // Setup full url to crud service
-        StringBuilder sb = new StringBuilder(serviceBaseUrl);
-        sb.append("/");
-        sb.append("httpcall");
-        url = sb.toString();
-        LOGGER.info("Got URL {}", url);
-
-        mapper = new ObjectMapper();
-        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
-        mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
-
-        httpClient = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
-                .build();
-    }
-
-    @SuppressWarnings("unchecked")
-    public Map<String, Object> call(String service, HttpMethods httpMethod, Map<String, Object> serviceCallParams) {
-        RequestBody body = createRequestPayload(service, httpMethod, serviceCallParams);
-        Builder requestBuilder = new Request.Builder().url(url).post(body);
-
-        try (Response response = httpClient.newCall(requestBuilder.build()).execute()) {
-            String payload = response.body().string();
-            LOGGER.debug("Resonse code {} and payload {}", response.code(), payload);
-
-            if (!response.isSuccessful()) {
-                throw new RuntimeException("Unsuccessful response from service " + response.message() + " (code " + response.code() + ")");
-            }
-
-            return mapper.readValue(payload, Map.class);
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public boolean isRouteAvailable() {
-        Builder requestBuilder = new Request.Builder().url(url).method("OPTIONS", null);
-        try (Response response = httpClient.newCall(requestBuilder.build()).execute()) {
-            String payload = response.body().string();
-            LOGGER.debug("Resonse code {} and payload {}", response.code(), payload);
-            return response.isSuccessful();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private RequestBody createRequestPayload(String service, HttpMethods httpMethod, Map<String, Object> serviceCallParams) {
-        Map<String, Object> data = new HashMap<>();
-        data.put("httpMethod", httpMethod.toString().toUpperCase());
-        data.put("service", service);
-        data.put("data", serviceCallParams);
-
-        try {
-            String json = mapper.writeValueAsString(data);
-            LOGGER.debug("Sending body {}", json);
-            RequestBody body = RequestBody.create(JSON, json);
-
-            return body;
-        } catch (Exception e) {
-            throw new RuntimeException("Unexpected error when producing request payload", e);
-        }
-    }
-}
diff --git a/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/OpenshiftOperations.java b/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/OpenshiftOperations.java
deleted file mode 100644
index 2c66d8d04c3..00000000000
--- a/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/OpenshiftOperations.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- * 
- * Licensed 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.
- */
-package org.kie.kogito.cloud.workitems;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BooleanSupplier;
-import java.util.stream.Collectors;
-
-import cz.xtf.core.openshift.OpenShift;
-import cz.xtf.core.openshift.OpenShiftBinary;
-import cz.xtf.core.openshift.OpenShifts;
-import cz.xtf.core.waiting.SimpleWaiter;
-import io.fabric8.openshift.api.model.Route;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class OpenshiftOperations {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(OpenshiftOperations.class);
-
-    private OpenShift openShift;
-    private OpenShiftBinary masterBinary;
-
-    public void init(String projectName) {
-        openShift = OpenShifts.master();
-        if (openShift.getProject(projectName) == null) {
-            LOGGER.info("Create project {}", projectName);
-            openShift.createProjectRequest(projectName);
-            waitFor(() -> openShift.getProject(projectName) != null, "Waiting for project to be created.", 5);
-        }
-        openShift = OpenShifts.master(projectName);
-        openShift.addRoleToServiceAccount("view", "default");
-        masterBinary = OpenShifts.masterBinary(openShift.getNamespace());
-    }
-
-    public void delete() {
-        openShift.deleteProject();
-    }
-
-    public OpenShift getOpenshift() {
-        return openShift;
-    }
-
-    public String startS2IBinaryBuild(String builderImageTag, String buildName, String projectDir) {
-        List<String> command = new ArrayList<>(Arrays.asList("new-build", builderImageTag, "--binary=true", "--name=" + buildName));
-        TestConfig.getMavenMirrorUrl().ifPresent(url -> {
-            command.add("-e");
-            command.add("MAVEN_MIRROR_URL=" + url);
-        });
-
-        launchBinaryCommand(command);
-        launchBinaryCommand(Arrays.asList("start-build", buildName, "--from-dir", projectDir));
-        return buildName;
-    }
-
-    public void startRuntimeBuild(String builderImageTag, String buildName, String sourceImageName) {
-        launchBinaryCommand(Arrays.asList("new-build", "--name=" + buildName,
-                                          "--source-image=" + sourceImageName,
-                                          "--source-image-path=/home/kogito/bin:.",
-                                          "--docker-image=" + builderImageTag));
-    }
-
-    public void startApp(String imageName, Map<String, String> envVariables, Map<String, String> serviceLabels) {
-        List<String> command = new ArrayList<>(Arrays.asList("new-app", imageName + ":latest"));
-        if (!envVariables.isEmpty()) {
-            command.add("-e");
-            command.add(getParameterKeyValueString(envVariables));
-        }
-        if (!serviceLabels.isEmpty()) {
-            command.add("-l");
-            command.add(getParameterKeyValueString(serviceLabels));
-        }
-        launchBinaryCommand(command);
-    }
-
-    public void waitForBuildCompleted(String buildName, long timeoutInMinutes) {
-        // Small bug with openshift.waiters().hasBuildCompleted(buildName) in case build has not started yet ...
-        openShift.waiters().isLatestBuildPresent(buildName).timeout(TimeUnit.MINUTES, 5L).waitFor();
-        openShift.waiters().hasBuildCompleted(buildName).timeout(TimeUnit.MINUTES, timeoutInMinutes).waitFor();
-    }
-
-    public void waitFor(BooleanSupplier supplier, String reason, long timeoutInMinutes) {
-        new SimpleWaiter(supplier).reason(reason).timeout(TimeUnit.MINUTES, timeoutInMinutes).waitFor();
-    }
-
-    public void launchBinaryCommand(List<String> command) {
-        LOGGER.debug("{}", command);
-        masterBinary.execute(command.toArray(new String[0]));
-    }
-
-    public void waitForPod(String deploymentName, int nbInstances, long timeoutInMinutes) {
-        openShift.waiters().areExactlyNPodsRunning(nbInstances, deploymentName).timeout(TimeUnit.MINUTES, timeoutInMinutes).waitFor();
-    }
-
-    public void waitForService(String serviceName, long timeoutInMinutes) {
-        waitFor(() -> openShift.getService(serviceName) != null, "Waiting for service " + serviceName, timeoutInMinutes);
-    }
-
-    public void exposeService(String serviceName) {
-        masterBinary.execute("expose", "svc/" + serviceName);
-    }
-
-    public String getHttpRoute(String serviceName) {
-        List<Route> routes = openShift.getRoutes();
-        Optional<Route> route = routes.stream()
-                .filter(n -> n.getSpec().getTls() == null)
-                .filter(n -> n.getSpec().getTo().getName().equals(serviceName))
-                .findAny();
-        String routeHost = null;
-        if (route.isPresent()) {
-            routeHost = route.get().getSpec().getHost();
-        } else {
-            String routeNames = routes.stream()
-                    .map(n -> n.getMetadata().getName())
-                    .collect(Collectors.joining(", "));
-            throw new RuntimeException("HTTP route leading to service " + serviceName + " not found. Available routes " + routeNames);
-        }
-        return "http://" + routeHost + ":80";
-    }
-
-    private static String getParameterKeyValueString(Map<String, String> parameters) {
-        return parameters.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining(","));
-    }
-}
diff --git a/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/TestConfig.java b/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/TestConfig.java
deleted file mode 100644
index c98bdca8528..00000000000
--- a/kogito-cloud-tests/src/main/java/org/kie/kogito/cloud/workitems/TestConfig.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-
-package org.kie.kogito.cloud.workitems;
-
-import java.util.Optional;
-
-import cz.xtf.core.config.XTFConfig;
-
-public class TestConfig {
-
-    private TestConfig() {}
-
-    private static final String IMAGE_KAAS_QUARKUS_BUILDER_S2I = "image.kaas.quarkus.builder.s2i";
-    private static final String IMAGE_KAAS_QUARKUS_RUNTIME = "image.kaas.quarkus.runtime";
-    private static final String IMAGE_KAAS_SPRINGBOOT_BUILDER_S2I = "image.kaas.springboot.builder.s2i";
-    private static final String IMAGE_KAAS_SPRINGBOOT_RUNTIME = "image.kaas.springboot.runtime";
-
-    private static final String MAVEN_MIRROR_URL = "maven.mirror.url";
-
-    public static String getKaasS2iQuarkusBuilderImage() {
-        return getMandatoryProperty(IMAGE_KAAS_QUARKUS_BUILDER_S2I);
-    }
-
-    public static String getKaasQuarkusRuntimeImage() {
-        return getMandatoryProperty(IMAGE_KAAS_QUARKUS_RUNTIME);
-    }
-
-    public static String getKaasS2iSpringBootBuilderImage() {
-        return getMandatoryProperty(IMAGE_KAAS_SPRINGBOOT_BUILDER_S2I);
-    }
-
-    public static String getKaasSpringBootRuntimeImage() {
-        return getMandatoryProperty(IMAGE_KAAS_SPRINGBOOT_RUNTIME);
-    }
-
-    public static Optional<String> getMavenMirrorUrl() {
-        return getOptionalProperty(MAVEN_MIRROR_URL);
-    }
-
-    private static String getMandatoryProperty(String propertyName) {
-        String propertyValue = XTFConfig.get(propertyName);
-        if (propertyValue == null || propertyValue.isEmpty()) {
-            throw new RuntimeException("Required property with name " + propertyName + " is not set.");
-        }
-        return propertyValue;
-    }
-
-    private static Optional<String> getOptionalProperty(String propertyName) {
-        String propertyValue = XTFConfig.get(propertyName);
-        if (propertyValue == null || propertyValue.isEmpty()) {
-            return Optional.empty();
-        }
-        return Optional.of(propertyValue);
-    }
-}
diff --git a/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerIntegrationTest.java b/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerIntegrationTest.java
deleted file mode 100644
index a82badba300..00000000000
--- a/kogito-cloud-tests/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerIntegrationTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- * 
- * Licensed 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.
- */
-package org.kie.kogito.cloud.workitems;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang.RandomStringUtils;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class DiscoveredServiceWorkItemHandlerIntegrationTest {
-
-    private static final String personsCrudServiceResourcePath = "/services/persons-crud-service";
-    private static final String httpCallsQuarkusServiceResourcePath = "/services/httpcalls-cloud-workitems-quarkus-service";
-    private static final String httpCallsSpringbootServiceResourcePath = "/services/httpcalls-cloud-workitems-springboot-service";
-
-    private static final String DEFAULT_NAME = "DEFAULT_NAME";
-    private static final String NEW_NAME = "NEW_NAME";
-
-    private static final String personsSvcName = "persons-service";
-    private static final String personsSvcBuilderName = personsSvcName + "-builder";
-    private static final String httpCallsQuarkusSvcName = "httpcalls-service-quarkus";
-    private static final String httpCallsQuarkusSvcBuilderName = httpCallsQuarkusSvcName + "-builder";
-    private static final String httpCallsSpringbootSvcName = "httpcalls-service-springboot";
-    private static final String httpCallsSpringbootSvcBuilderName = httpCallsSpringbootSvcName + "-builder";
-
-    private static OpenshiftOperations openshiftOps;
-    private static HttpCallsServiceOperations httpCallsQuarkusServiceOps;
-    private static HttpCallsServiceOperations httpCallsSpringbootServiceOps;
-
-    @BeforeAll
-    public static void setupProject() throws UnsupportedEncodingException, InterruptedException {
-        String projectName = "kogito-workitems-" + getRandom();
-        openshiftOps = new OpenshiftOperations();
-        openshiftOps.init(projectName);
-        buildAndLoadServices();
-        httpCallsQuarkusServiceOps = new HttpCallsServiceOperations(openshiftOps.getHttpRoute(httpCallsQuarkusSvcName));
-        httpCallsSpringbootServiceOps = new HttpCallsServiceOperations(openshiftOps.getHttpRoute(httpCallsSpringbootSvcName));
-
-        // Wait for httproute to be available
-        openshiftOps.waitFor(() -> httpCallsQuarkusServiceOps.isRouteAvailable(), "Waiting for route to be available for service " + httpCallsQuarkusSvcName, 5L);
-        openshiftOps.waitFor(() -> httpCallsSpringbootServiceOps.isRouteAvailable(), "Waiting for route to be available for service " + httpCallsSpringbootSvcName, 5L);
-    }
-
-    private static void buildAndLoadServices() {
-        // Create Crud & httpcalls builder builds
-        openshiftOps.startS2IBinaryBuild(TestConfig.getKaasS2iQuarkusBuilderImage(), personsSvcBuilderName, getResource(personsCrudServiceResourcePath));
-        openshiftOps.startS2IBinaryBuild(TestConfig.getKaasS2iQuarkusBuilderImage(), httpCallsQuarkusSvcBuilderName, getResource(httpCallsQuarkusServiceResourcePath));
-        openshiftOps.startS2IBinaryBuild(TestConfig.getKaasS2iSpringBootBuilderImage(), httpCallsSpringbootSvcBuilderName, getResource(httpCallsSpringbootServiceResourcePath));
-        openshiftOps.waitForBuildCompleted(personsSvcBuilderName, 20L);
-        openshiftOps.waitForBuildCompleted(httpCallsQuarkusSvcBuilderName, 20L);
-        openshiftOps.waitForBuildCompleted(httpCallsSpringbootSvcBuilderName, 20L);
-
-        // Build final httpcalls image
-        openshiftOps.startRuntimeBuild(TestConfig.getKaasQuarkusRuntimeImage(), personsSvcName, personsSvcBuilderName);
-        openshiftOps.startRuntimeBuild(TestConfig.getKaasQuarkusRuntimeImage(), httpCallsQuarkusSvcName, httpCallsQuarkusSvcBuilderName);
-        openshiftOps.startRuntimeBuild(TestConfig.getKaasSpringBootRuntimeImage(), httpCallsSpringbootSvcName, httpCallsSpringbootSvcBuilderName);
-        openshiftOps.waitForBuildCompleted(personsSvcName, 5L);
-        openshiftOps.waitForBuildCompleted(httpCallsQuarkusSvcName, 5L);
-        openshiftOps.waitForBuildCompleted(httpCallsSpringbootSvcName, 5L);
-
-        Map<String, String> svcLabels = new HashMap<String, String>();
-        svcLabels.put("persons", "service");
-        openshiftOps.startApp(personsSvcName, new HashMap<>(), svcLabels);
-        Map<String, String> envVariables = new HashMap<String, String>();
-        envVariables.put("NAMESPACE", openshiftOps.getOpenshift().getNamespace());
-        openshiftOps.startApp(httpCallsQuarkusSvcName, envVariables, new HashMap<>());
-        openshiftOps.startApp(httpCallsSpringbootSvcName, envVariables, new HashMap<>());
-        openshiftOps.waitForPod(personsSvcName, 1, 5L);
-        openshiftOps.waitForPod(httpCallsQuarkusSvcName, 1, 5L);
-        openshiftOps.waitForPod(httpCallsSpringbootSvcName, 1, 5L);
-
-        openshiftOps.exposeService(httpCallsQuarkusSvcName);
-        openshiftOps.exposeService(httpCallsSpringbootSvcName);
-        openshiftOps.waitForService(httpCallsQuarkusSvcName, 5L);
-        openshiftOps.waitForService(httpCallsSpringbootSvcName, 5L);
-    }
-
-    @AfterAll
-    private static void removeProject() {
-        openshiftOps.delete();
-    }
-
-    @Test
-    public void testCrudOnPersonsQuarkusService() {
-        launchTestCrudOnService(httpCallsQuarkusServiceOps);
-    }
-
-    @Test
-    public void testCrudOnPersonsSpringbootService() {
-        launchTestCrudOnService(httpCallsSpringbootServiceOps);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void launchTestCrudOnService(HttpCallsServiceOperations httpCallsServiceOperations) {
-        // Create person
-        Map<String, Object> personMap = new HashMap<>();
-        personMap.put("name", DEFAULT_NAME);
-        personMap = httpCallsServiceOperations.call("persons", HttpMethods.POST, personMap);
-        String personId = retrieveId(personMap);
-        assertNotNull(personId);
-        assertEquals(DEFAULT_NAME, retrieveName(personMap));
-
-        // Check person exists
-        personMap = httpCallsServiceOperations.call("persons", HttpMethods.GET, new HashMap<>());
-        List<Map<String, Object>> persons = (List<Map<String, Object>>) personMap.get("persons");
-        personMap = persons.stream()
-                .filter(p -> personId.equals(retrieveId(p)))
-                .findFirst()
-                .get();
-        assertEquals(DEFAULT_NAME, retrieveName(personMap));
-
-        // Update name
-        personMap.put("name", NEW_NAME);
-        personMap = httpCallsServiceOperations.call("persons", HttpMethods.PUT, personMap);
-        assertEquals(personId, retrieveId(personMap));
-        assertEquals(NEW_NAME, retrieveName(personMap));
-
-        // check id exist and its name updated
-        personMap = httpCallsServiceOperations.call("persons", HttpMethods.GET, new HashMap<>());
-        persons = (List<Map<String, Object>>) personMap.get("persons");
-        personMap = persons.stream()
-                .filter(p -> personId.equals(retrieveId(p)))
-                .findFirst()
-                .get();
-        assertEquals(NEW_NAME, retrieveName(personMap));
-
-        // delete person & check it has been removed
-        personMap = httpCallsServiceOperations.call("persons", HttpMethods.DELETE, personMap);
-        personMap = httpCallsServiceOperations.call("persons", HttpMethods.GET, new HashMap<>());
-        persons = (List<Map<String, Object>>) personMap.get("persons");
-        assertEquals(0, persons.size());
-    }
-
-    private static String retrieveId(Map<String, Object> personMap) {
-        return (String) personMap.get("id");
-    }
-
-    private static String retrieveName(Map<String, Object> personMap) {
-        return (String) personMap.get("name");
-    }
-
-    private static String getRandom() {
-        return RandomStringUtils.randomAlphanumeric(4).toLowerCase();
-    }
-
-    private static String getResource(String resourcePath) {
-        return DiscoveredServiceWorkItemHandlerIntegrationTest.class.getResource(resourcePath).getFile();
-    }
-}
diff --git a/kogito-cloud-tests/src/test/resources/logback-test.xml b/kogito-cloud-tests/src/test/resources/logback-test.xml
deleted file mode 100644
index 1d010883b43..00000000000
--- a/kogito-cloud-tests/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="INFO">
-    <appender-ref ref="STDOUT"/>
-  </root>
-</configuration>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/README.md b/kogito-cloud-tests/src/test/resources/services/README.md
deleted file mode 100644
index 1928325c9ee..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Test services
-
-If you want to work on those services, you can work with Maven profile `local`.
-
-Please, update the dependencies versions if needed in `local` profile. 
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/.gitignore b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/.gitignore
deleted file mode 100644
index 0d73459cf99..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/
-/target
-/local
-
-# Eclipse, Netbeans and IntelliJ files
-/.*
-!.gitignore
-/nbproject
-/*.ipr
-/*.iws
-/*.iml
-
-# Repository wide ignore mac DS_Store files
-.DS_Store
-
-# Original jbpm ignores
-*~
-
-# Test info
-/settings*.xml
-/lib-jdbc/
-*.db
-*.tlog
-
-# modules that don't exist in this branch
-/jbpm-human-task-war/
-/jbpm-bam/
-/jbpm-gwt/
-
-# files used for external db testing
-jdbc_driver.jar
-db-settings.xml
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/pom.xml b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/pom.xml
deleted file mode 100644
index 797737d0893..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.kie.kogito.tests</groupId>
-  <artifactId>httpcalls-cloud-workitems-common</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-</project>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCall.java b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCall.java
deleted file mode 100644
index 424cfebf6f2..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-common/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCall.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- * 
- * Licensed 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.
- */
-package org.kie.kogito.cloud.workitems.httpcalls;
-
-import java.util.Map;
-
-/**
- * 
- */
-public class HttpCall {
-
-    private String httpMethod;
-    private String service;
-    private Map<String, Object> data;
-
-    public String getHttpMethod() {
-        return httpMethod;
-    }
-
-    public void setHttpMethod(String httpMethod) {
-        this.httpMethod = httpMethod;
-    }
-
-    public String getService() {
-        return service;
-    }
-
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    public Map<String, Object> getData() {
-        return data;
-    }
-
-    public void setData(Map<String, Object> data) {
-        this.data = data;
-    }
-
-}
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/.gitignore b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/.gitignore
deleted file mode 100644
index 0d73459cf99..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/
-/target
-/local
-
-# Eclipse, Netbeans and IntelliJ files
-/.*
-!.gitignore
-/nbproject
-/*.ipr
-/*.iws
-/*.iml
-
-# Repository wide ignore mac DS_Store files
-.DS_Store
-
-# Original jbpm ignores
-*~
-
-# Test info
-/settings*.xml
-/lib-jdbc/
-*.db
-*.tlog
-
-# modules that don't exist in this branch
-/jbpm-human-task-war/
-/jbpm-bam/
-/jbpm-gwt/
-
-# files used for external db testing
-jdbc_driver.jar
-db-settings.xml
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/pom.xml b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/pom.xml
deleted file mode 100644
index c48a92fcf4f..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.kie.kogito.tests</groupId>
-  <artifactId>httpcalls-cloud-workitems-quarkus-service</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bom</artifactId>
-        <version>${version.io.quarkus}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-jsonb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>drools-core</artifactId>
-    </dependency>
-
-    <!-- include dependencies from kogito-cloud-kubernetes-client and kogito-cloud-workitems 
-      projects here as we are copying directly source code for s2i deployments -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.oracle.substratevm</groupId>
-      <artifactId>svm</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-api</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-maven-plugin</artifactId>
-        <version>${version.io.quarkus}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-
-  <profiles>
-    <profile>
-      <id>native</id>
-      <activation>
-        <property>
-          <name>native</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${version.io.quarkus}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                  <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
-                  <enableJni>true</enableJni>
-                  <enableAllSecurityServices>true</enableAllSecurityServices>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
deleted file mode 100644
index e88717be1bb..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-quarkus-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- * 
- * Licensed 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.
- */
-package org.kie.kogito.cloud.workitems.httpcalls;
-
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.drools.core.process.instance.impl.WorkItemImpl;
-import org.kie.api.runtime.process.WorkItem;
-import org.kie.api.runtime.process.WorkItemManager;
-import org.kie.kogito.cloud.workitems.DiscoveredServiceWorkItemHandler;
-import org.kie.kogito.cloud.workitems.HttpMethods;
-
-@Path("/httpcall")
-public class HttpCallsEndpoint {
-
-    private static final String SERVICE_KEY = "ServiceToCall";
-
-    private String namespace = System.getenv("NAMESPACE");
-
-    DiscoveredServiceWorkItemHandlerImpl workItemHandler = new DiscoveredServiceWorkItemHandlerImpl();
-
-    @POST
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Path("")
-    public Map<String, Object> callServiceForWorkItem(HttpCall httpCallData) {
-        Map<String, Object> params = httpCallData.getData();
-        params.put(SERVICE_KEY, httpCallData.getService());
-
-        return workItemHandler.makeCall(namespace, SERVICE_KEY, HttpMethods.valueOf(httpCallData.getHttpMethod().toUpperCase()), params);
-    }
-
-    static class DiscoveredServiceWorkItemHandlerImpl extends DiscoveredServiceWorkItemHandler {
-
-        @Override
-        public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {}
-
-        @Override
-        public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {}
-
-        public Map<String, Object> makeCall(String namespace, String serviceName, HttpMethods method, Map<String, Object> params) {
-            WorkItem item = new WorkItemImpl();
-            item.getParameters().putAll(params);
-
-            return discoverAndCall(item, namespace, serviceName, method);
-        }
-    }
-}
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/.gitignore b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/.gitignore
deleted file mode 100644
index 0d73459cf99..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/
-/target
-/local
-
-# Eclipse, Netbeans and IntelliJ files
-/.*
-!.gitignore
-/nbproject
-/*.ipr
-/*.iws
-/*.iml
-
-# Repository wide ignore mac DS_Store files
-.DS_Store
-
-# Original jbpm ignores
-*~
-
-# Test info
-/settings*.xml
-/lib-jdbc/
-*.db
-*.tlog
-
-# modules that don't exist in this branch
-/jbpm-human-task-war/
-/jbpm-bam/
-/jbpm-gwt/
-
-# files used for external db testing
-jdbc_driver.jar
-db-settings.xml
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/pom.xml b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/pom.xml
deleted file mode 100644
index ffcd5082762..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.kie.kogito.tests</groupId>
-  <artifactId>httpcalls-cloud-workitems-springboot-service</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${springboot.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-deps-bom</artifactId>
-        <version>${version.org.kie.kogito}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-bom</artifactId>
-        <version>${version.org.kie.kogito}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-      <version>${cxf.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>drools-core</artifactId>
-    </dependency>
-
-    <!-- include dependencies from kogito-cloud-kubernetes-client and kogito-cloud-workitems 
-      projects here as we are copying directly source code for s2i deployments -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.oracle.substratevm</groupId>
-      <artifactId>svm</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-api</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>${springboot.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <mainClass>${start-class}</mainClass>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsApplication.java b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsApplication.java
deleted file mode 100644
index 7c3defa747f..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.kie.kogito.cloud.workitems.httpcalls;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication(scanBasePackages={"org.kie.kogito.**"})
-public class HttpCallsApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(HttpCallsApplication.class, args);
-	}
-
-}
diff --git a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java b/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
deleted file mode 100644
index d3a12bfc557..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/httpcalls-cloud-workitems-springboot-service/src/main/java/org/kie/kogito/cloud/workitems/httpcalls/HttpCallsEndpoint.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- * 
- * Licensed 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.
- */
-package org.kie.kogito.cloud.workitems.httpcalls;
-
-import java.util.Map;
-
-import org.drools.core.process.instance.impl.WorkItemImpl;
-import org.kie.api.runtime.process.WorkItem;
-import org.kie.api.runtime.process.WorkItemManager;
-import org.kie.kogito.cloud.workitems.DiscoveredServiceWorkItemHandler;
-import org.kie.kogito.cloud.workitems.HttpMethods;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/httpcall")
-public class HttpCallsEndpoint {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(HttpCallsEndpoint.class);
-
-    private static final String SERVICE_KEY = "ServiceToCall";
-
-    private String namespace = System.getenv("NAMESPACE");
-
-    DiscoveredServiceWorkItemHandlerImpl workItemHandler = new DiscoveredServiceWorkItemHandlerImpl();
-
-    @PostMapping("")
-    public Map<String, Object> callServiceForWorkItem(@RequestBody HttpCall httpCallData) {
-        LOGGER.info("Got httpcall data {}", httpCallData);
-        Map<String, Object> params = httpCallData.getData();
-        params.put(SERVICE_KEY, httpCallData.getService());
-
-        return workItemHandler.makeCall(namespace, SERVICE_KEY, HttpMethods.valueOf(httpCallData.getHttpMethod().toUpperCase()), params);
-    }
-
-    static class DiscoveredServiceWorkItemHandlerImpl extends DiscoveredServiceWorkItemHandler {
-
-        @Override
-        public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {}
-
-        @Override
-        public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {}
-
-        public Map<String, Object> makeCall(String namespace, String serviceName, HttpMethods method, Map<String, Object> params) {
-            WorkItem item = new WorkItemImpl();
-            item.getParameters().putAll(params);
-
-            return discoverAndCall(item, namespace, serviceName, method);
-        }
-    }
-}
diff --git a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/.gitignore b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/.gitignore
deleted file mode 100644
index 0d73459cf99..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/
-/target
-/local
-
-# Eclipse, Netbeans and IntelliJ files
-/.*
-!.gitignore
-/nbproject
-/*.ipr
-/*.iws
-/*.iml
-
-# Repository wide ignore mac DS_Store files
-.DS_Store
-
-# Original jbpm ignores
-*~
-
-# Test info
-/settings*.xml
-/lib-jdbc/
-*.db
-*.tlog
-
-# modules that don't exist in this branch
-/jbpm-human-task-war/
-/jbpm-bam/
-/jbpm-gwt/
-
-# files used for external db testing
-jdbc_driver.jar
-db-settings.xml
diff --git a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/pom.xml b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/pom.xml
deleted file mode 100644
index 25c80e2c418..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.kie.kogito.tests</groupId>
-  <artifactId>persons-crud-service</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bom</artifactId>
-        <version>${version.io.quarkus}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-jsonb</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-maven-plugin</artifactId>
-        <version>${version.io.quarkus}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>native</id>
-      <activation>
-        <property>
-          <name>native</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-maven-plugin</artifactId>
-            <version>${version.io.quarkus}</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>native-image</goal>
-                </goals>
-                <configuration>
-                  <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
\ No newline at end of file
diff --git a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/Person.java b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/Person.java
deleted file mode 100644
index c240abd8ba9..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/Person.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- * 
- * Licensed 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.
- */
-package org.kie.kogito.cloud.persons;
-
-public class Person {
-
-    private String id;
-    private String name;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-}
diff --git a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/PersonEndpoint.java b/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/PersonEndpoint.java
deleted file mode 100644
index fc5824f4b95..00000000000
--- a/kogito-cloud-tests/src/test/resources/services/persons-crud-service/src/main/java/org/kie/kogito/cloud/persons/PersonEndpoint.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- * 
- * Licensed 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.
- */
-package org.kie.kogito.cloud.persons;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-@Path("/persons")
-public class PersonEndpoint {
-
-    private List<Person> persons = new ArrayList<>();
-
-    @GET
-    @Produces(MediaType.APPLICATION_JSON)
-    @Path("")
-    public Map<String, List<Person>> getAll() {
-        Map<String, List<Person>> map = new HashMap<>();
-        map.put("persons", persons);
-        return map;
-    }
-
-    @POST
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Path("")
-    public Person createPerson(Person person) {
-        person.setId(UUID.randomUUID().toString());
-        persons.add(person);
-        return person;
-    }
-
-    @PUT
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Path("")
-    public Person updatePerson(Person person) {
-        findPerson(person.getId()).ifPresent(persons::remove);
-        persons.add(person);
-        return person;
-    }
-
-    @DELETE
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Path("")
-    public Person deletePerson(Person person) {
-        findPerson(person.getId()).ifPresent(persons::remove);
-
-        // Return person with no id, meaning it is unregistered  
-        person.setId(null);
-        return person;
-    }
-
-    private Optional<Person> findPerson(String id) {
-        return persons.stream().filter(p -> p.getId().equals(id)).findFirst();
-    }
-}
diff --git a/pom.xml b/pom.xml
index c79571a3c57..ab2c035299c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,6 @@
 
   <modules>
     <module>kogito-cloud-services</module>
-    <module>kogito-cloud-tests</module>
   </modules>
 
   <dependencyManagement>

From fcf4e194a4e83ba00d80f9782c8b27b2c761c3e4 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 4 Mar 2020 11:33:41 -0300
Subject: [PATCH 095/709] [KOGITO-771] - Upgrade GraalVM to 19.3.1 (#96)

Signed-off-by: spolti <fspolti@redhat.com>
---
 s2i/kogito-data-index-overrides.yaml          |  2 +-
 s2i/kogito-jobs-service-overrides.yaml        |  2 +-
 s2i/kogito-quarkus-jvm-overrides.yaml         |  2 +-
 s2i/kogito-quarkus-overrides.yaml             |  2 +-
 s2i/kogito-quarkus-s2i-overrides.yaml         |  2 +-
 s2i/modules/kogito-data-index/module.yaml     |  4 +--
 .../kogito-graalvm-installer/19.x/configure   |  4 +--
 .../kogito-graalvm-installer/19.x/module.yaml | 16 ++++-----
 s2i/modules/kogito-graalvm-scripts/configure  |  2 +-
 .../kogito-graalvm-scripts/module.yaml        |  2 +-
 s2i/modules/kogito-jobs-service/module.yaml   |  4 +--
 s2i/modules/kogito-s2i-core/added/s2i-core    |  6 ++--
 .../features/kogito-quarkus-ubi8-s2i.feature  | 33 ++++++++++---------
 .../kogito-springboot-ubi8-s2i.feature        | 14 ++++----
 s2i/tests/test-apps/clone-repo.sh             |  4 +--
 15 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/s2i/kogito-data-index-overrides.yaml b/s2i/kogito-data-index-overrides.yaml
index a3bfe932f29..7017e476683 100644
--- a/s2i/kogito-data-index-overrides.yaml
+++ b/s2i/kogito-data-index-overrides.yaml
@@ -27,7 +27,7 @@ modules:
   - name: org.kie.kogito.dataindex
 
 run:
-  workdir: "/home/kogito/"
+  workdir: "/home/kogito"
   user: 1001
   cmd:
     - "/home/kogito/kogito-app-launch.sh"
diff --git a/s2i/kogito-jobs-service-overrides.yaml b/s2i/kogito-jobs-service-overrides.yaml
index ed819bd535c..dd9ba6d3eb7 100644
--- a/s2i/kogito-jobs-service-overrides.yaml
+++ b/s2i/kogito-jobs-service-overrides.yaml
@@ -41,7 +41,7 @@ modules:
   - name: org.kie.kogito.jobs.service
 
 run:
-  workdir: "/home/kogito/"
+  workdir: "/home/kogito"
   user: 1001
   cmd:
     - "/home/kogito/kogito-app-launch.sh"
diff --git a/s2i/kogito-quarkus-jvm-overrides.yaml b/s2i/kogito-quarkus-jvm-overrides.yaml
index 3f90c054d67..9075353dabb 100644
--- a/s2i/kogito-quarkus-jvm-overrides.yaml
+++ b/s2i/kogito-quarkus-jvm-overrides.yaml
@@ -34,5 +34,5 @@ modules:
 ## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/drools-quarkus-example
 run:
-  workdir: "/home/kogito/"
+  workdir: "/home/kogito"
 
diff --git a/s2i/kogito-quarkus-overrides.yaml b/s2i/kogito-quarkus-overrides.yaml
index 899325ad5a2..f0cc0f92301 100644
--- a/s2i/kogito-quarkus-overrides.yaml
+++ b/s2i/kogito-quarkus-overrides.yaml
@@ -26,7 +26,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.graalvm.installer
-    version: "19.2.1"
+    version: "19.3.1"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.quarkus
 
diff --git a/s2i/kogito-quarkus-s2i-overrides.yaml b/s2i/kogito-quarkus-s2i-overrides.yaml
index c93a0890e55..7cdfe1c786a 100644
--- a/s2i/kogito-quarkus-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-s2i-overrides.yaml
@@ -31,7 +31,7 @@ modules:
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "19.2.1"
+    version: "19.3.1"
   - name: org.kie.kogito.graalvm.scripts
   - name: org.kie.kogito.openjdk
     version: "1.8.0"
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index c2e7d7a3bfa..f64e6949bcc 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -4,8 +4,8 @@ version: "0.8.0-rc1"
 
 artifacts:
 - name: kogito-data-index-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200210.211020-160-runner.jar
-  md5: e0896b4048f250ada3589a91c9b2c8e1
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200302.162816-169-runner.jar
+  md5: 5681ca446b84148168c2f575574035cf
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-graalvm-installer/19.x/configure b/s2i/modules/kogito-graalvm-installer/19.x/configure
index 715d79ed616..490ae87e113 100644
--- a/s2i/modules/kogito-graalvm-installer/19.x/configure
+++ b/s2i/modules/kogito-graalvm-installer/19.x/configure
@@ -4,8 +4,8 @@ set -e
 SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname $0)
 
-tar xzf ${SOURCES_DIR}/graalvm-ce-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-${GRAALVM_VERSION} /usr/share/graalvm
+tar xzf ${SOURCES_DIR}/graalvm-ce-java8-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-java8-${GRAALVM_VERSION} /usr/share/graalvm
 
 #KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
 mkdir -p $KOGITO_HOME/ssl-libs
diff --git a/s2i/modules/kogito-graalvm-installer/19.x/module.yaml b/s2i/modules/kogito-graalvm-installer/19.x/module.yaml
index 2829a31d358..f877a9874de 100644
--- a/s2i/modules/kogito-graalvm-installer/19.x/module.yaml
+++ b/s2i/modules/kogito-graalvm-installer/19.x/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "19.2.1"
+version: "19.3.1"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,15 +9,15 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "19.2.1"
+    value: "19.3.1"
 
 artifacts:
-- name: graalvm-ce-linux-amd64-19.2.1.tar.gz
-  url: https://github.com/oracle/graal/releases/download/vm-19.2.1/graalvm-ce-linux-amd64-19.2.1.tar.gz
-  md5: 30a33f6c66ff05e324ec348f62358abb
-- name: native-image-installable-svm-linux-amd64-19.2.1.jar
-  url: https://github.com/oracle/graal/releases/download/vm-19.2.1/native-image-installable-svm-linux-amd64-19.2.1.jar
-  md5: 98d19c4d01d0a3c5b622638ac17ac1b8
+- name: graalvm-ce-java8-linux-amd64-19.3.1.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.1/graalvm-ce-java8-linux-amd64-19.3.1.tar.gz
+  md5: dbd66c43fd7c1e13702ec72b3638f49b
+- name: native-image-installable-svm-java8-linux-amd64-19.3.1.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.1/native-image-installable-svm-java8-linux-amd64-19.3.1.jar
+  md5: 495fbab410664f8c070d86f2bef4ecaa
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-graalvm-scripts/configure b/s2i/modules/kogito-graalvm-scripts/configure
index 74fa893d2e2..22934123a74 100644
--- a/s2i/modules/kogito-graalvm-scripts/configure
+++ b/s2i/modules/kogito-graalvm-scripts/configure
@@ -6,4 +6,4 @@ SCRIPT_DIR=$(dirname $0)
 
 cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
 
-/usr/share/graalvm/bin/gu -L install ${SOURCES_DIR}/native-image-installable-svm-linux-amd64-${GRAALVM_VERSION}.jar
+/usr/share/graalvm/bin/gu -L install ${SOURCES_DIR}/native-image-installable-svm-java8-linux-amd64-${GRAALVM_VERSION}.jar
diff --git a/s2i/modules/kogito-graalvm-scripts/module.yaml b/s2i/modules/kogito-graalvm-scripts/module.yaml
index 1124674e392..0e735b75c0b 100644
--- a/s2i/modules/kogito-graalvm-scripts/module.yaml
+++ b/s2i/modules/kogito-graalvm-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
-version: "19.2.1"
+version: "19.3.1"
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
index 923dd1623fa..2cb62fd2fc8 100644
--- a/s2i/modules/kogito-jobs-service/module.yaml
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "0.8.0-rc1"
 
 artifacts:
 - name: kogito-jobs-service-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200210.210529-85-runner.jar
-  md5: d0da24b615d2a6cdd99e40379d1ba6fa
+  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200302.162543-94-runner.jar
+  md5: b04c103576aea03a94c287712d2552d9
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-s2i-core/added/s2i-core b/s2i/modules/kogito-s2i-core/added/s2i-core
index 8c59fe76bbb..23064ae96ca 100644
--- a/s2i/modules/kogito-s2i-core/added/s2i-core
+++ b/s2i/modules/kogito-s2i-core/added/s2i-core
@@ -120,9 +120,9 @@ function copy_kogito_app() {
         # handle quarkus java build
         if ls $artifactDir/*-runner.jar 1> /dev/null 2>&1; then
             echo "---> Installing jar file"
-            cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin/
+            cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin
             echo "---> Copying application libraries"
-            cp -r $artifactDir/lib/ $KOGITO_HOME/bin/
+            cp -r $artifactDir/lib/ $KOGITO_HOME/bin
         fi
 
     elif ls $artifactDir/*-runner 1> /dev/null 2>&1; then
@@ -132,7 +132,7 @@ function copy_kogito_app() {
         chmod +x $KOGITO_HOME/bin/*-runner
 
     else
-        # handle non default java builds
+        # handle normal java builds
         echo "---> Installing application binaries"
         cp -v $artifactDir/*.jar $KOGITO_HOME/bin
     fi
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 79d1a4922e1..2178fc0ac41 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -1,22 +1,23 @@
 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i
 Feature: kogito-quarkus-ubi8-s2i image tests
+
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value                     |
-      | LIMIT_MEMORY   | 2147483648                |
+      | LIMIT_MEMORY   | 3221225472                |
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.7.0-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
-    And s2i build log should contain -J-Xmx1717986918
+    And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -26,12 +27,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.7.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -40,23 +41,23 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.7.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value |
       | NATIVE            | false   |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/jbpm-quarkus-example-0.7.0-runner.jar should exist
+    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
-    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for cd35391d447a67062c3914965254ebd2
-    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 318830fd04bce5b0f2a4727e001dbc21
+    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
+    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
 
     Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | ARTIFACT_DIR      | drools-quarkus-example/target   |
@@ -67,7 +68,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.7.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
 
   Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.7.0
@@ -104,10 +105,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.0
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.1
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index e41709387c2..da540420939 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,7 +3,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.7.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -12,12 +12,12 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.7.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.7.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value                           |
       | JAVA_OPTIONS        | -Ddebug=true                    |
       | ARTIFACT_DIR        | jbpm-springboot-example/target   |
@@ -28,23 +28,23 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.7.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.7.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.7.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.7.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index 92c642dfd0c..ebd3e2b8337 100755
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -7,8 +7,8 @@ cd /tmp
 rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
-git fetch origin --tags
-git checkout -b 0.7.0 0.7.0
+#git fetch origin --tags
+#git checkout -b 0.7.0 0.7.0
 
 # by adding the application.properties file telling quarkus to start on
 # port 10000, the purpose of this tests is make sure that the images

From 7cb0d2055cb1597d7c165bdc5c7fb25afb62239a Mon Sep 17 00:00:00 2001
From: Cristiano Nicolai <cristiano.nicolai@gmail.com>
Date: Sat, 7 Mar 2020 01:20:03 +1000
Subject: [PATCH 096/709] KOGITO-1362 - Missing POM properties and JAR sources
 (#98)

---
 pom.xml | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 136 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab2c035299c..97dd9f78ade 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -13,9 +13,25 @@
   <name>Kogito Cloud</name>
   <description>Kogito Cloud</description>
 
+  <url>http://kogito.kie.org</url>
+  <inceptionYear>2019</inceptionYear>
+  <organization>
+    <name>JBoss by Red Hat</name>
+    <url>http://www.jboss.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <version.source.plugin>3.0.1</version.source.plugin>
+    <version.jar.plugin>3.1.0</version.jar.plugin>
   </properties>
 
   <!-- distributionManagement section -->
@@ -57,6 +73,13 @@
     <url>https://github.com/kiegroup/kogito-cloud</url>
   </scm>
 
+  <developers>
+    <developer>
+      <name>All developers are listed on the team website</name>
+      <url>http://kogito.kie.org/community/team.html</url>
+    </developer>
+  </developers>
+
   <modules>
     <module>kogito-cloud-services</module>
   </modules>
@@ -72,4 +95,114 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <!-- Packaging -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${version.jar.plugin}</version>
+          <executions>
+            <execution>
+              <id>default-jar</id>
+              <configuration>
+                <archive>
+                  <manifestEntries combine.children="append">
+                    <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
+                  </manifestEntries>
+                </archive>
+              </configuration>
+            </execution>
+            <!-- No OSGi manifestEntries for <goal>jar</goal>: if it supported, then felix has already added them -->
+            <execution>
+              <id>test-jar</id>
+              <goals>
+                <goal>test-jar</goal>
+              </goals>
+              <configuration>
+                <skipIfEmpty>true</skipIfEmpty>
+                <excludes>
+                  <exclude>**/logback-test.xml</exclude>
+                  <exclude>**/jndi.properties</exclude>
+                </excludes>
+                <archive>
+                  <manifestEntries>
+                    <Bundle-SymbolicName>${java.module.name}.tests</Bundle-SymbolicName>
+                    <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}</Bundle-Version>
+                    <Bundle-Name>${project.name}</Bundle-Name>
+                    <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
+                  </manifestEntries>
+                </archive>
+              </configuration>
+            </execution>
+          </executions>
+          <configuration>
+            <archive>
+              <manifest>
+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              </manifest>
+            </archive>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>${version.source.plugin}</version>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+              <configuration>
+                <archive>
+                  <manifestEntries>
+                    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                    <Bundle-SymbolicName>${java.module.name}.source</Bundle-SymbolicName>
+                    <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}</Bundle-Version>
+                    <Bundle-Name>${project.name}</Bundle-Name>
+                    <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
+                    <Eclipse-SourceBundle>${java.module.name};version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}";roots:="."</Eclipse-SourceBundle>
+                  </manifestEntries>
+                </archive>
+              </configuration>
+            </execution>
+            <execution>
+              <id>attach-test-sources</id>
+              <goals>
+                <goal>test-jar-no-fork</goal>
+              </goals>
+              <configuration>
+                <archive>
+                  <manifestEntries>
+                    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                    <Bundle-SymbolicName>${java.module.name}.tests.source</Bundle-SymbolicName>
+                    <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}</Bundle-Version>
+                    <Bundle-Name>${project.name}</Bundle-Name>
+                    <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
+                    <Eclipse-SourceBundle>${java.module.name}.tests;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}";roots:="."</Eclipse-SourceBundle>
+                  </manifestEntries>
+                </archive>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <!-- Entry needed to create test-jars even for packaging types war, bundle, ... -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <!-- Entry needed to create, install and deploy sources jars -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>

From eaee159bc7a2de103d66a72b984c22558544d3d3 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 9 Mar 2020 12:27:55 -0300
Subject: [PATCH 097/709] [KOGITO-842] - Operator: jbpm-quarkus-example not
 starting after native build due to missing protobuf files (#99)

Signed-off-by: spolti <fspolti@redhat.com>
---
 s2i/kogito-quarkus-s2i-overrides.yaml           |  2 ++
 .../kogito-graalvm-installer/19.x/configure     |  1 +
 .../features/kogito-quarkus-ubi8-s2i.feature    | 17 ++++++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/s2i/kogito-quarkus-s2i-overrides.yaml b/s2i/kogito-quarkus-s2i-overrides.yaml
index 7cdfe1c786a..ef8f723ccd1 100644
--- a/s2i/kogito-quarkus-s2i-overrides.yaml
+++ b/s2i/kogito-quarkus-s2i-overrides.yaml
@@ -44,5 +44,7 @@ packages:
   install:
   - bc
   - gcc
+  - gcc-c++
   - glibc-devel
   - zlib-devel
+
diff --git a/s2i/modules/kogito-graalvm-installer/19.x/configure b/s2i/modules/kogito-graalvm-installer/19.x/configure
index 490ae87e113..a7ca3ed90db 100644
--- a/s2i/modules/kogito-graalvm-installer/19.x/configure
+++ b/s2i/modules/kogito-graalvm-installer/19.x/configure
@@ -11,3 +11,4 @@ mv /usr/share/graalvm-ce-java8-${GRAALVM_VERSION} /usr/share/graalvm
 mkdir -p $KOGITO_HOME/ssl-libs
 cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/ssl-libs
 cp -v $GRAALVM_HOME/jre/lib/security/cacerts $KOGITO_HOME/
+
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 2178fc0ac41..90e12515382 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -45,8 +45,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable          | value |
-      | NATIVE            | false   |
+      | variable          | value         |
+      | NATIVE            | false         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
     Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
@@ -55,8 +55,19 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
+  Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable          | value         |
+      | NATIVE            | true          |
+      | MAVEN_ARGS_APPEND | -Ppersistence |
+    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+    And s2i build log should contain ---> [persistence] generating md5 for persistence files
+    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
+    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
-    Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
+  Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |

From d199339e3ea584855e286cdda1cf3f300e0295dd Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Mon, 9 Mar 2020 19:37:09 +0100
Subject: [PATCH 098/709] [KOGITO-1377] Enable batch mode for S2I build (#100)

Signed-off-by: Karel Suta <ksuta@redhat.com>
---
 s2i/modules/kogito-s2i-core/added/s2i-core | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/s2i/modules/kogito-s2i-core/added/s2i-core b/s2i/modules/kogito-s2i-core/added/s2i-core
index 23064ae96ca..79f689ff521 100644
--- a/s2i/modules/kogito-s2i-core/added/s2i-core
+++ b/s2i/modules/kogito-s2i-core/added/s2i-core
@@ -78,6 +78,10 @@ function build_kogito_app() {
         nativeBuild=""
     fi
 
+    if [ "${SCRIPT_DEBUG}" != "true" ]; then
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --batch-mode"
+    fi
+
     if [ -f "pom.xml" ]; then
 
         echo "---> Building application from source..."

From c83e969baa7bd02a121ca459f1003573af2dbd7c Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 10 Mar 2020 17:08:50 -0300
Subject: [PATCH 099/709] [KOGITO-1286] - Upgrade Git Hub actions/checkout@v1
 to v2 (#103)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .github/workflows/validate-imagestreams.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/validate-imagestreams.yml b/.github/workflows/validate-imagestreams.yml
index 99f7faec7e8..1290f79f0bd 100644
--- a/.github/workflows/validate-imagestreams.yml
+++ b/.github/workflows/validate-imagestreams.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Download openshift-validator-tool
         run: |
           wget https://github.com/jboss-container-images/jboss-kie-modules/raw/master/tools/openshift-template-validator/openshift-template-validator-linux-amd64

From 84d9aa8ff96655970e3c4999aff33e8f8d72be91 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 12 Mar 2020 11:26:27 -0300
Subject: [PATCH 100/709] [KOGITO-1409] - Prepare Kogito images for release
 0.8.0 (#104)

Signed-off-by: spolti <fspolti@redhat.com>
---
 s2i/image.yaml                                |  2 +-
 s2i/kogito-imagestream.yaml                   | 42 +++++++++----------
 s2i/modules/kogito-data-index/module.yaml     |  6 +--
 .../kogito-image-dependencies/module.yaml     |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 s2i/modules/kogito-jobs-service/module.yaml   |  6 +--
 s2i/modules/kogito-jq/module.yaml             |  2 +-
 .../kogito-kubernetes-client/module.yaml      |  2 +-
 s2i/modules/kogito-launch-scripts/module.yaml |  2 +-
 s2i/modules/kogito-logging/module.yaml        |  2 +-
 s2i/modules/kogito-persistence/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-jvm/module.yaml    |  2 +-
 s2i/modules/kogito-quarkus-s2i/module.yaml    |  4 +-
 s2i/modules/kogito-quarkus/module.yaml        |  2 +-
 s2i/modules/kogito-s2i-core/module.yaml       |  2 +-
 s2i/modules/kogito-springboot-s2i/module.yaml |  4 +-
 s2i/modules/kogito-springboot/module.yaml     |  2 +-
 s2i/modules/kogito-system-user/module.yaml    |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 26 ++++++------
 .../kogito-springboot-ubi8-s2i.feature        | 14 +++----
 s2i/tests/test-apps/clone-repo.sh             |  4 +-
 21 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index 078149a34a4..6702f455990 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.8.0-rc1"
+version: "0.8.0"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 9fda04ce261..9d36f99da81 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0-rc1'
+        - name: '0.8.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.8.0-rc1'
+            version: '0.8.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.8.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.8.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0-rc1'
+        - name: '0.8.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.8.0-rc1'
+            version: '0.8.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.8.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.8.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0-rc1'
+        - name: '0.8.0'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.8.0-rc1'
+            version: '0.8.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.8.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.8.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0-rc1'
+        - name: '0.8.0'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.8.0-rc1'
+            version: '0.8.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.8.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.8.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0-rc1'
+        - name: '0.8.0'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.8.0-rc1'
+            version: '0.8.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.8.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.8.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0-rc1'
+        - name: '0.8.0'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: infinispan, persitence
-            version: '0.8.0-rc1'
+            version: '0.8.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.8.0-rc1
+            name: quay.io/kiegroup/kogito-data-index:0.8.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,15 +141,15 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0-rc1'
+        - name: '0.8.0'
           annotations:
             description: Runtime image for the Kogito Jobs Service - Tech preview
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.8.0-rc1'
+            version: '0.8.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.8.0-rc1
\ No newline at end of file
+            name: quay.io/kiegroup/kogito-jobs-service:0.8.0
\ No newline at end of file
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index f64e6949bcc..b9cbb8f2af3 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 artifacts:
 - name: kogito-data-index-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200302.162816-169-runner.jar
-  md5: 5681ca446b84148168c2f575574035cf
+  url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.8.0/data-index-service-0.8.0-runner.jar
+  md5: 2b50f0612b444c68fbfda4761096a3a8
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-image-dependencies/module.yaml b/s2i/modules/kogito-image-dependencies/module.yaml
index de074409451..f73eb5e8dbb 100644
--- a/s2i/modules/kogito-image-dependencies/module.yaml
+++ b/s2i/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.8.0-rc1"
+version: "0.8.0"
 description: holds common dependencies across images
 
 execute:
diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/s2i/modules/kogito-infinispan-properties/module.yaml
index 0ba4808a969..1e66e7b7d59 100644
--- a/s2i/modules/kogito-infinispan-properties/module.yaml
+++ b/s2i/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
index 2cb62fd2fc8..76cffcc07fe 100644
--- a/s2i/modules/kogito-jobs-service/module.yaml
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 artifacts:
 - name: kogito-jobs-service-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200302.162543-94-runner.jar
-  md5: b04c103576aea03a94c287712d2552d9
+  url: https://repository.jboss.org/org/kie/kogito/jobs-service/0.8.0/jobs-service-0.8.0-runner.jar
+  md5: 806d85e037d0dc58440a5b8dbdada4b1
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-jq/module.yaml b/s2i/modules/kogito-jq/module.yaml
index a7a9c04779e..0bb88a18f24 100644
--- a/s2i/modules/kogito-jq/module.yaml
+++ b/s2i/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 modules:
     install:
diff --git a/s2i/modules/kogito-kubernetes-client/module.yaml b/s2i/modules/kogito-kubernetes-client/module.yaml
index 413cc478bcd..043bef9baa2 100644
--- a/s2i/modules/kogito-kubernetes-client/module.yaml
+++ b/s2i/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-launch-scripts/module.yaml b/s2i/modules/kogito-launch-scripts/module.yaml
index ce3de8fc4a0..d1051de23e3 100644
--- a/s2i/modules/kogito-launch-scripts/module.yaml
+++ b/s2i/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-logging/module.yaml b/s2i/modules/kogito-logging/module.yaml
index 685670953ad..94a192917c6 100644
--- a/s2i/modules/kogito-logging/module.yaml
+++ b/s2i/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/s2i/modules/kogito-persistence/module.yaml b/s2i/modules/kogito-persistence/module.yaml
index 538a44ed465..ac392ce18ad 100644
--- a/s2i/modules/kogito-persistence/module.yaml
+++ b/s2i/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 modules:
     install:
diff --git a/s2i/modules/kogito-quarkus-jvm/module.yaml b/s2i/modules/kogito-quarkus-jvm/module.yaml
index 03c47ab47d5..9a3f34f4d4d 100644
--- a/s2i/modules/kogito-quarkus-jvm/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-quarkus-s2i/module.yaml b/s2i/modules/kogito-quarkus-s2i/module.yaml
index 868b44db4bf..52a7154ede5 100644
--- a/s2i/modules/kogito-quarkus-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.8.0-rc1"
\ No newline at end of file
+  value: "0.8.0"
\ No newline at end of file
diff --git a/s2i/modules/kogito-quarkus/module.yaml b/s2i/modules/kogito-quarkus/module.yaml
index a280ed590d5..96efe6345d6 100644
--- a/s2i/modules/kogito-quarkus/module.yaml
+++ b/s2i/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 execute:
 - script: configure
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml
index 3e983b5ad35..a7610664a8a 100644
--- a/s2i/modules/kogito-s2i-core/module.yaml
+++ b/s2i/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.8.0-rc1'
+version: '0.8.0'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/s2i/modules/kogito-springboot-s2i/module.yaml b/s2i/modules/kogito-springboot-s2i/module.yaml
index 4658fdc4788..1e26092433e 100644
--- a/s2i/modules/kogito-springboot-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 execute:
   - script: configure
 
 envs:
 - name: "KOGITO_VERSION"
-  value: "0.8.0-rc1"
\ No newline at end of file
+  value: "0.8.0"
\ No newline at end of file
diff --git a/s2i/modules/kogito-springboot/module.yaml b/s2i/modules/kogito-springboot/module.yaml
index 3b8496cf781..1ffc290c2ff 100644
--- a/s2i/modules/kogito-springboot/module.yaml
+++ b/s2i/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-system-user/module.yaml b/s2i/modules/kogito-system-user/module.yaml
index a4135b47f1d..3c15916fa84 100644
--- a/s2i/modules/kogito-system-user/module.yaml
+++ b/s2i/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.8.0-rc1"
+version: "0.8.0"
 
 execute:
 - script: add-user
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index 90e12515382..e539ed74576 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value                     |
       | LIMIT_MEMORY   | 3221225472                |
     Then check that page is served
@@ -11,13 +11,13 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.8.0-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -27,12 +27,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.8.0-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -41,14 +41,14 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.8.0-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value         |
       | NATIVE            | false         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    Then file /home/kogito/bin/jbpm-quarkus-example-0.8.0-runner.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
@@ -56,11 +56,11 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-stubi8:latest
       | variable          | value         |
       | NATIVE            | true          |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    Then file /home/kogito/bin/jbpm-quarkus-example-0.8.0-runner should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
@@ -68,7 +68,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | ARTIFACT_DIR      | drools-quarkus-example/target   |
@@ -79,7 +79,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-0.8.0-runner.jar should exist
 
   Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.7.0
@@ -119,7 +119,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index da540420939..81345cb2a2d 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,7 +3,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -12,12 +12,12 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.8.0.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.8.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value                           |
       | JAVA_OPTIONS        | -Ddebug=true                    |
       | ARTIFACT_DIR        | jbpm-springboot-example/target   |
@@ -28,23 +28,23 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.8.0.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.8.0
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-0.8.0.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.8.0
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index ebd3e2b8337..8d0cae65393 100755
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -7,8 +7,8 @@ cd /tmp
 rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
-#git fetch origin --tags
-#git checkout -b 0.7.0 0.7.0
+git fetch origin --tags
+git checkout -b 0.8.0 0.8.0
 
 # by adding the application.properties file telling quarkus to start on
 # port 10000, the purpose of this tests is make sure that the images

From 38c946feccfe776aae6e5cf107ced8dd437d2faa Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 13 Mar 2020 11:40:25 -0300
Subject: [PATCH 101/709] [KOGITO-1434] - Prepare Kogito images for next
 release 0.9.0 (#106)

Signed-off-by: spolti <fspolti@redhat.com>
---
 s2i/image.yaml                                | 22 +++++-----
 s2i/kogito-imagestream.yaml                   | 42 +++++++++----------
 s2i/modules/kogito-data-index/module.yaml     | 10 ++---
 .../kogito-image-dependencies/module.yaml     |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  4 +-
 s2i/modules/kogito-jobs-service/module.yaml   | 10 ++---
 s2i/modules/kogito-jq/module.yaml             |  4 +-
 .../kogito-kubernetes-client/module.yaml      |  8 ++--
 s2i/modules/kogito-launch-scripts/module.yaml |  4 +-
 s2i/modules/kogito-logging/module.yaml        |  4 +-
 s2i/modules/kogito-persistence/module.yaml    |  6 +--
 s2i/modules/kogito-quarkus-jvm/module.yaml    |  4 +-
 s2i/modules/kogito-quarkus-s2i/module.yaml    |  6 +--
 s2i/modules/kogito-quarkus/module.yaml        |  4 +-
 s2i/modules/kogito-s2i-core/module.yaml       | 23 ++++------
 s2i/modules/kogito-springboot-s2i/module.yaml |  6 +--
 s2i/modules/kogito-springboot/module.yaml     |  2 +-
 s2i/modules/kogito-system-user/module.yaml    | 12 +++---
 .../features/kogito-quarkus-ubi8-s2i.feature  | 30 ++++++-------
 .../kogito-springboot-ubi8-s2i.feature        | 14 +++----
 s2i/tests/test-apps/clone-repo.sh             |  4 +-
 21 files changed, 107 insertions(+), 114 deletions(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index 6702f455990..585c8a2b7d4 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -1,25 +1,25 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.8.0"
+version: "0.9.0-rc1"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
 from: "registry.redhat.io/ubi8/ubi-minimal:8.0"
 
 labels:
-- name: "maintainer"
-  value: "kogito <kogito@kiegroup.com>"
-- name: "io.openshift.s2i.scripts-url"
-  value: "image:///usr/local/s2i"
-- name: "io.openshift.s2i.destination"
-  value: "/tmp"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <kogito@kiegroup.com>"
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 modules:
   repositories:
-  - path: modules
+    - path: modules
 
 packages:
   manager: microdnf
@@ -27,4 +27,4 @@ packages:
 run:
   user: 1001
   cmd:
-  - "/usr/local/s2i/run"
+    - "/usr/local/s2i/run"
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 9d36f99da81..56b9b06ec02 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0'
+        - name: '0.9.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.8.0'
+            version: '0.9.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.8.0
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.9.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0'
+        - name: '0.9.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.8.0'
+            version: '0.9.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.8.0
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.9.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0'
+        - name: '0.9.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.8.0'
+            version: '0.9.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.8.0
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.9.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0'
+        - name: '0.9.0-rc1'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.8.0'
+            version: '0.9.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.8.0
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.9.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0'
+        - name: '0.9.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.8.0'
+            version: '0.9.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.8.0
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.9.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0'
+        - name: '0.9.0-rc1'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: infinispan, persitence
-            version: '0.8.0'
+            version: '0.9.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.8.0
+            name: quay.io/kiegroup/kogito-data-index:0.9.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,15 +141,15 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.8.0'
+        - name: '0.9.0-rc1'
           annotations:
             description: Runtime image for the Kogito Jobs Service - Tech preview
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.8.0'
+            version: '0.9.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.8.0
\ No newline at end of file
+            name: quay.io/kiegroup/kogito-jobs-service:0.9.0-rc1
diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml
index b9cbb8f2af3..c5fc8676793 100644
--- a/s2i/modules/kogito-data-index/module.yaml
+++ b/s2i/modules/kogito-data-index/module.yaml
@@ -1,12 +1,12 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 artifacts:
-- name: kogito-data-index-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.8.0/data-index-service-0.8.0-runner.jar
-  md5: 2b50f0612b444c68fbfda4761096a3a8
+  - name: kogito-data-index-runner.jar
+    url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200312.091238-181-runner.jar
+    md5: 9128f6e8ec92aa1d3d1686e7bc7325c0
 
 execute:
-- script: configure
+  - script: configure
 
diff --git a/s2i/modules/kogito-image-dependencies/module.yaml b/s2i/modules/kogito-image-dependencies/module.yaml
index f73eb5e8dbb..a1f2f3bb6e6 100644
--- a/s2i/modules/kogito-image-dependencies/module.yaml
+++ b/s2i/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.8.0"
+version: "0.9.0-rc1"
 description: holds common dependencies across images
 
 execute:
diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/s2i/modules/kogito-infinispan-properties/module.yaml
index 1e66e7b7d59..96a7ed97387 100644
--- a/s2i/modules/kogito-infinispan-properties/module.yaml
+++ b/s2i/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
@@ -20,4 +20,4 @@ envs:
     description: "Sasl mechanism to use during authentication. Example: PLAIN (Used to set the infinispan.client.hotrod.sasl_mechanism system property)"
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml
index 76cffcc07fe..87d83bfa075 100644
--- a/s2i/modules/kogito-jobs-service/module.yaml
+++ b/s2i/modules/kogito-jobs-service/module.yaml
@@ -1,12 +1,12 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 artifacts:
-- name: kogito-jobs-service-runner.jar
-  url: https://repository.jboss.org/org/kie/kogito/jobs-service/0.8.0/jobs-service-0.8.0-runner.jar
-  md5: 806d85e037d0dc58440a5b8dbdada4b1
+  - name: kogito-jobs-service-runner.jar
+    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200312.090922-105-runner.jar
+    md5: 098e6471f1a6d151fbb9f5e4f4422b16
 
 execute:
-- script: configure
+  - script: configure
 
diff --git a/s2i/modules/kogito-jq/module.yaml b/s2i/modules/kogito-jq/module.yaml
index 0bb88a18f24..066757d7c90 100644
--- a/s2i/modules/kogito-jq/module.yaml
+++ b/s2i/modules/kogito-jq/module.yaml
@@ -1,9 +1,9 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 modules:
-    install:
+  install:
     - name: org.kie.kogito.epel
       version: "7"
 
diff --git a/s2i/modules/kogito-kubernetes-client/module.yaml b/s2i/modules/kogito-kubernetes-client/module.yaml
index 043bef9baa2..afb1a9e1464 100644
--- a/s2i/modules/kogito-kubernetes-client/module.yaml
+++ b/s2i/modules/kogito-kubernetes-client/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 execute:
-- script: configure
+  - script: configure
 
 modules:
-    install:
-    - name: org.kie.kogito.jq
\ No newline at end of file
+  install:
+    - name: org.kie.kogito.jq
diff --git a/s2i/modules/kogito-launch-scripts/module.yaml b/s2i/modules/kogito-launch-scripts/module.yaml
index d1051de23e3..7829d3e7e11 100644
--- a/s2i/modules/kogito-launch-scripts/module.yaml
+++ b/s2i/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 execute:
-  - script: configure
\ No newline at end of file
+  - script: configure
diff --git a/s2i/modules/kogito-logging/module.yaml b/s2i/modules/kogito-logging/module.yaml
index 94a192917c6..0758c1d5125 100644
--- a/s2i/modules/kogito-logging/module.yaml
+++ b/s2i/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/s2i/modules/kogito-persistence/module.yaml b/s2i/modules/kogito-persistence/module.yaml
index ac392ce18ad..f1917387b8f 100644
--- a/s2i/modules/kogito-persistence/module.yaml
+++ b/s2i/modules/kogito-persistence/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 modules:
-    install:
+  install:
     - name: org.kie.kogito.kubernetes.client
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/s2i/modules/kogito-quarkus-jvm/module.yaml b/s2i/modules/kogito-quarkus-jvm/module.yaml
index 9a3f34f4d4d..ef9044f84e8 100644
--- a/s2i/modules/kogito-quarkus-jvm/module.yaml
+++ b/s2i/modules/kogito-quarkus-jvm/module.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 execute:
-- script: configure
+  - script: configure
 
diff --git a/s2i/modules/kogito-quarkus-s2i/module.yaml b/s2i/modules/kogito-quarkus-s2i/module.yaml
index 52a7154ede5..250c1c4cd21 100644
--- a/s2i/modules/kogito-quarkus-s2i/module.yaml
+++ b/s2i/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 execute:
   - script: configure
 
 envs:
-- name: "KOGITO_VERSION"
-  value: "0.8.0"
\ No newline at end of file
+  - name: "KOGITO_VERSION"
+    value: "0.9.0-rc1"
diff --git a/s2i/modules/kogito-quarkus/module.yaml b/s2i/modules/kogito-quarkus/module.yaml
index 96efe6345d6..9b00c6fe32c 100644
--- a/s2i/modules/kogito-quarkus/module.yaml
+++ b/s2i/modules/kogito-quarkus/module.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 execute:
-- script: configure
+  - script: configure
 
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml
index a7610664a8a..5e4f8aedfa3 100644
--- a/s2i/modules/kogito-s2i-core/module.yaml
+++ b/s2i/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.8.0'
+version: '0.9.0-rc1'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
@@ -12,35 +12,28 @@ labels:
     value: "/home/kogito/bin"
 
 envs:
-  - name : S2I_MODULE_LOCATION
+  - name: S2I_MODULE_LOCATION
     value: "/usr/local/s2i"
   - name: S2I_DESTINATION_DIR
-    description: ^
-      Root directory for S2I mount, as specified by the
-      **io.openshift.s2i.destination** label.  This should not be overridden by
-      end users.
+    description: ^ Root directory for S2I mount, as specified by the **io.openshift.s2i.destination** label.  This should not be overridden by end users.
     example: /tmp
 
   - name: S2I_ARTIFACTS_DIR
-    description: ^
-      Location mount for artifacts persisted with **save-artifacts** script, which
-      are used with incremental builds.  This should not be overridden by end users.
+    description: ^ Location mount for artifacts persisted with **save-artifacts** script, which are used with incremental builds.  This should not be overridden by end users.
     example: "${S2I_DESTINATION_DIR}/artifacts}"
 
   - name: S2I_SOURCE_DIR
-    description: ^
-      Location of mount for source code to be built.  This should not be
-      overridden by end users.
+    description: ^ Location of mount for source code to be built.  This should not be overridden by end users.
     example: "${S2I_DESTINATION_DIR}/src}"
 
 modules:
   install:
-  - name: org.kie.kogito.persistence
-  - name: org.kie.kogito.logging
+    - name: org.kie.kogito.persistence
+    - name: org.kie.kogito.logging
 
 run:
   cmd:
     - "/usr/local/s2i/run"
 
 execute:
-  - script: configure.sh
\ No newline at end of file
+  - script: configure.sh
diff --git a/s2i/modules/kogito-springboot-s2i/module.yaml b/s2i/modules/kogito-springboot-s2i/module.yaml
index 1e26092433e..bf1f4d71fd2 100644
--- a/s2i/modules/kogito-springboot-s2i/module.yaml
+++ b/s2i/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 execute:
   - script: configure
 
 envs:
-- name: "KOGITO_VERSION"
-  value: "0.8.0"
\ No newline at end of file
+  - name: "KOGITO_VERSION"
+    value: "0.9.0-rc1"
diff --git a/s2i/modules/kogito-springboot/module.yaml b/s2i/modules/kogito-springboot/module.yaml
index 1ffc290c2ff..8f52084daf8 100644
--- a/s2i/modules/kogito-springboot/module.yaml
+++ b/s2i/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 execute:
   - script: configure
diff --git a/s2i/modules/kogito-system-user/module.yaml b/s2i/modules/kogito-system-user/module.yaml
index 3c15916fa84..e8d18496e0e 100644
--- a/s2i/modules/kogito-system-user/module.yaml
+++ b/s2i/modules/kogito-system-user/module.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.8.0"
+version: "0.9.0-rc1"
 
 execute:
-- script: add-user
+  - script: add-user
 
 envs:
-- name: "KOGITO_HOME"
-  value: "/home/kogito"
-- name: "USER"
-  value: "kogito"
+  - name: "KOGITO_HOME"
+    value: "/home/kogito"
+  - name: "USER"
+    value: "kogito"
 
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
index e539ed74576..3035fd8daf4 100644
--- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value                     |
       | LIMIT_MEMORY   | 3221225472                |
     Then check that page is served
@@ -11,13 +11,13 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.8.0-runner should exist
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -27,12 +27,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.8.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -41,14 +41,14 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.8.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value         |
       | NATIVE            | false         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/jbpm-quarkus-example-0.8.0-runner.jar should exist
+    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
@@ -56,11 +56,11 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-stubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-stubi8:latest
       | variable          | value         |
       | NATIVE            | true          |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/jbpm-quarkus-example-0.8.0-runner should exist
+    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
@@ -68,7 +68,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | ARTIFACT_DIR      | drools-quarkus-example/target   |
@@ -79,17 +79,17 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | path            | /hello                   |
       | wait            | 80                       |
       | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-0.8.0-runner.jar should exist
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.7.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using master
       | variable          | value                  |
       | NATIVE            | false                  |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.7.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using master
       | variable          | value    |
       | NATIVE            | false    |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -119,7 +119,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
       | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
index 81345cb2a2d..da540420939 100644
--- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,7 +3,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.8.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -12,12 +12,12 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.8.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.8.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value                           |
       | JAVA_OPTIONS        | -Ddebug=true                    |
       | ARTIFACT_DIR        | jbpm-springboot-example/target   |
@@ -28,23 +28,23 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.8.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.8.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-0.8.0.jar should exist
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.8.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index 8d0cae65393..448eb02668b 100755
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -7,8 +7,8 @@ cd /tmp
 rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/drools-quarkus-example
-git fetch origin --tags
-git checkout -b 0.8.0 0.8.0
+#git fetch origin --tags
+#git checkout -b 0.8.0 0.8.0
 
 # by adding the application.properties file telling quarkus to start on
 # port 10000, the purpose of this tests is make sure that the images

From 918f3580cf9ac896852c3ccd0143ef24fe6f7603 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 13 Mar 2020 11:44:42 -0300
Subject: [PATCH 102/709] [KOGITO-1036] - Extract kogito-images from
 kogito-cloud repository (#102)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .gitignore                                    |   8 -
 kogito-cloud-services/.gitignore              |  32 --
 .../kogito-cloud-kubernetes-client/.gitignore |  32 --
 .../kogito-cloud-kubernetes-client/README.md  |  10 -
 .../kogito-cloud-kubernetes-client/pom.xml    |  60 ----
 .../client/DefaultKogitoKubeClient.java       |  72 -----
 .../kubernetes/client/KogitoKubeClient.java   |  36 ---
 .../client/KogitoKubeClientException.java     |  42 ---
 .../kubernetes/client/KogitoKubeConfig.java   |  83 -----
 .../kubernetes/client/OperationsUtils.java    |  23 --
 ...ubernetesClientCertUtilsSubstitutions.java |  38 ---
 .../client/operations/BaseListOperations.java |  37 ---
 .../client/operations/BaseOperations.java     | 115 -------
 .../operations/IstioGatewayOperations.java    |  36 ---
 .../operations/KNativeServiceOperations.java  |  31 --
 .../client/operations/ListOperations.java     |  41 ---
 .../client/operations/MapWalker.java          | 121 --------
 .../client/operations/Operations.java         |  22 --
 .../operations/OperationsResponseParser.java  |  91 ------
 .../client/operations/ServiceOperations.java  |  35 ---
 .../client/KubeClientConfigTest.java          |  68 -----
 .../client/MockKubernetesServerSupport.java   | 134 ---------
 .../client/operations/MapWalkerTest.java      |  43 ---
 ...rviceOperationsStatusCodeHandlingTest.java |  75 -----
 .../operations/ServiceOperationsTest.java     | 112 -------
 .../src/test/resources/logback-test.xml       |  14 -
 .../kogito-cloud-workitems/.gitignore         |  32 --
 .../kogito-cloud-workitems/pom.xml            |  58 ----
 .../DiscoveredServiceWorkItemHandler.java     | 283 ------------------
 .../kogito/cloud/workitems/HttpMethods.java   |  22 --
 .../kogito/cloud/workitems/ServiceInfo.java   |  43 ---
 .../discovery/BaseServiceDiscovery.java       |  90 ------
 .../discovery/IstioServiceDiscovery.java      |  74 -----
 .../discovery/KubernetesServiceDiscovery.java |  60 ----
 .../service/discovery/ServiceDiscovery.java   |  49 ---
 .../discovery/ServiceDiscoveryFactory.java    |  96 ------
 .../BaseKubernetesDiscoveredServiceTest.java  |  99 ------
 .../DiscoveredServiceWorkItemHandlerTest.java | 117 --------
 ...eDiscoveredServiceWorkItemHandlerTest.java |  45 ---
 ...sDiscoveredServiceWorkItemHandlerTest.java |  71 -----
 .../KubernetesServiceDiscoveryTest.java       | 162 ----------
 .../src/test/resources/logback-test.xml       |  14 -
 .../istio/services-istio-ingressgateway.json  | 112 -------
 .../knative/serving.knative.dev-services.json |  91 ------
 kogito-cloud-services/pom.xml                 |  19 --
 pom.xml                                       | 208 -------------
 46 files changed, 3156 deletions(-)
 delete mode 100644 kogito-cloud-services/.gitignore
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/.gitignore
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/README.md
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/DefaultKogitoKubeClient.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClient.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClientException.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeConfig.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/OperationsUtils.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/graal/KubernetesClientCertUtilsSubstitutions.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseListOperations.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseOperations.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/IstioGatewayOperations.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/KNativeServiceOperations.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ListOperations.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalker.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/Operations.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/OperationsResponseParser.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperations.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/resources/logback-test.xml
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/.gitignore
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/pom.xml
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/HttpMethods.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/ServiceInfo.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/BaseServiceDiscovery.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscovery.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscovery.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryTest.java
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/resources/logback-test.xml
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json
 delete mode 100644 kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/knative/serving.knative.dev-services.json
 delete mode 100644 kogito-cloud-services/pom.xml
 delete mode 100644 pom.xml

diff --git a/.gitignore b/.gitignore
index 28a7da2e36a..c383190e398 100755
--- a/.gitignore
+++ b/.gitignore
@@ -25,11 +25,3 @@ target/
 *.db
 *.tlog
 
-# modules that don't exist in this branch
-/jbpm-human-task-war/
-/jbpm-bam/
-/jbpm-gwt/
-
-# files used for external db testing
-jdbc_driver.jar
-db-settings.xml
diff --git a/kogito-cloud-services/.gitignore b/kogito-cloud-services/.gitignore
deleted file mode 100644
index 0d73459cf99..00000000000
--- a/kogito-cloud-services/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/
-/target
-/local
-
-# Eclipse, Netbeans and IntelliJ files
-/.*
-!.gitignore
-/nbproject
-/*.ipr
-/*.iws
-/*.iml
-
-# Repository wide ignore mac DS_Store files
-.DS_Store
-
-# Original jbpm ignores
-*~
-
-# Test info
-/settings*.xml
-/lib-jdbc/
-*.db
-*.tlog
-
-# modules that don't exist in this branch
-/jbpm-human-task-war/
-/jbpm-bam/
-/jbpm-gwt/
-
-# files used for external db testing
-jdbc_driver.jar
-db-settings.xml
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/.gitignore b/kogito-cloud-services/kogito-cloud-kubernetes-client/.gitignore
deleted file mode 100644
index 0d73459cf99..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/
-/target
-/local
-
-# Eclipse, Netbeans and IntelliJ files
-/.*
-!.gitignore
-/nbproject
-/*.ipr
-/*.iws
-/*.iml
-
-# Repository wide ignore mac DS_Store files
-.DS_Store
-
-# Original jbpm ignores
-*~
-
-# Test info
-/settings*.xml
-/lib-jdbc/
-*.db
-*.tlog
-
-# modules that don't exist in this branch
-/jbpm-human-task-war/
-/jbpm-bam/
-/jbpm-gwt/
-
-# files used for external db testing
-jdbc_driver.jar
-db-settings.xml
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/README.md b/kogito-cloud-services/kogito-cloud-kubernetes-client/README.md
deleted file mode 100644
index 3fc8ec36655..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Kogito Cloud Kubernetes Client
-
-This library is designed to be used with Kogito Cloud module, but also as a standalone library as an alternative Kubernetes client on [native images](https://www.graalvm.org/docs/reference-manual/aot-compilation/).
-
-It's a wrapper around the [Fabric8 Kubernetes Client API](https://github.com/fabric8io/kubernetes-client), with some tweaks:
-
-1. Removes the Kube Config file parsing as an alternative to connect to the cluster because of [its reflection usage](https://github.com/fabric8io/kubernetes-client/issues/1591).
-2. Parse JSON API responses as simple Maps to avoid using reflection to build domain objects during runtime like Jackson does. As an alternative, uses Yasson to parse JSON responses and a simple utility to walk into the resulted map.
-
-It's meant to be simple to support simple use cases.
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml b/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
deleted file mode 100644
index 7416652048a..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-cloud-services</artifactId>
-    <version>8.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>kogito-cloud-kubernetes-client</artifactId>
-  <name>Kogito Cloud Kubernetes Client</name>
-  <description>Kogito Cloud Kubernetes Client</description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.oracle.substratevm</groupId>
-      <artifactId>svm</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-server-mock</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Logging -->
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/DefaultKogitoKubeClient.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/DefaultKogitoKubeClient.java
deleted file mode 100644
index ca23645266c..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/DefaultKogitoKubeClient.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client;
-
-import org.kie.kogito.cloud.kubernetes.client.operations.IstioGatewayOperations;
-import org.kie.kogito.cloud.kubernetes.client.operations.KNativeServiceOperations;
-import org.kie.kogito.cloud.kubernetes.client.operations.ServiceOperations;
-
-/**
- * Default {@link KogitoKubeClient} implementation.
- */
-public class DefaultKogitoKubeClient implements KogitoKubeClient {
-
-    private ServiceOperations serviceOperation;
-    private IstioGatewayOperations istioGatewayOperations;
-    private KNativeServiceOperations kNativeServiceOperations;
-    private KogitoKubeConfig clientConfig;
-
-    public DefaultKogitoKubeClient() {
-        this.clientConfig = new KogitoKubeConfig();
-    }
-
-    @Override
-    public KogitoKubeConfig getConfig() {
-        return this.clientConfig;
-    }
-
-    @Override
-    public DefaultKogitoKubeClient withConfig(KogitoKubeConfig clientConfig) {
-        this.clientConfig = clientConfig;
-        return this;
-    }
-
-    /**
-     * The Services Operations
-     */
-    @Override
-    public ServiceOperations services() {
-        if (serviceOperation == null) {
-            this.serviceOperation = new ServiceOperations(clientConfig);
-        }
-        return this.serviceOperation;
-    }
-
-    @Override
-    public IstioGatewayOperations istioGateway() {
-        if (istioGatewayOperations == null) {
-            this.istioGatewayOperations = new IstioGatewayOperations(clientConfig);
-        }
-        return this.istioGatewayOperations;
-    }
-
-    @Override
-    public KNativeServiceOperations knativeService() {
-        if (kNativeServiceOperations == null) {
-            this.kNativeServiceOperations = new KNativeServiceOperations(clientConfig);
-        }
-        return this.kNativeServiceOperations;
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClient.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClient.java
deleted file mode 100644
index 740f6f087a7..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client;
-
-import org.kie.kogito.cloud.kubernetes.client.operations.IstioGatewayOperations;
-import org.kie.kogito.cloud.kubernetes.client.operations.KNativeServiceOperations;
-import org.kie.kogito.cloud.kubernetes.client.operations.ServiceOperations;
-
-/**
- * Main interface to communicate with Kubernetes Cluster API.
- */
-public interface KogitoKubeClient {
-
-    ServiceOperations services();
-
-    IstioGatewayOperations istioGateway();
-
-    KNativeServiceOperations knativeService();
-
-    KogitoKubeClient withConfig(KogitoKubeConfig config);
-
-    KogitoKubeConfig getConfig();
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClientException.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClientException.java
deleted file mode 100644
index 696a523967d..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeClientException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client;
-
-/**
- * Generic exception for the Kube Client
- */
-public class KogitoKubeClientException extends RuntimeException {
-
-    private static final long serialVersionUID = 5121838037390778349L;
-
-    public KogitoKubeClientException() {}
-
-    public KogitoKubeClientException(String message) {
-        super(message);
-    }
-
-    public KogitoKubeClientException(Throwable cause) {
-        super(cause);
-    }
-
-    public KogitoKubeClientException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public KogitoKubeClientException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeConfig.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeConfig.java
deleted file mode 100644
index 6adbb069546..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/KogitoKubeConfig.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import io.fabric8.kubernetes.client.BaseClient;
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.base.OperationSupport;
-import okhttp3.OkHttpClient;
-
-/**
- * Wraps the Kubernetes Client setup and configuration, exposing infrastructure components to connect to a Kubernetes cluster reliably. 
- * Most used when there's a need to customize the Fabric8 Kubernetes Client.
- */
-public final class KogitoKubeConfig {
-
-    public static final String KNATIVE_ISTIO_NAMESPACE = "istio-system";
-    private static final String NAMESPACE_REPLACE = "@ns@";
-    private static final String KNATIVE_SERVICE_SERVICE_URL = "apis/serving.knative.dev/v1alpha1/namespaces/" + NAMESPACE_REPLACE + "/services";
-    private static final String KNATIVE_ISTIO_GATEWAY_URL = "api/v1/namespaces/" + KNATIVE_ISTIO_NAMESPACE + "/services/istio-ingressgateway";
-
-    private KubernetesClient kubernetesClient;
-
-    public KogitoKubeConfig() {
-        // disable kube config file deserialization due to reflection usage
-        System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
-        this.kubernetesClient = new DefaultKubernetesClient();
-    }
-
-    /**
-     * Highly customizable config client. Most used in integration tests. 90% of the time you won't need to use this constructor.
-     * 
-     * @param kubernetesClient
-     */
-    public KogitoKubeConfig(KubernetesClient kubernetesClient) {
-        this.kubernetesClient = kubernetesClient;
-    }
-
-    public OkHttpClient getHttpClient() {
-        return ((BaseClient) this.kubernetesClient).getHttpClient();
-    }
-
-    public URL getMasterUrl() {
-        return this.kubernetesClient.getMasterUrl();
-    }
-
-    public String getKNativeServiceServiceURL(String namespace) throws MalformedURLException {
-        if (namespace == null || namespace.isEmpty()) {
-            throw new IllegalArgumentException("A namespace should be provided when using KNative service operations");
-        }
-        final StringBuilder sb = new StringBuilder(this.getMasterUrl().toString());
-        sb.append(KNATIVE_SERVICE_SERVICE_URL.replaceFirst(NAMESPACE_REPLACE, namespace));
-        return sb.toString();
-    }
-
-    public String getKNativeIstioGatewayURL() throws MalformedURLException {
-        final StringBuilder sb = new StringBuilder(this.getMasterUrl().toString());
-        sb.append(KNATIVE_ISTIO_GATEWAY_URL);
-        return sb.toString();
-    }
-
-    public URL getServiceOperationURL(final String namespace) throws MalformedURLException {
-        final OperationSupport services = ((OperationSupport) this.kubernetesClient.services());
-        return services.getNamespacedUrl(namespace);
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/OperationsUtils.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/OperationsUtils.java
deleted file mode 100644
index f66ba67bf5d..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/OperationsUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client;
-
-public final class OperationsUtils {
-
-    public static final String LABEL_SELECTOR_PARAM = "labelSelector";
-
-    private OperationsUtils() {}
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/graal/KubernetesClientCertUtilsSubstitutions.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/graal/KubernetesClientCertUtilsSubstitutions.java
deleted file mode 100644
index 871b7603b13..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/graal/KubernetesClientCertUtilsSubstitutions.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.graal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.PrivateKey;
-
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-/**
- * Removes EC Keys support from Fabric8 Kubernetes client dependency on native binaries. 
- * This avoids clients to add <code>--allow-incomplete-classpath</code> option on their build configuration.
- * <p/>
- * Cloned from <a href="https://github.com/quarkusio/quarkus/blob/master/extensions/kubernetes-client/runtime/src/main/java/io/quarkus/kubernetes/client/runtime/graal/CertUtilsSubstitutions.java">Quarkus Kubernetes Extension</a> to not add Quarkus dependencies to this project
- */
-@TargetClass(className = "io.fabric8.kubernetes.client.internal.CertUtils")
-public final class KubernetesClientCertUtilsSubstitutions {
-
-    @Substitute
-    static PrivateKey handleECKey(InputStream keyInputStream) throws IOException {
-        throw new RuntimeException("EC Keys are not supported when using the native binary");
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseListOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseListOperations.java
deleted file mode 100644
index 80c25114ef7..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseListOperations.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.util.Map;
-
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
-
-public abstract class BaseListOperations extends BaseOperations implements ListOperations {
-
-    public BaseListOperations(KogitoKubeConfig clientConfig) {
-        super(clientConfig);
-    }
-
-    @Override
-    public OperationsResponseParser listNamespaced(String namespace, Map<String, String> labels) {
-        return this.execute(namespace, labels);
-    }
-
-    @Override
-    public OperationsResponseParser list(Map<String, String> labels) {
-        return this.listNamespaced(null, labels);
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseOperations.java
deleted file mode 100644
index 1b5b13eb5a3..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/BaseOperations.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import okhttp3.Request;
-import okhttp3.Response;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClientException;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
-import org.kie.kogito.cloud.kubernetes.client.OperationsUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Base class for all operations
- */
-public abstract class BaseOperations implements Operations {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(BaseOperations.class);
-    private static final String EMPTY_JSON = "{}";
-
-    private final KogitoKubeConfig clientConfig;
-
-    public BaseOperations(final KogitoKubeConfig clientConfig) {
-        this.clientConfig = clientConfig;
-    }
-
-    public final KogitoKubeConfig getClientConfig() {
-        return clientConfig;
-    }
-
-    private URL doBuildUrl(final String namespace, final Map<String, String> labels) {
-        try {
-            StringBuilder sb = new StringBuilder(this.buildBaseUrl(namespace));
-            if (labels != null) {
-                sb.append("?").append(OperationsUtils.LABEL_SELECTOR_PARAM).append("=");
-                sb.append(this.buildLabelSelectorParam(labels));
-            }
-            return new URL(sb.toString());
-        } catch (Exception e) {
-            throw new KogitoKubeClientException(String.format("Error while trying to build URL for the Service API: '%s'", e.getMessage()), e);
-        }
-    }
-
-    private String buildLabelSelectorParam(final Map<String, String> labels) {
-        if (labels != null) {
-            return labels.entrySet()
-                         .stream()
-                         .map(label -> String.format(label.getValue() == null || label.getValue().isEmpty() ? "%s" : "%s=%s", label.getKey(), label.getValue()))
-                         .collect(Collectors.joining(","));
-        }
-        return "";
-    }
-
-    private Response doExecute(final String namespace, final Map<String, String> labels) throws IOException {
-        final URL url = this.doBuildUrl(namespace, labels);
-        final Request request = new Request.Builder().url(url).build();
-
-        LOGGER.debug("About to query the Kubernetes API with url {} with label selector {} in namespace  '{}'", url, labels, namespace);
-
-        return clientConfig.getHttpClient().newCall(request).execute();
-    }
-
-    protected OperationsResponseParser execute(final String namespace, final Map<String, String> labels) {
-        try (Response response = this.doExecute(namespace, labels)) {
-            LOGGER.debug("Response Headers received from the Kube cluster: {}", response.headers());
-            if (response.isSuccessful()) {
-                final String data = response.body().string();
-                LOGGER.debug("Received response data from Kube API: {}", data);
-                return new OperationsResponseParser(data);
-            }
-            if (response.code() == HttpURLConnection.HTTP_NOT_FOUND) {
-                LOGGER.debug("No resources found in namespace '{}' with labels {}", namespace, labels);
-                return new OperationsResponseParser(EMPTY_JSON);
-            }
-            if (response.code() == HttpURLConnection.HTTP_FORBIDDEN || response.code() == HttpURLConnection.HTTP_UNAUTHORIZED) {
-                throw new KogitoKubeClientException(String.format("Tried to fetch for resources, got unauthorized/forbidden response: %s. Make sure to correctly set a Service Account with permissions to fetch the resource.",
-                                                                  response));
-            }
-            throw new KogitoKubeClientException(String.format("Error trying to fetch the Kubernetes API. Response is: %s", response));
-        } catch (KogitoKubeClientException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new KogitoKubeClientException(String.format("Error trying to fetch the Kubernetes API - '%s: %s'", e.getClass(), e.getMessage()), e);
-        }
-    }
-
-    /**
-     * URL builder for the API calls. Normally composed by the Master URL + Resource Path.
-     * 
-     * @param namespace
-     * @return
-     * @throws MalformedURLException
-     * @see {@link ServiceOperations#buildBaseUrl(String)}
-     */
-    protected abstract String buildBaseUrl(final String namespace) throws MalformedURLException;
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/IstioGatewayOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/IstioGatewayOperations.java
deleted file mode 100644
index 8e89eebb053..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/IstioGatewayOperations.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.net.MalformedURLException;
-
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
-
-public class IstioGatewayOperations extends BaseOperations {
-
-    public IstioGatewayOperations(final KogitoKubeConfig config) {
-        super(config);
-    }
-
-    public OperationsResponseParser get() {
-        return this.execute(null, null);
-    }
-
-    @Override
-    protected String buildBaseUrl(String namespace) throws MalformedURLException {
-        return this.getClientConfig().getKNativeIstioGatewayURL();
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/KNativeServiceOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/KNativeServiceOperations.java
deleted file mode 100644
index 073b493a818..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/KNativeServiceOperations.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.net.MalformedURLException;
-
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
-
-public class KNativeServiceOperations extends BaseListOperations {
-
-    public KNativeServiceOperations(KogitoKubeConfig clientConfig) {
-        super(clientConfig);
-    }
-
-    @Override
-    protected String buildBaseUrl(String namespace) throws MalformedURLException {
-        return this.getClientConfig().getKNativeServiceServiceURL(namespace);
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ListOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ListOperations.java
deleted file mode 100644
index 8b68b20c2cf..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ListOperations.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.util.Map;
-
-/**
- * Operations that return a list of objects. Normally a <code>kind: List</code> with <code>items</code> attribute.
- */
-public interface ListOperations extends Operations {
-
-    /**
-     * Query for a list of services within a namespace.
-     * 
-     * @param namespace
-     * @param labels
-     * @return A JSON Document reference of the Service API response
-     */
-    OperationsResponseParser listNamespaced(final String namespace, final Map<String, String> labels);
-
-    /**
-     * Queries for a list of services in the entire cluster. A service account with permissions to query the cluster might be needed. 
-     * 
-     * @param labels
-     * @return A JSON Document reference of the Service API response
-     */
-    OperationsResponseParser list(final Map<String, String> labels);
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalker.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalker.java
deleted file mode 100644
index 487f25b1685..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalker.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Utility to avoid chaining conversion in code
- */
-@SuppressWarnings("unchecked")
-public final class MapWalker {
-
-    private Object theMap;
-    private boolean safeNull;
-
-    /**
-     * Walker with safe null
-     * @param theMap that we're going to walk into
-     * @param safeNull whether to return a null value at the end of the walk, otherwise if the key isn't expected a NPE or an {@link IllegalArgumentException} might raise.
-     */
-    public MapWalker(Object theMap, boolean safeNull) {
-        this.theMap = theMap;
-        this.safeNull = safeNull;
-    }
-
-    public MapWalker(Object theMap) {
-        this(theMap, false);
-    }
-
-    /**
-     * Return the object as a Map.
-     * @param <K>
-     * @param <V>
-     * @return
-     */
-    public <K, V> Map<K, V> asMap() {
-        if (theMap instanceof Map) {
-            return (Map<K, V>) theMap;
-        }
-        throw new IllegalArgumentException(String.format("The object %s is not a map. Impossible to get", theMap));
-    }
-
-    /**
-     * Return the object as a list
-     * @param <K>
-     * @param <V>
-     * @return
-     */
-    public <K, V> List<Map<K, V>> asList() {
-        if (theMap instanceof List) {
-            return (List<Map<K, V>>) theMap;
-        }
-        throw new IllegalArgumentException(String.format("The object %s is not a list. Impossible to get", theMap));
-    }
-
-    /**
-     * The key value is another map 
-     */
-    public MapWalker mapToMap(String key) {
-        if (theMap instanceof Map) {
-            this.theMap = ((Map<String, ?>) theMap).get(key);
-            if (safeNull && this.theMap == null) {
-                this.theMap = new HashMap<>();
-            }
-            return this;
-        }
-        throw new IllegalArgumentException(String.format("The object %s is not a map. Impossible to walk to the key '%s'", theMap, key));
-    }
-
-    /**
-     * The key value is a list map.
-     * 
-     * @param key
-     * @return
-     */
-    public MapWalker mapToListMap(final String key) {
-        if (theMap instanceof Map) {
-            theMap = (List<Map<?, ?>>) ((Map<?, ?>) theMap).get(key);
-            if (safeNull && this.theMap == null) {
-                this.theMap = new ArrayList<Map<?, ?>>();
-            }
-            return this;
-        }
-        throw new IllegalArgumentException(String.format("The object %s is not a list. Impossible to walk to the key %s", theMap, key));
-    }
-
-    /**
-     * In a list, we take the index that is a map
-     * @param index
-     * @return
-     */
-    public MapWalker listToMap(final int index) {
-        if (theMap instanceof List) {
-            final List<Map<?, ?>> theList = ((List<Map<?, ?>>) theMap);
-            if (theList != null && theList.size() > index) {
-                theMap = (Map<?, ?>) theList.get(index);
-            } else {
-                this.theMap = new HashMap<>();
-            }
-
-            return this;
-        }
-        throw new IllegalArgumentException(String.format("The object %s is not a list. Impossible to walk to the index '%d'", theMap, index));
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/Operations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/Operations.java
deleted file mode 100644
index 6b4526486f1..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/Operations.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-/**
- * Common interface for operations on the Kubernetes API.
- */
-public interface Operations {
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/OperationsResponseParser.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/OperationsResponseParser.java
deleted file mode 100644
index 5f141334f70..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/OperationsResponseParser.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClientException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class OperationsResponseParser {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(OperationsResponseParser.class);
-
-    private final String response;
-    private final ObjectMapper mapper;
-
-    public OperationsResponseParser(final String response) {
-        this.response = response;
-        this.mapper = new ObjectMapper();
-        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
-        mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
-    }
-
-    /**
-     * Returns the raw JSON Document Response from the API
-     *  
-     * @return
-     */
-    public String asJson() {
-        return response;
-    }
-
-    /**
-     * Returns the JSON Document as a list of map
-     * 
-     * @return
-     */
-    public Map<String, Object> asMap() {
-        if (response == null || response.isEmpty()) {
-            return new HashMap<>();
-        }
-        try {
-            final TypeReference<HashMap<String, Object>> typeRef = new TypeReference<HashMap<String, Object>>() {
-            };
-            LOGGER.debug("Trying to parse API response {}", response);
-            return mapper.readValue(response, typeRef);
-        } catch (IOException e) {
-            throw new KogitoKubeClientException("Error while trying to parse API response", e);
-        }
-    }
-
-    /**
-     * Default {@link MapWalker} that explodes an {@link IllegalArgumentException} in case the wrong path is taken
-     * 
-     * @return
-     */
-    public MapWalker asMapWalker() {
-        return this.asMapWalker(false);
-    }
-
-    /**
-     * A {@link MapWalker} with the option to turn on/off safe nulls
-     * @param safeNull
-     * @return
-     */
-    public MapWalker asMapWalker(final boolean safeNull) {
-        if (response == null || response.isEmpty()) {
-            return new MapWalker(new HashMap<>(), safeNull);
-        }
-        return new MapWalker(this.asMap(), safeNull);
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperations.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperations.java
deleted file mode 100644
index 701197c3b1b..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/main/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperations.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.net.MalformedURLException;
-
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
-
-/**
- * Wrapper for service operations on Kubernetes Client that resolves the responses from the API calls to Maps.
- * @see <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.14/#service-v1-core">Kubernetes API Reference - Services</a>
- */
-public class ServiceOperations extends BaseListOperations {
-
-    public ServiceOperations(final KogitoKubeConfig clientConfig) {
-        super(clientConfig);
-    }
-
-    @Override
-    protected String buildBaseUrl(String namespace) throws MalformedURLException {
-        return this.getClientConfig().getServiceOperationURL(namespace).toExternalForm();
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java
deleted file mode 100644
index 20c74d790b7..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/KubeClientConfigTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class KubeClientConfigTest {
-
-    public static final Path KUBE_CONFIG_PATH = Paths.get(System.getProperty("user.home") + "/.kube/config");
-    public static final Path KUBE_CONFIG_DIR = Paths.get(System.getProperty("user.home") + "/.kube");
-
-    @BeforeEach
-    public void setup() throws IOException {
-        if (!Files.exists(KUBE_CONFIG_PATH)) {
-            if (!Files.exists(KUBE_CONFIG_DIR)) {
-                Files.createDirectories(KUBE_CONFIG_DIR);
-            }
-            Files.createFile(KUBE_CONFIG_PATH);
-        }
-    }
-
-    @AfterEach
-    public void teardown() throws IOException {
-        if (Files.exists(KUBE_CONFIG_PATH) && Files.readAllBytes(KUBE_CONFIG_PATH).length == 0) {
-            Files.delete(KUBE_CONFIG_PATH);
-            Files.delete(KUBE_CONFIG_DIR);
-        }
-        System.clearProperty("kubernetes.master");
-    }
-
-    @Test
-    public void whenCreateNewConfigurationIgnoresKubeConfigFile() {
-        final KogitoKubeConfig config = new KogitoKubeConfig();
-        assertThat(config.getHttpClient(), notNullValue());
-        assertThat(config.getMasterUrl().toString(), containsString("kubernetes.default.svc"));
-    }
-
-    @Test
-    public void whenGetFromSystemProps() {
-        System.setProperty("kubernetes.master", "localhost");
-        final KogitoKubeConfig config = new KogitoKubeConfig();
-        assertThat(config.getMasterUrl().toString(), containsString("localhost"));
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java
deleted file mode 100644
index 2d6a4bfa1ed..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/MockKubernetesServerSupport.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client;
-
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.Map;
-
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesList;
-import io.fabric8.kubernetes.api.model.LoadBalancerStatus;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.ServicePort;
-import io.fabric8.kubernetes.api.model.ServiceSpec;
-import io.fabric8.kubernetes.api.model.ServiceStatus;
-import io.fabric8.kubernetes.client.dsl.RecreateFromServerGettable;
-import io.fabric8.kubernetes.client.dsl.ServiceResource;
-import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-
-/**
- * Base class to test use cases that need to query the API
- */
-public abstract class MockKubernetesServerSupport {
-
-    public static final String MOCK_NAMESPACE = "test";
-    private KubernetesServer server;
-    private KogitoKubeClient kubeClient;
-
-    public MockKubernetesServerSupport() {
-        this.initializeServer(true);
-    }
-
-    public MockKubernetesServerSupport(final boolean crudMode) {
-        this.initializeServer(crudMode);
-    }
-
-    public KogitoKubeClient getKubeClient() {
-        return this.kubeClient;
-    }
-
-    public KubernetesServer getServer() {
-        return server;
-    }
-
-    /**
-     * Override to setup a different kind of server
-     */
-    protected final void initializeServer(final boolean crudMode) {
-        this.server = new KubernetesServer(false, crudMode);
-    }
-
-    @BeforeEach
-    public void before() {
-        server.before();
-        this.kubeClient = new DefaultKogitoKubeClient().withConfig(new KogitoKubeConfig(server.getClient()));
-    }
-
-    @AfterEach
-    public void after() {
-        server.after();
-    }
-
-    /**
-     * Creates a new mock service in the {@value #MOCK_NAMESPACE} with 127.0.0.1:8080 address
-     */
-    protected void createMockService() {
-        this.createMockService("test", "127.0.0.1", Collections.singletonMap("service", "test"), MOCK_NAMESPACE);
-    }
-
-    /**
-     * Same as {@link #createMockService()}, but let you choose the namespace. 
-     * @param namespace null to not specify where.
-     */
-    protected void createMockService(final String namespace) {
-        this.createMockService("test", "127.0.0.1", Collections.singletonMap("service", "test"), namespace);
-    }
-
-    /**
-     * Creates a service based on an {@link InputStream} of a json service response.
-     * 
-     * @param mockJsonResponse
-     */
-    protected void createMockService(final InputStream mockJsonResponse, final String namespace) {
-        final ServiceResource<Service, ?> serviceResource = this.server.getClient().inNamespace(namespace).services().load(mockJsonResponse);
-        this.server.getClient().inNamespace(namespace).services().create(serviceResource.get());
-    }
-
-    /**
-     * Creates a list of services based on a {@link InputStream} of a json servicelist response
-     * 
-     * @param mockJsonResponse
-     * @param namespace
-     */
-    protected void createMockServices(final InputStream mockJsonResponse, final String namespace) {
-        final RecreateFromServerGettable<KubernetesList, KubernetesList, ?> serviceResource = this.server.getClient().inNamespace(namespace).lists().load(mockJsonResponse);
-        this.server.getClient().inNamespace(namespace).lists().create(serviceResource.get());
-    }
-
-    protected void createMockService(final String serviceName, final String ip, final Map<String, String> labels, final String namespace) {
-        final ServiceSpec serviceSpec = new ServiceSpec();
-        serviceSpec.setPorts(Collections.singletonList(new ServicePort("http", 0, 8080, "http", new IntOrString(8080))));
-        serviceSpec.setClusterIP(ip);
-        serviceSpec.setType("ClusterIP");
-        serviceSpec.setSessionAffinity("ClientIP");
-
-        final ObjectMeta metadata = new ObjectMeta();
-        metadata.setName(serviceName);
-        metadata.setNamespace(MOCK_NAMESPACE);
-        metadata.setLabels(labels);
-
-        final Service service = new Service("v1", "Service", metadata, serviceSpec, new ServiceStatus(new LoadBalancerStatus()));
-        if (namespace != null) {
-            this.server.getClient().inNamespace(namespace).services().create(service);
-        } else {
-            this.server.getClient().services().create(service);
-        }
-
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java
deleted file mode 100644
index 9a76b2d1eeb..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/MapWalkerTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.util.HashMap;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class MapWalkerTest {
-
-    public MapWalkerTest() {
-
-    }
-
-    @Test
-    public void whenMapIsEmptyAndIsSafe() {
-        final MapWalker walker = new MapWalker(new HashMap<>(), true);
-        assertThat(walker.mapToListMap("test").listToMap(0).asMap(), notNullValue());
-    }
-
-    @Test
-    public void whenMapIsEmptyAndIsNotSafe() {
-        final MapWalker walker = new MapWalker(new HashMap<>());
-        assertThrows(IllegalArgumentException.class, () -> walker.mapToListMap("test").listToMap(0).asMap());
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java
deleted file mode 100644
index 214e60aba39..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsStatusCodeHandlingTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.net.HttpURLConnection;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClientException;
-import org.kie.kogito.cloud.kubernetes.client.MockKubernetesServerSupport;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
-
-/**
- * Service Operations test cases that integrates with a mock Kubernetes server to validate HTTP Rest API handling.
- */
-public class ServiceOperationsStatusCodeHandlingTest extends MockKubernetesServerSupport {
-
-    public ServiceOperationsStatusCodeHandlingTest() {
-        super(false);
-    }
-
-    @Test
-    public void whenNotFoundResponse() {
-        getServer().expect().get().withPath("/api/v1/services").andReturn(404, null).once();
-        Map<String, Object> services = this.getKubeClient().services().list(null).asMap();
-        assertThat(services, notNullValue());
-        assertThat(services.size(), is(0));
-    }
-
-    @Test
-    public void whenForbiddenResponse() {
-        try {
-            getServer().expect().get().withPath("/api/v1/services").andReturn(HttpURLConnection.HTTP_FORBIDDEN, null).once();
-            this.getKubeClient().services().list(null).asMap();
-            fail("Should explode a forbidden exception");
-        } catch (KogitoKubeClientException e) {
-            assertThat(e.getMessage(), containsString("forbidden"));
-        }
-    }
-
-    @Test
-    public void whenUnauthorizedResponse() {
-        try {
-            getServer().expect().get().withPath("/api/v1/services").andReturn(HttpURLConnection.HTTP_UNAUTHORIZED, null).once();
-            this.getKubeClient().services().list(null).asMap();
-            fail("Should explode a forbidden exception");
-        } catch (KogitoKubeClientException e) {
-            assertThat(e.getMessage(), containsString("unauthorized"));
-        }
-    }
-
-    @Test
-    public void whenServerError() {
-        getServer().expect().get().withPath("/api/v1/services").andReturn(HttpURLConnection.HTTP_BAD_GATEWAY, null).once();
-        assertThrows(KogitoKubeClientException.class, () -> this.getKubeClient().services().list(null).asMap());
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java
deleted file mode 100644
index 418bda10d47..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/java/org/kie/kogito/cloud/kubernetes/client/operations/ServiceOperationsTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.kubernetes.client.operations;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.jupiter.api.Test;
-import org.kie.kogito.cloud.kubernetes.client.MockKubernetesServerSupport;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class ServiceOperationsTest extends MockKubernetesServerSupport {
-
-    private void assertDefaultServiceCreated(final String services) throws JsonParseException, JsonMappingException, IOException {
-        this.assertDefaultServiceCreated(services, "127.0.0.1");
-    }
-
-    private void assertDefaultServiceCreated(final String services, final String assertIp) throws JsonParseException, JsonMappingException, IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        assertThat(services, notNullValue());
-        assertThat(services.isEmpty(), not(true));
-        final TypeReference<HashMap<String, Object>> typeRef = new TypeReference<HashMap<String, Object>>() {
-        };
-        Map<String, Object> servicesMap = mapper.readValue(services, typeRef);
-        Map<String, Object> spec =
-                new MapWalker(servicesMap)
-                                          .mapToListMap("items")
-                                          .listToMap(0)
-                                          .mapToMap("spec")
-                                          .asMap();
-        assertThat(spec.get("clusterIP"), is(assertIp));
-        assertThat(Integer.parseInt(new MapWalker(spec).mapToListMap("ports").listToMap(0).asMap().get("port").toString()), is(8080));
-    }
-
-    @Test
-    public void whenThereIsOneSingleServiceNamespaced() throws JsonParseException, JsonMappingException, IOException {
-        this.createMockService();
-        String services = this.getKubeClient().services().listNamespaced(MOCK_NAMESPACE, null).asJson();
-        this.assertDefaultServiceCreated(services);
-    }
-
-    @Test
-    public void whenThereIsAListOfServicesNamespaced() throws JsonParseException, JsonMappingException, IOException {
-        this.createMockService();
-        this.createMockService("service2", "192.168.0.1", Collections.singletonMap("service", "test2"), MOCK_NAMESPACE);
-        String services = this.getKubeClient().services().listNamespaced(MOCK_NAMESPACE, null).asJson();
-        this.assertDefaultServiceCreated(services, "192.168.0.1");
-    }
-    
-    @Test
-    public void whenThereIsAListOfServicesNamespacedLookingForLabelKey() throws JsonParseException, JsonMappingException, IOException {
-        this.createMockService("service2", "192.168.0.1", Collections.singletonMap("service", null), MOCK_NAMESPACE);
-        String services = this.getKubeClient().services().listNamespaced(MOCK_NAMESPACE, Collections.singletonMap("service", null)).asJson();
-        this.assertDefaultServiceCreated(services, "192.168.0.1");
-    }
-
-    @Test
-    public void whenThereIsAListOfServicesNamespacedWithLabel() throws JsonParseException, JsonMappingException, IOException {
-        this.createMockService();
-        this.createMockService("service2", "192.168.0.1", Collections.singletonMap("service", "test2"), MOCK_NAMESPACE);
-        String servicesJson = this.getKubeClient()
-                                  .services()
-                                  .listNamespaced(MOCK_NAMESPACE, Collections.singletonMap("service", "test2"))
-                                  .asJson();
-        this.assertDefaultServiceCreated(servicesJson, "192.168.0.1");
-    }
-
-    @Test
-    public void whenThereIsOneServiceNamespacedReturnedAsMap() {
-        this.createMockService();
-        Map<String, Object> services =
-                this.getKubeClient()
-                    .services()
-                    .listNamespaced(MOCK_NAMESPACE, null)
-                    .asMap();
-        assertThat(services, notNullValue());
-        assertThat(services.size(), is(3));
-        assertThat(services.get("items"), instanceOf(ArrayList.class));
-    }
-
-    @Test
-    public void whenThereIsOneSingleService() throws JsonParseException, JsonMappingException, IOException {
-        this.createMockService("");
-        String services = this.getKubeClient().services().list(null).asJson();
-        this.assertDefaultServiceCreated(services);
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/resources/logback-test.xml b/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/resources/logback-test.xml
deleted file mode 100644
index 1d010883b43..00000000000
--- a/kogito-cloud-services/kogito-cloud-kubernetes-client/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="INFO">
-    <appender-ref ref="STDOUT"/>
-  </root>
-</configuration>
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-workitems/.gitignore b/kogito-cloud-services/kogito-cloud-workitems/.gitignore
deleted file mode 100644
index 0d73459cf99..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/
-/target
-/local
-
-# Eclipse, Netbeans and IntelliJ files
-/.*
-!.gitignore
-/nbproject
-/*.ipr
-/*.iws
-/*.iml
-
-# Repository wide ignore mac DS_Store files
-.DS_Store
-
-# Original jbpm ignores
-*~
-
-# Test info
-/settings*.xml
-/lib-jdbc/
-*.db
-*.tlog
-
-# modules that don't exist in this branch
-/jbpm-human-task-war/
-/jbpm-bam/
-/jbpm-gwt/
-
-# files used for external db testing
-jdbc_driver.jar
-db-settings.xml
diff --git a/kogito-cloud-services/kogito-cloud-workitems/pom.xml b/kogito-cloud-services/kogito-cloud-workitems/pom.xml
deleted file mode 100644
index 2e4160d5a65..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-cloud-services</artifactId>
-    <version>8.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>kogito-cloud-workitems</artifactId>
-  <name>Kogito Cloud Work Items</name>
-  <description>Kogito Cloud Work Items</description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-cloud-kubernetes-client</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Logging -->
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Fabric8 client used exclusively for tests purposes only -->
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-server-mock</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
deleted file mode 100644
index 72d796882f6..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandler.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-
-package org.kie.kogito.cloud.workitems;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Request.Builder;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import org.kie.api.runtime.process.WorkItem;
-import org.kie.api.runtime.process.WorkItemHandler;
-import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
-import org.kie.kogito.cloud.workitems.service.discovery.ServiceDiscovery;
-import org.kie.kogito.cloud.workitems.service.discovery.ServiceDiscoveryFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class DiscoveredServiceWorkItemHandler implements WorkItemHandler {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(DiscoveredServiceWorkItemHandler.class);
-
-    protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-    protected static final List<String> INTERNAL_FIELDS = Arrays.asList("TaskName", "ActorId", "GroupId", "Priority", "Comment", "Skippable", "Content", "Model", "Namespace");
-
-    private Map<String, ServiceInfo> serviceEndpoints;
-
-    private OkHttpClient http;
-    private ObjectMapper mapper;
-    private ServiceDiscovery serviceDiscovery;
-    private KogitoKubeClient kubeClient;
-
-    public DiscoveredServiceWorkItemHandler() {
-        this(null);
-    }
-
-    protected DiscoveredServiceWorkItemHandler(final KogitoKubeClient kubeClient) {
-        LOGGER.debug("New instance of discovered service work item with kubeclient: {}", kubeClient);
-        mapper = new ObjectMapper();
-        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
-        mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
-        /*
-         *  Delaying buildServiceDiscovery and buildHttpClient to avoid problems with okhttp3 dependency during GraalVM native builds. 
-         *  OKHttp3 references SSLContextFactory in static fields, which lead to errors. See: https://quarkus.io/guides/writing-native-applications-tips#delaying-class-initialization
-         *  We're trying to not use static fields that depends on unknown and uncontrolled dependencies to avoid errors like this.
-         *  That's why we're just holding the kube reference in the constructor, thus lazy building the HTTP objects. 
-         */ 
-        this.kubeClient = kubeClient;
-        this.serviceEndpoints = new ConcurrentHashMap<>();
-    }
-    
-    /**
-     * Returns the {@link ServiceDiscovery} reference that will be used during the endpoint discovery.
-     * @return
-     */
-    protected ServiceDiscovery buildServiceDiscovery() {
-        if (kubeClient == null) {
-            LOGGER.debug("Kubernetes client configuration is null, using default values");
-            kubeClient = new DefaultKogitoKubeClient();
-        }
-        if (serviceDiscovery == null) {
-            LOGGER.debug("Creating and caching a new reference of ServiceDiscoveryFactory");
-            serviceDiscovery = new ServiceDiscoveryFactory(kubeClient).build();
-        }
-        return serviceDiscovery;
-    }
-    
-    /**
-     * Build a {@link ServiceDiscovery} reference with the custom {@link KogitoKubeClient}.
-     * @see #buildServiceDiscovery()
-     * @param kubeClient
-     * @return
-     */
-    protected ServiceDiscovery buildServiceDiscovery(KogitoKubeClient kubeClient) {
-        this.kubeClient = kubeClient;
-        return this.buildServiceDiscovery();
-    }
-
-    protected OkHttpClient buildHttpClient() {
-        if (http == null) {
-            LOGGER.debug("Creating and caching a new reference of OkHttpClient");
-            http = new OkHttpClient.Builder()
-                                             .connectTimeout(60, TimeUnit.SECONDS)
-                                             .writeTimeout(60, TimeUnit.SECONDS)
-                                             .readTimeout(60, TimeUnit.SECONDS)
-                                             .build();
-        }
-        return http;
-    }
-    
-    /**
-     * Removes a service from the registry
-     *  
-     * @param serviceName
-     * @return true if removed successfully
-     */
-    protected boolean removeService(String serviceName) {
-        return this.serviceEndpoints.remove(serviceName) != null;
-    }
-
-    /**
-     * Add a new service into the internal registry
-     * 
-     * @param serviceName
-     * @param service
-     */
-    protected void addServices(String serviceName, ServiceInfo service) {
-        if(service != null) {
-            LOGGER.debug("Adding a new service '{}' to the registry: {}", serviceName, service);
-            this.serviceEndpoints.put(serviceName, service);
-        }
-    }
-    
-    /**
-     * Retrieves a immutable list of services added to this reference. 
-     * 
-     * @return
-     */
-    protected Map<String, ServiceInfo> getServices() {
-        return Collections.unmodifiableMap(this.serviceEndpoints);
-    }
-    
-    /**
-     * Looks up service's endpoint (cluster ip + port) using label selector - meaning returns services that have given label.
-     * Services are looked up only in given namespace. 
-     * @param service label assign to a service that should be used as selector
-     * @return valid endpoint (in URL form) if found or runtime exception in case of no services found
-     */
-    protected ServiceInfo findEndpoint(String namespace, String service) {
-        LOGGER.debug("Looking for services. Services discovered so far {}", this.serviceEndpoints);
-        return this.buildServiceDiscovery().findEndpoint(namespace, service).orElseThrow(() -> new RuntimeException("No endpoint found for service " + service));
-    }
-
-    /**
-     * Discover valid service to be invoked in given namespace and serviceName. Where serviceName is 
-     * considered to be a label on the service .It uses service discovery
-     * base on label selectors to find the matching service endpoint (cluster ip and port)
-     * @param workItem work item that this handler is working on
-     * @param namespace namespace to look up services in
-     * @param serviceName name of the service to look up by - label
-     * @param method http method to be used when calling a service (supports GET, POST, PUT, DELETE)
-     * @return returns map of data that was returned from the service call
-     */
-    protected Map<String, Object> discoverAndCall(WorkItem workItem, String namespace, String serviceName, HttpMethods method) {
-        Map<String, Object> data = new HashMap<>(workItem.getParameters());
-        String service = (String) data.remove(serviceName);
-
-        // remove all internal fields before sending
-        INTERNAL_FIELDS.forEach(field -> data.remove(field));
-
-        // discover service endpoint
-        ServiceInfo endpoint = serviceEndpoints.computeIfAbsent(service, (s) -> findEndpoint(namespace, s));
-        LOGGER.debug("Found endpoint for service {} with location {}", service, endpoint);
-
-        RequestBody body = produceRequestPayload(data);
-        Request request = null;
-
-        switch (method) {
-            case POST:
-                request = producePostRequest(endpoint, body);
-                break;
-            case GET:
-                request = produceGetRequest(endpoint);
-                break;
-            case PUT:
-                request = producePutRequest(endpoint, body);
-                break;
-            case DELETE:
-                request = produceDeleteRequest(endpoint, body);
-                break;
-            default:
-                break;
-        }
-
-        try (Response response = this.buildHttpClient().newCall(request).execute()) {
-
-            Map<String, Object> results = produceResultsFromResponse(response);
-
-            return results;
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected RequestBody produceRequestPayload(Map<String, Object> data) {
-        if (data == null) {
-            return null;
-        }
-        try {
-            String json = mapper.writeValueAsString(data);
-            LOGGER.debug("Sending body {}", json);
-            RequestBody body = RequestBody.create(JSON, json);
-
-            return body;
-        } catch (Exception e) {
-            throw new RuntimeException("Unexpected error when producing request payload", e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    protected Map<String, Object> produceResultsFromResponse(Response response) throws IOException {
-        String payload = response.body().string();
-        LOGGER.debug("Resonse code {} and payload {}", response.code(), payload);
-
-        if (!response.isSuccessful()) {
-            throw new RuntimeException("Unsuccessful response from service " + response.message() + " (code " + response.code() + ")");
-        }
-
-        Map<String, Object> results = mapper.readValue(payload, Map.class);
-
-        return results;
-    }
-
-    protected Request producePostRequest(ServiceInfo endpoint, RequestBody body) {
-        Builder builder = new Request.Builder().url(endpoint.getUrl())
-                                               .post(body);
-        applyHeaders(endpoint, builder);
-
-        return builder.build();
-    }
-
-    protected Request produceGetRequest(ServiceInfo endpoint) {
-        Builder builder = new Request.Builder().url(endpoint.getUrl())
-                                               .get();
-        applyHeaders(endpoint, builder);
-
-        return builder.build();
-    }
-
-    protected Request producePutRequest(ServiceInfo endpoint, RequestBody body) {
-        Builder builder = new Request.Builder().url(endpoint.getUrl())
-                                               .put(body);
-        applyHeaders(endpoint, builder);
-
-        return builder.build();
-    }
-
-    protected Request produceDeleteRequest(ServiceInfo endpoint, RequestBody body) {
-        Builder builder = new Request.Builder().url(endpoint.getUrl())
-                                               .delete(body);
-        applyHeaders(endpoint, builder);
-
-        return builder.build();
-    }
-
-    protected void applyHeaders(ServiceInfo endpoint, Builder builder) {
-
-        if (endpoint.getHeaders() != null) {
-            for (Entry<String, String> header : endpoint.getHeaders().entrySet()) {
-                builder.addHeader(header.getKey(), header.getValue());
-            }
-        }
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/HttpMethods.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/HttpMethods.java
deleted file mode 100644
index 901f03ef9bc..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/HttpMethods.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-
-package org.kie.kogito.cloud.workitems;
-
-
-public enum HttpMethods {
-
-    GET, POST, PUT, DELETE;
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/ServiceInfo.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/ServiceInfo.java
deleted file mode 100644
index 5a590ace8c9..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/ServiceInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-
-package org.kie.kogito.cloud.workitems;
-
-import java.util.Map;
-
-public class ServiceInfo {
-
-    private final String url;
-    private final Map<String, String> headers;
-
-    public ServiceInfo(String url, Map<String, String> headers) {
-        this.url = url;
-        this.headers = headers;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public Map<String, String> getHeaders() {
-        return headers;
-    }
-
-    @Override
-    public String toString() {
-        return "ServiceInfo [url=" + url + ", headers=" + headers + "]";
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/BaseServiceDiscovery.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/BaseServiceDiscovery.java
deleted file mode 100644
index 859c74edd32..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/BaseServiceDiscovery.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.workitems.service.discovery;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
-import org.kie.kogito.cloud.workitems.ServiceInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class BaseServiceDiscovery implements ServiceDiscovery {
-
-    protected static final Logger LOGGER = LoggerFactory.getLogger(BaseServiceDiscovery.class);
-    static final String KEY_ITEMS = "items";
-    static final String KEY_SPEC = "spec";
-    static final String KEY_CLUSTER_IP = "clusterIP";
-    static final String DEFAULT_PROTOCOL = "http://";
-    static final int DEFAULT_PORT = 80;
-
-    protected KogitoKubeClient kubeClient;
-
-    public BaseServiceDiscovery(final KogitoKubeClient kubeClient) {
-        this.kubeClient = kubeClient;
-    }
-
-    /**
-     * Should implement the Services API query logic according to the infrastructure.   
-     * 
-     * @see {@link KubernetesServiceDiscovery} for reference
-     * @param namespace the namespace where to query the service from
-     * @param labelKey an optional label key specified by the service
-     * @param labelValue an optional label value specified by the service
-     * @return a list of <a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#service-v1-core">Service specification</a> in a map structure based on the JSON server response
-     */
-    protected abstract List<Map<String, Object>> query(final String namespace, Map<String, String> labels);
-
-    /**
-     * Should build the {@link ServiceInfo} object based on the {@link #query(String, Map)} returned value.
-     * 
-     * @param services
-     * @return
-     */
-    protected abstract ServiceInfo buildService(final List<Map<String, Object>> services, final String service);
-
-    private Map<String, String> buildLabelMap(final String labelKey, final String labelValue) {
-        if (labelKey == null || labelKey.isEmpty()) {
-            return null;
-        } else {
-            return Collections.singletonMap(labelKey, labelValue);
-        }
-    }
-
-    public final Optional<ServiceInfo> findEndpoint(String namespace, String labelKey, String labelValue) {
-        LOGGER.debug("About to query for endpoints in namespace {} with labels {}:{}", namespace, labelKey, labelValue);
-        final List<Map<String, Object>> services = query(namespace, this.buildLabelMap(labelKey, labelValue));
-        LOGGER.debug("Result of services query: {}", services);
-
-        if (services.size() > 1) {
-            LOGGER.warn("Found more than one endpoint using labels {}:{}. Returning the first one in the list. Try to be more specific in the query search.",
-                        labelKey,
-                        labelValue);
-        } else if (services.isEmpty()) {
-            LOGGER.warn("Haven't found any endpoint in the namespace {} with labels {}:{}", namespace, labelKey, labelValue);
-            return Optional.empty();
-        }
-
-        return Optional.of(this.buildService(services, labelValue == null || labelValue.isEmpty() ? labelKey : labelValue));
-    }
-
-    public final Optional<ServiceInfo> findEndpoint(String namespace, String service) {
-        return this.findEndpoint(namespace, service, null);
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java
deleted file mode 100644
index 5c143a4d217..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/IstioServiceDiscovery.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.workitems.service.discovery;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
-import org.kie.kogito.cloud.kubernetes.client.operations.MapWalker;
-import org.kie.kogito.cloud.workitems.ServiceInfo;
-
-public class IstioServiceDiscovery extends BaseServiceDiscovery {
-
-    private static final String SERVICE_KEY_HOST = "HOST";
-    private static final String KEY_STATUS = "status";
-    /**
-     * Key field for service endpoint on KNative Serving 0.6.x and bellow
-     */
-    private static final String KEY_DOMAIN = "domain";
-    /**
-     * Key field for service endpoint on KNative Serving 0.7+
-     * 
-     * @see <a href="https://github.com/knative/serving/blob/master/docs/spec/spec.md#service">KNative Serving Service spec</a>
-     */
-    private static final String KEY_URL = "url";
-    private static final String PROTOCOL_REGEX = "^(http:\\/\\/www\\.|https:\\/\\/www\\.|http:\\/\\/|https:\\/\\/)";
-
-    private final String istioGatewayUrl;
-
-    public IstioServiceDiscovery(final KogitoKubeClient kubeClient, final String istioGatewayUrl) {
-        super(kubeClient);
-        this.istioGatewayUrl = istioGatewayUrl;
-    }
-
-    @Override
-    protected List<Map<String, Object>> query(String namespace, Map<String, String> labels) {
-        return kubeClient.knativeService()
-                         .listNamespaced(namespace, labels)
-                         .asMapWalker()
-                         .mapToListMap(KEY_ITEMS)
-                         .asList();
-    }
-
-    @Override
-    protected ServiceInfo buildService(List<Map<String, Object>> services, final String service) {
-        final Map<String, String> headers = new HashMap<>();
-        final Map<String, Object> response = new MapWalker(services.get(0)).mapToMap(KEY_STATUS).asMap();
-        String endpoint = "";
-        if (response.containsKey(KEY_URL)) {
-            endpoint = response.get(KEY_URL).toString().replaceAll(PROTOCOL_REGEX, "").replaceAll(PROTOCOL_REGEX, "");
-            LOGGER.debug("Found key {} using endpoint: {}", KEY_URL, endpoint);
-        } else {
-            endpoint = response.get(KEY_DOMAIN).toString();
-            LOGGER.debug("Found key {} using endpoint: {}", KEY_DOMAIN, endpoint);
-        }
-        headers.put(SERVICE_KEY_HOST, endpoint);
-        LOGGER.debug("Headers to be used for requests {}", headers);
-        return new ServiceInfo(String.format("%s%s", this.istioGatewayUrl, service), headers);
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscovery.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscovery.java
deleted file mode 100644
index 766f9751d73..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscovery.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.workitems.service.discovery;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
-import org.kie.kogito.cloud.kubernetes.client.operations.MapWalker;
-import org.kie.kogito.cloud.workitems.ServiceInfo;
-
-public class KubernetesServiceDiscovery extends BaseServiceDiscovery {
-
-    private static final String KEY_PORTS = "ports";
-    private static final String KEY_PORT = "port";
-
-    public KubernetesServiceDiscovery(final KogitoKubeClient kubeClient) {
-        super(kubeClient);
-    }
-
-    @Override
-    protected List<Map<String, Object>> query(String namespace, Map<String, String> labels) {
-        return kubeClient.services()
-                         .listNamespaced(namespace, labels)
-                         .asMapWalker()
-                         .mapToListMap(KEY_ITEMS)
-                         .asList();
-    }
-
-    @Override
-    protected ServiceInfo buildService(List<Map<String, Object>> services, String service) {
-        final StringBuilder url = new StringBuilder();
-        url
-           .append(DEFAULT_PROTOCOL)
-           .append(new MapWalker(services.get(0)).mapToMap(KEY_SPEC).asMap().get(KEY_CLUSTER_IP))
-           .append(":")
-           .append(new MapWalker(services.get(0)).mapToMap(KEY_SPEC)
-                                                 .mapToListMap(KEY_PORTS)
-                                                 .listToMap(0)
-                                                 .asMap().get(KEY_PORT))
-           .append("/")
-           .append(service);
-
-        return new ServiceInfo(url.toString(), new HashMap<>());
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscovery.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscovery.java
deleted file mode 100644
index 220ddc97623..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscovery.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.workitems.service.discovery;
-
-import java.util.Optional;
-
-import org.kie.kogito.cloud.workitems.ServiceInfo;
-
-/**
- * Service Discovery mechanism: tries to discover the desired endpoint based on the cluster infrastructure: Kubernetes, OpenShift, Istio/KNative or Operators. 
- */
-public interface ServiceDiscovery {
-
-    /**
-     * Finds an endpoint based on a namespace and the specified label. 
-     * If more than one service is found, the first one is returned.  
-     * The service must reside within the namespace. 
-     * 
-     * @param namespace the namespace where to look for the namespace. Can't be null.
-     * @param labelKey optional label key.
-     * @param labelValue optional label value. Ignored if key is empty.
-     * @return
-     */
-    public Optional<ServiceInfo> findEndpoint(final String namespace, final String labelKey, final String labelValue);
-
-    /**
-     * Finds an endpoint based on a namespace with a label key equals to the name of the service. 
-     * If more than one service is found, the first one is returned. 
-     * The service must reside within the namespace.   
-     * 
-     * @param namespace the namespace where to look for the namespace. Can't be null.
-     * @param service the service name that should match with any label in the Kubernetes Service.    
-     * @return
-     */
-    public Optional<ServiceInfo> findEndpoint(final String namespace, final String service);
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java b/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java
deleted file mode 100644
index 0f669fe2692..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/main/java/org/kie/kogito/cloud/workitems/service/discovery/ServiceDiscoveryFactory.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-package org.kie.kogito.cloud.workitems.service.discovery;
-
-import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class ServiceDiscoveryFactory {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ServiceDiscoveryFactory.class);
-
-    private KogitoKubeClient kubeClient;
-    private boolean istioEnv;
-    private String istioGatewayUrl;
-
-    /**
-     * Creates a new {@link ServiceDiscovery} reference for service discovery across a Kubernetes cluster
-     * @param kubeClient the {@link KogitoKubeClient} reference. If null, a new {@link DefaultKogitoKubeClient} will be created for you during the {@link ServiceDiscovery} {@link #build()}
-     */
-    public ServiceDiscoveryFactory(final KogitoKubeClient kubeClient) {
-        this.kubeClient = kubeClient;
-        this.discoverIstioGatewayUrl();
-    }
-
-    /**
-     * Creates the {@link ServiceDiscovery} reference based on {@link KogitoKubeClient} for this instance
-     * @return
-     */
-    public ServiceDiscovery build() {
-        if(kubeClient == null) {
-            this.kubeClient = new DefaultKogitoKubeClient();
-        }
-        
-        if (this.isIstioEnv()) {
-            return new IstioServiceDiscovery(kubeClient, this.getIstioGatewayUrl());
-        } else {
-            return new KubernetesServiceDiscovery(kubeClient);
-        }
-    }
-
-    public boolean isIstioEnv() {
-        return istioEnv;
-    }
-
-    public String getIstioGatewayUrl() {
-        return istioGatewayUrl;
-    }
-
-    private void discoverIstioGatewayUrl() {
-        LOGGER.debug("Trying to discover Istio Gateway URL");
-        try {
-            final String clusterIp =
-                    (String) kubeClient.istioGateway()
-                                       .get()
-                                       .asMapWalker(true)
-                                       .mapToMap(BaseServiceDiscovery.KEY_SPEC)
-                                       .asMap()
-                                       .get(BaseServiceDiscovery.KEY_CLUSTER_IP);
-            if (clusterIp == null || clusterIp.isEmpty()) {
-                LOGGER.debug("Not in Istio environment");
-                this.istioEnv = false;
-                this.istioGatewayUrl = null;
-            } else {
-                this.istioEnv = true;
-                this.istioGatewayUrl =
-                        new StringBuilder()
-                                           .append(BaseServiceDiscovery.DEFAULT_PROTOCOL)
-                                           .append(clusterIp)
-                                           .append(":")
-                                           .append(BaseServiceDiscovery.DEFAULT_PORT)
-                                           .append("/")
-                                           .toString();
-                LOGGER.debug("Discovered Istio Gateway URL {}. Will use Istio as default service discovery mechanism", this.istioGatewayUrl);
-            }
-        } catch (Exception ex) {
-            this.istioEnv = false;
-            this.istioGatewayUrl = null;
-            LOGGER.debug("Failed to look up for Istio Gateway URL: '{}'. Enable debug logging to view the full stack trace. Failing back to standard Service API.", ex.getMessage());
-            LOGGER.debug("Error while trying to fetch for Istio Gateway URL", ex);
-        }
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
deleted file mode 100644
index 8610840107d..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/BaseKubernetesDiscoveredServiceTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-
-package org.kie.kogito.cloud.workitems;
-
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.ServiceResource;
-import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.kie.api.runtime.process.WorkItem;
-import org.kie.api.runtime.process.WorkItemManager;
-import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
-
-/**
- * Base class for tests with Kubernetes API. In this scenario, nor Istio or KNative is available.
- */
-public abstract class BaseKubernetesDiscoveredServiceTest {
-
-    public KubernetesServer server = new KubernetesServer(true, true);
-
-    public static final String MOCK_NAMESPACE = "mock-namespace";
-
-    private boolean enableIstio;
-    private boolean istioEnabled;
-
-    public BaseKubernetesDiscoveredServiceTest() {
-        this.enableIstio = false;
-    }
-
-    public BaseKubernetesDiscoveredServiceTest(final boolean enableIstio) {
-        this.enableIstio = enableIstio;
-    }
-
-    @BeforeEach
-    public void before() {
-        server.before();
-        if (this.enableIstio) {
-            this.createsIstioIngressGateway();
-        }
-    }
-
-    @AfterEach
-    public void after() {
-        server.after();
-    }
-
-    public boolean isIstioEnabled() {
-        return istioEnabled;
-    }
-
-    protected KubernetesClient getClient() {
-        return server.getClient().inNamespace(MOCK_NAMESPACE);
-    }
-
-    /**
-     * Enables Istio in the test environment.
-     */
-    private void createsIstioIngressGateway() {
-        final ServiceResource<Service, ?> serviceResource =
-                this.server.getClient()
-                           .inNamespace(KogitoKubeConfig.KNATIVE_ISTIO_NAMESPACE)
-                           .services()
-                           .load(this.getClass().getResource("/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json"));
-        this.server.getClient()
-                   .inNamespace(KogitoKubeConfig.KNATIVE_ISTIO_NAMESPACE)
-                   .services().create(serviceResource.get());
-        this.istioEnabled = true;
-    }
-
-    protected static class TestDiscoveredServiceWorkItemHandler extends DiscoveredServiceWorkItemHandler {
-
-        public TestDiscoveredServiceWorkItemHandler(BaseKubernetesDiscoveredServiceTest testCase) {
-            super(new DefaultKogitoKubeClient().withConfig(new KogitoKubeConfig(testCase.getClient())));
-        }
-
-        @Override
-        public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {}
-
-        @Override
-        public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {}
-
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
deleted file mode 100644
index 43c96e032db..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/DiscoveredServiceWorkItemHandlerTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-
-package org.kie.kogito.cloud.workitems;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-
-import okhttp3.Call;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okio.Buffer;
-import okio.BufferedSource;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.kie.api.runtime.process.WorkItem;
-import org.kie.api.runtime.process.WorkItemManager;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeClient;
-import org.kie.kogito.cloud.workitems.service.discovery.ServiceDiscovery;
-import org.mockito.Mockito;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-public class DiscoveredServiceWorkItemHandlerTest {
-    
-    
-    private OkHttpClient httpClient;
-
-    @BeforeEach
-    public void setup() {
-        httpClient = mock(OkHttpClient.class);
-    }
-    
-    @Test
-    public void testGivenEndpoint() throws IOException {
-        DiscoveredServiceWorkItemHandler handler = new TestDiscoveredServiceWorkItemHandler("test", "http://testhost:9000"); 
-        
-        WorkItem workItem = Mockito.mock(WorkItem.class);
-        when(workItem.getParameters()).thenReturn(Collections.singletonMap("service", "test"));
-        
-        Call call = mock(Call.class);
-        ResponseBody body = new ResponseBody() {
-            private String content = "{\"test\" : \"fake\"}";
-            @Override
-            public BufferedSource source() {
-                Buffer b = new Buffer();
-                b.write(content.getBytes());
-                return b;
-            }
-            
-            @Override
-            public MediaType contentType() {
-                return MediaType.parse("application/json");
-            }
-            
-            @Override
-            public long contentLength() {
-                return content.length();
-            }
-        };
-        Response response = new Response.Builder().body(body).protocol(Protocol.HTTP_1_1).message("test").request(new Request.Builder().url("http://localhost:9000").build()).code(200).build();
-                
-     
-        when(call.execute()).thenReturn(response);
-        when(httpClient.newCall(any())).thenReturn(call);
-        
-        Map<String, Object> results = handler.discoverAndCall(workItem, "", "service", HttpMethods.POST);
-        
-        assertThat(results).isNotNull().containsKey("test").containsValue("fake");
-    }
-    
-    private class TestDiscoveredServiceWorkItemHandler extends DiscoveredServiceWorkItemHandler {
-
-        public TestDiscoveredServiceWorkItemHandler(String service, String endpoint) {
-            super();
-            this.addServices(service, new ServiceInfo(endpoint, null));
-        }
-        
-        @Override
-        public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {
-        }
-
-        @Override
-        public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
-        }
-
-        @Override
-        protected OkHttpClient buildHttpClient() {
-            return httpClient;
-        }
-        
-        @Override
-        protected ServiceDiscovery buildServiceDiscovery(KogitoKubeClient kubeClient) {
-            return mock(ServiceDiscovery.class);
-        }
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java
deleted file mode 100644
index 00a17a5904c..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KNativeDiscoveredServiceWorkItemHandlerTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-
-package org.kie.kogito.cloud.workitems;
-
-import io.fabric8.kubernetes.api.model.KubernetesList;
-import io.fabric8.kubernetes.client.dsl.RecreateFromServerGettable;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class KNativeDiscoveredServiceWorkItemHandlerTest extends BaseKubernetesDiscoveredServiceTest {
-
-    public KNativeDiscoveredServiceWorkItemHandlerTest() {
-        super(true);
-    }
-
-    @Test
-    public void whenExistsAServiceWithKNative() {
-        final RecreateFromServerGettable<KubernetesList, KubernetesList, ?> serviceResource =
-                this.getClient().lists().load(this.getClass().getResource("/mock/responses/ocp4.x/knative/serving.knative.dev-services.json"));
-        this.getClient().lists().create(serviceResource.get());
-
-        final DiscoveredServiceWorkItemHandler handler = new TestDiscoveredServiceWorkItemHandler(this);
-        final ServiceInfo serviceInfo = handler.findEndpoint(MOCK_NAMESPACE, "employeeValidation");
-        assertThat(serviceInfo, notNullValue());
-        assertThat(serviceInfo.getUrl(), is("http://172.30.101.218:80/employeeValidation"));
-        assertThat(serviceInfo.getHeaders().get("HOST"), is("onboarding-hr.test.apps.example.com"));
-    }
-
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
deleted file mode 100644
index edb616c15f5..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/KubernetesDiscoveredServiceWorkItemHandlerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2019 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-
-package org.kie.kogito.cloud.workitems;
-
-import java.io.IOException;
-import java.util.Collections;
-
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.LoadBalancerStatus;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.ServicePort;
-import io.fabric8.kubernetes.api.model.ServiceSpec;
-import io.fabric8.kubernetes.api.model.ServiceStatus;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
-
-
-public class KubernetesDiscoveredServiceWorkItemHandlerTest extends BaseKubernetesDiscoveredServiceTest {
-
-    @Test
-    public void testGivenServiceExists() {
-        final ServiceSpec serviceSpec = new ServiceSpec();
-        serviceSpec.setPorts(Collections.singletonList(new ServicePort("http", 0, 8080, "http", new IntOrString(8080))));
-        serviceSpec.setClusterIP("172.30.158.31");
-        serviceSpec.setType("ClusterIP");
-        serviceSpec.setSessionAffinity("ClientIP");
-
-        final ObjectMeta metadata = new ObjectMeta();
-        metadata.setName("test-kieserver");
-        metadata.setNamespace(MOCK_NAMESPACE);
-        metadata.setLabels(Collections.singletonMap("test-kieserver", "service"));
-
-        final Service service = new Service("v1", "Service", metadata, serviceSpec, new ServiceStatus(new LoadBalancerStatus()));
-        getClient().services().create(service);
-
-        final DiscoveredServiceWorkItemHandler handler = new TestDiscoveredServiceWorkItemHandler(this);
-        final ServiceInfo serviceInfo = handler.findEndpoint(MOCK_NAMESPACE, "test-kieserver");
-        assertThat(serviceInfo, notNullValue());
-        assertThat(serviceInfo.getUrl(), is("http://172.30.158.31:8080/test-kieserver"));
-    }
-
-    @Test
-    public void testGivenServiceNotExists() throws IOException {
-        final DiscoveredServiceWorkItemHandler handler = new TestDiscoveredServiceWorkItemHandler(this);
-        try {
-            handler.findEndpoint(MOCK_NAMESPACE, "test-kieserver");
-            fail("Finding of non existing endpoint should throw RuntimeException.");
-        } catch (RuntimeException ex) {
-            assertThat(ex.getMessage(), containsString("No endpoint found"));
-        }
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryTest.java b/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryTest.java
deleted file mode 100644
index afdb6ae35e4..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/java/org/kie/kogito/cloud/workitems/service/discovery/KubernetesServiceDiscoveryTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2020 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- *
- *      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.
- */
-
-package org.kie.kogito.cloud.workitems.service.discovery;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.ServiceBuilder;
-import io.fabric8.kubernetes.api.model.ServicePort;
-import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.kie.kogito.cloud.kubernetes.client.DefaultKogitoKubeClient;
-import org.kie.kogito.cloud.kubernetes.client.KogitoKubeConfig;
-import org.kie.kogito.cloud.workitems.ServiceInfo;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class KubernetesServiceDiscoveryTest {
-
-    public static final String NAMESPACE = "mockns";
-
-    public static final String SERVICE_PROTOCOL = "http";
-    public static final int SERVICE_PORT = 8080;
-
-    public KubernetesServer server = new KubernetesServer(true, true);
-
-    public KubernetesServiceDiscovery kubernetesServiceDiscovery;
-
-    @BeforeEach
-    public void before() {
-        server.before();
-        kubernetesServiceDiscovery = new KubernetesServiceDiscovery(new DefaultKogitoKubeClient().withConfig(new KogitoKubeConfig(server.getClient())));
-    }
-
-    @AfterEach
-    public void after() {
-        server.after();
-    }
-
-    @Test
-    public void findSingleEndpoint() {
-        String serviceLabelName = "test-kogito";
-        String serviceLabelValue = "service";
-        String serviceName = "test-kogito-service";
-        String serviceIp = "172.30.158.30";
-        String serviceUrl = getServiceUrl(serviceIp) + "/" + serviceLabelValue;
-
-        createServiceInMockServer(serviceName, serviceIp, Collections.singletonMap(serviceLabelName, serviceLabelValue));
-
-        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, serviceLabelName, serviceLabelValue);
-        assertThat(endpoint).hasValueSatisfying(serviceInfo -> {
-            assertThat(serviceInfo.getUrl()).isEqualTo(serviceUrl);
-        });
-    }
-
-    @Test
-    public void findEndpointFromTwoServicesWithSameLabel() {
-        String sharedServiceLabelName = "test-kogito";
-        String sharedServiceLabelValue = "service";
-        String serviceOneName = "test-kogito-service";
-        String serviceOneIp = "172.30.158.31";
-        String serviceOneUrl = getServiceUrl(serviceOneIp) + "/" + sharedServiceLabelValue;
-        String serviceTwoName = "test-kogito-service-two";
-        String serviceTwoIp = "172.30.158.32";
-        String serviceTwoUrl = getServiceUrl(serviceTwoIp) + "/" + sharedServiceLabelValue;
-
-        createServiceInMockServer(serviceOneName, serviceOneIp, Collections.singletonMap(sharedServiceLabelName, sharedServiceLabelValue));
-        createServiceInMockServer(serviceTwoName, serviceTwoIp, Collections.singletonMap(sharedServiceLabelName, sharedServiceLabelValue));
-
-        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, sharedServiceLabelName, sharedServiceLabelValue);
-        // Returns one of the endpoints (order is not specified)
-        assertThat(endpoint).hasValueSatisfying(serviceInfo -> {
-            assertThat(serviceInfo.getUrl()).isIn(serviceOneUrl, serviceTwoUrl);
-        });
-    }
-
-    @Test
-    public void findEndpointFromTwoServicesWithSameLabelsButDifferentValues() {
-        String sharedServiceLabelName = "test-kogito";
-        String serviceOneLabelValue = "service";
-        String serviceOneName = "test-kogito-service";
-        String serviceOneIp = "172.30.158.31";
-        String serviceOneUrl = getServiceUrl(serviceOneIp) + "/" + serviceOneLabelValue;
-        String serviceTwoLabelValue = "servicetwo";
-        String serviceTwoName = "test-kogito-service-two";
-        String serviceTwoIp = "172.30.158.32";
-        String serviceTwoUrl = getServiceUrl(serviceTwoIp) + "/" + serviceTwoLabelValue;
-
-        createServiceInMockServer(serviceOneName, serviceOneIp, Collections.singletonMap(sharedServiceLabelName, serviceOneLabelValue));
-        createServiceInMockServer(serviceTwoName, serviceTwoIp, Collections.singletonMap(sharedServiceLabelName, serviceTwoLabelValue));
-
-        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, sharedServiceLabelName, serviceOneLabelValue);
-        assertThat(endpoint).hasValueSatisfying(serviceInfo -> {
-            assertThat(serviceInfo.getUrl()).isEqualTo(serviceOneUrl);
-        });
-        Optional<ServiceInfo> endpointTwo = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, sharedServiceLabelName, serviceTwoLabelValue);
-        assertThat(endpointTwo).hasValueSatisfying(serviceInfo -> {
-            assertThat(serviceInfo.getUrl()).isEqualTo(serviceTwoUrl);
-        });
-    }
-
-    @Test
-    public void findEndpointNoServiceDeployed() {
-        String serviceLabelName = "test-kogito";
-        String serviceLabelValue = "service";
-
-        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, serviceLabelName, serviceLabelValue);
-        assertThat(endpoint).isEmpty();
-    }
-
-    @Test
-    public void findEndpointServiceDeployedWithDifferentValue() {
-        String sharedServiceLabelName = "test-kogito";
-        String serviceOneLabelValue = "service";
-        String serviceOneName = "test-kogito-service";
-        String serviceOneIp = "172.30.158.31";
-        String serviceTwoLabelValue = "servicetwo";
-
-        createServiceInMockServer(serviceOneName, serviceOneIp, Collections.singletonMap(sharedServiceLabelName, serviceOneLabelValue));
-
-        Optional<ServiceInfo> endpoint = kubernetesServiceDiscovery.findEndpoint(NAMESPACE, sharedServiceLabelName, serviceTwoLabelValue);
-        assertThat(endpoint).isEmpty();
-    }
-
-    private void createServiceInMockServer(String name, String serviceIp, Map<String,String> labels) {
-        final ServicePort port = new ServicePort(SERVICE_PROTOCOL, 0, SERVICE_PORT, SERVICE_PROTOCOL, new IntOrString(SERVICE_PORT));
-        final Service service = new ServiceBuilder().withNewMetadata()
-                                                        .withName(name)
-                                                        .withLabels(labels)
-                                                    .endMetadata()
-                                                    .withNewSpec()
-                                                        .withClusterIP(serviceIp)
-                                                        .withType("ClusterIP")
-                                                        .withSessionAffinity("ClientIP")
-                                                        .withPorts(port)
-                                                    .endSpec()
-                                                    .build();
-        server.getClient().services().inNamespace(NAMESPACE).create(service);
-    }
-
-    private String getServiceUrl(String serviceIp) {
-        return SERVICE_PROTOCOL + "://" + serviceIp + ":" + SERVICE_PORT;
-    }
-}
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/logback-test.xml b/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/logback-test.xml
deleted file mode 100644
index 1d010883b43..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="INFO">
-    <appender-ref ref="STDOUT"/>
-  </root>
-</configuration>
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json b/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json
deleted file mode 100644
index b7981abee6b..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/istio/services-istio-ingressgateway.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-	"kind": "Service",
-	"apiVersion": "v1",
-	"metadata": {
-		"name": "istio-ingressgateway",
-		"namespace": "istio-system",
-		"labels": {
-			"app": "istio-ingressgateway",
-			"chart": "gateways",
-			"heritage": "Tiller",
-			"istio": "ingressgateway",
-			"maistra-version": "0.10.0",
-			"release": "istio"
-		},
-		"ownerReferences": [
-			{
-				"apiVersion": "istio.openshift.com/v1alpha3",
-				"kind": "ControlPlane",
-				"name": "minimal-istio",
-				"uid": "be2b0fc2-a7d9-11e9-b86c-02ff077e3f52",
-				"controller": true,
-				"blockOwnerDeletion": true
-			}
-		]
-	},
-	"spec": {
-		"ports": [
-			{
-				"name": "http2",
-				"protocol": "TCP",
-				"port": 80,
-				"targetPort": 80,
-				"nodePort": 31380
-			},
-			{
-				"name": "https",
-				"protocol": "TCP",
-				"port": 443,
-				"targetPort": 443,
-				"nodePort": 31390
-			},
-			{
-				"name": "tcp",
-				"protocol": "TCP",
-				"port": 31400,
-				"targetPort": 31400,
-				"nodePort": 31400
-			},
-			{
-				"name": "https-kiali",
-				"protocol": "TCP",
-				"port": 15029,
-				"targetPort": 15029,
-				"nodePort": 31184
-			},
-			{
-				"name": "https-prometheus",
-				"protocol": "TCP",
-				"port": 15030,
-				"targetPort": 15030,
-				"nodePort": 32448
-			},
-			{
-				"name": "https-grafana",
-				"protocol": "TCP",
-				"port": 15031,
-				"targetPort": 15031,
-				"nodePort": 32364
-			},
-			{
-				"name": "https-tracing",
-				"protocol": "TCP",
-				"port": 15032,
-				"targetPort": 15032,
-				"nodePort": 32760
-			},
-			{
-				"name": "tls",
-				"protocol": "TCP",
-				"port": 15443,
-				"targetPort": 15443,
-				"nodePort": 31520
-			},
-			{
-				"name": "status-port",
-				"protocol": "TCP",
-				"port": 15020,
-				"targetPort": 15020,
-				"nodePort": 31358
-			}
-		],
-		"selector": {
-			"app": "istio-ingressgateway",
-			"istio": "ingressgateway",
-			"maistra-version": "0.10.0",
-			"release": "istio"
-		},
-		"clusterIP": "172.30.101.218",
-		"type": "LoadBalancer",
-		"sessionAffinity": "None",
-		"externalTrafficPolicy": "Cluster"
-	},
-	"status": {
-		"loadBalancer": {
-			"ingress": [
-				{
-					"hostname": "example.com"
-				}
-			]
-		}
-	}
-}
\ No newline at end of file
diff --git a/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/knative/serving.knative.dev-services.json b/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/knative/serving.knative.dev-services.json
deleted file mode 100644
index 465860e1145..00000000000
--- a/kogito-cloud-services/kogito-cloud-workitems/src/test/resources/mock/responses/ocp4.x/knative/serving.knative.dev-services.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-	"apiVersion": "serving.knative.dev/v1alpha1",
-	"kind": "ServiceList",
-	"metadata": {
-		"continue": ""
-	},
-	"items": [
-		{
-			"apiVersion": "serving.knative.dev/v1alpha1",
-			"kind": "Service",
-			"metadata": {
-				"annotations": {
-					"serving.knative.dev/creator": "kube:admin",
-					"serving.knative.dev/lastModifier": "kube:admin"
-				},
-				"labels": {
-					"department": "process",
-					"employeeValidation": "process",
-					"id": "process"
-				},
-				"name": "onboarding-hr",
-				"uid": "3c62c345-a8bd-11e9-83df-02ff077e3f52"
-			},
-			"spec": {
-				"template": {
-					"spec": {
-						"containers": [
-							{
-								"env": [
-									{
-										"name": "NAMESPACE",
-										"value": "test"
-									}
-								],
-								"image": "docker.io/mswiderski/onboarding-hr:0.1",
-								"name": "user-container",
-								"resources": {
-									"limits": {
-										"cpu": "1",
-										"memory": "200M"
-									},
-									"requests": {
-										"cpu": "400m",
-										"memory": "100M"
-									}
-								}
-							}
-						],
-						"timeoutSeconds": 300
-					}
-				},
-				"traffic": [
-					{
-						"latestRevision": true,
-						"percent": 100
-					}
-				]
-			},
-			"status": {
-				"address": {
-					"url": "http://onboarding-hr.test.svc.cluster.local"
-				},
-				"conditions": [
-					{
-						"status": "True",
-						"type": "ConfigurationsReady"
-					},
-					{
-						"status": "True",
-						"type": "Ready"
-					},
-					{
-						"status": "True",
-						"type": "RoutesReady"
-					}
-				],
-				"latestCreatedRevisionName": "onboarding-hr-zgjk8",
-				"latestReadyRevisionName": "onboarding-hr-zgjk8",
-				"observedGeneration": 1,
-				"traffic": [
-					{
-						"latestRevision": true,
-						"percent": 100,
-						"revisionName": "onboarding-hr-zgjk8"
-					}
-				],
-				"url": "http://onboarding-hr.test.apps.example.com"
-			}
-		}
-	]
-}
diff --git a/kogito-cloud-services/pom.xml b/kogito-cloud-services/pom.xml
deleted file mode 100644
index fc39320db6c..00000000000
--- a/kogito-cloud-services/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-cloud</artifactId>
-    <version>8.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>kogito-cloud-services</artifactId>
-  <packaging>pom</packaging>
-  <name>Kogito Cloud Services</name>
-  <description>Kogito Cloud Services</description>
-
-  <modules>
-    <module>kogito-cloud-workitems</module>
-    <module>kogito-cloud-kubernetes-client</module>
-  </modules>
-</project>
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 97dd9f78ade..00000000000
--- a/pom.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.kie.kogito</groupId>
-  <artifactId>kogito-cloud</artifactId>
-  <version>8.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>Kogito Cloud</name>
-  <description>Kogito Cloud</description>
-
-  <url>http://kogito.kie.org</url>
-  <inceptionYear>2019</inceptionYear>
-  <organization>
-    <name>JBoss by Red Hat</name>
-    <url>http://www.jboss.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <version.source.plugin>3.0.1</version.source.plugin>
-    <version.jar.plugin>3.1.0</version.jar.plugin>
-  </properties>
-
-  <!-- distributionManagement section -->
-  <distributionManagement>
-    <repository>
-      <id>jboss-releases-repository</id>
-      <name>JBoss Releases Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
-    </repository>
-    <snapshotRepository>
-      <id>jboss-snapshots-repository</id>
-      <name>JBoss Snapshot Repository</name>
-      <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-  <repositories>
-    <!-- Bootstrap repository to locate the parent pom when the parent pom 
-      has not been build locally. -->
-    <repository>
-      <id>jboss-public-repository-group</id>
-      <name>JBoss Public Repository Group</name>
-      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-      <layout>default</layout>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>daily</updatePolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <scm>
-    <connection>scm:git:https://github.com/kiegroup/kogito-cloud.git</connection>
-    <developerConnection>scm:git:git@github.com:kiegroup/kogito-cloud.git</developerConnection>
-    <url>https://github.com/kiegroup/kogito-cloud</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <name>All developers are listed on the team website</name>
-      <url>http://kogito.kie.org/community/team.html</url>
-    </developer>
-  </developers>
-
-  <modules>
-    <module>kogito-cloud-services</module>
-  </modules>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-bom</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <!-- Packaging -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>${version.jar.plugin}</version>
-          <executions>
-            <execution>
-              <id>default-jar</id>
-              <configuration>
-                <archive>
-                  <manifestEntries combine.children="append">
-                    <Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
-                  </manifestEntries>
-                </archive>
-              </configuration>
-            </execution>
-            <!-- No OSGi manifestEntries for <goal>jar</goal>: if it supported, then felix has already added them -->
-            <execution>
-              <id>test-jar</id>
-              <goals>
-                <goal>test-jar</goal>
-              </goals>
-              <configuration>
-                <skipIfEmpty>true</skipIfEmpty>
-                <excludes>
-                  <exclude>**/logback-test.xml</exclude>
-                  <exclude>**/jndi.properties</exclude>
-                </excludes>
-                <archive>
-                  <manifestEntries>
-                    <Bundle-SymbolicName>${java.module.name}.tests</Bundle-SymbolicName>
-                    <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}</Bundle-Version>
-                    <Bundle-Name>${project.name}</Bundle-Name>
-                    <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
-                  </manifestEntries>
-                </archive>
-              </configuration>
-            </execution>
-          </executions>
-          <configuration>
-            <archive>
-              <manifest>
-                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              </manifest>
-            </archive>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>${version.source.plugin}</version>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <goals>
-                <goal>jar-no-fork</goal>
-              </goals>
-              <configuration>
-                <archive>
-                  <manifestEntries>
-                    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-                    <Bundle-SymbolicName>${java.module.name}.source</Bundle-SymbolicName>
-                    <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}</Bundle-Version>
-                    <Bundle-Name>${project.name}</Bundle-Name>
-                    <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
-                    <Eclipse-SourceBundle>${java.module.name};version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}";roots:="."</Eclipse-SourceBundle>
-                  </manifestEntries>
-                </archive>
-              </configuration>
-            </execution>
-            <execution>
-              <id>attach-test-sources</id>
-              <goals>
-                <goal>test-jar-no-fork</goal>
-              </goals>
-              <configuration>
-                <archive>
-                  <manifestEntries>
-                    <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-                    <Bundle-SymbolicName>${java.module.name}.tests.source</Bundle-SymbolicName>
-                    <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}</Bundle-Version>
-                    <Bundle-Name>${project.name}</Bundle-Name>
-                    <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
-                    <Eclipse-SourceBundle>${java.module.name}.tests;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${osgi.snapshot.qualifier}";roots:="."</Eclipse-SourceBundle>
-                  </manifestEntries>
-                </archive>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <!-- Entry needed to create test-jars even for packaging types war, bundle, ... -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <!-- Entry needed to create, install and deploy sources jars -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>

From a37f45575c7d75683c6584bcdaab8708bda14b03 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 13 Mar 2020 16:07:30 -0300
Subject: [PATCH 103/709] [KOGITO-1294] - Support for binary builds (#101)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 s2i/Makefile                                  |  2 +-
 s2i/kogito-quarkus-overrides.yaml             |  3 ++
 s2i/kogito-springboot-overrides.yaml          |  3 ++
 s2i/modules/kogito-s2i-core/added/s2i-core    | 29 +++++++++++++--
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 35 ++++++++++++++++++-
 .../features/kogito-quarkus-jvm-ubi8.feature  | 30 +++++++++++++++-
 .../features/kogito-springboot-ubi8.feature   | 28 +++++++++++++++
 s2i/tests/test-apps/clone-repo.sh             |  6 +++-
 8 files changed, 130 insertions(+), 6 deletions(-)

diff --git a/s2i/Makefile b/s2i/Makefile
index cd85a9a6876..fb2b1116158 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -31,9 +31,9 @@ kogito-jobs-service:
 # Build and test all images
 .PHONY: test
 test:
+	cd tests/test-apps && sh clone-repo.sh
 	cekit -v test --overrides-file kogito-quarkus-overrides.yaml behave
 	cekit -v test --overrides-file kogito-quarkus-jvm-overrides.yaml behave
-	cd tests/test-apps && sh clone-repo.sh
 	cekit -v test --overrides-file kogito-quarkus-s2i-overrides.yaml behave
 	cekit -v test --overrides-file kogito-springboot-overrides.yaml behave
 	cekit -v test --overrides-file kogito-springboot-s2i-overrides.yaml behave
diff --git a/s2i/kogito-quarkus-overrides.yaml b/s2i/kogito-quarkus-overrides.yaml
index f0cc0f92301..f9694e91f83 100644
--- a/s2i/kogito-quarkus-overrides.yaml
+++ b/s2i/kogito-quarkus-overrides.yaml
@@ -17,6 +17,9 @@ envs:
 - name: JAVA_OPTIONS
   example: "-Dquarkus.log.level=DEBUG"
   description: JVM options passed to the Java command.
+- name: BINARY_BUILD
+  example: "true"
+  description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
 
 ports:
 - value: 8080
diff --git a/s2i/kogito-springboot-overrides.yaml b/s2i/kogito-springboot-overrides.yaml
index 2b9431ee86e..a15625dc432 100644
--- a/s2i/kogito-springboot-overrides.yaml
+++ b/s2i/kogito-springboot-overrides.yaml
@@ -17,6 +17,9 @@ envs:
 - name: JAVA_OPTIONS
   example: "-Ddebug=true"
   description: JVM options passed to the Java command.
+- name: BINARY_BUILD
+  example: "true"
+  description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
 
 ports:
 - value: 8080
diff --git a/s2i/modules/kogito-s2i-core/added/s2i-core b/s2i/modules/kogito-s2i-core/added/s2i-core
index 79f689ff521..49c9fd776bf 100644
--- a/s2i/modules/kogito-s2i-core/added/s2i-core
+++ b/s2i/modules/kogito-s2i-core/added/s2i-core
@@ -32,7 +32,7 @@ function assemble_runtime() {
 
         echo "---> [s2i-core] Adding custom labels..."
         if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
-            mkdir -v /tmp/.s2i
+            mkdir -pv /tmp/.s2i
             mkdir -pv /tmp/src/.s2i/
             cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
             cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/src/.s2i/image_metadata.json
@@ -50,9 +50,34 @@ function assemble_runtime() {
 
 # copy already built artifacts to the runtime image.
 function runtime_assemble() {
+    echo "-----> [s2i-core] Running runtime assemble script"
     cd ${S2I_DESTINATION_DIR}/src
-    cp -Rv --parents ./* ${KOGITO_HOME}/
+    if [ "${BINARY_BUILD^^}" == "TRUE" ] || ls | grep -E '*.jar|classes|maven*|*-runner|target' 1> /dev/null 2>&1; then
+        echo "-----> Binary build enabled, artifacts were uploaded directly to the image build"
+        if ls target 1> /dev/null 2>&1; then
+            echo "-----> Entire target dir uploaded"
+            cd "target"    
+        fi
+        if ls | grep -E '*-runner.jar' 1> /dev/null 2>&1; then
+            echo "-----> Found jar file, not native build"
+            NATIVE="FALSE"
+        fi
+        echo "-----> Cleaning up unneeded jar files"
+        rm -rfv *-tests.jar
+        rm -rfv *-sources.jar
+
+        echo "-----> Copying uploaded files to ${KOGITO_HOME}"
+        artifactDir="."
+        ARTIFACT_DIR=$artifactDir
+        handle_image_metadata_json
+        copy_kogito_app
+        copy_persistence_files
+    else
+        cp -Rv --parents ./* ${KOGITO_HOME}/
+    fi
     assemble_runtime
+    echo "-----> Cleaning up s2i directory"
+    rm -rfv ${S2I_DESTINATION_DIR}/src/*
 }
 
 
diff --git a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 31983dad49e..711bbe94226 100644
--- a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -108,7 +108,40 @@ teardown() {
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "'./bin/myapp.jar' -> '$KOGITO_HOME/./bin/myapp.jar'" ]
+    [ "${lines[1]}" = "'./bin/myapp.jar' -> '$KOGITO_HOME/./bin/myapp.jar'" ]
+}
+
+@test "test runtime_assemble with binary builds" {
+    mkdir -p ${KOGITO_HOME}/bin
+    # emulating an upload
+    mkdir -p /tmp/src/
+    touch /tmp/src/myapp.jar
+    mkdir -p /tmp/src/lib
+    mkdir -p /tmp/src/classes
+    mkdir -p /tmp/src/maven-archiver
+
+    run runtime_assemble
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[7]}" = "'./myapp.jar' -> '$KOGITO_HOME/bin/myapp.jar'" ]
+}
+
+@test "test runtime_assemble with binary builds entire target!" {
+    mkdir -p ${KOGITO_HOME}/bin
+    # emulating an upload
+    mkdir -p /tmp/src/target
+    touch /tmp/src/target/myapp.jar
+    touch /tmp/src/target/myapp-sources.jar
+    mkdir -p /tmp/src/target/lib
+    mkdir -p /tmp/src/target/classes
+    mkdir -p /tmp/src/target/maven-archiver
+
+    run runtime_assemble
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[9]}" = "'./myapp.jar' -> '$KOGITO_HOME/bin/myapp.jar'" ]
 }
 
 
diff --git a/s2i/tests/features/kogito-quarkus-jvm-ubi8.feature b/s2i/tests/features/kogito-quarkus-jvm-ubi8.feature
index 13e0e166c45..779f13c7ae5 100644
--- a/s2i/tests/features/kogito-quarkus-jvm-ubi8.feature
+++ b/s2i/tests/features/kogito-quarkus-jvm-ubi8.feature
@@ -17,4 +17,32 @@ Feature: Kogito-quarkus-ubi8 feature.
     When container is started with command bash
     Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
     And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
-    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
\ No newline at end of file
+    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
+
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples/drools-quarkus-example from target
+      | variable            | value                     |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | wait            | 80                       |
+      | expected_phrase | Mario is older than Mark |
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+
+  
+  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples/drools-quarkus-example from target
+      | variable            | value                     |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+      | BINARY_BUILD        | true                      |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | wait            | 80                       |
+      | expected_phrase | Mario is older than Mark |
+    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
diff --git a/s2i/tests/features/kogito-springboot-ubi8.feature b/s2i/tests/features/kogito-springboot-ubi8.feature
index d0cbfa8ff69..d60a57c77ae 100644
--- a/s2i/tests/features/kogito-springboot-ubi8.feature
+++ b/s2i/tests/features/kogito-springboot-ubi8.feature
@@ -20,3 +20,31 @@ Feature: springboot-quarkus-ubi8 feature.
     And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
 
 
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples/jbpm-springboot-example from target
+      | variable            | value        |
+      | JAVA_OPTIONS        | -Ddebug=true |
+    Then check that page is served
+      | property             | value     |
+      | port                 | 8080      |
+      | path                 | /orders/1 |
+      | wait                 | 80        |
+      | expected_status_code | 204       |
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+
+  Scenario: Verify if the (forcing) binary build is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples/jbpm-springboot-example from target
+      | variable            | value        |
+      | JAVA_OPTIONS        | -Ddebug=true |
+      | BINARY_BUILD        | true         |
+    Then check that page is served
+      | property             | value     |
+      | port                 | 8080      |
+      | path                 | /orders/1 |
+      | wait                 | 80        |
+      | expected_status_code | 204       |
+    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh
index 448eb02668b..088b7b89332 100755
--- a/s2i/tests/test-apps/clone-repo.sh
+++ b/s2i/tests/test-apps/clone-repo.sh
@@ -6,7 +6,6 @@ TEST_DIR=`pwd`
 cd /tmp
 rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
-cd kogito-examples/drools-quarkus-example
 #git fetch origin --tags
 #git checkout -b 0.8.0 0.8.0
 
@@ -15,10 +14,15 @@ cd kogito-examples/drools-quarkus-example
 # will ensure the use of the port 8080.
 cp ${TEST_DIR}/application.properties src/main/resources/META-INF/
 
+# generating the app binaries to test the binary build
+mvn -f kogito-examples/drools-quarkus-example clean package -DskipTests
+mvn -f kogito-examples/jbpm-springboot-example clean package -DskipTests
+
 # preparing directory to run kogito maven archetypes tests
 cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-quarkus-example/
 rm -rf /tmp/kogito-examples/dmn-quarkus-example/src
 rm -rf /tmp/kogito-examples/dmn-quarkus-example/pom.xml
 
+cd kogito-examples/drools-quarkus-example
 git add --all
 git commit -am "test"

From 152ea03536cd7961075ef642cf37d4c711294541 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 16 Mar 2020 13:38:47 -0300
Subject: [PATCH 104/709] [KOGITO-1443] - Use registry.access.redhat.com as
 registry for Kogito images (#109)

Signed-off-by: spolti <fspolti@redhat.com>
---
 s2i/image.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s2i/image.yaml b/s2i/image.yaml
index 585c8a2b7d4..72878629230 100644
--- a/s2i/image.yaml
+++ b/s2i/image.yaml
@@ -5,7 +5,7 @@ version: "0.9.0-rc1"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
-from: "registry.redhat.io/ubi8/ubi-minimal:8.0"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:8.0"
 
 labels:
   - name: "maintainer"

From 6cbc36ac2ff9f19e55bda6ea71edd6453c510c04 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 17 Mar 2020 15:38:28 -0300
Subject: [PATCH 105/709] [KOGITO-754] - Create image for Management Console
 (#110)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .github/workflows/run-bats-tests.yml          | 22 ++++++++++++
 s2i/Makefile                                  |  7 +++-
 s2i/kogito-imagestream.yaml                   | 28 +++++++++++++--
 s2i/kogito-management-console-overrides.yaml  | 33 ++++++++++++++++++
 .../added/kogito-app-launch.sh                | 21 ++++++++++++
 .../added/launch/kogito-management-console.sh | 29 ++++++++++++++++
 .../kogito-management-console/configure       | 16 +++++++++
 .../kogito-management-console/module.yaml     | 16 +++++++++
 .../tests/bats/kogito-management-console.bats | 34 +++++++++++++++++++
 s2i/push-staging.py                           |  2 +-
 .../kogito-management-console.feature         | 32 +++++++++++++++++
 11 files changed, 235 insertions(+), 5 deletions(-)
 create mode 100644 s2i/kogito-management-console-overrides.yaml
 create mode 100644 s2i/modules/kogito-management-console/added/kogito-app-launch.sh
 create mode 100644 s2i/modules/kogito-management-console/added/launch/kogito-management-console.sh
 create mode 100644 s2i/modules/kogito-management-console/configure
 create mode 100644 s2i/modules/kogito-management-console/module.yaml
 create mode 100644 s2i/modules/kogito-management-console/tests/bats/kogito-management-console.bats
 create mode 100644 s2i/tests/features/kogito-management-console.feature

diff --git a/.github/workflows/run-bats-tests.yml b/.github/workflows/run-bats-tests.yml
index 04ce9f1e99d..62789edef69 100644
--- a/.github/workflows/run-bats-tests.yml
+++ b/.github/workflows/run-bats-tests.yml
@@ -16,27 +16,49 @@ jobs:
           git clone https://github.com/bats-core/bats-core.git
           cd bats-core
           ./install.sh $HOME
+
       - name: run kogito-data-index tests
         working-directory: ${{ github.workspace }}
         run: |
           $HOME/bin/bats s2i/modules/kogito-data-index/tests/bats
+
       - name: run kogito-graalvm-scripts tests
         working-directory: ${{ github.workspace }}
         run: |
           $HOME/bin/bats s2i/modules/kogito-graalvm-scripts/tests/bats
+
       - name: run kogito-infinispan-properties tests
         working-directory: ${{ github.workspace }}
         run: |
           $HOME/bin/bats s2i/modules/kogito-infinispan-properties/tests/bats
+
       - name: run kogito-jobs-service tests
         working-directory: ${{ github.workspace }}
         run: |
           $HOME/bin/bats s2i/modules/kogito-jobs-service/tests/bats
+
+      - name: run kogito-kubernetes-client tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats s2i/modules/kogito-kubernetes-client/tests/bats/
+
+      - name: run kogito-management-console tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats s2i/modules/kogito-management-console/tests/bats/
+
       - name: run kogito-maven tests
         working-directory: ${{ github.workspace }}
         run: |
           $HOME/bin/bats s2i/modules/kogito-maven/tests/bats
+
+      - name: run kogito-persistence tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats s2i/modules/kogito-persistence/tests/bats
+
       - name: run kogito-s2i-core tests
         working-directory: ${{ github.workspace }}
         run: |
           $HOME/bin/bats s2i/modules/kogito-s2i-core/tests/bats
+
diff --git a/s2i/Makefile b/s2i/Makefile
index fb2b1116158..21df3fbc61e 100644
--- a/s2i/Makefile
+++ b/s2i/Makefile
@@ -4,7 +4,7 @@ BUILD_ENGINE := docker
 
 # Build all images
 .PHONY: build
-build: kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-jobs-service
+build: kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-jobs-service kogito-management-console
 
 kogito-quarkus-ubi8:
 	cekit -v build --overrides-file kogito-quarkus-overrides.yaml ${BUILD_ENGINE}
@@ -27,6 +27,8 @@ kogito-data-index:
 kogito-jobs-service:
 	cekit -v build --overrides-file kogito-jobs-service-overrides.yaml ${BUILD_ENGINE}
 
+kogito-management-console:
+	cekit -v build --overrides-file kogito-management-console-overrides.yaml ${BUILD_ENGINE}
 
 # Build and test all images
 .PHONY: test
@@ -39,6 +41,7 @@ test:
 	cekit -v test --overrides-file kogito-springboot-s2i-overrides.yaml behave
 	cekit -v test --overrides-file kogito-data-index-overrides.yaml behave
 	cekit -v test --overrides-file kogito-jobs-service-overrides.yaml behave
+	cekit -v test --overrides-file kogito-management-console-overrides.yaml behave
 
 
 # push images to quay.io, this requires permissions under kiegroup organization
@@ -59,6 +62,8 @@ _push:
 	docker push quay.io/kiegroup/kogito-data-index:latest
 	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-jobs-service:latest
+	docker push quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-management-console:latest
 
 
 # push staging images to quay.io, done before release, this requires permissions under kiegroup organization
diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml
index 56b9b06ec02..4c563fede71 100644
--- a/s2i/kogito-imagestream.yaml
+++ b/s2i/kogito-imagestream.yaml
@@ -125,7 +125,7 @@ items:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
-            supports: infinispan, persitence
+            supports: persistence backed by Infinispan server
             version: '0.9.0-rc1'
           referencePolicy:
             type: Local
@@ -137,13 +137,13 @@ items:
     metadata:
       name: kogito-jobs-service
       annotations:
-        openshift.io/display-name: Runtime image for the Kogito Jobs Service - Tech preview
+        openshift.io/display-name: Runtime image for the Kogito Jobs Service
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
         - name: '0.9.0-rc1'
           annotations:
-            description: Runtime image for the Kogito Jobs Service - Tech preview
+            description: Runtime image for the Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
@@ -153,3 +153,25 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-jobs-service:0.9.0-rc1
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-management-console
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Management Console
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '0.9.0-rc1'
+          annotations:
+            description: Runtime image for the Kogito Management Console
+            iconClass: icon-jbpm
+            tags: kogito,management-console
+            supports: business process management
+            version: '0.9.0-rc1'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-management-console:0.9.0-rc1
+
diff --git a/s2i/kogito-management-console-overrides.yaml b/s2i/kogito-management-console-overrides.yaml
new file mode 100644
index 00000000000..08cfabb28fd
--- /dev/null
+++ b/s2i/kogito-management-console-overrides.yaml
@@ -0,0 +1,33 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-management-console"
+description: "Runtime image for Kogito Management Console"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Management Console, manage your Business Process easily."
+- name: "io.k8s.display-name"
+  value: "Kogito Management Console"
+- name: "io.openshift.tags"
+  value: "kogito,management,management-console"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.openjdk
+    version: "1.8.0-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.management.console
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/s2i/modules/kogito-management-console/added/kogito-app-launch.sh b/s2i/modules/kogito-management-console/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..6e60b476a06
--- /dev/null
+++ b/s2i/modules/kogito-management-console/added/kogito-app-launch.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    echo "JVM settings debug is enabled."
+fi
+
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-management-console.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} \
+        -Dquarkus.http.host=0.0.0.0 \
+        -jar $KOGITO_HOME/bin/kogito-management-console-runner.jar
\ No newline at end of file
diff --git a/s2i/modules/kogito-management-console/added/launch/kogito-management-console.sh b/s2i/modules/kogito-management-console/added/launch/kogito-management-console.sh
new file mode 100644
index 00000000000..4195c5cea97
--- /dev/null
+++ b/s2i/modules/kogito-management-console/added/launch/kogito-management-console.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset KOGITO_DATAINDEX_HTTP_URL
+}
+
+function configure() {
+    configure_data_index_url
+}
+
+# Exit codes:
+#   10 - invalid url
+function configure_data_index_url {
+    url_simple_regex='(https?)://'
+    local dataIndexURL=${KOGITO_DATAINDEX_HTTP_URL}
+    if [ "${dataIndexURL}x" != "x" ]; then
+        if [[ ! "${dataIndexURL}x" =~ $url_simple_regex ]]; then
+            echo "URL must start with http or https."
+            exit 10
+        fi
+    else
+        echo "Data index url not set, default will be used: http://localhost:8180"
+        dataIndexURL="http://localhost:8180"
+    fi
+    KOGITO_MANAGEMENT_CONSOLE_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
+}
+
diff --git a/s2i/modules/kogito-management-console/configure b/s2i/modules/kogito-management-console/configure
new file mode 100644
index 00000000000..51aeeaec17e
--- /dev/null
+++ b/s2i/modules/kogito-management-console/configure
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+cp -v ${SOURCES_DIR}/kogito-management-console-runner.jar ${KOGITO_HOME}/bin/
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
+cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
diff --git a/s2i/modules/kogito-management-console/module.yaml b/s2i/modules/kogito-management-console/module.yaml
new file mode 100644
index 00000000000..e6f4c99b951
--- /dev/null
+++ b/s2i/modules/kogito-management-console/module.yaml
@@ -0,0 +1,16 @@
+schema_version: 1
+name: org.kie.kogito.management.console
+version: "0.9.0-rc1"
+
+envs:
+  - name: "KOGITO_DATAINDEX_HTTP_URL"
+    description: "Kogito Data Index address, if empty defaults to http://localhost:8180."
+
+artifacts:
+  - name: kogito-management-console-runner.jar
+    url: https://repository.jboss.org/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200312.091545-18-runner.jar
+    md5: 32b6fe5644752cc2c2f83825aab0b1fc
+
+execute:
+  - script: configure
+
diff --git a/s2i/modules/kogito-management-console/tests/bats/kogito-management-console.bats b/s2i/modules/kogito-management-console/tests/bats/kogito-management-console.bats
new file mode 100644
index 00000000000..33a731a8d0d
--- /dev/null
+++ b/s2i/modules/kogito-management-console/tests/bats/kogito-management-console.bats
@@ -0,0 +1,34 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME=$KOGITO_HOME
+mkdir -p ${KOGITO_HOME}/launch
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-management-console.sh
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+}
+
+@test "test if the default value for data-index url will be set" {
+    local expected=" -Dkogito.dataindex.http.url=http://localhost:8180"
+    configure_data_index_url
+    echo "Result is [${KOGITO_MANAGEMENT_CONSOLE_PROPS}] and expected is [${expected}]" >&2
+    [ "${expected}" = "${KOGITO_MANAGEMENT_CONSOLE_PROPS}" ]
+}
+
+@test "test if KOGITO_DATA_INDEX_URL will be correctly set " {
+    export KOGITO_DATAINDEX_HTTP_URL="http://10.10.10.10:8080"
+    local expected=" -Dkogito.dataindex.http.url=http://10.10.10.10:8080"
+    configure_data_index_url
+    echo "Result is [${KOGITO_MANAGEMENT_CONSOLE_PROPS}] and expected is [${expected}]" >&2
+    [ "${expected}" = "${KOGITO_MANAGEMENT_CONSOLE_PROPS}" ]
+}
+
+@test "test if a invalid value for data-index url will return the expected exit code" {
+    export KOGITO_DATAINDEX_HTTP_URL="a.b.c"
+    run configure_data_index_url
+    [ "${status}" == "10" ]
+}
+
diff --git a/s2i/push-staging.py b/s2i/push-staging.py
index 0a4ce53c31c..c998d7e0fd2 100644
--- a/s2i/push-staging.py
+++ b/s2i/push-staging.py
@@ -15,7 +15,7 @@
 # All Kogito images
 IMAGES = ["kogito-quarkus-ubi8", "kogito-quarkus-jvm-ubi8", "kogito-quarkus-ubi8-s2i",
           "kogito-springboot-ubi8", "kogito-springboot-ubi8-s2i", "kogito-data-index",
-          "kogito-jobs-service"]
+          "kogito-jobs-service", "kogito-management-console"]
 
 IMAGES_NEXT_RC_TAG = []
 QUAY_KOGITO_ORG_PLACE_HOLDER = "quay.io/kiegroup/{}:{}"
diff --git a/s2i/tests/features/kogito-management-console.feature b/s2i/tests/features/kogito-management-console.feature
new file mode 100644
index 00000000000..a01cd4833cd
--- /dev/null
+++ b/s2i/tests/features/kogito-management-console.feature
@@ -0,0 +1,32 @@
+@quay.io/kiegroup/kogito-management-console
+
+Feature: kogito-management-console feature
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Management Console, manage your Business Process easily.
+    And the image should contain label io.k8s.display-name with value Kogito Management Console
+    And the image should contain label io.openshift.tags with value kogito,management,management-console
+
+  Scenario: verify if the management console jar is available on /home/kogito
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/kogito-management-console-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-management-console-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and test default http port
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and set data-index url
+    When container is started with env
+      | variable                     | value             |
+      | SCRIPT_DEBUG                 | true              |
+      | KOGITO_DATAINDEX_HTTP_URL    | http://test:9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
+
+

From bb431c95c482691c2bc86271c2d44a6e16da04f1 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 18 Mar 2020 10:46:20 -0300
Subject: [PATCH 106/709] [KOGITO-1388] - Rename kogito-cloud to kogito-images
 (#111)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .github/workflows/run-bats-tests.yml          | 18 ++---
 .github/workflows/validate-imagestreams.yml   |  2 +-
 Jenkinsfile                                   | 66 -------------------
 s2i/Makefile => Makefile                      |  0
 s2i/README.md => README.md                    |  2 +-
 s2i/image.yaml => image.yaml                  |  0
 ...s.yaml => kogito-data-index-overrides.yaml |  0
 ...magestream.yaml => kogito-imagestream.yaml |  0
 ...yaml => kogito-jobs-service-overrides.yaml |  0
 ...> kogito-management-console-overrides.yaml |  0
 ....yaml => kogito-quarkus-jvm-overrides.yaml |  0
 ...ides.yaml => kogito-quarkus-overrides.yaml |  0
 ....yaml => kogito-quarkus-s2i-overrides.yaml |  0
 ...s.yaml => kogito-springboot-overrides.yaml |  0
 ...ml => kogito-springboot-s2i-overrides.yaml |  0
 .../added/kogito-app-launch.sh                |  0
 .../added/launch/kogito-data-index.sh         |  0
 .../kogito-data-index/configure               |  0
 .../kogito-data-index/module.yaml             |  0
 .../tests/bats/kogito-data-index.bats         |  0
 .../kogito-epel/7/configure                   |  0
 .../kogito-epel/7/module.yaml                 |  0
 .../kogito-graalvm-installer/19.x/configure   |  0
 .../kogito-graalvm-installer/19.x/module.yaml |  0
 .../added/memory-limit.sh                     |  0
 .../kogito-graalvm-scripts/configure          |  0
 .../kogito-graalvm-scripts/module.yaml        |  0
 .../tests/bats/memory-limits.bats             |  0
 .../kogito-image-dependencies/clean.sh        |  0
 .../kogito-image-dependencies/module.yaml     |  0
 .../added/kogito-infinispan-properties.sh     |  0
 .../kogito-infinispan-properties/configure    |  0
 .../kogito-infinispan-properties/module.yaml  |  0
 .../bats/kogito-infinispan-properties.bats    |  0
 .../added/kogito-app-launch.sh                |  0
 .../added/launch/kogito-jobs-service.sh       |  0
 .../kogito-jobs-service/configure             |  0
 .../kogito-jobs-service/module.yaml           |  0
 .../tests/bats/kogito-jobs-service.bats       |  0
 {s2i/modules => modules}/kogito-jq/clean.sh   |  0
 .../modules => modules}/kogito-jq/module.yaml |  0
 .../added/kogito-kubernetes-client.sh         |  0
 .../kogito-kubernetes-client/configure        |  0
 .../kogito-kubernetes-client/module.yaml      |  0
 .../tests/bats/kogito-kubernetes-client.bats  |  0
 .../kogito-launch-scripts/added/configure.sh  |  0
 .../kogito-launch-scripts/configure           |  0
 .../kogito-launch-scripts/module.yaml         |  0
 .../kogito-logging/added/logging.sh           |  0
 .../kogito-logging/configure                  |  0
 .../kogito-logging/module.yaml                |  0
 .../added/kogito-app-launch.sh                |  0
 .../added/launch/kogito-management-console.sh |  0
 .../kogito-management-console/configure       |  0
 .../kogito-management-console/module.yaml     |  0
 .../tests/bats/kogito-management-console.bats |  0
 .../3.6.0/added/configure-maven.sh            |  0
 .../kogito-maven/3.6.0/configure              |  0
 .../kogito-maven/3.6.0/maven/settings.xml     |  0
 .../kogito-maven/3.6.0/module.yaml            |  0
 .../tests/bats/maven-settings.bats            |  0
 .../kogito-openjdk/1.8.0-headless/module.yaml |  0
 .../kogito-openjdk/1.8.0/clean.sh             |  0
 .../kogito-openjdk/1.8.0/module.yaml          |  0
 .../added/kogito-persistence.sh               |  0
 .../added/post-hook-persistence.sh            |  0
 .../kogito-persistence/configure              |  0
 .../kogito-persistence/module.yaml            |  0
 .../bats/expected/patch_cm_travel_agency.json |  0
 .../tests/bats/expected/patch_empty_data.json |  0
 .../tests/bats/kogito-persistence.bats        |  0
 .../tests/bats/mocks/config_map.json          |  0
 .../mocks/config_map_empty_annotations.json   |  0
 .../bats/mocks/config_map_file1_only.json     |  0
 .../bats/mocks/config_map_no_annotations.json |  0
 .../tests/bats/mocks/travels.proto            |  0
 .../tests/bats/mocks/visaApplications.proto   |  0
 .../tests/bats/post-hook-persistence.bats     |  0
 .../kogito-quarkus-jvm/README.md              |  0
 .../added/kogito-app-launch.sh                |  0
 .../kogito-quarkus-jvm/configure              |  0
 .../kogito-quarkus-jvm/module.yaml            |  0
 .../kogito-quarkus-jvm/s2i/bin/assemble       |  0
 .../kogito-quarkus-jvm/s2i/bin/usage          |  0
 .../kogito-quarkus-s2i/README.md              |  0
 .../added/kogito-app-launch.sh                |  0
 .../kogito-quarkus-s2i/configure              |  0
 .../kogito-quarkus-s2i/module.yaml            |  0
 .../kogito-quarkus-s2i/s2i/bin/assemble       |  0
 .../kogito-quarkus-s2i/s2i/bin/usage          |  0
 .../kogito-quarkus/README.md                  |  0
 .../kogito-quarkus/added/kogito-app-launch.sh |  0
 .../kogito-quarkus/configure                  |  0
 .../kogito-quarkus/module.yaml                |  0
 .../kogito-quarkus/s2i/bin/assemble           |  0
 .../kogito-quarkus/s2i/bin/usage              |  0
 .../kogito-s2i-core/added/s2i-core            |  0
 .../kogito-s2i-core/configure.sh              |  0
 .../kogito-s2i-core/module.yaml               |  0
 .../kogito-s2i-core/s2i/bin/assemble-runtime  |  0
 .../kogito-s2i-core/s2i/bin/run               |  0
 .../kogito-s2i-core/s2i/bin/save-artifacts    |  0
 .../kogito-s2i-core/tests/bats/s2i-core.bats  |  0
 .../kogito-springboot-s2i/README.md           |  0
 .../added/kogito-app-launch.sh                |  0
 .../kogito-springboot-s2i/configure           |  0
 .../kogito-springboot-s2i/module.yaml         |  0
 .../kogito-springboot-s2i/s2i/bin/assemble    |  0
 .../kogito-springboot-s2i/s2i/bin/usage       |  0
 .../kogito-springboot/README.md               |  0
 .../added/kogito-app-launch.sh                |  0
 .../kogito-springboot/configure               |  0
 .../kogito-springboot/module.yaml             |  0
 .../kogito-springboot/s2i/bin/assemble        |  0
 .../kogito-springboot/s2i/bin/usage           |  0
 .../kogito-system-user/add-user               |  0
 .../kogito-system-user/module.yaml            |  0
 s2i/push-staging.py => push-staging.py        |  0
 {s2i/tests => tests}/features/common.feature  |  0
 .../features/kogito-data-index.feature        |  0
 .../features/kogito-jobs-service.feature      |  0
 .../kogito-management-console.feature         |  0
 .../features/kogito-quarkus-jvm-ubi8.feature  |  0
 .../features/kogito-quarkus-ubi8-s2i.feature  |  0
 .../features/kogito-quarkus-ubi8.feature      |  0
 .../kogito-springboot-ubi8-s2i.feature        |  0
 .../features/kogito-springboot-ubi8.feature   |  0
 .../test-apps/application.properties          |  0
 {s2i/tests => tests}/test-apps/clone-repo.sh  |  0
 129 files changed, 11 insertions(+), 77 deletions(-)
 delete mode 100644 Jenkinsfile
 rename s2i/Makefile => Makefile (100%)
 rename s2i/README.md => README.md (99%)
 rename s2i/image.yaml => image.yaml (100%)
 rename s2i/kogito-data-index-overrides.yaml => kogito-data-index-overrides.yaml (100%)
 rename s2i/kogito-imagestream.yaml => kogito-imagestream.yaml (100%)
 rename s2i/kogito-jobs-service-overrides.yaml => kogito-jobs-service-overrides.yaml (100%)
 rename s2i/kogito-management-console-overrides.yaml => kogito-management-console-overrides.yaml (100%)
 rename s2i/kogito-quarkus-jvm-overrides.yaml => kogito-quarkus-jvm-overrides.yaml (100%)
 rename s2i/kogito-quarkus-overrides.yaml => kogito-quarkus-overrides.yaml (100%)
 rename s2i/kogito-quarkus-s2i-overrides.yaml => kogito-quarkus-s2i-overrides.yaml (100%)
 rename s2i/kogito-springboot-overrides.yaml => kogito-springboot-overrides.yaml (100%)
 rename s2i/kogito-springboot-s2i-overrides.yaml => kogito-springboot-s2i-overrides.yaml (100%)
 rename {s2i/modules => modules}/kogito-data-index/added/kogito-app-launch.sh (100%)
 rename {s2i/modules => modules}/kogito-data-index/added/launch/kogito-data-index.sh (100%)
 rename {s2i/modules => modules}/kogito-data-index/configure (100%)
 rename {s2i/modules => modules}/kogito-data-index/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-data-index/tests/bats/kogito-data-index.bats (100%)
 rename {s2i/modules => modules}/kogito-epel/7/configure (100%)
 rename {s2i/modules => modules}/kogito-epel/7/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-graalvm-installer/19.x/configure (100%)
 rename {s2i/modules => modules}/kogito-graalvm-installer/19.x/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-graalvm-scripts/added/memory-limit.sh (100%)
 rename {s2i/modules => modules}/kogito-graalvm-scripts/configure (100%)
 rename {s2i/modules => modules}/kogito-graalvm-scripts/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-graalvm-scripts/tests/bats/memory-limits.bats (100%)
 rename {s2i/modules => modules}/kogito-image-dependencies/clean.sh (100%)
 rename {s2i/modules => modules}/kogito-image-dependencies/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-infinispan-properties/added/kogito-infinispan-properties.sh (100%)
 rename {s2i/modules => modules}/kogito-infinispan-properties/configure (100%)
 rename {s2i/modules => modules}/kogito-infinispan-properties/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats (100%)
 rename {s2i/modules => modules}/kogito-jobs-service/added/kogito-app-launch.sh (100%)
 rename {s2i/modules => modules}/kogito-jobs-service/added/launch/kogito-jobs-service.sh (100%)
 rename {s2i/modules => modules}/kogito-jobs-service/configure (100%)
 rename {s2i/modules => modules}/kogito-jobs-service/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-jobs-service/tests/bats/kogito-jobs-service.bats (100%)
 rename {s2i/modules => modules}/kogito-jq/clean.sh (100%)
 rename {s2i/modules => modules}/kogito-jq/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-kubernetes-client/added/kogito-kubernetes-client.sh (100%)
 rename {s2i/modules => modules}/kogito-kubernetes-client/configure (100%)
 rename {s2i/modules => modules}/kogito-kubernetes-client/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats (100%)
 rename {s2i/modules => modules}/kogito-launch-scripts/added/configure.sh (100%)
 rename {s2i/modules => modules}/kogito-launch-scripts/configure (100%)
 rename {s2i/modules => modules}/kogito-launch-scripts/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-logging/added/logging.sh (100%)
 rename {s2i/modules => modules}/kogito-logging/configure (100%)
 rename {s2i/modules => modules}/kogito-logging/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-management-console/added/kogito-app-launch.sh (100%)
 rename {s2i/modules => modules}/kogito-management-console/added/launch/kogito-management-console.sh (100%)
 rename {s2i/modules => modules}/kogito-management-console/configure (100%)
 rename {s2i/modules => modules}/kogito-management-console/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-management-console/tests/bats/kogito-management-console.bats (100%)
 rename {s2i/modules => modules}/kogito-maven/3.6.0/added/configure-maven.sh (100%)
 rename {s2i/modules => modules}/kogito-maven/3.6.0/configure (100%)
 rename {s2i/modules => modules}/kogito-maven/3.6.0/maven/settings.xml (100%)
 rename {s2i/modules => modules}/kogito-maven/3.6.0/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-maven/tests/bats/maven-settings.bats (100%)
 rename {s2i/modules => modules}/kogito-openjdk/1.8.0-headless/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-openjdk/1.8.0/clean.sh (100%)
 rename {s2i/modules => modules}/kogito-openjdk/1.8.0/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-persistence/added/kogito-persistence.sh (100%)
 rename {s2i/modules => modules}/kogito-persistence/added/post-hook-persistence.sh (100%)
 rename {s2i/modules => modules}/kogito-persistence/configure (100%)
 rename {s2i/modules => modules}/kogito-persistence/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/expected/patch_empty_data.json (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/kogito-persistence.bats (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/mocks/config_map.json (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/mocks/config_map_file1_only.json (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/mocks/travels.proto (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/mocks/visaApplications.proto (100%)
 rename {s2i/modules => modules}/kogito-persistence/tests/bats/post-hook-persistence.bats (100%)
 rename {s2i/modules => modules}/kogito-quarkus-jvm/README.md (100%)
 rename {s2i/modules => modules}/kogito-quarkus-jvm/added/kogito-app-launch.sh (100%)
 rename {s2i/modules => modules}/kogito-quarkus-jvm/configure (100%)
 rename {s2i/modules => modules}/kogito-quarkus-jvm/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-quarkus-jvm/s2i/bin/assemble (100%)
 rename {s2i/modules => modules}/kogito-quarkus-jvm/s2i/bin/usage (100%)
 rename {s2i/modules => modules}/kogito-quarkus-s2i/README.md (100%)
 rename {s2i/modules => modules}/kogito-quarkus-s2i/added/kogito-app-launch.sh (100%)
 rename {s2i/modules => modules}/kogito-quarkus-s2i/configure (100%)
 rename {s2i/modules => modules}/kogito-quarkus-s2i/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-quarkus-s2i/s2i/bin/assemble (100%)
 rename {s2i/modules => modules}/kogito-quarkus-s2i/s2i/bin/usage (100%)
 rename {s2i/modules => modules}/kogito-quarkus/README.md (100%)
 rename {s2i/modules => modules}/kogito-quarkus/added/kogito-app-launch.sh (100%)
 rename {s2i/modules => modules}/kogito-quarkus/configure (100%)
 rename {s2i/modules => modules}/kogito-quarkus/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-quarkus/s2i/bin/assemble (100%)
 rename {s2i/modules => modules}/kogito-quarkus/s2i/bin/usage (100%)
 rename {s2i/modules => modules}/kogito-s2i-core/added/s2i-core (100%)
 rename {s2i/modules => modules}/kogito-s2i-core/configure.sh (100%)
 rename {s2i/modules => modules}/kogito-s2i-core/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-s2i-core/s2i/bin/assemble-runtime (100%)
 rename {s2i/modules => modules}/kogito-s2i-core/s2i/bin/run (100%)
 rename {s2i/modules => modules}/kogito-s2i-core/s2i/bin/save-artifacts (100%)
 rename {s2i/modules => modules}/kogito-s2i-core/tests/bats/s2i-core.bats (100%)
 rename {s2i/modules => modules}/kogito-springboot-s2i/README.md (100%)
 rename {s2i/modules => modules}/kogito-springboot-s2i/added/kogito-app-launch.sh (100%)
 rename {s2i/modules => modules}/kogito-springboot-s2i/configure (100%)
 rename {s2i/modules => modules}/kogito-springboot-s2i/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-springboot-s2i/s2i/bin/assemble (100%)
 rename {s2i/modules => modules}/kogito-springboot-s2i/s2i/bin/usage (100%)
 rename {s2i/modules => modules}/kogito-springboot/README.md (100%)
 rename {s2i/modules => modules}/kogito-springboot/added/kogito-app-launch.sh (100%)
 rename {s2i/modules => modules}/kogito-springboot/configure (100%)
 rename {s2i/modules => modules}/kogito-springboot/module.yaml (100%)
 rename {s2i/modules => modules}/kogito-springboot/s2i/bin/assemble (100%)
 rename {s2i/modules => modules}/kogito-springboot/s2i/bin/usage (100%)
 rename {s2i/modules => modules}/kogito-system-user/add-user (100%)
 rename {s2i/modules => modules}/kogito-system-user/module.yaml (100%)
 rename s2i/push-staging.py => push-staging.py (100%)
 rename {s2i/tests => tests}/features/common.feature (100%)
 rename {s2i/tests => tests}/features/kogito-data-index.feature (100%)
 rename {s2i/tests => tests}/features/kogito-jobs-service.feature (100%)
 rename {s2i/tests => tests}/features/kogito-management-console.feature (100%)
 rename {s2i/tests => tests}/features/kogito-quarkus-jvm-ubi8.feature (100%)
 rename {s2i/tests => tests}/features/kogito-quarkus-ubi8-s2i.feature (100%)
 rename {s2i/tests => tests}/features/kogito-quarkus-ubi8.feature (100%)
 rename {s2i/tests => tests}/features/kogito-springboot-ubi8-s2i.feature (100%)
 rename {s2i/tests => tests}/features/kogito-springboot-ubi8.feature (100%)
 rename {s2i/tests => tests}/test-apps/application.properties (100%)
 rename {s2i/tests => tests}/test-apps/clone-repo.sh (100%)

diff --git a/.github/workflows/run-bats-tests.yml b/.github/workflows/run-bats-tests.yml
index 62789edef69..a55c3a38dc4 100644
--- a/.github/workflows/run-bats-tests.yml
+++ b/.github/workflows/run-bats-tests.yml
@@ -20,45 +20,45 @@ jobs:
       - name: run kogito-data-index tests
         working-directory: ${{ github.workspace }}
         run: |
-          $HOME/bin/bats s2i/modules/kogito-data-index/tests/bats
+          $HOME/bin/bats modules/kogito-data-index/tests/bats
 
       - name: run kogito-graalvm-scripts tests
         working-directory: ${{ github.workspace }}
         run: |
-          $HOME/bin/bats s2i/modules/kogito-graalvm-scripts/tests/bats
+          $HOME/bin/bats modules/kogito-graalvm-scripts/tests/bats
 
       - name: run kogito-infinispan-properties tests
         working-directory: ${{ github.workspace }}
         run: |
-          $HOME/bin/bats s2i/modules/kogito-infinispan-properties/tests/bats
+          $HOME/bin/bats modules/kogito-infinispan-properties/tests/bats
 
       - name: run kogito-jobs-service tests
         working-directory: ${{ github.workspace }}
         run: |
-          $HOME/bin/bats s2i/modules/kogito-jobs-service/tests/bats
+          $HOME/bin/bats modules/kogito-jobs-service/tests/bats
 
       - name: run kogito-kubernetes-client tests
         working-directory: ${{ github.workspace }}
         run: |
-          $HOME/bin/bats s2i/modules/kogito-kubernetes-client/tests/bats/
+          $HOME/bin/bats modules/kogito-kubernetes-client/tests/bats/
 
       - name: run kogito-management-console tests
         working-directory: ${{ github.workspace }}
         run: |
-          $HOME/bin/bats s2i/modules/kogito-management-console/tests/bats/
+          $HOME/bin/bats modules/kogito-management-console/tests/bats/
 
       - name: run kogito-maven tests
         working-directory: ${{ github.workspace }}
         run: |
-          $HOME/bin/bats s2i/modules/kogito-maven/tests/bats
+          $HOME/bin/bats modules/kogito-maven/tests/bats
 
       - name: run kogito-persistence tests
         working-directory: ${{ github.workspace }}
         run: |
-          $HOME/bin/bats s2i/modules/kogito-persistence/tests/bats
+          $HOME/bin/bats modules/kogito-persistence/tests/bats
 
       - name: run kogito-s2i-core tests
         working-directory: ${{ github.workspace }}
         run: |
-          $HOME/bin/bats s2i/modules/kogito-s2i-core/tests/bats
+          $HOME/bin/bats modules/kogito-s2i-core/tests/bats
 
diff --git a/.github/workflows/validate-imagestreams.yml b/.github/workflows/validate-imagestreams.yml
index 1290f79f0bd..b267c65f5e7 100644
--- a/.github/workflows/validate-imagestreams.yml
+++ b/.github/workflows/validate-imagestreams.yml
@@ -16,5 +16,5 @@ jobs:
           mv openshift-template-validator-linux-amd64 ${HOME} 	
       - name: validate imagestream
         run: |
-          ${HOME}/openshift-template-validator-linux-amd64 validate -f s2i/kogito-imagestream.yaml
+          ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
 
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 6db815af5d9..00000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,66 +0,0 @@
-@Library('jenkins-pipeline-shared-libraries')_
-
-pipeline {
-    agent {
-        label 'kogito-static || kie-rhel7'
-    }
-    tools {
-        maven 'kie-maven-3.5.4'
-        jdk 'kie-jdk1.8'
-    }
-    options {
-        buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
-        timeout(time: 90, unit: 'MINUTES')
-    }
-    stages {
-        stage('Initialize') {
-            steps {
-                sh 'printenv'
-            }
-        }
-        stage('Build kogito-runtimes') {
-            steps {
-                dir("kogito-runtimes") {
-                    script {
-                        githubscm.checkoutIfExists('kogito-runtimes', "$CHANGE_AUTHOR", "$CHANGE_BRANCH", 'kiegroup', "$CHANGE_TARGET")
-                        maven.runMavenWithSubmarineSettings('clean install', true)
-                    }
-                }
-            }
-        }
-        stage('Build kogito-cloud') {
-            steps {
-                script {
-                    maven.runMavenWithSubmarineSettings('clean install', false)
-                }
-            }
-        }
-        stage('Build kogito-cloud-s2i') {
-            steps {
-                script {
-                     build job: 'KIE/master/kogito-deploy/kogito-cloud-s2i-images-master',
-                        propagate: true,
-                        parameters: [
-                            string(name: 'mainBranch', value: "$CHANGE_BRANCH"),
-                            string(name: 'ghOrgUnit', value: "$CHANGE_AUTHOR")
-                        ]
-                }
-            }
-        }
-    }
-    post {
-        unstable {
-            script {
-                mailer.sendEmailFailure()
-            }
-        }
-        failure {
-            script {
-                mailer.sendEmailFailure()
-            }
-        }
-        always {
-            cleanWs()
-        }
-    }
-}
diff --git a/s2i/Makefile b/Makefile
similarity index 100%
rename from s2i/Makefile
rename to Makefile
diff --git a/s2i/README.md b/README.md
similarity index 99%
rename from s2i/README.md
rename to README.md
index 9a4947f4bc2..1c8b6a73130 100644
--- a/s2i/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Kogito S2I images
+# Kogito Container Images
 
 To be able to produce efficient container images for Kogito there are following sets
 of builder images to perform the build and to run the result binaries.
diff --git a/s2i/image.yaml b/image.yaml
similarity index 100%
rename from s2i/image.yaml
rename to image.yaml
diff --git a/s2i/kogito-data-index-overrides.yaml b/kogito-data-index-overrides.yaml
similarity index 100%
rename from s2i/kogito-data-index-overrides.yaml
rename to kogito-data-index-overrides.yaml
diff --git a/s2i/kogito-imagestream.yaml b/kogito-imagestream.yaml
similarity index 100%
rename from s2i/kogito-imagestream.yaml
rename to kogito-imagestream.yaml
diff --git a/s2i/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
similarity index 100%
rename from s2i/kogito-jobs-service-overrides.yaml
rename to kogito-jobs-service-overrides.yaml
diff --git a/s2i/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
similarity index 100%
rename from s2i/kogito-management-console-overrides.yaml
rename to kogito-management-console-overrides.yaml
diff --git a/s2i/kogito-quarkus-jvm-overrides.yaml b/kogito-quarkus-jvm-overrides.yaml
similarity index 100%
rename from s2i/kogito-quarkus-jvm-overrides.yaml
rename to kogito-quarkus-jvm-overrides.yaml
diff --git a/s2i/kogito-quarkus-overrides.yaml b/kogito-quarkus-overrides.yaml
similarity index 100%
rename from s2i/kogito-quarkus-overrides.yaml
rename to kogito-quarkus-overrides.yaml
diff --git a/s2i/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
similarity index 100%
rename from s2i/kogito-quarkus-s2i-overrides.yaml
rename to kogito-quarkus-s2i-overrides.yaml
diff --git a/s2i/kogito-springboot-overrides.yaml b/kogito-springboot-overrides.yaml
similarity index 100%
rename from s2i/kogito-springboot-overrides.yaml
rename to kogito-springboot-overrides.yaml
diff --git a/s2i/kogito-springboot-s2i-overrides.yaml b/kogito-springboot-s2i-overrides.yaml
similarity index 100%
rename from s2i/kogito-springboot-s2i-overrides.yaml
rename to kogito-springboot-s2i-overrides.yaml
diff --git a/s2i/modules/kogito-data-index/added/kogito-app-launch.sh b/modules/kogito-data-index/added/kogito-app-launch.sh
similarity index 100%
rename from s2i/modules/kogito-data-index/added/kogito-app-launch.sh
rename to modules/kogito-data-index/added/kogito-app-launch.sh
diff --git a/s2i/modules/kogito-data-index/added/launch/kogito-data-index.sh b/modules/kogito-data-index/added/launch/kogito-data-index.sh
similarity index 100%
rename from s2i/modules/kogito-data-index/added/launch/kogito-data-index.sh
rename to modules/kogito-data-index/added/launch/kogito-data-index.sh
diff --git a/s2i/modules/kogito-data-index/configure b/modules/kogito-data-index/configure
similarity index 100%
rename from s2i/modules/kogito-data-index/configure
rename to modules/kogito-data-index/configure
diff --git a/s2i/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
similarity index 100%
rename from s2i/modules/kogito-data-index/module.yaml
rename to modules/kogito-data-index/module.yaml
diff --git a/s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
similarity index 100%
rename from s2i/modules/kogito-data-index/tests/bats/kogito-data-index.bats
rename to modules/kogito-data-index/tests/bats/kogito-data-index.bats
diff --git a/s2i/modules/kogito-epel/7/configure b/modules/kogito-epel/7/configure
similarity index 100%
rename from s2i/modules/kogito-epel/7/configure
rename to modules/kogito-epel/7/configure
diff --git a/s2i/modules/kogito-epel/7/module.yaml b/modules/kogito-epel/7/module.yaml
similarity index 100%
rename from s2i/modules/kogito-epel/7/module.yaml
rename to modules/kogito-epel/7/module.yaml
diff --git a/s2i/modules/kogito-graalvm-installer/19.x/configure b/modules/kogito-graalvm-installer/19.x/configure
similarity index 100%
rename from s2i/modules/kogito-graalvm-installer/19.x/configure
rename to modules/kogito-graalvm-installer/19.x/configure
diff --git a/s2i/modules/kogito-graalvm-installer/19.x/module.yaml b/modules/kogito-graalvm-installer/19.x/module.yaml
similarity index 100%
rename from s2i/modules/kogito-graalvm-installer/19.x/module.yaml
rename to modules/kogito-graalvm-installer/19.x/module.yaml
diff --git a/s2i/modules/kogito-graalvm-scripts/added/memory-limit.sh b/modules/kogito-graalvm-scripts/added/memory-limit.sh
similarity index 100%
rename from s2i/modules/kogito-graalvm-scripts/added/memory-limit.sh
rename to modules/kogito-graalvm-scripts/added/memory-limit.sh
diff --git a/s2i/modules/kogito-graalvm-scripts/configure b/modules/kogito-graalvm-scripts/configure
similarity index 100%
rename from s2i/modules/kogito-graalvm-scripts/configure
rename to modules/kogito-graalvm-scripts/configure
diff --git a/s2i/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml
similarity index 100%
rename from s2i/modules/kogito-graalvm-scripts/module.yaml
rename to modules/kogito-graalvm-scripts/module.yaml
diff --git a/s2i/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats b/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
similarity index 100%
rename from s2i/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
rename to modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
diff --git a/s2i/modules/kogito-image-dependencies/clean.sh b/modules/kogito-image-dependencies/clean.sh
similarity index 100%
rename from s2i/modules/kogito-image-dependencies/clean.sh
rename to modules/kogito-image-dependencies/clean.sh
diff --git a/s2i/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
similarity index 100%
rename from s2i/modules/kogito-image-dependencies/module.yaml
rename to modules/kogito-image-dependencies/module.yaml
diff --git a/s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh b/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
similarity index 100%
rename from s2i/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
rename to modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
diff --git a/s2i/modules/kogito-infinispan-properties/configure b/modules/kogito-infinispan-properties/configure
similarity index 100%
rename from s2i/modules/kogito-infinispan-properties/configure
rename to modules/kogito-infinispan-properties/configure
diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
similarity index 100%
rename from s2i/modules/kogito-infinispan-properties/module.yaml
rename to modules/kogito-infinispan-properties/module.yaml
diff --git a/s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats b/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
similarity index 100%
rename from s2i/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
rename to modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
diff --git a/s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh b/modules/kogito-jobs-service/added/kogito-app-launch.sh
similarity index 100%
rename from s2i/modules/kogito-jobs-service/added/kogito-app-launch.sh
rename to modules/kogito-jobs-service/added/kogito-app-launch.sh
diff --git a/s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
similarity index 100%
rename from s2i/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
rename to modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
diff --git a/s2i/modules/kogito-jobs-service/configure b/modules/kogito-jobs-service/configure
similarity index 100%
rename from s2i/modules/kogito-jobs-service/configure
rename to modules/kogito-jobs-service/configure
diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
similarity index 100%
rename from s2i/modules/kogito-jobs-service/module.yaml
rename to modules/kogito-jobs-service/module.yaml
diff --git a/s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
similarity index 100%
rename from s2i/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
rename to modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
diff --git a/s2i/modules/kogito-jq/clean.sh b/modules/kogito-jq/clean.sh
similarity index 100%
rename from s2i/modules/kogito-jq/clean.sh
rename to modules/kogito-jq/clean.sh
diff --git a/s2i/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
similarity index 100%
rename from s2i/modules/kogito-jq/module.yaml
rename to modules/kogito-jq/module.yaml
diff --git a/s2i/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
similarity index 100%
rename from s2i/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
rename to modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
diff --git a/s2i/modules/kogito-kubernetes-client/configure b/modules/kogito-kubernetes-client/configure
similarity index 100%
rename from s2i/modules/kogito-kubernetes-client/configure
rename to modules/kogito-kubernetes-client/configure
diff --git a/s2i/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
similarity index 100%
rename from s2i/modules/kogito-kubernetes-client/module.yaml
rename to modules/kogito-kubernetes-client/module.yaml
diff --git a/s2i/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats b/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
similarity index 100%
rename from s2i/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
rename to modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
diff --git a/s2i/modules/kogito-launch-scripts/added/configure.sh b/modules/kogito-launch-scripts/added/configure.sh
similarity index 100%
rename from s2i/modules/kogito-launch-scripts/added/configure.sh
rename to modules/kogito-launch-scripts/added/configure.sh
diff --git a/s2i/modules/kogito-launch-scripts/configure b/modules/kogito-launch-scripts/configure
similarity index 100%
rename from s2i/modules/kogito-launch-scripts/configure
rename to modules/kogito-launch-scripts/configure
diff --git a/s2i/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
similarity index 100%
rename from s2i/modules/kogito-launch-scripts/module.yaml
rename to modules/kogito-launch-scripts/module.yaml
diff --git a/s2i/modules/kogito-logging/added/logging.sh b/modules/kogito-logging/added/logging.sh
similarity index 100%
rename from s2i/modules/kogito-logging/added/logging.sh
rename to modules/kogito-logging/added/logging.sh
diff --git a/s2i/modules/kogito-logging/configure b/modules/kogito-logging/configure
similarity index 100%
rename from s2i/modules/kogito-logging/configure
rename to modules/kogito-logging/configure
diff --git a/s2i/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
similarity index 100%
rename from s2i/modules/kogito-logging/module.yaml
rename to modules/kogito-logging/module.yaml
diff --git a/s2i/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
similarity index 100%
rename from s2i/modules/kogito-management-console/added/kogito-app-launch.sh
rename to modules/kogito-management-console/added/kogito-app-launch.sh
diff --git a/s2i/modules/kogito-management-console/added/launch/kogito-management-console.sh b/modules/kogito-management-console/added/launch/kogito-management-console.sh
similarity index 100%
rename from s2i/modules/kogito-management-console/added/launch/kogito-management-console.sh
rename to modules/kogito-management-console/added/launch/kogito-management-console.sh
diff --git a/s2i/modules/kogito-management-console/configure b/modules/kogito-management-console/configure
similarity index 100%
rename from s2i/modules/kogito-management-console/configure
rename to modules/kogito-management-console/configure
diff --git a/s2i/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
similarity index 100%
rename from s2i/modules/kogito-management-console/module.yaml
rename to modules/kogito-management-console/module.yaml
diff --git a/s2i/modules/kogito-management-console/tests/bats/kogito-management-console.bats b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
similarity index 100%
rename from s2i/modules/kogito-management-console/tests/bats/kogito-management-console.bats
rename to modules/kogito-management-console/tests/bats/kogito-management-console.bats
diff --git a/s2i/modules/kogito-maven/3.6.0/added/configure-maven.sh b/modules/kogito-maven/3.6.0/added/configure-maven.sh
similarity index 100%
rename from s2i/modules/kogito-maven/3.6.0/added/configure-maven.sh
rename to modules/kogito-maven/3.6.0/added/configure-maven.sh
diff --git a/s2i/modules/kogito-maven/3.6.0/configure b/modules/kogito-maven/3.6.0/configure
similarity index 100%
rename from s2i/modules/kogito-maven/3.6.0/configure
rename to modules/kogito-maven/3.6.0/configure
diff --git a/s2i/modules/kogito-maven/3.6.0/maven/settings.xml b/modules/kogito-maven/3.6.0/maven/settings.xml
similarity index 100%
rename from s2i/modules/kogito-maven/3.6.0/maven/settings.xml
rename to modules/kogito-maven/3.6.0/maven/settings.xml
diff --git a/s2i/modules/kogito-maven/3.6.0/module.yaml b/modules/kogito-maven/3.6.0/module.yaml
similarity index 100%
rename from s2i/modules/kogito-maven/3.6.0/module.yaml
rename to modules/kogito-maven/3.6.0/module.yaml
diff --git a/s2i/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
similarity index 100%
rename from s2i/modules/kogito-maven/tests/bats/maven-settings.bats
rename to modules/kogito-maven/tests/bats/maven-settings.bats
diff --git a/s2i/modules/kogito-openjdk/1.8.0-headless/module.yaml b/modules/kogito-openjdk/1.8.0-headless/module.yaml
similarity index 100%
rename from s2i/modules/kogito-openjdk/1.8.0-headless/module.yaml
rename to modules/kogito-openjdk/1.8.0-headless/module.yaml
diff --git a/s2i/modules/kogito-openjdk/1.8.0/clean.sh b/modules/kogito-openjdk/1.8.0/clean.sh
similarity index 100%
rename from s2i/modules/kogito-openjdk/1.8.0/clean.sh
rename to modules/kogito-openjdk/1.8.0/clean.sh
diff --git a/s2i/modules/kogito-openjdk/1.8.0/module.yaml b/modules/kogito-openjdk/1.8.0/module.yaml
similarity index 100%
rename from s2i/modules/kogito-openjdk/1.8.0/module.yaml
rename to modules/kogito-openjdk/1.8.0/module.yaml
diff --git a/s2i/modules/kogito-persistence/added/kogito-persistence.sh b/modules/kogito-persistence/added/kogito-persistence.sh
similarity index 100%
rename from s2i/modules/kogito-persistence/added/kogito-persistence.sh
rename to modules/kogito-persistence/added/kogito-persistence.sh
diff --git a/s2i/modules/kogito-persistence/added/post-hook-persistence.sh b/modules/kogito-persistence/added/post-hook-persistence.sh
similarity index 100%
rename from s2i/modules/kogito-persistence/added/post-hook-persistence.sh
rename to modules/kogito-persistence/added/post-hook-persistence.sh
diff --git a/s2i/modules/kogito-persistence/configure b/modules/kogito-persistence/configure
similarity index 100%
rename from s2i/modules/kogito-persistence/configure
rename to modules/kogito-persistence/configure
diff --git a/s2i/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
similarity index 100%
rename from s2i/modules/kogito-persistence/module.yaml
rename to modules/kogito-persistence/module.yaml
diff --git a/s2i/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json b/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json
rename to modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json
diff --git a/s2i/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json b/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json
rename to modules/kogito-persistence/tests/bats/expected/patch_empty_data.json
diff --git a/s2i/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/kogito-persistence.bats
rename to modules/kogito-persistence/tests/bats/kogito-persistence.bats
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/config_map.json b/modules/kogito-persistence/tests/bats/mocks/config_map.json
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/mocks/config_map.json
rename to modules/kogito-persistence/tests/bats/mocks/config_map.json
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json b/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json
rename to modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json b/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json
rename to modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json b/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json
rename to modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/travels.proto b/modules/kogito-persistence/tests/bats/mocks/travels.proto
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/mocks/travels.proto
rename to modules/kogito-persistence/tests/bats/mocks/travels.proto
diff --git a/s2i/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto b/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto
rename to modules/kogito-persistence/tests/bats/mocks/visaApplications.proto
diff --git a/s2i/modules/kogito-persistence/tests/bats/post-hook-persistence.bats b/modules/kogito-persistence/tests/bats/post-hook-persistence.bats
similarity index 100%
rename from s2i/modules/kogito-persistence/tests/bats/post-hook-persistence.bats
rename to modules/kogito-persistence/tests/bats/post-hook-persistence.bats
diff --git a/s2i/modules/kogito-quarkus-jvm/README.md b/modules/kogito-quarkus-jvm/README.md
similarity index 100%
rename from s2i/modules/kogito-quarkus-jvm/README.md
rename to modules/kogito-quarkus-jvm/README.md
diff --git a/s2i/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh b/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
similarity index 100%
rename from s2i/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
rename to modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
diff --git a/s2i/modules/kogito-quarkus-jvm/configure b/modules/kogito-quarkus-jvm/configure
similarity index 100%
rename from s2i/modules/kogito-quarkus-jvm/configure
rename to modules/kogito-quarkus-jvm/configure
diff --git a/s2i/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-quarkus-jvm/module.yaml
similarity index 100%
rename from s2i/modules/kogito-quarkus-jvm/module.yaml
rename to modules/kogito-quarkus-jvm/module.yaml
diff --git a/s2i/modules/kogito-quarkus-jvm/s2i/bin/assemble b/modules/kogito-quarkus-jvm/s2i/bin/assemble
similarity index 100%
rename from s2i/modules/kogito-quarkus-jvm/s2i/bin/assemble
rename to modules/kogito-quarkus-jvm/s2i/bin/assemble
diff --git a/s2i/modules/kogito-quarkus-jvm/s2i/bin/usage b/modules/kogito-quarkus-jvm/s2i/bin/usage
similarity index 100%
rename from s2i/modules/kogito-quarkus-jvm/s2i/bin/usage
rename to modules/kogito-quarkus-jvm/s2i/bin/usage
diff --git a/s2i/modules/kogito-quarkus-s2i/README.md b/modules/kogito-quarkus-s2i/README.md
similarity index 100%
rename from s2i/modules/kogito-quarkus-s2i/README.md
rename to modules/kogito-quarkus-s2i/README.md
diff --git a/s2i/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
similarity index 100%
rename from s2i/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
rename to modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
diff --git a/s2i/modules/kogito-quarkus-s2i/configure b/modules/kogito-quarkus-s2i/configure
similarity index 100%
rename from s2i/modules/kogito-quarkus-s2i/configure
rename to modules/kogito-quarkus-s2i/configure
diff --git a/s2i/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
similarity index 100%
rename from s2i/modules/kogito-quarkus-s2i/module.yaml
rename to modules/kogito-quarkus-s2i/module.yaml
diff --git a/s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble b/modules/kogito-quarkus-s2i/s2i/bin/assemble
similarity index 100%
rename from s2i/modules/kogito-quarkus-s2i/s2i/bin/assemble
rename to modules/kogito-quarkus-s2i/s2i/bin/assemble
diff --git a/s2i/modules/kogito-quarkus-s2i/s2i/bin/usage b/modules/kogito-quarkus-s2i/s2i/bin/usage
similarity index 100%
rename from s2i/modules/kogito-quarkus-s2i/s2i/bin/usage
rename to modules/kogito-quarkus-s2i/s2i/bin/usage
diff --git a/s2i/modules/kogito-quarkus/README.md b/modules/kogito-quarkus/README.md
similarity index 100%
rename from s2i/modules/kogito-quarkus/README.md
rename to modules/kogito-quarkus/README.md
diff --git a/s2i/modules/kogito-quarkus/added/kogito-app-launch.sh b/modules/kogito-quarkus/added/kogito-app-launch.sh
similarity index 100%
rename from s2i/modules/kogito-quarkus/added/kogito-app-launch.sh
rename to modules/kogito-quarkus/added/kogito-app-launch.sh
diff --git a/s2i/modules/kogito-quarkus/configure b/modules/kogito-quarkus/configure
similarity index 100%
rename from s2i/modules/kogito-quarkus/configure
rename to modules/kogito-quarkus/configure
diff --git a/s2i/modules/kogito-quarkus/module.yaml b/modules/kogito-quarkus/module.yaml
similarity index 100%
rename from s2i/modules/kogito-quarkus/module.yaml
rename to modules/kogito-quarkus/module.yaml
diff --git a/s2i/modules/kogito-quarkus/s2i/bin/assemble b/modules/kogito-quarkus/s2i/bin/assemble
similarity index 100%
rename from s2i/modules/kogito-quarkus/s2i/bin/assemble
rename to modules/kogito-quarkus/s2i/bin/assemble
diff --git a/s2i/modules/kogito-quarkus/s2i/bin/usage b/modules/kogito-quarkus/s2i/bin/usage
similarity index 100%
rename from s2i/modules/kogito-quarkus/s2i/bin/usage
rename to modules/kogito-quarkus/s2i/bin/usage
diff --git a/s2i/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
similarity index 100%
rename from s2i/modules/kogito-s2i-core/added/s2i-core
rename to modules/kogito-s2i-core/added/s2i-core
diff --git a/s2i/modules/kogito-s2i-core/configure.sh b/modules/kogito-s2i-core/configure.sh
similarity index 100%
rename from s2i/modules/kogito-s2i-core/configure.sh
rename to modules/kogito-s2i-core/configure.sh
diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
similarity index 100%
rename from s2i/modules/kogito-s2i-core/module.yaml
rename to modules/kogito-s2i-core/module.yaml
diff --git a/s2i/modules/kogito-s2i-core/s2i/bin/assemble-runtime b/modules/kogito-s2i-core/s2i/bin/assemble-runtime
similarity index 100%
rename from s2i/modules/kogito-s2i-core/s2i/bin/assemble-runtime
rename to modules/kogito-s2i-core/s2i/bin/assemble-runtime
diff --git a/s2i/modules/kogito-s2i-core/s2i/bin/run b/modules/kogito-s2i-core/s2i/bin/run
similarity index 100%
rename from s2i/modules/kogito-s2i-core/s2i/bin/run
rename to modules/kogito-s2i-core/s2i/bin/run
diff --git a/s2i/modules/kogito-s2i-core/s2i/bin/save-artifacts b/modules/kogito-s2i-core/s2i/bin/save-artifacts
similarity index 100%
rename from s2i/modules/kogito-s2i-core/s2i/bin/save-artifacts
rename to modules/kogito-s2i-core/s2i/bin/save-artifacts
diff --git a/s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
similarity index 100%
rename from s2i/modules/kogito-s2i-core/tests/bats/s2i-core.bats
rename to modules/kogito-s2i-core/tests/bats/s2i-core.bats
diff --git a/s2i/modules/kogito-springboot-s2i/README.md b/modules/kogito-springboot-s2i/README.md
similarity index 100%
rename from s2i/modules/kogito-springboot-s2i/README.md
rename to modules/kogito-springboot-s2i/README.md
diff --git a/s2i/modules/kogito-springboot-s2i/added/kogito-app-launch.sh b/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
similarity index 100%
rename from s2i/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
rename to modules/kogito-springboot-s2i/added/kogito-app-launch.sh
diff --git a/s2i/modules/kogito-springboot-s2i/configure b/modules/kogito-springboot-s2i/configure
similarity index 100%
rename from s2i/modules/kogito-springboot-s2i/configure
rename to modules/kogito-springboot-s2i/configure
diff --git a/s2i/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
similarity index 100%
rename from s2i/modules/kogito-springboot-s2i/module.yaml
rename to modules/kogito-springboot-s2i/module.yaml
diff --git a/s2i/modules/kogito-springboot-s2i/s2i/bin/assemble b/modules/kogito-springboot-s2i/s2i/bin/assemble
similarity index 100%
rename from s2i/modules/kogito-springboot-s2i/s2i/bin/assemble
rename to modules/kogito-springboot-s2i/s2i/bin/assemble
diff --git a/s2i/modules/kogito-springboot-s2i/s2i/bin/usage b/modules/kogito-springboot-s2i/s2i/bin/usage
similarity index 100%
rename from s2i/modules/kogito-springboot-s2i/s2i/bin/usage
rename to modules/kogito-springboot-s2i/s2i/bin/usage
diff --git a/s2i/modules/kogito-springboot/README.md b/modules/kogito-springboot/README.md
similarity index 100%
rename from s2i/modules/kogito-springboot/README.md
rename to modules/kogito-springboot/README.md
diff --git a/s2i/modules/kogito-springboot/added/kogito-app-launch.sh b/modules/kogito-springboot/added/kogito-app-launch.sh
similarity index 100%
rename from s2i/modules/kogito-springboot/added/kogito-app-launch.sh
rename to modules/kogito-springboot/added/kogito-app-launch.sh
diff --git a/s2i/modules/kogito-springboot/configure b/modules/kogito-springboot/configure
similarity index 100%
rename from s2i/modules/kogito-springboot/configure
rename to modules/kogito-springboot/configure
diff --git a/s2i/modules/kogito-springboot/module.yaml b/modules/kogito-springboot/module.yaml
similarity index 100%
rename from s2i/modules/kogito-springboot/module.yaml
rename to modules/kogito-springboot/module.yaml
diff --git a/s2i/modules/kogito-springboot/s2i/bin/assemble b/modules/kogito-springboot/s2i/bin/assemble
similarity index 100%
rename from s2i/modules/kogito-springboot/s2i/bin/assemble
rename to modules/kogito-springboot/s2i/bin/assemble
diff --git a/s2i/modules/kogito-springboot/s2i/bin/usage b/modules/kogito-springboot/s2i/bin/usage
similarity index 100%
rename from s2i/modules/kogito-springboot/s2i/bin/usage
rename to modules/kogito-springboot/s2i/bin/usage
diff --git a/s2i/modules/kogito-system-user/add-user b/modules/kogito-system-user/add-user
similarity index 100%
rename from s2i/modules/kogito-system-user/add-user
rename to modules/kogito-system-user/add-user
diff --git a/s2i/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
similarity index 100%
rename from s2i/modules/kogito-system-user/module.yaml
rename to modules/kogito-system-user/module.yaml
diff --git a/s2i/push-staging.py b/push-staging.py
similarity index 100%
rename from s2i/push-staging.py
rename to push-staging.py
diff --git a/s2i/tests/features/common.feature b/tests/features/common.feature
similarity index 100%
rename from s2i/tests/features/common.feature
rename to tests/features/common.feature
diff --git a/s2i/tests/features/kogito-data-index.feature b/tests/features/kogito-data-index.feature
similarity index 100%
rename from s2i/tests/features/kogito-data-index.feature
rename to tests/features/kogito-data-index.feature
diff --git a/s2i/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
similarity index 100%
rename from s2i/tests/features/kogito-jobs-service.feature
rename to tests/features/kogito-jobs-service.feature
diff --git a/s2i/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
similarity index 100%
rename from s2i/tests/features/kogito-management-console.feature
rename to tests/features/kogito-management-console.feature
diff --git a/s2i/tests/features/kogito-quarkus-jvm-ubi8.feature b/tests/features/kogito-quarkus-jvm-ubi8.feature
similarity index 100%
rename from s2i/tests/features/kogito-quarkus-jvm-ubi8.feature
rename to tests/features/kogito-quarkus-jvm-ubi8.feature
diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
similarity index 100%
rename from s2i/tests/features/kogito-quarkus-ubi8-s2i.feature
rename to tests/features/kogito-quarkus-ubi8-s2i.feature
diff --git a/s2i/tests/features/kogito-quarkus-ubi8.feature b/tests/features/kogito-quarkus-ubi8.feature
similarity index 100%
rename from s2i/tests/features/kogito-quarkus-ubi8.feature
rename to tests/features/kogito-quarkus-ubi8.feature
diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
similarity index 100%
rename from s2i/tests/features/kogito-springboot-ubi8-s2i.feature
rename to tests/features/kogito-springboot-ubi8-s2i.feature
diff --git a/s2i/tests/features/kogito-springboot-ubi8.feature b/tests/features/kogito-springboot-ubi8.feature
similarity index 100%
rename from s2i/tests/features/kogito-springboot-ubi8.feature
rename to tests/features/kogito-springboot-ubi8.feature
diff --git a/s2i/tests/test-apps/application.properties b/tests/test-apps/application.properties
similarity index 100%
rename from s2i/tests/test-apps/application.properties
rename to tests/test-apps/application.properties
diff --git a/s2i/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
similarity index 100%
rename from s2i/tests/test-apps/clone-repo.sh
rename to tests/test-apps/clone-repo.sh

From 676121063ab2dc3a37664ddc7c1b2d9205d3c837 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 19 Mar 2020 18:09:25 -0300
Subject: [PATCH 107/709] [KOGITO-1388] - Rename kogito-cloud to kogito-images
 (#113)

Update Management Console to the latest SNAPSHOT version.
And improve the test by checking messages on the logs

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-management-console/module.yaml    | 4 ++--
 tests/features/kogito-management-console.feature | 3 ++-
 tests/features/kogito-quarkus-ubi8-s2i.feature   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e6f4c99b951..434ad8c83d8 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -8,8 +8,8 @@ envs:
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200312.091545-18-runner.jar
-    md5: 32b6fe5644752cc2c2f83825aab0b1fc
+    url: https://repository.jboss.org/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200319.135106-24-runner.jar
+    md5: 39710d6d1f285ebcc1d0e7b4b4aed742
 
 execute:
   - script: configure
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index a01cd4833cd..b7dba83ccb1 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -21,6 +21,7 @@ Feature: kogito-management-console feature
       | variable     | value |
       | SCRIPT_DEBUG | true  |
     Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
+     And container log should not contain Data index url not set, default will be used: http://localhost:8180
 
   Scenario: Verify if the debug is correctly enabled and set data-index url
     When container is started with env
@@ -28,5 +29,5 @@ Feature: kogito-management-console feature
       | SCRIPT_DEBUG                 | true              |
       | KOGITO_DATAINDEX_HTTP_URL    | http://test:9090  |
     Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
-
+     And container log should not contain Data index url not set, default will be used: http://localhost:8180
 
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 3035fd8daf4..ef0b73bb029 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -56,7 +56,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-stubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable          | value         |
       | NATIVE            | true          |
       | MAVEN_ARGS_APPEND | -Ppersistence |

From 7a13116a98b7f6de9fba2ff61975106187ddc2c1 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 24 Mar 2020 15:26:02 -0300
Subject: [PATCH 108/709] [KOGITO-851] - Enable events for Jobs Service (#114)

* [KOGITO-851] - Enable events for Jobs Service

* fixing KAFKA_BOOTSTRAP_SERVERS env name
---
 kogito-jobs-service-overrides.yaml                 |  8 +++++++-
 .../added/launch/kogito-jobs-service.sh            |  9 +++++++++
 modules/kogito-jobs-service/module.yaml            |  4 ++--
 .../tests/bats/kogito-jobs-service.bats            | 10 ++++++++++
 tests/features/kogito-jobs-service.feature         | 14 ++++++++++++++
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index dd9ba6d3eb7..6267388e2f4 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -21,11 +21,17 @@ envs:
   example: "localhost:11222,localhost:11223"
   description: "Required when persisted is enabled. (Sets the property quarkus.infinispan-client.server-list)."
 - name: "MAX_INTERVAL_LIMIT_RETRY"
-  example: "localhost:11222,localhost:11223"
+  example: "60000"
   description: "Maximum interval in milliseconds when retrying to execute jobs, in case of failures, defaults to 60000ms. (Sets the property kogito.jobs-service.maxIntervalLimitToRetryMillis)."
 - name: "BACKOFF_RETRY"
   example: "1000"
   description: "Retry backoff time in milliseconds between the job execution attempts, in case of execution failure, defaults to 1000. (Sets the property kogito.jobs-service.backoffRetryMillis)."
+- name: "ENABLE_EVENTS"
+  example: "true"
+  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+- name: "KAFKA_BOOTSTRAP_SERVERS"
+  example: "localhost:9092"
+  description: "When enabling events for the Jobs Service, this variable also needs to be set to allow the service to connect to the given Kafka instance."
 
 ports:
 - value: 8080
diff --git a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
index 4097c98ab6d..52cac74f87c 100644
--- a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
+++ b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
@@ -33,5 +33,14 @@ function configure_jobs_service() {
         KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.maxIntervalLimitToRetryMillis=${MAX_INTERVAL_LIMIT_RETRY}"
     fi
 
+    if [ "${ENABLE_EVENTS^^}" == "TRUE" ]; then
+        if [ "${KAFKA_BOOTSTRAP_SERVERS}x" = "x" ]; then
+            echo "KAFKA_BOOTSTRAP_SERVERS env not found, please set it."
+            exit 1
+        else
+            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.profile=events-support"
+            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dmp.messaging.outgoing.kogito-job-service-job-status-events.bootstrap.servers=${KAFKA_BOOTSTRAP_SERVERS} -Devents-support.quarkus.kafka.bootstrap-servers=${KAFKA_BOOTSTRAP_SERVERS}"
+        fi
+    fi
 }
 
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 87d83bfa075..1de7fbaf557 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "0.9.0-rc1"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200312.090922-105-runner.jar
-    md5: 098e6471f1a6d151fbb9f5e4f4422b16
+    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200323.063633-114-runner.jar
+    md5: b6a499e6bd78d342d5682b20d5977286
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index 1490c7f2e3b..96f3c817579 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -70,4 +70,14 @@ teardown() {
     [ "${result}" = "${expected}" ]
 }
 
+@test "check if the event is correctly set" {
+    export ENABLE_EVENTS="true"
+    export KAFKA_BOOTSTRAP_SERVERS="localhost:9999"
+    configure_jobs_service
+
+    result="${KOGITO_JOBS_PROPS}"
+    expected=" -Dquarkus.profile=events-support -Dmp.messaging.outgoing.kogito-job-service-job-status-events.bootstrap.servers=${KAFKA_BOOTSTRAP_SERVERS} -Devents-support.quarkus.kafka.bootstrap-servers=${KAFKA_BOOTSTRAP_SERVERS}"
 
+    echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 3bf8a762c40..1ae9c2def64 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -69,3 +69,17 @@ Feature: Kogito-jobs-service feature.
      And container log should contain quarkus.infinispan-client.sasl-mechanism = COOLGSSAPI
      And container log should contain quarkus.infinispan-client.server-list = localhost:11111
 
+  Scenario: verify if container fails if event is enabled but there is no Kafka bootstrap server set.
+    When container is started with env
+      | variable            | value |
+      | ENABLE_EVENTS       | true  |
+     Then container log should contain KAFKA_BOOTSTRAP_SERVERS env not found, please set it.
+    
+  Scenario: verify if the events is correctly enabled
+    When container is started with env
+      | variable                      | value           |
+      | SCRIPT_DEBUG                  | true            |
+      | ENABLE_EVENTS                 | true            |
+      | KAFKA_BOOTSTRAP_SERVERS        | localhost:11111 |
+    Then container log should contain bootstrap.servers = [localhost:11111]
+     And container log should contain Connection to node -1 (localhost/127.0.0.1:11111) could not be established.
\ No newline at end of file

From ad5b03b437693b3f9198c225732fff9de316b6a5 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 25 Mar 2020 16:03:41 -0300
Subject: [PATCH 109/709] [KOGITO-1565] - Align maven version on Kogito images
 (#115)

Signed-off-by: spolti <fspolti@redhat.com>
---
 kogito-quarkus-s2i-overrides.yaml                      |  2 +-
 kogito-springboot-s2i-overrides.yaml                   |  2 +-
 .../{3.6.0 => 3.6.x}/added/configure-maven.sh          |  0
 modules/kogito-maven/{3.6.0 => 3.6.x}/configure        |  0
 .../kogito-maven/{3.6.0 => 3.6.x}/maven/settings.xml   |  0
 modules/kogito-maven/{3.6.0 => 3.6.x}/module.yaml      | 10 +++++-----
 modules/kogito-maven/tests/bats/maven-settings.bats    |  4 ++--
 tests/features/kogito-quarkus-ubi8-s2i.feature         |  2 +-
 tests/features/kogito-springboot-ubi8-s2i.feature      |  1 +
 9 files changed, 11 insertions(+), 10 deletions(-)
 rename modules/kogito-maven/{3.6.0 => 3.6.x}/added/configure-maven.sh (100%)
 rename modules/kogito-maven/{3.6.0 => 3.6.x}/configure (100%)
 rename modules/kogito-maven/{3.6.0 => 3.6.x}/maven/settings.xml (100%)
 rename modules/kogito-maven/{3.6.0 => 3.6.x}/module.yaml (83%)

diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
index ef8f723ccd1..c15279ed3e8 100644
--- a/kogito-quarkus-s2i-overrides.yaml
+++ b/kogito-quarkus-s2i-overrides.yaml
@@ -36,7 +36,7 @@ modules:
   - name: org.kie.kogito.openjdk
     version: "1.8.0"
   - name: org.kie.kogito.maven
-    version: "3.6.0"
+    version: "3.6.2"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.quarkus.s2i
 
diff --git a/kogito-springboot-s2i-overrides.yaml b/kogito-springboot-s2i-overrides.yaml
index 6acc286a648..9d03a763d17 100644
--- a/kogito-springboot-s2i-overrides.yaml
+++ b/kogito-springboot-s2i-overrides.yaml
@@ -28,7 +28,7 @@ modules:
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.maven
-    version: "3.6.0"
+    version: "3.6.2"
   - name: org.kie.kogito.openjdk
     version: "1.8.0"
   - name: org.kie.kogito.s2i.core
diff --git a/modules/kogito-maven/3.6.0/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
similarity index 100%
rename from modules/kogito-maven/3.6.0/added/configure-maven.sh
rename to modules/kogito-maven/3.6.x/added/configure-maven.sh
diff --git a/modules/kogito-maven/3.6.0/configure b/modules/kogito-maven/3.6.x/configure
similarity index 100%
rename from modules/kogito-maven/3.6.0/configure
rename to modules/kogito-maven/3.6.x/configure
diff --git a/modules/kogito-maven/3.6.0/maven/settings.xml b/modules/kogito-maven/3.6.x/maven/settings.xml
similarity index 100%
rename from modules/kogito-maven/3.6.0/maven/settings.xml
rename to modules/kogito-maven/3.6.x/maven/settings.xml
diff --git a/modules/kogito-maven/3.6.0/module.yaml b/modules/kogito-maven/3.6.x/module.yaml
similarity index 83%
rename from modules/kogito-maven/3.6.0/module.yaml
rename to modules/kogito-maven/3.6.x/module.yaml
index a73bb8f685b..52f2b7c1a74 100644
--- a/modules/kogito-maven/3.6.0/module.yaml
+++ b/modules/kogito-maven/3.6.x/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.maven
-version: "3.6.0"
+version: "3.6.2"
 
 envs:
   - name: "MAVEN_VERSION"
-    value: "3.6.0"
+    value: "3.6.2"
   - name: " MAVEN_HOME"
     value: "/usr/share/maven"
   - name: "HTTP_PROXY"
@@ -29,9 +29,9 @@ envs:
 
 # unfortunately by now the version needs to be hardcoded.
 artifacts:
-  - name: apache-maven-3.6.0-bin.tar.gz
-    url: https://archive.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz
-    md5: 268081b8394502b6bf8a75ca9c5a2c4f
+  - name: apache-maven-3.6.2-bin.tar.gz
+    url: https://archive.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz
+    md5: f1d40d252a4e09429297567a66324db7
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index f4be1ed29a5..42294bbba85 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -1,13 +1,13 @@
 #!/usr/bin/env bats
 
 # imports
-source $BATS_TEST_DIRNAME/../../3.6.0/added/configure-maven.sh
+source $BATS_TEST_DIRNAME/../../3.6.x/added/configure-maven.sh
 
 
 setup() {
     export HOME=$BATS_TMPDIR/maven
     mkdir -p ${HOME}/.m2/
-    cp $BATS_TEST_DIRNAME/../../3.6.0/maven/settings.xml ${HOME}/.m2/
+    cp $BATS_TEST_DIRNAME/../../3.6.x/maven/settings.xml ${HOME}/.m2/
 }
 
 teardown() {
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index ef0b73bb029..e7355d0e4cd 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -113,7 +113,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
   Scenario: verify if the maven and graal vm settings are correct
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.0
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index da540420939..86857fd6dad 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -63,5 +63,6 @@ Feature: kogito-springboot-ubi8-s2i image tests
     Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
     And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
     And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
     And run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
 

From 2f73e83dafecb566816818a1efe41d06734b79e0 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 27 Mar 2020 11:12:58 -0300
Subject: [PATCH 110/709] [KOGITO-1548] - Upgrade Kogito Images to JDK 11
 (#116)

Signed-off-by: spolti <fspolti@redhat.com>
---
 image.yaml                                    |  2 +-
 kogito-data-index-overrides.yaml              |  2 +-
 kogito-imagestream.yaml                       | 48 +++++++++----------
 kogito-jobs-service-overrides.yaml            |  2 +-
 kogito-management-console-overrides.yaml      |  2 +-
 kogito-quarkus-jvm-overrides.yaml             |  2 +-
 kogito-quarkus-overrides.yaml                 |  2 +-
 kogito-quarkus-s2i-overrides.yaml             |  4 +-
 kogito-springboot-overrides.yaml              |  2 +-
 kogito-springboot-s2i-overrides.yaml          |  2 +-
 modules/kogito-data-index/module.yaml         |  2 +-
 .../{19.x => 19.x-java-1.8}/configure         |  4 +-
 .../{19.x => 19.x-java-1.8}/module.yaml       |  4 +-
 .../19.x-java-11/configure                    | 14 ++++++
 .../19.x-java-11/module.yaml                  | 25 ++++++++++
 modules/kogito-graalvm-scripts/configure      |  2 +-
 modules/kogito-image-dependencies/module.yaml |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 modules/kogito-jobs-service/module.yaml       |  6 +--
 modules/kogito-jq/module.yaml                 |  2 +-
 modules/kogito-kubernetes-client/module.yaml  |  2 +-
 modules/kogito-launch-scripts/module.yaml     |  2 +-
 modules/kogito-logging/module.yaml            |  2 +-
 modules/kogito-management-console/module.yaml |  2 +-
 .../kogito-openjdk/11-headless/module.yaml    | 25 ++++++++++
 modules/kogito-openjdk/11/clean.sh            |  4 ++
 modules/kogito-openjdk/11/module.yaml         | 29 +++++++++++
 modules/kogito-persistence/module.yaml        |  2 +-
 modules/kogito-quarkus-jvm/module.yaml        |  2 +-
 modules/kogito-quarkus-s2i/module.yaml        |  4 +-
 modules/kogito-quarkus/module.yaml            |  2 +-
 modules/kogito-s2i-core/module.yaml           |  2 +-
 modules/kogito-springboot-s2i/module.yaml     |  4 +-
 modules/kogito-springboot/module.yaml         |  2 +-
 modules/kogito-system-user/module.yaml        |  2 +-
 tests/features/kogito-jobs-service.feature    |  2 +-
 .../features/kogito-quarkus-jvm-ubi8.feature  |  4 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  |  2 +-
 .../kogito-springboot-ubi8-s2i.feature        |  6 +--
 tests/features/kogito-springboot-ubi8.feature |  4 +-
 tests/test-apps/clone-repo.sh                 | 21 ++++----
 41 files changed, 178 insertions(+), 78 deletions(-)
 rename modules/kogito-graalvm-installer/{19.x => 19.x-java-1.8}/configure (59%)
 rename modules/kogito-graalvm-installer/{19.x => 19.x-java-1.8}/module.yaml (90%)
 create mode 100644 modules/kogito-graalvm-installer/19.x-java-11/configure
 create mode 100644 modules/kogito-graalvm-installer/19.x-java-11/module.yaml
 create mode 100644 modules/kogito-openjdk/11-headless/module.yaml
 create mode 100644 modules/kogito-openjdk/11/clean.sh
 create mode 100644 modules/kogito-openjdk/11/module.yaml

diff --git a/image.yaml b/image.yaml
index 72878629230..a0ce196618d 100644
--- a/image.yaml
+++ b/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/kogito-data-index-overrides.yaml b/kogito-data-index-overrides.yaml
index 7017e476683..ce2ea6b2997 100644
--- a/kogito-data-index-overrides.yaml
+++ b/kogito-data-index-overrides.yaml
@@ -21,7 +21,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.openjdk
-    version: "1.8.0-headless"
+    version: "11-headless"
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.infinispan.properties
   - name: org.kie.kogito.dataindex
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 4c563fede71..62d799cc8cf 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc1'
+        - name: '0.9.0-rc2'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.9.0-rc1'
+            version: '0.9.0-rc2'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.9.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.9.0-rc2
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc1'
+        - name: '0.9.0-rc2'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.9.0-rc1'
+            version: '0.9.0-rc2'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.9.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.9.0-rc2
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc1'
+        - name: '0.9.0-rc2'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.9.0-rc1'
+            version: '0.9.0-rc2'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.9.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.9.0-rc2
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc1'
+        - name: '0.9.0-rc2'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.9.0-rc1'
+            version: '0.9.0-rc2'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.9.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.9.0-rc2
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc1'
+        - name: '0.9.0-rc2'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.9.0-rc1'
+            version: '0.9.0-rc2'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.9.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.9.0-rc2
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc1'
+        - name: '0.9.0-rc2'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: persistence backed by Infinispan server
-            version: '0.9.0-rc1'
+            version: '0.9.0-rc2'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.9.0-rc1
+            name: quay.io/kiegroup/kogito-data-index:0.9.0-rc2
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc1'
+        - name: '0.9.0-rc2'
           annotations:
             description: Runtime image for the Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.9.0-rc1'
+            version: '0.9.0-rc2'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.9.0-rc1
+            name: quay.io/kiegroup/kogito-jobs-service:0.9.0-rc2
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,16 +162,16 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc1'
+        - name: '0.9.0-rc2'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '0.9.0-rc1'
+            version: '0.9.0-rc2'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:0.9.0-rc1
+            name: quay.io/kiegroup/kogito-management-console:0.9.0-rc2
 
diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index 6267388e2f4..4280d0ddfac 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -41,7 +41,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.openjdk
-    version: "1.8.0-headless"
+    version: "11-headless"
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.infinispan.properties
   - name: org.kie.kogito.jobs.service
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index 08cfabb28fd..57152d452f7 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -21,7 +21,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.openjdk
-    version: "1.8.0-headless"
+    version: "11-headless"
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.management.console
 
diff --git a/kogito-quarkus-jvm-overrides.yaml b/kogito-quarkus-jvm-overrides.yaml
index 9075353dabb..8d2342c484c 100644
--- a/kogito-quarkus-jvm-overrides.yaml
+++ b/kogito-quarkus-jvm-overrides.yaml
@@ -26,7 +26,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.openjdk
-    version: "1.8.0-headless"
+    version: "11-headless"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.quarkus.jvm
 
diff --git a/kogito-quarkus-overrides.yaml b/kogito-quarkus-overrides.yaml
index f9694e91f83..de9e6460337 100644
--- a/kogito-quarkus-overrides.yaml
+++ b/kogito-quarkus-overrides.yaml
@@ -29,7 +29,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.graalvm.installer
-    version: "19.3.1"
+    version: "19.3.1-java-11"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.quarkus
 
diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
index c15279ed3e8..0e2f8174bd7 100644
--- a/kogito-quarkus-s2i-overrides.yaml
+++ b/kogito-quarkus-s2i-overrides.yaml
@@ -31,10 +31,10 @@ modules:
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "19.3.1"
+    version: "19.3.1-java-11"
   - name: org.kie.kogito.graalvm.scripts
   - name: org.kie.kogito.openjdk
-    version: "1.8.0"
+    version: "11"
   - name: org.kie.kogito.maven
     version: "3.6.2"
   - name: org.kie.kogito.s2i.core
diff --git a/kogito-springboot-overrides.yaml b/kogito-springboot-overrides.yaml
index a15625dc432..7479ae7695a 100644
--- a/kogito-springboot-overrides.yaml
+++ b/kogito-springboot-overrides.yaml
@@ -29,7 +29,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.openjdk
-    version: "1.8.0-headless"
+    version: "11-headless"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.springboot
 
diff --git a/kogito-springboot-s2i-overrides.yaml b/kogito-springboot-s2i-overrides.yaml
index 9d03a763d17..14f43088b11 100644
--- a/kogito-springboot-s2i-overrides.yaml
+++ b/kogito-springboot-s2i-overrides.yaml
@@ -30,6 +30,6 @@ modules:
   - name: org.kie.kogito.maven
     version: "3.6.2"
   - name: org.kie.kogito.openjdk
-    version: "1.8.0"
+    version: "11"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.springboot.s2i
diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index c5fc8676793..a5502b02a57 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 artifacts:
   - name: kogito-data-index-runner.jar
diff --git a/modules/kogito-graalvm-installer/19.x/configure b/modules/kogito-graalvm-installer/19.x-java-1.8/configure
similarity index 59%
rename from modules/kogito-graalvm-installer/19.x/configure
rename to modules/kogito-graalvm-installer/19.x-java-1.8/configure
index a7ca3ed90db..30f63dfc37f 100644
--- a/modules/kogito-graalvm-installer/19.x/configure
+++ b/modules/kogito-graalvm-installer/19.x-java-1.8/configure
@@ -4,8 +4,8 @@ set -e
 SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname $0)
 
-tar xzf ${SOURCES_DIR}/graalvm-ce-java8-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-java8-${GRAALVM_VERSION} /usr/share/graalvm
+tar xzf ${SOURCES_DIR}/graalvm-ce-java${GRAALVM_JAVA_VERSION}-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION} /usr/share/graalvm
 
 #KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
 mkdir -p $KOGITO_HOME/ssl-libs
diff --git a/modules/kogito-graalvm-installer/19.x/module.yaml b/modules/kogito-graalvm-installer/19.x-java-1.8/module.yaml
similarity index 90%
rename from modules/kogito-graalvm-installer/19.x/module.yaml
rename to modules/kogito-graalvm-installer/19.x-java-1.8/module.yaml
index f877a9874de..19d7a0fecd0 100644
--- a/modules/kogito-graalvm-installer/19.x/module.yaml
+++ b/modules/kogito-graalvm-installer/19.x-java-1.8/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "19.3.1"
+version: "19.3.1-java-1.8"
 
 envs:
   - name: "JAVA_HOME"
@@ -10,6 +10,8 @@ envs:
   #version without prefix ce
   - name: "GRAALVM_VERSION"
     value: "19.3.1"
+  - name: "GRAALVM_JAVA_VERSION"
+    value: "8"
 
 artifacts:
 - name: graalvm-ce-java8-linux-amd64-19.3.1.tar.gz
diff --git a/modules/kogito-graalvm-installer/19.x-java-11/configure b/modules/kogito-graalvm-installer/19.x-java-11/configure
new file mode 100644
index 00000000000..675b2c071ab
--- /dev/null
+++ b/modules/kogito-graalvm-installer/19.x-java-11/configure
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+
+tar xzf ${SOURCES_DIR}/graalvm-ce-java${GRAALVM_JAVA_VERSION}-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION} /usr/share/graalvm
+
+#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
+mkdir -p $KOGITO_HOME/ssl-libs
+cp -v $GRAALVM_HOME/lib/libsunec.so $KOGITO_HOME/ssl-libs
+cp -v $GRAALVM_HOME/lib/security/cacerts $KOGITO_HOME/
+
diff --git a/modules/kogito-graalvm-installer/19.x-java-11/module.yaml b/modules/kogito-graalvm-installer/19.x-java-11/module.yaml
new file mode 100644
index 00000000000..9a86750ca3b
--- /dev/null
+++ b/modules/kogito-graalvm-installer/19.x-java-11/module.yaml
@@ -0,0 +1,25 @@
+schema_version: 1
+name: org.kie.kogito.graalvm.installer
+version: "19.3.1-java-11"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/usr/share/graalvm"
+  #version without prefix ce
+  - name: "GRAALVM_VERSION"
+    value: "19.3.1"
+  - name: "GRAALVM_JAVA_VERSION"
+    value: "11"
+
+artifacts:
+- name: graalvm-ce-java11-linux-amd64-19.3.1.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.1/graalvm-ce-java11-linux-amd64-19.3.1.tar.gz
+  md5: d2644fee760ff102866c705a7d6b6634
+- name: native-image-installable-svm-java11-linux-amd64-19.3.1.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.1/native-image-installable-svm-java11-linux-amd64-19.3.1.jar
+  md5: e415d5dc0f1249b81a0571300da35db9
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-scripts/configure b/modules/kogito-graalvm-scripts/configure
index 22934123a74..905e5f454d2 100644
--- a/modules/kogito-graalvm-scripts/configure
+++ b/modules/kogito-graalvm-scripts/configure
@@ -6,4 +6,4 @@ SCRIPT_DIR=$(dirname $0)
 
 cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
 
-/usr/share/graalvm/bin/gu -L install ${SOURCES_DIR}/native-image-installable-svm-java8-linux-amd64-${GRAALVM_VERSION}.jar
+/usr/share/graalvm/bin/gu -L install ${SOURCES_DIR}/native-image-installable-svm-java${GRAALVM_JAVA_VERSION}-linux-amd64-${GRAALVM_VERSION}.jar
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index a1f2f3bb6e6..d1e98c161b8 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
index 96a7ed97387..fa53e37d758 100644
--- a/modules/kogito-infinispan-properties/module.yaml
+++ b/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 1de7fbaf557..42a53940929 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200323.063633-114-runner.jar
-    md5: b6a499e6bd78d342d5682b20d5977286
+    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200326.165355-118-runner.jar
+    md5: 4e97476b8f95d5ed4027a98bcd753973
 
 execute:
   - script: configure
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
index 066757d7c90..767940416c9 100644
--- a/modules/kogito-jq/module.yaml
+++ b/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 modules:
   install:
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index afb1a9e1464..258dea33629 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index 7829d3e7e11..49aa863fd13 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index 0758c1d5125..8dc7d401148 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 434ad8c83d8..48c12b9ba53 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
diff --git a/modules/kogito-openjdk/11-headless/module.yaml b/modules/kogito-openjdk/11-headless/module.yaml
new file mode 100644
index 00000000000..ebfb5f79e90
--- /dev/null
+++ b/modules/kogito-openjdk/11-headless/module.yaml
@@ -0,0 +1,25 @@
+schema_version: 1
+name: org.kie.kogito.openjdk
+version: "11-headless"
+
+labels:
+  - name: "com.redhat.component"
+    value: "jboss-openjdk11-rhel8-container"
+  - name: "org.jboss.product"
+    value: "openjdk"
+  - name: "org.jboss.product.version"
+    value: "11"
+  - name: "org.jboss.product.openjdk.version"
+    value: "11"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/lib/jvm/java-11"
+  - name: "JAVA_VENDOR"
+    value: "openjdk"
+  - name: "JAVA_VERSION"
+    value: "11"
+
+packages:
+  install:
+  - java-11-openjdk-headless
\ No newline at end of file
diff --git a/modules/kogito-openjdk/11/clean.sh b/modules/kogito-openjdk/11/clean.sh
new file mode 100644
index 00000000000..d99eb4fb10e
--- /dev/null
+++ b/modules/kogito-openjdk/11/clean.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+microdnf clean all
+rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/11/module.yaml b/modules/kogito-openjdk/11/module.yaml
new file mode 100644
index 00000000000..c57600c3ee8
--- /dev/null
+++ b/modules/kogito-openjdk/11/module.yaml
@@ -0,0 +1,29 @@
+schema_version: 1
+name: org.kie.kogito.openjdk
+version: "11"
+
+labels:
+  - name: "com.redhat.component"
+    value: "jboss-openjdk11-rhel8-container"
+  - name: "org.jboss.product"
+    value: "openjdk"
+  - name: "org.jboss.product.version"
+    value: "11"
+  - name: "org.jboss.product.openjdk.version"
+    value: "11"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/lib/jvm/java-11"
+  - name: "JAVA_VENDOR"
+    value: "openjdk"
+  - name: "JAVA_VERSION"
+    value: "11"
+
+execute:
+  - script: clean.sh
+
+packages:
+  install:
+  - java-11-openjdk-devel
+
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index f1917387b8f..6cb586b4616 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 modules:
   install:
diff --git a/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-quarkus-jvm/module.yaml
index ef9044f84e8..7b8a37095f5 100644
--- a/modules/kogito-quarkus-jvm/module.yaml
+++ b/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
index 250c1c4cd21..8cd1549bea2 100644
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ b/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.9.0-rc1"
+    value: "0.9.0-rc2"
diff --git a/modules/kogito-quarkus/module.yaml b/modules/kogito-quarkus/module.yaml
index 9b00c6fe32c..cd42b25543f 100644
--- a/modules/kogito-quarkus/module.yaml
+++ b/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 5e4f8aedfa3..603538b21f0 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.9.0-rc1'
+version: '0.9.0-rc2'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
index bf1f4d71fd2..dbd3357cbb4 100644
--- a/modules/kogito-springboot-s2i/module.yaml
+++ b/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.9.0-rc1"
+    value: "0.9.0-rc2"
diff --git a/modules/kogito-springboot/module.yaml b/modules/kogito-springboot/module.yaml
index 8f52084daf8..b76020a4a42 100644
--- a/modules/kogito-springboot/module.yaml
+++ b/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 execute:
   - script: configure
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index e8d18496e0e..77f8972d6e6 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.9.0-rc1"
+version: "0.9.0-rc2"
 
 execute:
   - script: add-user
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 1ae9c2def64..778cd80d80f 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -80,6 +80,6 @@ Feature: Kogito-jobs-service feature.
       | variable                      | value           |
       | SCRIPT_DEBUG                  | true            |
       | ENABLE_EVENTS                 | true            |
-      | KAFKA_BOOTSTRAP_SERVERS        | localhost:11111 |
+      | KAFKA_BOOTSTRAP_SERVERS       | localhost:11111 |
     Then container log should contain bootstrap.servers = [localhost:11111]
      And container log should contain Connection to node -1 (localhost/127.0.0.1:11111) could not be established.
\ No newline at end of file
diff --git a/tests/features/kogito-quarkus-jvm-ubi8.feature b/tests/features/kogito-quarkus-jvm-ubi8.feature
index 779f13c7ae5..bfb0a62a102 100644
--- a/tests/features/kogito-quarkus-jvm-ubi8.feature
+++ b/tests/features/kogito-quarkus-jvm-ubi8.feature
@@ -15,9 +15,9 @@ Feature: Kogito-quarkus-ubi8 feature.
 
   Scenario: verify if the java installation is correct
     When container is started with command bash
-    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
+    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
-    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
+    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples/drools-quarkus-example from target
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index e7355d0e4cd..1d2113920f8 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -114,7 +114,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
-    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
+    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
 
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 86857fd6dad..86c7dd9b607 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -60,9 +60,9 @@ Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: verify if the maven and java installation is correct
     When container is started with command bash
-    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
+    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
-    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
+    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
     And run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
 
diff --git a/tests/features/kogito-springboot-ubi8.feature b/tests/features/kogito-springboot-ubi8.feature
index d60a57c77ae..698a36ab4ea 100644
--- a/tests/features/kogito-springboot-ubi8.feature
+++ b/tests/features/kogito-springboot-ubi8.feature
@@ -15,9 +15,9 @@ Feature: springboot-quarkus-ubi8 feature.
 
   Scenario: verify if the java installation is correct
     When container is started with command bash
-    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-1.8.0
+    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
-    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 1.8.0
+    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
 
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 088b7b89332..d68948f92b2 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -6,23 +6,24 @@ TEST_DIR=`pwd`
 cd /tmp
 rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
-#git fetch origin --tags
-#git checkout -b 0.8.0 0.8.0
-
-# by adding the application.properties file telling quarkus to start on
-# port 10000, the purpose of this tests is make sure that the images
-# will ensure the use of the port 8080.
-cp ${TEST_DIR}/application.properties src/main/resources/META-INF/
+cd kogito-examples/
+git fetch origin --tags
+git checkout master
 
 # generating the app binaries to test the binary build
-mvn -f kogito-examples/drools-quarkus-example clean package -DskipTests
-mvn -f kogito-examples/jbpm-springboot-example clean package -DskipTests
+mvn -f drools-quarkus-example clean package -DskipTests
+mvn -f jbpm-springboot-example clean package -DskipTests
 
 # preparing directory to run kogito maven archetypes tests
 cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-quarkus-example/
 rm -rf /tmp/kogito-examples/dmn-quarkus-example/src
 rm -rf /tmp/kogito-examples/dmn-quarkus-example/pom.xml
 
-cd kogito-examples/drools-quarkus-example
+# by adding the application.properties file telling quarkus to start on
+# port 10000, the purpose of this tests is make sure that the images
+# will ensure the use of the port 8080.
+cp ${TEST_DIR}/application.properties kogito-examples/drools-quarkus-example/src/main/resources/META-INF/
+
+cd drools-quarkus-example
 git add --all
 git commit -am "test"

From 92f6461e19c8a943659db87872421cf0d52ae4f2 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 30 Mar 2020 13:52:57 -0300
Subject: [PATCH 111/709] Fix management console test, the given message should
 exist in the logs (#118)

Signed-off-by: spolti <fspolti@redhat.com>
---
 tests/features/kogito-management-console.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index b7dba83ccb1..9f28a4b5a0b 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -21,7 +21,7 @@ Feature: kogito-management-console feature
       | variable     | value |
       | SCRIPT_DEBUG | true  |
     Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
-     And container log should not contain Data index url not set, default will be used: http://localhost:8180
+     And container log should contain Data index url not set, default will be used: http://localhost:8180
 
   Scenario: Verify if the debug is correctly enabled and set data-index url
     When container is started with env

From 3135a8b0c819d4340d7791aafe140670972ffd76 Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Tue, 31 Mar 2020 16:03:57 +0200
Subject: [PATCH 112/709] Check that image created from archetype generation
 works (#119)

---
 tests/features/kogito-quarkus-ubi8-s2i.feature | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 1d2113920f8..2540e36e63f 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -124,4 +124,13 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | NATIVE            | false                           |
       | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 

From fc1ad9741dac54479f7990d6bce8107e0443cc3c Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 1 Apr 2020 19:25:19 -0300
Subject: [PATCH 113/709] [KOGITO-1601] - Release Kogito Images 0.9.0 (#123)

* [KOGITO-1601] - Release Kogito Images 0.9.0

* [KOGITO-1601] - Prepare kogito-images for next version iteration

Signed-off-by: spolti <fspolti@redhat.com>
---
 image.yaml                                    |  2 +-
 kogito-imagestream.yaml                       | 48 +++++++++----------
 modules/kogito-data-index/module.yaml         |  6 +--
 modules/kogito-image-dependencies/module.yaml |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 modules/kogito-jobs-service/module.yaml       |  6 +--
 modules/kogito-jq/module.yaml                 |  2 +-
 modules/kogito-kubernetes-client/module.yaml  |  2 +-
 modules/kogito-launch-scripts/module.yaml     |  2 +-
 modules/kogito-logging/module.yaml            |  2 +-
 modules/kogito-management-console/module.yaml |  6 +--
 modules/kogito-persistence/module.yaml        |  2 +-
 modules/kogito-quarkus-jvm/module.yaml        |  2 +-
 modules/kogito-quarkus-s2i/module.yaml        |  4 +-
 modules/kogito-quarkus/module.yaml            |  2 +-
 modules/kogito-s2i-core/module.yaml           |  2 +-
 modules/kogito-springboot-s2i/module.yaml     |  4 +-
 modules/kogito-springboot/module.yaml         |  2 +-
 modules/kogito-system-user/module.yaml        |  2 +-
 19 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/image.yaml b/image.yaml
index a0ce196618d..6a8f21dc43f 100644
--- a/image.yaml
+++ b/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 62d799cc8cf..870701af988 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc2'
+        - name: '0.10.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.9.0-rc2'
+            version: '0.10.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.9.0-rc2
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.10.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc2'
+        - name: '0.10.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.9.0-rc2'
+            version: '0.10.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.9.0-rc2
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.10.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc2'
+        - name: '0.10.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.9.0-rc2'
+            version: '0.10.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.9.0-rc2
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.10.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc2'
+        - name: '0.10.0-rc1'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.9.0-rc2'
+            version: '0.10.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.9.0-rc2
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.10.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc2'
+        - name: '0.10.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.9.0-rc2'
+            version: '0.10.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.9.0-rc2
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.10.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc2'
+        - name: '0.10.0-rc1'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: persistence backed by Infinispan server
-            version: '0.9.0-rc2'
+            version: '0.10.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.9.0-rc2
+            name: quay.io/kiegroup/kogito-data-index:0.10.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc2'
+        - name: '0.10.0-rc1'
           annotations:
             description: Runtime image for the Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.9.0-rc2'
+            version: '0.10.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.9.0-rc2
+            name: quay.io/kiegroup/kogito-jobs-service:0.10.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,16 +162,16 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.9.0-rc2'
+        - name: '0.10.0-rc1'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '0.9.0-rc2'
+            version: '0.10.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:0.9.0-rc2
+            name: quay.io/kiegroup/kogito-management-console:0.10.0-rc1
 
diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index a5502b02a57..5b500ad380e 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 artifacts:
   - name: kogito-data-index-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200312.091238-181-runner.jar
-    md5: 9128f6e8ec92aa1d3d1686e7bc7325c0
+    url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200331.022350-198-runner.jar
+    md5: 20fde16c5d5007afa1a95e36b521988c
 
 execute:
   - script: configure
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index d1e98c161b8..6642904bee3 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
index fa53e37d758..bf8b8a6d8b2 100644
--- a/modules/kogito-infinispan-properties/module.yaml
+++ b/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 42a53940929..d57e92fe77b 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200326.165355-118-runner.jar
-    md5: 4e97476b8f95d5ed4027a98bcd753973
+    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200331.022039-122-runner.jar
+    md5: 0e195298111cc9d0d3e0d308ec9432e8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
index 767940416c9..948fb52147b 100644
--- a/modules/kogito-jq/module.yaml
+++ b/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 modules:
   install:
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 258dea33629..15d128d1dc9 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index 49aa863fd13..d0828211050 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index 8dc7d401148..de84a392b1c 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 48c12b9ba53..6ca1dc8bb53 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
@@ -8,8 +8,8 @@ envs:
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200319.135106-24-runner.jar
-    md5: 39710d6d1f285ebcc1d0e7b4b4aed742
+    url: https://repository.jboss.org/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200323.064325-27-runner.jar
+    md5: 37bfa43dcd645c2a5ea4fbca0024793e
 
 execute:
   - script: configure
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index 6cb586b4616..4f5eb4a51b5 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 modules:
   install:
diff --git a/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-quarkus-jvm/module.yaml
index 7b8a37095f5..e14f2d6c1e4 100644
--- a/modules/kogito-quarkus-jvm/module.yaml
+++ b/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
index 8cd1549bea2..a31d0db4a03 100644
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ b/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.9.0-rc2"
+    value: "0.10.0-rc1"
diff --git a/modules/kogito-quarkus/module.yaml b/modules/kogito-quarkus/module.yaml
index cd42b25543f..1ec50d2db8b 100644
--- a/modules/kogito-quarkus/module.yaml
+++ b/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 603538b21f0..a26f8ba28ba 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.9.0-rc2'
+version: '0.10.0-rc1'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
index dbd3357cbb4..51a0bcba12c 100644
--- a/modules/kogito-springboot-s2i/module.yaml
+++ b/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.9.0-rc2"
+    value: "0.10.0-rc1"
diff --git a/modules/kogito-springboot/module.yaml b/modules/kogito-springboot/module.yaml
index b76020a4a42..434f88be890 100644
--- a/modules/kogito-springboot/module.yaml
+++ b/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index 77f8972d6e6..917ea58871a 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.9.0-rc2"
+version: "0.10.0-rc1"
 
 execute:
   - script: add-user

From 6951b84f1a9bdf72741083ec33208e6e82a4f07a Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 2 Apr 2020 13:14:04 -0300
Subject: [PATCH 114/709] [KOGITO-836] - Provide a way to automatically
 increase the Kogito version on the image and modules (#117)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Makefile                                   |   2 +-
 scripts/README.md                          |  54 ++++++
 scripts/manage-kogito-version.py           | 193 +++++++++++++++++++++
 push-staging.py => scripts/push-staging.py |   2 +-
 4 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 scripts/README.md
 create mode 100644 scripts/manage-kogito-version.py
 rename push-staging.py => scripts/push-staging.py (99%)

diff --git a/Makefile b/Makefile
index 21df3fbc61e..885b3a8ae3f 100644
--- a/Makefile
+++ b/Makefile
@@ -70,5 +70,5 @@ _push:
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	python3 push-staging.py
+	python3 scripts/push-staging.py
 
diff --git a/scripts/README.md b/scripts/README.md
new file mode 100644
index 00000000000..88fe7435b77
--- /dev/null
+++ b/scripts/README.md
@@ -0,0 +1,54 @@
+### Kogito helper scripts
+
+On this directory you can find some python scripts used to help with some repetitive tasks.
+
+Today we have these scripts:
+
+- [manage-kogito-version.py](manage-kogito-version.py)
+- [push-staging.py](push-staging.py)
+
+
+### Managing Kogito images version
+
+The manage-kogito-version script will help when we need to update the current version due a new release or prepare the
+master branch for the next release.
+
+#### Script dependencies
+
+The `manage-kogito-version.py` has one dependency that needs to be manually installed:
+
+```bash
+$ pip install -U ruamel.yaml
+```
+
+Its usage is pretty simple, only one parameter is accepted:
+
+```bash
+$ python manage-kogito-version.py --bump-to 1.0.0  
+```
+
+The command above will update all the needed files to the version 1.0.0. These changes includes updates on
+
+ - all cekit modules
+ - image.yaml file descriptor
+ - kogito-imagestream.yaml
+ 
+
+### Pushing staging images.
+
+Staging images are the release candidates which are pushed mainly after big changes that has direct impact on how
+the images will behave and also when new functionality is added.
+
+#### Script dependencies
+
+The `push-stating.py` has a few dependencies that probably needs to be manually installed:
+
+```bash
+$ pip install -U docker yaml
+```
+
+This script is called as the last step of the `make push-staging` command defined on the [Makefile](../Makefile).
+
+It will look for the current RC images available on [quay.io](https://quay.io/organization/kiegroup) to increase the rc tag 
+accordingly then push the new tag so it can be tested by others. 
+
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
new file mode 100644
index 00000000000..57dc65e943b
--- /dev/null
+++ b/scripts/manage-kogito-version.py
@@ -0,0 +1,193 @@
+#!/usr/bin/python3
+# This script will be responsible to help to manage kogito images and modules version, it will update all needed files
+# Example of usage:
+#   # move the current version to the next one or rcX
+#   python manage-kogito-version --bump-to 0.99.0
+#
+#  The point of truth for vesion is the image.yaml.
+#
+# Dependencies:
+#  ruamel.yaml
+
+import argparse
+import os
+import re
+
+from ruamel.yaml import YAML
+
+# all kogito-image modules that points to the kogito version.
+MODULES = {"kogito-data-index/module.yaml", "kogito-image-dependencies/module.yaml",
+           "kogito-infinispan-properties/module.yaml", "kogito-jobs-service/module.yaml",
+           "kogito-jq/module.yaml", "kogito-kubernetes-client/module.yaml",
+           "kogito-launch-scripts/module.yaml", "kogito-logging/module.yaml",
+           "kogito-management-console/module.yaml", "kogito-persistence/module.yaml",
+           "kogito-quarkus/module.yaml", "kogito-quarkus-jvm/module.yaml",
+           "kogito-quarkus-s2i/module.yaml", "kogito-s2i-core/module.yaml",
+           "kogito-springboot/module.yaml", "kogito-springboot-s2i/module.yaml",
+           "kogito-system-user/module.yaml"}
+
+# imagestream file that contains all images, this file aldo needs to be updated.
+IMAGE_STREAM = "kogito-imagestream.yaml"
+
+# image.yaml file definition that needs to be updated
+IMAGE = "image.yaml"
+
+# declared envs on modules.yaml that also needs to have its version updated
+ENVS = {"KOGITO_VERSION"}
+
+# behave tests that needs to be update
+BEHAVE_TESTS = {"kogito-quarkus-ubi8-s2i.feature", "kogito-springboot-ubi8-s2i.feature",
+                "kogito-quarkus-jvm-ubi8.feature", "kogito-springboot-ubi8.feature"}
+
+
+def yaml_loader():
+    '''
+    default yaml Loader
+    :return: yaml object
+    '''
+    yaml = YAML()
+    yaml.preserve_quotes = True
+    yaml.width = 1024
+    yaml.indent(mapping=2, sequence=4, offset=2)
+    return yaml
+
+
+def update_image_version(target_version):
+    '''
+    Update image.yaml version tag.
+    :param target_version: version used to update the image.yaml file
+    '''
+    print("Updating Image main file version from file {0} to version {1}".format(IMAGE, target_version))
+    try:
+        with open(IMAGE) as image:
+            data = yaml_loader().load(image)
+            if 'version' in data:
+                data['version'] = target_version
+            else:
+                print("Field version not found, returning...")
+                return
+
+        with open(IMAGE, 'w') as image:
+            yaml_loader().dump(data, image)
+    except TypeError as err:
+        print("Unexpected error:", err)
+
+
+def update_image_stream(target_version):
+    '''
+    Update the imagestream file, it will update the tag name, version and image tag.
+    :param target_version: version used to update the imagestream file;
+    '''
+    print("Updating ImageStream images version from file {0} to version {1}".format(IMAGE_STREAM, target_version))
+    try:
+        with open(IMAGE_STREAM) as imagestream:
+            data = yaml_loader().load(imagestream)
+            for item_index, item in enumerate(data['items'], start=0):
+                for tag_index, tag in enumerate(item['spec']['tags'], start=0):
+                    # print(tag)
+                    data['items'][item_index]['spec']['tags'][tag_index]['name'] = target_version
+                    data['items'][item_index]['spec']['tags'][tag_index]['annotations']['version'] = target_version
+                    imageDict = str.split(data['items'][item_index]['spec']['tags'][tag_index]['from']['name'], ':')
+                    # image name + new version
+                    updatedImageName = imageDict[0] + ':' + target_version
+                    data['items'][item_index]['spec']['tags'][tag_index]['from']['name'] = updatedImageName
+
+        with open(IMAGE_STREAM, 'w') as imagestream:
+            yaml_loader().dump(data, imagestream)
+
+    except TypeError:
+        raise
+
+
+def update_kogito_modules(target_version):
+    '''
+    Update every module.yaml file listed on MODULES as well the envs listed on ENVS.
+    :param target_version:  version used to update all needed module.yaml files
+    '''
+    modules_dir = "modules"
+    try:
+
+        for module in MODULES:
+            with open(os.path.join(modules_dir, module)) as m:
+                data = yaml_loader().load(m)
+                print(
+                    "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
+                data['version'] = target_version
+                if 'envs' in data:
+                    for index, env in enumerate(data['envs'], start=0):
+                        for target_env in ENVS:
+                            if target_env == env['name']:
+                                data['envs'][index]['value'] = target_version
+
+            with open(os.path.join(modules_dir, module), 'w') as m:
+                yaml_loader().dump(data, m)
+
+    except TypeError:
+        raise
+
+
+def update_behave_tests(target_branch):
+    '''
+    will update the behave tests accordingly.
+    If master, the app 8.0.0-SNAPSHOT otherwise use the same value for branch and version
+    :param target_branch:
+    '''
+    base_dir = 'tests/features'
+    artifact_version = target_branch
+    if 'master' in target_branch:
+        artifact_version = '8.0.0-SNAPSHOT'
+
+    # this pattern will look for any occurrencies of using master or using x.x.x
+    pattern_branch = re.compile(r'(using master)|(using \s*([\d.]+))')
+    quarkus_native_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner\s)|(\s*([\d.]+)-runner\s)')
+    quarkus_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner.jar)|(\s*([\d.]+)-runner.jar)')
+    spring_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT.jar)|(\s*([\d.]+).jar)')
+    for feature in BEHAVE_TESTS:
+        print("Updating feature {0}".format(feature))
+        with open(os.path.join(base_dir, feature)) as fe:
+            updated_value = pattern_branch.sub('using ' + target_branch, fe.read())
+            updated_value = quarkus_native_pattern_app_version.sub(artifact_version + '-runner ', updated_value)
+            updated_value = quarkus_pattern_app_version.sub(artifact_version + '-runner.jar', updated_value)
+            updated_value = spring_pattern_app_version.sub(artifact_version + '.jar', updated_value)
+
+        with open(os.path.join(base_dir, feature), 'w') as fe:
+            fe.write(updated_value)
+
+
+def update_test_apps_clone_repo(target_branch):
+    file = 'tests/test-apps/clone-repo.sh'
+    if target_branch == 'master':
+        # os.system('sed -i \'s/^git fetch origin --tags/#git fetch origin --tags/\' ' + file)
+        os.system('sed -i \'s/^git checkout.*/git checkout master/\' ' + file)
+    else:
+        # os.system('sed -i \'s/^#git fetch origin --tags/git fetch origin --tags/\' ' + file)
+        os.system('sed -i \'s/^git checkout.*/git checkout -b '+target_branch+' '+target_branch+'/\' ' + file)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Kogito Version Manager')
+    parser.add_argument('--bump-to', dest='bump_to', help='bump everything to the next version')
+
+    args = parser.parse_args()
+
+    if args.bump_to:
+        # validate if the provided version is valid.
+        # e.g. 1.10.0 or 1.0.0-rc1
+        pattern = '\d.\d{1,2}.(\d$|\d-rc\d+$)'
+        regex = re.compile(r'\d.\d{1,2}.(\d$|\d-rc\d+$)')
+        valid = regex.match(args.bump_to)
+        if valid:
+            print("Version will be updated to {0}".format(args.bump_to))
+            update_image_version(args.bump_to)
+            update_image_stream(args.bump_to)
+            update_kogito_modules(args.bump_to)
+            tests_branch = args.bump_to
+            if 'rc' in args.bump_to:
+                # update the tests to use kogito examples from master branch and app versions to 8.0.0-SNAPSHOT,
+                tests_branch = 'master'
+            update_behave_tests(tests_branch)
+            update_test_apps_clone_repo(tests_branch)
+        else:
+            print("Provided version {0} does not match the expected regex - {1}".format(args.bump_to, pattern))
+    else:
+        print(parser.print_usage())
diff --git a/push-staging.py b/scripts/push-staging.py
similarity index 99%
rename from push-staging.py
rename to scripts/push-staging.py
index c998d7e0fd2..b7d3aebbd51 100644
--- a/push-staging.py
+++ b/scripts/push-staging.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 # This script will be responsible to fetch the latest rc tags from each image and define the next
-# rc tag to avoid images get overriden.
+# rc tag to avoid images get overridden.
 #
 # Requires QUAY_TOKEN env to be set.
 # export QUAY_TOKEN=XXXXX

From b79b356d40b211bf1f16f1efa3d2d42a471ff7ba Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <khandelwaltarun32@live.com>
Date: Fri, 3 Apr 2020 00:02:22 +0530
Subject: [PATCH 115/709] [KOGITO-1227] - Create pipeline to build and test
 Kogito images when a new Pull Request is created. (#122)

---
 Jenkinsfile                                | 31 ++++++++++++++++++++++
 tests/features/kogito-jobs-service.feature |  3 ++-
 tests/test-apps/clone-repo.sh              |  4 +--
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 00000000000..fdc99705852
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,31 @@
+pipeline{
+    agent { label 'jenkins-slave'}
+    stages{
+        stage('Initialization'){
+            steps{
+                sh "docker rmi -f \$(docker images -q) || date"
+            }
+        }
+        stage('Build'){
+            steps{
+                sh "make build"
+            }
+        }
+        stage('Test'){
+            steps{
+                sh "make test"
+            }
+            post{
+                always{
+                    junit 'target/test/results/*.xml'
+                }
+            }
+        }
+        stage('Finishing'){
+            steps{
+                sh "docker rmi -f \$(docker images -q) || date"
+            }
+        }
+    }
+}
+
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 778cd80d80f..127a5b4bb11 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -75,6 +75,7 @@ Feature: Kogito-jobs-service feature.
       | ENABLE_EVENTS       | true  |
      Then container log should contain KAFKA_BOOTSTRAP_SERVERS env not found, please set it.
     
+     @ignore
   Scenario: verify if the events is correctly enabled
     When container is started with env
       | variable                      | value           |
@@ -82,4 +83,4 @@ Feature: Kogito-jobs-service feature.
       | ENABLE_EVENTS                 | true            |
       | KAFKA_BOOTSTRAP_SERVERS       | localhost:11111 |
     Then container log should contain bootstrap.servers = [localhost:11111]
-     And container log should contain Connection to node -1 (localhost/127.0.0.1:11111) could not be established.
\ No newline at end of file
+     And container log should contain Connection to node -1 (localhost/127.0.0.1:11111) could not be established.
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index d68948f92b2..279089c2224 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -22,8 +22,8 @@ rm -rf /tmp/kogito-examples/dmn-quarkus-example/pom.xml
 # by adding the application.properties file telling quarkus to start on
 # port 10000, the purpose of this tests is make sure that the images
 # will ensure the use of the port 8080.
-cp ${TEST_DIR}/application.properties kogito-examples/drools-quarkus-example/src/main/resources/META-INF/
+cp ${TEST_DIR}/application.properties /tmp/kogito-examples/drools-quarkus-example/src/main/resources/META-INF/
 
 cd drools-quarkus-example
-git add --all
+git add --all  :/
 git commit -am "test"

From 62180acddb1168aeb357114506ab00c5e760afb9 Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Tue, 7 Apr 2020 16:20:25 +0200
Subject: [PATCH 116/709] [KOGITO-1715] Copy application libraries only if
 exist (#126)

Signed-off-by: Karel Suta <ksuta@redhat.com>
---
 modules/kogito-s2i-core/added/s2i-core           |  6 ++++--
 modules/kogito-s2i-core/tests/bats/s2i-core.bats | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 49c9fd776bf..0e70facb7fb 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -150,8 +150,10 @@ function copy_kogito_app() {
         if ls $artifactDir/*-runner.jar 1> /dev/null 2>&1; then
             echo "---> Installing jar file"
             cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin
-            echo "---> Copying application libraries"
-            cp -r $artifactDir/lib/ $KOGITO_HOME/bin
+            if [ -d "${artifactDir}/lib" ]; then
+                echo "---> Copying application libraries"
+                cp -r $artifactDir/lib/ $KOGITO_HOME/bin
+            fi
         fi
 
     elif ls $artifactDir/*-runner 1> /dev/null 2>&1; then
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 711bbe94226..0bcdc4e09b9 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -212,6 +212,22 @@ teardown() {
     [ "${lines[2]}" = "---> Copying application libraries" ]
 }
 
+@test "test copy_kogito_app default quarkus java build uberJar runner file present" {
+    NATIVE="false"
+    mkdir $KOGITO_HOME/bin
+    touch target/app-runner.jar
+
+    run copy_kogito_app
+    rm -rf target/*
+
+    echo "result= ${lines[@]}"
+    echo "status= $status"
+
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "---> Installing jar file" ]
+    [ "${lines[1]}" = "'target/app-runner.jar' -> '$KOGITO_HOME/bin/app-runner.jar'" ]
+}
+
 @test "test copy_kogito_app default quarkus native builds file present" {
 
     mkdir $KOGITO_HOME/bin

From 779428063ffa276104d91b4501e5bf3a81a3cc93 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 7 Apr 2020 13:28:11 -0300
Subject: [PATCH 117/709] [KOGITO-1673] - Operator should not take care of
 which micro version of images to deploy (#124)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Makefile | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 885b3a8ae3f..27e6093e5da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
+SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
 BUILD_ENGINE := docker
 .DEFAULT_GOAL := build
 
@@ -8,27 +9,51 @@ build: kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogit
 
 kogito-quarkus-ubi8:
 	cekit -v build --overrides-file kogito-quarkus-overrides.yaml ${BUILD_ENGINE}
+ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${SHORTENED_LATEST_VERSION}
+endif
 
 kogito-quarkus-jvm-ubi8:
 	cekit -v build --overrides-file kogito-quarkus-jvm-overrides.yaml ${BUILD_ENGINE}
+ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${SHORTENED_LATEST_VERSION}
+endif
 
 kogito-quarkus-ubi8-s2i:
 	cekit -v build --overrides-file kogito-quarkus-s2i-overrides.yaml ${BUILD_ENGINE}
+ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${SHORTENED_LATEST_VERSION}
+endif
 
 kogito-springboot-ubi8:
 	cekit -v build --overrides-file kogito-springboot-overrides.yaml ${BUILD_ENGINE}
+ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${SHORTENED_LATEST_VERSION}
+endif
 
 kogito-springboot-ubi8-s2i:
 	cekit -v build --overrides-file kogito-springboot-s2i-overrides.yaml ${BUILD_ENGINE}
+ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${SHORTENED_LATEST_VERSION}
+endif
 
 kogito-data-index:
 	cekit -v build --overrides-file kogito-data-index-overrides.yaml ${BUILD_ENGINE}
+ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
+endif
 
 kogito-jobs-service:
 	cekit -v build --overrides-file kogito-jobs-service-overrides.yaml ${BUILD_ENGINE}
+ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION} quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
+endif
 
 kogito-management-console:
 	cekit -v build --overrides-file kogito-management-console-overrides.yaml ${BUILD_ENGINE}
+ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION} quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
+endif
 
 # Build and test all images
 .PHONY: test
@@ -48,9 +73,9 @@ test:
 .PHONY: push
 push: build _push
 _push:
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:$(IMAGE_VERSION)
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8:latest
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:$(IMAGE_VERSION)
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest
@@ -64,6 +89,17 @@ _push:
 	docker push quay.io/kiegroup/kogito-jobs-service:latest
 	docker push quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-management-console:latest
+ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+	@echo "${SHORTENED_LATEST_VERSION} will be pushed"
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-springboot-ubi8:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
+endif
 
 
 # push staging images to quay.io, done before release, this requires permissions under kiegroup organization

From 8a848d5ce5d31a21446c92d6e081ee430e8493a0 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 8 Apr 2020 12:37:53 -0300
Subject: [PATCH 118/709] [master][KOGITO-1636] - Native binary is not
 recognized in binary build when target folder is uploaded (#128)

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-image-dependencies/module.yaml |  1 +
 modules/kogito-s2i-core/added/s2i-core        | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index 6642904bee3..d48a7f106f9 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -8,6 +8,7 @@ execute:
 
 packages:
   install:
+    - file
     - shadow-utils
     - tar
     - gzip
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 0e70facb7fb..605c70c2045 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -58,9 +58,16 @@ function runtime_assemble() {
             echo "-----> Entire target dir uploaded"
             cd "target"    
         fi
-        if ls | grep -E '*-runner.jar' 1> /dev/null 2>&1; then
-            echo "-----> Found jar file, not native build"
-            NATIVE="FALSE"
+
+        local result=$(file -b --mime-type *-runner | grep x-executable)
+        if [ "$result" == "application/x-executable" ]; then
+            echo "-----> Found binary file, native build."
+            NATIVE="TRUE"
+        else
+            if ls | grep -E '*-runner.jar' 1> /dev/null 2>&1;then
+                echo "-----> Found jar file, not native build."
+                NATIVE="FALSE"
+            fi
         fi
         echo "-----> Cleaning up unneeded jar files"
         rm -rfv *-tests.jar

From 8d19c698766aca839d8626d21c7921fbdfeeb7ef Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Thu, 9 Apr 2020 18:48:36 +0200
Subject: [PATCH 119/709] [master][KOGITO-1636] - Add missing test coverage for
 runtime_assemble (#120)

---
 .../tests/bats/mocks/myapp-0.0.1-runner       | Bin 0 -> 21736 bytes
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 110 ++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100755 modules/kogito-s2i-core/tests/bats/mocks/myapp-0.0.1-runner

diff --git a/modules/kogito-s2i-core/tests/bats/mocks/myapp-0.0.1-runner b/modules/kogito-s2i-core/tests/bats/mocks/myapp-0.0.1-runner
new file mode 100755
index 0000000000000000000000000000000000000000..7f45e1a0d050e21b8860c94430a33646acc5b5ac
GIT binary patch
literal 21736
zcmeHPdu$v>8K1k0W2Z^Z=e%&6fHz7Jj)T{a2FIbK-Su-V*|Bl#HW4J7^WEA$<$Pz|
z?NxS!L`p&>hX(vls{8{&NI^kGB7Z;>2?>(MYCuBBl~DO3pp-|{Kq0t5OQ9sk_s!0C
zce}S2g{mMGW@PU-^ZOn%^X=^H&g16uy@P$hK!8yQvL_g(l!(S5=gQdaA)XXiCtJ%j
zwvBCNs{vUB{~G5Ybz(%PgARjejgSigMZF7xe<7$r3ey@Au<Zn*R6?YvR}7kn3QA0(
z5r>U>RTvd%ChAA@yvTqk$rbWbP#J=vaYD34=n*Z|L*I<3j`+wEjvmpU2)$)NNe|tD
zdPjxcQK3h4QOFY|e`0m<e@XarDX2jT(;5=i!>>h(vKU5g*>Q|V6igx2Ty!^2F-Da1
zJ`H+U&Ib+T_EC{vCBIx0^&?8|X-Os~I(D}t<ITxLDmT|W*V)nBv0Kfi)plO*O;8YQ
zQ~mqLS#|H-kEI`f_Ny<PzGdEgapYY+vvi)<5%_2iWiX(;a2LmsNBJTDLBd)P+TbI&
z6EMXGXHbtA7Q2I)CdSRI9nIM0Of->V{euHt-DbPmu6_czQ#0w5;F@5`DQN&oh-D;y
z<{n9`LEeW&UMo*(JcjqCv@Y+I;8bU!B8l{X^nmn$^nmn$^nmn$^nmn$^uYg#2mVs~
zk$)H`|4?Imsp@wvj2U0NVh8if#>u6cYup3KZ~NoG!YfCNg<l&df4ed=HgNsQVx7i}
z>sJ*{uCE4?-~0_w|LY>kUz=2G8%}Zc#mkBYqWkb_Z@i2cX0hgn2;^UzT)Z|}6s~R1
z*blh;vv)XISTU~NdD6K0PRIznY`k*Mt}9rm78bnvnE#1=I+TUwHjWz$w{9QL=kqUD
zwEz-0e61`$lz-zi3SN$b&f$`>*EaMphJ5|$!87}IG&80@HL&oiK0dJUmOiF0{Bztm
z)4U1b1A{y7q7QF>=UzT<T)i8z8`^HvHk<%^Y;fVvg9~?h7GBr$n{FB>uLX>~zs&s}
z{rj22`e*gS`VrkMtpoQT=pp6zrEn+Enheqd(gV^1(gV^1(gV^1(gV^1(gV^1(gV^1
z@67{&!V0LPAJ`gt9M^hrtvs@l&yN7rfa2izZJ=|AznRaU19}4JYd|sJ`YVRO@lh6-
ziv+f=tFFN{YFwwpHT=te%I9%V&U&gNh_%B1&j90V@(@QE7;dv?AP-zqWqLUBT(Eon
z>OL?ecvyy6;9JP=3rD^Z90=EcIn*0g&aCPUH$Gq06K;KOwGr+-S=}GjQsGWL+^UBg
zyTVFWxV|eK=?d5I@_ZZA&w(Av8_mfeJs>?GJs>?GJs>?GJs>?GJs>?GJs>^sZ+ZaM
zf-x+M{nfMwmFPOog^S>?7wL0C?_rUqebQS+n)W$ABGL!NzGxgbVj%uo_ws3;4rxf7
zJ>NiQMVj_3H;VK_T#B(yLHXDd;`JiESx_R?BC;&>DPJ7VVt~!KJdi%D2=nq>6!Neb
z&C>xP2g6XFz99Gl{;v_*SMHZ#e|PsMl}6Yty;Io>dy?Cf_SUw&t)1<Al*Umjt{73<
z!JFH5GV~*k>v7X@zy4_8vFXk|=u<`9XQCfM84QkG)l@9zG0wQHqD)i&@YAfR7XZ3<
zj&2j*#$3w<$=)v5OdUIB#*)$OG-DfGyr$TsIh#q_R?JSMQ`lgr?FoB*!=qyZeTP^c
z)wZ~Fck!Ls2M?P1fdjoDHN5`-@IB?J#{J}lIR#$7?Ywz-Y^7%swmF%J&RFJbI+3!i
z4Cob}3$E9+dIMl}fYt%!!LjGmFJncMiK!Ig(x1EDSAUkZ<Ctv6{km+&AGCg<tQ}`%
zJC^PEgZF+bYsZ#s$Fd#&547V7-^XR`y~6iLnOueby-cpc^MfC%uJ89~TjAS%SbW3#
z$q<idS$?z5^GbZ8^1Jmv{M{=2J|gbjxS-PS@2}r!42eIX@7J4r$B+)se+=pOOwqj}
z>L)|<CtL3GY|@;{*Tvk5pPi#ZANTNM@RPx9{us{QM}~Mr{p=8rsGkhgXX}0HMfEu^
z%EJqHpGyb^_!oj&nM4ToJ}mj-A$HprU&U%des-!D%_o&+5`q~5ns;*J)y!|cCj{Q7
zc_O#`8b<R?ZX9}B;U_n~w$OLG@pX*agd2xetZ1bWkB3;ea2`M@GsJ3{;VU0uG;imY
zuVXY{=f*cMzxk&S%-qoL*xmB5%LINm;te6TnbrH^Ti7;VywD4}Ood?9PdVzg505pR
zFYqRx6Dk$nhl$`?M(;D?4OPIS0;hQ}lFwDZ&s4y_Spnz2)`9YP?cb;%|F;VGI;^md
zosSBf-Y2MzVV}UMuX0ev4pp#|tAL-afM2SB->87UTLEtfLdksU^{EQ@VS#(=drIKm
z`hE*=zjpFnz=LpF3iY$(pGyK?^gO>m7WlFUzX^B%W+kaTV>L0{;duG;wHYQOF<<8C
zBew${fG<7obE*OESN=-%>gRT9*{batFGuOc&(1i=;}@p4ADHBJ%KL$|koT7J3mh-+
zm(FrK<^98pfNual;4juN(ERLg09Snajqd{<0i68ImEiI{v=c1vKVRbZNvcSHCG2?n
zr8|HtMX^HcF5q>+^{htG3K&KnT7~n##r_$RJUk2$tQWnTErE|g!-zmT!Qao7hMg!6
z?Vs8+`Qde5{$jt;B9wHHM>}3W42gW{dx6$VMggx2ZZ6Ar2hZ2%J=K!SX7Es#7FYpj
zfzw>fj@``}D?S~yofBSK_O_^M@ed^7_?KA5Zd21tjiyrRiA2gwq!P9o^QKKJ758H5
zblUb}DCdW(xl}T7%u3GtDpX>s{2-Uytgli9o@&h{{EOvgfV!QCnHejYj+NHejl1jZ
z=DF+X=9T-w&G+$#TYwuV_lsMo+&^wUHv&+`F7=^X#^WzHlN)gR&5S1<r$ucGkJ3RW
z&L%9UD8(C9NetT&G`XyugI}q}Slr53Q;94r*qHVVEHb52Ru<0biKoq}WO^c+G~;$U
zlQpBcITlOL%qA_{imQ7b+uQChWKKf!HKUnKbRLRsXXcr+C=}1l%*=yINs2dgm#A%J
zvE`d)->5#+YxeH%F-=I}15uERGqdN=etl@5+s)xl1_)O6%w9uSFnUIr**`ekr4O3J
zeSHUd$ILOkYp@rs@^gw}*&Hu1Gp%^kjuOm`@#Bj$&3%3mN;&5jfvoE=Bk)-^ZB9p1
z@ubDffnkt}!_%D0T2SO-Zde&s;ogAUL^dnT^TU%&b8M(vID)C!`58Mp0o2Yobedv(
z#SNa)6f6a*Q>mOfkxRg_QVHlXIHY$CG~3ZB#(C4Ykf_GzQ((`bcE;g6V`Z|qj>yGC
z!UP^Xqft~~DlfijTXXP)<E;i>ntM*Qrp3*jj)MlJ91Z90IT{oPbJ3Xu^m9|#iNQsk
zO+v&m25w*~w6_^(Lr!UUh195RXA%=RXeg!cf%h86b$I;dfX@vcXgo#dx6wMhU~^fD
zBi#Z2xOPtZOF<1%#q-J@<*DKYUK_5^0jW}b8lT-31{IgIa~4`D)B}mPVXd9=r*T{j
zy#Fvz`RTn_<G_XMeu&|_j`V4~*C_N2A&G0k=qJ*reE?4ZhN7fT<HA{?k89<n0d16q
zBapzo1Ef#m#|uKA)}pEWBuDfZ=;K}lO4B&=qR>}FX5R7(m>q`*-V@TN@#wP9r~MC<
zzqkIUKo{#o<z)1I%O@QfoFwQD-ur*rqpt{kMd<T!MTrRk7m!7dK8=IVi3N7}!g2*~
z{x1l9s()d;tT<}k{HXq9^lKjd;yHVc1peltG<fsJ-z=0qe}<xQaYNyRU2#a^>dpTW
zaKi8}Zdc*^pU&a)%2S%?OQ4H;El8if;}42+3P}z`c%U@Vp8|^ap7d$lPv;yiiUv>Z
zgY?L+KL=eDA$^)3SP>trBnKiqkUr6009vYFm`7-J<moweQpM+&^ly3e>ASvO=zH&%
zs1BK9Z$J!fQTge+dfNl)uZaAGc)>2|f4qP=5z3$F-vOq*ODI9}9ELFXxrn1jSHJoc
z+CB*Z{gLJ*E(+tgKTC&y@*DXT_eD|N9S!F?XE^kTCqpVX$>L+`r~m4pBT?&7@Fdy4
E0BT_2<^TWy

literal 0
HcmV?d00001

diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 0bcdc4e09b9..4671dbc3ecf 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -127,6 +127,22 @@ teardown() {
     [ "${lines[7]}" = "'./myapp.jar' -> '$KOGITO_HOME/bin/myapp.jar'" ]
 }
 
+@test "test runtime_assemble with binary builds native binary" {
+    mkdir -p ${KOGITO_HOME}/bin
+    # emulating an upload
+    mkdir -p /tmp/src/
+    cp $BATS_TEST_DIRNAME/mocks/myapp-0.0.1-runner /tmp/src/myapp-0.0.1-runner
+
+    run runtime_assemble
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[8]}" = "'./myapp-0.0.1-runner' -> '$KOGITO_HOME/bin/myapp-0.0.1-runner'" ]
+
+    # Only runner is located in bin directory
+    [ -f "$KOGITO_HOME/bin/myapp-0.0.1-runner" ]
+}
+
 @test "test runtime_assemble with binary builds entire target!" {
     mkdir -p ${KOGITO_HOME}/bin
     # emulating an upload
@@ -144,6 +160,100 @@ teardown() {
     [ "${lines[9]}" = "'./myapp.jar' -> '$KOGITO_HOME/bin/myapp.jar'" ]
 }
 
+# Check that the irrelevant binaries are excluded
+@test "test runtime_assemble with binary builds entire target SpringBoot build" {
+    mkdir -p ${KOGITO_HOME}/bin
+    # emulating an upload
+    mkdir -p /tmp/src/target
+    touch /tmp/src/target/myapp-0.0.1.jar
+    touch /tmp/src/target/myapp-0.0.1.jar.original
+    touch /tmp/src/target/myapp-0.0.1-sources.jar
+    touch /tmp/src/target/myapp-0.0.1-tests.jar
+    touch /tmp/src/target/myapp-0.0.1-tests-sources.jar
+    mkdir -p /tmp/src/target/classes
+    mkdir -p /tmp/src/target/generated-sources
+    mkdir -p /tmp/src/target/maven-archiver
+
+    run runtime_assemble
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+
+    # Target directory is removed from initial location
+    [ ! -d "/tmp/src/target" ]
+
+    # Only expected runnable is located in bin directory
+    [ -f "$KOGITO_HOME/bin/myapp-0.0.1.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1.jar.original" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-sources.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests-sources.jar" ]
+}
+
+# Check that the irrelevant binaries are excluded
+@test "test runtime_assemble with binary builds entire target Quarkus build" {
+    mkdir -p ${KOGITO_HOME}/bin
+    # emulating an upload
+    mkdir -p /tmp/src/target
+    touch /tmp/src/target/myapp-0.0.1.jar
+    touch /tmp/src/target/myapp-0.0.1-runner.jar
+    touch /tmp/src/target/myapp-0.0.1-sources.jar
+    touch /tmp/src/target/myapp-0.0.1-tests.jar
+    touch /tmp/src/target/myapp-0.0.1-tests-sources.jar
+    mkdir -p /tmp/src/target/classes
+    mkdir -p /tmp/src/target/generated-sources
+    mkdir -p /tmp/src/target/lib
+    touch /tmp/src/target/lib/mydependency-0.0.1.jar
+
+    run runtime_assemble
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+
+    # Target directory is removed from initial location
+    [ ! -d "/tmp/src/target" ]
+
+    # Only runner and dependency is located in bin directory
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1.jar" ]
+    [ -f "$KOGITO_HOME/bin/myapp-0.0.1-runner.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-sources.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests-sources.jar" ]
+    [ -f "$KOGITO_HOME/bin/lib/mydependency-0.0.1.jar" ]
+}
+
+# Check that the irrelevant binaries are excluded
+@test "test runtime_assemble with binary builds entire target Quarkus native build" {
+    mkdir -p ${KOGITO_HOME}/bin
+    # emulating an upload
+    mkdir -p /tmp/src/target
+    touch /tmp/src/target/myapp-0.0.1.jar
+    cp $BATS_TEST_DIRNAME/mocks/myapp-0.0.1-runner /tmp/src/target/myapp-0.0.1-runner
+    touch /tmp/src/target/myapp-0.0.1-runner.jar
+    touch /tmp/src/target/myapp-0.0.1-sources.jar
+    touch /tmp/src/target/myapp-0.0.1-tests.jar
+    touch /tmp/src/target/myapp-0.0.1-tests-sources.jar
+    mkdir -p /tmp/src/target/classes
+    mkdir -p /tmp/src/target/generated-sources
+    mkdir -p /tmp/src/target/lib
+    touch /tmp/src/target/lib/mydependency-0.0.1.jar
+
+    run runtime_assemble
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+
+    # Target directory is removed from initial location
+    [ ! -d "/tmp/src/target" ]
+
+    # Only runner and dependency is located in bin directory
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-runner.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-sources.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests-sources.jar" ]
+    [ ! -f "$KOGITO_HOME/bin/lib/mydependency-0.0.1.jar" ]
+}
 
 @test "test handle_image_metadata_json no metadata" {
     mkdir -p /tmp/src/target

From 2f4b5b5a9d612f4147065641e50d4349729f79c9 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 9 Apr 2020 15:31:12 -0300
Subject: [PATCH 120/709] [master][KOGITO-1774] - Update Jobs-services,
 data-index and mgmt console SNAPSHOT artefacts (#130)

jobs-services snapshot version: jobs-service-8.0.0-20200408.070024-132-runner.jar
md5: 72ffb4a158d4b90a68fe080cfb28c3ad

data-index snapshot version: data-index-service-8.0.0-20200408.070316-207-runner.jar
md5: 9272617dfec4ff548603319250b8ed87

management-console snapshot version: management-console-8.0.0-20200408.070632-43-runner.jar
md5: c8519cc20f283b671c6da064e7bf0326

Image tag available on quay: 0.10.0-rc1

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-data-index/module.yaml         | 4 ++--
 modules/kogito-jobs-service/module.yaml       | 4 ++--
 modules/kogito-management-console/module.yaml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index 5b500ad380e..d54e43b3d4e 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -4,8 +4,8 @@ version: "0.10.0-rc1"
 
 artifacts:
   - name: kogito-data-index-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200331.022350-198-runner.jar
-    md5: 20fde16c5d5007afa1a95e36b521988c
+    url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200408.070316-207-runner.jar
+    md5: 9272617dfec4ff548603319250b8ed87
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index d57e92fe77b..8b2a5d6103a 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "0.10.0-rc1"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200331.022039-122-runner.jar
-    md5: 0e195298111cc9d0d3e0d308ec9432e8
+    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200408.070024-132-runner.jar
+    md5: 72ffb4a158d4b90a68fe080cfb28c3ad
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 6ca1dc8bb53..796df80b824 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -8,8 +8,8 @@ envs:
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200323.064325-27-runner.jar
-    md5: 37bfa43dcd645c2a5ea4fbca0024793e
+    url: https://repository.jboss.org/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200408.070632-43-runner.jar
+    md5: c8519cc20f283b671c6da064e7bf0326
 
 execute:
   - script: configure

From cf5456899c044678f99b59eeed51160338a394ce Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:46:51 -0300
Subject: [PATCH 121/709] [KOGITO-1770] - Updating images tests to reflect new
 examples naming (#132)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 kogito-quarkus-jvm-overrides.yaml             |  2 +-
 kogito-quarkus-overrides.yaml                 |  2 +-
 .../features/kogito-quarkus-jvm-ubi8.feature  | 19 ++++---
 .../features/kogito-quarkus-ubi8-s2i.feature  | 50 ++++++++++++-------
 .../kogito-springboot-ubi8-s2i.feature        | 16 +++---
 tests/features/kogito-springboot-ubi8.feature |  8 +--
 tests/test-apps/clone-repo.sh                 | 10 ++--
 7 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/kogito-quarkus-jvm-overrides.yaml b/kogito-quarkus-jvm-overrides.yaml
index 8d2342c484c..aa5c4f6f1f8 100644
--- a/kogito-quarkus-jvm-overrides.yaml
+++ b/kogito-quarkus-jvm-overrides.yaml
@@ -32,7 +32,7 @@ modules:
 
 
 ## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/drools-quarkus-example
+## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
 
diff --git a/kogito-quarkus-overrides.yaml b/kogito-quarkus-overrides.yaml
index de9e6460337..d23c8b3cb9a 100644
--- a/kogito-quarkus-overrides.yaml
+++ b/kogito-quarkus-overrides.yaml
@@ -35,7 +35,7 @@ modules:
 
 
 ## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/drools-quarkus-example
+## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
 
diff --git a/tests/features/kogito-quarkus-jvm-ubi8.feature b/tests/features/kogito-quarkus-jvm-ubi8.feature
index bfb0a62a102..7605146d21a 100644
--- a/tests/features/kogito-quarkus-jvm-ubi8.feature
+++ b/tests/features/kogito-quarkus-jvm-ubi8.feature
@@ -20,7 +20,7 @@ Feature: Kogito-quarkus-ubi8 feature.
     And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/drools-quarkus-example from target
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -28,13 +28,15 @@ Feature: Kogito-quarkus-ubi8 feature.
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
-      | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
-  
   Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/drools-quarkus-example from target
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -43,6 +45,9 @@ Feature: Kogito-quarkus-ubi8 feature.
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
-      | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 2540e36e63f..e82f52e5ed6 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -2,22 +2,25 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value                     |
       | LIMIT_MEMORY   | 3221225472                |
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
-      | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner should exist
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value                     |
       | NATIVE              | false                     |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
@@ -25,30 +28,36 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
-      | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from drools-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
-      | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value         |
       | NATIVE            | false         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+    Then file /home/kogito/bin/process-quarkus-example-runner.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
@@ -56,11 +65,11 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable          | value         |
       | NATIVE            | true          |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner should exist
+    Then file /home/kogito/bin/process-quarkus-example-runner should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
@@ -71,25 +80,28 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value                           |
       | NATIVE            | false                           |
-      | ARTIFACT_DIR      | drools-quarkus-example/target   |
-      | MAVEN_ARGS_APPEND | -pl drools-quarkus-example -am  |
+      | ARTIFACT_DIR      | rules-quarkus-helloworld/target   |
+      | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am  |
     Then check that page is served
       | property        | value                    |
       | port            | 8080                     |
       | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
-      | expected_phrase | Mario is older than Mark |
-    And file /home/kogito/bin/drools-quarkus-example-8.0.0-SNAPSHOT-runner.jar should exist
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
       | variable          | value                  |
       | NATIVE            | false                  |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
       | variable          | value    |
       | NATIVE            | false    |
     Then s2i build log should contain Expanding artifacts from incremental build...
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 86c7dd9b607..d19cb00ce41 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -3,7 +3,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -12,7 +12,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
@@ -20,31 +20,31 @@ Feature: kogito-springboot-ubi8-s2i image tests
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value                           |
       | JAVA_OPTIONS        | -Ddebug=true                    |
-      | ARTIFACT_DIR        | jbpm-springboot-example/target   |
-      | MAVEN_ARGS_APPEND   | -pl jbpm-springboot-example -am  |
+      | ARTIFACT_DIR        | process-springboot-example/target   |
+      | MAVEN_ARGS_APPEND   | -pl process-springboot-example -am  |
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/process-springboot-example.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
diff --git a/tests/features/kogito-springboot-ubi8.feature b/tests/features/kogito-springboot-ubi8.feature
index 698a36ab4ea..92d185790d5 100644
--- a/tests/features/kogito-springboot-ubi8.feature
+++ b/tests/features/kogito-springboot-ubi8.feature
@@ -21,7 +21,7 @@ Feature: springboot-quarkus-ubi8 feature.
 
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/jbpm-springboot-example from target
+    Given s2i build /tmp/kogito-examples/process-springboot-example from target
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -30,12 +30,12 @@ Feature: springboot-quarkus-ubi8 feature.
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the (forcing) binary build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/jbpm-springboot-example from target
+    Given s2i build /tmp/kogito-examples/process-springboot-example from target
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | BINARY_BUILD        | true         |
@@ -45,6 +45,6 @@ Feature: springboot-quarkus-ubi8 feature.
       | path                 | /orders/1 |
       | wait                 | 80        |
       | expected_status_code | 204       |
-    And file /home/kogito/bin/jbpm-springboot-example-8.0.0-SNAPSHOT.jar should exist
+    And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 279089c2224..6e935593240 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Clone the kogito-examples and edit the drools-quarkus-example and dmn-quarkus-example for testing purposes
+# Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
 
 TEST_DIR=`pwd`
 cd /tmp
@@ -11,8 +11,8 @@ git fetch origin --tags
 git checkout master
 
 # generating the app binaries to test the binary build
-mvn -f drools-quarkus-example clean package -DskipTests
-mvn -f jbpm-springboot-example clean package -DskipTests
+mvn -f rules-quarkus-helloworld clean package -DskipTests
+mvn -f process-springboot-example clean package -DskipTests
 
 # preparing directory to run kogito maven archetypes tests
 cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-quarkus-example/
@@ -22,8 +22,8 @@ rm -rf /tmp/kogito-examples/dmn-quarkus-example/pom.xml
 # by adding the application.properties file telling quarkus to start on
 # port 10000, the purpose of this tests is make sure that the images
 # will ensure the use of the port 8080.
-cp ${TEST_DIR}/application.properties /tmp/kogito-examples/drools-quarkus-example/src/main/resources/META-INF/
+cp ${TEST_DIR}/application.properties /tmp/kogito-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
 
-cd drools-quarkus-example
+cd rules-quarkus-helloworld
 git add --all  :/
 git commit -am "test"

From dc98b6911eaed69f9570507de85b30fe165d40eb Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 16 Apr 2020 11:09:15 -0300
Subject: [PATCH 122/709] [master][KOGITO-1490] - Improve Kogito images README
 file (#134)

Signed-off-by: spolti <fspolti@redhat.com>
---
 LICENSE                                       |  201 +++
 README.md                                     | 1093 +++++++++++++++--
 docsimg/kogito.png                            |  Bin 0 -> 33218 bytes
 kogito-data-index-overrides.yaml              |   11 +
 kogito-jobs-service-overrides.yaml            |    3 +
 kogito-management-console-overrides.yaml      |    8 +
 kogito-quarkus-jvm-overrides.yaml             |    3 +
 kogito-quarkus-overrides.yaml                 |    3 +
 kogito-quarkus-s2i-overrides.yaml             |    3 +
 kogito-springboot-overrides.yaml              |    3 +
 kogito-springboot-s2i-overrides.yaml          |    3 +
 .../kogito-infinispan-properties/module.yaml  |   10 +-
 modules/kogito-quarkus-jvm/README.md          |   14 -
 modules/kogito-quarkus-s2i/README.md          |   18 -
 modules/kogito-quarkus-s2i/s2i/bin/usage      |   12 +-
 modules/kogito-quarkus/README.md              |   14 -
 .../kogito-s2i-core/tests/bats/s2i-core.bats  |    2 +-
 modules/kogito-springboot-s2i/README.md       |   15 -
 modules/kogito-springboot-s2i/s2i/bin/usage   |    2 +-
 modules/kogito-springboot/README.md           |   16 -
 modules/kogito-springboot/s2i/bin/usage       |    2 +-
 21 files changed, 1225 insertions(+), 211 deletions(-)
 create mode 100644 LICENSE
 create mode 100644 docsimg/kogito.png
 delete mode 100644 modules/kogito-quarkus-jvm/README.md
 delete mode 100644 modules/kogito-quarkus-s2i/README.md
 delete mode 100644 modules/kogito-quarkus/README.md
 delete mode 100644 modules/kogito-springboot-s2i/README.md
 delete mode 100644 modules/kogito-springboot/README.md

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000000..f49a4e16e68
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
\ No newline at end of file
diff --git a/README.md b/README.md
index 1c8b6a73130..2af57c4c7b8 100644
--- a/README.md
+++ b/README.md
@@ -1,219 +1,1064 @@
+Kogito
+------
+
+**Kogito** is the next generation of business automation platform focused on cloud-native development, deployment and execution.
+
+<p align="center"><img width=55% height=55% src="docsimg/kogito.png"></p>
+
+[![GitHub Stars](https://img.shields.io/github/stars/kiegroup/kogito-images.svg)](https://github.com/kiegroup/kogito-images/stargazers)
+[![GitHub Forks](https://img.shields.io/github/forks/kiegroup/kogito-images.svg)](https://github.com/kiegroup/kogito-images/network/members)
+[![Pull Requests](https://img.shields.io/github/issues-pr/kiegroup/kogito-images.svg?style=flat-square)](https://github.com/kiegroup/kogito-images/pulls)
+[![Contributors](https://img.shields.io/github/contributors/kiegroup/kogito-images.svg?style=flat-square)](https://github.com/kiegroup/kogito-images/graphs/contributors)
+[![License](https://img.shields.io/github/license/kiegroup/kogito-images.svg)](https://github.com/kiegroup/kogito-images/blob/master/LICENSE)
+[![Twitter Follow](https://img.shields.io/twitter/follow/kogito_kie.svg?label=Follow&style=social)](https://twitter.com/kogito_kie?lang=en)
+
+
 # Kogito Container Images
 
-To be able to produce efficient container images for Kogito there are following sets
-of builder images to perform the build and to run the result binaries.
+To be able to efficiently execute Kogito services on the Cloud there's a need to have Container Images so it can played
+smoothly on any Kubernetes cluster. There are a few sets images which are divided in three different groups which are 
+the components, the builder images and the runtime images.
+
+
+Table of Contents
+=================
+
+* [Kogito Images](#kogito-container-images)
+    * [Kogito Images Requirements](#kogito-images-requirements)
+    * [Kogito Runtime and Builder Images](#kogito-runtime-and-builder-images)
+        * [Kogito Builder Images](#kogito-builder-images)
+            * [Kogito Quarkus Builder Image](#kogito-quarkus-builder-image)
+                * [Kogito Quarkus Builder Image Usage](#kogito-quarkus-builder-image-usage)
+                * [Kogito Quarkus Builder Image example](#kogito-quarkus-builder-image-example)
+            * [Kogito Spring Boot Builder Image](#kogito-spring-boot-builder-image)
+                * [Kogito Spring Boot Builder Image usage](#kogito-spring-boot-builder-image-usage)
+                * [Kogito Spring Boot Builder Image example](#kogito-spring-boot-builder-image-example) 
+            * [Improving Build Time](#improving-build-time)
+                * [Using incremental builds](#using-incremental-builds)
+                * [Using a Maven mirror](#using-a-maven-mirror)
+        * [Kogito Runtime Images](#kogito-runtime-images)
+            * [Binary Builds](#binary-builds)
+                * [KJAR Maven Project](#kjar-maven-project)
+                * [Assets Only](#assets-only)
+            * [Kogito Quarkus JVM Runtime Image](#kogito-quarkus-jvm-runtime-image)
+                * [Kogito Quarkus JVM Runtime Image usage](#kogito-quarkus-jvm-runtime-image-usage)
+                * [Kogito Quarkus JVM Runtime Image examples](#kogito-quarkus-jvm-runtime-image-examples)
+            * [Kogito Quarkus Native Runtime Image](#kogito-quarkus-native-runtime-image)
+                * [Kogito Quarkus Native Runtime Image usage](#kogito-quarkus-native-runtime-image-usage)
+                * [Kogito Quarkus Native Runtime Image example](#kogito-quarkus-native-runtime-image-example)
+            * [Kogito Spring Boot Runtime Image](#kogito-spring-boot-runtime-image)
+                * [Kogito Spring Boot Runtime Image usage](#kogito-spring-boot-runtime-image-usage)
+                * [Kogito Spring Boot Runtime Image example](#kogito-spring-boot-runtime-image-example)
+    * [Kogito Component Images](#kogito-components-images)
+        * [Kogito Data Index Component Image](#kogito-data-index-component-image)
+        * [Kogito Jobs Service Component Image](#kogito-jobs-service-component-image)
+        * [Kogito Management Console Component Image](#kogito-management-console-component-image)
+    * [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift)
+        * [Using released Images](#using-released-images)
+        * [Pushing the built images to a local OCP registry](#pushing-the-built-images-to-a-local-ocp-registry)
+    * [Contributing to Kogito Images repository](#contributing-to-kogito-images-repository)
+        * [Building Images](#building-images)
+            [Image Modules](#image-modules)
+        * [Testing Images](#testing-images)
+            * [Behave tests](#behave-tests)
+                * [Running Behave tests](#running-behave-tests)
+                * [Writing Behave tests](#writing-behave-tests)
+            * [Bats tests](#bats-tests)
+                * [Running Bats tests](#running-bats-tests)
+                * [Writing Bats tests](#writing-bats-tests)
+        * [Reporting new issues](#reporting-new-issues)
+
+         
+## Kogito Images Requirements 
+
+To interact with Kogito images, you would need to install the needed dependencies so that the images can be built and tested.
+
+* Mandatory dependencies:
+    * Moby Engine or Docker CE
+        * Podman can be use to build the images, but at this moment CeKit does not support it, so images build with podman
+            cannot be tested with CeKit.
+    * [CeKit 3.6.0+](https://docs.cekit.io/en/latest/): 
+        * CeKit also has its own dependencies:
+            * python packages: docker, docker-squash, odcs-client. 
+            * All of those can be handled with pip, including CeKit.
+            * if any dependency is missing CeKit will tell which one.
+    * [Bats](https://github.com/sstephenson/bats) 
+    * Java 11 or higher
+    * Maven 3.6.2 or higher
+            
+* Optional dependencies:
+    * [source-to-image](https://github.com/openshift/source-to-image)
+        * used to perform local s2i images using some of the [builder images](#builder-images)
+    * [GraalVM 19.3.1](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-19.3.1) Java 11 or higher
+        * Useful to test Kogito apps on native mode before create a Container image with it.
+    * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
+        
+        
+## Kogito Runtime and Builder Images
+
+Today, the Kogito images are divided basically in 2 vectors, when we talk about images that would be used to assemble 
+or run Kogito applications: Runtime image and Builder image. 
+Those are described bellow.
+
+
+### Kogito Builder Images
+
+The Kogito Builder Images are responsible for building the project with Apache Maven and generate the binary that will 
+be used by the Kogito Runtime images to run the Kogito application.
+
+The current available Kogito Builder images are:
+
+* [quay.io/kiegroup/kogito-quarkus-ubi8-s2i](https://quay.io/kiegroup/kogito-quarkus-ubi8-s2i)
+* [quay.io/kiegroup/kogito-springboot-ubi8-s2i](https://quay.io/kiegroup/kogito-springboot-ubi8-s2i)
+
+The Kogito Quarkus Builder Image allows you to create native image using GraalVM which allows you to have
+lightweight and fast applications ready to run in the Cloud.
+
+
+#### Kogito Quarkus Builder Image
+
+The Kogito Quarkus Builder Image is equipped with the following components:
+
+ * GraalVM 19.3.1-java11
+ * OpenJDK 11.0.6
+ * Maven 3.6.2
+ 
+For more information about what is installed on this image take a look [here](kogito-quarkus-s2i-overrides.yaml) in the
+**modules.install** section. 
+
+##### Kogito Quarkus Builder Image usage
+
+This image contains a helper option to better understand how to it:
+
+```bash
+$ docker run -it quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest /home/kogito/kogito-app-launch.sh -h
+```
+
+By default, a native build will be performed. To disable it and perform a normal java build just set the **NATIVE**
+build environment variable to **false**.
 
-Images are grouped by the runtime that will run the binaries and the builders which will actually build the 
-binaries and copy it to the runtime image.
+See the next topic for an example.
+ 
 
+##### Kogito Quarkus Builder Image example
 
-## Quarkus
+In this example, let's use a simple application available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
+repository: the *rules-quarkus-helloworld* example, with native compilation disabled.
 
-### kogito-quarkus-ubi8-s2i
 
-Builder image that is responsible for building the project
-with Apache Maven and generate native image using GraalVM/SubstrateVM
+```bash
+$ s2i build https://github.com/kiegroup/kogito-examples.git \
+    --ref master \
+    --context-dir rules-quarkus-helloworld \
+    quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest \
+    rules-example:1.0 \
+    --env NATIVE=false
+...
+[INFO] BUILD SUCCESS
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time:  08:37 s
+[INFO] Finished at: 2020-04-06T19:13:42Z
+[INFO] ------------------------------------------------------------------------
+---> Build finished, installing application from path /tmp/src
+---> Installing jar file
+'target/rules-quarkus-helloworld-8.0.0-SNAPSHOT-runner.jar' -> '/home/kogito/bin/rules-quarkus-helloworld-8.0.0-SNAPSHOT-runner.jar'
+---> Copying application libraries
+---> [s2i-core] Copy image metadata file...
+'/tmp/src/target/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'
+'/tmp/src/target/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'
+'/tmp/src/target/image_metadata.json' -> '/home/kogito/bin/image_metadata.json'
+INFO ---> [persistence] Copying persistence files...
+INFO ---> [persistence] Skip copying files, persistence directory does not exist...
+Build completed successfully
+```
 
-Image location: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest
+After the image is built, let's test it:
+
+```bash
+$ docker run -it -p 8080:8080 rules-example:1.0
+ --/ __ \/ / / / _ | / _ \/ //_/ / / / __/ 
+ -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\ \   
+--\___\_\____/_/ |_/_/|_/_/|_|\____/___/   
+2020-04-08 18:59:57,753 INFO  [io.quarkus] (main) rules-quarkus-helloworld 8.0.0-SNAPSHOT (powered by Quarkus 1.3.0.Final) started in 0.839s. Listening on: http://0.0.0.0:8080
+2020-04-08 18:59:57,755 INFO  [io.quarkus] (main) Profile prod activated. 
+2020-04-08 18:59:57,756 INFO  [io.quarkus] (main) Installed features: [cdi, kogito, resteasy, resteasy-jackson, resteasy-jsonb]
+```
 
-For more details have a look at [README.md](modules/kogito-quarkus-ubi8-s2i/README.md)
+In a different shell, try the following command:
+```bash
+$ curl -H "Content-Type: application/json" -X POST -d '{"strings":["hello"]}' http://localhost:8080/hello
 
-### kogito-quarkus-ubi8
+# the service will return `["hello", "world"]`
+```
 
-Runtime image that is responsible for just running the binaries taken from the
-builder image. That approach is giving small and compact image that does not
-not carry on any of the build tools or artefacts (like local maven repository).
 
-Image location: quay.io/kiegroup/kogito-quarkus-ubi8:latest
+#### Kogito Spring Boot Builder Image
 
-For more details have a look at [README.md](modules/kogito-quarkus-ubi8/README.md)
+The Kogito Spring Boot Builder Image is equipped with the following components:
 
-## SpringBoot
+ * OpenJDK 11.0.6
+ * Maven 3.6.2
+ 
+For more information about what is installed on this image take a look [here](kogito-springboot-s2i-overrides.yaml) 
+in the **modules.install** section. 
 
-### kogito-springboot-ubi8-s2i
+##### Kogito Spring Boot Builder Image usage
 
-Builder image that is responsible for building the project
-with Apache Maven and generate fat jar.
+This image contains a helper option to better understand how to it:
 
-Image location: quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest
+```bash
+$ docker run -it quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest /home/kogito/kogito-app-launch.sh -h
+```
 
-For more details have a look at [README.md](modules/kogito-springboot-ubi8-s2i/README.md)
+##### Kogito Spring Boot Builder Image example
 
-### kogito-springboot-ubi8
+In this example, let's use a simple application available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
+repository: the *process-springboot-example*.
 
-Runtime image that is responsible for just running the fat jar taken from the
-builder image. It has JRE installed on the container to allow java executable.
-That approach is giving small and compact image that does not
-not carry on any of the build tools or artefacts (like local maven repository).
+```bash
+$ s2i build https://github.com/kiegroup/kogito-examples.git \
+    --ref master \
+    --context-dir \
+    process-springboot-example \
+    quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest \
+    springboot-example:1.0
+```
 
-Image location: quay.io/kiegroup/kogito-springboot-ubi8:latest
+After the image is built, let's test it:
 
-For more details have a look at [README.md](modules/kogito-springboot-ubi8/README.md)
+```bash
+$ docker run -it -p 8080:8080 springboot-example:1.0
+```
 
-## Kogito Data Index Service
+In a different shell, try the following commands:
+```bash
+$ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" \
+     -X POST http://localhost:8080/orders
 
-Runtime image that is responsible for just running the [Data Index Service](https://github.com/kiegroup/kogito-runtimes/wiki/Data-Index-Service). Solely used by the [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) to deploy data index capabilities to Kogito Services.
+{"id":"10de03c0-828f-4f2e-bb3f-68c3ddfea7ec","approver":"john","order":{"orderNumber":"12345","shipped":false,"total":0.4231905542160477}}✔
 
-## Kogito Jobs Service
+$ curl -X GET http://localhost:8080/orders
+$ curl -X DELETE http://localhost:8080/orders/10de03c0-828f-4f2e-bb3f-68c3ddfea7ec
+```
 
-Kogito Job Service is a dedicated lightweight service responsible for scheduling jobs that aim to be fired at a given time. The service does not execute the job itself, it triggers a callback that could be an HTTP request on a given endpoint specified on the job request, or any other callback that could be supported by the service.
-For more information please access this (link)[https://github.com/kiegroup/kogito-runtimes/wiki/Job-Service]
+#### Improving Build Time
 
-# Supported source structure
+The time needed to build the application is rather long. This is mainly due to maven downloading all dependencies, which takes several minutes.
 
-Images can be build based on two types of source structure
 
-- assets only
-- kjar maven project
+##### Using incremental builds
 
-## Assets only
+If you are planning to build many times the same application, you can use the incremental builds which will improve drastically the build time. 
+Let's start 2 builds with the incremental option enabled and compare the time spent to build each one:
 
-This source structure assumes there is no maven project
-but only business assets stored either directly in the top folder or grouped into directories.
+```bash
+# First incremental build
+$ time s2i build https://github.com/kiegroup/kogito-examples.git \
+    --ref master \
+    --context-dir rules-quarkus-helloworld \
+    quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest \
+    rules-example-incremental:1.0 \
+    --incremental \    
+    --env NATIVE=false
+...
+real	13m49.819s
+user	0m1.768s
+sys	0m1.429s
+```
 
-Business assets are:
+And now, let's run it again.
 
-- process definition - bpmn2
-- rule definition - drl
-- decision definition - dmn
+```bash
+# Second incremental build
+$ time s2i build https://github.com/kiegroup/kogito-examples.git \
+    --ref master \
+    --context-dir rules-quarkus-helloworld \
+    quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest \
+    rules-example-incremental:1.0 \
+    --incremental \
+    --env NATIVE=false
+...
+real	0m57.582s
+user	0m1.628s
+sys	0m1.123s
+```
 
-Upon build these assets will be copied to generated kjar maven project and build with maven to produce the runnable binary.
+In the second try, you can see the artifacts getting unpacked and reused from the previous build. 
+Now, pay also attention to the time spent to build it. There is a big difference. 
+In fact, an incremental build reuses the previously built image and it takes advantage of already downloaded artifacts. 
+This can significantly improve the build time.
 
-## Kjar maven project
+##### Using a Maven mirror
 
-This source structure is expected to be valid kjar project equipped with runtime information - either Quarkus or Spring Boot.
+Another option is to use a Maven Mirror.  
+This can be used together with incremental builds to speed up the build even more.  
+To turn it possible we just need to set the **MAVEN_MIRROR_URL** environment variable when starting a new build, see the example below:
 
-Best way is to use maven archetypes to generate project structure (same archetypes are used in cases assets only are used as source).
 
-[Kogito Quarkus archetype](https://github.com/kiegroup/kogito-runtimes/tree/master/archetypes/kogito-quarkus-archetype)
+```bash
+# Third incremental build, with Maven mirror option
+$ time s2i build https://github.com/kiegroup/kogito-examples.git \
+    --ref master \
+    --context-dir rules-quarkus-helloworld \
+    quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest \
+    rules-example-incremental-1 \
+    --incremental \
+    --env NATIVE=false \
+    --env MAVEN_MIRROR_URL=http://nexus.apps.local.cloud/nexus/content/groups/public
+...
+real	0m49.658s
+user	0m0.968s
+sys	0m0.539s
+```
 
-[Kogito SpringBoot archetype](https://github.com/kiegroup/kogito-runtimes/tree/master/archetypes/kogito-springboot-archetype)
+Here you can see that the build time has again been reduced. 
+If the maven mirror have already have all the dependencies there, the build time can be even faster.
 
-# Example usage
 
-## Build the application
+### Kogito Runtime Images
 
-Once the images are built and imported into registry (docker hub or internal OpenShift registry)
-new applications can be build and deployed with this few steps
+The Kogito Runtime Images have 2 behaviors:
+* Run the artifacts built by the Kogito Builder Images
+* Run your pre-built local artifacts, via what we call a _Binary Build_. 
+For non-native built applications, they have a JRE installed to allow to execute Java applications.
 
-`oc new-build quay.io/kiegroup/kogito-quarkus-ubi8-s2i~https://github.com/user/project --name=builder-app-name`
+With this approach, we can have smaller and more compact images that do not include any of the build tools or artifacts (like the local maven repository for example).
 
-Modify accordingly following
-- repository is the docker repository the images are available in (could be OpenShift project or docker hub user)
-- user is user name in github
-- project is project in github
-- builder-app-name is name of the resulting build image that will be referenced in next step to build the runtime image
+Today we have the following Kogito Runtime Images:
 
-## Build runtime image of the application
+* [quay.io/kiegroup/kogito-quarkus-jvm-ubi8](https://quay.io/kiegroup/kogito-quarkus-jvm-ubi8)
+* [quay.io/kiegroup/kogito-quarkus-ubi8](http://quay.io/kiegroup/kogito-quarkus-ubi8)
+* [quay.io/kiegroup/kogito-springboot-ubi8](http://quay.io/kiegroup/kogito-springboot-ubi8)
 
-Once the build is finished, create another build config to produce runtime image
+#### Binary Builds
 
-`oc new-build --name app-name --source-image=builder-app-name --source-image-path=/home/kogito/bin:. --image-stream=kogito-quarkus-ubi8`
+A Binary Build allows you to quickly copy the built locally artifacts into the target *Kogito Runtime Image*, 
+saving the time needed to build the final image using the method with Kogito Builder Images.
+Below are the supported source structure:
 
-Modify accordingly following
-- app-name is the final name of the image that will be deployed
-- builder-app-name is the name of the built image from first step
+- KJAR Maven Project
+- Assets only
 
-This build is very fast and should produce rather small image (below 100mb).
+Both methods are described below.
 
-## Create new application from the runtime image
+##### KJAR Maven Project
 
-Create new application based on runtime image
+[KJAR](https://developers.redhat.com/blog/2018/03/14/what-is-a-kjar/) stands for Knowledge jar which is a custom JAR file 
+that contains Business Process or Rules and all needed dependencies and files to execute it on the target runtime, 
+either Quarkus or Spring Boot.
 
-`oc new-app app-name:latest`
+If you don't have a already existing project, the best way to create a new one is to use Kogito Maven Archetypes 
+to generate project structure. 
+The available archetypes are:
 
-Modify accordingly following
-- app-name is the final name of the image that will be deployed
+- [Kogito Quarkus Archetype](https://github.com/kiegroup/kogito-runtimes/tree/master/archetypes/kogito-quarkus-archetype)
+- [Kogito Spring Boot Archetype](https://github.com/kiegroup/kogito-runtimes/tree/master/archetypes/kogito-springboot-archetype)
 
-## Make the application available to users
+Note that, when building Quarkus based application that is **not** a *UberJAR* we also need to copy the **lib** directory 
+located inside the *target* directory.  
+Examples on how to use this feature can be found in the next topics.
 
-Expose the application via route
 
-`oc expose svc/app-name`
+##### Assets only
 
-Modify accordingly following
-- app-name is the name of the application that was deployed
+This source structure assumes that there is no maven project but only business assets, stored either directly in the top folder 
+or grouped into directories.
 
-# Subsequent builds of the application
+Types of Business assets can be:
 
-Once the build configs are in place there is only one command that is needed to produce
-new application image (the runtime one)
+- Business Process definition - bpmn2 or just bpmn files
+- Business Rule definition - drl files
+- Business Decision definition - dmn files
 
-`oc start-build builder-app-name`
+Upon build, these assets will be copied to a generated maven project and built with Maven to produce a runnable binary.
 
-Modify accordingly following
-- builder-app-name is name of the resulting build image that was built in the first step.
 
-This will get the latest source and run the builder image first. Once the build
-is completed it will automatically trigger building of the runtime image and next
-automatic deployment of the runtime image.
+#### Kogito Quarkus JVM Runtime Image
 
-## Improve speed of the builds
+This Kogito Runtime Image contains only the needed files to execute a pre built Kogito application and a JRE.
 
-Time needed to build the application is rather long, mainly due to
-maven downloading dependencies for the build which usually takes several minutes.
 
-That can be improved by using incremental builds
+##### Kogito Quarkus JVM Runtime Image usage
 
-`oc start-build builder-app-name --incremental=true`
+This image contains a helper option to better understand how to it:
 
-Modify accordingly following
-- builder-app-name is name of the resulting build image that was built in the first step.
+```bash
+docker run -it quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest /home/kogito/kogito-app-launch.sh -h
+```
 
-what this does ... essentially reuses previously build image and takes advantage of
-already downloaded artifacts. By that improving overall build time significantly.
 
-You can also use a maven mirror, if available on your internal network, just set the
-MAVEN_MIRROR_URL environment variable when starting a new build.
+##### Kogito Quarkus JVM Runtime Image examples
 
-## Building the images locally:
+In the next few lines let's take a look on how this image can be used to receive an already built UberJAR. 
+To configure Quarkus to generate a UberJAR please follow the instructions described [here](https://quarkus.io/guides/maven-tooling#configuration-reference)
 
-CeKit3 is required to build the images, how to install: https://docs.cekit.io/en/latest/handbook/installation/instructions.html
+For this example let's use the [process-quarkus-example](https://github.com/kiegroup/kogito-examples/tree/stable/process-quarkus-example).
+Once you have checked out the example on your local machine follow the steps below:
 
-To build all images:
+**Example with UberJAR**
 ```bash
-$ make
+# build the example using uberjar reference
+$ mvn clean package -Dquarkus.package.uber-jar
+# inspect and run the generated uberjar, for instructions on how to use this example see its README file.
+$ java -jar target/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner.jar 
+
+# performing a source to image build to copy the artifacts to the runtime image
+$ s2i build target/ quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest process-quarkus-example
+
+# run the generated image
+$ docker run -p 8080:8080 -it process-quarkus-example
+
+# On another shell do a simple post request 
+curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
+
+#repare the container logs the following message:
+Order has been created Order[12345] with assigned approver JOHN
 ```
 
-To build a single image, use `make build image-name`, example:
+
+**Example with non UberJAR**
+For non uberjar the process is the same, but you only need to remove the property from Quarkus configuration to not generate uberjar.
 ```bash
-$ make kogito-quarkus-ubi8
+$ mvn clean package
 ```
 
-Testing the images (WIP):
+Note that this time there is a *lib* folder into the **target** directory. The s2i build will take care of copying it to the correct place. 
+Just perform a build:
+
 ```bash
-$ make test
+$ s2i build target/ quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest process-quarkus-example-non-uberjar
+$ docker run -p 8080:8080 -it process-quarkus-example-non-uberjar
+
+# On another shell do a simple post request 
+$ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
+
+#repare the container logs the following message:
+Order has been created Order[12345] with assigned approver JOHN
 ```
 
-And finally, to push the images for the quay.io/kiegroup registry, this step requires permission under the kiegroup
-organization on quay.io.:
+
+#### Kogito Quarkus Native Runtime Image
+
+This Kogito Runtime Image contains only the needed files to execute a pre built Kogito application.
+
+
+##### Kogito Quarkus Native Runtime Image usage
+
+This image contains a helper option to better understand how to it:
+
 ```bash
- make push
- ```
+docker run -it quay.io/kiegroup/kogito-quarkus-ubi8:latest /home/kogito/kogito-app-launch.sh -h
+```
 
-##### Pushing the built images to a local OCP registry:
-To be able to build the image a docker should be installed.
+##### Kogito Quarkus Native Runtime Image example
 
-Setup environment
+For this example let's use the same than the previous one (process-quarkus-example). 
+But this time, let's perform a native build:
 
 ```bash
-$ eval $(minishift docker-env)
- ```
+$ mvn clean package -Pnative
+```
 
-Login to docker registry
+A binary has been generated into the **target directory**.
+Let's use this binary to perform the source-to-image build:
 
 ```bash
-$ docker login -u developer -p $(oc whoami -t) $(minishift openshift registry)
+s2i build target/ quay.io/kiegroup/kogito-quarkus-ubi8:latest binary-test-example
+-----> [s2i-core] Running runtime assemble script
+-----> Binary build enabled, artifacts were uploaded directly to the image build
+-----> Found binary file, native build.
+-----> Cleaning up unneeded jar files
+...
+---> Installing application binaries
+'./process-quarkus-example-8.0.0-SNAPSHOT-runner' -> '/home/kogito/bin/process-quarkus-example-8.0.0-SNAPSHOT-runner'
+...
+
+# run the output image
+$ docker run -it -p 8080:8080 binary-test-example-3
+
+# on another terminal, interact with the kogito service
+$ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
+
+#repare the container logs the following message:
+Order has been created Order[12345] with assigned approver JOHN
 ```
 
-(this will run a docker build and produce a image builder)
 
-Tag the built image, example
+#### Kogito Spring Boot Runtime Image
+
+This Kogito Runtime Image contains only the needed files to execute a pre built Kogito application and a JRE.
+
+
+##### Kogito Spring Boot Runtime Image usage
+
+This image contains a helper option to better understand how to it:
+
 ```bash
-$ docker tag {IMAGE_ID} $(minishift openshift registry)/{PROJECT}/kogito-quarkus-ubi8
+docker run -it quay.io/kiegroup/kogito-springboot-ubi8:latest /home/kogito/kogito-app-launch.sh -h
 ```
 
-Modify accordingly
- - IMAGE_ID - use the hash from the image produced by the make command (`docker images` to view images)
-    * Note that, you can also use the image name:tag.
- - PROJECT - OpenShift project that the image should be pushed to
+##### Kogito Spring Boot Runtime Image example
+
+Let's try, here, the *process-springboot-example*: 
+
+```bash
+$ mvn clean package
+```
+
+A uberjar file has been generated into the **target directory**. 
+Let's use this uberjar to perform the build:
+
+```bash
+$ s2i build target/ quay.io/kiegroup/kogito-springboot-ubi8:latest spring-binary-example
+-----> [s2i-core] Running runtime assemble script
+-----> Binary build enabled, artifacts were uploaded directly to the image build
+-----> Cleaning up unneeded jar files
+removed 'process-springboot-example-tests.jar'
+removed 'process-springboot-example-sources.jar'
+removed 'process-springboot-example-test-sources.jar'
+-----> Copying uploaded files to /home/kogito
+---> [s2i-core] Copy image metadata file...
+'/tmp/src/./image_metadata.json' -> '/tmp/.s2i/image_metadata.json'
+'/tmp/src/./image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'
+'/tmp/src/./image_metadata.json' -> '/home/kogito/bin/image_metadata.json'
+---> Installing application binaries
+'./process-springboot-example.jar' -> '/home/kogito/bin/process-springboot-example.jar'
+...
+
+# run the output image
+$ docker run -it -p 8080:8080 spring-binary-example
+
+# on another terminal, interact with the kogito service
+$ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
+
+#repare the container logs the following message:
+Order has been created Order[12345] with assigned approver JOHN
+```
+
+
+## Kogito Component Images
+
+The Kogito Component Images can be considered as lightweight images that will complement the Kogito core engine 
+by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications.
+Today we have 3 Kogito Component Images:
+
+* [quay.io/kiegroup/kogito-data-index](https://quay.io/kiegroup/kogito-data-index)
+* [quay.io/kiegroup/kogito-jobs-service](htps://quay.io/kiegroup/kogito-jobs-service)
+* [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
+
+
+### Kogito Data Index Component Image
+
+The Data Index Service aims at capturing and indexing data produced by one more Kogito runtime services. 
+For more information please visit this (link)(https://docs.jboss.org/kogito/release/latest/html_single/#proc_kogito-travel-agency-enable-data-index). 
+The Data Index Service depends on a running Infinispan Server.
+
+
+Basic usage
+```bash
+$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index:latest
+```
+
+To enable debug just use this env while running this image:
+
+```bash
+docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index:latest
+```
+You should notice a few debug messages being printed in the system output.
+
+To know what configurations this image accepts please take a look [here](kogito-data-index-overrides.yaml) on the **envs** section.
+
+The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Data Index Service 
+to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
+
+
+### Kogito Jobs Service Component Image
+
+The Kogito Jobs Service is a dedicated lightweight service responsible for scheduling jobs that aim at firing at a given time. 
+It does not execute the job itself but it triggers a callback that could be an HTTP request on a given endpoint specified 
+on the job request, or any other callback that could be supported by the service. 
+For more information please visit this (link)[https://github.com/kiegroup/kogito-runtimes/wiki/Job-Service]
+
+
+Basic usage:
+
+```bash
+$ docker run -it quay.io/kiegroup/kogito-jobs-service:latest
+```
+
+To enable debug just use this env while running this image:
+
+```bash
+docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service:latest
+```
+You should notice a few debug messages being printed in the system output.
+
+To know what configurations this image accepts please take a look [here](kogito-jobs-service-overrides.yaml) on the **envs** section.
+
+The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Jobs Service
+to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications
+
+
+### Kogito Management Console Component Image
+
+The Kogito Management Console allows you to have a intuitive way to manage your Kogito processes in execution.
+It depends on the Kogito Data Index Service on which the Console will connect to so it can be able to manage it.
+Keep in mind that when using the [Process Instance Management Add-on](https://docs.jboss.org/kogito/release/latest/html_single/#con_bpmn-process-instance-management_kogito-developing-process-services) 
+it will enable your Kogito service be manageable through REST API.
+
+
+To work correctly, the Kogito Management Console needs the Kogito Data Index Service url. If not provided, it will try to connect to the default one (http://localhost:8180).
+
+Basic usage:
+
+```bash
+$ docker run -it --env KOGITO_DATAINDEX_HTTP_URL=data-index-service-url:9090 quay.io/kiegroup/kogito-management-console:latest
+```
+
+To enable debug just use this env while running this image:
+
+```bash
+docker run -it --env SCRIPT_DEBUG=true --env KOGITO_DATAINDEX_HTTP_URL=data-index-service-url:9090 quay.io/kiegroup/kogito-management-console:latest
+```
+You should notice a few debug messages being printed in the system output.
+
+To know what configurations this image accepts please take a look [here](kogito-management-console-overrides.yaml) on the **envs** section.
+
+The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Management Console 
+to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
+
+
+## Using Kogito Images to Deploy Apps on OpenShift
+
+Once the images are built and imported into a registry (quay.io or any other registry), new applications can be built and deployed within a few steps.
+
+
+### Using released images
+
+As a first step, we need to make the Kogito Images available as Image Streams in OpenShift. If you have `cluster-admin` 
+rights you can deploy it into the **openshift** namespace, otherwise, deploy it into the namespace where you have permissions. 
+To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/kiegroup/kogito-images/0.9.0/kogito-imagestream.yaml).
+It points to the latest released version.
+
+Let's use the *rules-quarkus-helloworld* from [Kogito Examples](https://github.com/kiegroup/kogito-examples).
+
+```bash
+# creating a new namespace
+$ oc new-project rules-quarkus-helloworld
+Now using project "rules-quarkus-helloworld" on server "https://ocp.lab.cloud:8443".
+
+You can add applications to this project with the 'new-app' command. For example, try:
+
+    oc new-app centos/ruby-25-centos7~https://github.com/sclorg/ruby-ex.git
+
+to build a new example application in Ruby.
+
+# installing the imagestream on the current namespace
+$ oc create -f https://raw.githubusercontent.com/kiegroup/kogito-images/0.9.0/kogito-imagestream.yaml
+imagestream.image.openshift.io/kogito-quarkus-ubi8 created
+imagestream.image.openshift.io/kogito-quarkus-jvm-ubi8 created
+imagestream.image.openshift.io/kogito-quarkus-ubi8-s2i created
+imagestream.image.openshift.io/kogito-springboot-ubi8 created
+imagestream.image.openshift.io/kogito-springboot-ubi8-s2i created
+imagestream.image.openshift.io/kogito-data-index created
+imagestream.image.openshift.io/kogito-jobs-service created
+imagestream.image.openshift.io/kogito-management-console created
+
+# performing a new build
+$ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-quarkus-ubi8-s2i:0.9.0 \ 
+    https://github.com/kiegroup/kogito-examples.git#master --context-dir=rules-quarkus-helloworld \
+    --strategy=source --env NATIVE=false 
+--> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-quarkus-ubi8-s2i" under tag "0.9.0" for "kogito-quarkus-ubi8-s2i:0.9.0"
+
+    Kogito based on Quarkus 
+    ----------------------- 
+    Platform for building Kogito based on Quarkus
+
+    Tags: builder, kogito, quarkus
+
+    * The source repository appears to match: jee
+    * A source build using source code from https://github.com/kiegroup/kogito-examples.git#master will be created
+      * The resulting image will be pushed to image stream tag "rules-quarkus-helloworld-builder:latest"
+      * Use 'start-build' to trigger a new build
+
+--> Creating resources with label build=drools-helloworld-builder ...
+    imagestreamtag.image.openshift.io "rules-quarkus-helloworld-builder:latest" created
+    buildconfig.build.openshift.io "rules-quarkus-helloworld-builder" created
+--> Success
+```
+
+The build has started, you can check the logs with the following command:
+
+```bash
+$ oc logs -f bc/rules-quarkus-helloworld-builder
+```
+
+Once the build is finished, you can now create a new build to copy the generated artifact from the source to image build
+to the Kogito Runtime Image. To do this, execute the following command:
+
+```bash
+$ oc new-build --name=rules-quarkus-helloworld-service --source-image=rules-quarkus-helloworld-builder \
+  --source-image-path=/home/kogito/bin:. --image-stream=kogito-quarkus-jvm-ubi8:0.9.0
+--> Found image 1608e71 (6 days old) in image stream "rules-quarkus-helloworld/kogito-quarkus-jvm-ubi8" under tag "0.9.0" for "kogito-quarkus-jvm-ubi8:0.9.0"
+
+    Kogito based on Quarkus JVM image 
+    --------------------------------- 
+    Runtime image for Kogito based on Quarkus JVM image
+
+    Tags: builder, runtime, kogito, quarkus, jvm
+
+    * A source build using <unknown> will be created
+      * The resulting image will be pushed to image stream tag "rules-quarkus-helloworld-service:latest"
+      * Use 'start-build' to trigger a new build
+
+--> Creating resources with label build=drools-helloworld-service ...
+    imagestream.image.openshift.io "rules-quarkus-helloworld-service" created
+    buildconfig.build.openshift.io "rules-quarkus-helloworld-service" created
+--> Success
+```
+
+Follow the logs with the following command:
+```bash
+$ oc logs -f bc/rules-quarkus-helloworld-service
+```
+
+Once the build gets finished, you need to create an application and use the service image created with the latest command.
+
+```bash
+$ oc new-app rules-quarkus-helloworld-service:latest
+  --> Found image 664b295 (3 minutes old) in image stream "rules-quarkus-helloworld/rules-quarkus-helloworld-service" under tag "latest" for "rules-quarkus-helloworld-service:latest"
+  
+      temp.builder.openshift.io/rules-quarkus-helloworld/rules-quarkus-helloworld-service-1:e8062a99 
+      --------------------------------------------------------------------------------------- 
+      Runtime image for Kogito based on Quarkus JVM image
+  
+      Tags: builder, runtime, kogito, quarkus, jvm
+  
+      * This image will be deployed in deployment config "rules-quarkus-helloworld-service"
+      * Port 8080/tcp will be load balanced by service "rules-quarkus-helloworld-service"
+        * Other containers can access this service through the hostname "rules-quarkus-helloworld-service"
+  
+  --> Creating resources ...
+      deploymentconfig.apps.openshift.io "rules-quarkus-helloworld-service" created
+      service "rules-quarkus-helloworld-service" created
+  --> Success
+      Application is not exposed. You can expose services to the outside world by executing one or more of the commands below:
+       'oc expose svc/rules-quarkus-helloworld-service' 
+      Run 'oc status' to view your app.
+```
+
+As described in the command output, to be able to access the application, we need to expose it to the external world. 
+For that, just execute the command listed in the output above, e.g.:
+
+```bash
+$ oc expose svc/rules-quarkus-helloworld-service
+```
+
+To see the route name, just execute the following command:
+
+```bash
+$ oc get routes
+NAME                               HOST/PORT                                                                     PATH      SERVICES                           PORT       TERMINATION   WILDCARD
+rules-quarkus-helloworld-service   rules-quarkus-helloworld-service-rules-quarkus-helloworld.apps.lab.cloud                rules-quarkus-helloworld-service   8080-tcp                 None
+```
+
+Now, with the service address in hand we can test our service:
+
+```bash
+$ curl -H "Content-Type: application/json" -X POST -d '{"strings":["hello"]}' \
+     http://rules-quarkus-helloworld-service-rules-quarkus-helloworld.apps.lab.cloud/hello
+```
+
+As output you should see the following response:
+
+```json
+["hello","world"]
+```
+
+
+For more complex deployment, please use the [Kogito Cloud Operator](https://github.com/kiegroup/kogito-cloud-operator)
+
+
+
+### Pushing the built images to a local OCP registry:
+
+To be able to build the image it should be installed and available on OpenShift before it can be used.
+
+Suppose we have built the Quarkus s2i Image with the following command:
+
+```bash
+$ make kogito-quarkus-ubi8-s2i 
+```
+
+We'll have as output the following image:
+
+```bash
+quay.io/kiegroup/kogito-quarkus-ubi8-s2i:X.X.X
+```
+
+Then we need to tag the image properly. 
+Suppose your local registry is openshift.local.registry:8443, you should do:
+
+```bash
+$ docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:X.X.X \
+    openshift.local.registry:8443/{NAMESPACE}/kogito-quarkus-ubi8-s2i:X.X.X
+```
+
+Where the namespace is the place where you want the image to be available for usage. 
+Once the image is properly tagged, log in to the registry and push the new image:
+
+```bash
+$ docker login -u <USERNAME> -p <PASSWORD>  openshift.local.registry:8443
+$ docker push  openshift.local.registry:8443/{NAMESPACE}/kogito-quarkus-ubi8-s2i:X.X.X
+```
+
+To deploy and test the new image, follow the same steps as described [here](#using-released-images)
+
+
+## Contributing to Kogito Images repository
+
+Before proceed please make sure you have checked the [requirements](#kogito-images-requirements).
+
+
+### Building Images
+
+To build the images for local testing there is a [Makefile](./Makefile) which will do all the hard work for you.
+With this Makefile you can:
+
+- Build all images with only one command
+     ```bash
+     $ make
+     ```
+     
+- Build images individually
+     ```bash
+     $ make kogito-quarkus-ubi8
+     $ make kogito-quarkus-jvm-ubi8
+     $ make kogito-quarkus-ubi8-s2i
+     $ make kogito-springboot-ubi8 
+     $ make kogito-springboot-ubi8-s2i
+     $ make kogito-data-index
+     $ make kogito-jobs-service 
+     $ make kogito-management-console
+     ```
+     
+- Build and Push the Images to quay or a repo for you preference, for this you need to edit the Makefile accordingly: 
+      ```bash
+      $ make push
+      ```
+      It will create 3 tags:
+        - X.Y
+        - X.Y.z
+        - latest
+        
+- Push staging images (release candidates, a.k.a rcX tags), the following command will build and push RC images to quay. 
+      ```bash
+      $ make push-staging
+      ```
+      It uses the [push-staging.py](scripts/push-staging.py) script to handle the images.
+
+
+#### Image Modules
+
+CeKit can use modules to better separate concerns and reuse these modules on different images. 
+On the Kogito Images we have several CeKit modules that are used during builds. 
+To better understand the CeKit Modules, please visit this [link](https://docs.cekit.io/en/latest/handbook/modules).
+
+Below you can find all modules used to build the Kogito Images
+
+- [kogito-data-index](modules/kogito-data-index): Installs and Configure the data-index jar inside the image.
+- [kogito-epel](modules/kogito-epel): Configures the epel repository on the target image.
+- [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image.
+- [kogito-graalvm-scripts](modules/kogito-graalvm-scripts): Configures the GraalVM on the target image and provides custom configuration script. 
+- [kogito-image-dependencies](modules/kogito-image-dependencies): Installs rpm packages on the target image. Contains common dependencies for Kogito Images.
+- [kogito-infinispan-properties](modules/kogito-infinispan-properties): Provides Infinispan custom script to configure Infinispan properties during image startup.
+- [kogito-jobs-service](modules/kogito-jobs-service): Installs and Configure the jobs-service jar inside the image
+- [kogito-jq](modules/kogito-jq): Provides jq binary.
+- [kogito-kubernetes-client](modules/kogito-kubernetes-client): Provides a simple wrapper to interact with Kubernetes API.
+- [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
+- [kogito-logging](modules/kogito-logging): Provides common logging functions.
+- [kogito-management-console](modules/kogito-management-console): Installs and Configure the management-console jar inside the image
+- [kogito-maven](modules/kogito-maven): Installs and configure Maven on the S2I images, also provides custom configuration script.
+- [kogito-openjdk](modules/kogito-openjdk): Provides OpenJDK and JRE.
+- [kogito-persistence](modules/kogito-persistence): Provides the needed configuration scripts to properly configure the Kogito Services in the target image.
+- [kogito-quarkus](modules/kogito-quarkus): Main module for the quay.io/kiegroup/kogito-quarkus-ubi8 image.
+- [kogito-quarkus-jvm](modules/kogito-quarkus-jvm): Main module for the quay.io/kiegroup/kogito-quarkus-jvm-ubi8 image.
+- [kogito-quarkus-s2i](modules/kogito-quarkus-s2i): Main module for the quay.io/kiegroup/kogito-quarkus-ubi8-s2i image.
+- [kogito-s2i-core](modules/kogito-s2i-core): Provides the source-to-image needed scripts and configurations.
+- [kogito-springboot](modules/kogito-springboot): Main module for the quay.io/kiegroup/kogito-springboot-ubi8 image.
+- [kogito-springboot-s2i](modules/kogito-springbot-s2i): Main module for the quay.io/kiegroup/kogito-springboot-ubi8-s2i image.
+
+
+For each image, we use a specific *-overrides.yaml file which will specific the modules needed.
+Please inspect the images overrides files to learn which modules are being installed:
+
+- [quay.io/kiegroup/kogito-data-index](kogito-data-index-overrides.yaml)
+- [quay.io/kiegroup/kogito-jobs-service](kogito-jobs-service-overrides.yaml)
+- [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
+- [quay.io/kiegroup/kogito-quarkus-jvm-ubi8](kogito-quarkus-jvm-overrides.yaml)
+- [quay.io/kiegroup/kogito-quarkus-ubi8](kogito-quarkus-overrides.yaml)
+- [quay.io/kiegroup/kogito-quarkus-ubi8-s2i](kogito-quarkus-s2i-overrides.yaml)
+- [quay.io/kiegroup/kogito-springboot-ubi8](kogito-springboot-overrides.yaml)
+- [quay.io/kiegroup/kogito-springboot-ubi8-s2i](kogito-springboot-s2i-overrides.yaml)
+
+
+### Testing Images
+
+There is two kind of tests, **behave** and **bats** tests.
+
+#### Behave tests
+
+For more information about behave tests please refer this [link](https://docs.cekit.io/en/latest/handbook/testing/behave.html)
+
+##### Running Behave tests
+
+To run all behave tests:
+
+```bash
+make test
+```
+
+CeKit also allows you to run a specific test.
+See [Writing Behave Tests](#writing-behave-tests).
+
+
+##### Writing Behave tests
+
+
+With the Cekit extension of behave we can run, practically, any kind of test on the containers, even source to image tests.
+There are a few options that you can use to define what action and what kind of validations/verifications your test must do.
+The behave test structure looks like:
+
+```bash
+Feature my cool feature
+    Scenario test my cool feature - it should print Hello and World on logs
+  	  Given/when image is built/container is ready
+	  Then container log should contain Hello
+	  And container log should contain World
+```
+
+One feature can have as many scenarios as you want.
+But one Scenario can have one action defined by the keywords given or when, the most common options for this are:
+
+ - **Given s2i build {app_git_repo}**
+ - **When container is ready**
+ - **When container is started with env** \
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| variable&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| value |\
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| JBPM_LOOP_LEVEL_DISABLED&nbsp;&nbsp;&nbsp;| true &nbsp;&nbsp;| \
+ In this test, we can specify any valid environment variable or a set of them.
+ - **When container is started with args**: Most useful when you want to pass some docker argument, i.e. memory limit for the container.
+
+The **Then** clause is used to do your validations, test something, looking for a keyword in the logs, etc. 
+If you need to validate more than one thing you can add a new line with the **And** keyword, like this example:
+
+```bash
+Scenario test my cool feature - it should print Hello and World on logs
+  	  Given/when image is built/container is ready
+	  Then container log should contain Hello
+	   And container log should contain World
+	   And container log should not contain World!!
+	   And file /opt/eap/standalone/deployments/bar.jar should not exist
+```
+
+The most common sentences are:
+
+ - **Then/And file {file} should exist**
+ - **Then/And file {file} should not exist**
+ - **Then/And s2i build log should not contain {string}**
+ - **Then/And run {bash command} in container and check its output for {command_output}**
+ - **Then/And container log should contain {string}**
+ - **Then/And container log should not contain {string}**
+
+
+CeKit allow us to use tags, it is very useful to segregate tests, if we want to run only the tests for the 
+given image, we need to annotate the test specific or the entire feature with the image name, for example, 
+we have the common tests that needs to run against almost all images, instead to add the same tests for every 
+image feature, we create a common feature and annotate it with the images we want that
+specific test or feature to run, a example can be found on [this common test](tests/features/common.feature)
+For example, suppose you are working on a new feature and add tests to cover your changes. You don't want to run all existing tests, 
+this can be easily done by adding the **@wip** tag on the behave test that you are creating.
+
+All images have already test feature files. If a new image is being created, a new feature file will need to be created
+and the very first line of this file would need to contain a tag with the image name.
+
+For example, if we are creating a new image called quay.io/kiegroup/kogito-moon-service, we would have a feature called
+**kogito-moon-service.feature** under the **tests/features** directory and this file will looks like with the following
+example:
+
+```text
+@quay.io/kiegroup/kogito-data-index
+Feature: Kogito-data-index feature.
+    ...
+    Scenarios......
+```
+
+For a complete list of all available sentences, please refer the CeKit source code:
+https://github.com/cekit/behave-test-steps/tree/v1/steps
+
+
+#### Bats tests
+
+What is Bats tests ? 
+From Google: Bats is a TAP-compliant testing framework for Bash.
+It provides a simple way to verify that the UNIX programs you write behave as expected.  
+A Bats test file is a Bash script with special syntax for defining test cases.  
+Under the hood, each test case is just a function with a description.
+
+##### Running Bats tests
+
+To run the bats tests, we need to specify which module and test we want to run.  
+As an example, let's execute the tests from the [kogito-s2i-core](modules/kogito-s2i-core) module:
+
+```bash
+ $ bats modules/kogito-s2i-core/tests/bats/s2i-core.bats 
+ ✓ test manage_incremental_builds
+ ✓ test assemble_runtime no binaries
+ ✓ test assemble_runtime with binaries binaries
+ ✓ test assemble_runtime with binaries binaries and metadata
+ ✓ test runtime_assemble
+ ✓ test runtime_assemble with binary builds
+ ✓ test runtime_assemble with binary builds entire target!
+ ✓ test handle_image_metadata_json no metadata
+ ✓ test handle_image_metadata_json with metadata
+ ✓ test copy_kogito_app default java build no jar file present
+ ✓ test copy_kogito_app default java build jar file present
+ ✓ test copy_kogito_app default quarkus java build no jar file present
+ ✓ test copy_kogito_app default quarkus java build uberJar runner file present
+ ✓ test copy_kogito_app default quarkus native builds file present
+ ✓ build_kogito_app only checks if it will generate the project in case there's no pom.xml
+ ✓ build_kogito_app only checks if it will a build will be triggered if a pom is found
+
+16 tests, 0 failures
+```
+
+##### Writing Bats tests
+
+The best way to start to interact with Bats tests is take a look on its [documentation](https://github.com/sstephenson/bats) 
+and after use the existing ones as example.
+
+[Here](modules/kogito-jobs-service/tests/bats) you can find a basic example about how our Bats tests
+are structured.
+
+
+### Reporting new issues
+
+For the Kogito Images, we use the [Jira issue tracker](https://issues.redhat.com/projects/KOGITO) under the **KOGITO** project.
+And to specify that the issue is specific to the Kogito images, there is a component called **Image** that 
+should be added for any issue related to this repository.
+
+When submitting the Pull Request with the fix for the reported issue, and for a better readability, we use the following pattern:
+
+
+- Pull Requests targeting only master branch:  
+```text
+[KOGITO-XXXX] - Description of the Issue
+```
+
+- But if the Pull Request also needs to be part of a different branch/version and is cherry picked from master: 
+```text
+Master PR:
+[master][KOGITO-XXXX] - Description of the Issue
+
+0.9.x PR cherry picker from master:
+[0.9.x][KOGITO-XXXX] - Description of the Issue
+```
diff --git a/docsimg/kogito.png b/docsimg/kogito.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f5fead8a8fa855ad04b64b8519002f0747d87c2
GIT binary patch
literal 33218
zcmXtAby!s2)4#hkNC?ucAOaF1-67H;Eg>i%(%rF3tE99_N=TQ|u?s37C?K$Ohjd8S
z?!FhkzxNM?=kc65bLLEbX0C5^wN*%o8HfP@AXQU+qz3?a;I9xTLVWN?a@MUM;141<
z)u)~SKtg%-2QoAhatQ!zfZ8Jk1Ha6z8InwM!}q&r)CR6#qBiagcJ>(}%|?zvtvA!}
z-+C~bk=Y9f9xi+rzH@s~l_xBgC5pY6Ng$jnGV|xDWWd^u?go1L==iE(76lFw!Z0B%
zC~ng*5pFEL64xWa#ls7K9>-|)s&)g^>}IVmx;;ndrJEs_Mfwb?1#|IqU|3jMy4=ZO
zgXew<ETplav1>yNI&YzG{Jd1JG%Lp+WE}uH-<bg8BZi6OXp$q=vt62{m=p#*^$Ha1
z*%Ng&c|q}MGbZ77O8M#!&BPVzB}V827PN0j>_v+<_E+D)1w+Uz<cf+LuMtqJ1b0E(
zeMMH$a1!Ahv4$zI0V4Rps3iI7;*<@>9lrL?%^O#1;TGO_aLHRHl_{n#rZdWW-*$AY
zA&5xfHcyGq?+O)!BX7$MU#$bi^*ygyo8L8E!f%MRN(`|^e&-1|REC-322;JuS?zRl
zt+5NM!nt1UT`UQV$Y7Rn0zSH1i;Eh#u#Zl?Cc^)dcnD<QTaJMu{=#!e>~RLwMA)v^
z|19MJoHls8HY)<yqY0KKbe}wEG$IIh>^=)%6Y&}p^B{4Z&dzLC6`5BIk-fg8YJUVI
zmkjG7>e3VCO+EFRUOFsyoo9OV=9I5eWlsey`+tOq7{q{Iey3vDl;JA#8p=7c={ORK
zN`!=0r^+jK-2fQHFB$tJEjY)O?u8bJcvDLjVzbE5L(Rcr_7U)_RRD+82%zgKVxGL1
z4Xan9GqG`4=hw1`ELN{DH85y@x^Aqi?oD+br*`gJ@7a32Ll;p4Mb^=8^Q8$BaixhV
zQWPsK^s;#AQ;nxd8q}bgJzBi~UI>bMQ>Sh2B_syFD2on^$;z8kyWXs5iwl>`XiPIM
zzdQ7>T8g(LwNlfp82dGFO^y~XTraZu<(2ZBzD*fYaA2i|iCiE-!3)@)&|mF_vu)i3
zHYze5OVmsI63HO?^m=PnrDo9~>_)IOFSq);6*3E;^633*=xl_b#s#O%%56VNT%SAm
z7$07n>P@7heZMa%Fy@Ew^b_WDYCUnk7vW?$`VSK$b1EL0Kbq6JUhL2y1&mC|HtaLq
zeSrecm-;SMR3_c>P}olqzxHrVP_RegW(4d_9x=r=SCR(!a3>wjQSWbUKUVUl-xpOX
zekMcH(2Kq7=3&OgAAXp)C*Xbv#l2db`#2Rc&lXNZx$52bsd6J_-qk<6t)7z^H(-W;
z610tqd5t(m3YBV9-8Cl>rA)wvbKbx|9!_oi@cUjfpS1~Kc<9gX2%1%^kSnrb@)qv?
zE$%pr3=BJb+AB~0J0rmLkLAQq&zH(yc63%X^^Fxu(FGq4Op7Ga%UE2~Hb#po!@iV0
zU`7g+cgFuMs_g8%FDrO`oYNa9(kJ`5<D?f%xr}3eXsVG2qxpoQarB9w!Lms8+Y{dF
zWe)PdT9=0fb(%QQSB~){cnnKCm4m+e%*=@4+VIpY)n}Z?Q6b|$E~u|pi@b&+MYDy=
zK6o3Nyx`Csp?bOd_o(c>recV8y@na#ORC_k2RytBeAkPg9??8|YL~`Qhc-C*!dNhL
zUvz>$YrNj74fRoQR5l8Jy+}8_;h&9!VeFUSC$46xrHEGdI~%A^4R~|KT=)pRRmVGd
zBOXim<MKUMz7&uroqbV8Yg*XfRI#x!tZlHH<zM}wZq8=u7=OrUSJ)JNGD?Yg`bGGq
z$o&3emP_|7$i*&3A{|S9eOBim(6ilN7^?mq$dNa9FxMKAP{%s^Fqg&uum4eJAHs0c
z@;okJP0Va$G)pQD@lio(=v(=u`a_GSqxl!39dV4H_8aQBxNPvK8m=mJk<xR>^&J!m
zmnHx0H~K;r6zw3_YMABst96F_@J&bhh}u|XHRg--w3(9-&9x^$7H2v^LY`lc9ig&O
z8>Ks956e%o(s;2Y919&^1`q{1!OLnOA7-d;h}lmpll!&*b_>nFRMLDDv>HOalF>Zz
zb}0$jkpj60Hw-$^B*P@Wol*L5qOZd2Q7w5ss5J7g`<MQO*sf!cMWMjV(CY0TOS|&x
zo5LSSlmNGe?`rAk1fyNKZcse-#D3E$?a)FPCCHwHolksWL?ur}_2#|kWtN&YGnX1w
z8pPo=q7y@MmW*z(?C>4O9myPxZheen)O%FFTdz5x^E<~s(NxebP4c)$3AIr1aN}G;
zW?h3f&YMIXw4F!z4c7+`5`H2^de<{<Y8VcB&oyfWqu<8FPTjq2c7wNp{_$g%JD8tE
zv~g8L83u9m?D%FO;kQvA8v5Xgf9i2J$9P0gFv?EWz<EeZ!)`s37yL;iV>b#b{8IbF
zSBFxeYnj4n@ZgRXnxn1j9o`$s;Q}Z_3*irM>Tg!f9rD&apE}lUxVc&w;MCYKPQ|zO
z%tJ;~g0x=`J?Ry{Hbb{HpAb;L+vUDV4%-ldvwrcQx#l_J6Cbj_{$p>%;8c~^+miC+
z?Kh4&bOr*Ke;e4H@65_jJUYqTbX-=e<*wFtC3?o#J5NsE>pmSy&^6o6IL4lCzP-P?
zE&~cdq>Ja8Af4eYpq{5Nn{k`OX$`S;=kZE5xd3@vX$WR7xxL}$Truwly&09t&>QO&
zQ?*B8yBp6{rhHci#C4fP0$(mp`7R|w<Y4Ih7K`APyoK3C1MB~cF}8#WD7Bc<A+XT;
zn7aMOcg8KXh9%5(+9&$_JL1^$JKH_Ei)q{Z<Bmfu#Y4Ha%LD$q*vCesCp0Z_hSz)v
z7Bv`5&pTy=8ce7S(tOewkSb%+h31`(xH~IE!Cw6E4Vf3Z)DQS5eZ9I^!4@yqscdRv
z<7e`$?Evf`z*+`(NMNr(pki741G0u-tEy<b&e*@STzqBipHgX_G3+x-@J{4Dj9?`C
z!K>P%laeZI1q#A)loTqZ612n1k64LX0PVTv+O&Z#YAuLS0L2fU!jYtZ7)3pf)3cAM
z4W$Cld=%WO5)I7wBsSdYHfp$Hrx@PfaC`Thit>;X1>@iNc2EB!=dHuR@CUDQf(N)k
z&KETr#09#{T>hu~MB9~sK}#uMb|g>CmHbMn(q(^e>c05?d1l}^)6r@-a|OTOT#5Eh
zw)AepjC)Qq_MaVtEIgICFZ5&OgHffuZ-Mv*-Mugmf1P5?b<&Wl9f%8eFebcbC_2_0
zpjbFmx%xqeZj;?jdPbN|Z~cV!Gt27zLq?5T__N2z$*A%hH*8IhUuh%u%PK9C$#0y{
ztYZnTL@Lkxm;@-KozE@fk^gs^jxlAPmHcKxuCSwTsY~wcFVS<6#!+(IvK5hOI{l7(
zzb-Mvvv%d{lTxS>S(l7vFF*K{v<zj}kCV&u7%29MgwLp#fHr#nT}cb54u*+U8POH-
z+R7bswIl;X^<(CoCB!K|zwols^=ut)B{p=$DDgK<9_^)_fJ}|i{XZ#J`t2Anu*wX1
z_BD1;PN?5gFneu7Qe<Fl8yBHzoa6IC;#HEueS1P|#I#Nm!UG}aZT`_ckS0R<R0;n?
zoD6Gp6LW2w6a&SO+)?Lp6R#s*EZ=zgzGJ!oKf%kV>>W=h!w~P5Ltvmc=$+~=w0myU
zGoMh_OpAB+s^DCYM}XOSU*P&)58~*7jna=v?%|w6b~*tuk*b|{OM2C%CLGXT1}u!o
z`iB@U<2ca7u84MBmW&6Eh@V~C_MYgoUGifV%ae*JbJv!3m&OM1SLM(vdhidi^ninQ
z8Bm4zVo)hW{La8u&D)4U?P$@sKSZZ#VDU}&FO3!JjMq-6XBWOXysnPgyb}&A8zYwV
zogTyCo3Y+8Q7L-LV+mB()b4{h+XzamEEbgb><giJb^~@}ySPI0Bj1@?tA^CO+#BTg
z4CC!d961Zn(~H{HGPiQj-7ueE9b(Ws7{~r+g}Ptdagb}_jg?*QiUF~arg-;IPwh9v
zXbsUnMJFELHjMWTaerDG716`-SJ#q@esK7td^oF-@sREIwS*GkL^$#mkxNdz*@tv3
zi<=E}n|Y`E-I&{_p=?7WI;Harc^j_x|0E{PCIpF7SEU>9M{Pu*<a~k$GV58cDX?vp
zmH-Blz_eAlX)S1ABWQ9t`el6qLsPv9YMv6^lxKcVw~vg=NM?OYHxP@9xed55&wtUe
zb-F!P**Q)De^%PK*CCJoqs4BB2X7{JYjO`)Hpc2(R#(*+I7W)Q8{u2^Jen@oJk?VF
z%4rhi6!923rAq+oF$$vpwPez9vUF7#0c?(?6@WoASNfL+xq99lZQY90dZ;ufcXTwl
z4{lrBh!~M_VCC5(UHz~X?_|D}yrfWRp^WZ4Lr|J^9kT4#926L!Ai00PO0FiEwcC|P
z-cAW+qrCl-W(@RheT}4diPSjnlPdIt%N3mK;O~nIFE{tnUG0NEexeT)2YO0OQQbqS
z429n}XeS8k5w#)0uALY&5@}orT)aLR<6nNOMgRQ{jz1F**$GWnJi|5Hxlcw+A;so8
zYnQunr|wM*+>d0zy}Be(!6Q06;+)b))KJU}!7RwlBA6HShWjy1&U*}rU$Yxm^cT=I
zUY~w7ZS}^0T}_}?_l%D4_Cn5$I;(LNY0B(#Ldcxd!Ti40qOQd;!o@v!AZ=4Y>3S<N
zEPw|{-9d@il$+je>nY&jHsCL7BE%-G+`%<JGmeP^A84ML9=S9qDPwhAM*t>z#z1kI
zcc$}1G7l0=5$wvN6-%26O8Z1R<)qA`;6jn&BOR=Z8@rf~H80-}cPL&TB>X9W7vRJ-
zuMG5+V3+w>Ajxe|U)D^B-SW5z?KS#mOPg&C(!t-6{<>nDeo|CGKyq#VK+G)7K~5UQ
z-b-s#5~C5eQM#4=ksgW@WidAA30pjg-y4X#hr4w;*-);DOs!bVYmX9orGmdB{?{v)
zqLwp#_tlAv^vm24#GpxpK06bE;TrwDqv4G!mY#`_l9P9zW3(*rO6GquikS>uydx)&
zl2=enIUWd7YpV{9b~kGy#7?(h7r3a%A+|B67GmbM<<X0-Mzao_tt{Q83$wQ&Y#V8P
zzN)7_4Fh&=xg&En_dDsCF+U|#J&^<FrJ;IqyWZegdzCwUNa{33UYg*)$E^5)BdV(D
z%kmTx@y+|zFoo0A3<GG$>LLjxx`>?|lL(O#dexoB9)N|s4&S><JBzip0Ns;4Q|GG(
z9t*DPo@gk0Z@{Hq)zHXsnY>+0`M5)7!U03hx}~~&p?+ius-_JxK8|l->E4EdBB1*v
zB?4APgas*4ByoW6z3GrGFc<9V-{Sn*hS!$T3~v0)jejA>E<M}VsHw`@TyEm<Q}a=@
z9O?dpULQO9>ZQS`TZfxaieiw?=9)VgYvF?&lmMu{1gUys^kOErQR=+y2jTPCn(y^8
zAF<X|WumjKE|^3=fRQ)U)MI3!hV{s{Aw;fc@O%Td@o@CMnf4JYJYadBSwB@Tn41tw
zLzZ&xp94lldEKN^(0ohndQ9pbg^8|P&=3>(@;9vn*6hYbXc>D82#qf242b01Be#B|
zq_}y2s1_<VegbtY(e^49o;I_gybJ%ZzNf>3HHC&86JB4r{5w?M0=4AD_WF>Y<Oj7S
zg7bLPlIT5$lcJvu<(EU-Sf$ST#B<}jH%-QR)-Q12PQ`@SNoa_C1Pl}yp=lB|oDxdo
zoglzf;QQX-!P#B(%;NErWH&X%yAf)4AN1*_HDb<HeA6#>&W_`zc2o<DZApzbLlppB
zkxn^~0vr7seE5gqP&To0Oij(-Bqww##>HK&k%OJ8lT+zwQpSy-2|3J{n!o26=v_HC
zjOWr}Fhu_Rzxel4O&Va@;p=Umz6xKp6?&!bgPKmu=6FtgW0ayo1pkRK+X%T$=dppY
zzDb&Il9oP~>LjD$Ph5a51z^C*xiE)+%|wCnBE$-;{In;{z|h`|(YEtnVzJqDo%{07
zBMz*DZlG1)S6Q@+AL~-kzgV*7t-jH(_Cn7)Zqfp#1eA=?`kitq4M<+AP$ErzJs_1e
z#MSo8+}MD#=E!$6BpKCE`F75j%;l%ib}H*d%(#+5kQ3gqusGKoSOW?hL9A{y1x0I;
z418?BwN^F8RID6by|pO^1F*3nC(zbzBrB*(wqmaKVslrF7WTRw#?5I~FL#lx|6;~}
zf_Te=r~1aPH&W$yqdrx+-e8mQI&I*Xm(n~1Qy{p3dNWkF69GC12+>mI#i+A(dpa(+
zdjsZK@Z_6~;Lj_u-UZQ4GiiL&?m=fefqhdR7JJfyp9@RM2A#{H@W)p~fbnD#VC~Df
zz*T@QkLK31_4~;;_i)sa9lg}<H-Trg%Qc+{5~zo2xCKvOn}3+-d^jvi36;p^Tdl?w
zWVn_wvXX-rXbCpN8k)BKUF|YWvI#3aWGYXOP;N6GJQ3jSMFRrjVx#%*thAw$A2Da2
z$)omSHK^wmt*Pae?p$7_g<Bdzz@ZVEYf3OsZvVN+wAok5Ct`1iN{7UD_D1QuB!@P`
zPO=yRdH3vGuz4t!v<6E{U9<Lo%15B->s}SI?k!4AIQZ3!3#=fu`Ny}f9zAd7XxWlo
zp=-(VeAA<mojumsy}_XuT}Q9mnbT+%T3BjOs^OgE@B@r)8Z+MC3`?=K2`LSq0;?Z2
zkN|`89%u18$Zv8_*seH~r{OS!tbHw238N{oNn-nEC}J_q;^2{Ej6uDyW}Zm=Ze&%$
z?=3>{2!HU#w3n7YT^vD{Y&$pHZEbJ&FVZq8245X5b6wITDyreZ`(+0;5=UV_eyph9
zO}B}8$&{XzXuav$#aTmr`UQJB(Dgw}DE4uuS2rOLivQnBHPT7}UQK8*Vyw3G%WU_L
zTCgwsqbA{U8Rt{ti!OLOfj+wEy=;i}%w3{k=4kj<I03`0|D>TpNe%BW3b=B#nb9zz
zjOQyj|Df+dbtSPTo!~GFwH?%8GKQVZWy*<BLPJ)zPUtr41xe{%NnbkxxLgSlP-y)A
zkk50w*>$F<erNjWi7y(gbNZDuPC3J$Eox2%zv}DTU~HIqUOq*05;FE0pm@dh-)2iS
zT=;gEdgse+v8Q}3drYf3DK~5y!FsbRpw5POt&TQl_1xtSFb3mz_OWGi_kL=bj)kXq
zao70;K3ouVlO)%s2OyFNfr=As%lWS$f5$>c%jQCXQQu3})y##JkZ*D&=P4Tl0crz3
zsprl@54zdI9nzS*8*5w?TJ5<3J@)k7#A>-&0sV{ra%;BD7kF^~b3Zle8GpMhr}C-0
z;dDka$B$;_l<W1HvkhXaRgdg4!2~dHNQHX7Fh*N!^nS4%GhQOG<fU1DiUZjxM*VaQ
zG$Bya=#wAe<r=QCh<0mG&ybeEoXSy)y~=it?R|u?ObvQ?rUL6S>-ogGrL?vlb<SYK
zEd@ejZ(pl?C#4wh^%=x(@n$rGW4+qZoQ`Ol$%*efz7$#fG&X5HJO(b!14BGNht2!e
zzoAfhw(x7O4&TGIgp7wYUc|C#ALTfmT~06h;jkt0jpbl5&8!IqkZ1pn%woN#;y=hF
z=Tpf4{%?~Y9xKr6^C*4M2y5Y^SShUvd95l^d>B!le)uWn%?N)TlNV6M3jY8~yyE)d
z<TJv^0gD(jbi-DsXRNo?iX~tC5!3f9Rpxt}e7Hd4yFOn{)Nsi4>%f7VfYEC+^vT3Y
z=Ax|?Q74yS-VkH$Gd;Yud|Ea@^HDU+5t_5prp;|AXar_AaC`;8gkAe+t{i>03@lve
zH|058Tvb`ALirefP2xZqwBB|iB5?{a#<6CgjN$k<gMhWt4Q`jCIh5VsIFVevX&!k?
zaP@5fS1<NDQBX~2hz!wzftbJwJ8^yR0TvTDGpA6B<(JvLZ_P}%4i-;FbBN1>mG$<z
zB*Yy<xMk}WbaP;{EkWA893me95`l}Yfa>NA+br((w)O784_*kYz<dEysDVf~p#KLc
zP=Rn)qj)X_q!5(_4~$}Ui!n-d1u6xaZ`(217n=e71;o1ezsGk(nnH%FVnqPmD><gD
zub&KA)(3{MoA90Mv@h;f8mS-MNI8Efu}&_ZvFHK;%ZOv_KDRZWz5CsAJ#@6G8k~zN
zf0Nx1epODRR?X|_yNSM+fgaJ^8vPNd&Wi?F9V}i}G~u6nVxTVbImJ{`;Z%&qo&^@j
zKUeeEm>dfC?jV4JVe#n<wz_TmHKk8a1S;Uk73rf{nAG2%=9~u5(C8i2YMBKcl)8xF
z^Wep0&XqL4@DBi^pbBK2KinINXpaucXf-2v3s@PJ18$8CYX!a?Vn%be<(!=THlVZA
zt<niu8`#9O2sq8<xu6$x;*JW&$>{3pK$5xZd#-B8lPCQ5y{N!?)~RPjDoq3REQ=aO
z_4GrZZ#l|Y6hOY^h=Qj)7M9S;G+0CbkijtufT-)#1vHgolGT6YBs?LKm_<f8SG5(5
zA`Tg?gN1cm7<r;KP)Tp<WyXR&?R0zooh!d*>}Rw&j&p20d^}lJS|w}0<7CYzw6c9s
zoKG(E-GsKA_2EDOOvdoR&Bob{VOZ;?tarzSw#ewxxx>K5hxkxB(81nPQ#<8Kg|&jH
z8|CWSN$%INd#*%(U(f)Ipw}52Cj)+PHU#NZXo+W@bvgTvh{PG9bkQf@0*`OdsYH1T
zw6+?`$bAh?sEZEyQn+)mq9@UM-YGZ21RbTqaJMnHnu1y7ix&eCt)mA;TmE^wiGR@}
z<>=4bn7KPjKkR>Blu{+Ux4Se;m2GI$uQ;DJjy-bdSxT<>M-`l4+9Q~Gm9W0R&f>0N
z2?}sQho1XR0wa_0lR`IunIXodocZ1nt#q&}n>grbwY3`ydDh=n&FT66n0VC=7V@#R
zrdc>AlV<4Oy=Hxu7hmkeb}&+PMt=$|D%h>s7IJj<0~o5-izat;ZC{JqR;f8)eueu~
zF=BmEZ5)I2Ai1sl7M2%jee>_hH{^*az?Wor%0KsKd*LKE0<J7$A<p|MlN>kK-p^0`
zxb4*j&v&d!=`Fh{d(M(yn<i&EU6NaE{Ps7niVZ7_ma!Jpn+x7g#Xv|`%qWy$?Tx?h
zMNmH&7PY!wM6E?FtBFW7go4U#r3Ic)DquRbc4iz$4%*5^?H=*!K6C$m*iChu!jPi-
zIHuFw$ako&x14(Jqv%N3y=WTu%YzT+Wmv1X&(dosFcbf_r<O>2-Z>*!p3&B0p`pXn
z<e)XeAJ<P?pMLhDW&=3xmH>n6sYFB{C*=+}^AXSLIATkEPoZ6+Mue)Tb^}@`=++&W
zS%6ixS4H|*VYdl{;s!HjhG~yi5low^)s3-dE}?%u!MJebZztUVqGJtX3S2)pEu<pX
zF%OEC;yGPVx4J}ya5*l&XoQeCkaoI)_JLYA4lxW~w7dwu@$ua@BIp$XG&O8b=hl_k
zr9}#fe;PJ{z$G~!;64JuDNFkep2M?7_1mGzmlDTtG^(WH%g9B%tG*}s`#dt&teWmI
zHP!u|hXZ9fGDn#kfj)z$zKL6ox5E|Mea>EV$`SBij#g|;i;x#nC5Rh<P`$$q{CCdn
z<mi2R?>TFolBpcO$&*BeQY>7)kmIuD73k+K2mxfhZdikIQ&9KFeJx!4d7aykT%*IM
zclp?pFPpA{wzFFm)30aeV$ug>s??UZA_!c-SWifGm1nf9Z6o*~GR)hDgZPON1@!=L
zTSb-4H24p<3QaRsp@bw?s{&t<ZmnCr<%2)spaC5E;;4afLv%OCLpH&tAeBJk5YelM
z!e4jbgwyls5e^bWY#B-cNNm`K9GjrzW%AtAZwNy4%Cn9Y?Z<*^3U~oSd8%X}BJ^s-
zf1%47tQ|($09Rob&{Gl{U?B^tYNx(;z~hlr{bmpwy(E1&FW*@Hu+oR@6rxq_kYEsF
zbsW+b@f-qSCZUxIn1PBmi_mDd=l;lQUqdC#yIFGc=b6JM>&LFM4V%pR0d4Q8o8+b3
zu7O(4f!3@?Yh?r@hr6=X+ss|2h254@Dx~Ot6<z0}*r1r^)jG8<$rrrfi=I)C<K6}f
zldIymg$MxJ%U9kLBq|$0<x7si$L=xcXo+KF9PAm~i3qlwS%M8rZ+eS3R?ThKh&t|W
zI~>nGHxK%N*nR2UEp01<TYdu@af!VbQEpUWDfcd}O2<&3wSA7o@~Dsbw}YAT>qc~f
zt6@T0{lE@ZE2HrvNB<0%eG2H^!u)H80DJa=)poGB8YtjhZ3r=8AsiYpY}DrVu5h<j
z*9zRMmUP~oOWzGTFvAwdkFVCvkS|AYBWBQZB*!zgQr~-tr`YFv_5^NGcE;a$;Ydoa
z67@RO@NFvfo0Hb|^kg25=w`6Zl9we9A>~fr%}@s|2KgN{^l(tGqToJXp1dPuyEzJ#
zuj9ovpB*tYDNgBS6f1f(uths^Hk>p6>I)q-iUGrEYxCMf3x0aG>ao#hRz$za?Xh&#
z1N}`7^blXw9S(O_Ycz2DCXL8b&ezpIlA=XG0>{C79uRo=Zx)~p7^5%aW}}8hzyc?!
zp_Kx1Vro4Br^Zz~^aDi)@w>GFjSZ?;el~!5!O{#_MF46DoA3|$9dg<c2uD`{Q2ZI@
zvk_udG9+Rvr80Rhi5NnJ?Yc`HzJFOTD0z;7JijUpa%F2tO+r-sL(WA7Z?eiKnHvB+
zGXzf0Cl!$~WRtJTpQksnvn|Yh@6V|hIcyP6ihz-LuaP73uONjh%ZHfloE`8Y?m#$t
z)vjS^$KhL0mIv!`9zBsYC`KqH#&Go)+EVq~Of2YtLsd0SKM#P~Lzq+vJ*4iO5!c<Y
zI~RaIk{|(4AK9$}83Ld_wde+(x+r)A45jf$bRHD}lcyWHh50kW1W+`G>LCv2Tl)Xa
zq!9a`+vBKa4g<Q|P0Wop({zdC%#Ga3Ewm{PO7fkE$wDi}YR!vnj!T@dC*WTIn*^AW
zt&m+n^w`Of46Bgbp>PEd=_Zje*D867`_u_r@%s^YQ_EoJEdG77Gl3VA0u=G)?Me)h
z0z{{r>>!1Lq@AaM?^Z6_Kg=ZqPWzO=V{pHR$cl{6LQmtLJ4M)0yK;)ey{eE<7o4<>
znPU)U(*FsUzlu9n>DfJj<%I*4W27nPQfD$m$h%dL+^a|Z6AS?@{c!o0y+E{wv7Vg`
z;o6-`Gwg;}-F94X>`~+L+~uD>&nyH7#2F{86k)5^R@ShOLkL`XBNs5d<Yym`aSBiC
z@t3ofHPGY04QFxWkN&1vO{j}^`?|^#Rrb$fpIS4cVib{{T!<acODWJ7Y_xVKXb9t`
zz%($w$)%-Kf_)Dby0%5L#xEH^&$-?hIw|mOY%pO$zXW6p*e;XFRSbjyKu9U%^E$H9
zkRbHP0Jpd4C=j#>67OO{V6=^|;IlXb1!#qd82EnC2eI~^TF<-K{-cIp97GUTnO<ks
zANMY&&b#k=4>%_GhFVZUY;IwGBDkBy`gyR}gU@o$gDOb(%|W#xJUZ1DkgN3YsLgyU
z$0p59gk26N-DL&fzy8oREI-`bH*e3kAm4p8)-nIeX7yu4uw$bjJ~BENihMmwb6+91
zHB{Z!>a$+y#Hk{Qb`Hbkh+*s}q01PKo6z_h*xQv#$P;Z$RzT3|E$f*ib{Vy=(evbl
z`d}^!x>yxMP)QCBccnsBA%v!h5G$L;hI_7`X23Cu63N7B%=6XnFN?56zh5m_a%dBZ
z8=ca+(?iuQdsEG_aN&L9e@P<vz*0>uf*0DJ{GTVc3R{DS-(0_0obo}kBmKu+9A29Z
zo+0bjJpsx{c-<jx=Do`pRl>DTT=Qzb1?U~qOt2C-x^mZnT3_`V-@v^`4auz^G*KJp
zPWEkt85Em|ELaw#QB+Uv2`t{mP1#VUFI|Km<vawAt~3+?bgOb30F|rJ8~y+wTaa^l
z199bCPsp{5<>q9S+p0a2&N1<AaaB(O-u|->#6DxL8*p6dzLRRr|9P)jPvexf<fW8b
z#e(JcA3pO`$HCse#$*(>>k$z6<bTN4>pLJvWxAaUqJ5>RYbR}%4aH{l+7$uNa@-e`
zl&RsL_=Z#TJVzF}rFy?<VS=!6*7%n8dOD}H^a8l$VwW-FWDuQ<eX~MQR;zNZ@~2SW
zC>XGys&LBH{9iHVR%lC7edPS6woNF-O*0I^n-kI?x%kevq)d!e*ZWi~&8%LFKU!Z!
zHYmxorlz9knP1);Dva{uDKe%j>eFOFVAP8f(HO_SfqOfBcTH2_)c22k31Ywm4-^kY
z>{nd)C@)|eSm>JCkrVf(it>Y6ZpJ8^;F~=GJ$mR}YK*c|6g>VMs3oN%l;@vgmy3}J
zMbJ=UB12fOYQL!TG(ga`oMWr_=ahw9kxWqFFw}d<T7tJ@P8FQ6a6|vwXg4N%;6jd~
z6=g|NJ*9o4h~)T&=&99uSb<v}ALam+M?Pf6RJi}aiv9=jv2lW>>c?i{_d8fF_CI(D
zS)XK&77rhNt8nNUU3{4R;j=8(ynp?qVoYq6w0QV<;{6(eyTft_Y!kd_vYrj#HS6sQ
z2DZPjG~&?x2Oq%;3iF_Y0dhh_sX>R>WWI`8=CKZ&G528qK4I_U{LiTkY|)y}?$FP^
z^CHYBxOe#x49dLN_A*&GSm2)nP?jr)1pw9Tq>$VrVr2e_&ycY*`OqEyk`N!YL>}>p
zu={y7J&I%y=V;hXm4qy3B;5L1-vOsQs4lnnWyn;l$VU+1R=AlL0lV2GN2yK;9ql(f
z<<frN`px7EoLC;22Zj$Z%IkC1Z+TtMY{``Hb&(Q%lslugOW-EPDk>A2NTo02h%aty
zL*;n@h>FJ<*_p)^q}kw*J7RfViUS3TYt(RUMMC3_IL&ENiOU!YsL_D;>E~&@Q9emH
zfz>-Q>}X@-ICXdgY=-FyFq997WC2X)qWpGj#L!p{O{v`pIgwE%>PYwveEN?GdpZ&~
z$|vw|j2qs>)ZtwkTvdM{Oft9!nJ-s64$pUX-O87h5f^C8hEct{xTyJ@z(0pgJR^hz
zM}o5G5SfBQG_Il|05p#5nZXmLS4F_uILE)JLfTd=4(xh{xGC(NOxqH!NnPs4hdF}x
zlKS6z8mB8Uyz>4-f$sUKbOl4Mb@NT#oeH5ds+g86ycAbly$ucnUQ#`r!G#+DP@?~!
z$9bh5Py(e1G+Qk{Of=pe4w%*37sW(BpE(x8a8RG<D<WaiTQ{v`xUns^gMr{1fW~M2
zI}Dr`g0izEmbW9nA-w<dR>u)cfGIgk!3PcK9kY5wjq%1gChqb1?_jUL`T5h7EbGSi
zf=Qguas+<g_{6nX-qyhAm_`Be@pDBgAVu#Co-^R>guaq-ZAl&ua`+h2Rs;61Z?%Lp
zw-GDRa&VykwuTx^8x#HQ54;pFL({CxrR^?A;byj-@OFLRjDW~Pui@d<S|$t_B(vI@
zuEglZwG0dfq(;Oj5cj>T(vSJPB{({~Sl^`cv?59KZ4Bs1)d|;LZ9Jfc%WM9pgh3=i
zS5tc8C6XS(stV|tyiM~+kvGlj^S?KiO9lvFau!jrcNB_9d)G4^P!NfMsgREUL`e~*
z%L`-~F#iTKSL@$VuLL8VK5NDF6*+4t&&jcZF433Jud}_1!BMo4csaEEKZi^4wgK;4
zU7U#N<@S-3^>3Q>37_uPqm6Q|RRTG>N1X^pvWv(X7KR)!Xb?kOr4~C3oKh>3FQqHh
zR%8gIK^lvFD^ffI1dcLdOe3&ftc>mkt8hD%PU)(QOmRRps6X!<`GXi@+bwaF*a5o|
zSJlm1XibUttr&M%UG@=RPz^8ln_8)@(5>Zof1b6g48*5h5t)Ct?_VIi#sv}#K!zo)
zmBC}0amcYzgjfn<=6&VoeTu;zIer&!z!YcQ8s_{XI#eWx?v<0|n&TMklXVSe370af
zFXQ1q8s<Pp0(G=G=szoNFFTIye%n?<uo?#mh%5%5Q3uOb*Wc`q3n#g9VfxOkgZb{_
zYTga^a4!$%TiH6x)FWU=2RETRC!=z7*XmOA1QrT{$}g9q+$b;|jLh}-M_`jOhwq(7
zmHvKG@Ej|(IN>G6U%^2#biUu}U6GpPjqiv&&#10Y#!kr0>%ssFvBkzauki;dcxGer
zvAZ1D62bjo2}#y*!Np+zihpAImG*w(<?UWz*w!u_+3q5xx!jrYZ3^*gQG4zEGg;yY
z%^b+saOQ?S<Xd_3Bah_4Wf{k}XXcS`M$4Sic)w+fu4Yb8FtN+bxJ}pWu;!9*@>y7S
zW6oOR1qkc?%KF7-4z@%x$Gih1I})txFu<USV6qFhB>tEolV`+WPl|c_H{&&{%&HC<
ziv`*?a$m{j)1-*Jwcw`+vCkN2z-u#jmI32gb}ujFPld`%nURx|zOk!MZJeipP{uN>
z;YR6~6PVA}kKvR7r=OXOp^}wW&Q)t!!2E9(9oq;PlAoIEY~Sw5+nhAz^MSYE<AuFv
z=|mn5qBtW{f(M<3VQCws24~0#B|1X3I3W+&L34LmH_snu@;av9kQ6xbTtw)v4VRy5
z{)QXOWC^ZN92qnIE$#Mg4wmT8x@<n*m_B+|uQ;Z}b2pg`%K=yju9LsPv^*g^&Br^T
zYbYF748Bcll|JK|+1w1Gj-*<~D?Xp^yOpFx2=VfCB3~HsKx!Ys#<xa0EI*WLsSK9~
z{^b8-HuQ-+6L$~@D;kJt(GR)lc0Y9$r|hUnet^!Bu^_4fxbgF+evUDYevW`K&TO?U
zY!gQ@KI1Uze5ia?|H+Z@`iBXfvOr3vT(CE;`BK(q*ZGYxO~@hAlF^Y{g;n0_);W&d
z8sao20#?m#9jZ|`={0ZpYej0gbKFCb9^vKsGfbA|3ymx<`U@wzr1JNQlu=VLu~)0b
z!*RY3vQu$j5}l<LJJLee9LHFjCzHNQSo&5p#w_XR!p%!I@yE%+pA=pk&$IZI^Dpub
zNNMrIiLZ2ho74+QSHQ5BPq3Tcj$V}JRmjDK<;biVZ(OeHfRa*3(of0X)4^!5oB1RY
zLjqqS=C>r$c(hf5IS#sr2gg6jS7e0EneFG*Bv4SO*$+~o-|_H%HQJ<t)jLQQBz#*5
z)v?eq_4<|Sb((ql;B$jce$CgHr{;+F0}qac*Dm%{?+6Ux20!29>w0V1AF_~Hy<660
zN?72Ui5rTL{%g0w#{K45B<L>hVa;%y3r9eoXTd&y?g2Nhdbf}>G|&<Och7MJ<Ex`&
zE<tr4Z?g~^AD47+vnfgO$ILYlukuK}kO;1ws-|^TN#udI6!tzs2p~V*?0%jfvi8eN
z`tPX)#LB#tJV7lxW_7vg&%!G=#VP17wdA{@DY$C;Dn)Ixa>5qqpo?2aJ)40#CWUtm
zpQ~&ie2{$J%eztVH$79cz?)l}bN(usCWdTQ;QsPB{mjQCaSFV0v)?%T^J&-hvpb0(
zgqekwp>?r};mN%_)S-Cw_*^kdZU%oI7!P%uQ?A;Z@8JpZ@L)=53?0EqI%xO=1CuGx
zBar!|Cz0&T6LTo$n*63Qp}l$aa31f%<)`_$SXzK0@?R%HwT;~hCj$01N5_ghi+ju8
zXh&a2cf-<U8X61sTkfqT2Sd|0l!HSnH8gZ`2iJ@Cf8cM3Jmn>VvJOoR5I;ze00Z|{
z-Xio@o%BPIr#yW6hiASIBBX9j(#(rm<K-visz*f|VC+-Cq_WRv-T^$YVk(r8<5C|N
zj$}zII$Uo|<9k~i#l!`Ab5oh^_`NFGeFggpvMODIw%?jj71P?M#?&Q}^s)ZG+}jDP
z#LywNX?s;JzXKfhCMg2S@u>iCF#A+K?1Lc{6dZe1E+vI9-n*o_YSB~@<E*R5$;Yb2
z$APs{F_)#sb5U8M3YT<>n4Ff$wVwr!-pZV%V@wAbOX7G)yo}|#b@lB}0|%jrJOB~!
zB>kTvGN2RD^N8Il9L#C1sBy89UHCCSNU9{W__#<smdK}`D^$k5MqxUe?^1LwoVJ!x
zcJ$CFF>Vvm2%2j*NRkiLg3}sQNyZIun8?pOCV?zPz~0p;BJoMFw-jU&>HRHM@KV%Z
z3>HV-h9QBUdhb^mW0i{JDE{R=l=vN>s>;`9=}!(Y82rG?m}&y74Pz?ty=K!t0u=9`
zfI0e2Fx`)WlQLnrL$pIRpQ?*c9@4M|Tr_eTW5*%}N$zn3%>Pot)ip9V`<-Sbvp^+}
zvj~l)HEa{(;(iTOgZ<-Pfj|y+Vn{ME_VyD(zl-Tr28m03Fr|7w{EeW!%dlo8{TXbh
zZk-~LB4n&)JfEN+nXP=D!MGcK7eNlkF9@vkfOI7&^Eco|>p|8oiPw(h+EFG-qN;o8
zHm9`jDE79{IU=KsnqSDaAT~H?fH6gO0`ZYg_L;I-SPSD3(cskY(T(-G>MG~34gLOq
zaQu7$<n*u29mANin6Nxtcz@YjmOy7#Yf{yZT-ZHP){_h#c{a1j!=J1SxLg+<O-(mp
z_}-k83_QA7i~_hE04~ELWrQ3*GNR+BatG*6ack%QWj%w+hdc}2dOFl&s2cZ(Kr3@A
z+D`3GBwR9xf#dR^$Q&)x>ofnao&cxk^;;6b!wZsu-=fjs5tP7R5Y)^ATT`_q;*XUH
zh2RxwC4&^~xgj}Eza4w-nm%49>e&U@mWtc8BORTy$o;rkOGicw_x5A{UPv8_j@E9e
z2n-ndy3AODwWi+Lll~81^_dZK^&@0o$B(;YH?Zx}W-~{<!XgD15-ectxe;rRc*3O<
zJbQY6fAX}sA?7RYvAn3rW*!>}m~~X`G1w7sU6kBr&t<rGWLJATeNRAqKbwtJD8K#c
z#pt`v<V#H?SPAo>i6Jj&Dz323i$B971ld{nMlM-;WU?y>m%b-mPgkav9fuxu{<^~|
zTM~qIoe=duu|D5Vv)_pQ{I`UJMXHdA;^hoU)$Z!{%`3}l!mCx&CX8vVpXm4*!ed)Y
z3C{kT#PHOA{3i=S7ppiW9IH5QveTm}fB;?*#BQomY~B5LR=Z%<R~Go}qwwGSq^tAx
z&4WN-Wkt{vgkEE(Zd2lCpPahCCx=*`qNn0SqQ`GTZPGKHZutd2%#Th+8}u3w7R&h^
zQ(*8mO=*X@Ag2na=?)snTf;MhkojXd%$u4t&X^pD7t^`-Z(H6;^`xwf+&UOo={1C*
z60Hs%4%l3voribZT&%gk*K@{01H(E5s=}w*Rh*)Xp)H*R10#)Xe{uk}7(ep<h>u`U
zYCFEllr@k1*<|aj<-CtET^@H;GmJMQOo+x<uroGC4W9V1Q$b1UvP1_qEv|gan*yMK
zK@j(^W_uTTYjai2UkWpL=vFe(yX`|9O)h38Tif~WL_LQJjO!UTpE<eWJYk5oq*l-V
zZtBx;5PlOj#-Vw5-r;HSqo%Q|@kr~BMDo~x48UNNHXAOsMzrscc{0;`5PJWpGW~h*
zRo3YkXXY>;NceheBdpu9Z-?d&Ecgttu3#8aaUJfbLd`KZYis#WIaco0E7U)L1-Q*N
zPGxi-w9Wnc<pi8Av$kSR>s8@$;1@~TN_6l^Qan17ud%Pl5>f_@-&AR>Z`LW~jPwyz
zX0FA1hsm+izsesFnerwaUfg-k!SgOTgjI<0(XPAZ#!~Ih0jovau<Rmv2OIo*;iZgt
zz^+C9obTp2v&p|~#w@D)n(NA)FJ+qAMEZBx<{-IaJfAE<Fu5j;+P#QLV`W-kl(ou5
z;?TWn;r)$^(>~G)LuYH2K5KeX|3aSHQDPmE<<*9PlPo~bMU}v5KjtzIU{!CDxRfuE
zJDQ?kjGS%Gs#oCO^cruy`!i7^I=Thtk%axIoa+oXiTQ_NlXqo-y@evLpH&RFFJ~|b
zyTmCVqV6R8E;%1JFUHEXQ9`~a4V}!d1?38qoXkF$^_&88FS}lTGSSUBE$`J=q|AUi
zy!PKw2?)~PdJxAk@Vf=pBtPS|7rK%EkX6K`L9Mf5@jxZ5?B;{!9Ma!(-ZM2mU_+mV
z2ut%gR0V9?Y6k4$ou>5Cd>3)&shN)=yLqm6i={lNddSfBBS!Ga2(>pQKFuKkTv*z&
zq_hV$;5u2)m(C;WCy92;MOf+_X0DU(WYJG{kt5le-3nJ^{8Z=0UJTKicYPX=T4u`4
z%_&oS%iq4dWS)5<gZn)&{NF`%5u@W%w@FzkD*szK0q)Js^ELXJS|h1^2%!$Kl0Dba
z0-NmULFsB|2f~xrvT%7cI8!!Knf&fkr6kdl9I|wZ`s`cgKhvzSl7%B*L-k+{Rn8Ur
z?A9QzKzHw`&pr6vti!ElW$q7yS!r(&N|LX$AL?$TpDbrnl->uml2TD!oR8~!pPok$
zlu(7?N_XcF73U{4$$PFG66Ak&8!FB(ZF){W?U|QNWsdwZ!@C;i5s3)jU!D3~eDE*>
zk}c$~G8268IBEO)i8P30J@8DHgq>4$ZL2-4snN1%Yigg3w3Y}#I9pFAxdcxglPq8!
zvfnCBxQQ`b8<i<iByoS?Dgn1>-nCq#g1H)~^N~9<ma$a-$^TZj5(;}|n#b#*5{M-X
z+mT3(>e?Jzf17O80A0VJF|6>}TzXj1cK>E&wmUu#$BK(iLP%ESjsqRozgkn0i~4j@
zmpBVM3VvFdgHR-{*Ety(W+(s~q~j)Dc_n3Ri0>}P`@eZL!6wUO%Eg<SY#-51VfUTo
zF_iIYrH<FsVQ>}GCyc{4b6%P4kju|HrOBUVUCTeecQTU$F}%oq!g%H#zM@KQi6I@!
zqkV57`fk4k%lETyDPG9QyXTu1iWn`V&bl;-&d;mM!u`vR%OWei`0(40JZ3;s=!tO)
zMZlDe*4ZXC>eS5XZ$LHlg6+%kk*iHzAi{^ay9NOZ#>)sY2&<)N!ThC(PqQCLLRpzN
zCQ;y3#SkjS@Sq7#{52IVy&(IyyS0lgAIXiIy#0B>gct><lvP90`I=SZK4pb1KJxC;
zKPV^tng}zi7u4v<p!RK-<}FZBq-N7?Bl;$H^wKiPwu|(+Nok-y`+auTqbBXn(yyA;
zsl4mwHs>-B*A}N?LmzhHrqz_z?A<?R1N!us5;0z*DQ~<x;7|pLNnSfapTr&kh@fZL
z`(sfRiZmOZ`??Ky0wvzOZr=#ti~SWBjE?qHc(55pJBjyXypW}LwS0~7Y`WKosIP=-
z%A0TXYOmfGvhB5)g)_t}0)z&iOF=lqPY%fvY<LSYh>~Z2mX%h$GX7ONaa7555(gu3
zKjPT4Sm~#3L)OpZgX8iW4~G=$r02Rfh|K`PIw8NT5Uke9o@%i6EX!V?vsPZ!03eu=
zjGA@6kYMz9CrtF!93Pfi5FkVhmBX4>GHu1F>^R=K1i>lW%&M>XLWC*L@7QykNR`aS
z6Xmhe3D%I-MZl<=aVq2;UPAroc<RfdUe?J@=y=BvGS_<Ho7$t8h8!&)7)l5~L8-AX
zKZ6|&{oX9W$7RTLK~xJP?VhL3;w4U&Iu@2ej#g(4yW%i)BelFpjVqXpkViO?Z4=BT
zrcB7+M>td3Oias~@%dwH9I9{w?c@SXC2m|E7vZfSb$D<&50ex1cFGdwT{(!LbLc+2
zm5cZF^Cy2T@q9C*rmbiQJDLN+DbUYFMz-r~@g6K!gv8zc9!gzyNR#s`g0FdK<Mt9h
zmIft-HyHK;-u<GqOxxkf6Vi;R^;95<cJT)?#$j8Bw)QOzJNq-Yk^p0P6)|$Yo;2jl
zn1J3fFG*LcQ<SJy@eazK5<g_)$NK+RI$+j|f4uYAK%n<{T{yA2RxEZM5lF~4NC2(X
z28Z&PBXDQQ-QLWG5QE>7J$q$*k#4(ggGkzGp?QH^434QIV^{hp-)4%y7Bz1a(43zr
z^O}W)c6|zb7(Gh7d>bA3&=cBrZ`^$Q3|<8YHX`MrrGw#Y6Bur4pL+Zt;oBw8QnrWn
zv?Tt}yqp7z*VcVBDFuYh>Mb)y8M;egGBTw-|LhglDDAqn$QLhUtzb2UAgeqDt7%U6
zFT*?|4dddk1kGBcaAtP&4)f5rG@&+)M{@0hibzhB0YndC!oJKSUvi%8To!r+>$_1>
zB)wi^VV17Mfr5!S5&4*qvSLDIIB773giWkg2|LOJDqcSfRgEtm1{T5!<dx)IA?EN@
zuCiLwNK+Ct69p7X|5*Tt6h6&QOnt6FMI?-yxfg`=zfyw?hBdDbY-K<pPh6>-SV6OP
zJwNR74ORFi>FHSqUY-$_8!B%_F4~Fc4S};C`#O+(J<&{yG;psgebR||O$Je7@cXk^
zLo8U36Woa)j)2Q65v~X2KIg}Oe7Hnf!ZjaZ2$$sn!e{v#orZr|b+QuOxjw1EWkU2R
zpE)c@Fga``BtlTymWdC9o80GK!SSDSUdG_kNg5<k#p~{x72z78$ErhPWY@_{<USwd
z$XTFidzHb%o`Bbypf)+0^NypzD0}H36KCzZNh5>7?nGH6jb;^$x60sY@LzgtxR$L)
z<zbPh;gLx2zD?a+fgJc<((RK0RB(!e?t}+(XWG0DdH=)FQqF<&)_O8syw{KIL@s02
zlFM}EepTeM=2GS1R%}Aa3bF=e$d%6goel(Vif35A+jDgS@B1>2@lgD$X|xro24Wye
z2yQ>kgVZzvvV#vVP1th{;AfM>_fgTcD`Uz((j$~uGvzGN!6zysrDc@{ViuQwOa?w`
z*|GX$Y;c=by0n}l${hRsVP~)wLL6I->WG^5AWV}Vb#9glYreKU^TDc|TF{!xo#ftR
zpJ>um5{QofRz7R4%y|TVgnd~pbz95L==-s^3vyKKLe1q<iy7%2i`F1zGoi1!b2kvA
z%{n5T4ycEJ9g}{7O^H=>iD{-B%A_jN3D2hu&!9cWNv5uC#aOYOw_m)CsmQ_u6OGFA
z{F^dH{z2Aa#%-dzuOU*8^d8F5QUd$UVPcU4wfyrUZA{z$#C-+J7dp?SE%PHF@?%5|
zWpDE=113LxwN$|M{mXJ=jc4EbhiOaCJTr0OnL+taB<6gIl+t(PFCe`?U**)iEr{@l
zY|CvZ5Nkz-u+YZ&qU4_E1<gD5*dx46>DC0ffx0CbaX~Qo?SMZ^e;`08NqP+*1-!@=
zp$t$>M2X5hqt10|ORY$+RAeQ>_6K-`_-~f*>4|W;JZ$j)|5<?NA0mS6vPFI5c^cFj
z@1jE6dp7SaWE<SAk8_vfpfLCPOTSX}u2lXbDu%N6s><kBe10YiYhs_3Xf?q8^z>TW
zQi`3rPiPNin}6Gotsi=V^9uxdNZY8t<6AtPphsFfohc3u>G}j?QIhyuf#6!Vc7Nj@
z9@t0tsm%C+Cb9h6brKo&pyTHFlX)2sonN_q8rMa-BeE&mhCfCP>MYi@Xd7{XSTce<
z&P&*)(5+|GKuDOOF}+iE0xe(7MZ}CUM3Zn;^qB9#bTI9_l$U%VV=cXqf`~v=QmH(V
zDChiFYTVv`Z0r@=6oSOzOHAZXj&g=lv-o)=y^-X?Z&B@m+IX|%d#2>*p4!UcW91Q^
z8zKR7h?=z!c;N#VpPxT2^a!cRIMJE;_~+jORH=9&Bm5C_-xwL%cIU*?2x@t)M&?kJ
zIP#mU`0-gHo+mJkacZ&FT4t#FDc3hyr$jc*^9!{-E_Pj+<=xbVDN`~iZ#aTvK*sLG
zXU_DeBMV-rXg$8hJ-dfs*W8##XDO=V$&ux9#`?q9sv0=?#Vd|HC*NFFt0lUlNBuP`
z0Wl<xX*;89X$Zdg1+m5`9cGs1U<S42<k{L3{jf_iem9yYB_j?(mGiTr?JA*e9eJL|
zr*r8+Zcny0xXjpdEB1841STkX6--9v1S;<lUd|dCr-U~bbk<D_7o`T0b&+BoC$Z_)
z<M)X!7L?67MZ%w~SWdGf?q~LTKDFPGA{TD&hw=b_RLzej7>wu9K%uE~T+Q1Lc(pTj
zIMl{V!ze>`gB8<@`MhsGM8W?m;Vtf;ntuz-s_bnQ!zV7l1m3r^8Sz8@ED9eyx+%B?
z0en=4j?8h!lP(@t9lL$H6jxQ28X+W<d#7Zu+vt>QVY*l6ndvO0W4Lq<CI6LzMh<c5
zLO+}KjA;mR8Ai_CH-EMxkzueWmgICN&Fx=`(o4pMA7KB{Z;m(m`|L5}+4B3(jE;B0
z-8BdS2ss#o#=)<1C>Va&Wg`9Mt#q>#fza09Z-eH#LvPf~%W&RB2i}R0H3S@}I?sR#
z`BJJ*8v7-`8Zq}55#UGhN86!#siLNd9PEQKIx_hzGnc$e^`<>=G9r7UUzw%-IhaQ?
z*!Z|T9mP7tvqMYDveUAtAb~T_H+l};@y4j(aK@4R0qM^^t(fKjkG{SZY~(Am`UqXh
z!T4i_368nl4>1CICzwSA!`3CTy5Ln-$}<-bM(UO>{JYyS(b#6nD_VcmtxoI-PLlWe
zDw}Y1tx2#YuMdtDX@)_Wl6m8rSDz8aovD~!4U_(fd-sHOE>Gi485;Gj)SNlMa`T@{
zN(02qq2DDa!_7&8ii_%tIilgT@-9?YW^T8mtQc7tpLsR!%Q+w=-a7^7g}F+S02YS?
zjyVr}a=!4&jg-h9Rk(JO!8i`z?d?<=7nLBSys|#**N??k(I;HpoRxljAvway`TvS~
z??5)+?+y5gAgEOxR1r#PYj&tjN)^?jYLA*-_TD6DwWU^#sugPQy*IVms=Y_l-jom$
zN#4ij`+MKlUqPOG-{)NCoa>y&>YZkKRDRD<MuZl*0(aki_u%S<I(=uw)-%?CzMPDi
zKeBtS%l`0&BhjCXj>JnWA4X40ILzA2#Fu(hpF-v?V*Ar}x4kpg2LmYu!o`P(#(pi?
z_wdExyMPuLI{<TNd<5%b1VgPRS}8Y{C|UHNx!T;*NGW)3xU89{Z!^=Ej_qceT^BIu
zza8kx#O^DTjV%>Sc8@Q6Q38hg^}s;Cw$wmDydA4)_1jmLxCcJdY9$Jozh;RKM^WWe
zQa7K`7^p|8=HX@5%S<f)qB+iKL!@80FGmx09SaRxxtUvIE@Gk9H&p%o%(gLzLo<79
z|M%S&sQVFDcSn(3bPKnr@iI_UFK$&RpKO!akM?6Som%wt%%*6i`oL*ZsQZPkl!@OU
z{jx6f#ooltWiE%sXq%EupT?V}+wQ}i@T##*(M@aPTCCU;8^p)P;!*n0=vK)Z5wp4d
zq>(aik&_CABqsunLSh=V4yEzB=%aw}@f_{M(JG{?`}@H+?JrY!qPrKgUQ$87q<7fN
zeGPQm^OtY+RrdE&aP;Mn(4c4qk93SMbQIeXV^fz2Q&hb)enqqI>Rp;xtu-r6c#6Ti
z>ygEWyi0JxFBe_j4T0`3dYU}<kG%%gTEAbXUh)5`ckxusT&RgJhA-I6I_l@cl|PS*
z@opTT`z&=`*oEiGHO{^-Ce6VXELHyu-Nk>z|H7|{&Ea&(nMeV`DJMo{SHbr93XFmk
zArs{ukN^29RX%dx@a^n(W3Sk{e4x^dC_&`5vKK<{NQ;&Y<Y-@{OeL<p^|fP&*HUdy
z=Tn`iu>1FZ(c$pn;gWZ(n6Ba|U(cA+<XnN<9%1|Gxk4)B;}30j;_BEVsDIqsY=xuD
z-UIC)$}VQX=h<q~gXAp^CU-xC7I^u=1V0gz*U^UP?rU)Z@oU2V1$R&8QCn$v(OEyV
z=C(Y%=LsOWi`pP0DW^w<Gi$9s7Nhlh#n@QGLH+nf?7K5uuu%#djahu4IGU-5n4A+F
zO@qm~mE%XkhKne{Q6ODfY@exXaY1!asMj~wU=vCTt@%#vXoqHKD_<lW+$HK;nuQs3
z%rr^62M`gOu0_JhwEt->9Z&=>Jy;#lbF-GA)TtLW(T+ocw6}`B3y11=D4*EWb{lNa
zl7EyrR70LmLMgdH&)i9?)NS-`&O4FY>)dm%uRDC{j_kLJW=f3*bt{35nu4-#)pyUv
zNbJXjR^P${y4J?BFQrPalbUe+AnWG|#b2}xOMdSGXSq*@!k~1A8WlH$oB3la0U`n#
zz={kvlpd^o36KxoS^3$laNAkv6}<m0v&g3RPf0IF)sX(xLDMtvTpG~M9b>Y|`SJXF
zlo}JY8r@&C@4laal(4j#OUniWStsRzH>V#dh{Bw%4n9wZheZ5ZC9JbsQN8u!ilGCV
z#L@5@hps~Pw<l<rSX7fJMVCgxaP!v3eq5er%x=#hZ~O_nw})S|*;Yj{?}0LtP6W$y
zdZ3c6EKtQMdDBI<hZw39w7(t`v#utU3epk$fj|Uk^=M%SnFfB)BJWd{hD#sqTJ`hz
z_kzUYu7v|X^I)!v?~a3Nx!0}%l>tLyxD*(>?O~LYvf|~u8`$j&IjIY>r-ad!zAhux
zRPP<B92|ddD#}^a9EY2Qt8IBnZgGw>{r(gf%EiqMA|N{p-`-rm)V-1njOKU05CgS$
zoAQy$L2rQYKd&vQcH3wNALQfYQQv3)Ru1WIgMzQ`gh0^yti&I3-OUI@TwV3{k+LVT
z2fK!0D(HZ&6I?9wz-k${@vwftzP9^X@>0Y<E2CsPC_g|+aRIc;{XkdQjDfwKJVr(8
zuV#Gz>fKL^J*#Cs-0WbFt0J_2U|*IGJdI8y%h}JuJK6PXSBB#E#!M&qPx{)IZT>aP
zy_|V99kdSX-1v97J0tjNqaVgbuJNz8C`RAsVg1B?W3_y(5~)?<a?yIZvYc8Gtb6*7
z+4X7wYH_xMRds%_T~5b+?{>|#FNKwk=mi5x0O|MQodv<MywQxg(iHNBXkKNQ;{La8
zH8=H_i0}s&5!E%<Sr&!AXgl(3B~jN(j*rPPp!Zi(G_d2?PlzgW2-86wT@=yJX(UJr
zVtCeD{pf}96aWe}z$B(C`L~}D-T#^;*t(H344X;;AlceuCDARzTlzqKE`_uUvVr&;
z455bnl7CU$Rc=akv`n6g^QzLXQpAu1t9MU>59CqjCxZluJoaDGP6StxwI&c7f}~Sr
z(YME3+=#O+eAUqFFc+kyaU9cmU|6G75C>_^;uBdK;oaH}Twfx7*V_;TSSzd9Z11az
zkAY^3&<Di*AjG6YvNgKK=zTL$Vj+Xc{2^ZHv1W6oavPemFCzb7#2E&+D>OvF5!_m5
zeSpk~(5_o1v{lj<-5;mrkBu`kQx5_t1s!vNenJFlL?8H*B0g+Tp{AIY8H}JsSvNRW
zd2Fc$6zoiWJ+&(-(jD>#Y*YMB*NYEW{AW#J$Y`m%$#%9m6wEZnJw)K^3YfCeWn=Zv
z{rvk>TaV*pN)DWXi)+>FLx2V#F$4TU@2W44ov8uEg1MhoaV7b6Ke@#i*9o4>A8ZJp
z4;BeK5@QQd%ytJ6oS#TZ)qJxsr-OK5n_2u}7v8|yb|(izZochMG>7p-{!rgzb-tMV
z9701W1d1VFkW*zAr@~Vjz(_?IA;ykS0_VC0`}}aS5KQhOF4{<Tdo4Jm5FNYWW;=Hc
z!jQ&fgYS_%3`Fv^`*?t4omPFIPP=WbrNYtQTzYe`TT77k&vn1*!n(Wy1kL}txI(wU
zrK=Bs40qSGt$$O#eXoEw#9(q+L=8EDFV0oL2mjWp$>`2Ui@|TNM^5F=phaPKbUX<e
zok;-ZYRZnfk-ae1PPze7fB%=Fg+i5I_ZpyX_dx%%Q$2h>JaF#U{j7^bVD|gQPsSjy
zs=|C#`JGXSc|nr=E31vB#cr!vowzfUXG4;~h|XFScE<f*+mChsHnn&S7{DX#sG67h
zNp{I4Y-qc>=7Usp1VOx7if(`w%&h_4!5?OroYX)z4wy2x{^h569Gwa9#=wO6H+K@q
zk8>W~R^hZLth*L0xsk^a)^mBt2hTbulVE3_oc+H!grW<5e;6cv#0Gw@V3_s1G#{jt
zg6+3vritQ8f#9G*K0CqCd$$61fVA7s>QW!*{ip8_nTU5j>E@UEtvA>{t#c{lDtFhZ
zjv9OHgSpN*mX${~`|$|g>Wju0jJqv&o;(k)vgx%o`~`f;<Q&_u&NWLaqu^Hcxnr0c
z=h5eLgJx6}WKtnG?Q{X779+0-nPjZ!)nU#^1^Kb37dB+^3H9y2cF9<IE8*hGLvk2+
zeza!v7sZ&fU_n3fC{9WJ0S@2<yVEGwtLtjHK?)LR%r=9{=7_BTA)P7S_==7XxR<T>
z0=K1R4|qNK#nY82I3!v;_gFTMv?<%vEX(&Nez7dGh-}8UE{|GJi5$@n2hXlFIBK=!
zbi0nDEdMTgR?N3;B}C|%+v}MK=KRKprMYb0scEiYFa!wy0Eh+KQGvwG03#+37L(8U
zsR7Q>J_Texw?fZf{|tsE$fA}RO!FB@NL_t4&jIZE#+ik&Ia<FNX!fJ!z&+7-z>O6X
zLWkh?SKNWs1_hw>{-uU%?fty~M2WxXx4^tA`~e0rql6j9lEQk&)Zu*GU-FB5e&mq|
zCySbFw$7td<Pr`xhe^vqGQP%mw4_E4!>f}mu}e7e|Lnf5rf)CFeh4Xi9re?T%j@`j
z)!OeVr7~Ad>E@k9#p)O{uN|qb`g0LMZt}U%o4mRTKKnb{fpZ7qpwE31k%y)pMR=SC
zDBipQ(}SciZ?QQ%wu%1osXw3yR{e<Ann|y~)rUN5(nvM+Z`D-`d49UKo)dmp`{;;F
z=qs2WWo>q^V4tdU#gUH;d2W;(#H#tmk$qPJRu1_6ffz=BY)`bZ0dE)E=7q`8b9*_<
zx7v-AI}m>FrW%@8Ti7;fZNc=7O0X!v<Ri+=k60*3oymmH4*|PX$+Cwp8;$H!avnUU
zH!ACRouKO*vnb{yM1fMc=xiMo4h-M}U1r)~S8a<`5jrKs6*f%qIw>7DV;LFITr;H&
zio26$<ZO-|`w9Gh?)0bYAL-tz?{yU!dy;V(8C$=JAJB8gB;H^l#u?8R7uDlGD=V{?
zLJlcy_T@H<gk%Y8Ct%sX1p%mSlWx^d<`|z{Pll<te2kfq|Bdl7we+A2`j@8=h(bgq
z9D1qEM#G;t)^zl)5eNCSZptj>Sq5622TuQ9d(tjjQ+gAJ(|AcWpM2#|(==SEx>YYk
zyDBP5*{5^V>ige|&juup7u0PI#`H&Gj9+lwUHbL?M(sVNcH|@{BbSVAw$Ey1-bTu9
z!hMSYk8x2_MlrDWdssskbBaTjY<ho%i2nMlE3v{^+EM_Nf=uHm>XiDRp3V68w@s2j
z3olyuP6p=le`OOUU!-t&%ReVEFRdy#7D}hp;9Vi-5xfWP=R@dPmri8iH_+o*<rGdk
zh2Odo&pB6<AG;gK@wssbC!hSmA+?IveDO7+IUZ3T&N+qz$MyehiLGIUm+uDHV4C=^
z;1=fE9=LxhGfKHjc1y*NA1=bGGol9u#_!LcxEgKN_ltkela0~_q3sRhxaqrWEMDhK
zv2`5jHZF~3|1@uVFavMgn*YEO>$npn(W}tq@!NwpTS3RB$Mkw7{g7(?u5s0l_r|w+
zQtHg>JjQ}<gA109Cz0eEOex%_1(7-~KMy2~9F@H_UT(O^X&`Y88_k+bh2*TVmG<-s
zCg*?le*Pb+qJVW+ZfyPSfz@)Uj7weenzeNsXrWz!)7vLoJUwNg#@pjc7TP7EE-(P5
z9NfagM-pQuQTEjtx(m8WAxIr{e1B2%LHDu+$Eqn=;pYSR456Kg^i=p{gTba#81u|?
z?qJyE`YUn1<YG_NzF^VjH-&W|B)gtj{nU&bh|(Tn5}UXAUJX)X-V|mh_2&!BmBcI`
zoIJVKcyQ%WMKFNKI53Rv_jNi$L{EG`s}$x|n6urY8JUn^9JUxK>G!)N-uzjJU(dt2
zD$%Bg%4UeAswlcPm$>=J-CHo<J7AXH@6`RB#jeJTT{Ke1TT-nk^VYM74?g_L-R{4!
zSC&Ine@#7?{lwfV!h?gF<P#vTve*Y+13k3J@?4-0E(2z<!9{5Jf35D`69heLnry5b
z8?Onwphx0$p{~-cf=40B+RFlRry@54O#Rmi%$}PO{+TXEf&6tlmI1XA**wP61KX14
z`o*WnpQDMq1yEKFk2kZCycz=>-7}tCYYWqRfh?+0v#(2J=2Zq4z1xkx_)(*T@A$PD
zDEDCjX7sRKOfJX2DKeP+w07^Z1r&}A6nh3qfPl2e-PLlx7vJ2d(he^qcNi65G_F$Q
z6|xLH-&u`Rco1h6(i87=!aEvp$No5WY|MoTF-a{%mU&v@DrHd9GMjusog13jE&?V=
z1fbNRe)syMDNPcNvPXT6L(6uel5>xa8=+UugV3Mj&Py4T)$K5Ud8H1RKlc-PQJVXk
z4{Wy<Li;y;?d}PQmeHLV#fLDy^w7xdXy=~T7wgLcx>h<TFTXYxYjYm=rXp|Q7*A*6
z9@!gZ(sX0fp!Y>y1r1eIT_XZ<+J@^egFAXN=^MAM$ZH;dU`dYHK3Gk$8oXor@`|M`
zEbZ_0WBC`NbHOoxL7M}2V*SM!Riu!1bmi{nssS~zO3>w_?b-6I<zDj&OX0XoW9B0r
z2*o6iz&oWt`NZp>Q13C0D_A}Vl^I3!?wz#V>|N}}#k)nQG#sOt-i4nFx|uy4=(S7E
zVPOP{kfmr)H(B+?ja`9x6XxD<3^Pf#PFu;jAO$W|O9jI2TmxZR*p)Td+FiizkLt&b
zaCws7QL$RNV{AW{&aFLMqR>24p7}m_UG1?{5q&scJ85X^STIo+;F2aVgB+qS^q-~P
z)VD<W1}53Jo>6AL3+&9Xt?_=@w)4m5+Zvth)G6Iyj@%u%1&)(YmavarHeXLeZ?_;O
z{90hFpD&HH<4#6)!n{7wL(UXMeQo>XePnalN+{*sw^z5!JI=?<X&sQ3!k>|s4P!j=
zzr}Rz_~VXk3AyQKv?$iIq`E0E^~b6yI$3sl7nM|3@rvE{vKEBK`ZE?fGJW8uA<d~C
z#$_G-lUqH}0rW~MaVaE=ekmY9u<*x%7>K#0t}le1;_Vn5@%3sAw@AKV;ND4b`wkyv
zVPtWt$<jX&yIk2wbsM_U!~9gLVWMLjalUMO`BRCZD@YK~-9(>0;4A}^TvYD6mW+=U
zHU;RDb`5<U^($~53aZY;g5lADt1&;x#P(fG@qJ>z?mkjsZ=;w;%#fZQlXPIrAut@q
z`6m7xbw`u3{1b}Fp}Z1}4+hHDc=RmNM$ltz+_ti4NskNlBO<8$eD}-z7GGs?VhaXO
z5=iD72jWy(RJ2ZDDGmm%>Bp*~V>=+%Akz69Kg&pGE0|+ytSPd>IiIO8S^G!w<j4N~
zzQS)u@njwS8rkCbz8Cr=kisZ10&-(T$^XuiKAjL8=KSGHq=&fev5XyIa-IFobDJsS
z58*9e_3ofLUca~f@oeDFeRFOr?Exky<xm0y-@IXFzWLJh&U2!EdcT2l!TaXePrO=G
zL%}Z!Z)SkLE`1FnTA;{rGfANviBbC&JLQeN-Q_cN=Jeah>~`6hPP$A<R=wXWuj>!S
z)kZ<T(=Q#Wd4Yb}S%ZVW2GtN~?sL$&+?g0lZP=`NoHTj#{A$znIZxfV@X|lHvRtea
zoMN4FZKLIS9+DfexJTqletpfiPZ~PGS<!uh05h}?W0JK(oJ>H3v}_}cS&~=PY|m6p
zILc$qDVV8m#P6(hG$}MkS2vYKo@M)R=**Q1*L8CSG5tZqA0DDzB(@VlP?wPjPqUMw
z#}10awAys;u0wASjb$+m`GD<WL%xlw&(W2F+f*(>EUE$@z%*M^Mad6;{WI=2qf3T*
zJh;oC|H%@jgXWx!h{^>k<hq|=sa>DRX|ZQsNix~uu&JO}3v^%?>jmr&JyZg#_5G>I
z+X=4-qNT`M&<tt;8D(mwO(&=y1*AXnTVkWGlUW;yu5)IL3nm{L_K6~3xT&jNG$P2u
zrw^Fq*O&P~;s4I%P&!<oq*)VBYnmVXcSC`d>`_Hm@5A6e)O~Xli3nZe&RII)dQN3<
z-M@L=^XKY~mWmiQ3QHm&`3g^O)h94XcM6)yS@OtfT;Wry_*TtoD-lVzKMA82E()Zh
zMy9-eQcIH!;g14aP4{`Kz+d<Kbl~Wt(2dl8g~I_T1t0I?de=>o&GOjIE_*dF6bOdH
zevuO?f1jE0?*HcopX%n)-$Y;4VQN19K2_^p5VtG(7yYi6$60*4KChq@tf;`&u6GTf
z9S+aW()_(0C|@%U8nU)_I;w_zPiwyVG&8Z(UlgW~?@441>0=W(rKS68U^j*fW=cO)
z-_+tu8$6_PidLIL*3sOJK=_dJ20{171chA_h<(8D#h72rr#$VzuOkDLw5EJfUmoAf
z+iUn+9{IKAY9yGWwG^Pr_O{^Kvs*jOjV}}b%MYu7%N3b~3taGt;WzfXj&0aq_bm7Z
z-PMJAc|=rzyc}A+Ul#Kxa1ni@pPSB|S8~3RHMILHbguqv5ylAK`_R<U+sX+Z=qvG{
zb>ROtpPTN@=JoV8N$aUf?R@*K5+_Sl@~PqZp0ZrGOOJEPLTT6YFJiiHqVVsu-p_tV
zVl3=B0UvVFm=gXd3M{H}$h5Cb#d?j_kuSFav?%k*2NeX{;zZDyd^%IN@grmPYjC5F
zGS9re9vL~7Kl($i<f%5U(F5TvxKmm4M?Ytq=<5#Vn&fBjJL(gf4w;reHH}7<?hfiR
zX^Ebawm1G^p6cOt5==-nrdLEyuZB1Nd7bKEbJBn3twU8nlaD!3bhIfrSiEJ01si}T
z?w-qD#k}EjYQdd^XUu%L0b0+C;GIcryt+_L&V`#N&V}JAavP1l{PM(R7Wxd)a^Cn*
z+SJ%>pqA=aYWNo)82(*l&gu~X6+F0(Te4MYI*-`HiiC|m&Qng^{Vyjo5@+@tA$<7}
zLzop6m`C<LPo$U|v_*Y4vB%$?RD)UxXfK<Yy@!e|xPFDlDNer!KOKq3f?>iK5kfcF
zUYzo?>dUkzOz{ejIn(r4<H)=Jr&JggcV`apFXjYrW9+2x?59lIQQPhPvbf~>O;+-4
z2euo!!2<mb&${8xUUlVSZp*Di1yaXRll3&?09&TwYcW(oTE^R9W20f0OATxYAorFc
zYc<7go<P*%jB?y7Gj51Ed$6A)HvS$f<TlWNr=S7ec8Z0f=3c*)XwAj(I)EE#R?Cv`
zzV@lhy=Tn1ZgCT;EY?$gLi>*DG{*|Qj#nk#RX)YTexe8b7Dk?re81bTihZHBcMJJ_
zE>M$cr%vz{rlv(s&pn5!A^!ro^T^X7`W(%fB0*4G;pd5-%l7n4i*(7`fk|%Y4n?gM
zkg|YVw~XC-M(k&X(y)5D%(qO{Me=V`<RhNlq~G_yRes2-szB?p<S&W}(-;a(7t`9v
zk?Tnch0v3<7T-rX`vOLqevva6HHGpY%DR?uVBPa?`*Ou~$KUsVm~UOX<aI|*3ao8X
zxf-x!n_3O#kiKERqrVkMomLa}f_0B~dvJPT$o%&O>F)To2cis`a2Xz*j+@=xDys0~
zco*3SO&rl`Lo|vry%AQTIw%#Zi^pl**sZYQf;&SI1R|LNL%MqF3imarvK<3V?Hp~n
zL;Z2a1KiBHLC~ePweaHE9mabf!4z)4V<9U1n<RG{$<f;DVm>k|G*GsOWrLdd!`l}g
zEBs)vvd5J@fDty6<=g+w77|1(D2eH@%}7M`yUG;gQ}#dUc0;R5Rv``%;nJtPEPhn;
zGlqA=#dTEheTNrCH0`vVr&KRxKAC!2K5m(jaJQrPcE=~_0RwBnJ*~9JT4Ci24oXt%
zjt)yPq|iOlSW>(^Sn=WL?(q0pI#yNs6pZ0P5c%t<*Sg%1>4W_+Bd83V4d>}P`(IJ6
z(azu}o0orTJ&Xy>BAaIDKp&4{K*w693DqaOB;A~p8jSrT7yICqJzkAp)nk^32R6KD
zERJ$Sv+wPp8DD9rj;^z;OTdF;*u5ZT{(hAycITcbdGh+X8>fQnbi~`8d7$I1X*f3y
zbXbyQ@~C5P)*4=i<WMSoy3hy!|Emj-qJ601#1ScrWTaR;%i|MRM?lpcD74PkRBdp(
z&lEI7REZnWB!G9B@(#eeaG+$a3P)VxnHPD7L>y7+QQf$_j)`PQw-i9AcEs_Yrf>)V
zm87skgK9GW<9x_h;pS3VW?tLB`IJd4PE%aiK~=Ei_?1>AfaYET7)skxe~@rV`%;=s
zCbJf@miBEz(ASNYkEA)CLkb=I>T&ubPWtb#05FF%oToBOOr4#FlK$RlQYl^&OuVeF
zUsoD)vgQu4JNHMC*?^HG(oo4^SD#Qmqsl?GM~OmMfsSf(^|fgOw@c=41c=XQCTwQD
zKwQc}JHL?D>5C0b_k%VA+KxVHdRrPi+qTs_Y(SEtkU|HvBtYszP+$l$e+tv-O!0pK
z6SyV8_+I5t?mf^Q1oFJ2it<1T3(|A1JBmpL?2w)U!mb4dHh$iZ*HQ{E2eH}hQj+as
zG<`|m)V;A#YRp)_zpc)`A(3_P5-eTs@P%Ny!C1lb!}wM4K>Me#`A0mhVfprkcHL?4
zesk1+r7_4xR_+%;w*{Dpu_@p&ETG9h;ruYD)mEfAmm^oLl)vBqqjhcfrPs+X<~DqL
zPv9%ZrG>;?UK78hfjL=-<QGu+2x>E1zpw3lR&6%N>4P#7_NOmoz~XdON9}nWYvQ!*
z#BAH#9+C^?en?#!NTAqa-~dyMqePGOp4P<Cyq$8i&W(S33Ks1w5~u@}ni{$6;r7Ho
zn~fdU>$D?$2FC8AasR=Sxfh$hE~W1R?o24Pt6kY~UU{37?NYE?a^La(n4&;`MVQz`
zClwW7LDvXRqicevF+S4=h1~;+5gi=W$h68X<DRwIjKR|qxIXrNWfYWnBS8c-WVLQR
z!&YN2b%g`$q4H?DB6z{jZc|OpNmI@DruM$TR3@Qu9w*&7y;X@aE`V$JOY?S%E!@{6
z1vHpHAKv@Y&4Y};nROPraVPU`jw*@TX-7Jc;zm_?1D_K<U$J>$8z${Dhklj)(-HJ=
zFO$*L-Ml58k*NVw2AcTkwSt=f`}3SRjq?j?y52Wb=eOzVp#h}*`u%+7cD+%Xbzylq
zh`tU3)daNs6r!WATFE96VwHFLJ99gsFjL_n>)IjA{GEd-1IIP*-R)S+c^=co#E-=s
zyR^qRBej}$c}7hjV7>5nEEo)Gr5lrH%wJKoKK}6M+jEj@`imIE-X!b&JTpiCEDkz{
z=@Z{7=S{uE-Efs#=U)D_JIGYC0db8GE-5B8(r|8!&=aGXwezn}?oGY+5w!JvV0;nO
z2~ljcvCZQN!~3mfu{<#|Wr_$OEoG9An0L{P{ElNdXYU>XlC*(gu|n><!iM+)VuU;F
zw1Pve@3vvywPQg__G9Rts!uCO43MBcl_^x#xBT_zeNZt6)0Z8hF@0mnhL+s6gbm|=
zshXyIX+vK{?795@DZ8s}?6_}#M`)QyE;y=79&eB_bHvVC_jqp(WVi>8zmUCn=xWcy
zC6V_}OsA--%vFd`_rTiapEeE7B0Y4sVxQ~eef^f}nLBV-^{G1G9&)c-CvN^`Z|wa~
z(hf1Rx{tFL<D;1=&kL~HiRk?>YJa@-UO&=X!$-RN?qbVo<E|7Y@}A90rjbSG<nfk+
z=9bkGq$!T<x;k?7TVs>hx2%VwsZh71TlhvvZ=LK1^s_$xAUrpCEtpa-{%Y7^kKE;`
z?yPe*Nv!!)rpNuZYnFZOm@@O1V`Jm#Cwu+neQ-oa(71KS3U|~z6QTutBz4EAqV9rQ
z38Qg^vz%BKD}{a1G3J+6|E!n{U?oL;FcJ;_mec&q<5hPomdsFpP9!|YocWm`690VZ
zev-Jpe&0b(f7d^nn$=r#Iyo!GzL#iPm)8HaeSaUL2X%G1H?kl&rpu{kaqv$)BW%N;
z-2kr^B2qtq!`8X-7`&bG!g>m;$fH829+*G(^c%6Cu*mDT7>#E74s2O$mWEaZ9kw<W
z!|;igGPFj-zf#zM2C=n4Osg2gT&Tf4)3(@WsdGnXN(GJ&J#6U8Br{F)R9%&*??Biw
zRW08p9e)j5IUN;@Ch*^2%VXr8Hd%vKx{SN5-6-Ae7KOGkqT-J>e|MfQ-f+k-4?vWQ
z+wEl8pA2HEOilpyYGd^|e__9p?xtyNrIzx5PR^B@Neh}<%}5Gge85T&H;vtfPa4;-
zkNK@iE~mGlKDM#Fgs~lfKH0!jJO@dZIhZi@{MLlSu-0KN50PPZT`OFO$xb7M2I~mZ
zMz%Up>S25vJ0e7C09I?vKiSKe1Mc0x;#W=S`<L7rxQOzZVdSiNTMmn_)B(fw0m3rX
zJxm8*W;k!(fGMCtW?AqE8@HkAMt=RSIxF`++q=iFwIL?z;}#+uv(%-uS6nh#FPcm}
zXfz%d?O*pvE4B?RYuw%Nb-0aP28S*C6W=q%iLxLc)R6CrCd)W#G}c%$ZrwDJdZUCV
zqxvSMptVl;&)z5P?|0Bu?<Qm|E+9U0tU+aS{ZV=v%yGOtKCzvhR>2L21y>c<c3OX>
ztNkPT(cB0jNiDZVuLb;WkSrS;WJ+t=V!(@wGuv%!-l4H3c$;dh>oemgkEROCFGIDv
zhjCX~gNx1OoN~JfJBI^=U7sMFkuk>gLltr)ED%bCstc7!SsHVaQat(H`+TL^Q#8?0
z?ieNR?}{a-n^hkIkNYu98clP=ia4>a5f+dHF&G~3XMotxMlbJwSFmdcpelhHEB#fo
z5t6w4L4G6Vp7$2JY6HoL{+xUQwUVa^()7>9dsYzsD`Rz(2N!JO9u)dx`o2#(o6w&c
zEX9W#4*K#EQJTMrzhynQyd?b8*@?(C{Q+pgJ#YFuZ&ug!UsUm&ZVsKJM+tg0X}mC$
z$+L3{W2Bn2SqvV|;8AX}Wb_n2><`@Z5}qn}Ynuf@4Za_PRu|_Cpii8e^kuF9)N{3N
zy*fmA;$lh4lY2Da0S=DhYR&9HU!eW-vNeKoJ)TD^Q2oYZw3un-6i2|;*r#;8q1BR~
z-!X<P370t8@ns?}!p3Y$yd$gjgQ!u1Yj3F(5uW1R-Yn(=z(9S`-yuVOrE|^1)36n+
z%<45<cOXfDUeO1L;eJp@xx$ic9GW2j$Sa1SnT$^hw}yKg^ehK=3y*TIW2*mFy#XzE
zwIq{|RN9X*!IRsYsVlV#yiDwX(KLpqo2>=8Vuv%xz$SLS2iv^0!_|7QOPbmu%vH>$
z$+q#piROQ4xfSt17EIXXgWQXuh`WO48zpm!WXRf{jqk?4>t?DprydGGdRVq2r~5@`
zuUwF#9q<Ga3cNJ7{zO}a583i}b1beIWq@lES^(Q)LY`VlFn?{6s>Yt$TY45RIG<7?
zMDODuq4h=nsF3;2>*W*Za<AIoJzl~_ZM}Izz@r@G5qw2%!skK(<cc*c?RkUiQo^EV
z!2a+j9CV2M!Qx3dOsid)w)Le}#Cthpk_9U_iUvGEFSUzC;kn{o-(Il=S7{HQ)Lc<)
zec0C^tIOWH=7tm9Z9DpcTVDtH1k|)Z%H}GFn6hwo+C&tVY{3?@28m5Grf{Tf7T!6T
zrk6tjJ}zlYPL9o5<@IJNk#TpTN9E5M(vm6Op+152rUowgFll5bb8UV*CSbWCX%*e)
z`DkJTTA?JS?kOf!GCV|lhYLYl`;s{VdNx9JVU#;4Fpf>Y_V9`!@1D54G`##RS|<A4
z<Z_o~K6L<A5DSS#`0RsKH2f$9poJ9*5x8}bu%prURT;<ii*@emmr@Np1bx!0ZnbU>
zu5AaqK2sXy)X;$dq=r`xxfwmnBqJ@3)?f#cZW;%4PHo7yqD1bXKhFf#R=Ss=*YiH7
zGY?Gmvod;p*<(V8riTSp$n89mwU%@8HJL4hK85UzoMvhCiEd!oUe|=Bw)k}FL^i&O
zXx`sYC8Da2$h~{83CCD)PE6N(;t|trsV!oLd%No+r!F}w6$GZ%Y*5NHDl4}36kRrQ
z5W<(QEzxLg1vM*(`1l_~Dtll9W#<%MDZEr*Mcp0_dqxlYWX8Mm*9?>ukjbp!yp!is
zor_yxOFuSjYT!<PvEO?9iKSKKU5T$G<~reDb_@?ctV8I1NPMmF+|w5O9lKx8(YaW(
zEyF1hr*7%i2Rl`Y&02|{W^B?2&ZkkaayiodwmJSfrPk6h#FR!j0i-VrE4~7P2mW#o
zZ}mj<S=1e0@}%m~f|w&BsWj_mczONbo=MXq|J}(zJj8y7?Azil?qVE2$^MaX3VK5h
z$zq`1kM5ZA`D>oI*bF>MZ!ofBEMi<fcRk7T)?B7c=}!|P`Ub7_k!nv|XLC!yTXSWB
z(Kk!}&WTZ1TGOlz5_Wn5z8tpxxOdp&c#Snwg%0S$D79{;B$|!#^8Lx~976MV-^|i1
zLUUT3t+kaSdD}61y5jd3q7nnHdG__R_*8{%nBQ;PJqh03tI@s?b0^(jktKhY&t>KH
z6vYn}kTuLEszwT_?`(PP1_uBs)qWc_;X%AD-#BhT&Hb>~1REgT1w{=cmL|kq7l3VT
z<n+=uY-Z8r>t}49+-=<5gPF3$t4GkODRTEe%njOy_HxvX&zREQ1+%ECi*180|C6vq
zk2)<xKOE)!oyqCcO~PDv+;yv+{b`ITvSWDme9eLMmU`)C<nSe+>ssa2J&XDvmCKDP
z0xy{ERs&*b!HU@?nEUvyEcMyN_@SDyup%OogS_20W?p%Ako)hXJ@O%O!1s6*W;&)0
zx^G_uF8oEn=Xd<lmrQ6|w)BQg4K$bn)K%3zEz33?AMURjn|<I=*(_=p8!|<jSW}64
zq&pyTRu%a8a>=DDaz0xS^R(v&{&J5NwjPQ~Io$NObvfNXZD?usZWtvZ$Ei2te$g2R
z4_3*c?nFHbTD<_pJ~PT~XfhO`bhBxGE@KAN_6Ewg2A?SAvDb}4$}`^7m93r5*Cfnr
z)x8uL^IAtcN8})HoEljbQJH_ox*^2KfrqUtLFWRWSDVtDe&`Xl%9JyEQM}M=Hnm?R
zu>*JFSUO(5E1>ypdamgWm*|WYX@8ttweS4%wtlzF0)N+-`MovBX-8ba%9^oyG5k=R
z{do8vjGLCFwAZ0^J6@g;(5z+TT$NyUnN%P1EcJE&!m1Rlz3D2R<1mH8-=RR-!kA)A
z(Fi&ARF&punF~-hj7u?>n_nLnKIM1#GVj>65_T4ggiaB3|L8V;7m4yvY3_x%a6HFP
zRNGHlE(d3k9sOB8KSto!Ic3I(shP5JNFjzcH1>259LDYP8>4v*yM}n<TICNx7fp%t
z#gWtFVioxo=6XtOi|vXE;aE1^XC$HZ51IlJZ1lNB={fz+%m6jx3zRMvd%NiO{;VF>
z-7ElgCS0pJfA!W2UDha#?9S>CaV**X35E7mD5ATgC7v4T#sN`H-YWjZ`grKlQF2yG
z_-sANd0)~gA>;+i8;#BOmgIC(pd4x&5zu12e$bK`Q~g>S&u+Kw+r=S60w!Mdy>I(o
z?0EEYiFI`Bfn&3Jj*KNZ>y$)=uLWN2rea*7e$Ws_GNy}<yRZHFLPF(XZi#E>5is<$
zzTNG-&89J_*)P2^Hr~{#er=mNv0kt=d5F`HVKz`#;A2_X&c~RHHsix81NXzqXFZM0
zV{16*{JR0=Z}Z>HjmDwp@T9FJX_07Pz;A*{GN!=G)n`;hQ0?Et0dkEL#ZX!Ff<8J`
zfp4omfE(tMXJb%N)$M;js`Q%s1MN5ZX|lVW1290}^QG|GsK25DtZ?$vouXanOO=SM
z-uI)|UpS6g6y26rlZ(_i+NpnnX=&dKG#A!#bCYA<!WuvBAh;F}uRnBn5_AOpQ#*Iv
z6(^wZviYRyOP%|4b&r1x->{XLq-Qh1tk!<IXl2roY}}|&+nFl8pW%Sa@M^}Fl)<46
z#l?wM;jR+!;Etu>D3yLVV9w0mby3NzIskaHMuGga*tCA$hZrYJNFJp3PkVBD7%v)I
zEP#Do0TKd*9yw4&N&6`B9+!*bXhnJ`Hv@Iv_k7w0Ow?t5gibL@F4}xrIw{cqeZni6
z*u7iZ5xXm#C~Pdxb&{%<MlMlsJ_3HaVWyH^|GxTFM0v;c$@5?Zd3p#yogKD%X*T6$
zWre*_%aT&7&hO3UYWdV8v$w|ci%N1YkZm9O=f&B&Z8gWVzaBbIu#4U8z0mrQs{36q
zIpjr}A>q=h?=y8w($^r|T4f2WkQRX2;vp%Vg8o|z%FoI3{{KJTN6tvjO`#=y0LPi*
zuspQsMl&_X_)w}s_Eid?>ygZ~$Yyk65;nM1kH}prj@`Am>M!|bBf1H(hq>JbWAr$(
z*oJ8xSlnO>XnOCNX+N9x+-bY4>ykgii*aPj?~xb4ny_2o3NKb}^4(mRZxQVN)Pved
z--E-#7snMMz&-dj40~vk5<^4{^$K*mXoASTnJ^Ii3Ri3zy?X_QC*vj7)36{M{5@EM
z@gU*`8KvFUPN2Y#>y>N*nM#F<ZDL9i0JlXt&Uy@L_39<SHn5k@PDdf}*t^IbEFg4%
z6)Z`du1>kD>7OBc6o8N#3ni(F2?Va!Mncs4F`zk^D2ODvF3ETQ-Yixq)&uMCS)+EE
zpVGniAl&?VFjSyMpV?qQYdLkG#u4-<^T&;7);`__k8hwA_j3XdStnopE$Itnt?qWW
zm~43{NEfHK!NbG=0A*L^ZYd3ze@>=3yNMXiaCCuJDkGg?3AD>bKu^DK9Yg*Tt8id=
zur}Tzy{`mHBC$mfkEOOO<^+rqO{I&opz@OYV5Rq{r_WF4Al$@cy0eCMLDMxk1O?;8
z%mY%Px0J5Uoo+k!1<EPA;!@C8Hy#X=C2F5Rhu;ss{{4$pB=h@f$@7EP*Ki<-j9VQn
z7o3*@K_&S89u+XcLuACwJScY7ZZCIU8Dcs<Gg|U^6*fY=gTIp<ogOgFr)91>VsNS3
zj2_Oir!lE5H~)L(Lg6<b4haeb@bOcO4A9|b5Qv5TG&6A(!9nHEH0pAS%+uvS0-oz4
zC~%yp*CDZ`d+*0FTcik%@qxwWZyer?;Nqly;h+H1UV+=r@&NtXUQnJ%XTe4qvj72t
z0d0&^LY!U=ywuOpdH4YjXvgQExe)6oGCr2+1R3XK?5XaRJ+QPJN-PCPo><LZ?z#ry
z27d5~|EK&`T`p--v-kX)SBiFYLe#?d%0&I<X2_ksKJsty<d7OeC!f=*m~2uT;qBT<
zOmB0*(%IXTxF;7|`g()`)F<a^s1q-EaWjahb65QeMl<1igx7yO2#_SX?7ktgMB||k
zpxNSDJPl&d!o|Os!lTpwiYuDSExS8JLL0~c_oKXN2wOH0^>P~)izsD2;fJZ>W`;`|
zZFWdYR0n+}aSlfyqL)Z?0wF+QH~Z?)z(GwKsCaV0fs_`5l34t2zY10xiukO}2~bxO
z3Ui65yTy!jQpm$lDddv!!7-<&8{zEeg;VB|UA7bRn!NcL<d9DpNM~0AKq!2fAqp7O
zP#`|vIS){eVWB?Y)6t80H`j91lPPmCC%u}(0|x?a7?b}dZ|*-=kNXkKi2|52bUXkD
zz7eJy7fMznj`a%8lfpGpl|G<VXi1E={qVEGr2rn3f0@_bdIt3yxYm_<$+-vu=9YJ=
zpkhyChVtt|1(aC)^a+q?wFBwduc->)1N0e*dlg;(%z%%ED;_}cXx@onN}{NKE7$$5
z%4-;4BE#bIB#4G}&yH7=-ihMPb*EdS`|pQhZ@)5YSKx(!n=5qi-{ykYQ6a1Q)-<@a
zs+;{}`^y?==MxpSu&WXz%ZL__I}9=Y*AwPMABZc-gUgTzBGtV6-fHAey{h;+dr^tY
zo6*J);6mJ{o3w0)?b59|J-N%t*toK2yXo>yj)~{@JTWIyACRGcRRR3|`*UyE_Ws(w
zz7DpO54L1@z(Gg+eDEt=*#jC8?Llse+v}Le(E+sFzzm{z;pzINJ2?c1<FrS?$yhK`
zg68hT`8rYi#DanqSk4QHafcZvqCnF4dUGr<6hMs(TeXND9!q6WWc_aaI0ypTB57|=
z-*%>D3lD$-aY_Raq6)l}87N{%zg+mt=IVwyysS$m%a<1!$rqc5<5jjRlj!kbr<t1c
zHq7I*T|`~{$@+M>D*<=^xHplVVkl5H$S<8wAeoW>RBY*ZcdVxfJlwnh2RKykJN~0=
zu3>kXe8Q2W9OS*_e!nqLFJ)h&0i{odz~%o}7pVs;6o-I>@ZSS_j(L%XRXQ0Lzg`V9
z;o}6&j$2o)0xa5;{vL}0eD44!#1zw7(Yk<h1QsfP^u9ld(Bc(Yp%6@eoQvEGVD}-t
zk`~8A&VXk#%F>5Vx4mT+dKyar8>6SW(hBg{aySV5ph8(Q1B_|}$o0y}%_XKZ@Z$Yz
zm-|l<5bWGZvt~&dj>1{#tB!gd3exuArexD!AyL(v_F^d<{(PTP7&LGYy3AWc0a!i&
zB(H&L<%3D1ff61f$TaiXVYa$&s{001K0^FYR@Q3CRNe`80$j5v;F^_(IbvuO8n6_4
zlTWLg&nu0ondA5YzK?*@6PHUR`9#zoM!K>pxE8hF$ee6UNNP*=(W$WV4k&<nKHg@`
zSkub`{WW>oh8^vDB~>#9$)PiJz()qiJllIbL~b1Rp5u7vE6Xk{76L!4P=C9A5;Gqu
zm<mdq;r;htOzt7y{_bxJ+M!-jElv50w!pywzDU4{q7v@(>W3A>C&Gw;yhUm)dF~+|
z0!p1fji+$(H*gFcE)SE>?pBohiK1G*>s;c%@W2>zDOa6<lF-%T^X6bX1}MNOs1mLf
z)Ee|lp?em68hf%b{<sVa&CXqQd;#+tH~{NC-VyCG&rg3~zA|QB-!N3O$HxK+uvQ96
z)NNHIg)}egagl>HC9`j;3TfC=;{WHM<QN{9k38!hWz9cWElzV#;Ur{$Hlv+5dbIO|
zD+UQ^WdU3GsoVJN9(W!+#!X-C5^>5qS04==cy29p)*@q_ZQt&7kDk5iH_i!es{Y|!
zricHlf5k1Wsh~7x?SlL_1W@=lZxT_{)poZr{%dW~pzC6FcWv4+$D;LvCWzAjgbrx`
zR+!I%_1nH?2OzeeS2o$a@c?ZWWd|yNF9;Ch0ex~sZPCL-RE>SZsNZHA?01gm*2kF|
zuJsc_Ti*Dv*nIGR^Kf4RFZd?cmcQe*WX$<B)xFo)YbO_DzCl{KC{eWFKwOJ)&;ajM
z4cGbTCeUI8eR&lMC1(S{o_ePwwy@Nl70+xN9Qi8b&u;{hEL|-OK5}J<$c)`2IgJV2
zfuihb0O4p50g$qG+!V}D?xMvb1BeCiI#VA~1R5VFRaVb_f|1P50@1@2aADooM5=0h
zFt#aFR-X&EH|}rioqHefQvHLk-Mfqyz?_Ey5%xx5{_{(f>(u;26zu3?->hfA9}eVp
zW*&IsZuyX;#gY6jXD>2yIFk#~*pAMyDFz1USI~)GhQ<!e-#d1x;?KPqi9Tx%PJuYL
zd}}WD2wLw^B^v&!YBf?Be0z5*wcGeq=;r8s9tMWH%L#kS&QB{wqudIp{mXaI8gCx&
z*H($2X7IxRp@+bm+u)UZUe4_lE_9qve++iKrrE6ZWih{{r*(LghS>1Vbkp<(V^A|{
zxPy!@#VkVvfhZ436l0HWV?K4@pChPrW>y=<pm-02Jl3B=P_Bi>cR$Q20Hqv|G+yu=
zleFbx4_7S}r=;hD3*y1{d7T<z%)v=!4nlg~b3m&DB`RVt0CD9}ndoMJCmZJ&4}6mo
z1Aea+s07O~+)5g;T7v<SLBPN>P`$?libSg!4VWUar{GQg{4E3}&szLE415U$ha#{h
zxeZHJ8?3C7yeEE~u?nuDc{`|&=*92nDS@S(BY1!(fm#Y_D&s#xtXsS3<&a=6|12d{
z^TEg|Dwqa%{xBF3Vfe7>&^!I?VQwDqlGYb)VkxA<&pJ>B5){u4W*{pO)pZ6teMn#f
zERRIfh7*p?0gSxBlQNS|!A%OmFd~ZK|CD+uy-HAut5;o_WDMws1WX<QAgeQUbv-Rg
zNT}3EdOm~ezauy{z}x1UY*d!0v#tZm*TN!5t1~6)N;(mIp&Hkdb<LTv2!-M&;1Wx|
zyV*8oV{=^d<xqeE7(xMJRxX!B!}X0;-N)fCe}DsGJUck`k6t1^a=v<b0CdO$+;TL)
z-CO$qK*MHj|C+iF>3<uo3Y%qE8)QgGh~L3ys9XiKLjbYGGuindO+Bm-G;f8TfX!)#
zIJEvK-DCo^KLgAU6w+1^xW~o<1bnnF_|K?Y(l-sp{HIU)G-BO|-dlJm%8eKJ@pOvm
zMp$9fWqH90c9OF)3%HiN`|q`#(i5%P7RSdpktQZE6g@Za@EvIX8Mtg&KKMVm7WK?W
z$Y3mo;KlH{u!xoDA3>l%fD~y<)3dD~C=1J`MuOV_N)Xlu^F1qvwW4isz?vSyegEPH
z?DOV?vT<-rU5_02g;q>3LaI#rI?dKO(9#AdQEQP$P>p??&A#`v|Lyx4Ool>YWN0;8
zV-E&^NCn|?$<Zjd-WeRwCW`65ofRt`D2=k|%Ax+Hd<e_)-T@2mKU918K&SrptBAa2
z5XVv==&$Sl`^iojQQm6vX0LmJ671RPyfl}|pMj-$s@Zjwa7G|a0K{{A`u|>qtikL+
z=}B=`6Z=ApXe{{L<>%FRwZ?|k+3};iI0~SY8p8c3J6MsAMz*$>tZytsdi9?L09=R_
zjm;LPp>H;s;$))?m@NUN?Wh!h3IvzN&P}UlMw*B^gKZR+VB35eu#c+DY^SbMU$jc!
zevU>tDnnZ?g?ItLBW2)Y*)PzcLLE3=wF>g+E~UN&ADGaPp{%jteshn59$P;k_c1=i
z_YwJ~*|_*t!|y-xKx-!0i>0-t7`WB|F!Ti4@nQlzvuA?^e+Pe}Ea8h^&;9RnCM$&d
tf1jc(DN+CXga`#QE&liM?aR+6$hNMKidAoJqq9G$DQi3|Rx}U#e*o~Q3F80&

literal 0
HcmV?d00001

diff --git a/kogito-data-index-overrides.yaml b/kogito-data-index-overrides.yaml
index ce2ea6b2997..80c44a45022 100644
--- a/kogito-data-index-overrides.yaml
+++ b/kogito-data-index-overrides.yaml
@@ -13,6 +13,17 @@ labels:
 - name: "io.openshift.expose-services"
   value: "8080:http"
 
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "KOGITO_DATA_INDEX_HTTP_PORT"
+    example: "9090"
+    description: "Defines which port the Data Index Container Image will listen on."
+  - name: "QUARKUS_INFINISPAN_CLIENT_SERVER_LIST"
+    example: "localhost:11222"
+    description: "Defines the Infinispan Server address, multiple values comma separated. If empty defaults to localhost:11222"
+
 ports:
 - value: 8080
 
diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index 4280d0ddfac..97003ef5469 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -14,6 +14,9 @@ labels:
   value: "8080:http"
 
 envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 - name: "ENABLE_PERSISTENCE"
   example: "true"
   description: "By default the Jobs services runs on memory only, if persistence is needed then set it to true. (Sets the property kogito.jobs-service.persistence to infinispan)."
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index 57152d452f7..7f9d4e3cd3d 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -13,6 +13,14 @@ labels:
 - name: "io.openshift.expose-services"
   value: "8080:http"
 
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "KOGITO_DATAINDEX_HTTP_URL"
+    example: "http://data-index.service:8080"
+    description: "Data Index service address, defaults tohttp://localhost:8180."
+
 ports:
 - value: 8080
 
diff --git a/kogito-quarkus-jvm-overrides.yaml b/kogito-quarkus-jvm-overrides.yaml
index aa5c4f6f1f8..c3402682b4a 100644
--- a/kogito-quarkus-jvm-overrides.yaml
+++ b/kogito-quarkus-jvm-overrides.yaml
@@ -14,6 +14,9 @@ labels:
   value: "/home/kogito/bin"
 
 envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 - name: JAVA_OPTIONS
   example: "-Dquarkus.log.level=DEBUG"
   description: JVM options passed to the Java command.
diff --git a/kogito-quarkus-overrides.yaml b/kogito-quarkus-overrides.yaml
index d23c8b3cb9a..e54ecabf65c 100644
--- a/kogito-quarkus-overrides.yaml
+++ b/kogito-quarkus-overrides.yaml
@@ -14,6 +14,9 @@ labels:
   value: "/home/kogito/bin"
 
 envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 - name: JAVA_OPTIONS
   example: "-Dquarkus.log.level=DEBUG"
   description: JVM options passed to the Java command.
diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
index 0e2f8174bd7..1b5ed239d90 100644
--- a/kogito-quarkus-s2i-overrides.yaml
+++ b/kogito-quarkus-s2i-overrides.yaml
@@ -12,6 +12,9 @@ labels:
   value: "builder,kogito,quarkus"
 
 envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 - name: NATIVE
   example: false
   description: If set to false, perform a non native build.
diff --git a/kogito-springboot-overrides.yaml b/kogito-springboot-overrides.yaml
index 7479ae7695a..7b4534954a1 100644
--- a/kogito-springboot-overrides.yaml
+++ b/kogito-springboot-overrides.yaml
@@ -14,6 +14,9 @@ labels:
   value: "/home/kogito/bin"
 
 envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 - name: JAVA_OPTIONS
   example: "-Ddebug=true"
   description: JVM options passed to the Java command.
diff --git a/kogito-springboot-s2i-overrides.yaml b/kogito-springboot-s2i-overrides.yaml
index 14f43088b11..1df6a2448a2 100644
--- a/kogito-springboot-s2i-overrides.yaml
+++ b/kogito-springboot-s2i-overrides.yaml
@@ -12,6 +12,9 @@ labels:
   value: "builder,kogito,springboot"
 
 envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 - name: JAVA_OPTIONS
   example: "-Ddebug=true"
   description: JVM options passed to the Java command.
diff --git a/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
index bf8b8a6d8b2..32f32dcff8d 100644
--- a/modules/kogito-infinispan-properties/module.yaml
+++ b/modules/kogito-infinispan-properties/module.yaml
@@ -4,19 +4,19 @@ version: "0.10.0-rc1"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
-    value: "false"
+    example: "false"
     description: "Flag that signals to Infinispan Hotrod client to use authentication (Used to set the infinispan.client.hotrod.use_auth system property)"
   - name: "INFINISPAN_USERNAME"
-    value: ""
+    example: "myUsername"
     description: "Username for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_username system property)"
   - name: "INFINISPAN_PASSWORD"
-    value: ""
+    example: "myPassword"
     description: "Password for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_password system property)"
   - name: "INFINISPAN_AUTHREALM"
-    value: ""
+    example: ""
     description: "Infinispan authentication realm (Used to set the infinispan.client.hotrod.auth_realm system property)"
   - name: "INFINISPAN_SASLMECHANISM"
-    value: ""
+    example: ""
     description: "Sasl mechanism to use during authentication. Example: PLAIN (Used to set the infinispan.client.hotrod.sasl_mechanism system property)"
 
 execute:
diff --git a/modules/kogito-quarkus-jvm/README.md b/modules/kogito-quarkus-jvm/README.md
deleted file mode 100644
index c094210fdd1..00000000000
--- a/modules/kogito-quarkus-jvm/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# JVM Runtime image for Kogito apps
-
-This Runtime image is considered a runtime image as it only contains the needed
-files used to execute a pre built Kogito application in native mode.
-
-This is a lightweight and compact application container image.
-
-This image can be used without the image builder, this image has the ability to copy
-built artifacts and files into the image so you can perform faster image builds to test your application.
-
-### Usage information:
-
-docker run -it quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest /home/kogito/kogito-app-launch.sh -h
-
diff --git a/modules/kogito-quarkus-s2i/README.md b/modules/kogito-quarkus-s2i/README.md
deleted file mode 100644
index c9efcf3940f..00000000000
--- a/modules/kogito-quarkus-s2i/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# S2I image to build builder image based on ubi8
-
-This S2I is considered image builder that is equipped with build tools
-
-- GraalVM
-- Apache Maven
-- JDK
-
-To perform non native builds set the env **NATIVE** to **false**.
-
-So it is equipped with all required tools to build a runnable native image of
-Kogito type of projects.
-
-
-### Usage:
-
-docker run -it quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest /home/kogito/kogito-app-launch.sh -h
-
diff --git a/modules/kogito-quarkus-s2i/s2i/bin/usage b/modules/kogito-quarkus-s2i/s2i/bin/usage
index 477737eaa37..93912cf1d95 100644
--- a/modules/kogito-quarkus-s2i/s2i/bin/usage
+++ b/modules/kogito-quarkus-s2i/s2i/bin/usage
@@ -7,18 +7,26 @@ such as processes, rules, decisions.
 
 To use it, install S2I: https://github.com/openshift/source-to-image
 
-This image is intended to build application binaries only that are later on transfered to runtime image.
+This image is intended only to build application binaries that will be copied to runtime image when the build is finished.
 
 
+S2I command syntax:
+
 s2i build -c <source code path/URL> quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image <image name>
 
+
 Sample invocation:
 
-s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8
+$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8
+
 
 For non native build, just set the NATIVE environment variable to false and use the quay.io/kiegroup/kogito-quarkus-jvm-ubi8
 image as runtime-image, in that way a *runner.jar will be produced and copied to the runtime image.
 
+Example:
+
+$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8 --env NATIVE=false
+
 You can then run the resulting image via:
 docker run <application image>
 EOF
\ No newline at end of file
diff --git a/modules/kogito-quarkus/README.md b/modules/kogito-quarkus/README.md
deleted file mode 100644
index 039f6ed4d7b..00000000000
--- a/modules/kogito-quarkus/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Native Runtime image for Kogito apps
-
-This Runtime image is considered a runtime image as it only contains the needed
-files used to execute a pre built Kogito application.
-
-This is a lightweight and compact application container image.
-
-This image can be used without the image builder, this image has the ability to copy
-built artifacts and files into the image so you can perform faster image builds to test your application.
-
-### Usage information:
-
-docker run -it quay.io/kiegroup/kogito-quarkus-ubi8:latest /home/kogito/kogito-app-launch.sh -h
-
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 4671dbc3ecf..5e2ae732057 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -356,7 +356,7 @@ teardown() {
     [ "${lines[1]}" = "'target/app-runner' -> '$KOGITO_HOME/bin/app-runner'" ]
 }
 
-@test "build_kogito_app only checks if it will generated the project in case there's no pom.xml" {
+@test "build_kogito_app only checks if it will generate the project in case there's no pom.xml" {
     mkdir /tmp/src
 
     run build_kogito_app
diff --git a/modules/kogito-springboot-s2i/README.md b/modules/kogito-springboot-s2i/README.md
deleted file mode 100644
index ff4f037958f..00000000000
--- a/modules/kogito-springboot-s2i/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# S2I image to build builder image based on ubi8
-
-This S2I is considered image builder that is equipped with build tools
-
-- OpenJDK 1.8
-- Apache Maven
-- JDK
-
-So it is equipped with all required tools to build a runnable fat jar of
-Kogito type of projects.
-
-### Usage:
-
-docker run -it quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest /home/kogito/kogito-app-launch.sh -h
-
diff --git a/modules/kogito-springboot-s2i/s2i/bin/usage b/modules/kogito-springboot-s2i/s2i/bin/usage
index 1bcbd121fad..42088233655 100755
--- a/modules/kogito-springboot-s2i/s2i/bin/usage
+++ b/modules/kogito-springboot-s2i/s2i/bin/usage
@@ -7,7 +7,7 @@ such as processes, rules, decisions.
 
 To use it, install S2I: https://github.com/openshift/source-to-image
 
-This image is intended to build application binaries only that are later on transfered to runtime image.
+This image is intended to build application binaries only that are later on transferred to runtime image.
 
 s2i build -c <source code path/URL> quay.io/kiegroup/kogito-springboot-ubi8-s2i <application image name> --runtime-image <image name>
 
diff --git a/modules/kogito-springboot/README.md b/modules/kogito-springboot/README.md
deleted file mode 100644
index b4b48a40a32..00000000000
--- a/modules/kogito-springboot/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# S2I image to build runtime image based on ubi8
-
-This S2I is considered a runtime image builder as it relies on another image
-(built with `kogito-springboot-ubi8-s2i`) that actually produced the binaries to be executed
-(the fat jar based on SpringBoot 2.1.x runtime). So this one will only get the binaries
-and place into the container.
-
-On top of the OS it has JRE installed (OpenJDK 1.8) to be able to execute fat jar.
-
-This image can be used without the image builder, this image has the ability to copy
-built artifacts and files into the image so you can perform faster image builds to test your application.
-
-### Usage information:
-
-docker run -it quay.io/kiegroup/kogito-springboot-ubi8:latest /home/kogito/kogito-app-launch.sh -h
-
diff --git a/modules/kogito-springboot/s2i/bin/usage b/modules/kogito-springboot/s2i/bin/usage
index 6ba9bc3082e..e6d6ff8e0e8 100755
--- a/modules/kogito-springboot/s2i/bin/usage
+++ b/modules/kogito-springboot/s2i/bin/usage
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 cat <<EOF
-This is the quay.io/kiegroup/kogito-springboot-ubi8 S2I image:
+This is the quay.io/kiegroup/kogito-springboot-ubi8 Runtime image:
 To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:

From 4fb4957866fb98c085be0d2dd1a786daae4bec60 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 16 Apr 2020 11:22:03 -0300
Subject: [PATCH 123/709] [KOGITO-1839] - Allow user use Make command to build
 and push images to local registry (#139)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Makefile                       | 10 ++++++++++
 scripts/README.md              | 25 +++++++++++++++++++++++++
 scripts/push-local-registry.sh | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 scripts/push-local-registry.sh

diff --git a/Makefile b/Makefile
index 27e6093e5da..e55bf38578f 100644
--- a/Makefile
+++ b/Makefile
@@ -108,3 +108,13 @@ push-staging: build _push-staging
 _push-staging:
 	python3 scripts/push-staging.py
 
+# push to local registry, useful to push the built images to local registry
+# requires parameter: REGISTRY: my-custom-registry:[port]
+# requires pre built images, if no images, run make build first
+# the shortened version will be used so operator can fetch it from the local namespace.
+# use the NS env to set the current namespace, if no set openshift will be used
+# example:  make push-local-registry REGISTRY=docker-registry-default.apps.spolti.cloud NS=spolti-1
+.PHONY: push-local-registry
+push-local-registry:
+	/bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}
+
diff --git a/scripts/README.md b/scripts/README.md
index 88fe7435b77..71d129ddabe 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -5,6 +5,7 @@ On this directory you can find some python scripts used to help with some repeti
 Today we have these scripts:
 
 - [manage-kogito-version.py](manage-kogito-version.py)
+- [push-local-registry.sh](push-local-registry.sh)
 - [push-staging.py](push-staging.py)
 
 
@@ -34,6 +35,30 @@ The command above will update all the needed files to the version 1.0.0. These c
  - kogito-imagestream.yaml
  
 
+### Pushing Images to a local registry
+
+This script will help you while building images and test in a local OpenShift Cluster. It requires you to already have
+images built in your local registry with the tag following the patter: X.Z, e.g. 0.10:
+
+```text
+quay.io/kiegroup/kogito-jobs-service:0.10
+```
+
+The [Makefile](../Makefile) has an option to do it, it can be invoked as the following sample:
+
+```bash
+$ make push-local-registry REGISTRY=docker-registry-default.apps.test.cloud NS=test-1
+```
+
+Where **NS** stands for the namespace where the images will be available.
+
+To execute the script directly:
+
+```bash
+$ /bin/sh scripts/push-local-registry.sh my_registry_address 0.10 my_namespace
+```
+
+
 ### Pushing staging images.
 
 Staging images are the release candidates which are pushed mainly after big changes that has direct impact on how
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
new file mode 100644
index 00000000000..dc38146fa22
--- /dev/null
+++ b/scripts/push-local-registry.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Simple usage: /bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}
+
+BUILD_ENGINE="docker"
+
+# All Kogito images
+IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-jobs-service kogito-management-console"
+
+registry=${REGISTRY:-{1}}
+version=${2:-latest}
+namespace=${3:-openshift}
+
+if [ "${registry}x" == "x"  ]; then
+    echo "No registry provided, please set the env REGISTRY or set it as parameter to this script"
+    echo "Simple usage: /bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}"
+    exit 1
+fi
+if [ "${version}" == "latest"  ]; then
+    echo "No version provided, latest will be used"
+fi
+if [ "${namespace}" == "openshift"  ]; then
+    echo "No namespace provided, images will be installed on openshift namespace"
+fi
+
+echo "Images version ${version} will be pushed to registry ${registry}"
+
+for image in ${IMAGES}; do
+    echo "tagging image ${image} to ${registry}/${namespace}/${image}:${version}"
+    ${BUILD_ENGINE} tag quay.io/kiegroup/${image}:${version} ${registry}/${namespace}/${image}:${version}
+    echo "Deleting imagestream ${image} if exists `oc delete oc -n ${namespace} ${image}`"
+    ${BUILD_ENGINE} push ${registry}/${namespace}/${image}:${version}
+done
+

From 4e8aa5ea8f0bc480de212b2f72d77f0d743d1389 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 20 Apr 2020 15:44:40 -0300
Subject: [PATCH 124/709] [master][KOGITO-1909] - Behave tests on Kogito images
 fails when non native build and no runtime image is used (#143)

Fixes Caused by: java.nio.file.AccessDeniedException: ./proc/tty/driver
when running behave tests with non native builds and no runtime image, try the example directly on the buider image.

Signed-off-by: spolti <fspolti@redhat.com>
---
 kogito-quarkus-s2i-overrides.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
index 1b5ed239d90..8e398157cc6 100644
--- a/kogito-quarkus-s2i-overrides.yaml
+++ b/kogito-quarkus-s2i-overrides.yaml
@@ -51,3 +51,5 @@ packages:
   - glibc-devel
   - zlib-devel
 
+run:
+  workdir: "/home/kogito"
\ No newline at end of file

From 7682073dc8f04f92d2793976fbb041ee4e8e4935 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 24 Apr 2020 11:48:44 -0300
Subject: [PATCH 125/709] [KOGITO-1672] - Improve Kogito Images Behave tests
 (#147)

This commit addresses:
- limit the memory for all native builds
- applies the same behave tests changes of https://github.com/kiegroup/kogito-images/pull/141 added to satisfy tests for sanity checks
- improves the manage-version script to match the change on kogito-examples, artifacts does n ot have version anymore :)
- update make file to:
	- run the tests after every image build with make command.
	- little fix for images tag when releasing, make push
- Fix the behavior for the INFINISPAN_USEAUTH
	- If env not set or empty, this should default to false.

Signed-off-by: spolti <fspolti@redhat.com>
---
 Jenkinsfile                                   |  51 +++-
 Makefile                                      |  98 +++++--
 README.md                                     |  32 ++-
 .../tests/bats/kogito-data-index.bats         |   3 +-
 .../added/kogito-infinispan-properties.sh     |   9 +-
 .../kogito-infinispan-properties/module.yaml  |   2 +-
 .../bats/kogito-infinispan-properties.bats    |   6 +-
 scripts/README.md                             |   8 +
 scripts/manage-kogito-version.py              |  82 +++---
 tests/features/common.feature                 |   1 -
 tests/features/kogito-data-index.feature      |   2 +-
 tests/features/kogito-jobs-service.feature    |  68 ++---
 .../kogito-management-console.feature         |  15 +-
 .../features/kogito-quarkus-jvm-ubi8.feature  |   1 -
 .../features/kogito-quarkus-ubi8-s2i.feature  | 241 ++++++++++++++----
 tests/features/kogito-quarkus-ubi8.feature    |  19 +-
 .../kogito-springboot-ubi8-s2i.feature        |  46 +++-
 tests/features/kogito-springboot-ubi8.feature |   2 -
 tests/test-apps/clone-repo.sh                 |  11 +-
 19 files changed, 511 insertions(+), 186 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fdc99705852..0c15c315703 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,19 +6,49 @@ pipeline{
                 sh "docker rmi -f \$(docker images -q) || date"
             }
         }
-        stage('Build'){
+        stage('Prepare offline kogito-examples'){
             steps{
-                sh "make build"
+                sh "make clone-repos"
             }
         }
-        stage('Test'){
+        stage('Build and test kogito-quarkus-ubi8 image'){
             steps{
-                sh "make test"
+                sh "make kogito-quarkus-ubi8"
             }
-            post{
-                always{
-                    junit 'target/test/results/*.xml'
-                }
+        }
+        stage('Build and test kogito-quarkus-jvm-ubi8 image'){
+            steps{
+                sh "make kogito-quarkus-jvm-ubi8"
+            }
+        }
+        stage('Build and test kogito-quarkus-ubi8-s2i image'){
+            steps{
+                sh "make kogito-quarkus-ubi8-s2i"
+            }
+        }
+        stage('Build and test kogito-springboot-ubi8 image'){
+            steps{
+                sh "make kogito-springboot-ubi8"
+            }
+        }
+        stage('Build and test kogito-springboot-ubi8-s2i image '){
+            steps{
+                sh "make kogito-springboot-ubi8-s2i"
+            }
+        }
+        stage('Build and test kogito-data-index image '){
+            steps{
+                sh "make kogito-data-index"
+            }
+        }
+        stage('Build and test kogito-jobs-service image '){
+            steps{
+                sh "make kogito-jobs-service"
+            }
+        }
+        stage('Build and test kogito-management-console image '){
+            steps{
+                sh "make kogito-management-console"
             }
         }
         stage('Finishing'){
@@ -27,5 +57,10 @@ pipeline{
             }
         }
     }
+    post{
+        always{
+            junit 'target/test/results/*.xml'
+        }
+    }
 }
 
diff --git a/Makefile b/Makefile
index e55bf38578f..79560d2bb7c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,70 +3,121 @@ SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"
 BUILD_ENGINE := docker
 .DEFAULT_GOAL := build
 
+
 # Build all images
 .PHONY: build
-build: kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-jobs-service kogito-management-console
+# start to build the images
+build: clone-repos kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-jobs-service kogito-management-console
 
+clone-repos:
+# if the NO_TEST env defined, proceed with the tests, as first step prepare the repo to be used
+ifneq ($(ignore_test),true)
+	cd tests/test-apps && sh clone-repo.sh
+endif
+
+# build the quay.io/kiegroup/kogito-quarkus-ubi8 image
 kogito-quarkus-ubi8:
+ifneq ($(ignore_build),true)
 	cekit -v build --overrides-file kogito-quarkus-overrides.yaml ${BUILD_ENGINE}
-ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+endif
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
+	cekit -v test --overrides-file kogito-quarkus-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-quarkus-jvm-ubi8 image
 kogito-quarkus-jvm-ubi8:
+ifneq ($(ignore_build),true)
 	cekit -v build --overrides-file kogito-quarkus-jvm-overrides.yaml ${BUILD_ENGINE}
-ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+endif
+# if no NO_TEST env defined, test the image
+ifneq ($(ignore_test),true)
+	cekit -v test --overrides-file kogito-quarkus-jvm-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-quarkus-ubi8-s2i image
 kogito-quarkus-ubi8-s2i:
+ifneq ($(ignore_build),true)
 	cekit -v build --overrides-file kogito-quarkus-s2i-overrides.yaml ${BUILD_ENGINE}
-ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+endif
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
+	cekit -v test --overrides-file kogito-quarkus-s2i-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-springboot-ubi8 image
 kogito-springboot-ubi8:
+ifneq ($(ignore_build),true)
 	cekit -v build --overrides-file kogito-springboot-overrides.yaml ${BUILD_ENGINE}
-ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+endif
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
+	cekit -v test --overrides-file kogito-springboot-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-springboot-ubi8-s2i image
 kogito-springboot-ubi8-s2i:
+ifneq ($(ignore_build),true)
 	cekit -v build --overrides-file kogito-springboot-s2i-overrides.yaml ${BUILD_ENGINE}
-ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+endif
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
+	cekit -v test --overrides-file kogito-springboot-s2i-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-data-index image
 kogito-data-index:
+ifneq ($(ignore_build),true)
 	cekit -v build --overrides-file kogito-data-index-overrides.yaml ${BUILD_ENGINE}
-ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+endif
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
+	cekit -v test --overrides-file kogito-data-index-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-jobs-service image
 kogito-jobs-service:
+ifneq ($(ignore_build),true)
 	cekit -v build --overrides-file kogito-jobs-service-overrides.yaml ${BUILD_ENGINE}
-ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+endif
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
+	cekit -v test --overrides-file kogito-jobs-service-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION} quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-management-console image
 kogito-management-console:
+ifneq ($(ignore_build),true)
 	cekit -v build --overrides-file kogito-management-console-overrides.yaml ${BUILD_ENGINE}
-ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION} quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
 endif
-
-# Build and test all images
-.PHONY: test
-test:
-	cd tests/test-apps && sh clone-repo.sh
-	cekit -v test --overrides-file kogito-quarkus-overrides.yaml behave
-	cekit -v test --overrides-file kogito-quarkus-jvm-overrides.yaml behave
-	cekit -v test --overrides-file kogito-quarkus-s2i-overrides.yaml behave
-	cekit -v test --overrides-file kogito-springboot-overrides.yaml behave
-	cekit -v test --overrides-file kogito-springboot-s2i-overrides.yaml behave
-	cekit -v test --overrides-file kogito-data-index-overrides.yaml behave
-	cekit -v test --overrides-file kogito-jobs-service-overrides.yaml behave
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
 	cekit -v test --overrides-file kogito-management-console-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION} quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
+endif
 
 
 # push images to quay.io, this requires permissions under kiegroup organization
@@ -89,7 +140,7 @@ _push:
 	docker push quay.io/kiegroup/kogito-jobs-service:latest
 	docker push quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-management-console:latest
-ifneq ($(findstring "rc",$(IMAGE_VERSION)),"rc")
+ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	@echo "${SHORTENED_LATEST_VERSION} will be pushed"
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${SHORTENED_LATEST_VERSION}
@@ -108,6 +159,7 @@ push-staging: build _push-staging
 _push-staging:
 	python3 scripts/push-staging.py
 
+
 # push to local registry, useful to push the built images to local registry
 # requires parameter: REGISTRY: my-custom-registry:[port]
 # requires pre built images, if no images, run make build first
diff --git a/README.md b/README.md
index 2af57c4c7b8..6e8b1097f75 100644
--- a/README.md
+++ b/README.md
@@ -825,12 +825,21 @@ Before proceed please make sure you have checked the [requirements](#kogito-imag
 To build the images for local testing there is a [Makefile](./Makefile) which will do all the hard work for you.
 With this Makefile you can:
 
-- Build all images with only one command
+- Build and test all images with only one command:
      ```bash
      $ make
      ```
-     
-- Build images individually
+     If there's no need to run the tests just set the *ignore_test* env to true, e.g.:
+     ```bash
+     $ make ignore_test=true
+     ```
+
+- Test all images with only one command, no build triggered, set the *ignore_build* env to true, e.g.:
+     ```bash
+     $ make ignore_build=true
+     ```
+ 
+- Build images individually, by default it will build and test each image
      ```bash
      $ make kogito-quarkus-ubi8
      $ make kogito-quarkus-jvm-ubi8
@@ -841,6 +850,17 @@ With this Makefile you can:
      $ make kogito-jobs-service 
      $ make kogito-management-console
      ```
+  
+     We can ignore the build or the tests while interacting with a specific image as well, to build only:
+     ```bash
+     $ make ignore_test=true {image_name}
+
+     ```
+     
+     Or to test only:
+     ```bash
+     $ make ignore_build=true {image_name}
+     ```      
      
 - Build and Push the Images to quay or a repo for you preference, for this you need to edit the Makefile accordingly: 
       ```bash
@@ -857,6 +877,12 @@ With this Makefile you can:
       ```
       It uses the [push-staging.py](scripts/push-staging.py) script to handle the images.
 
+- Push images to a local registry for testing 
+      ```bash
+      $ make push-local-registry REGISTRY=docker-registry-default.apps.spolti.cloud NS=spolti-1
+      ```
+      It uses the [push-local-registry.sh](scripts/push-local-registry.sh) script properly tag the images and push to the
+      desired registry.
 
 #### Image Modules
 
diff --git a/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
index cd6505c517b..48f7afc1528 100644
--- a/modules/kogito-data-index/tests/bats/kogito-data-index.bats
+++ b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
@@ -23,13 +23,12 @@ function clear_vars() {
 
 @test "check if infinispan properties is blank" {
     clear_vars
-    local expected=""
+    local expected=" -Dquarkus.infinispan-client.use-auth=false"
     configure_infinispan_props
     echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
     [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
 }
 
-
 @test "check if infinispan auth is false" {
     clear_vars
     export INFINISPAN_USEAUTH="false"
diff --git a/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh b/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
index d1b564c64d3..94cb9570042 100755
--- a/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
+++ b/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
@@ -23,12 +23,11 @@ function configure_infinispan_props() {
         exit 1
     fi
 
-    if [ -z "${INFINISPAN_USERNAME}" ]; then
-        if [ ! -z "${INFINISPAN_USEAUTH}" ]; then
-            INFINISPAN_USEAUTH="false"
-        fi
+    # default to false if empty or any value different than true or false.
+    if  [ -z "${INFINISPAN_USEAUTH}" ] || [[ ! ${INFINISPAN_USEAUTH^^} =~ FALSE$|TRUE$ ]]; then
+        INFINISPAN_USEAUTH="false"
     fi
- 
+
     if [ ! -z "${INFINISPAN_USERNAME}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-username=${INFINISPAN_USERNAME}"); INFINISPAN_USEAUTH="true"; fi
     if [ ! -z "${INFINISPAN_PASSWORD}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-password=${INFINISPAN_PASSWORD}"); fi
     if [ ! -z "${INFINISPAN_USEAUTH}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.use-auth=${INFINISPAN_USEAUTH}"); fi
diff --git a/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
index 32f32dcff8d..1fdfaa609e3 100644
--- a/modules/kogito-infinispan-properties/module.yaml
+++ b/modules/kogito-infinispan-properties/module.yaml
@@ -5,7 +5,7 @@ version: "0.10.0-rc1"
 envs:
   - name: "INFINISPAN_USEAUTH"
     example: "false"
-    description: "Flag that signals to Infinispan Hotrod client to use authentication (Used to set the infinispan.client.hotrod.use_auth system property)"
+    description: "Flag that signals to Infinispan Hotrod client to use authentication (Used to set the infinispan.client.hotrod.use_auth system property). Defaults to false"
   - name: "INFINISPAN_USERNAME"
     example: "myUsername"
     description: "Username for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_username system property)"
diff --git a/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats b/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
index 9502c089e8c..0c3eecd9abe 100644
--- a/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
+++ b/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
@@ -15,14 +15,13 @@ function clear_vars() {
 
 @test "check if infinispan properties is blank" {
     clear_vars
-    local expected=""
+    local expected=" -Dquarkus.infinispan-client.use-auth=false"
     configure_infinispan_props
 
     echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
     [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
 }
 
-
 @test "check if infinispan auth is false" {
     clear_vars
     export INFINISPAN_USEAUTH="false"
@@ -90,4 +89,5 @@ function clear_vars() {
     # exit
     echo "Status: ${status}"
     [ "$status" -eq 1 ]
-}
\ No newline at end of file
+}
+
diff --git a/scripts/README.md b/scripts/README.md
index 71d129ddabe..6e7cca62126 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -28,6 +28,14 @@ Its usage is pretty simple, only one parameter is accepted:
 $ python manage-kogito-version.py --bump-to 1.0.0  
 ```
 
+The script also allows you to set a custom branch for the kogito-examples repository on the behave tests. Useful for minor
+releases, e.g. 0.9.x branch.
+
+```bash
+$ python manage-kogito-version.py --bump-to 0.10.1-rc1 --apps-branch 0.10.x
+```
+
+
 The command above will update all the needed files to the version 1.0.0. These changes includes updates on
 
  - all cekit modules
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 57dc65e943b..29bab7d09b5 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -2,9 +2,11 @@
 # This script will be responsible to help to manage kogito images and modules version, it will update all needed files
 # Example of usage:
 #   # move the current version to the next one or rcX
-#   python manage-kogito-version --bump-to 0.99.0
+#   python scripts/manage-kogito-version.py --bump-to 0.99.0
 #
-#  The point of truth for vesion is the image.yaml.
+#   # to set a custom kogito-examples branch for the behave tests different than the defaults (sam than the version
+#   # or master for rc) use --branch-apps parameters, e.g.:
+#   python scripts/manage-kogito-version.py --bump-to 0.99.0 --apps-branch 0.10.x
 #
 # Dependencies:
 #  ruamel.yaml
@@ -41,10 +43,10 @@
 
 
 def yaml_loader():
-    '''
+    """
     default yaml Loader
     :return: yaml object
-    '''
+    """
     yaml = YAML()
     yaml.preserve_quotes = True
     yaml.width = 1024
@@ -53,10 +55,10 @@ def yaml_loader():
 
 
 def update_image_version(target_version):
-    '''
+    """
     Update image.yaml version tag.
     :param target_version: version used to update the image.yaml file
-    '''
+    """
     print("Updating Image main file version from file {0} to version {1}".format(IMAGE, target_version))
     try:
         with open(IMAGE) as image:
@@ -74,17 +76,16 @@ def update_image_version(target_version):
 
 
 def update_image_stream(target_version):
-    '''
+    """
     Update the imagestream file, it will update the tag name, version and image tag.
     :param target_version: version used to update the imagestream file;
-    '''
+    """
     print("Updating ImageStream images version from file {0} to version {1}".format(IMAGE_STREAM, target_version))
     try:
         with open(IMAGE_STREAM) as imagestream:
             data = yaml_loader().load(imagestream)
             for item_index, item in enumerate(data['items'], start=0):
                 for tag_index, tag in enumerate(item['spec']['tags'], start=0):
-                    # print(tag)
                     data['items'][item_index]['spec']['tags'][tag_index]['name'] = target_version
                     data['items'][item_index]['spec']['tags'][tag_index]['annotations']['version'] = target_version
                     imageDict = str.split(data['items'][item_index]['spec']['tags'][tag_index]['from']['name'], ':')
@@ -100,10 +101,10 @@ def update_image_stream(target_version):
 
 
 def update_kogito_modules(target_version):
-    '''
+    """
     Update every module.yaml file listed on MODULES as well the envs listed on ENVS.
     :param target_version:  version used to update all needed module.yaml files
-    '''
+    """
     modules_dir = "modules"
     try:
 
@@ -126,29 +127,30 @@ def update_kogito_modules(target_version):
         raise
 
 
-def update_behave_tests(target_branch):
-    '''
+def update_behave_tests(tests_branch):
+    """
     will update the behave tests accordingly.
     If master, the app 8.0.0-SNAPSHOT otherwise use the same value for branch and version
-    :param target_branch:
-    '''
+    :param tests_branch:
+    """
     base_dir = 'tests/features'
-    artifact_version = target_branch
-    if 'master' in target_branch:
-        artifact_version = '8.0.0-SNAPSHOT'
-
-    # this pattern will look for any occurrencies of using master or using x.x.x
-    pattern_branch = re.compile(r'(using master)|(using \s*([\d.]+))')
-    quarkus_native_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner\s)|(\s*([\d.]+)-runner\s)')
-    quarkus_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner.jar)|(\s*([\d.]+)-runner.jar)')
-    spring_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT.jar)|(\s*([\d.]+).jar)')
+    # if 'master' in target_branch:
+    #     artifact_version = '8.0.0-SNAPSHOT'
+
+    # this pattern will look for any occurrences of using master or using x.x.x
+    pattern_branch = re.compile(r'(using master)|(using \s*([\d.]+.x))|(using \s*([\d.]+))')
+    # kogito examples does not have the version on built examples anymore, let's comment it out for now.
+    # quarkus_native_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner\s)|((\s*([\d.]+)-runner\s)|(\s*([\d.]+)-SNAPSHOT-runner\s))')
+    # quarkus_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner.jar)|((\s*([\d.]+)-runner.jar)|(\s*([\d.]+)-SNAPSHOT-runner.jar))')
+    # spring_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT.jar)|((\s*([\d.]+).jar)|(\s*([\d.]+)-SNAPSHOT.jar))')
     for feature in BEHAVE_TESTS:
         print("Updating feature {0}".format(feature))
         with open(os.path.join(base_dir, feature)) as fe:
-            updated_value = pattern_branch.sub('using ' + target_branch, fe.read())
-            updated_value = quarkus_native_pattern_app_version.sub(artifact_version + '-runner ', updated_value)
-            updated_value = quarkus_pattern_app_version.sub(artifact_version + '-runner.jar', updated_value)
-            updated_value = spring_pattern_app_version.sub(artifact_version + '.jar', updated_value)
+            updated_value = pattern_branch.sub('using ' + tests_branch, fe.read())
+            # kogito examples does not have the version on built examples anymore, let's comment it out for now.
+            # updated_value = quarkus_native_pattern_app_version.sub(tests_version + '-runner ', updated_value)
+            # updated_value = quarkus_pattern_app_version.sub(tests_version + '-runner.jar', updated_value)
+            # updated_value = spring_pattern_app_version.sub(tests_version + '.jar', updated_value)
 
         with open(os.path.join(base_dir, feature), 'w') as fe:
             fe.write(updated_value)
@@ -156,17 +158,20 @@ def update_behave_tests(target_branch):
 
 def update_test_apps_clone_repo(target_branch):
     file = 'tests/test-apps/clone-repo.sh'
+    print('Updating file {}'.format(file))
     if target_branch == 'master':
-        # os.system('sed -i \'s/^git fetch origin --tags/#git fetch origin --tags/\' ' + file)
         os.system('sed -i \'s/^git checkout.*/git checkout master/\' ' + file)
+    elif 'x' in target_branch:
+        os.system('sed -i \'s/^git checkout.*/git checkout -b ' + target_branch + '/\' ' + file)
     else:
-        # os.system('sed -i \'s/^#git fetch origin --tags/git fetch origin --tags/\' ' + file)
-        os.system('sed -i \'s/^git checkout.*/git checkout -b '+target_branch+' '+target_branch+'/\' ' + file)
+        os.system('sed -i \'s/^git checkout.*/git checkout -b ' + target_branch + ' ' + target_branch + '/\' ' + file)
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Kogito Version Manager')
     parser.add_argument('--bump-to', dest='bump_to', help='bump everything to the next version')
+    parser.add_argument('--apps-branch', dest='apps_branch',
+                        help='Update Behave tests to use the desired branch for kogito-examples')
 
     args = parser.parse_args()
 
@@ -176,15 +181,22 @@ def update_test_apps_clone_repo(target_branch):
         pattern = '\d.\d{1,2}.(\d$|\d-rc\d+$)'
         regex = re.compile(r'\d.\d{1,2}.(\d$|\d-rc\d+$)')
         valid = regex.match(args.bump_to)
+        tests_branch = ""
         if valid:
+            tests_branch = args.bump_to
+            if args.apps_branch is not None:
+                tests_branch = args.apps_branch
+            if 'rc' in args.bump_to:
+                tests_branch = 'master'
+
             print("Version will be updated to {0}".format(args.bump_to))
+            print("Version on behave tests examples will be updated to version {0} and branch {1}".format(args.bump_to,
+                                                                                                          tests_branch))
+            input("Is the information correct? If so press any key to continue...")
+
             update_image_version(args.bump_to)
             update_image_stream(args.bump_to)
             update_kogito_modules(args.bump_to)
-            tests_branch = args.bump_to
-            if 'rc' in args.bump_to:
-                # update the tests to use kogito examples from master branch and app versions to 8.0.0-SNAPSHOT,
-                tests_branch = 'master'
             update_behave_tests(tests_branch)
             update_test_apps_clone_repo(tests_branch)
         else:
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 537cf55cd67..477159b71b1 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8 @quay.io/kiegroup/kiegroup/kogito-data-index
-
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/kogito-data-index.feature b/tests/features/kogito-data-index.feature
index f8a81403726..81768476894 100644
--- a/tests/features/kogito-data-index.feature
+++ b/tests/features/kogito-data-index.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-data-index
-
 Feature: Kogito-data-index feature.
 
   Scenario: verify if all labels are correctly set.
@@ -69,3 +68,4 @@ Feature: Kogito-data-index feature.
       | INFINISPAN_USEAUTH              | true                   |
       | INFINISPAN_SASLMECHANISM        | PLAIN                  |
      Then container log should not contain Error: Could not find or load main class [ERROR]
+
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 127a5b4bb11..53f6026c168 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -1,16 +1,15 @@
 @quay.io/kiegroup/kogito-jobs-service
-
 Feature: Kogito-jobs-service feature.
 
   Scenario: verify if all labels are correctly set.
     Given image is built
-     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
-     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-     And the image should contain label io.openshift.s2i.destination with value /tmp
-     And the image should contain label io.openshift.expose-services with value 8080:http
-     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service
-     And the image should contain label io.k8s.display-name with value Kogito Jobs Service
-     And the image should contain label io.openshift.tags with value kogito,jobs-service
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service
+    And the image should contain label io.k8s.display-name with value Kogito Jobs Service
+    And the image should contain label io.openshift.tags with value kogito,jobs-service
 
   Scenario: verify if the jobs service binary is available on /home/kogito/bin
     When container is started with command bash
@@ -21,12 +20,14 @@ Feature: Kogito-jobs-service feature.
       | variable     | value |
       | SCRIPT_DEBUG | true  |
     Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false -jar /home/kogito/bin/kogito-jobs-service-runner.jar
+    And container log should contain started in
+    And container log should not contain Application failed to start
 
   Scenario: verify if container fails if persistence is enabled but there is no infinispan server list.
     When container is started with env
-      | variable            | value |
-      | ENABLE_PERSISTENCE  | true  |
-     Then container log should contain INFINISPAN_CLIENT_SERVER_LIST env not found, please set it.
+      | variable           | value |
+      | ENABLE_PERSISTENCE | true  |
+    Then container log should contain INFINISPAN_CLIENT_SERVER_LIST env not found, please set it.
 
   Scenario: verify if the persistence is correctly enabled without auth
     When container is started with env
@@ -35,7 +36,9 @@ Feature: Kogito-jobs-service feature.
       | ENABLE_PERSISTENCE            | true            |
       | INFINISPAN_CLIENT_SERVER_LIST | localhost:11111 |
     Then container log should contain quarkus.infinispan-client.server-list = localhost:11111
-     And container log should contain quarkus.infinispan-client.use-auth = false
+    And container log should contain quarkus.infinispan-client.use-auth = false
+    And container log should contain started in
+    And container log should not contain Application failed to start
 
   Scenario: verify if auth is correctly set
     When container is started with env
@@ -47,9 +50,11 @@ Feature: Kogito-jobs-service feature.
       | INFINISPAN_USERNAME           | IamNotExist     |
       | INFINISPAN_PASSWORD           | hard2guess      |
     Then container log should contain quarkus.infinispan-client.use-auth = true
-     And container log should contain quarkus.infinispan-client.auth-password = hard2guess
-     And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
-     And container log should contain quarkus.infinispan-client.server-list = localhost:11111
+    And container log should contain quarkus.infinispan-client.auth-password = hard2guess
+    And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
+    And container log should contain quarkus.infinispan-client.server-list = localhost:11111
+    And container log should contain started in
+    And container log should not contain Application failed to start
 
   Scenario: verify if all parameters are correctly set
     When container is started with env
@@ -63,24 +68,27 @@ Feature: Kogito-jobs-service feature.
       | INFINISPAN_AUTHREALM          | SecretRealm     |
       | INFINISPAN_SASLMECHANISM      | COOLGSSAPI      |
     Then container log should contain quarkus.infinispan-client.use-auth = true
-     And container log should contain quarkus.infinispan-client.auth-password = hard2guess
-     And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
-     And container log should contain quarkus.infinispan-client.auth-realm = SecretRealm
-     And container log should contain quarkus.infinispan-client.sasl-mechanism = COOLGSSAPI
-     And container log should contain quarkus.infinispan-client.server-list = localhost:11111
+    And container log should contain quarkus.infinispan-client.auth-password = hard2guess
+    And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
+    And container log should contain quarkus.infinispan-client.auth-realm = SecretRealm
+    And container log should contain quarkus.infinispan-client.sasl-mechanism = COOLGSSAPI
+    And container log should contain quarkus.infinispan-client.server-list = localhost:11111
+    And container log should contain started in
+    And container log should not contain Application failed to start
 
   Scenario: verify if container fails if event is enabled but there is no Kafka bootstrap server set.
     When container is started with env
-      | variable            | value |
-      | ENABLE_EVENTS       | true  |
-     Then container log should contain KAFKA_BOOTSTRAP_SERVERS env not found, please set it.
-    
-     @ignore
+      | variable      | value |
+      | ENABLE_EVENTS | true  |
+    Then container log should contain KAFKA_BOOTSTRAP_SERVERS env not found, please set it.
+
   Scenario: verify if the events is correctly enabled
     When container is started with env
-      | variable                      | value           |
-      | SCRIPT_DEBUG                  | true            |
-      | ENABLE_EVENTS                 | true            |
-      | KAFKA_BOOTSTRAP_SERVERS       | localhost:11111 |
+      | variable                | value           |
+      | SCRIPT_DEBUG            | true            |
+      | ENABLE_EVENTS           | true            |
+      | KAFKA_BOOTSTRAP_SERVERS | localhost:11111 |
     Then container log should contain bootstrap.servers = [localhost:11111]
-     And container log should contain Connection to node -1 (localhost/127.0.0.1:11111) could not be established.
+    And container log should contain started in
+    And container log should contain Connection to node -1 (localhost/127.0.0.1:11111) could not be established.
+
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index 9f28a4b5a0b..282e9fc4d3b 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-management-console
-
 Feature: kogito-management-console feature
 
   Scenario: verify if all labels are correctly set.
@@ -21,13 +20,17 @@ Feature: kogito-management-console feature
       | variable     | value |
       | SCRIPT_DEBUG | true  |
     Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
-     And container log should contain Data index url not set, default will be used: http://localhost:8180
+    And container log should contain Data index url not set, default will be used: http://localhost:8180
+    And container log should contain started in
+    And container log should not contain Application failed to start
 
   Scenario: Verify if the debug is correctly enabled and set data-index url
     When container is started with env
-      | variable                     | value             |
-      | SCRIPT_DEBUG                 | true              |
-      | KOGITO_DATAINDEX_HTTP_URL    | http://test:9090  |
+      | variable                  | value            |
+      | SCRIPT_DEBUG              | true             |
+      | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
     Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
-     And container log should not contain Data index url not set, default will be used: http://localhost:8180
+    And container log should not contain Data index url not set, default will be used: http://localhost:8180
+    And container log should contain started in
+    And container log should not contain Application failed to start
 
diff --git a/tests/features/kogito-quarkus-jvm-ubi8.feature b/tests/features/kogito-quarkus-jvm-ubi8.feature
index 7605146d21a..0760ed483fb 100644
--- a/tests/features/kogito-quarkus-jvm-ubi8.feature
+++ b/tests/features/kogito-quarkus-jvm-ubi8.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8
-
 Feature: Kogito-quarkus-ubi8 feature.
 
   Scenario: verify if all labels are correctly set.
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index e82f52e5ed6..bdc120d968f 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -1,57 +1,110 @@
 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i
 Feature: kogito-quarkus-ubi8-s2i image tests
 
-  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable       | value                     |
-      | LIMIT_MEMORY   | 3221225472                |
+  Scenario: Verify if the s2i build is finished as expected using native build and runtime image
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable     | value      |
+      | NATIVE       | true       |
+      | LIMIT_MEMORY | 3221225472 |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+    And file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+    And s2i build log should contain -J-Xmx2576980377
+
+  Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+      | variable     | value      |
+      | NATIVE       | true       |
+      | LIMIT_MEMORY | 3221225472 |
     Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
     And s2i build log should contain -J-Xmx2576980377
 
-  Scenario: Verify if the s2i build is finished as expected performing a non native build
+  Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+      | variable | value |
+      | NATIVE   | false |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+
+  Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable            | value                     |
-      | NATIVE              | false                     |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+      | variable     | value                     |
+      | NATIVE       | false                     |
+      | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG |
     Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
-  Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port
+  Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
     Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
+  Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable     | value      |
+      | NATIVE       | true       |
+      | LIMIT_MEMORY | 6442450944 |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable          | value         |
@@ -64,48 +117,107 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
+  # ignore until https://issues.redhat.com/browse/KOGITO-2003 is not fixed.
+  @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable          | value         |
       | NATIVE            | true          |
+      | LIMIT_MEMORY      | 6442450944    |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/process-quarkus-example-runner should exist
+    Then run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
+    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
+    And file /home/kogito/bin/process-quarkus-example-runner should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
-    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
-    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
-  Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port
+  Scenario: Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable          | value                           |
-      | NATIVE            | false                           |
-      | ARTIFACT_DIR      | rules-quarkus-helloworld/target   |
-      | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am  |
+      | variable          | value                            |
+      | NATIVE            | false                            |
+      | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
+      | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am |
     Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
+  Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable          | value                            |
+      | NATIVE            | true                             |
+      | LIMIT_MEMORY      | 6442450944                       |
+      | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
+      | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+
   Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
-      | variable          | value                  |
-      | NATIVE            | false                  |
+      | variable | value |
+      | NATIVE   | false |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
-      | variable          | value    |
-      | NATIVE            | false    |
+      | variable | value |
+      | NATIVE   | false |
+    Then s2i build log should contain Expanding artifacts from incremental build...
+    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+
+  Scenario: Perform a third incremental s2i build, this time, with native enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+      | variable     | value      |
+      | NATIVE       | true       |
+      | LIMIT_MEMORY | 6442450944 |
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+    And check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
 
   Scenario: verify if all labels are correctly set.
     Given image is built
@@ -132,9 +244,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
     Given s2i build /tmp/kogito-examples from dmn-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable          | value                           |
-      | NATIVE            | false                           |
-      | KOGITO_VERSION    | 8.0.0-SNAPSHOT                  |
+      | variable       | value          |
+      | NATIVE         | false          |
+      | KOGITO_VERSION | 8.0.0-SNAPSHOT |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
     And check that page is served
       | property        | value                                                                                            |
@@ -146,3 +258,20 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | content_type    | application/json                                                                                 |
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable       | value          |
+      | NATIVE         | true           |
+      | LIMIT_MEMORY   | 6442450944     |
+      | KOGITO_VERSION | 8.0.0-SNAPSHOT |
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+
diff --git a/tests/features/kogito-quarkus-ubi8.feature b/tests/features/kogito-quarkus-ubi8.feature
index 9363d6a0da5..4131b7a1612 100644
--- a/tests/features/kogito-quarkus-ubi8.feature
+++ b/tests/features/kogito-quarkus-ubi8.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-quarkus-ubi8
-
 Feature: Kogito-quarkus-ubi8 feature.
 
   Scenario: verify if all labels are correctly set.
@@ -16,4 +15,20 @@ Feature: Kogito-quarkus-ubi8 feature.
   Scenario: verify java cacerts and libsunec are available in the given container.
     When container is started with command bash
     Then  file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
\ No newline at end of file
+    And file /home/kogito/cacerts should exist
+
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld-native/ from target
+      | variable            | value                     |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | request_method  | POST                     |
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
+      | wait            | 80                       |
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
\ No newline at end of file
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index d19cb00ce41..f999e671d3f 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -1,9 +1,22 @@
 @quay.io/kiegroup/kogito-springboot-ubi8-s2i
-
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable     | value        |
+      | JAVA_OPTIONS | -Ddebug=true |
+    Then check that page is served
+      | property             | value     |
+      | port                 | 8080      |
+      | path                 | /orders/1 |
+      | wait                 | 80        |
+      | expected_status_code | 204       |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+
+  Scenario: Verify if the s2i build is finished as expected with no runtime image
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -16,12 +29,35 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
+  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
+    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable            | value        |
+    Then check that page is served
+      | property             | value     |
+      | port                 | 8080      |
+      | path                 | /orders/1 |
+      | wait                 | 80        |
+      | expected_status_code | 204       |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain Tomcat initialized with port(s): 8080 (http)
+
+  Scenario: Verify if the s2i build is finished as expected with persistence enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable          | value         |
+      | MAVEN_ARGS_APPEND | -Ppersistence |
+    Then file /home/kogito/bin/process-springboot-example.jar should exist
+    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+    And s2i build log should contain ---> [persistence] generating md5 for persistence files
+    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
+    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
+
   Scenario: Verify if the s2i build is finished as expected using multi-module build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable            | value                           |
-      | JAVA_OPTIONS        | -Ddebug=true                    |
-      | ARTIFACT_DIR        | process-springboot-example/target   |
-      | MAVEN_ARGS_APPEND   | -pl process-springboot-example -am  |
+      | variable          | value                              |
+      | JAVA_OPTIONS      | -Ddebug=true                       |
+      | ARTIFACT_DIR      | process-springboot-example/target  |
+      | MAVEN_ARGS_APPEND | -pl process-springboot-example -am |
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
diff --git a/tests/features/kogito-springboot-ubi8.feature b/tests/features/kogito-springboot-ubi8.feature
index 92d185790d5..992b96246fd 100644
--- a/tests/features/kogito-springboot-ubi8.feature
+++ b/tests/features/kogito-springboot-ubi8.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-springboot-ubi8
-
 Feature: springboot-quarkus-ubi8 feature.
 
   Scenario: verify if all labels are correctly set.
@@ -19,7 +18,6 @@ Feature: springboot-quarkus-ubi8 feature.
     And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
     And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
 
-
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples/process-springboot-example from target
       | variable            | value        |
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 6e935593240..8ffffab3c43 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -2,6 +2,9 @@
 #
 # Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
 
+# exit when any command fails
+set -e
+
 TEST_DIR=`pwd`
 cd /tmp
 rm -rf kogito-examples/
@@ -10,20 +13,24 @@ cd kogito-examples/
 git fetch origin --tags
 git checkout master
 
+# make a new copy of rules-quarkus-helloworld for native tests
+cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/
+
 # generating the app binaries to test the binary build
 mvn -f rules-quarkus-helloworld clean package -DskipTests
 mvn -f process-springboot-example clean package -DskipTests
+mvn -f rules-quarkus-helloworld-native -Pnative clean package -DskipTests
 
 # preparing directory to run kogito maven archetypes tests
 cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-quarkus-example/
 rm -rf /tmp/kogito-examples/dmn-quarkus-example/src
 rm -rf /tmp/kogito-examples/dmn-quarkus-example/pom.xml
 
-# by adding the application.properties file telling quarkus to start on
+# by adding the application.properties file telling app to start on
 # port 10000, the purpose of this tests is make sure that the images
 # will ensure the use of the port 8080.
 cp ${TEST_DIR}/application.properties /tmp/kogito-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
+(echo ""; echo "server.port=10000") >> /tmp/kogito-examples/process-springboot-example/src/main/resources/application.properties
 
-cd rules-quarkus-helloworld
 git add --all  :/
 git commit -am "test"

From baa9742cd47d4c20b99f7ebc3d5a35492ff6e11a Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <khandelwaltarun32@live.com>
Date: Sat, 25 Apr 2020 00:28:10 +0530
Subject: [PATCH 126/709] KOGITO-1227 - Create pipeline to build and test
 Kogito images when a new Pull Request is created. (#138)

Updating Jenkinsfile to clean containers in the pipeline itself.

Signed-off-by: TARUN KHANDELWAL <tarkhand@redhat.com>
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0c15c315703..7763ecc0f7c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline{
     stages{
         stage('Initialization'){
             steps{
-                sh "docker rmi -f \$(docker images -q) || date"
+                sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
             }
         }
         stage('Prepare offline kogito-examples'){

From 180ea05a2e761fda5fa4d51e51cf02bc2ddd051f Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 27 Apr 2020 10:09:29 -0300
Subject: [PATCH 127/709] [KOGITO-1672] - Improve Kogito Images Behave tests
 (#149)

Signed-off-by: spolti <fspolti@redhat.com>
---
 tests/features/kogito-springboot-ubi8-s2i.feature | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index f999e671d3f..9368ba55b7b 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-springboot-ubi8-s2i
 Feature: kogito-springboot-ubi8-s2i image tests
 
-  Scenario: Verify if the s2i build is finished as expected
+  Scenario: Verify if the s2i build is finished as expected with debug enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable     | value        |
       | JAVA_OPTIONS | -Ddebug=true |
@@ -12,10 +12,10 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | wait                 | 80        |
       | expected_status_code | 204       |
     And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
+    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
-  Scenario: Verify if the s2i build is finished as expected with no runtime image
+  Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
@@ -26,12 +26,11 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | wait                 | 80        |
       | expected_status_code | 204       |
     And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
+    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
     Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable            | value        |
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
@@ -52,7 +51,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
-  Scenario: Verify if the s2i build is finished as expected using multi-module build
+  Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable          | value                              |
       | JAVA_OPTIONS      | -Ddebug=true                       |
@@ -65,7 +64,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | wait                 | 80        |
       | expected_status_code | 204       |
     And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
+    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build

From a9fad846a049632b662273819b2e633c26a62bf3 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Wed, 29 Apr 2020 02:17:32 +0530
Subject: [PATCH 128/709] KOGITO-1964 Kogito Images nightly builds (#151)

This pipeline will build and push the images to quay
Between UTC 12:00AM - 3:00 AM midnight if there is a push on that day

Signed-off-by: Tarun Khandelwal <tarkhand@redhat.com>
---
 Jenkinsfile-Nightly | 105 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 Jenkinsfile-Nightly

diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
new file mode 100644
index 00000000000..05b35d9c814
--- /dev/null
+++ b/Jenkinsfile-Nightly
@@ -0,0 +1,105 @@
+//Checks master branch for updates every day
+//If found triggers the pipeline, 
+//The pipeline is set to run between 12:00AM - 3:00AM UTC
+
+pipeline{
+    agent { label 'jenkins-slave'}
+     triggers{
+        pollSCM(
+            scmpoll_spec: '@midnight', 
+            ignorePostCommitHooks: true
+        )
+    }
+    stages{
+        stage('Initialization'){
+            steps{
+                sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
+            }
+        }
+        stage('Prepare offline kogito-examples'){
+            steps{
+                sh "make clone-repos"
+            }
+        }
+        stage('Build and test kogito-quarkus-ubi8 image'){
+            steps{
+                sh "make kogito-quarkus-ubi8"
+            }
+        }
+        stage('Build and test kogito-quarkus-jvm-ubi8 image'){
+            steps{
+                sh "make kogito-quarkus-jvm-ubi8"
+            }
+        }
+        stage('Build and test kogito-quarkus-ubi8-s2i image'){
+            steps{
+                sh "make kogito-quarkus-ubi8-s2i"
+            }
+        }
+        stage('Build and test kogito-springboot-ubi8 image'){
+            steps{
+                sh "make kogito-springboot-ubi8"
+            }
+        }
+        stage('Build and test kogito-springboot-ubi8-s2i image '){
+            steps{
+                sh "make kogito-springboot-ubi8-s2i"
+            }
+        }
+        stage('Build and test kogito-data-index image '){
+            steps{
+                sh "make kogito-data-index"
+            }
+        }
+        stage('Build and test kogito-jobs-service image '){
+            steps{
+                sh "make kogito-jobs-service"
+            }
+        }
+        stage('Build and test kogito-management-console image '){
+            steps{
+                sh "make kogito-management-console"
+            }
+        }
+        stage('Tagging'){
+            steps{
+                sh """
+                docker tag quay.io/kiegroup/kogito-quarkus-ubi8:latest                    quay.io/kiegroup/kogito-quarkus-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+	        docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest                quay.io/kiegroup/kogito-quarkus-jvm-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+	        docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest                quay.io/kiegroup/kogito-quarkus-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+	        docker tag quay.io/kiegroup/kogito-springboot-ubi8:latest                 quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+	        docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest             quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                docker tag quay.io/kiegroup/kogito-data-index:latest                      quay.io/kiegroup/kogito-data-index-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+	        docker tag quay.io/kiegroup/kogito-jobs-service:latest                    quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+	        docker tag quay.io/kiegroup/kogito-management-console:latest              quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+	        """
+            }
+        }
+        stage('Pushing'){
+            steps{
+                withDockerRegistry([ credentialsId: "quay", url: "https://quay.io" ]){
+                    sh """
+                        docker push quay.io/kiegroup/kogito-quarkus-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                        docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                        docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                        docker push quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                        docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                        docker push quay.io/kiegroup/kogito-data-index-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                        docker push quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                        docker push quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                       """
+                }
+            }
+        }
+        stage('Finishing'){
+            steps{
+                sh "docker rmi -f \$(docker images -q) || date"
+            }
+        }
+    }
+    post{
+        always{
+            junit 'target/test/results/*.xml'
+        }
+    }
+}

From 08d7947c077d3a59e13ecff851d9b3c6728116ce Mon Sep 17 00:00:00 2001
From: vaibhavjainwiz <vajain@redhat.com>
Date: Mon, 11 May 2020 20:03:44 +0530
Subject: [PATCH 129/709] [KOGITO-1214] - Do not use echo statement on the
 images to print log (#153)

* [KOGITO-1214] - Do not use echo statement on the images to print log
---
 kogito-data-index-overrides.yaml              |  1 +
 kogito-jobs-service-overrides.yaml            |  1 +
 kogito-management-console-overrides.yaml      |  1 +
 kogito-quarkus-jvm-overrides.yaml             |  1 +
 kogito-quarkus-overrides.yaml                 |  1 +
 kogito-quarkus-s2i-overrides.yaml             |  1 +
 kogito-springboot-overrides.yaml              |  1 +
 kogito-springboot-s2i-overrides.yaml          |  1 +
 .../added/kogito-app-launch.sh                |  7 ++-
 .../tests/bats/kogito-data-index.bats         |  7 ++-
 .../added/memory-limit.sh                     |  7 ++-
 .../tests/bats/memory-limits.bats             | 20 +++++---
 .../added/kogito-infinispan-properties.sh     |  5 +-
 .../bats/kogito-infinispan-properties.bats    |  3 ++
 .../added/kogito-app-launch.sh                |  7 ++-
 .../tests/bats/kogito-jobs-service.bats       |  9 +++-
 .../added/kogito-kubernetes-client.sh         |  2 +-
 .../kogito-launch-scripts/added/configure.sh  |  5 +-
 .../added/kogito-app-launch.sh                |  7 ++-
 .../added/launch/kogito-management-console.sh |  6 ++-
 .../tests/bats/kogito-management-console.bats |  1 +
 modules/kogito-s2i-core/added/s2i-core        | 49 ++++++++++---------
 modules/kogito-s2i-core/module.yaml           |  1 -
 .../kogito-s2i-core/tests/bats/s2i-core.bats  |  2 +
 24 files changed, 99 insertions(+), 47 deletions(-)

diff --git a/kogito-data-index-overrides.yaml b/kogito-data-index-overrides.yaml
index 80c44a45022..7eb11d50446 100644
--- a/kogito-data-index-overrides.yaml
+++ b/kogito-data-index-overrides.yaml
@@ -31,6 +31,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index 97003ef5469..565d98ee085 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -43,6 +43,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index 7f9d4e3cd3d..621b9661dbe 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -28,6 +28,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
diff --git a/kogito-quarkus-jvm-overrides.yaml b/kogito-quarkus-jvm-overrides.yaml
index c3402682b4a..759e16651e8 100644
--- a/kogito-quarkus-jvm-overrides.yaml
+++ b/kogito-quarkus-jvm-overrides.yaml
@@ -28,6 +28,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.s2i.core
diff --git a/kogito-quarkus-overrides.yaml b/kogito-quarkus-overrides.yaml
index e54ecabf65c..cd7f85db990 100644
--- a/kogito-quarkus-overrides.yaml
+++ b/kogito-quarkus-overrides.yaml
@@ -31,6 +31,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
   - name: org.kie.kogito.graalvm.installer
     version: "19.3.1-java-11"
   - name: org.kie.kogito.s2i.core
diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
index 8e398157cc6..2d1b4f14c56 100644
--- a/kogito-quarkus-s2i-overrides.yaml
+++ b/kogito-quarkus-s2i-overrides.yaml
@@ -32,6 +32,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
     version: "19.3.1-java-11"
diff --git a/kogito-springboot-overrides.yaml b/kogito-springboot-overrides.yaml
index 7b4534954a1..de6068f5934 100644
--- a/kogito-springboot-overrides.yaml
+++ b/kogito-springboot-overrides.yaml
@@ -31,6 +31,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.s2i.core
diff --git a/kogito-springboot-s2i-overrides.yaml b/kogito-springboot-s2i-overrides.yaml
index 1df6a2448a2..c399f1c3354 100644
--- a/kogito-springboot-s2i-overrides.yaml
+++ b/kogito-springboot-s2i-overrides.yaml
@@ -29,6 +29,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.maven
     version: "3.6.2"
diff --git a/modules/kogito-data-index/added/kogito-app-launch.sh b/modules/kogito-data-index/added/kogito-app-launch.sh
index 04034232707..28e7de9c423 100644
--- a/modules/kogito-data-index/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index/added/kogito-app-launch.sh
@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
     SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    echo "JVM settings debug is enabled."
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
 fi
 
 
diff --git a/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
index 48f7afc1528..198ecc0e1e8 100644
--- a/modules/kogito-data-index/tests/bats/kogito-data-index.bats
+++ b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
@@ -4,11 +4,16 @@ export KOGITO_HOME=/tmp/kogito
 export HOME=$KOGITO_HOME
 mkdir -p ${KOGITO_HOME}/launch
 cp $BATS_TEST_DIRNAME/../../../kogito-infinispan-properties/added/kogito-infinispan-properties.sh ${KOGITO_HOME}/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
 
 # imports
 load ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-data-index.sh
 
+function setup(){
+  function log_error() { echo "ERROR ${1}"; }
+}
+
 teardown() {
     rm -rf ${KOGITO_HOME}
 }
@@ -94,7 +99,7 @@ function clear_vars() {
 
     run configure_infinispan_props
 
-    expected="[ERROR] Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
+    expected="ERROR Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
     echo "Result is ${output} and expected is ${expected}"
     echo "Expected status is 1, outcome status is ${status}"
     [ "$status" -eq 1 ]
diff --git a/modules/kogito-graalvm-scripts/added/memory-limit.sh b/modules/kogito-graalvm-scripts/added/memory-limit.sh
index 9053363ae66..e2877730514 100644
--- a/modules/kogito-graalvm-scripts/added/memory-limit.sh
+++ b/modules/kogito-graalvm-scripts/added/memory-limit.sh
@@ -11,6 +11,9 @@
 # configure the GraalVM build memory usage limit based on the LIMIT_MEMORY env
 # its value must be in binary bytes.
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
 function configure() {
     # does not accepts
     if [[  "${LIMIT_MEMORY}" =~ ^[-+]?[0-9]+{9}$ ]]; then
@@ -18,7 +21,7 @@ function configure() {
         local limit=1073741824
         # only 80% of the actual limit will be used for the JVM
         local jvm_limit_memory=$(($LIMIT_MEMORY*80/100))
-        echo "Limit memory for this container is set to ${LIMIT_MEMORY}. Allocated memory for JVM will be set to ${jvm_limit_memory}."
+        log_info "Limit memory for this container is set to ${LIMIT_MEMORY}. Allocated memory for JVM will be set to ${jvm_limit_memory}."
         if [ "${jvm_limit_memory}" -lt "${limit}" ]; then
             limit=$(echo "scale=1; ${limit} / (80/100)" | bc -l)
             printf "Provided memory (${LIMIT_MEMORY}) limit is too small (should be greater then %.0f bytes), native build will use all available memory.\n" $limit
@@ -26,7 +29,7 @@ function configure() {
             export KOGITO_OPTS="${KOGITO_OPTS} -Dnative-image.xmx=${jvm_limit_memory}"
         fi
     else
-        echo "Provided memory (${LIMIT_MEMORY}) limit is not valid, native build will use all available memory"
+        log_warning "Provided memory (${LIMIT_MEMORY}) limit is not valid, native build will use all available memory"
     fi
 }
 
diff --git a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats b/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
index b20ae95649b..a1250a6c01e 100644
--- a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
+++ b/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
@@ -1,5 +1,9 @@
 #!/usr/bin/env bats
 
+export KOGITO_HOME=/tmp/kogito
+mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+
 # imports
 source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
 
@@ -24,17 +28,19 @@ source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
 @test "test a small memory limit value" {
     export LIMIT_MEMORY="1073741600"
     local expected="Provided memory (1073741600) limit is too small"
-    local result=$(configure)
+    run configure
+    local result="${lines[1]}"
     echo "Expected: ${expected}"
-    echo "Result: ${result}"
-    [[ ${result} == *"${expected}"* ]]
+    echo "Result is ${result}"
+    [[ "${result}" == *"${expected}"* ]]
 }
 
 @test "test a invalid memory limit value" {
+    function log_warning() { echo "WARN ${1}"; }
     export LIMIT_MEMORY="1024m"
-    local expected="Provided memory (1024m) limit is not valid, native build will use all available memory"
-    local result=$(configure)
+    local expected="WARN Provided memory (1024m) limit is not valid, native build will use all available memory"
+    run configure
     echo "Expected: ${expected}"
-    echo "Result: ${result}"
-    [ "${expected}" = "${result}" ]
+    echo "Result: ${output}"
+    [ "${expected}" = "${output}" ]
 }
diff --git a/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh b/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
index 94cb9570042..2b7baa0b099 100755
--- a/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
+++ b/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
@@ -1,5 +1,8 @@
 #!/bin/bash -e
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
 function prepareEnv() {
     # keep it on alphabetical order
     unset INFINISPAN_AUTHREALM
@@ -19,7 +22,7 @@ function configure_infinispan_props() {
     local infinispan_props=""
 
     if [[ "${INFINISPAN_USEAUTH}" == "true" ]] && [[ -z "${INFINISPAN_USERNAME}"  || -z "${INFINISPAN_PASSWORD}" ]]; then
-        echo "[ERROR] Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
+        log_error "Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
         exit 1
     fi
 
diff --git a/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats b/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
index 0c3eecd9abe..7be259c3fa6 100644
--- a/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
+++ b/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
@@ -1,6 +1,9 @@
 #!/usr/bin/env bats
 
 export TEST=true
+export KOGITO_HOME=/tmp/kogito
+mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
 
 # import
 load $BATS_TEST_DIRNAME/../../added/kogito-infinispan-properties.sh
diff --git a/modules/kogito-jobs-service/added/kogito-app-launch.sh b/modules/kogito-jobs-service/added/kogito-app-launch.sh
index 95ea6989018..eea5f4bcfb9 100644
--- a/modules/kogito-jobs-service/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service/added/kogito-app-launch.sh
@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
     SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    echo "JVM settings debug is enabled."
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
 fi
 
 
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index 96f3c817579..180118ae986 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -4,7 +4,7 @@ export KOGITO_HOME=/tmp/kogito
 export HOME=$KOGITO_HOME
 mkdir -p ${KOGITO_HOME}/launch
 cp $BATS_TEST_DIRNAME/../../../kogito-infinispan-properties/added/kogito-infinispan-properties.sh ${KOGITO_HOME}/launch/
-
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-jobs-service.sh
@@ -81,3 +81,10 @@ teardown() {
     echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
 }
+
+@test "enable event without set kafka bootstrap server" {
+    export ENABLE_EVENTS="true"
+    run configure_jobs_service
+    echo "status is ${status}"
+    [ "$status" -eq 1 ]
+}
\ No newline at end of file
diff --git a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
index bb9ec36f90f..0dce31dc1a8 100644
--- a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
+++ b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
@@ -34,7 +34,7 @@ function list_or_get_k8s_resource() {
             -H "Authorization: Bearer $token" \
             -H 'Accept: application/json' \
             ${KUBERNETES_SERVICE_PROTOCOL:-https}://${KUBERNETES_SERVICE_HOST:-kubernetes.default.svc}:${KUBERNETES_SERVICE_PORT:-443}/${api}/v1/namespaces/${namespace}/${resource}?labelSelector=${labels}\&fieldSelector=${fields})
-        echo ${response}
+        log_info ${response}
     else
         log_info "--> [k8s-client] Not running on Kubernetes, skipping..."
     fi
diff --git a/modules/kogito-launch-scripts/added/configure.sh b/modules/kogito-launch-scripts/added/configure.sh
index b97f3427cb4..0f3f3ad23a5 100644
--- a/modules/kogito-launch-scripts/added/configure.sh
+++ b/modules/kogito-launch-scripts/added/configure.sh
@@ -46,6 +46,9 @@
 # type entries, which should only be processed once.
 #
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
 # clear functions from any previous module
 function prepareModule() {
   unset -f preConfigure
@@ -96,7 +99,7 @@ function processEnvFiles() {
               executeModules configureEnv
               executeModules postConfigureEnv
             else
-              echo "Warning - Could not process environment for $prop_file.  File does not exist."
+              log_warning "Could not process environment for $prop_file.  File does not exist."
             fi
           )
         done
diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
index 6e60b476a06..b8132695221 100644
--- a/modules/kogito-management-console/added/kogito-app-launch.sh
+++ b/modules/kogito-management-console/added/kogito-app-launch.sh
@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
     SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    echo "JVM settings debug is enabled."
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
 fi
 
 
diff --git a/modules/kogito-management-console/added/launch/kogito-management-console.sh b/modules/kogito-management-console/added/launch/kogito-management-console.sh
index 4195c5cea97..65beee33539 100644
--- a/modules/kogito-management-console/added/launch/kogito-management-console.sh
+++ b/modules/kogito-management-console/added/launch/kogito-management-console.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
@@ -17,11 +19,11 @@ function configure_data_index_url {
     local dataIndexURL=${KOGITO_DATAINDEX_HTTP_URL}
     if [ "${dataIndexURL}x" != "x" ]; then
         if [[ ! "${dataIndexURL}x" =~ $url_simple_regex ]]; then
-            echo "URL must start with http or https."
+            log_error "URL must start with http or https."
             exit 10
         fi
     else
-        echo "Data index url not set, default will be used: http://localhost:8180"
+        log_info "Data index url not set, default will be used: http://localhost:8180"
         dataIndexURL="http://localhost:8180"
     fi
     KOGITO_MANAGEMENT_CONSOLE_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
diff --git a/modules/kogito-management-console/tests/bats/kogito-management-console.bats b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
index 33a731a8d0d..f0c063ce7e3 100644
--- a/modules/kogito-management-console/tests/bats/kogito-management-console.bats
+++ b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
@@ -3,6 +3,7 @@
 export KOGITO_HOME=/tmp/kogito
 export HOME=$KOGITO_HOME
 mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-management-console.sh
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 605c70c2045..b1567cc315c 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 # imports
+source ${KOGITO_HOME}/launch/logging.sh
 source $KOGITO_HOME/launch/kogito-persistence.sh
 
 S2I_DESTINATION_DIR="${S2I_DESTINATION_DIR:-/tmp}"
@@ -19,7 +20,7 @@ fi
 
 function manage_incremental_build() {
     if [ -d /tmp/artifacts ]; then
-        echo "Expanding artifacts from incremental build..."
+        log_info "Expanding artifacts from incremental build..."
         ( cd /tmp/artifacts && tar cf - . ) | ( cd ${HOME} && tar xvf - )
         rm -rf /tmp/artifacts
     fi
@@ -28,19 +29,19 @@ function manage_incremental_build() {
 
 function assemble_runtime() {
     if [ -d "$KOGITO_HOME/bin" ]; then
-        echo "---> Application binaries found and ready to use"
+        log_info "---> Application binaries found and ready to use"
 
-        echo "---> [s2i-core] Adding custom labels..."
+        log_info "---> [s2i-core] Adding custom labels..."
         if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
             mkdir -pv /tmp/.s2i
             mkdir -pv /tmp/src/.s2i/
             cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
             cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/src/.s2i/image_metadata.json
         else
-            echo "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+            log_info "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
         fi
     else
-        echo "---> Application binaries NOT found, failing build..."
+        log_error "---> Application binaries NOT found, failing build..."
         exit 1
     fi
     # handle persistence files
@@ -50,30 +51,30 @@ function assemble_runtime() {
 
 # copy already built artifacts to the runtime image.
 function runtime_assemble() {
-    echo "-----> [s2i-core] Running runtime assemble script"
+    log_info "-----> [s2i-core] Running runtime assemble script"
     cd ${S2I_DESTINATION_DIR}/src
     if [ "${BINARY_BUILD^^}" == "TRUE" ] || ls | grep -E '*.jar|classes|maven*|*-runner|target' 1> /dev/null 2>&1; then
-        echo "-----> Binary build enabled, artifacts were uploaded directly to the image build"
+        log_info "-----> Binary build enabled, artifacts were uploaded directly to the image build"
         if ls target 1> /dev/null 2>&1; then
-            echo "-----> Entire target dir uploaded"
+            log_info "-----> Entire target dir uploaded"
             cd "target"    
         fi
 
         local result=$(file -b --mime-type *-runner | grep x-executable)
         if [ "$result" == "application/x-executable" ]; then
-            echo "-----> Found binary file, native build."
+            log_info "-----> Found binary file, native build."
             NATIVE="TRUE"
         else
             if ls | grep -E '*-runner.jar' 1> /dev/null 2>&1;then
-                echo "-----> Found jar file, not native build."
+                log_info "-----> Found jar file, not native build."
                 NATIVE="FALSE"
             fi
         fi
-        echo "-----> Cleaning up unneeded jar files"
+        log_info "-----> Cleaning up unneeded jar files"
         rm -rfv *-tests.jar
         rm -rfv *-sources.jar
 
-        echo "-----> Copying uploaded files to ${KOGITO_HOME}"
+        log_info "-----> Copying uploaded files to ${KOGITO_HOME}"
         artifactDir="."
         ARTIFACT_DIR=$artifactDir
         handle_image_metadata_json
@@ -83,13 +84,13 @@ function runtime_assemble() {
         cp -Rv --parents ./* ${KOGITO_HOME}/
     fi
     assemble_runtime
-    echo "-----> Cleaning up s2i directory"
+    log_info "-----> Cleaning up s2i directory"
     rm -rfv ${S2I_DESTINATION_DIR}/src/*
 }
 
 
 function handle_image_metadata_json() {
-    echo "---> [s2i-core] Copy image metadata file..."
+    log_info "---> [s2i-core] Copy image metadata file..."
     if [ -e "/tmp/src/${artifactDir}/image_metadata.json" ]; then
         mkdir /tmp/.s2i
         mkdir -p /tmp/src/.s2i/
@@ -97,7 +98,7 @@ function handle_image_metadata_json() {
         cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/src/.s2i
         cp -v /tmp/src/$artifactDir/image_metadata.json $KOGITO_HOME/bin
     else
-        echo "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
+        log_info "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
     fi
 }
 
@@ -116,14 +117,14 @@ function build_kogito_app() {
 
     if [ -f "pom.xml" ]; then
 
-        echo "---> Building application from source..."
+        log_info "---> Building application from source..."
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
             -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
             -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 
     else
 
-        echo "---> Generating project structure..."
+        log_info "---> Generating project structure..."
 
         $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=kogito-quarkus-archetype \
         -DarchetypeVersion=$KOGITO_VERSION -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
@@ -132,9 +133,9 @@ function build_kogito_app() {
         for item in *
         do
             if [ -d "${item}" ] && [ "${item}" == "project" ]; then
-                echo "--> Skipping generated project ..."
+                log_info "--> Skipping generated project ..."
             else
-                echo "--> Coping resource "${item}""
+                log_info "--> Coping resource "${item}""
                 cp -Rv "${item}" project/src/main/resources
             fi
         done
@@ -147,7 +148,7 @@ function build_kogito_app() {
             -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
     fi
 
-    echo "---> Build finished, installing application from path $(pwd)"
+    log_info "---> Build finished, installing application from path $(pwd)"
 }
 
 function copy_kogito_app() {
@@ -155,23 +156,23 @@ function copy_kogito_app() {
     if [ "${NATIVE^^}" == "FALSE" ]; then
         # handle quarkus java build
         if ls $artifactDir/*-runner.jar 1> /dev/null 2>&1; then
-            echo "---> Installing jar file"
+            log_info "---> Installing jar file"
             cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin
             if [ -d "${artifactDir}/lib" ]; then
-                echo "---> Copying application libraries"
+                log_info "---> Copying application libraries"
                 cp -r $artifactDir/lib/ $KOGITO_HOME/bin
             fi
         fi
 
     elif ls $artifactDir/*-runner 1> /dev/null 2>&1; then
         # quarkus native builds
-        echo "---> Installing application binaries"
+        log_info "---> Installing application binaries"
         cp -v $artifactDir/*-runner $KOGITO_HOME/bin/
         chmod +x $KOGITO_HOME/bin/*-runner
 
     else
         # handle normal java builds
-        echo "---> Installing application binaries"
+        log_info "---> Installing application binaries"
         cp -v $artifactDir/*.jar $KOGITO_HOME/bin
     fi
 }
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index a26f8ba28ba..6f58254b5a1 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -29,7 +29,6 @@ envs:
 modules:
   install:
     - name: org.kie.kogito.persistence
-    - name: org.kie.kogito.logging
 
 run:
   cmd:
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 5e2ae732057..c3b077ea726 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -13,6 +13,8 @@ source $BATS_TEST_DIRNAME/../../added/s2i-core
 setup() {
     export HOME=$KOGITO_HOME
     mkdir -p target
+    function log_error() { echo "${1}"; }
+    function log_info() { echo "${1}"; }
 }
 
 teardown() {

From bd92d9d59c1046552a634c46b0ccdd0dbf1d8c90 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <khandelwaltarun32@live.com>
Date: Wed, 13 May 2020 19:56:41 +0530
Subject: [PATCH 130/709] [KOGITO-2118] - Write script to retrieve latest
 snapshot urls for services jar artifacts (#154)

Signed-off-by: TARUN KHANDELWAL <tarkhand@redhat.com>
---
 Jenkinsfile-Nightly         |   5 ++
 scripts/README.md           |  33 +++++++++-
 scripts/update-artifacts.py | 120 ++++++++++++++++++++++++++++++++++++
 3 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 scripts/update-artifacts.py

diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
index 05b35d9c814..55c1b483fdd 100644
--- a/Jenkinsfile-Nightly
+++ b/Jenkinsfile-Nightly
@@ -16,6 +16,11 @@ pipeline{
                 sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
             }
         }
+        stage('Update Artifacts'){
+            steps{
+                sh "python3 scripts/update-artifacts.py"
+            }
+        }
         stage('Prepare offline kogito-examples'){
             steps{
                 sh "make clone-repos"
diff --git a/scripts/README.md b/scripts/README.md
index 6e7cca62126..f60fdc3a959 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -7,7 +7,7 @@ Today we have these scripts:
 - [manage-kogito-version.py](manage-kogito-version.py)
 - [push-local-registry.sh](push-local-registry.sh)
 - [push-staging.py](push-staging.py)
-
+- [update-artifacts.py](update-artifacts.py)
 
 ### Managing Kogito images version
 
@@ -85,3 +85,34 @@ This script is called as the last step of the `make push-staging` command define
 It will look for the current RC images available on [quay.io](https://quay.io/organization/kiegroup) to increase the rc tag 
 accordingly then push the new tag so it can be tested by others. 
 
+#### Updating Kogito Images service artifacts.
+
+The update-artifacts script will help in fetching the URL of latest artifacts from the repo
+and update them in the `module.yaml` files of the kogito services
+
+#### Script dependencies
+
+The `update-artifacts.py` has some dependencies that needs to be manually installed:
+
+```bash
+$ pip install -U ruamel.yaml
+$ pip install -U elementpath
+```
+It's usage is pretty simple as well:
+
+```bash
+$ python update-artifacts.py
+```
+
+This script also accepts `--snapshot-version` as argument in specifying the current version of artifacts which need to be fetched
+
+```bash
+$ python update-artifacts.py --snapshot-version='8.0.0-SNAPSHOT'
+```
+if no argument is given, it takes the default value of `8.0.0-SNAPSHOT`
+
+The command will update the needed files with latest snapshot URL:
+
+ - kogito-data-index/module.yaml
+ - kogito-jobs-service/module.yaml
+ - kogito-management-console/module.yaml
\ No newline at end of file
diff --git a/scripts/update-artifacts.py b/scripts/update-artifacts.py
new file mode 100644
index 00000000000..bb08c45c389
--- /dev/null
+++ b/scripts/update-artifacts.py
@@ -0,0 +1,120 @@
+#!/usr/bin/python3
+#Script responsible for fetching the latest artifacts of kogito services and updating their module.yaml files
+#Should be run from root directory of the repository
+#Sample usage:  python3 scripts/update-artifacts.py
+#
+#Dependencies
+# ruamel.yaml
+# elementpath 
+
+
+import xml.etree.ElementTree as ET
+import requests
+import subprocess as sp
+import os
+import argparse
+from ruamel.yaml import YAML
+
+repoURL = "https://repository.jboss.org/org/kie/kogito/"
+
+Modules = {
+    #service-name: module-name(directory in which module's module.yaml file is present)
+    #Note: Service name should be same as given in the repository
+    "data-index-service": "kogito-data-index",
+    "jobs-service": "kogito-jobs-service",
+    "management-console": "kogito-management-console"
+}
+
+
+def getMetadataRoot(repoURL):
+    '''
+    Get the root element from the maven-metadata
+    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :return: root object
+    '''
+    metadataURL=repoURL+"maven-metadata.xml"
+    mavenMetadata=requests.get(metadataURL)
+    with open('maven-metadata.xml', 'wb') as f:
+        f.write(mavenMetadata.content)
+    tree = ET.parse('maven-metadata.xml')
+    root=tree.getroot()
+    return root
+
+def getSnapshotVersion(repoURL):
+    '''
+    parse the xml and finds the snapshotVersion
+    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :return: snapshotVersion string
+    '''
+    root=getMetadataRoot(repoURL)
+    snapshotVersion=root.find("./versioning/snapshotVersions/snapshotVersion/value").text
+    return snapshotVersion
+
+def getArtifactID(repoURL):
+    '''
+    parse the xml and finds the artifactID
+    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :return: artifactID string
+    '''
+    root=getMetadataRoot(repoURL)
+    artifactID=root.find("./artifactId").text
+    return artifactID
+
+def getRunnerURL(repoURL):
+    ''' 
+    Creates the updated URL for runner.jar
+    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :return: url string
+    '''
+    artifactId=getArtifactID(repoURL)
+    snapshotVersion=getSnapshotVersion(repoURL)
+    url=repoURL+"{}-{}-runner.jar".format(artifactId,snapshotVersion)
+    return url
+
+def getMD5(repoURL):
+    '''
+    Fetches the md5 code for the latest runner.jar
+    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :return: runnerMD5 string
+    '''
+    runnerURL=getRunnerURL(repoURL)
+    runnerMD5URL=runnerURL+".md5"
+    runnerMD5=sp.getoutput("curl -s  {}".format(runnerMD5URL))
+    return runnerMD5
+
+def yaml_loader():
+    '''
+    default yaml Loader
+    :return: yaml object
+    '''
+    yaml = YAML()
+    yaml.preserve_quotes = True
+    yaml.width = 1024
+    yaml.indent(mapping=2, sequence=4, offset=2)
+    return yaml
+
+def update_artifacts(repoURL,modulePath):
+    '''
+    Updates the module.yaml file of services with latest artifacts
+    :parm repoURL: URL of the repo from which artifacts needs to be updated
+    :param modulePath: relative file location of the module.yaml for the kogito service
+    '''
+
+    with open(modulePath) as module:
+        data=yaml_loader().load(module)
+        data['artifacts'][0]['url']=getRunnerURL(repoURL)
+        data['artifacts'][0]['md5']=getMD5(repoURL)
+    with open(modulePath, 'w') as module:
+        yaml_loader().dump(data, module)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Update the snapshot url for kogito services.')
+    parser.add_argument('--snapshot-version', dest='snapshotVersion', default='8.0.0-SNAPSHOT', help='Defines the snapshot version of the jboss repository, defaults to 8.0.0-SNAPSHOT')
+    args = parser.parse_args()
+    
+    for service, path in Modules.items():
+        update_artifacts(repoURL+"{}/{}/".format(service,args.snapshotVersion),"modules/{}/module.yaml".format(path))
+        print("Successfully updated the artifacts for: ",service)
+
+    os.remove("maven-metadata.xml")

From 91848eb500acde284662bc14288197a724cde0e7 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <khandelwaltarun32@live.com>
Date: Thu, 14 May 2020 01:13:24 +0530
Subject: [PATCH 131/709] [KOGITO-877] - Improve the KOGITO images push-stating
 script to also increase the tag on image-stream (#157)

Signed-off-by: TARUN KHANDELWAL <tarkhand@redhat.com>
---
 scripts/README.md                |  17 ++++-
 scripts/common.py                | 112 +++++++++++++++++++++++++++++
 scripts/manage-kogito-version.py | 118 +++----------------------------
 scripts/push-staging.py          |  25 +++++--
 4 files changed, 153 insertions(+), 119 deletions(-)
 create mode 100644 scripts/common.py

diff --git a/scripts/README.md b/scripts/README.md
index f60fdc3a959..293c3ad8125 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -8,6 +8,7 @@ Today we have these scripts:
 - [push-local-registry.sh](push-local-registry.sh)
 - [push-staging.py](push-staging.py)
 - [update-artifacts.py](update-artifacts.py)
+- [common.py](common.py)
 
 ### Managing Kogito images version
 
@@ -21,7 +22,7 @@ The `manage-kogito-version.py` has one dependency that needs to be manually inst
 ```bash
 $ pip install -U ruamel.yaml
 ```
-
+This script has a dependency on `common.py`.
 Its usage is pretty simple, only one parameter is accepted:
 
 ```bash
@@ -72,12 +73,20 @@ $ /bin/sh scripts/push-local-registry.sh my_registry_address 0.10 my_namespace
 Staging images are the release candidates which are pushed mainly after big changes that has direct impact on how
 the images will behave and also when new functionality is added.
 
+The script updates the version on:
+
+ - all cekit modules
+ - image.yaml file descriptor
+ - kogito-imagestream.yaml
+ 
+
 #### Script dependencies
 
-The `push-stating.py` has a few dependencies that probably needs to be manually installed:
+The `push-staging.py` has a few dependencies that probably needs to be manually installed:
 
 ```bash
 $ pip install -U docker yaml
+$ pip install -U ruamel.yaml
 ```
 
 This script is called as the last step of the `make push-staging` command defined on the [Makefile](../Makefile).
@@ -115,4 +124,6 @@ The command will update the needed files with latest snapshot URL:
 
  - kogito-data-index/module.yaml
  - kogito-jobs-service/module.yaml
- - kogito-management-console/module.yaml
\ No newline at end of file
+ - kogito-management-console/module.yaml
+### Common script
+The `common.py` script defines some common functions for the scripts.
diff --git a/scripts/common.py b/scripts/common.py
new file mode 100644
index 00000000000..ea6af14ca77
--- /dev/null
+++ b/scripts/common.py
@@ -0,0 +1,112 @@
+#!/usr/bin/python3
+#This script defines some common function that are used by manage-kogito-version.py and push-staging.py script
+
+
+import os
+import re
+
+from ruamel.yaml import YAML
+
+# all kogito-image modules that points to the kogito version.
+MODULES = {"kogito-data-index", "kogito-image-dependencies",
+           "kogito-infinispan-properties", "kogito-jobs-service",
+           "kogito-jq", "kogito-kubernetes-client",
+           "kogito-launch-scripts", "kogito-logging",
+           "kogito-management-console", "kogito-persistence",
+           "kogito-quarkus", "kogito-quarkus-jvm",
+           "kogito-quarkus-s2i", "kogito-s2i-core",
+           "kogito-springboot", "kogito-springboot-s2i",
+           "kogito-system-user"}
+
+# imagestream file that contains all images, this file aldo needs to be updated.
+IMAGE_STREAM = "kogito-imagestream.yaml"
+
+# image.yaml file definition that needs to be updated
+IMAGE = "image.yaml"
+
+# declared envs on modules.yaml that also needs to have its version updated
+ENVS = {"KOGITO_VERSION"}
+
+def yaml_loader():
+    """
+    default yaml Loader
+    :return: yaml object
+    """
+    yaml = YAML()
+    yaml.preserve_quotes = True
+    yaml.width = 1024
+    yaml.indent(mapping=2, sequence=4, offset=2)
+    return yaml
+
+def update_image_version(target_version):
+    """
+    Update image.yaml version tag.
+    :param target_version: version used to update the image.yaml file
+    """
+    print("Updating Image main file version from file {0} to version {1}".format(IMAGE, target_version))
+    try:
+        with open(IMAGE) as image:
+            data = yaml_loader().load(image)
+            if 'version' in data:
+                data['version'] = target_version
+            else:
+                print("Field version not found, returning...")
+                return
+
+        with open(IMAGE, 'w') as image:
+            yaml_loader().dump(data, image)
+    except TypeError as err:
+        print("Unexpected error:", err)
+
+
+def update_image_stream(target_version):
+    """
+    Update the imagestream file, it will update the tag name, version and image tag.
+    :param target_version: version used to update the imagestream file;
+    """
+    print("Updating ImageStream images version from file {0} to version {1}".format(IMAGE_STREAM, target_version))
+    try:
+        with open(IMAGE_STREAM) as imagestream:
+            data = yaml_loader().load(imagestream)
+            for item_index, item in enumerate(data['items'], start=0):
+                for tag_index, tag in enumerate(item['spec']['tags'], start=0):
+                    data['items'][item_index]['spec']['tags'][tag_index]['name'] = target_version
+                    data['items'][item_index]['spec']['tags'][tag_index]['annotations']['version'] = target_version
+                    imageDict = str.split(data['items'][item_index]['spec']['tags'][tag_index]['from']['name'], ':')
+                    # image name + new version
+                    updatedImageName = imageDict[0] + ':' + target_version
+                    data['items'][item_index]['spec']['tags'][tag_index]['from']['name'] = updatedImageName
+
+        with open(IMAGE_STREAM, 'w') as imagestream:
+            yaml_loader().dump(data, imagestream)
+
+    except TypeError:
+        raise
+
+
+def update_kogito_modules(target_version):
+    """
+    Update every module.yaml file listed on MODULES as well the envs listed on ENVS.
+    :param target_version:  version used to update all needed module.yaml files
+    """
+    modules_dir = "modules"
+    try:
+
+        for module in MODULES:
+            module = module + "/module.yaml"
+            with open(os.path.join(modules_dir, module)) as m:
+                data = yaml_loader().load(m)
+                print(
+                    "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
+                data['version'] = target_version
+                if 'envs' in data:
+                    for index, env in enumerate(data['envs'], start=0):
+                        for target_env in ENVS:
+                            if target_env == env['name']:
+                                data['envs'][index]['value'] = target_version
+
+            with open(os.path.join(modules_dir, module), 'w') as m:
+                yaml_loader().dump(data, m)
+
+    except TypeError:
+        raise
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 29bab7d09b5..66d3ae489ea 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -11,121 +11,19 @@
 # Dependencies:
 #  ruamel.yaml
 
+import sys
+sys.dont_write_bytecode = True
+
 import argparse
-import os
+import common
 import re
-
-from ruamel.yaml import YAML
-
-# all kogito-image modules that points to the kogito version.
-MODULES = {"kogito-data-index/module.yaml", "kogito-image-dependencies/module.yaml",
-           "kogito-infinispan-properties/module.yaml", "kogito-jobs-service/module.yaml",
-           "kogito-jq/module.yaml", "kogito-kubernetes-client/module.yaml",
-           "kogito-launch-scripts/module.yaml", "kogito-logging/module.yaml",
-           "kogito-management-console/module.yaml", "kogito-persistence/module.yaml",
-           "kogito-quarkus/module.yaml", "kogito-quarkus-jvm/module.yaml",
-           "kogito-quarkus-s2i/module.yaml", "kogito-s2i-core/module.yaml",
-           "kogito-springboot/module.yaml", "kogito-springboot-s2i/module.yaml",
-           "kogito-system-user/module.yaml"}
-
-# imagestream file that contains all images, this file aldo needs to be updated.
-IMAGE_STREAM = "kogito-imagestream.yaml"
-
-# image.yaml file definition that needs to be updated
-IMAGE = "image.yaml"
-
-# declared envs on modules.yaml that also needs to have its version updated
-ENVS = {"KOGITO_VERSION"}
+import os
 
 # behave tests that needs to be update
 BEHAVE_TESTS = {"kogito-quarkus-ubi8-s2i.feature", "kogito-springboot-ubi8-s2i.feature",
                 "kogito-quarkus-jvm-ubi8.feature", "kogito-springboot-ubi8.feature"}
 
 
-def yaml_loader():
-    """
-    default yaml Loader
-    :return: yaml object
-    """
-    yaml = YAML()
-    yaml.preserve_quotes = True
-    yaml.width = 1024
-    yaml.indent(mapping=2, sequence=4, offset=2)
-    return yaml
-
-
-def update_image_version(target_version):
-    """
-    Update image.yaml version tag.
-    :param target_version: version used to update the image.yaml file
-    """
-    print("Updating Image main file version from file {0} to version {1}".format(IMAGE, target_version))
-    try:
-        with open(IMAGE) as image:
-            data = yaml_loader().load(image)
-            if 'version' in data:
-                data['version'] = target_version
-            else:
-                print("Field version not found, returning...")
-                return
-
-        with open(IMAGE, 'w') as image:
-            yaml_loader().dump(data, image)
-    except TypeError as err:
-        print("Unexpected error:", err)
-
-
-def update_image_stream(target_version):
-    """
-    Update the imagestream file, it will update the tag name, version and image tag.
-    :param target_version: version used to update the imagestream file;
-    """
-    print("Updating ImageStream images version from file {0} to version {1}".format(IMAGE_STREAM, target_version))
-    try:
-        with open(IMAGE_STREAM) as imagestream:
-            data = yaml_loader().load(imagestream)
-            for item_index, item in enumerate(data['items'], start=0):
-                for tag_index, tag in enumerate(item['spec']['tags'], start=0):
-                    data['items'][item_index]['spec']['tags'][tag_index]['name'] = target_version
-                    data['items'][item_index]['spec']['tags'][tag_index]['annotations']['version'] = target_version
-                    imageDict = str.split(data['items'][item_index]['spec']['tags'][tag_index]['from']['name'], ':')
-                    # image name + new version
-                    updatedImageName = imageDict[0] + ':' + target_version
-                    data['items'][item_index]['spec']['tags'][tag_index]['from']['name'] = updatedImageName
-
-        with open(IMAGE_STREAM, 'w') as imagestream:
-            yaml_loader().dump(data, imagestream)
-
-    except TypeError:
-        raise
-
-
-def update_kogito_modules(target_version):
-    """
-    Update every module.yaml file listed on MODULES as well the envs listed on ENVS.
-    :param target_version:  version used to update all needed module.yaml files
-    """
-    modules_dir = "modules"
-    try:
-
-        for module in MODULES:
-            with open(os.path.join(modules_dir, module)) as m:
-                data = yaml_loader().load(m)
-                print(
-                    "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
-                data['version'] = target_version
-                if 'envs' in data:
-                    for index, env in enumerate(data['envs'], start=0):
-                        for target_env in ENVS:
-                            if target_env == env['name']:
-                                data['envs'][index]['value'] = target_version
-
-            with open(os.path.join(modules_dir, module), 'w') as m:
-                yaml_loader().dump(data, m)
-
-    except TypeError:
-        raise
-
 
 def update_behave_tests(tests_branch):
     """
@@ -194,9 +92,9 @@ def update_test_apps_clone_repo(target_branch):
                                                                                                           tests_branch))
             input("Is the information correct? If so press any key to continue...")
 
-            update_image_version(args.bump_to)
-            update_image_stream(args.bump_to)
-            update_kogito_modules(args.bump_to)
+            common.update_image_version(args.bump_to)
+            common.update_image_stream(args.bump_to)
+            common.update_kogito_modules(args.bump_to)
             update_behave_tests(tests_branch)
             update_test_apps_clone_repo(tests_branch)
         else:
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index b7d3aebbd51..909107fcf41 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -6,11 +6,14 @@
 # export QUAY_TOKEN=XXXXX
 # this token can be retrieved from https://quay.io/repository/kiegroup
 #
+import sys
+sys.dont_write_bytecode = True
 
 import docker
 import os
 import requests
 import yaml
+import common
 
 # All Kogito images
 IMAGES = ["kogito-quarkus-ubi8", "kogito-quarkus-jvm-ubi8", "kogito-quarkus-ubi8-s2i",
@@ -40,7 +43,7 @@ def fetch_tag(image):
     :param image: image to be verified
     :return: the next rc tag
     '''
-    version = CURRENT_IMAGE_VERSION
+    version = find_current_rc_version()
     while True:
         url = 'https://quay.io/api/v1/repository/kiegroup/{}/tag/{}/images'.format(image, version)
         print("Defining latest rc tag for image %s with url %s" % (image, url))
@@ -53,7 +56,7 @@ def fetch_tag(image):
             # increase number
             current_number = version[-1]
             print("Image found, current rc tag number is %s, increasing..." % current_number)
-            version = str.replace(version, current_number, str(int(current_number) + 1))
+            version = get_next_rc_version(version)
 
 
 def tag_and_push_images():
@@ -112,20 +115,30 @@ def find_current_rc_version():
     If the current version already includes the rc tag, keep it, otherwise add it -rc1 tag.
     :return: the current image tag version
     '''
-    global CURRENT_IMAGE_VERSION
     version = get_current_version()
     if '-rc' in version:
         CURRENT_IMAGE_VERSION = version
     else:
         CURRENT_IMAGE_VERSION = version+'-rc1'
-    print("Current initial version is %s" % CURRENT_IMAGE_VERSION)
+    return CURRENT_IMAGE_VERSION
 
+def get_next_rc_version(current_rc_version):
+    '''
+    After finding the current rc tag of the image, adds one to it
+    e.g: 0.10.0-rc1 will returned as 0.10.0-rc2
+    :param current_rc_version: takes the current rc version of the image as input
+    :return: returns the next rc version of the image
+    '''    
+    return (current_rc_version.split("rc")[0] + "rc" + str(int(current_rc_version.split("rc")[1]) + 1 ))
 
 if __name__ == "__main__":
     if 'QUAY_TOKEN' not in  os.environ:
         print("Env QUAY_TOKEN not found, aborting...")
         os._exit(1)
-    find_current_rc_version()
+    version = get_next_rc_version(find_current_rc_version())
+    common.update_image_version(version)
+    common.update_image_stream(version)
+    common.update_kogito_modules(version)
+
     find_next_tag()
     tag_and_push_images()
-

From d312c804dabad85511f01bd162d6cccae3b2bba0 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 14 May 2020 15:42:17 -0300
Subject: [PATCH 132/709] [KOGITO-1117] - Create a Job on CI to validate CeKit
 yaml descriptor files (#159)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Jenkinsfile         | 21 +++++++++++++++++++++
 Jenkinsfile-Nightly | 33 +++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7763ecc0f7c..6fe95eeb8aa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,6 +6,27 @@ pipeline{
                 sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
             }
         }
+        stage('Validate CeKit Image and Modules descriptors'){
+            steps {
+                sh """
+                    curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                    tar -xzvf cekit-image-validator-runner.tgz
+                    chmod +x cekit-image-validator-runner
+                """
+                sh "./cekit-image-validator-runner modules/"
+                sh """
+                    ./cekit-image-validator-runner image.yaml
+                    ./cekit-image-validator-runner kogito-data-index-overrides.yaml
+                    ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
+                    ./cekit-image-validator-runner kogito-management-console-overrides.yaml
+                    ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
+                    ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
+                    ./cekit-image-validator-runner kogito-quarkus-s2i-overrides.yaml
+                    ./cekit-image-validator-runner kogito-springboot-overrides.yaml
+                    ./cekit-image-validator-runner kogito-springboot-s2i-overrides.yaml
+                """
+            }
+        }
         stage('Prepare offline kogito-examples'){
             steps{
                 sh "make clone-repos"
diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
index 55c1b483fdd..48159e10345 100644
--- a/Jenkinsfile-Nightly
+++ b/Jenkinsfile-Nightly
@@ -16,6 +16,27 @@ pipeline{
                 sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
             }
         }
+        stage('Validate CeKit Image and Modules descriptors'){
+            steps {
+                sh """
+                    curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                    tar -xzvf cekit-image-validator-runner.tgz
+                    chmod +x cekit-image-validator-runner
+                """
+                sh "./cekit-image-validator-runner modules/"
+                sh """
+                    ./cekit-image-validator-runner image.yaml
+                    ./cekit-image-validator-runner kogito-data-index-overrides.yaml
+                    ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
+                    ./cekit-image-validator-runner kogito-management-console-overrides.yaml
+                    ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
+                    ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
+                    ./cekit-image-validator-runner kogito-quarkus-s2i-overrides.yaml
+                    ./cekit-image-validator-runner kogito-springboot-overrides.yaml
+                    ./cekit-image-validator-runner kogito-springboot-s2i-overrides.yaml
+                """
+            }
+        }
         stage('Update Artifacts'){
             steps{
                 sh "python3 scripts/update-artifacts.py"
@@ -70,13 +91,13 @@ pipeline{
             steps{
                 sh """
                 docker tag quay.io/kiegroup/kogito-quarkus-ubi8:latest                    quay.io/kiegroup/kogito-quarkus-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-	        docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest                quay.io/kiegroup/kogito-quarkus-jvm-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-	        docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest                quay.io/kiegroup/kogito-quarkus-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-	        docker tag quay.io/kiegroup/kogito-springboot-ubi8:latest                 quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-	        docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest             quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest                quay.io/kiegroup/kogito-quarkus-jvm-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest                quay.io/kiegroup/kogito-quarkus-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                docker tag quay.io/kiegroup/kogito-springboot-ubi8:latest                 quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest             quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-data-index:latest                      quay.io/kiegroup/kogito-data-index-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-	        docker tag quay.io/kiegroup/kogito-jobs-service:latest                    quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-	        docker tag quay.io/kiegroup/kogito-management-console:latest              quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                docker tag quay.io/kiegroup/kogito-jobs-service:latest                    quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                docker tag quay.io/kiegroup/kogito-management-console:latest              quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
 	        """
             }
         }

From 9f10fe0f6b3856352923d626f8e920d788d83b80 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <khandelwaltarun32@live.com>
Date: Fri, 15 May 2020 19:56:28 +0530
Subject: [PATCH 133/709] [KOGITO-2183] - Stop previous build if new build is
 triggered (#160)

Signed-off-by: TARUN KHANDELWAL <tarkhand@redhat.com>
---
 Jenkinsfile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6fe95eeb8aa..e353dadb479 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,12 @@
+// Setup milestone to stop previous build from running when a new one is launched
+// The result would be:
+//  Build 1 runs and creates milestone 1
+//  While build 1 is running, suppose build 2 fires. It has milestone 1 and milestone 2. It passes 1, which causes build #1 to abort
+
+def buildNumber = env.BUILD_NUMBER as int
+if (buildNumber > 1) milestone(buildNumber - 1)
+milestone(buildNumber)
+
 pipeline{
     agent { label 'jenkins-slave'}
     stages{

From 719bb1346b20350b370efdc53d1f3b02c983e586 Mon Sep 17 00:00:00 2001
From: vaibhavjainwiz <vajain@redhat.com>
Date: Mon, 18 May 2020 19:28:55 +0530
Subject: [PATCH 134/709] [KOGITO-2004] - Default the Quarkus S2I image to
 build non native images (#161)

* [KOGITO-2004] - Default the Quarkus S2I image to build non native images
---
 README.md                                     |  7 ++---
 kogito-quarkus-s2i-overrides.yaml             |  4 +--
 .../added/kogito-app-launch.sh                |  9 +++---
 modules/kogito-quarkus-s2i/s2i/bin/usage      | 15 +++++++---
 modules/kogito-s2i-core/added/s2i-core        | 30 +++++++++----------
 .../kogito-s2i-core/tests/bats/s2i-core.bats  |  1 +
 6 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 6e8b1097f75..3c5d1a69e18 100644
--- a/README.md
+++ b/README.md
@@ -134,8 +134,8 @@ This image contains a helper option to better understand how to it:
 $ docker run -it quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest /home/kogito/kogito-app-launch.sh -h
 ```
 
-By default, a native build will be performed. To disable it and perform a normal java build just set the **NATIVE**
-build environment variable to **false**.
+By default, a normal java build will be performed. To perform a native build just set the **NATIVE**
+build environment variable to **true**.
 
 See the next topic for an example.
  
@@ -151,8 +151,7 @@ $ s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref master \
     --context-dir rules-quarkus-helloworld \
     quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest \
-    rules-example:1.0 \
-    --env NATIVE=false
+    rules-example:1.0
 ...
 [INFO] BUILD SUCCESS
 [INFO] ------------------------------------------------------------------------
diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
index 2d1b4f14c56..477ba50cc4f 100644
--- a/kogito-quarkus-s2i-overrides.yaml
+++ b/kogito-quarkus-s2i-overrides.yaml
@@ -16,8 +16,8 @@ envs:
   example: "true"
   description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 - name: NATIVE
-  example: false
-  description: If set to false, perform a non native build.
+  example: true
+  description: If set to true, perform a native build.
 - name: JAVA_OPTIONS
   example: "-Dquarkus.log.level=DEBUG"
   description: JVM options passed to the Java command.
diff --git a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
index a7947aeedb7..a566e37e958 100644
--- a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
@@ -12,11 +12,10 @@ if [[ "$1" == "-h" ]]; then
     exit 0
 fi
 
-if [ "${NATIVE^^}" == "FALSE" ]; then
-    exec java ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
-else
+if [ "${NATIVE^^}" == "TRUE" ]; then
     exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/ssl-libs \
         -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
-fi
-
+else
+    exec java ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
+fi
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/s2i/bin/usage b/modules/kogito-quarkus-s2i/s2i/bin/usage
index 93912cf1d95..29de88f87e0 100644
--- a/modules/kogito-quarkus-s2i/s2i/bin/usage
+++ b/modules/kogito-quarkus-s2i/s2i/bin/usage
@@ -20,13 +20,20 @@ Sample invocation:
 $ s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8
 
 
-For non native build, just set the NATIVE environment variable to false and use the quay.io/kiegroup/kogito-quarkus-jvm-ubi8
-image as runtime-image, in that way a *runner.jar will be produced and copied to the runtime image.
+By default it generates non native build. Use the quay.io/kiegroup/kogito-quarkus-jvm-ubi8 image as runtime-image,
+in that way a *runner.jar will be produced and copied to the runtime image.
 
 Example:
 
-$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8 --env NATIVE=false
+$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8
+
+For native build, just set the NATIVE environment variable to true and use the quay.io/kiegroup/kogito-quarkus-ubi8 image as runtime-image,
+in that way a native build will be produced and copied to the runtime image.
+
+Example:
+
+$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8 --env NATIVE=true
 
 You can then run the resulting image via:
 docker run <application image>
-EOF
\ No newline at end of file
+EOF
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index b1567cc315c..6e88dd6d977 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -106,9 +106,9 @@ function handle_image_metadata_json() {
 function build_kogito_app() {
     cd "${S2I_SOURCE_DIR}"
 
-    nativeBuild="-Pnative"
-    if [ "${NATIVE^^}" == "FALSE" ]; then
-        nativeBuild=""
+    nativeBuild=""
+    if [ "${NATIVE^^}" == "TRUE" ]; then
+        nativeBuild="-Pnative"
     fi
 
     if [ "${SCRIPT_DEBUG}" != "true" ]; then
@@ -153,23 +153,21 @@ function build_kogito_app() {
 
 function copy_kogito_app() {
 
-    if [ "${NATIVE^^}" == "FALSE" ]; then
-        # handle quarkus java build
-        if ls $artifactDir/*-runner.jar 1> /dev/null 2>&1; then
-            log_info "---> Installing jar file"
-            cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin
-            if [ -d "${artifactDir}/lib" ]; then
-                log_info "---> Copying application libraries"
-                cp -r $artifactDir/lib/ $KOGITO_HOME/bin
-            fi
-        fi
-
-    elif ls $artifactDir/*-runner 1> /dev/null 2>&1; then
+    if [ "${NATIVE^^}" == "TRUE" ]; then
+      if ls $artifactDir/*-runner 1> /dev/null 2>&1; then
         # quarkus native builds
         log_info "---> Installing application binaries"
         cp -v $artifactDir/*-runner $KOGITO_HOME/bin/
         chmod +x $KOGITO_HOME/bin/*-runner
-
+      fi
+    elif ls $artifactDir/*-runner.jar 1> /dev/null 2>&1; then
+      # handle quarkus java build
+        log_info "---> Installing jar file"
+        cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin
+        if [ -d "${artifactDir}/lib" ]; then
+            log_info "---> Copying application libraries"
+            cp -r $artifactDir/lib/ $KOGITO_HOME/bin
+        fi
     else
         # handle normal java builds
         log_info "---> Installing application binaries"
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index c3b077ea726..e2e2eed92d8 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -342,6 +342,7 @@ teardown() {
 
 @test "test copy_kogito_app default quarkus native builds file present" {
 
+    NATIVE="true"
     mkdir $KOGITO_HOME/bin
     touch target/app-runner
     mkdir target/lib

From c27757878bcfb3de9b3ca310cc37108d0f830f6a Mon Sep 17 00:00:00 2001
From: vaibhavjainwiz <vajain@redhat.com>
Date: Mon, 18 May 2020 20:20:24 +0530
Subject: [PATCH 135/709] [KOGITO-2065] - Add Pull Request template on Kogito
 Images Repository (#163)

---
 .github/pull_request_template.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000000..134526c2298
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,11 @@
+Many thanks for submitting your Pull Request :heart:! 
+
+Please make sure your PR meets the following requirements:
+
+- [ ] You have read the [contributors guide](README.md#contributing-to-kogito-images-repository)
+- [ ] Pull Request title is properly formatted: `[KOGITO-XYZ] Subject`
+- [ ] Pull Request contains link to the JIRA issue
+- [ ] Pull Request contains description of the issue
+- [ ] Pull Request does not include fixes for issues other than the main ticket
+- [ ] Your feature/bug fix has a testcase that verifies it
+- [ ] You've tested the new feature/bug fix in an actual OpenShift cluster
\ No newline at end of file

From b1fa81e938394491417c418121862134c595be39 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 19 May 2020 13:47:43 -0300
Subject: [PATCH 136/709] [KOGITO-1916] - Print generated *md5.txt files when
 persistence is enabled (#162)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .../kogito-persistence/added/kogito-persistence.sh    |  1 +
 .../tests/bats/kogito-persistence.bats                | 11 +++++++----
 tests/features/kogito-quarkus-ubi8-s2i.feature        |  4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/kogito-persistence/added/kogito-persistence.sh b/modules/kogito-persistence/added/kogito-persistence.sh
index 05f91a01b33..5503d49d70a 100644
--- a/modules/kogito-persistence/added/kogito-persistence.sh
+++ b/modules/kogito-persistence/added/kogito-persistence.sh
@@ -44,6 +44,7 @@ function generate_md5_persistence_files() {
         log_info "---> [persistence] generating md5 for persistence files"
         for entry in "$KOGITO_HOME/data/protobufs"/*.proto; do
             md5sum ${entry} | awk '{ print $1 }' >${entry%.*}-md5.txt
+            log_info "----> [persistence] Generated checksum for ${entry} with the name: ${entry%.*}-md5.txt"
         done
     fi
 }
diff --git a/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
index 85b2c07b197..6426bf65b6e 100644
--- a/modules/kogito-persistence/tests/bats/kogito-persistence.bats
+++ b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
@@ -66,7 +66,8 @@ teardown() {
     [ "${lines[4]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
     [ "${lines[5]}" = "'${KOGITO_HOME}/bin/file1.proto' -> '${KOGITO_HOME}/data/protobufs/file1.proto'" ]
     [ "${lines[6]}" = "INFO ---> [persistence] generating md5 for persistence files" ]
-    
+    [ "${lines[7]}" = "INFO ----> [persistence] Generated checksum for ${KOGITO_HOME}/data/protobufs/file1.proto with the name: ${KOGITO_HOME}/data/protobufs/file1-md5.txt" ]
+
 }
 
 @test "There are no persistence files" {
@@ -91,6 +92,8 @@ teardown() {
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
     [ "${lines[1]}" = "'${KOGITO_HOME}/bin/file1.proto' -> '${KOGITO_HOME}/data/protobufs/file1.proto'" ]
+    [ "${lines[2]}" = "INFO ---> [persistence] generating md5 for persistence files" ]
+    [ "${lines[3]}" = "INFO ----> [persistence] Generated checksum for ${KOGITO_HOME}/data/protobufs/file1.proto with the name: ${KOGITO_HOME}/data/protobufs/file1-md5.txt" ]
 }
 
 @test "There's no proto files in the bin directory" {
@@ -107,10 +110,11 @@ teardown() {
     touch $KOGITO_HOME/data/protobufs/file1.proto
 
     run generate_md5_persistence_files
-    
     echo "result= ${lines[@]}"
 
     [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "INFO ---> [persistence] generating md5 for persistence files" ]
+    [ "${lines[1]}" = "INFO ----> [persistence] Generated checksum for ${KOGITO_HOME}/data/protobufs/file1.proto with the name: ${KOGITO_HOME}/data/protobufs/file1-md5.txt" ]
     [ -e $KOGITO_HOME/data/protobufs/file1-md5.txt ]
     # if md5 isn't generated, grep will fail to find the given string
     grep -q "d41d8cd98f00b204e9800998ecf8427e" $KOGITO_HOME/data/protobufs/file1-md5.txt
@@ -120,7 +124,6 @@ teardown() {
     touch $KOGITO_HOME/data/protobufs/file1.proto1
 
     run generate_md5_persistence_files
-    
     echo "result= ${lines[@]}"
 
     [ "$status" -eq 0 ]
@@ -136,7 +139,7 @@ teardown() {
     local expected=$(cat $BATS_TEST_DIRNAME/expected/patch_cm_travel_agency.json)
 
     run update_configmap
-    
+
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
     [ "${lines[1]}" = "INFO ---> [persistence] About to patch configMap exampleapp-cm" ]
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index bdc120d968f..10192cbc87e 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -116,6 +116,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
     And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
+    And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/persons.proto with the name: /home/kogito/data/protobufs/persons-md5.txt
+    And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
   # ignore until https://issues.redhat.com/browse/KOGITO-2003 is not fixed.
   @ignore
@@ -131,6 +133,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
+    And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/persons.proto with the name: /home/kogito/data/protobufs/persons-md5.txt
+    And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
   Scenario: Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest

From 4f78023629557e3aa24fffa8d172b90057f419c7 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 21 May 2020 19:37:33 +0200
Subject: [PATCH 137/709] Adjust deploy pipeline and Setup promote pipeline
 (#158)

---
 Jenkinsfile.deploy            | 245 ++++++++++++++++++++++++++++++++++
 Jenkinsfile.promote           | 212 +++++++++++++++++++++++++++++
 tests/test-apps/clone-repo.sh |   6 +-
 3 files changed, 460 insertions(+), 3 deletions(-)
 create mode 100644 Jenkinsfile.deploy
 create mode 100644 Jenkinsfile.promote

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
new file mode 100644
index 00000000000..e1f345fc1d1
--- /dev/null
+++ b/Jenkinsfile.deploy
@@ -0,0 +1,245 @@
+//Checks master branch for updates every day
+//If found triggers the pipeline, 
+//The pipeline is set to run between 12:00AM - 3:00AM UTC
+
+IMAGES = ["kogito-quarkus-ubi8", 
+            "kogito-quarkus-jvm-ubi8",
+            "kogito-quarkus-ubi8-s2i",
+            "kogito-springboot-ubi8",
+            "kogito-springboot-ubi8-s2i",
+            "kogito-data-index",
+            "kogito-jobs-service",
+            "kogito-management-console"]
+
+pipeline {
+    agent { label 'jenkins-slave' }
+    parameters {
+        string(name: 'DISPLAY_NAME', defaultValue: '', description: 'Setup a specific build display name')
+        string(name: 'BUILD_BRANCH_NAME', defaultValue: 'master', description: 'Which branch to build ? Set if you are not on a multibranch pipeline.')
+
+        string(name: 'IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+        string(name: 'IMAGE_REGISTRY', defaultValue: '', description: 'Image registry to use to deploy images')
+        string(name: 'IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Image namespace to use to deploy images')
+        string(name: 'IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
+        string(name: 'IMAGE_TAG', defaultValue: '', description: 'Image tag to use to deploy images')
+    }
+
+    // Keep commented if no env var is defined
+    // environment {
+        // Keep commented. It is for documentation only
+        // Cannot define here as an env variable defined here is immutable ...
+        // BRANCH_NAME => should be set by the multibranch pipeline. If single pipeline, then it is set with value from ${params.BUILD_BRANCH_NAME}
+
+        // OPENSHIFT_API => Taken from Jenkins global env
+        // OPENSHIFT_REGISTRY_ROUTE => Taken from Jenkins global env
+
+        // DEPLOY_IMAGE_REGISTRY_CREDENTIALS
+        // DEPLOY_IMAGE_USE_OPENSHIFT
+        // DEPLOY_IMAGE_REGISTRY
+        // DEPLOY_IMAGE_NAMESPACE
+        // DEPLOY_IMAGE_NAME_SUFFIX
+        // DEPLOY_IMAGE_TAG
+    // }
+
+    stages {
+        stage('Initialization') {
+            steps {
+                script {
+                    sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
+                    
+                    setupImageEnvVarsFromParams("","DEPLOY")
+
+                    if (params.DISPLAY_NAME != "") {
+                        currentBuild.displayName = params.DISPLAY_NAME
+                    }
+
+                    if (env.BRANCH_NAME != "") {
+                        // Switch to branch if not on a multibranch pipeline
+                        env.BRANCH_NAME = params.BUILD_BRANCH_NAME
+                        checkout([$class: 'GitSCM', branches: [[name: env.BRANCH_NAME]], browser: [$class: 'GithubWeb', repoUrl: "${GIT_URL}"], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'user-kie-ci10', url: "${GIT_URL}"]]])
+                    }
+                }
+            }
+        }
+        stage('Update Artifacts') {
+            steps {
+                sh "python3 scripts/update-artifacts.py"
+
+                sh "cat modules/kogito-data-index/module.yaml"
+                sh "cat modules/kogito-jobs-service/module.yaml"
+                sh "cat modules/kogito-management-console/module.yaml"
+            }
+        }
+        stage('Validate CeKit Image and Modules descriptors'){
+            steps {
+                sh """
+                    curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                    tar -xzvf cekit-image-validator-runner.tgz
+                    chmod +x cekit-image-validator-runner
+                """
+                sh "./cekit-image-validator-runner modules/"
+                sh """
+                    ./cekit-image-validator-runner image.yaml
+                    ./cekit-image-validator-runner kogito-data-index-overrides.yaml
+                    ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
+                    ./cekit-image-validator-runner kogito-management-console-overrides.yaml
+                    ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
+                    ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
+                    ./cekit-image-validator-runner kogito-quarkus-s2i-overrides.yaml
+                    ./cekit-image-validator-runner kogito-springboot-overrides.yaml
+                    ./cekit-image-validator-runner kogito-springboot-s2i-overrides.yaml
+                """
+            }
+        }
+        stage('Prepare offline kogito-examples') {
+            steps {
+                sh "make clone-repos"
+            }
+        }
+        stage('Build and test kogito-quarkus-ubi8 image') {
+            steps {
+                sh "make kogito-quarkus-ubi8"
+            }
+        }
+        stage('Build and test kogito-quarkus-jvm-ubi8 image') {
+            steps {
+                sh "make kogito-quarkus-jvm-ubi8"
+            }
+        }
+        stage('Build and test kogito-quarkus-ubi8-s2i image') {
+            steps {
+                sh "make kogito-quarkus-ubi8-s2i"
+            }
+        }
+        stage('Build and test kogito-springboot-ubi8 image') {
+            steps {
+                sh "make kogito-springboot-ubi8"
+            }
+        }
+        stage('Build and test kogito-springboot-ubi8-s2i image ') {
+            steps {
+                sh "make kogito-springboot-ubi8-s2i"
+            }
+        }
+        stage('Build and test kogito-data-index image ') {
+            steps {
+                sh "make kogito-data-index"
+            }
+        }
+        stage('Build and test kogito-jobs-service image ') {
+            steps {
+                sh "make kogito-jobs-service"
+            }
+        }
+        stage('Build and test kogito-management-console image ') {
+            steps {
+                sh "make kogito-management-console"
+            }
+        }
+        stage('Tagging') {
+            steps {
+                script {
+                    tagImages()
+                }
+            }
+        }
+        stage('Pushing') {
+            steps {
+                script {
+                    if (env.DEPLOY_IMAGE_USE_OPENSHIFT == "true") {
+                        loginOpenshiftRegistry()
+                        pushImages()
+                    } else if (env.DEPLOY_IMAGE_REGISTRY_CREDENTIALS != '') {
+                        withDockerRegistry([ credentialsId: "${DEPLOY_IMAGE_REGISTRY_CREDENTIALS}", url: "https://${DEPLOY_IMAGE_REGISTRY}" ]) {        
+                            pushImages()
+                        }
+                    } else {
+                        pushImages()
+                    }
+                }
+            }
+        }
+        stage('Finishing') {
+            steps {
+                sh "docker rmi -f \$(docker images -q) || date"
+            }
+        }
+    }
+    post {
+        always {
+            junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
+        }
+    }
+}
+
+void tagImages() {
+    for(String imageName : IMAGES) {
+        sh "docker tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"
+    }
+}
+
+void pushImages() {
+    for(String imageName : IMAGES) {
+        sh "docker push ${buildImageName(imageName)}"
+    }
+}
+
+String buildImageName(String imageName) {
+    String finalImageName = imageName
+    if(env.DEPLOY_IMAGE_NAME_SUFFIX != null && env.DEPLOY_IMAGE_NAME_SUFFIX != '') {
+        finalImageName += "-" + env.DEPLOY_IMAGE_NAME_SUFFIX
+    }
+    return "${DEPLOY_IMAGE_REGISTRY}/${DEPLOY_IMAGE_NAMESPACE}/${finalImageName}:${DEPLOY_IMAGE_TAG}"
+}
+
+void loginOpenshiftRegistry() {
+    // Use creds & route as `jenkins-slave` is not running directly on Openshift
+    withCredentials([string(credentialsId: 'openshift-login-passwd', variable: 'OC_PASSWORD')]) {
+        sh "set +x && oc login -u admin -p ${OC_PASSWORD} --server=${OPENSHIFT_API} --insecure-skip-tls-verify"
+        sh "set +x && docker login -u admin -p \$(oc whoami -t) ${OPENSHIFT_REGISTRY_ROUTE}"
+    }
+}
+
+/**
+    Setup env variables for image registry/namesapce/tag, depending on parameters
+*/
+void setupImageEnvVarsFromParams(String prefixParam, String prefixEnv) {
+    if(getParam(prefixParam, "IMAGE_REGISTRY") == '') {
+        setEnv(prefixEnv, "IMAGE_REGISTRY", env.OPENSHIFT_REGISTRY_ROUTE) // Use route as `jenkins-slave` is not running directly on Openshift
+        setEnv(prefixEnv, "IMAGE_NAMESPACE", "openshift")
+        setEnv(prefixEnv, "IMAGE_USE_OPENSHIFT", "true")
+    } else {
+        setEnvFromParam("IMAGE_REGISTRY_CREDENTIALS", prefixEnv, prefixParam)
+        setEnvFromParam("IMAGE_REGISTRY", prefixEnv, prefixParam)
+        setEnvFromParam("IMAGE_NAMESPACE", prefixEnv, prefixParam)
+        setEnv(prefixEnv, "IMAGE_USE_OPENSHIFT", "false")
+    }
+    if (getParam(prefixParam, "IMAGE_TAG") != '') {
+        setEnvFromParam("IMAGE_TAG", prefixEnv, prefixParam)
+    } else {
+        setEnv(prefixEnv, "IMAGE_TAG", sh(script: "echo ${GIT_COMMIT} | cut -c1-7", returnStdout: true).trim())
+    }
+    if(getParam(prefixParam, "IMAGE_NAME_SUFFIX") != '') {
+        setEnvFromParam("IMAGE_NAME_SUFFIX", prefixEnv, prefixParam)
+    }
+}
+
+String getKey(String prefix, String envVarName) {
+    if (prefix == '') {
+        return envVarName
+    }
+    return "${prefix}_${envVarName}"
+}
+
+void setEnv(String keyPrefix, String keyId, String value){
+    echo "setEnv ${getKey(keyPrefix, keyId)} = ${value}"
+    env."${getKey(keyPrefix, keyId)}" = value
+}
+
+void setEnvFromParam(String keyId, String prefixEnv, String prefixParam){
+    setEnv(prefixEnv, keyId, getParam(prefixParam, keyId))
+}
+
+String getParam(String keyPrefix, String keyId){
+    return params."${getKey(keyPrefix, keyId)}"
+}
\ No newline at end of file
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
new file mode 100644
index 00000000000..b2b6d41f358
--- /dev/null
+++ b/Jenkinsfile.promote
@@ -0,0 +1,212 @@
+// Promote images
+
+IMAGES = ["kogito-quarkus-ubi8", 
+                    "kogito-quarkus-jvm-ubi8",
+                    "kogito-quarkus-ubi8-s2i",
+                    "kogito-springboot-ubi8",
+                    "kogito-springboot-ubi8-s2i",
+                    "kogito-data-index",
+                    "kogito-jobs-service",
+                    "kogito-management-console"]
+
+pipeline {
+    agent { label 'jenkins-slave' }
+
+    parameters {
+        string(name: 'DISPLAY_NAME', defaultValue: '', description: 'Setup a specific build display name')
+
+        string(name: 'BASE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
+        string(name: 'BASE_IMAGE_REGISTRY', defaultValue: '', description: 'Base image registry')
+        string(name: 'BASE_IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Base image namespace')
+        string(name: 'BASE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Base image name suffix')
+        string(name: 'BASE_IMAGE_TAG', defaultValue: '', description: 'Base image tag')
+
+        string(name: 'PROMOTE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
+        string(name: 'PROMOTE_IMAGE_REGISTRY', defaultValue: '', description: 'Promote image registry')
+        string(name: 'PROMOTE_IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Promote image namespace')
+        string(name: 'PROMOTE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Promote image name suffix')
+        string(name: 'PROMOTE_IMAGE_TAG', defaultValue: '', description: 'Promote image tag')
+
+        booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', defaultValue: false, description: 'Set to true if you want the deployed images to also be with the `latest` tag')
+    }
+
+    // Keep commented if no env var is defined
+    // environment {
+        // Keep commented. It is for documentation only
+        // Cannot define here as an env variable defined here is immutable ...
+
+        // OPENSHIFT_API => Taken from Jenkins global env
+        // OPENSHIFT_REGISTRY_ROUTE => Taken from Jenkins global env
+
+        // OLD_IMAGE_REGISTRY_CREDENTIALS
+        // OLD_IMAGE_USE_OPENSHIFT
+        // OLD_IMAGE_REGISTRY
+        // OLD_IMAGE_NAMESPACE
+        // OLD_IMAGE_NAME_SUFFIX
+        // OLD_IMAGE_TAG
+        
+        // NEW_IMAGE_REGISTRY_CREDENTIALS
+        // NEW_IMAGE_USE_OPENSHIFT
+        // NEW_IMAGE_REGISTRY
+        // NEW_IMAGE_NAMESPACE
+        // NEW_IMAGE_NAME_SUFFIX
+        // NEW_IMAGE_TAG
+    // }
+
+    stages {
+        stage('Initialization') {
+            steps {
+                script {
+                    sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
+
+                    setupImageEnvVarsFromParams("BASE","OLD")
+                    setupImageEnvVarsFromParams("PROMOTE","NEW")
+
+                    if (params.DISPLAY_NAME != "") {
+                        currentBuild.displayName = params.DISPLAY_NAME
+                    }
+                }
+            }
+        }
+        stage('Pull "old" images'){
+            steps{
+                script {
+                    if (env.OLD_IMAGE_USE_OPENSHIFT == "true") {
+                        loginOpenshiftRegistry()
+                        pullImages()
+                    } else if (env.OLD_IMAGE_REGISTRY_CREDENTIALS != ''){
+                        withDockerRegistry([ credentialsId: "${OLD_IMAGE_REGISTRY_CREDENTIALS}", url: "https://${OLD_IMAGE_REGISTRY}" ]){        
+                            pullImages()
+                        }
+                    } else {
+                        pullImages()
+                    }
+                }
+            }
+        }
+        stage('Tag images'){
+            steps{
+                script {
+                    tagImages()
+                }
+            }
+        }
+        stage('Pushing'){
+            steps{
+                script {
+                    if (env.NEW_IMAGE_USE_OPENSHIFT == "true") {
+                        loginOpenshiftRegistry()
+                        pushImages()
+                    } else if (env.NEW_IMAGE_REGISTRY_CREDENTIALS != ''){
+                        withDockerRegistry([ credentialsId: "${NEW_IMAGE_REGISTRY_CREDENTIALS}", url: "https://${NEW_IMAGE_REGISTRY}" ]){
+                            pushImages()
+                        }
+                    } else {
+                        pushImages()
+                    }
+                }
+            }
+        }
+        stage('Finishing'){
+            steps{
+                sh "docker rmi -f \$(docker images -q) || date"
+            }
+        }
+    }
+}
+
+void pullImages(){
+    for(String imageName : IMAGES){
+        sh "docker pull ${getOldImageFullTag(imageName)}"
+    }
+}
+
+void tagImages() {
+    for(String imageName : IMAGES){
+        sh "docker tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, env.NEW_IMAGE_TAG)}"
+        if(isDeployLatestTag()){
+            sh "docker tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, "latest")}"
+        }
+    }
+}
+
+void pushImages(){
+    for(String imageName : IMAGES){
+        sh "docker push ${getNewImageFullTag(imageName, env.NEW_IMAGE_TAG)}"
+        if(isDeployLatestTag()){
+            sh "docker push ${getNewImageFullTag(imageName, "latest")}"
+        }
+    }
+}
+
+String getOldImageFullTag(String imageName){
+    return "${OLD_IMAGE_REGISTRY}/${OLD_IMAGE_NAMESPACE}/${buildImageNameWithSuffix(imageName, env.OLD_IMAGE_NAME_SUFFIX)}:${OLD_IMAGE_TAG}"
+}
+
+String getNewImageFullTag(String imageName, String tag){
+    return "${NEW_IMAGE_REGISTRY}/${NEW_IMAGE_NAMESPACE}/${buildImageNameWithSuffix(imageName, env.NEW_IMAGE_NAME_SUFFIX)}:${tag}"
+}
+
+String buildImageNameWithSuffix(String imageName, String suffix) {
+    String finalImageName = imageName
+    if(suffix != null && suffix != '') {
+        finalImageName += "-" + suffix
+    }
+    return finalImageName
+}
+
+boolean isDeployLatestTag(){
+    return params.DEPLOY_WITH_LATEST_TAG
+}
+
+void loginOpenshiftRegistry() {
+    // Use creds & route as `jenkins-slave` is not running directly on Openshift
+    withCredentials([string(credentialsId: 'openshift-login-passwd', variable: 'OC_PASSWORD')]) {
+        sh "set +x && oc login -u admin -p ${OC_PASSWORD} --server=${OPENSHIFT_API} --insecure-skip-tls-verify"
+        sh "set +x && docker login -u admin -p \$(oc whoami -t) ${OPENSHIFT_REGISTRY_ROUTE}"
+    }
+}
+
+/**
+    Setup env variables for image registry/namesapce/tag, depending on parameters
+*/
+void setupImageEnvVarsFromParams(String prefixParam, String prefixEnv) {
+    if(getParam(prefixParam, "IMAGE_REGISTRY") == '') {
+        setEnv(prefixEnv, "IMAGE_REGISTRY", env.OPENSHIFT_REGISTRY_ROUTE) // Use route as `jenkins-slave` is not running directly on Openshift
+        setEnv(prefixEnv, "IMAGE_NAMESPACE", "openshift")
+        setEnv(prefixEnv, "IMAGE_USE_OPENSHIFT", "true")
+    } else {
+        setEnvFromParam("IMAGE_REGISTRY_CREDENTIALS", prefixEnv, prefixParam)
+        setEnvFromParam("IMAGE_REGISTRY", prefixEnv, prefixParam)
+        setEnvFromParam("IMAGE_NAMESPACE", prefixEnv, prefixParam)
+        setEnv(prefixEnv, "IMAGE_USE_OPENSHIFT", "false")
+    }
+    if (getParam(prefixParam, "IMAGE_TAG") != '') {
+        setEnvFromParam("IMAGE_TAG", prefixEnv, prefixParam)
+    } else {
+        setEnv(prefixEnv, "IMAGE_TAG", sh(script: "echo ${GIT_COMMIT} | cut -c1-7", returnStdout: true).trim())
+    }
+    if(getParam(prefixParam, "IMAGE_NAME_SUFFIX") != '') {
+        setEnvFromParam("IMAGE_NAME_SUFFIX", prefixEnv, prefixParam)
+    }
+}
+
+String getKey(String prefix, String envVarName) {
+    if (prefix == '') {
+        return envVarName
+    }
+    return "${prefix}_${envVarName}"
+}
+
+void setEnv(String keyPrefix, String keyId, String value){
+    echo "setEnv ${getKey(keyPrefix, keyId)} = ${value}"
+    env."${getKey(keyPrefix, keyId)}" = value
+}
+
+void setEnvFromParam(String keyId, String prefixEnv, String prefixParam){
+    setEnv(prefixEnv, keyId, getParam(prefixParam, keyId))
+}
+
+String getParam(String keyPrefix, String keyId){
+    return params."${getKey(keyPrefix, keyId)}"
+}
\ No newline at end of file
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 8ffffab3c43..0994afa9bef 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -17,9 +17,9 @@ git checkout master
 cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/
 
 # generating the app binaries to test the binary build
-mvn -f rules-quarkus-helloworld clean package -DskipTests
-mvn -f process-springboot-example clean package -DskipTests
-mvn -f rules-quarkus-helloworld-native -Pnative clean package -DskipTests
+mvn -f rules-quarkus-helloworld clean package -DskipTests -U
+mvn -f process-springboot-example clean package -DskipTests -U
+mvn -f rules-quarkus-helloworld-native -Pnative clean package -DskipTests -U
 
 # preparing directory to run kogito maven archetypes tests
 cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-quarkus-example/

From f8bfe9eef86e10e2936cdb2aecf1bd5d8057b31e Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Fri, 22 May 2020 20:05:09 +0530
Subject: [PATCH 138/709] =?UTF-8?q?[KOGITO-1919]=20-=20Allow=20user=20to?=
 =?UTF-8?q?=20specify=20the=20artifact=20and=20group=20id=20when=20?=
 =?UTF-8?q?=E2=80=A6=20(#164)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-1919] - Allow user to specify the artifact and group id when doing builds from archetype
---
 README.md                                      |  3 +--
 modules/kogito-s2i-core/added/s2i-core         | 17 ++++++++++-------
 modules/kogito-s2i-core/module.yaml            | 14 +++++++++++++-
 tests/features/kogito-quarkus-ubi8-s2i.feature | 18 ++++++++++++++++++
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 3c5d1a69e18..7e62e8309d1 100644
--- a/README.md
+++ b/README.md
@@ -369,8 +369,7 @@ Types of Business assets can be:
 - Business Rule definition - drl files
 - Business Decision definition - dmn files
 
-Upon build, these assets will be copied to a generated maven project and built with Maven to produce a runnable binary.
-
+Upon build, these assets will be copied to a generated maven project and built with Maven to produce a runnable binary. Default value of group id is "com.company", artifact id is "project" and version is "1.0-SNAPSHOT". To provide custom value we need to set the **PROJECT_GROUP_ID**, **PROJECT_ARTIFACT_ID** and **PROJECT_VERSION**.
 
 #### Kogito Quarkus JVM Runtime Image
 
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 6e88dd6d977..c40083346f6 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -7,6 +7,9 @@ source $KOGITO_HOME/launch/kogito-persistence.sh
 S2I_DESTINATION_DIR="${S2I_DESTINATION_DIR:-/tmp}"
 S2I_ARTIFACTS_DIR="${S2I_DESTINATION_DIR}/artifacts"
 S2I_SOURCE_DIR="${S2I_DESTINATION_DIR}/src"
+PROJECT_GROUP_ID="${PROJECT_GROUP_ID:-com.company}"
+PROJECT_ARTIFACT_ID="${PROJECT_ARTIFACT_ID:-project}"
+PROJECT_VERSION="${PROJECT_VERSION:-1.0-SNAPSHOT}"
 artifactDir="target"
 if [ ! -z "${ARTIFACT_DIR}" ]; then
     artifactDir="${ARTIFACT_DIR}"
@@ -127,21 +130,22 @@ function build_kogito_app() {
         log_info "---> Generating project structure..."
 
         $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=kogito-quarkus-archetype \
-        -DarchetypeVersion=$KOGITO_VERSION -DgroupId=com.company -DartifactId=project -s $KOGITO_HOME/.m2/settings.xml
+        -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
+        -s $KOGITO_HOME/.m2/settings.xml
 
         # copy resources into the generated project
         for item in *
         do
-            if [ -d "${item}" ] && [ "${item}" == "project" ]; then
+            if [ -d "${item}" ] && [ "${item}" == "$PROJECT_ARTIFACT_ID" ]; then
                 log_info "--> Skipping generated project ..."
             else
-                log_info "--> Coping resource "${item}""
-                cp -Rv "${item}" project/src/main/resources
+                log_info "--> Coping resource ${item}"
+                cp -Rv "${item}" $PROJECT_ARTIFACT_ID/src/main/resources
             fi
         done
 
         # move all project content into the current directory
-        mv -v project/* .
+        mv -v $PROJECT_ARTIFACT_ID/* .
 
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
             -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
@@ -173,5 +177,4 @@ function copy_kogito_app() {
         log_info "---> Installing application binaries"
         cp -v $artifactDir/*.jar $KOGITO_HOME/bin
     fi
-}
-
+}
\ No newline at end of file
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 6f58254b5a1..9fd6c152caf 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -26,6 +26,18 @@ envs:
     description: ^ Location of mount for source code to be built.  This should not be overridden by end users.
     example: "${S2I_DESTINATION_DIR}/src}"
 
+  - name: PROJECT_GROUP_ID
+    description: ^  Indicates the unique identifier of the organization or group that created the project.(default "com.company")
+    example: "com.company"
+
+  - name: PROJECT_ARTIFACT_ID
+    description: ^  Indicates the unique base name of the primary artifact being generated.(default "project")
+    example: "project"
+
+  - name: PROJECT_VERSION
+    description: ^  Indicates the version of the artifact generated by the project.(default "1.0-SNAPSHOT")
+    example: "1.0-SNAPSHOT"
+
 modules:
   install:
     - name: org.kie.kogito.persistence
@@ -35,4 +47,4 @@ run:
     - "/usr/local/s2i/run"
 
 execute:
-  - script: configure.sh
+  - script: configure.sh
\ No newline at end of file
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 10192cbc87e..1d5d0926922 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -279,3 +279,21 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | content_type    | application/json                                                                                 |
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
+    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable            | value          |
+      | NATIVE              | false          |
+      | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
+      | PROJECT_GROUP_ID    | com.mycompany  |
+      | PROJECT_ARTIFACT_ID | myproject      |
+      | PROJECT_VERSION     | 2.0-SNAPSHOT   |
+    Then file /home/kogito/bin/myproject-2.0-SNAPSHOT-runner.jar should exist
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
\ No newline at end of file

From a53f09d4e6ca7e87cc8467d0c3c3727ebbb01f9d Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 26 May 2020 14:07:15 -0300
Subject: [PATCH 139/709] =?UTF-8?q?[KOGITO-1956]=20-=20Provide=20a=20way?=
 =?UTF-8?q?=20to=20add=20a=20specific=20repository=20to=20setting=E2=80=A6?=
 =?UTF-8?q?=20(#166)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-1956] - Provide a way to add a specific repository to settings.xml in S2I images

Signed-off-by: spolti <fspolti@redhat.com>


Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 README.md                                     |  13 +
 .../3.6.x/added/configure-maven.sh            | 131 +++++++++-
 modules/kogito-maven/3.6.x/maven/settings.xml |   5 +
 modules/kogito-maven/3.6.x/module.yaml        |  30 +++
 .../tests/bats/maven-settings.bats            | 237 +++++++++++++++++-
 5 files changed, 414 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7e62e8309d1..3a050e5e66a 100644
--- a/README.md
+++ b/README.md
@@ -313,6 +313,19 @@ sys	0m0.539s
 Here you can see that the build time has again been reduced. 
 If the maven mirror have already have all the dependencies there, the build time can be even faster.
 
+If a custom Maven Repository is required, the S2i images also supports it.  
+In case the **MAVEN_REPO_URL** environment variable is provided a new Repository and Plugin Repository will be added to the internal `settings.xml` file.  
+If no repo-id is provided using the **MAVEN_REPO_ID** environment variable, a generated one will be used.  
+There is also the possibility to provide more than one custom Repository. In this case, we need to provide the repo **prefix** using the **MAVEN_REPOS** environment variable.  
+Example, if we want to add two new repositories, the following environment variables is needed:
+
+```bash
+MAVEN_REPOS="CENTRAL,COMPANY"
+CENTRAL_MAVEN_REPO_URL="http://central.severinolabs.com/group/public"
+CENTRAL_MAVEN_REPO_ID="my_cool_id_central"
+COMPANY_MAVEN_REPO_URL="http://company.severinolabs.com/group/public"
+COMPANY_MAVEN_REPO_ID="my_cool_id_company"
+``` 
 
 ### Kogito Runtime Images
 
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index 3b9f981a6e1..8237ee780a5 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -1,18 +1,29 @@
 #!/usr/bin/env bash
 
 function prepareEnv() {
-    unset HTTPS_PROXY
     unset HTTP_PROXY_HOST
     unset HTTP_PROXY_PORT
     unset HTTP_PROXY_PASSWORD
     unset HTTP_PROXY_USERNAME
     unset HTTP_PROXY_NONPROXYHOSTS
+    unset HTTPS_PROXY
     unset MAVEN_MIRROR_URL
+    unset MAVEN_REPO_ID
+    unset MAVEN_REPO_LAYOUT
+    unset MAVEN_REPO_RELEASES_ENABLED
+    unset MAVEN_REPO_RELEASES_UPDATE_POLICY
+    unset MAVEN_REPO_RELEASES_CHECKSUM_POLICY
+    unset MAVEN_REPO_SNAPSHOTS_ENABLED
+    unset MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY
+    unset MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY
+    unset MAVEN_REPO_URL
+    unset MAVEN_REPOS
 }
 
 function configure() {
     configure_proxy
     configure_mirrors
+    add_maven_repo
 }
 
 # insert settings for HTTP proxy into maven settings.xml if supplied
@@ -73,3 +84,121 @@ function configure_mirrors() {
 }
 
 
+function add_maven_repo() {
+    # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service
+    local single_repo_url="${MAVEN_REPO_URL}"
+    if [ -n "$single_repo_url" ]; then
+        local single_repo_id=$(_maven_find_env "MAVEN_REPO_ID" "repo-$(_generate_random_id)")
+        _add_maven_repo "$single_repo_url" "$single_repo_id" ""
+    fi
+
+    # multiple remote repositories scenario: respect fully qualified url(s) if specified, otherwise find and use service(s); can be used together with "single repo scenario" above
+    local multi_repo_counter=1
+    IFS=',' read -a multi_repo_prefixes <<< ${MAVEN_REPOS}
+    for multi_repo_prefix in ${multi_repo_prefixes[@]}; do
+        local multi_repo_url=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_URL")
+        local multi_repo_id=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_ID" "repo${multi_repo_counter}-$(_generate_random_id)")
+        _add_maven_repo "$multi_repo_url" "$multi_repo_id" "$multi_repo_prefix"
+        multi_repo_counter=$((multi_repo_counter+1))
+    done
+}
+# add maven repositories
+# Parameters:
+#   $1 - repo url
+#   $2 - repo id
+#   $3 - repo prefix
+function _add_maven_repo() {
+    local repo_url=$1
+    local repo_id=$2
+    local prefix=$3
+
+    local repo_name=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_NAME" "${repo_id}")
+    local repo_layout=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_LAYOUT" "default")
+    local releases_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_ENABLED" "true")
+    local releases_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_UPDATE_POLICY" "always")
+    local releases_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" "warn")
+    local snapshots_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_ENABLED" "true")
+    local snapshots_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" "always")
+    local snapshots_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" "warn")
+
+    local repo="\n\
+                <repository>\n\
+                    <id>${repo_id}</id>\n\
+                    <name>${repo_name}</name>\n\
+                    <url>${repo_url}</url>\n\
+                    <layout>${repo_layout}</layout>\n\
+                    <releases>\n\
+                        <enabled>${releases_enabled}</enabled>\n\
+                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
+                    </releases>\n\
+                    <snapshots>\n\
+                        <enabled>${snapshots_enabled}</enabled>\n\
+                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
+                    </snapshots>\n\
+                </repository>\n\
+                <!-- ### configured repositories ### -->"
+    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" $HOME/.m2/settings.xml
+
+
+    local pluginRepo="\n\
+                <pluginRepository>\n\
+                    <id>${repo_id}</id>\n\
+                    <name>${repo_name}</name>\n\
+                    <url>${repo_url}</url>\n\
+                    <layout>${repo_layout}</layout>\n\
+                    <releases>\n\
+                        <enabled>${releases_enabled}</enabled>\n\
+                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
+                    </releases>\n\
+                    <snapshots>\n\
+                        <enabled>${snapshots_enabled}</enabled>\n\
+                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
+                    </snapshots>\n\
+                </pluginRepository>\n\
+                <!-- ### configured plugin repositories ### -->"
+
+    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" $HOME/.m2/settings.xml
+}
+
+# Finds the environment variable  and returns its value if found.
+# Otherwise returns the default value if provided.
+#
+# Arguments:
+# $1 env variable name to check
+# $2 default value if environment variable was not set
+function _maven_find_env() {
+    local var=${!1}
+    echo "${var:-$2}"
+}
+
+# Finds the environment variable with the given prefix. If not found
+# the default value will be returned. If no prefix is provided will
+# rely on _maven_find_env
+#
+# Arguments
+#  - $1 prefix. Transformed to uppercase and replace - by _
+#  - $2 variable name. Prepended by "prefix_"
+#  - $3 default value if the variable is not defined
+function _maven_find_prefixed_env() {
+    local prefix=$1
+
+    if [[ -z $prefix ]]; then
+        _maven_find_env $2 $3
+    else
+        prefix=${prefix^^} # uppercase
+        prefix=${prefix//-/_} #replace - by _
+
+        local var_name=$prefix"_"$2
+        echo ${!var_name:-$3}
+      fi
+}
+
+# private
+function _generate_random_id() {
+    cat /dev/urandom | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
+}
+
diff --git a/modules/kogito-maven/3.6.x/maven/settings.xml b/modules/kogito-maven/3.6.x/maven/settings.xml
index 77c08913f48..257f694e114 100644
--- a/modules/kogito-maven/3.6.x/maven/settings.xml
+++ b/modules/kogito-maven/3.6.x/maven/settings.xml
@@ -19,6 +19,7 @@
                     <id>jboss-public-repository-group</id>
                     <name>JBoss Public Repository Group</name>
                     <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+                    <layout>default</layout>
                     <releases>
                         <enabled>true</enabled>
                         <updatePolicy>never</updatePolicy>
@@ -28,12 +29,15 @@
                         <updatePolicy>always</updatePolicy>
                     </snapshots>
                 </repository>
+                <!-- ### configured repositories ### -->
             </repositories>
+
             <pluginRepositories>
                 <pluginRepository>
                     <id>jboss-public-repository-group</id>
                     <name>JBoss Public Repository Group</name>
                     <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+                    <layout>default</layout>
                     <releases>
                         <enabled>true</enabled>
                         <updatePolicy>never</updatePolicy>
@@ -43,6 +47,7 @@
                         <updatePolicy>always</updatePolicy>
                     </snapshots>
                 </pluginRepository>
+                <!-- ### configured plugin repositories ### -->
             </pluginRepositories>
         </profile>
     </profiles>
diff --git a/modules/kogito-maven/3.6.x/module.yaml b/modules/kogito-maven/3.6.x/module.yaml
index 52f2b7c1a74..424886b9821 100644
--- a/modules/kogito-maven/3.6.x/module.yaml
+++ b/modules/kogito-maven/3.6.x/module.yaml
@@ -26,6 +26,36 @@ envs:
   - name: "MAVEN_MIRROR_URL"
     description: "The base URL of a mirror used for retrieving artifacts."
     example: "http://10.0.0.1:8080/repository/internal/"
+  - name: "MAVEN_REPO_URL"
+    description: "Defines the new Repository address."
+    example: "https://nexus.test.com/group/public"
+  - name: "MAVEN_REPO_ID"
+    description: "Defines the id of the new Repository"
+    example: "nexus-test"
+  - name: "MAVEN_REPO_LAYOUT"
+    description: "The type of layout this repository uses for locating and storing artifacts - can be 'legacy' or 'default'.Defaults to 'default'."
+    example: "legacy"
+  - name: "MAVEN_REPO_RELEASES_ENABLED"
+    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
+    example: "false"
+  - name: "MAVEN_REPO_RELEASES_UPDATE_POLICY"
+    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
+    example: "never"
+  - name: "MAVEN_REPO_RELEASES_CHECKSUM_POLICY"
+    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
+    example: "fail"
+  - name: "MAVEN_REPO_SNAPSHOTS_ENABLED"
+    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
+    example: "false"
+  - name: "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY"
+    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
+    example: "never"
+  - name: "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY"
+    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
+    example: "fail"
+  - name: "MAVEN_REPOS"
+    description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories."
+    example: "CENTRAL,INTERNAL"
 
 # unfortunately by now the version needs to be hardcoded.
 artifacts:
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index 42294bbba85..0ab6bbdb245 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -14,6 +14,12 @@ teardown() {
     rm -rf ${HOME}
 }
 
+# override this function, cat /dec/urandon makes the test hangs on GH actions
+function _generate_random_id() {
+    echo "testing" | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
+}
+
+
 @test "test maven mirror configuration" {
     prepareEnv
     MAVEN_MIRROR_URL="http://localhost:8081/nexus/custom/repo/public"
@@ -135,4 +141,233 @@ teardown() {
     echo "expected=${expected}"
     echo "result=${result}"
     [ "${expected}" = "${result}" ]
-}
\ No newline at end of file
+}
+
+
+@test "test maven custom repo with ID and all supported configurations" {
+    prepareEnv
+    MAVEN_REPO_URL="http://my.cool.mvn.repo.severinolabs.com/group/public"
+    MAVEN_REPO_ID="my_cool_id"
+    MAVEN_REPO_LAYOUT="test"
+    MAVEN_REPO_RELEASES_ENABLED="true"
+    MAVEN_REPO_RELEASES_UPDATE_POLICY="never"
+    MAVEN_REPO_RELEASES_CHECKSUM_POLICY="test"
+    MAVEN_REPO_SNAPSHOTS_ENABLED="false"
+    MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY="test"
+    MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY="test"
+
+    run add_maven_repo
+
+    repository_expected="<repository>
+                    <id>my_cool_id</id>
+                    <name>my_cool_id</name>
+                    <url>http://my.cool.mvn.repo.severinolabs.com/group/public</url>
+                    <layout>test</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                        <checksumPolicy>test</checksumPolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                        <updatePolicy>test</updatePolicy>
+                        <checksumPolicy>test</checksumPolicy>
+                    </snapshots>
+                </repository>"
+    repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "repository_expected=${repository_expected}"
+    echo "repository_result  =${repository_result}"
+    [ "${repository_expected}" = "${repository_result}" ]
+
+    plugin_repository_expected="<pluginRepository>
+                    <id>my_cool_id</id>
+                    <name>my_cool_id</name>
+                    <url>http://my.cool.mvn.repo.severinolabs.com/group/public</url>
+                    <layout>test</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                        <checksumPolicy>test</checksumPolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                        <updatePolicy>test</updatePolicy>
+                        <checksumPolicy>test</checksumPolicy>
+                    </snapshots>
+                </pluginRepository>"
+    plugin_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "plugin_repository_expected=${plugin_repository_expected}"
+    echo "plugin_repository_result  =${plugin_repository_result}"
+    [ "${plugin_repository_expected}" = "${plugin_repository_result}" ]
+}
+
+
+@test "test maven custom repo with no ID and other configuration, test default values" {
+    prepareEnv
+    MAVEN_REPO_URL="http://my.cool.mvn.repo.severinolabs.com/group/public"
+    run add_maven_repo
+
+    repository_url_expected="<url>http://my.cool.mvn.repo.severinolabs.com/group/public</url>"
+    repository_url_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository']//*[local-name()='url'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "repository_url_expected=${repository_url_expected}"
+    echo "repository_url_result  =${repository_url_result}"
+    [ "${repository_url_expected}" = "${repository_url_result}" ]
+
+    repository_releases_expected="<releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>always</updatePolicy>
+                        <checksumPolicy>warn</checksumPolicy>
+                    </releases>"
+    repository_releases_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository']//*[local-name()='releases'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "repository_releases_expected=${repository_releases_expected}"
+    echo "repository_releases_result  =${repository_releases_result}"
+    [ "${repository_releases_expected}" = "${repository_releases_result}" ]
+
+    repository_snapshots_expected="<snapshots>
+                        <enabled>true</enabled>
+                        <updatePolicy>always</updatePolicy>
+                        <checksumPolicy>warn</checksumPolicy>
+                    </snapshots>"
+    repository_snapshots_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository']//*[local-name()='snapshots'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "repository_snapshots_expected=${repository_snapshots_expected}"
+    echo "repository_snapshots_result  =${repository_snapshots_result}"
+    [ "${repository_snapshots_expected}" = "${repository_snapshots_result}" ]
+
+
+    plugin_repository_url_expected="<url>http://my.cool.mvn.repo.severinolabs.com/group/public</url>"
+    plugin_repository_url_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository']//*[local-name()='url'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "plugin_repository_url_expected=${plugin_repository_url_expected}"
+    echo "plugin_repository_url_result  =${plugin_repository_url_result}"
+    [ "${plugin_repository_url_expected}" = "${plugin_repository_url_result}" ]
+
+    plugin_repository_releases_expected="<releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>always</updatePolicy>
+                        <checksumPolicy>warn</checksumPolicy>
+                    </releases>"
+    plugin_repository_releases_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository']//*[local-name()='releases'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "plugin_repository_releases_expected=${plugin_repository_releases_expected}"
+    echo "plugin_repository_releases_result  =${plugin_repository_releases_result}"
+    [ "${plugin_repository_releases_expected}" = "${plugin_repository_releases_result}" ]
+
+    plugin_repository_snapshots_expected="<snapshots>
+                        <enabled>true</enabled>
+                        <updatePolicy>always</updatePolicy>
+                        <checksumPolicy>warn</checksumPolicy>
+                    </snapshots>"
+    plugin_repository_snapshots_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository']//*[local-name()='snapshots'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "plugin_repository_snapshots_expected=${plugin_repository_snapshots_expected}"
+    echo "plugin_repository_snapshots_result  =${plugin_repository_snapshots_result}"
+    [ "${plugin_repository_snapshots_expected}" = "${plugin_repository_snapshots_result}" ]
+}
+
+@test "test maven multiple custom repos with ID and all supported configuration" {
+    prepareEnv
+    MAVEN_REPOS="CENTRAL,COMPANY"
+    CENTRAL_MAVEN_REPO_URL="http://central.severinolabs.com/group/public"
+    CENTRAL_MAVEN_REPO_ID="my_cool_id_central"
+    CENTRAL_MAVEN_REPO_LAYOUT="test"
+    CENTRAL_MAVEN_REPO_RELEASES_ENABLED="true"
+    CENTRAL_MAVEN_REPO_RELEASES_UPDATE_POLICY="never"
+    CENTRAL_MAVEN_REPO_RELEASES_CHECKSUM_POLICY="test"
+    CENTRAL_MAVEN_REPO_SNAPSHOTS_ENABLED="false"
+    CENTRAL_MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY="test"
+    CENTRAL_MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY="test"
+
+    COMPANY_MAVEN_REPO_URL="http://company.severinolabs.com/group/public"
+    COMPANY_MAVEN_REPO_ID="my_cool_id_company"
+    COMPANY_MAVEN_REPO_LAYOUT="another-test"
+    COMPANY_MAVEN_REPO_RELEASES_ENABLED="true"
+    COMPANY_MAVEN_REPO_RELEASES_UPDATE_POLICY="never"
+    COMPANY_MAVEN_REPO_RELEASES_CHECKSUM_POLICY="another-test"
+    COMPANY_MAVEN_REPO_SNAPSHOTS_ENABLED="false"
+    COMPANY_MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY="another-test"
+    COMPANY_MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY="another-test"
+
+    run add_maven_repo
+
+    central_repository_expected="<repository>
+                    <id>my_cool_id_central</id>
+                    <name>my_cool_id_central</name>
+                    <url>http://central.severinolabs.com/group/public</url>
+                    <layout>test</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                        <checksumPolicy>test</checksumPolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                        <updatePolicy>test</updatePolicy>
+                        <checksumPolicy>test</checksumPolicy>
+                    </snapshots>
+                </repository>"
+    central_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository'])[last()-1]"  ${HOME}/.m2/settings.xml)
+    echo "central_repository_expected=${central_repository_expected}"
+    echo "central_repository_result  =${central_repository_result}"
+    [ "${central_repository_expected}" = "${central_repository_result}" ]
+
+    company_repository_expected="<repository>
+                    <id>my_cool_id_company</id>
+                    <name>my_cool_id_company</name>
+                    <url>http://company.severinolabs.com/group/public</url>
+                    <layout>another-test</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                        <checksumPolicy>another-test</checksumPolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                        <updatePolicy>another-test</updatePolicy>
+                        <checksumPolicy>another-test</checksumPolicy>
+                    </snapshots>
+                </repository>"
+    company_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "company_repository_expected=${company_repository_expected}"
+    echo "company_repository_result  =${company_repository_result}"
+    [ "${company_repository_expected}" = "${company_repository_result}" ]
+
+
+    central_plugin_repository_expected="<pluginRepository>
+                    <id>my_cool_id_central</id>
+                    <name>my_cool_id_central</name>
+                    <url>http://central.severinolabs.com/group/public</url>
+                    <layout>test</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                        <checksumPolicy>test</checksumPolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                        <updatePolicy>test</updatePolicy>
+                        <checksumPolicy>test</checksumPolicy>
+                    </snapshots>
+                </pluginRepository>"
+    central_plugin_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository'])[last()-1]"  ${HOME}/.m2/settings.xml)
+    echo "central_plugin_repository_expected=${central_plugin_repository_expected}"
+    echo "central_plugin_repository_result  =${central_plugin_repository_result}"
+    [ "${central_plugin_repository_expected}" = "${central_plugin_repository_result}" ]
+
+    company_plugin_repository_expected="<pluginRepository>
+                    <id>my_cool_id_company</id>
+                    <name>my_cool_id_company</name>
+                    <url>http://company.severinolabs.com/group/public</url>
+                    <layout>another-test</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                        <checksumPolicy>another-test</checksumPolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                        <updatePolicy>another-test</updatePolicy>
+                        <checksumPolicy>another-test</checksumPolicy>
+                    </snapshots>
+                </pluginRepository>"
+    company_plugin_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository'])[last()]"  ${HOME}/.m2/settings.xml)
+    echo "company_plugin_repository_expected=${company_plugin_repository_expected}"
+    echo "company_plugin_repository_result  =${company_plugin_repository_result}"
+    [ "${company_plugin_repository_expected}" = "${company_plugin_repository_result}" ]
+}

From 08b22ec39574b4ffef009b95dcf85cdcd6345632 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 2 Jun 2020 22:11:56 +0200
Subject: [PATCH 140/709] KOGITO-2352 repository option on update artifacts
 (#170)

---
 scripts/update-artifacts.py | 54 ++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/scripts/update-artifacts.py b/scripts/update-artifacts.py
index bb08c45c389..6e104afe097 100644
--- a/scripts/update-artifacts.py
+++ b/scripts/update-artifacts.py
@@ -15,7 +15,9 @@
 import argparse
 from ruamel.yaml import YAML
 
-repoURL = "https://repository.jboss.org/org/kie/kogito/"
+DEFAULT_REPO_URL = "https://repository.jboss.org/"
+DEFAULT_VERSION = "8.0.0-SNAPSHOT"
+DEFAULT_ARTIFACT_PATH = "org/kie/kogito"
 
 Modules = {
     #service-name: module-name(directory in which module's module.yaml file is present)
@@ -26,13 +28,13 @@
 }
 
 
-def getMetadataRoot(repoURL):
+def getMetadataRoot(serviceUrl):
     '''
     Get the root element from the maven-metadata
-    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
     :return: root object
     '''
-    metadataURL=repoURL+"maven-metadata.xml"
+    metadataURL=serviceUrl+"maven-metadata.xml"
     mavenMetadata=requests.get(metadataURL)
     with open('maven-metadata.xml', 'wb') as f:
         f.write(mavenMetadata.content)
@@ -40,44 +42,44 @@ def getMetadataRoot(repoURL):
     root=tree.getroot()
     return root
 
-def getSnapshotVersion(repoURL):
+def getSnapshotVersion(serviceUrl):
     '''
     parse the xml and finds the snapshotVersion
-    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
     :return: snapshotVersion string
     '''
-    root=getMetadataRoot(repoURL)
+    root=getMetadataRoot(serviceUrl)
     snapshotVersion=root.find("./versioning/snapshotVersions/snapshotVersion/value").text
     return snapshotVersion
 
-def getArtifactID(repoURL):
+def getArtifactID(serviceUrl):
     '''
     parse the xml and finds the artifactID
-    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
     :return: artifactID string
     '''
-    root=getMetadataRoot(repoURL)
+    root=getMetadataRoot(serviceUrl)
     artifactID=root.find("./artifactId").text
     return artifactID
 
-def getRunnerURL(repoURL):
+def getRunnerURL(serviceUrl):
     ''' 
     Creates the updated URL for runner.jar
-    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
     :return: url string
     '''
-    artifactId=getArtifactID(repoURL)
-    snapshotVersion=getSnapshotVersion(repoURL)
-    url=repoURL+"{}-{}-runner.jar".format(artifactId,snapshotVersion)
+    artifactId=getArtifactID(serviceUrl)
+    snapshotVersion=getSnapshotVersion(serviceUrl)
+    url=serviceUrl+"{}-{}-runner.jar".format(artifactId,snapshotVersion)
     return url
 
-def getMD5(repoURL):
+def getMD5(serviceUrl):
     '''
     Fetches the md5 code for the latest runner.jar
-    :param repoURL: URL of the repo from which artifacts needs to be updated
+    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
     :return: runnerMD5 string
     '''
-    runnerURL=getRunnerURL(repoURL)
+    runnerURL=getRunnerURL(serviceUrl)
     runnerMD5URL=runnerURL+".md5"
     runnerMD5=sp.getoutput("curl -s  {}".format(runnerMD5URL))
     return runnerMD5
@@ -93,28 +95,32 @@ def yaml_loader():
     yaml.indent(mapping=2, sequence=4, offset=2)
     return yaml
 
-def update_artifacts(repoURL,modulePath):
+def update_artifacts(serviceUrl,modulePath):
     '''
     Updates the module.yaml file of services with latest artifacts
-    :parm repoURL: URL of the repo from which artifacts needs to be updated
+    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
     :param modulePath: relative file location of the module.yaml for the kogito service
     '''
 
     with open(modulePath) as module:
         data=yaml_loader().load(module)
-        data['artifacts'][0]['url']=getRunnerURL(repoURL)
-        data['artifacts'][0]['md5']=getMD5(repoURL)
+        data['artifacts'][0]['url']=getRunnerURL(serviceUrl)
+        data['artifacts'][0]['md5']=getMD5(serviceUrl)
     with open(modulePath, 'w') as module:
         yaml_loader().dump(data, module)
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Update the snapshot url for kogito services.')
-    parser.add_argument('--snapshot-version', dest='snapshotVersion', default='8.0.0-SNAPSHOT', help='Defines the snapshot version of the jboss repository, defaults to 8.0.0-SNAPSHOT')
+    parser.add_argument('--repo-url', dest='repoUrl', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
+    parser.add_argument('--snapshot-version', dest='snapshotVersion', default=DEFAULT_VERSION, help='Defines the snapshot version of artifacts to retrieve from the repository url, defaults to {}'.format(DEFAULT_VERSION))
     args = parser.parse_args()
     
     for service, path in Modules.items():
-        update_artifacts(repoURL+"{}/{}/".format(service,args.snapshotVersion),"modules/{}/module.yaml".format(path))
+        serviceUrl = args.repoUrl+"{}/{}/{}/".format(DEFAULT_ARTIFACT_PATH, service, args.snapshotVersion)
+        moduleYamlFile = "modules/{}/module.yaml".format(path)
+        
+        update_artifacts(serviceUrl,moduleYamlFile)
         print("Successfully updated the artifacts for: ",service)
 
     os.remove("maven-metadata.xml")

From 04f9b9ce196de9d530e92fcf275954d96e181cc7 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 3 Jun 2020 09:24:10 -0300
Subject: [PATCH 141/709] [KOGITO-2123] - Remove duplicate BATS test (#169)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .../tests/bats/kogito-data-index.bats         | 91 -------------------
 .../bats/kogito-infinispan-properties.bats    | 12 ++-
 .../tests/bats/kogito-jobs-service.bats       | 13 +--
 3 files changed, 12 insertions(+), 104 deletions(-)

diff --git a/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
index 198ecc0e1e8..5bcfa4d8306 100644
--- a/modules/kogito-data-index/tests/bats/kogito-data-index.bats
+++ b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
@@ -10,101 +10,10 @@ cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/la
 load ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-data-index.sh
 
-function setup(){
-  function log_error() { echo "ERROR ${1}"; }
-}
-
 teardown() {
     rm -rf ${KOGITO_HOME}
 }
 
-function clear_vars() {
-    unset INFINISPAN_USEAUTH
-    unset INFINISPAN_USERNAME
-    unset INFINISPAN_PASSWORD
-    unset INFINISPAN_AUTHREALM
-    unset INFINISPAN_SASLMECHANISM
-}
-
-@test "check if infinispan properties is blank" {
-    clear_vars
-    local expected=" -Dquarkus.infinispan-client.use-auth=false"
-    configure_infinispan_props
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "check if infinispan auth is false" {
-    clear_vars
-    export INFINISPAN_USEAUTH="false"
-    local expected=" -Dquarkus.infinispan-client.use-auth=false"
-    configure_infinispan_props
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "check if infinispan has auth props" {
-    clear_vars
-    export INFINISPAN_USERNAME="developer"
-    export INFINISPAN_USEAUTH="true"
-    export INFINISPAN_PASSWORD="developer"
-    export INFINISPAN_AUTHREALM="default"
-    export INFINISPAN_SASLMECHANISM="PLAIN"
-
-    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.auth-password=developer -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.auth-realm=default -Dquarkus.infinispan-client.sasl-mechanism=PLAIN"
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "setting username, useauth is true" {
-    clear_vars
-    export INFINISPAN_USERNAME="developer"
-    export INFINISPAN_USEAUTH="false"
-    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
-
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "when use auth is set to nonsense and no credentials" {
-    clear_vars
-    export INFINISPAN_USEAUTH="dsadsadasdsa"
-    local expected=" -Dquarkus.infinispan-client.use-auth=false"
-
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "when use auth is set to nonsense and has credentials" {
-    clear_vars
-    export INFINISPAN_USEAUTH="dsadsadasdsa"
-    export INFINISPAN_USERNAME="developer"
-    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
-
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "when use auth is set to true and no credentials" {
-    clear_vars
-    export INFINISPAN_USEAUTH="true"
-
-    run configure_infinispan_props
-
-    expected="ERROR Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
-    echo "Result is ${output} and expected is ${expected}"
-    echo "Expected status is 1, outcome status is ${status}"
-    [ "$status" -eq 1 ]
-    [ "${output}" = "${expected}" ]
-}
 
 @test "http port configuration default value" {
     configure_data_index_http_port
diff --git a/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats b/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
index 7be259c3fa6..e9b11846fe9 100644
--- a/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
+++ b/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
@@ -8,6 +8,10 @@ cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/la
 # import
 load $BATS_TEST_DIRNAME/../../added/kogito-infinispan-properties.sh
 
+function setup(){
+  function log_error() { echo "ERROR ${1}"; }
+}
+
 function clear_vars() {
     unset INFINISPAN_USEAUTH
     unset INFINISPAN_USERNAME
@@ -88,9 +92,13 @@ function clear_vars() {
 @test "when use auth is set to true and no credentials" {
     clear_vars
     export INFINISPAN_USEAUTH="true"
+
     run configure_infinispan_props
-    # exit
-    echo "Status: ${status}"
+
+    expected="ERROR Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
+    echo "Result is ${output} and expected is ${expected}"
+    echo "Expected status is 1, outcome status is ${status}"
     [ "$status" -eq 1 ]
+    [ "${output}" = "${expected}" ]
 }
 
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index 180118ae986..03c88947e66 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -15,7 +15,6 @@ teardown() {
     rm -rf ${KOGITO_HOME}
 }
 
-
 @test "test enable persistence without set infinispan server list" {
     export ENABLE_PERSISTENCE="true"
     run configure_jobs_service
@@ -25,7 +24,6 @@ teardown() {
     [ "${output}" = "${expected}" ]
 }
 
-
 @test "check if the backoffRetryMillis is correctly set" {
     export BACKOFF_RETRY="2000"
     configure_jobs_service
@@ -34,7 +32,6 @@ teardown() {
     [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
 }
 
-
 @test "check if the maxIntervalLimitToRetryMillis is correctly set" {
     export MAX_INTERVAL_LIMIT_RETRY="8000"
     configure_jobs_service
@@ -43,7 +40,6 @@ teardown() {
     [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
 }
 
-
 @test "check if the maxIntervalLimitToRetryMillis and backoffRetryMillis are correctly set" {
     export MAX_INTERVAL_LIMIT_RETRY="8000"
     export BACKOFF_RETRY="2000"
@@ -53,18 +49,13 @@ teardown() {
     [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
 }
 
-
 @test "check if the persistence is correctly configured with auth" {
     export ENABLE_PERSISTENCE="true"
     export INFINISPAN_CLIENT_SERVER_LIST="localhost:11222"
-    export INFINISPAN_USEAUTH="true"
-    export INFINISPAN_USERNAME="nevermind"
-    export INFINISPAN_PASSWORD="impossible2gues"
     configure_jobs_service
-    configure_infinispan_props
 
-    result="${KOGITO_JOBS_PROPS} ${INFINISPAN_PROPERTIES}"
-    expected=" -Dkogito.jobs-service.persistence=infinispan -Dquarkus.infinispan-client.server-list=localhost:11222  -Dquarkus.infinispan-client.auth-username=nevermind -Dquarkus.infinispan-client.auth-password=impossible2gues -Dquarkus.infinispan-client.use-auth=true"
+    result="${KOGITO_JOBS_PROPS}"
+    expected=" -Dkogito.jobs-service.persistence=infinispan -Dquarkus.infinispan-client.server-list=localhost:11222"
 
     echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]

From b0ab1a0bca7158df879f59f7355f67b5facd6f85 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Wed, 3 Jun 2020 18:37:39 +0530
Subject: [PATCH 142/709] [KOGITO-2226] - Kogito Images pipeline builds & tests
 in parallel (#167)

See: https://issues.redhat.com/browse/KOGITO-2293

Signed-off-by: TARUN KHANDELWAL <tarkhand@redhat.com>
---
 Jenkinsfile         | 91 ++++++++++++++++++++++++++-------------------
 Jenkinsfile-Nightly | 91 ++++++++++++++++++++++++++-------------------
 Jenkinsfile.deploy  | 82 ++++++++++++++++++++--------------------
 3 files changed, 146 insertions(+), 118 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e353dadb479..22952e1204f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,13 +6,25 @@
 def buildNumber = env.BUILD_NUMBER as int
 if (buildNumber > 1) milestone(buildNumber - 1)
 milestone(buildNumber)
+IMAGES = ["kogito-quarkus-ubi8", 
+            "kogito-quarkus-jvm-ubi8",
+            "kogito-quarkus-ubi8-s2i",
+            "kogito-springboot-ubi8",
+            "kogito-springboot-ubi8-s2i",
+            "kogito-data-index",
+            "kogito-jobs-service",
+            "kogito-management-console"]
 
 pipeline{
     agent { label 'jenkins-slave'}
     stages{
         stage('Initialization'){
             steps{
-                sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
+                script{
+                    cleanWorkspaces()
+                }
+                sh "docker rm -f \$(docker ps -a -q) || date"
+                sh "docker rmi -f \$(docker images -q) || date"
             }
         }
         stage('Validate CeKit Image and Modules descriptors'){
@@ -41,44 +53,26 @@ pipeline{
                 sh "make clone-repos"
             }
         }
-        stage('Build and test kogito-quarkus-ubi8 image'){
-            steps{
-                sh "make kogito-quarkus-ubi8"
-            }
-        }
-        stage('Build and test kogito-quarkus-jvm-ubi8 image'){
+        stage('Build and Test Images'){
             steps{
-                sh "make kogito-quarkus-jvm-ubi8"
-            }
-        }
-        stage('Build and test kogito-quarkus-ubi8-s2i image'){
-            steps{
-                sh "make kogito-quarkus-ubi8-s2i"
-            }
-        }
-        stage('Build and test kogito-springboot-ubi8 image'){
-            steps{
-                sh "make kogito-springboot-ubi8"
-            }
-        }
-        stage('Build and test kogito-springboot-ubi8-s2i image '){
-            steps{
-                sh "make kogito-springboot-ubi8-s2i"
-            }
-        }
-        stage('Build and test kogito-data-index image '){
-            steps{
-                sh "make kogito-data-index"
-            }
-        }
-        stage('Build and test kogito-jobs-service image '){
-            steps{
-                sh "make kogito-jobs-service"
-            }
-        }
-        stage('Build and test kogito-management-console image '){
-            steps{
-                sh "make kogito-management-console"
+                script {
+                    build_stages = [:]
+                    IMAGES.each{ image -> build_stages["${image}"] = {
+                            createWorkspace("$image")
+                            copyWorkspace("$image")
+                            dir(getWorkspacePath("$image")){
+                                try{
+                                    sh "make ${image}"
+                                }
+                                finally{
+                                    junit 'target/test/results/*.xml'
+                                }
+                            
+                            }
+                        }
+                    }
+                    parallel build_stages
+                }
             }
         }
         stage('Finishing'){
@@ -89,8 +83,27 @@ pipeline{
     }
     post{
         always{
-            junit 'target/test/results/*.xml'
+            script{
+                cleanWorkspaces()
+            }
         }
     }
 }
 
+
+
+void  createWorkspace(String image){
+    sh "mkdir -p ${getWorkspacePath(image)}"
+}
+void copyWorkspace(String image){
+    sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
+}
+void cleanWorkspaces(){
+    sh "rm -rf ${getWorkspacesPath()}"
+}
+String getWorkspacesPath(){
+    return "${WORKSPACE}/workspaces"
+}
+String getWorkspacePath(String image){
+    return "${getWorkspacesPath()}/${image}"
+}
\ No newline at end of file
diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
index 48159e10345..d2819007c7a 100644
--- a/Jenkinsfile-Nightly
+++ b/Jenkinsfile-Nightly
@@ -2,6 +2,15 @@
 //If found triggers the pipeline, 
 //The pipeline is set to run between 12:00AM - 3:00AM UTC
 
+IMAGES = ["kogito-quarkus-ubi8", 
+            "kogito-quarkus-jvm-ubi8",
+            "kogito-quarkus-ubi8-s2i",
+            "kogito-springboot-ubi8",
+            "kogito-springboot-ubi8-s2i",
+            "kogito-data-index",
+            "kogito-jobs-service",
+            "kogito-management-console"]
+
 pipeline{
     agent { label 'jenkins-slave'}
      triggers{
@@ -13,7 +22,11 @@ pipeline{
     stages{
         stage('Initialization'){
             steps{
-                sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
+                script{
+                    cleanWorkspaces()
+                }
+                sh "docker rm -f \$(docker ps -a -q) || date"
+                sh "docker rmi -f \$(docker images -q) ||"
             }
         }
         stage('Validate CeKit Image and Modules descriptors'){
@@ -47,44 +60,26 @@ pipeline{
                 sh "make clone-repos"
             }
         }
-        stage('Build and test kogito-quarkus-ubi8 image'){
-            steps{
-                sh "make kogito-quarkus-ubi8"
-            }
-        }
-        stage('Build and test kogito-quarkus-jvm-ubi8 image'){
-            steps{
-                sh "make kogito-quarkus-jvm-ubi8"
-            }
-        }
-        stage('Build and test kogito-quarkus-ubi8-s2i image'){
-            steps{
-                sh "make kogito-quarkus-ubi8-s2i"
-            }
-        }
-        stage('Build and test kogito-springboot-ubi8 image'){
-            steps{
-                sh "make kogito-springboot-ubi8"
-            }
-        }
-        stage('Build and test kogito-springboot-ubi8-s2i image '){
-            steps{
-                sh "make kogito-springboot-ubi8-s2i"
-            }
-        }
-        stage('Build and test kogito-data-index image '){
-            steps{
-                sh "make kogito-data-index"
-            }
-        }
-        stage('Build and test kogito-jobs-service image '){
-            steps{
-                sh "make kogito-jobs-service"
-            }
-        }
-        stage('Build and test kogito-management-console image '){
+        stage('Build and Test Images'){
             steps{
-                sh "make kogito-management-console"
+                script {
+                    build_stages = [:]
+                    IMAGES.each{ image -> build_stages["${image}"] = {
+                            createWorkspace("$image")
+                            copyWorkspace("$image")
+                            dir(getWorkspacePath("$image")){
+                                try{
+                                    sh "make ${image}"
+                                }
+                                finally{
+                                    junit 'target/test/results/*.xml'
+                                }
+                            
+                            }
+                        }
+                    }
+                    parallel build_stages
+                }
             }
         }
         stage('Tagging'){
@@ -125,7 +120,25 @@ pipeline{
     }
     post{
         always{
-            junit 'target/test/results/*.xml'
+            script{
+                cleanWorkspaces()
+            }
         }
     }
 }
+
+void  createWorkspace(String image){
+    sh "mkdir -p ${getWorkspacePath(image)}"
+}
+void copyWorkspace(String image){
+    sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
+}
+void cleanWorkspaces(){
+    sh "rm -rf ${getWorkspacesPath()}"
+}
+String getWorkspacesPath(){
+    return "${WORKSPACE}/workspaces"
+}
+String getWorkspacePath(String image){
+    return "${getWorkspacesPath()}/${image}"
+}
\ No newline at end of file
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index e1f345fc1d1..fe2a1434a78 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -45,7 +45,9 @@ pipeline {
         stage('Initialization') {
             steps {
                 script {
-                    sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
+                    cleanWorkspaces()
+                    sh "docker rm -f \$(docker ps -a -q) || date"
+                    sh "docker rmi -f \$(docker images -q) || date"
                     
                     setupImageEnvVarsFromParams("","DEPLOY")
 
@@ -96,44 +98,26 @@ pipeline {
                 sh "make clone-repos"
             }
         }
-        stage('Build and test kogito-quarkus-ubi8 image') {
-            steps {
-                sh "make kogito-quarkus-ubi8"
-            }
-        }
-        stage('Build and test kogito-quarkus-jvm-ubi8 image') {
-            steps {
-                sh "make kogito-quarkus-jvm-ubi8"
-            }
-        }
-        stage('Build and test kogito-quarkus-ubi8-s2i image') {
-            steps {
-                sh "make kogito-quarkus-ubi8-s2i"
-            }
-        }
-        stage('Build and test kogito-springboot-ubi8 image') {
-            steps {
-                sh "make kogito-springboot-ubi8"
-            }
-        }
-        stage('Build and test kogito-springboot-ubi8-s2i image ') {
-            steps {
-                sh "make kogito-springboot-ubi8-s2i"
-            }
-        }
-        stage('Build and test kogito-data-index image ') {
-            steps {
-                sh "make kogito-data-index"
-            }
-        }
-        stage('Build and test kogito-jobs-service image ') {
-            steps {
-                sh "make kogito-jobs-service"
-            }
-        }
-        stage('Build and test kogito-management-console image ') {
-            steps {
-                sh "make kogito-management-console"
+        stage('Build and Test Images'){
+            steps{
+                script {
+                    build_stages = [:]
+                    IMAGES.each{ image -> build_stages["${image}"] = {
+                            createWorkspace("$image")
+                            copyWorkspace("$image")
+                            dir(getWorkspacePath("$image")){
+                                try{
+                                    sh "make ${image}"
+                                }
+                                finally{
+                                    junit 'target/test/results/*.xml'
+                                }
+                            
+                            }
+                        }
+                    }
+                    parallel build_stages
+                }
             }
         }
         stage('Tagging') {
@@ -167,7 +151,9 @@ pipeline {
     }
     post {
         always {
-            junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
+            script{
+                cleanWorkspaces()
+            }
         }
     }
 }
@@ -242,4 +228,20 @@ void setEnvFromParam(String keyId, String prefixEnv, String prefixParam){
 
 String getParam(String keyPrefix, String keyId){
     return params."${getKey(keyPrefix, keyId)}"
+}
+
+void  createWorkspace(String image){
+    sh "mkdir -p ${getWorkspacePath(image)}"
+}
+void copyWorkspace(String image){
+    sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
+}
+void cleanWorkspaces(){
+    sh "rm -rf ${getWorkspacesPath()}"
+}
+String getWorkspacesPath(){
+    return "${WORKSPACE}/workspaces"
+}
+String getWorkspacePath(String image){
+    return "${getWorkspacesPath()}/${image}"
 }
\ No newline at end of file

From 4db4ed0a5a3d75eb56a2130a948b4005a39b5244 Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Wed, 3 Jun 2020 18:56:45 +0530
Subject: [PATCH 143/709] =?UTF-8?q?[KOGITO-1861]=20-=20Make=20possible=20t?=
 =?UTF-8?q?o=20turn=20the=20Maven=20downloading=20process=20o=E2=80=A6=20(?=
 =?UTF-8?q?#165)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-1861] - Make possible to turn the Maven downloading process output off during s2i builds

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 README.md                                     |  3 ++-
 .../3.6.x/added/configure-maven.sh            |  7 +++++++
 modules/kogito-maven/3.6.x/module.yaml        |  3 +++
 .../tests/bats/maven-settings.bats            | 20 +++++++++++++++++++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3a050e5e66a..cec8bd3130e 100644
--- a/README.md
+++ b/README.md
@@ -311,7 +311,8 @@ sys	0m0.539s
 ```
 
 Here you can see that the build time has again been reduced. 
-If the maven mirror have already have all the dependencies there, the build time can be even faster.
+If the maven mirror already have all the dependencies there, the build time can be even faster.  
+Also, Maven generates lots of transfer logs for downloading/uploading of maven dependencies. By default, these logs are disabled. To view these logs we need to set env variable **MAVEN_DOWNLOAD_OUTPUT** to true. 
 
 If a custom Maven Repository is required, the S2i images also supports it.  
 In case the **MAVEN_REPO_URL** environment variable is provided a new Repository and Plugin Repository will be added to the internal `settings.xml` file.  
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index 8237ee780a5..1686f50d3f4 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -8,6 +8,7 @@ function prepareEnv() {
     unset HTTP_PROXY_NONPROXYHOSTS
     unset HTTPS_PROXY
     unset MAVEN_MIRROR_URL
+    unset MAVEN_DOWNLOAD_OUTPUT
     unset MAVEN_REPO_ID
     unset MAVEN_REPO_LAYOUT
     unset MAVEN_REPO_RELEASES_ENABLED
@@ -23,6 +24,7 @@ function prepareEnv() {
 function configure() {
     configure_proxy
     configure_mirrors
+    configure_maven_download_output
     add_maven_repo
 }
 
@@ -83,6 +85,11 @@ function configure_mirrors() {
     fi
 }
 
+function configure_maven_download_output() {
+    if [ "${MAVEN_DOWNLOAD_OUTPUT}" != "true" ]; then
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --no-transfer-progress"
+    fi
+}
 
 function add_maven_repo() {
     # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service
diff --git a/modules/kogito-maven/3.6.x/module.yaml b/modules/kogito-maven/3.6.x/module.yaml
index 424886b9821..dd519509bff 100644
--- a/modules/kogito-maven/3.6.x/module.yaml
+++ b/modules/kogito-maven/3.6.x/module.yaml
@@ -26,6 +26,9 @@ envs:
   - name: "MAVEN_MIRROR_URL"
     description: "The base URL of a mirror used for retrieving artifacts."
     example: "http://10.0.0.1:8080/repository/internal/"
+  - name: "MAVEN_DOWNLOAD_OUTPUT"
+    description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
+    example: "true"
   - name: "MAVEN_REPO_URL"
     description: "Defines the new Repository address."
     example: "https://nexus.test.com/group/public"
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index 0ab6bbdb245..d687ef4d645 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -143,6 +143,26 @@ function _generate_random_id() {
     [ "${expected}" = "${result}" ]
 }
 
+@test "test maven download output logs when MAVEN_DOWNLOAD_OUTPUT is not true" {
+    prepareEnv
+    configure_maven_download_output
+    expected=" --no-transfer-progress"
+    result="${MAVEN_ARGS_APPEND}"
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven download output logs when MAVEN_DOWNLOAD_OUTPUT is true" {
+    prepareEnv
+    MAVEN_DOWNLOAD_OUTPUT="true"
+    configure_maven_download_output
+    expected=""
+    result="${MAVEN_ARGS_APPEND}"
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
 
 @test "test maven custom repo with ID and all supported configurations" {
     prepareEnv

From 48d1baf2c3bb55cff93acbdd675687919c8f661b Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 3 Jun 2020 17:11:03 +0200
Subject: [PATCH 144/709] KOGITO-2357 Build & test against custom repo param
 (#171)

---
 Jenkinsfile.deploy          | 16 ++++++--
 scripts/update-artifacts.py | 73 +++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index fe2a1434a78..f02cc4cf5fe 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -22,6 +22,8 @@ pipeline {
         string(name: 'IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Image namespace to use to deploy images')
         string(name: 'IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
         string(name: 'IMAGE_TAG', defaultValue: '', description: 'Image tag to use to deploy images')
+
+        string(name: 'MAVEN_ARTIFACT_REPOSITORY', defaultValue: '', description: 'Maven repository where the build artifacts are present')
     }
 
     // Keep commented if no env var is defined
@@ -65,11 +67,17 @@ pipeline {
         }
         stage('Update Artifacts') {
             steps {
-                sh "python3 scripts/update-artifacts.py"
+                script {
+                    updateArtifactCmd = "python3 scripts/update-artifacts.py"
+                    if(params.MAVEN_ARTIFACT_REPOSITORY != ''){
+                        updateArtifactCmd += "--repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
+                    }
+                    sh updateArtifactCmd
 
-                sh "cat modules/kogito-data-index/module.yaml"
-                sh "cat modules/kogito-jobs-service/module.yaml"
-                sh "cat modules/kogito-management-console/module.yaml"
+                    sh "cat modules/kogito-data-index/module.yaml"
+                    sh "cat modules/kogito-jobs-service/module.yaml"
+                    sh "cat modules/kogito-management-console/module.yaml"
+                }
             }
         }
         stage('Validate CeKit Image and Modules descriptors'){
diff --git a/scripts/update-artifacts.py b/scripts/update-artifacts.py
index 6e104afe097..284856e835e 100644
--- a/scripts/update-artifacts.py
+++ b/scripts/update-artifacts.py
@@ -27,59 +27,58 @@
     "management-console": "kogito-management-console"
 }
 
+def isSnapshotVersion(version):
+    '''
+    Check whether the given version is a snapshot version
+    :param version: The version to check
+    :return: whether the given version is a snapshot version
+    '''
+    return version.endswith("-SNAPSHOT")
 
-def getMetadataRoot(serviceUrl):
+def getMetadataRoot(service):
     '''
     Get the root element from the maven-metadata
-    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
+    :param service: Service information (repoUrl, version, name)
     :return: root object
     '''
-    metadataURL=serviceUrl+"maven-metadata.xml"
+    metadataURL=service["repoUrl"]+"maven-metadata.xml"
     mavenMetadata=requests.get(metadataURL)
     with open('maven-metadata.xml', 'wb') as f:
         f.write(mavenMetadata.content)
     tree = ET.parse('maven-metadata.xml')
     root=tree.getroot()
+    os.remove("maven-metadata.xml")
     return root
 
-def getSnapshotVersion(serviceUrl):
+def getSnapshotVersion(service):
     '''
     parse the xml and finds the snapshotVersion
-    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
+    :param service: Service information (repoUrl, version, name)
     :return: snapshotVersion string
     '''
-    root=getMetadataRoot(serviceUrl)
+    root=getMetadataRoot(service)
     snapshotVersion=root.find("./versioning/snapshotVersions/snapshotVersion/value").text
     return snapshotVersion
 
-def getArtifactID(serviceUrl):
-    '''
-    parse the xml and finds the artifactID
-    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
-    :return: artifactID string
-    '''
-    root=getMetadataRoot(serviceUrl)
-    artifactID=root.find("./artifactId").text
-    return artifactID
-
-def getRunnerURL(serviceUrl):
+def getRunnerURL(service):
     ''' 
     Creates the updated URL for runner.jar
-    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
+    :param service: Service information (repoUrl, version, name)
     :return: url string
     '''
-    artifactId=getArtifactID(serviceUrl)
-    snapshotVersion=getSnapshotVersion(serviceUrl)
-    url=serviceUrl+"{}-{}-runner.jar".format(artifactId,snapshotVersion)
+    finalVersion = service["version"]
+    if isSnapshotVersion(finalVersion):
+        finalVersion=getSnapshotVersion(service)
+    url = service["repoUrl"] + "{}-{}-runner.jar".format(service["name"], finalVersion)
     return url
 
-def getMD5(serviceUrl):
+def getMD5(service):
     '''
     Fetches the md5 code for the latest runner.jar
-    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
+    :param service: Service information (repoUrl, version, name)
     :return: runnerMD5 string
     '''
-    runnerURL=getRunnerURL(serviceUrl)
+    runnerURL=getRunnerURL(service)
     runnerMD5URL=runnerURL+".md5"
     runnerMD5=sp.getoutput("curl -s  {}".format(runnerMD5URL))
     return runnerMD5
@@ -95,17 +94,17 @@ def yaml_loader():
     yaml.indent(mapping=2, sequence=4, offset=2)
     return yaml
 
-def update_artifacts(serviceUrl,modulePath):
+def update_artifacts(service,modulePath):
     '''
     Updates the module.yaml file of services with latest artifacts
-    :parm serviceUrl: URL of the repository's service from which artifacts needs to be updated
+    :param service: Service information (repoUrl, version, name)
     :param modulePath: relative file location of the module.yaml for the kogito service
     '''
 
     with open(modulePath) as module:
         data=yaml_loader().load(module)
-        data['artifacts'][0]['url']=getRunnerURL(serviceUrl)
-        data['artifacts'][0]['md5']=getMD5(serviceUrl)
+        data['artifacts'][0]['url']=getRunnerURL(service)
+        data['artifacts'][0]['md5']=getMD5(service)
     with open(modulePath, 'w') as module:
         yaml_loader().dump(data, module)
 
@@ -113,14 +112,16 @@ def update_artifacts(serviceUrl,modulePath):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Update the snapshot url for kogito services.')
     parser.add_argument('--repo-url', dest='repoUrl', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
-    parser.add_argument('--snapshot-version', dest='snapshotVersion', default=DEFAULT_VERSION, help='Defines the snapshot version of artifacts to retrieve from the repository url, defaults to {}'.format(DEFAULT_VERSION))
+    parser.add_argument('--version', dest='version', default=DEFAULT_VERSION, help='Defines the version of artifacts to retrieve from the repository url, defaults to {}'.format(DEFAULT_VERSION))
     args = parser.parse_args()
     
-    for service, path in Modules.items():
-        serviceUrl = args.repoUrl+"{}/{}/{}/".format(DEFAULT_ARTIFACT_PATH, service, args.snapshotVersion)
-        moduleYamlFile = "modules/{}/module.yaml".format(path)
+    for serviceName, modulePath in Modules.items():
+        service = {
+            "repoUrl" : args.repoUrl + "{}/{}/{}/".format(DEFAULT_ARTIFACT_PATH, serviceName, args.version),
+            "name" : serviceName,
+            "version" : args.version
+        }
+        moduleYamlFile = "modules/{}/module.yaml".format(modulePath)
         
-        update_artifacts(serviceUrl,moduleYamlFile)
-        print("Successfully updated the artifacts for: ",service)
-
-    os.remove("maven-metadata.xml")
+        update_artifacts(service, moduleYamlFile)
+        print("Successfully updated the artifacts for: ", serviceName)

From f2b9059106e0fccf1da635a46fd2a2547d9d00c3 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 4 Jun 2020 21:37:15 +0200
Subject: [PATCH 145/709] KOGITO-2370 Update artifacts should update kogito
 version (#172)

---
 scripts/common.py           | 22 ++++++++++++++++++++++
 scripts/update-artifacts.py |  6 ++++++
 2 files changed, 28 insertions(+)

diff --git a/scripts/common.py b/scripts/common.py
index ea6af14ca77..e8c1eb174cc 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -99,10 +99,32 @@ def update_kogito_modules(target_version):
                 print(
                     "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
                 data['version'] = target_version
+
+            with open(os.path.join(modules_dir, module), 'w') as m:
+                yaml_loader().dump(data, m)
+
+    except TypeError:
+        raise
+
+    update_kogito_version_in_modules(target_version)
+
+def update_kogito_version_in_modules(target_version):
+    """
+    Update every module.yaml file listed on MODULES as well the envs listed on ENVS.
+    :param target_version:  version used to update all needed module.yaml files
+    """
+    modules_dir = "modules"
+    try:
+
+        for module in MODULES:
+            module = module + "/module.yaml"
+            with open(os.path.join(modules_dir, module)) as m:
+                data = yaml_loader().load(m)
                 if 'envs' in data:
                     for index, env in enumerate(data['envs'], start=0):
                         for target_env in ENVS:
                             if target_env == env['name']:
+                                print("Updating module {0} env var {1} with value {2}".format(data['name'], target_env, target_version))
                                 data['envs'][index]['value'] = target_version
 
             with open(os.path.join(modules_dir, module), 'w') as m:
diff --git a/scripts/update-artifacts.py b/scripts/update-artifacts.py
index 284856e835e..c43fa762753 100644
--- a/scripts/update-artifacts.py
+++ b/scripts/update-artifacts.py
@@ -7,6 +7,8 @@
 # ruamel.yaml
 # elementpath 
 
+import sys
+sys.dont_write_bytecode = True
 
 import xml.etree.ElementTree as ET
 import requests
@@ -15,6 +17,8 @@
 import argparse
 from ruamel.yaml import YAML
 
+import common
+
 DEFAULT_REPO_URL = "https://repository.jboss.org/"
 DEFAULT_VERSION = "8.0.0-SNAPSHOT"
 DEFAULT_ARTIFACT_PATH = "org/kie/kogito"
@@ -125,3 +129,5 @@ def update_artifacts(service,modulePath):
         
         update_artifacts(service, moduleYamlFile)
         print("Successfully updated the artifacts for: ", serviceName)
+    
+    common.update_kogito_version_in_modules(args.version)

From 0c6924852fda16093db540d0f117c5cc5eb4e0fd Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 10 Jun 2020 16:47:17 +0200
Subject: [PATCH 146/709] KOGITO-2388 Set mirror url if provided by Jenkins
 (#175)

---
 Jenkinsfile         | 8 +++++++-
 Jenkinsfile-Nightly | 8 +++++++-
 Jenkinsfile.deploy  | 9 ++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 22952e1204f..832dbecb885 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,13 @@ pipeline{
         stage('Initialization'){
             steps{
                 script{
-                    cleanWorkspaces()
+                    cleanWorkspaces()                    
+                    
+                    // Set the mirror url only if exist
+                    if (env.MAVEN_MIRROR_REPOSITORY != null
+                            && env.MAVEN_MIRROR_REPOSITORY != ''){
+                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
+                    }
                 }
                 sh "docker rm -f \$(docker ps -a -q) || date"
                 sh "docker rmi -f \$(docker images -q) || date"
diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
index d2819007c7a..0522de8e542 100644
--- a/Jenkinsfile-Nightly
+++ b/Jenkinsfile-Nightly
@@ -24,9 +24,15 @@ pipeline{
             steps{
                 script{
                     cleanWorkspaces()
+                    
+                    // Set the mirror url only if exist
+                    if (env.MAVEN_MIRROR_REPOSITORY != null
+                            && env.MAVEN_MIRROR_REPOSITORY != ''){
+                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
+                    }
                 }
                 sh "docker rm -f \$(docker ps -a -q) || date"
-                sh "docker rmi -f \$(docker images -q) ||"
+                sh "docker rmi -f \$(docker images -q) || date"
             }
         }
         stage('Validate CeKit Image and Modules descriptors'){
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index f02cc4cf5fe..80d7213ec78 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -62,6 +62,13 @@ pipeline {
                         env.BRANCH_NAME = params.BUILD_BRANCH_NAME
                         checkout([$class: 'GitSCM', branches: [[name: env.BRANCH_NAME]], browser: [$class: 'GithubWeb', repoUrl: "${GIT_URL}"], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'user-kie-ci10', url: "${GIT_URL}"]]])
                     }
+
+                    // Set the mirror url only if no artifact repository is given
+                    if (params.MAVEN_ARTIFACT_REPOSITORY != '' 
+                            && env.MAVEN_MIRROR_REPOSITORY != null
+                            && env.MAVEN_MIRROR_REPOSITORY != ''){
+                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
+                    }
                 }
             }
         }
@@ -70,7 +77,7 @@ pipeline {
                 script {
                     updateArtifactCmd = "python3 scripts/update-artifacts.py"
                     if(params.MAVEN_ARTIFACT_REPOSITORY != ''){
-                        updateArtifactCmd += "--repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
+                        updateArtifactCmd += " --repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
                     }
                     sh updateArtifactCmd
 

From 171c02b05711e863788e42bcde2150572a996c5d Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 11 Jun 2020 00:11:20 +0200
Subject: [PATCH 147/709] KOGITO-2374 Setup Maven repo url (#173)

---
 Jenkinsfile-Nightly                           |   2 +-
 Jenkinsfile.deploy                            |  10 +-
 .../3.6.x/added/configure-maven.sh            |   8 ++
 modules/kogito-maven/3.6.x/module.yaml        |   5 +-
 scripts/README.md                             |  48 +++++--
 scripts/common.py                             | 130 ++++++++++++------
 scripts/manage-kogito-version.py              |   3 +-
 scripts/push-staging.py                       |   3 +-
 ...tifacts.py => update-maven-information.py} |  57 ++++----
 tests/test-apps/clone-repo.sh                 |  15 +-
 10 files changed, 190 insertions(+), 91 deletions(-)
 rename scripts/{update-artifacts.py => update-maven-information.py} (64%)

diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
index 0522de8e542..5e3b7f01b4d 100644
--- a/Jenkinsfile-Nightly
+++ b/Jenkinsfile-Nightly
@@ -58,7 +58,7 @@ pipeline{
         }
         stage('Update Artifacts'){
             steps{
-                sh "python3 scripts/update-artifacts.py"
+                sh "python3 scripts/update-maven-information.py"
             }
         }
         stage('Prepare offline kogito-examples'){
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 80d7213ec78..1c96fe3800d 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -72,22 +72,26 @@ pipeline {
                 }
             }
         }
-        stage('Update Artifacts') {
+        stage('Update Maven information') {
             steps {
                 script {
-                    updateArtifactCmd = "python3 scripts/update-artifacts.py"
+                    // Update artifacts
+                    updateArtifactCmd = "python3 scripts/update-maven-information.py"
                     if(params.MAVEN_ARTIFACT_REPOSITORY != ''){
                         updateArtifactCmd += " --repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
                     }
                     sh updateArtifactCmd
 
+                    // For debug
                     sh "cat modules/kogito-data-index/module.yaml"
                     sh "cat modules/kogito-jobs-service/module.yaml"
                     sh "cat modules/kogito-management-console/module.yaml"
+                    sh "cat tests/test-apps/clone-repo.sh"
+                    sh "cat ${HOME}/.m2/settings.xml"
                 }
             }
         }
-        stage('Validate CeKit Image and Modules descriptors'){
+        stage('Validate CeKit Image and Modules descriptors') {
             steps {
                 sh """
                     curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index 1686f50d3f4..70cc7ebca38 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -25,6 +25,7 @@ function configure() {
     configure_proxy
     configure_mirrors
     configure_maven_download_output
+    set_kogito_maven_repo
     add_maven_repo
 }
 
@@ -91,6 +92,13 @@ function configure_maven_download_output() {
     fi
 }
 
+function set_kogito_maven_repo() {
+    local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
+    if [ -n "${kogito_maven_repo_url}" ]; then
+        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" $HOME/.m2/settings.xml
+    fi
+}
+
 function add_maven_repo() {
     # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service
     local single_repo_url="${MAVEN_REPO_URL}"
diff --git a/modules/kogito-maven/3.6.x/module.yaml b/modules/kogito-maven/3.6.x/module.yaml
index dd519509bff..0d60c957261 100644
--- a/modules/kogito-maven/3.6.x/module.yaml
+++ b/modules/kogito-maven/3.6.x/module.yaml
@@ -29,8 +29,11 @@ envs:
   - name: "MAVEN_DOWNLOAD_OUTPUT"
     description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
     example: "true"
+  - name: "JBOSS_MAVEN_REPO_URL"
+    value: "https://repository.jboss.org/nexus/content/groups/public/"
+    description: "Defines the Jboss Maven repository for Kogito artifacts."
   - name: "MAVEN_REPO_URL"
-    description: "Defines the new Repository address."
+    description: "Defines an extra Maven repository."
     example: "https://nexus.test.com/group/public"
   - name: "MAVEN_REPO_ID"
     description: "Defines the id of the new Repository"
diff --git a/scripts/README.md b/scripts/README.md
index 293c3ad8125..d5f5e085a50 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -7,7 +7,7 @@ Today we have these scripts:
 - [manage-kogito-version.py](manage-kogito-version.py)
 - [push-local-registry.sh](push-local-registry.sh)
 - [push-staging.py](push-staging.py)
-- [update-artifacts.py](update-artifacts.py)
+- [update-maven-information.py](update-maven-information.py)
 - [common.py](common.py)
 
 ### Managing Kogito images version
@@ -23,6 +23,8 @@ The `manage-kogito-version.py` has one dependency that needs to be manually inst
 $ pip install -U ruamel.yaml
 ```
 This script has a dependency on `common.py`.
+
+#### Usage
 Its usage is pretty simple, only one parameter is accepted:
 
 ```bash
@@ -36,7 +38,6 @@ releases, e.g. 0.9.x branch.
 $ python manage-kogito-version.py --bump-to 0.10.1-rc1 --apps-branch 0.10.x
 ```
 
-
 The command above will update all the needed files to the version 1.0.0. These changes includes updates on
 
  - all cekit modules
@@ -67,7 +68,6 @@ To execute the script directly:
 $ /bin/sh scripts/push-local-registry.sh my_registry_address 0.10 my_namespace
 ```
 
-
 ### Pushing staging images.
 
 Staging images are the release candidates which are pushed mainly after big changes that has direct impact on how
@@ -89,19 +89,21 @@ $ pip install -U docker yaml
 $ pip install -U ruamel.yaml
 ```
 
+#### Usage
+
 This script is called as the last step of the `make push-staging` command defined on the [Makefile](../Makefile).
 
 It will look for the current RC images available on [quay.io](https://quay.io/organization/kiegroup) to increase the rc tag 
 accordingly then push the new tag so it can be tested by others. 
 
-#### Updating Kogito Images service artifacts.
+### Updating Kogito Images service artifacts.
 
-The update-artifacts script will help in fetching the URL of latest artifacts from the repo
+The update-maven-information script will help in fetching the artifacts from the Maven repository
 and update them in the `module.yaml` files of the kogito services
 
 #### Script dependencies
 
-The `update-artifacts.py` has some dependencies that needs to be manually installed:
+The `update-maven-information.py` has some dependencies that needs to be manually installed:
 
 ```bash
 $ pip install -U ruamel.yaml
@@ -110,20 +112,46 @@ $ pip install -U elementpath
 It's usage is pretty simple as well:
 
 ```bash
-$ python update-artifacts.py
+$ python update-maven-information.py
 ```
 
-This script also accepts `--snapshot-version` as argument in specifying the current version of artifacts which need to be fetched
+#### Usage
+
+##### Update Maven artifact version
+
+This script also accepts `--version` as argument in specifying the current version of artifacts which need to be fetched
 
 ```bash
-$ python update-artifacts.py --snapshot-version='8.0.0-SNAPSHOT'
+$ python update-maven-information.py --version='8.0.0-SNAPSHOT'
+$ python update-maven-information.py --version='0.10.0'
 ```
 if no argument is given, it takes the default value of `8.0.0-SNAPSHOT`
 
-The command will update the needed files with latest snapshot URL:
+The command will update the needed files with latest  URL:
+
+ - kogito-data-index/module.yaml
+ - kogito-jobs-service/module.yaml
+ - kogito-management-console/module.yaml
+
+as well as the `KOGITO_VERSION` environment variable present in the Kogito modules.
+
+##### Update Maven artifact repository url
+
+This script also accepts `--repo-url` as argument in specifying the Maven repository from where to fetch the artifacts
+
+```bash
+$ python update-maven-information.py --repo-url='https://maven-repository.mirror.com/public'
+```
+if no argument is given, it takes the JBoss repository as the default value.
+
+The command will update the needed files with the new URL:
 
  - kogito-data-index/module.yaml
  - kogito-jobs-service/module.yaml
  - kogito-management-console/module.yaml
+
+as well as the `JBOSS_MAVEN_REPO_URL` where present in the repository.
+
 ### Common script
+
 The `common.py` script defines some common functions for the scripts.
diff --git a/scripts/common.py b/scripts/common.py
index e8c1eb174cc..152ffe56b98 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -7,7 +7,7 @@
 
 from ruamel.yaml import YAML
 
-# all kogito-image modules that points to the kogito version.
+# All kogito-image modules that have the kogito version.
 MODULES = {"kogito-data-index", "kogito-image-dependencies",
            "kogito-infinispan-properties", "kogito-jobs-service",
            "kogito-jq", "kogito-kubernetes-client",
@@ -17,15 +17,13 @@
            "kogito-quarkus-s2i", "kogito-s2i-core",
            "kogito-springboot", "kogito-springboot-s2i",
            "kogito-system-user"}
+MODULE_FILENAME = "module.yaml"
+MODULES_DIR = "modules"
 
 # imagestream file that contains all images, this file aldo needs to be updated.
-IMAGE_STREAM = "kogito-imagestream.yaml"
-
+IMAGE_STREAM_FILENAME = "kogito-imagestream.yaml"
 # image.yaml file definition that needs to be updated
-IMAGE = "image.yaml"
-
-# declared envs on modules.yaml that also needs to have its version updated
-ENVS = {"KOGITO_VERSION"}
+IMAGE_FILENAME = "image.yaml"
 
 def yaml_loader():
     """
@@ -43,9 +41,9 @@ def update_image_version(target_version):
     Update image.yaml version tag.
     :param target_version: version used to update the image.yaml file
     """
-    print("Updating Image main file version from file {0} to version {1}".format(IMAGE, target_version))
+    print("Updating Image main file version from file {0} to version {1}".format(IMAGE_FILENAME, target_version))
     try:
-        with open(IMAGE) as image:
+        with open(IMAGE_FILENAME) as image:
             data = yaml_loader().load(image)
             if 'version' in data:
                 data['version'] = target_version
@@ -53,7 +51,7 @@ def update_image_version(target_version):
                 print("Field version not found, returning...")
                 return
 
-        with open(IMAGE, 'w') as image:
+        with open(IMAGE_FILENAME, 'w') as image:
             yaml_loader().dump(data, image)
     except TypeError as err:
         print("Unexpected error:", err)
@@ -64,9 +62,9 @@ def update_image_stream(target_version):
     Update the imagestream file, it will update the tag name, version and image tag.
     :param target_version: version used to update the imagestream file;
     """
-    print("Updating ImageStream images version from file {0} to version {1}".format(IMAGE_STREAM, target_version))
+    print("Updating ImageStream images version from file {0} to version {1}".format(IMAGE_STREAM_FILENAME, target_version))
     try:
-        with open(IMAGE_STREAM) as imagestream:
+        with open(IMAGE_STREAM_FILENAME) as imagestream:
             data = yaml_loader().load(imagestream)
             for item_index, item in enumerate(data['items'], start=0):
                 for tag_index, tag in enumerate(item['spec']['tags'], start=0):
@@ -77,58 +75,100 @@ def update_image_stream(target_version):
                     updatedImageName = imageDict[0] + ':' + target_version
                     data['items'][item_index]['spec']['tags'][tag_index]['from']['name'] = updatedImageName
 
-        with open(IMAGE_STREAM, 'w') as imagestream:
+        with open(IMAGE_STREAM_FILENAME, 'w') as imagestream:
             yaml_loader().dump(data, imagestream)
 
     except TypeError:
         raise
 
+def get_all_module_dirs():
+    modules = []
+
+    # r=>root, d=>directories, f=>files
+    for r, d, f in os.walk(MODULES_DIR):
+        for item in f:
+            if MODULE_FILENAME == item:
+                modules.append(os.path.dirname(os.path.join(r, item)))
+
+    return modules
+
+def get_kogito_module_dirs():
+    modules = []
 
-def update_kogito_modules(target_version):
+    for moduleName in MODULES:
+        modules.append(os.path.join(MODULES_DIR, moduleName))
+
+    return modules
+
+def update_modules_version(target_version):
     """
-    Update every module.yaml file listed on MODULES as well the envs listed on ENVS.
-    :param target_version:  version used to update all needed module.yaml files
+    Update every Kogito module.yaml to the given version.
+    :param target_version: version used to update all Kogito module.yaml files
     """
-    modules_dir = "modules"
-    try:
+    for module_dir in get_kogito_module_dirs():
+        update_module_version(module_dir, target_version)
 
-        for module in MODULES:
-            module = module + "/module.yaml"
-            with open(os.path.join(modules_dir, module)) as m:
-                data = yaml_loader().load(m)
-                print(
-                    "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
-                data['version'] = target_version
+def update_module_version(moduleDir, target_version):
+    """
+    Set Kogito module.yaml to given version.
+    :param target_version: version to set into the module
+    """
+    try:
+        moduleFile = os.path.join(moduleDir, "module.yaml")
+        with open(moduleFile) as module:
+            data = yaml_loader().load(module)
+            print(
+                "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
+            data['version'] = target_version
 
-            with open(os.path.join(modules_dir, module), 'w') as m:
-                yaml_loader().dump(data, m)
+        with open(moduleFile, 'w') as module:
+            yaml_loader().dump(data, module)
 
     except TypeError:
         raise
 
-    update_kogito_version_in_modules(target_version)
 
-def update_kogito_version_in_modules(target_version):
+def update_kogito_version_env_in_modules(target_version):
     """
-    Update every module.yaml file listed on MODULES as well the envs listed on ENVS.
-    :param target_version:  version used to update all needed module.yaml files
+    Update all modules which contains the `KOGITO_VERSION` env var.
+    :param target_version: kogito version used to update all modules which contains the `KOGITO_VERSION` env var
     """
-    modules_dir = "modules"
-    try:
+    update_env_in_all_modules("KOGITO_VERSION", target_version)
 
-        for module in MODULES:
-            module = module + "/module.yaml"
-            with open(os.path.join(modules_dir, module)) as m:
-                data = yaml_loader().load(m)
-                if 'envs' in data:
-                    for index, env in enumerate(data['envs'], start=0):
-                        for target_env in ENVS:
-                            if target_env == env['name']:
-                                print("Updating module {0} env var {1} with value {2}".format(data['name'], target_env, target_version))
-                                data['envs'][index]['value'] = target_version
+def update_env_in_all_modules(envKey, envValue):
+    """
+    Update all modules which contains the given envKey to the given envValue.
+    :param envKey: Environment variable key to update
+    :param envValue: Environment variable value to set
+    """
+    for module_dir in get_all_module_dirs():
+        update_env_in_module(module_dir, envKey, envValue)
 
-            with open(os.path.join(modules_dir, module), 'w') as m:
-                yaml_loader().dump(data, m)
+def update_env_in_module(module_dir, envKey, envValue):
+    """
+    Update a module if it contains the given envKey to the given envValue.
+    :param envKey: Environment variable key to update if exists
+    :param envValue: Environment variable value to set if exists
+    """
+    try:
+        moduleFile = os.path.join(module_dir, "module.yaml")
+        changed = False
+        with open(moduleFile) as module:
+            data = yaml_loader().load(module)
+            if 'envs' in data:
+                for index, env in enumerate(data['envs'], start=0):
+                    if envKey == env['name']:
+                        print("Updating module {0} env var {1} with value {2}".format(data['name'], envKey, envValue))
+                        data['envs'][index]['value'] = envValue
+                        changed = True
+
+        if (changed):
+            with open(moduleFile, 'w') as module:
+                yaml_loader().dump(data, module)
 
     except TypeError:
         raise
+
+if __name__ == "__main__":
+    for m in get_kogito_module_dirs():
+        print("module {}".format(m))
\ No newline at end of file
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 66d3ae489ea..5eceada5a79 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -94,7 +94,8 @@ def update_test_apps_clone_repo(target_branch):
 
             common.update_image_version(args.bump_to)
             common.update_image_stream(args.bump_to)
-            common.update_kogito_modules(args.bump_to)
+            common.update_modules_version(args.bump_to)
+            common.update_kogito_version_env_in_modules(args.bump_to)
             update_behave_tests(tests_branch)
             update_test_apps_clone_repo(tests_branch)
         else:
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 909107fcf41..8dfd466c5ec 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -138,7 +138,8 @@ def get_next_rc_version(current_rc_version):
     version = get_next_rc_version(find_current_rc_version())
     common.update_image_version(version)
     common.update_image_stream(version)
-    common.update_kogito_modules(version)
+    common.update_modules_version(version)
+    common.update_kogito_version_env_in_modules(version)
 
     find_next_tag()
     tag_and_push_images()
diff --git a/scripts/update-artifacts.py b/scripts/update-maven-information.py
similarity index 64%
rename from scripts/update-artifacts.py
rename to scripts/update-maven-information.py
index c43fa762753..30a2a39a7fb 100644
--- a/scripts/update-artifacts.py
+++ b/scripts/update-maven-information.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 #Script responsible for fetching the latest artifacts of kogito services and updating their module.yaml files
 #Should be run from root directory of the repository
-#Sample usage:  python3 scripts/update-artifacts.py
+#Sample usage:  python3 scripts/update-maven-information.py
 #
 #Dependencies
 # ruamel.yaml
@@ -10,6 +10,8 @@
 import sys
 sys.dont_write_bytecode = True
 
+import common
+
 import xml.etree.ElementTree as ET
 import requests
 import subprocess as sp
@@ -17,9 +19,9 @@
 import argparse
 from ruamel.yaml import YAML
 
-import common
+MAVEN_MODULE="kogito-maven/3.6.x"
 
-DEFAULT_REPO_URL = "https://repository.jboss.org/"
+DEFAULT_REPO_URL = "https://repository.jboss.org/nexus/content/groups/public/"
 DEFAULT_VERSION = "8.0.0-SNAPSHOT"
 DEFAULT_ARTIFACT_PATH = "org/kie/kogito"
 
@@ -42,10 +44,10 @@ def isSnapshotVersion(version):
 def getMetadataRoot(service):
     '''
     Get the root element from the maven-metadata
-    :param service: Service information (repoUrl, version, name)
+    :param service: Service information (repo_url, version, name)
     :return: root object
     '''
-    metadataURL=service["repoUrl"]+"maven-metadata.xml"
+    metadataURL=service["repo_url"]+"maven-metadata.xml"
     mavenMetadata=requests.get(metadataURL)
     with open('maven-metadata.xml', 'wb') as f:
         f.write(mavenMetadata.content)
@@ -57,7 +59,7 @@ def getMetadataRoot(service):
 def getSnapshotVersion(service):
     '''
     parse the xml and finds the snapshotVersion
-    :param service: Service information (repoUrl, version, name)
+    :param service: Service information (repo_url, version, name)
     :return: snapshotVersion string
     '''
     root=getMetadataRoot(service)
@@ -67,19 +69,19 @@ def getSnapshotVersion(service):
 def getRunnerURL(service):
     ''' 
     Creates the updated URL for runner.jar
-    :param service: Service information (repoUrl, version, name)
+    :param service: Service information (repo_url, version, name)
     :return: url string
     '''
     finalVersion = service["version"]
     if isSnapshotVersion(finalVersion):
         finalVersion=getSnapshotVersion(service)
-    url = service["repoUrl"] + "{}-{}-runner.jar".format(service["name"], finalVersion)
+    url = service["repo_url"] + "{}-{}-runner.jar".format(service["name"], finalVersion)
     return url
 
 def getMD5(service):
     '''
     Fetches the md5 code for the latest runner.jar
-    :param service: Service information (repoUrl, version, name)
+    :param service: Service information (repo_url, version, name)
     :return: runnerMD5 string
     '''
     runnerURL=getRunnerURL(service)
@@ -87,41 +89,41 @@ def getMD5(service):
     runnerMD5=sp.getoutput("curl -s  {}".format(runnerMD5URL))
     return runnerMD5
 
-def yaml_loader():
-    '''
-    default yaml Loader
-    :return: yaml object
-    '''
-    yaml = YAML()
-    yaml.preserve_quotes = True
-    yaml.width = 1024
-    yaml.indent(mapping=2, sequence=4, offset=2)
-    return yaml
-
 def update_artifacts(service,modulePath):
     '''
     Updates the module.yaml file of services with latest artifacts
-    :param service: Service information (repoUrl, version, name)
+    :param service: Service information (repo_url, version, name)
     :param modulePath: relative file location of the module.yaml for the kogito service
     '''
 
     with open(modulePath) as module:
-        data=yaml_loader().load(module)
+        data=common.yaml_loader().load(module)
         data['artifacts'][0]['url']=getRunnerURL(service)
         data['artifacts'][0]['md5']=getMD5(service)
     with open(modulePath, 'w') as module:
-        yaml_loader().dump(data, module)
+        common.yaml_loader().dump(data, module)
 
+def update_test_apps_clone_repo(repo_url):
+    file = 'tests/test-apps/clone-repo.sh'
+    print('Updating file {}'.format(file))
+    os.system('sed -i \'s|^export JBOSS_MAVEN_REPO_URL=.*|export JBOSS_MAVEN_REPO_URL=\"{}\"|\' '.format(repo_url) + file)
+
+def update_maven_repo(repo_url):
+    common.update_env_in_all_modules("JBOSS_MAVEN_REPO_URL", repo_url)
+    update_test_apps_clone_repo(repo_url)
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Update the snapshot url for kogito services.')
-    parser.add_argument('--repo-url', dest='repoUrl', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
+    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and version.')
+    parser.add_argument('--repo-url', dest='repo_url', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
     parser.add_argument('--version', dest='version', default=DEFAULT_VERSION, help='Defines the version of artifacts to retrieve from the repository url, defaults to {}'.format(DEFAULT_VERSION))
     args = parser.parse_args()
+
+    update_maven_repo(args.repo_url)
     
+    # Update Kogito Service modules
     for serviceName, modulePath in Modules.items():
         service = {
-            "repoUrl" : args.repoUrl + "{}/{}/{}/".format(DEFAULT_ARTIFACT_PATH, serviceName, args.version),
+            "repo_url" : args.repo_url + "{}/{}/{}/".format(DEFAULT_ARTIFACT_PATH, serviceName, args.version),
             "name" : serviceName,
             "version" : args.version
         }
@@ -130,4 +132,5 @@ def update_artifacts(service,modulePath):
         update_artifacts(service, moduleYamlFile)
         print("Successfully updated the artifacts for: ", serviceName)
     
-    common.update_kogito_version_in_modules(args.version)
+    # Need also to set the KOGITO_VERSION for artifacts to the given one
+    common.update_kogito_version_env_in_modules(args.version)
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 0994afa9bef..12d4eb62f75 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -2,10 +2,19 @@
 #
 # Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
 
+SCRIPT_DIR=`pwd`
+MVN_MODULE="${SCRIPT_DIR}/../../modules/kogito-maven/3.6.x"
+
 # exit when any command fails
 set -e
 
-TEST_DIR=`pwd`
+# setup maven env
+export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
+cp ${MVN_MODULE}/maven/settings.xml ${HOME}/.m2/settings.xml
+source ${MVN_MODULE}/added/configure-maven.sh
+configure
+
+# Clone examples
 cd /tmp
 rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
@@ -29,8 +38,10 @@ rm -rf /tmp/kogito-examples/dmn-quarkus-example/pom.xml
 # by adding the application.properties file telling app to start on
 # port 10000, the purpose of this tests is make sure that the images
 # will ensure the use of the port 8080.
-cp ${TEST_DIR}/application.properties /tmp/kogito-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
+cp ${SCRIPT_DIR}/application.properties /tmp/kogito-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
 (echo ""; echo "server.port=10000") >> /tmp/kogito-examples/process-springboot-example/src/main/resources/application.properties
 
 git add --all  :/
 git commit -am "test"
+
+rm ${HOME}/.m2/settings.xml
\ No newline at end of file

From 9f8f9be2164b09b4faedf849b5de37293ec88fd6 Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Tue, 16 Jun 2020 00:12:25 +0530
Subject: [PATCH 148/709] [KOGITO-2221] - Project generation for SpringBoot
 doesn't work on OpenShift (#177)

* [KOGITO-2221] - Project generation for SpringBoot doesn't work on OpenShift
---
 modules/kogito-quarkus-s2i/s2i/bin/assemble      |  2 +-
 modules/kogito-s2i-core/added/s2i-core           | 16 ++++++++++++++--
 modules/kogito-s2i-core/tests/bats/s2i-core.bats | 11 ++++++++++-
 modules/kogito-springboot-s2i/s2i/bin/assemble   |  2 +-
 tests/features/kogito-quarkus-ubi8-s2i.feature   |  6 +++---
 .../features/kogito-springboot-ubi8-s2i.feature  |  5 +++++
 tests/test-apps/clone-repo.sh                    |  5 ++---
 7 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/modules/kogito-quarkus-s2i/s2i/bin/assemble b/modules/kogito-quarkus-s2i/s2i/bin/assemble
index b1950a76cbe..4aed09df11e 100644
--- a/modules/kogito-quarkus-s2i/s2i/bin/assemble
+++ b/modules/kogito-quarkus-s2i/s2i/bin/assemble
@@ -26,7 +26,7 @@ source ${KOGITO_HOME}/launch/configure.sh
 manage_incremental_build
 
 # kogito app build
-build_kogito_app
+build_kogito_app $QUARKUS_RUNTIME_TYPE
 
 # copy kogito app to ${KOGITO_HOME}/bin dir
 copy_kogito_app
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index c40083346f6..1a6e068ff06 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -11,6 +11,8 @@ PROJECT_GROUP_ID="${PROJECT_GROUP_ID:-com.company}"
 PROJECT_ARTIFACT_ID="${PROJECT_ARTIFACT_ID:-project}"
 PROJECT_VERSION="${PROJECT_VERSION:-1.0-SNAPSHOT}"
 artifactDir="target"
+readonly QUARKUS_RUNTIME_TYPE="quarkus"
+readonly SPRINGBOOT_RUNTIME_TYPE="springboot"
 if [ ! -z "${ARTIFACT_DIR}" ]; then
     artifactDir="${ARTIFACT_DIR}"
 fi
@@ -107,6 +109,7 @@ function handle_image_metadata_json() {
 
 
 function build_kogito_app() {
+    local RUNTIME_TYPE="${1:-$QUARKUS_RUNTIME_TYPE}"
     cd "${S2I_SOURCE_DIR}"
 
     nativeBuild=""
@@ -127,9 +130,18 @@ function build_kogito_app() {
 
     else
 
-        log_info "---> Generating project structure..."
+        local ARCHETYPE_ARTIFACT_ID
+        if [ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]; then
+            ARCHETYPE_ARTIFACT_ID='kogito-quarkus-archetype'
+        elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
+            ARCHETYPE_ARTIFACT_ID="kogito-springboot-archetype"
+        else
+            log_error "---> Invalid RUNTIME_TYPE(${RUNTIME_TYPE}) provided, failing build..."
+            exit 1
+        fi
 
-        $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=kogito-quarkus-archetype \
+        log_info "---> Generating $RUNTIME_TYPE project structure..."
+        $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=$ARCHETYPE_ARTIFACT_ID \
         -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
         -s $KOGITO_HOME/.m2/settings.xml
 
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index e2e2eed92d8..03a61627517 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -366,9 +366,18 @@ teardown() {
     rm -rf target/*
 
     echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating project structure..." ]
+    [ "${lines[0]}" = "---> Generating $QUARKUS_RUNTIME_TYPE project structure..." ]
 }
 
+@test "build_kogito_app only checks if it will generate the springboot project in case there's no pom.xml" {
+    mkdir /tmp/src
+
+    run build_kogito_app $SPRINGBOOT_RUNTIME_TYPE
+    rm -rf target/*
+
+    echo "result= ${lines[@]}"
+    [ "${lines[0]}" = "---> Generating $SPRINGBOOT_RUNTIME_TYPE project structure..." ]
+}
 
 @test "build_kogito_app only checks if it will a build will be triggered if a pom is found" {
     mkdir /tmp/src
diff --git a/modules/kogito-springboot-s2i/s2i/bin/assemble b/modules/kogito-springboot-s2i/s2i/bin/assemble
index 2e85fb566f8..2d989309d8c 100755
--- a/modules/kogito-springboot-s2i/s2i/bin/assemble
+++ b/modules/kogito-springboot-s2i/s2i/bin/assemble
@@ -24,7 +24,7 @@ source ${KOGITO_HOME}/launch/configure.sh
 manage_incremental_build
 
 # kogito app build
-build_kogito_app
+build_kogito_app $SPRINGBOOT_RUNTIME_TYPE
 
 # copy kogito app to ${KOGITO_HOME}/bin dir
 copy_kogito_app
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 1d5d0926922..d7ed58e05f6 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -247,7 +247,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable       | value          |
       | NATIVE         | false          |
       | KOGITO_VERSION | 8.0.0-SNAPSHOT |
@@ -263,7 +263,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable       | value          |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
@@ -280,7 +280,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable            | value          |
       | NATIVE              | false          |
       | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 9368ba55b7b..8ba9ed79cdc 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -101,3 +101,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
 
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable            | value          |
+      | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 12d4eb62f75..a83013dd265 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -31,9 +31,8 @@ mvn -f process-springboot-example clean package -DskipTests -U
 mvn -f rules-quarkus-helloworld-native -Pnative clean package -DskipTests -U
 
 # preparing directory to run kogito maven archetypes tests
-cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-quarkus-example/
-rm -rf /tmp/kogito-examples/dmn-quarkus-example/src
-rm -rf /tmp/kogito-examples/dmn-quarkus-example/pom.xml
+mkdir -pv /tmp/kogito-examples/dmn-example
+cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-example/
 
 # by adding the application.properties file telling app to start on
 # port 10000, the purpose of this tests is make sure that the images

From f26168a0a2f818f818e80f1121073926033b159e Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 16 Jun 2020 15:08:17 +0200
Subject: [PATCH 149/709] KOGITO-2445 maven repo added to tests only (#181)

---
 Jenkinsfile.deploy                            | 17 ++++++---
 scripts/update-maven-information.py           | 35 +++++++++++++++++--
 .../kogito-springboot-ubi8-s2i.feature        |  6 ++++
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 1c96fe3800d..88bdfd78cd9 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -24,6 +24,8 @@ pipeline {
         string(name: 'IMAGE_TAG', defaultValue: '', description: 'Image tag to use to deploy images')
 
         string(name: 'MAVEN_ARTIFACT_REPOSITORY', defaultValue: '', description: 'Maven repository where the build artifacts are present')
+
+        booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: 'Skip tests')
     }
 
     // Keep commented if no env var is defined
@@ -64,9 +66,10 @@ pipeline {
                     }
 
                     // Set the mirror url only if no artifact repository is given
-                    if (params.MAVEN_ARTIFACT_REPOSITORY != '' 
+                    if (params.MAVEN_ARTIFACT_REPOSITORY == '' 
                             && env.MAVEN_MIRROR_REPOSITORY != null
                             && env.MAVEN_MIRROR_REPOSITORY != ''){
+                        echo "Set Maven mirror url"
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
                     }
                 }
@@ -87,7 +90,8 @@ pipeline {
                     sh "cat modules/kogito-jobs-service/module.yaml"
                     sh "cat modules/kogito-management-console/module.yaml"
                     sh "cat tests/test-apps/clone-repo.sh"
-                    sh "cat ${HOME}/.m2/settings.xml"
+                    sh "cat tests/features/kogito-quarkus-ubi8-s2i.feature"
+                    sh "cat tests/features/kogito-springboot-ubi8-s2i.feature"
                 }
             }
         }
@@ -113,6 +117,11 @@ pipeline {
             }
         }
         stage('Prepare offline kogito-examples') {
+            when {
+                expression {
+                    return !params.SKIP_TESTS;
+                }
+            }
             steps {
                 sh "make clone-repos"
             }
@@ -126,10 +135,10 @@ pipeline {
                             copyWorkspace("$image")
                             dir(getWorkspacePath("$image")){
                                 try{
-                                    sh "make ${image}"
+                                    sh "make ${image} ignore_test=${params.SKIP_TESTS}"
                                 }
                                 finally{
-                                    junit 'target/test/results/*.xml'
+                                    junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
                                 }
                             
                             }
diff --git a/scripts/update-maven-information.py b/scripts/update-maven-information.py
index 30a2a39a7fb..10fa2244805 100644
--- a/scripts/update-maven-information.py
+++ b/scripts/update-maven-information.py
@@ -15,6 +15,7 @@
 import xml.etree.ElementTree as ET
 import requests
 import subprocess as sp
+import re
 import os
 import argparse
 from ruamel.yaml import YAML
@@ -25,6 +26,9 @@
 DEFAULT_VERSION = "8.0.0-SNAPSHOT"
 DEFAULT_ARTIFACT_PATH = "org/kie/kogito"
 
+# behave tests that needs to be update
+S2I_BEHAVE_TESTS = {"kogito-quarkus-ubi8-s2i.feature", "kogito-springboot-ubi8-s2i.feature"}
+
 Modules = {
     #service-name: module-name(directory in which module's module.yaml file is present)
     #Note: Service name should be same as given in the repository
@@ -104,12 +108,36 @@ def update_artifacts(service,modulePath):
         common.yaml_loader().dump(data, module)
 
 def update_test_apps_clone_repo(repo_url):
+    '''
+    Updates the clone-repo.sh script for testing with the given repository URL.
+    :param repo_url: Maven Repository URL to set
+    '''
     file = 'tests/test-apps/clone-repo.sh'
     print('Updating file {}'.format(file))
     os.system('sed -i \'s|^export JBOSS_MAVEN_REPO_URL=.*|export JBOSS_MAVEN_REPO_URL=\"{}\"|\' '.format(repo_url) + file)
 
-def update_maven_repo(repo_url):
-    common.update_env_in_all_modules("JBOSS_MAVEN_REPO_URL", repo_url)
+def update_maven_repo_in_features(repo_url):
+    '''
+    Updates S2I feature tests with the given repository URL.
+    :param repo_url: Maven Repository URL to set
+    '''
+    base_dir = 'tests/features'
+    pattern_branch = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
+
+    for feature in S2I_BEHAVE_TESTS:
+        print("Updating feature {0}".format(feature))
+        with open(os.path.join(base_dir, feature)) as fe:
+            updated_value = pattern_branch.sub("| variable | value |\n      | JBOSS_MAVEN_REPO_URL | {} |".format(repo_url), fe.read())
+
+        with open(os.path.join(base_dir, feature), 'w') as fe:
+            fe.write(updated_value)
+
+def update_maven_repo_in_tests(repo_url):
+    '''
+    Updates images tests with the given repository URL.
+    :param repo_url: Maven Repository URL to set
+    '''
+    update_maven_repo_in_features(repo_url)
     update_test_apps_clone_repo(repo_url)
 
 if __name__ == "__main__":
@@ -118,7 +146,8 @@ def update_maven_repo(repo_url):
     parser.add_argument('--version', dest='version', default=DEFAULT_VERSION, help='Defines the version of artifacts to retrieve from the repository url, defaults to {}'.format(DEFAULT_VERSION))
     args = parser.parse_args()
 
-    update_maven_repo(args.repo_url)
+    if(args.repo_url != DEFAULT_REPO_URL):
+        update_maven_repo_in_tests(args.repo_url)
     
     # Update Kogito Service modules
     for serviceName, modulePath in Modules.items():
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 8ba9ed79cdc..03aa5dce5ed 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -31,6 +31,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
     Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable | value |
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
@@ -69,6 +71,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable | value |
     Then check that page is served
       | property             | value     |
       | port                 | 8080      |
@@ -80,6 +84,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable | value |
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 

From 5a44268df27dfb9fbce94e39518627b5b1b0eaa5 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 19 Jun 2020 10:07:42 -0300
Subject: [PATCH 150/709] [KOGITO-2005] - Release Kogito Images 0.11.0 (#185)

Signed-off-by: spolti <fspolti@redhat.com>
---
 image.yaml                                    |  2 +-
 kogito-imagestream.yaml                       | 48 ++++++++--------
 modules/kogito-data-index/module.yaml         |  6 +-
 modules/kogito-image-dependencies/module.yaml |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 modules/kogito-jobs-service/module.yaml       |  6 +-
 modules/kogito-jq/module.yaml                 |  2 +-
 modules/kogito-kubernetes-client/module.yaml  |  2 +-
 modules/kogito-launch-scripts/module.yaml     |  2 +-
 modules/kogito-logging/module.yaml            |  2 +-
 modules/kogito-management-console/module.yaml |  6 +-
 modules/kogito-persistence/module.yaml        |  2 +-
 modules/kogito-quarkus-jvm/module.yaml        |  2 +-
 modules/kogito-quarkus-s2i/module.yaml        |  4 +-
 modules/kogito-quarkus/module.yaml            |  2 +-
 modules/kogito-s2i-core/module.yaml           |  4 +-
 modules/kogito-springboot-s2i/module.yaml     |  4 +-
 modules/kogito-springboot/module.yaml         |  2 +-
 modules/kogito-system-user/module.yaml        |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 56 +++++++++----------
 .../kogito-springboot-ubi8-s2i.feature        | 26 ++++-----
 tests/test-apps/clone-repo.sh                 |  2 +-
 22 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/image.yaml b/image.yaml
index 6a8f21dc43f..b4082bb1108 100644
--- a/image.yaml
+++ b/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.10.0-rc1"
+version: "0.11.0"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 870701af988..149446fb92c 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.10.0-rc1'
+        - name: '0.11.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.10.0-rc1'
+            version: '0.11.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.10.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.11.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.10.0-rc1'
+        - name: '0.11.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.10.0-rc1'
+            version: '0.11.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.10.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.11.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.10.0-rc1'
+        - name: '0.11.0'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.10.0-rc1'
+            version: '0.11.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.10.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.11.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.10.0-rc1'
+        - name: '0.11.0'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.10.0-rc1'
+            version: '0.11.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.10.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.11.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.10.0-rc1'
+        - name: '0.11.0'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.10.0-rc1'
+            version: '0.11.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.10.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.11.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.10.0-rc1'
+        - name: '0.11.0'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: persistence backed by Infinispan server
-            version: '0.10.0-rc1'
+            version: '0.11.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.10.0-rc1
+            name: quay.io/kiegroup/kogito-data-index:0.11.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.10.0-rc1'
+        - name: '0.11.0'
           annotations:
             description: Runtime image for the Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.10.0-rc1'
+            version: '0.11.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.10.0-rc1
+            name: quay.io/kiegroup/kogito-jobs-service:0.11.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,16 +162,16 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.10.0-rc1'
+        - name: '0.11.0'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '0.10.0-rc1'
+            version: '0.11.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:0.10.0-rc1
+            name: quay.io/kiegroup/kogito-management-console:0.11.0
 
diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index d54e43b3d4e..f154dbbbe88 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 artifacts:
   - name: kogito-data-index-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200408.070316-207-runner.jar
-    md5: 9272617dfec4ff548603319250b8ed87
+    url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.11.0/data-index-service-0.11.0-runner.jar
+    md5: cd6d7decc93d83671cce7b99aef12182
 
 execute:
   - script: configure
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index d48a7f106f9..de9f81a6c0d 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.10.0-rc1"
+version: "0.11.0"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
index 1fdfaa609e3..8383ee56d89 100644
--- a/modules/kogito-infinispan-properties/module.yaml
+++ b/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 8b2a5d6103a..9c1d926ac39 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200408.070024-132-runner.jar
-    md5: 72ffb4a158d4b90a68fe080cfb28c3ad
+    url: https://repository.jboss.org/org/kie/kogito/jobs-service/0.11.0/jobs-service-0.11.0-runner.jar
+    md5: 5b5648251ab15900752f8e223b41ed49
 
 execute:
   - script: configure
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
index 948fb52147b..6d252b9b80e 100644
--- a/modules/kogito-jq/module.yaml
+++ b/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 modules:
   install:
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 15d128d1dc9..256df58481e 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index d0828211050..f09456214a6 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index de84a392b1c..71513735e3e 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 796df80b824..227effac13f 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
@@ -8,8 +8,8 @@ envs:
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200408.070632-43-runner.jar
-    md5: c8519cc20f283b671c6da064e7bf0326
+    url: https://repository.jboss.org/org/kie/kogito/management-console/0.11.0/management-console-0.11.0-runner.jar
+    md5: 655eaf81bfcf5c3122facf3229b223a6
 
 execute:
   - script: configure
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index 4f5eb4a51b5..33cb65c7655 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 modules:
   install:
diff --git a/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-quarkus-jvm/module.yaml
index e14f2d6c1e4..2a115d41385 100644
--- a/modules/kogito-quarkus-jvm/module.yaml
+++ b/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
index a31d0db4a03..ae9b56fa621 100644
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ b/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.10.0-rc1"
+    value: "0.11.0"
diff --git a/modules/kogito-quarkus/module.yaml b/modules/kogito-quarkus/module.yaml
index 1ec50d2db8b..bbd2751dcd4 100644
--- a/modules/kogito-quarkus/module.yaml
+++ b/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 9fd6c152caf..4a797b6b66c 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.10.0-rc1'
+version: '0.11.0'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
@@ -47,4 +47,4 @@ run:
     - "/usr/local/s2i/run"
 
 execute:
-  - script: configure.sh
\ No newline at end of file
+  - script: configure.sh
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
index 51a0bcba12c..16772f9eacc 100644
--- a/modules/kogito-springboot-s2i/module.yaml
+++ b/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.10.0-rc1"
+    value: "0.11.0"
diff --git a/modules/kogito-springboot/module.yaml b/modules/kogito-springboot/module.yaml
index 434f88be890..0089f3e0a31 100644
--- a/modules/kogito-springboot/module.yaml
+++ b/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index 917ea58871a..e828086be2d 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.10.0-rc1"
+version: "0.11.0"
 
 execute:
   - script: add-user
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index d7ed58e05f6..78d9ed3d23b 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -2,8 +2,8 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable     | value      |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 3221225472 |
     Then check that page is served
@@ -21,8 +21,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
-      | variable     | value      |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.11.0
+      | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 3221225472 |
     Then check that page is served
@@ -40,7 +40,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.11.0
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -57,8 +57,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable     | value                     |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable | value |
       | NATIVE       | false                     |
       | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG |
     Then check that page is served
@@ -75,7 +75,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -90,8 +90,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable     | value      |
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
     Then check that page is served
@@ -106,8 +106,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable          | value         |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable | value |
       | NATIVE            | false         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
     Then file /home/kogito/bin/process-quarkus-example-runner.jar should exist
@@ -122,8 +122,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
   # ignore until https://issues.redhat.com/browse/KOGITO-2003 is not fixed.
   @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable          | value         |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable | value |
       | NATIVE            | true          |
       | LIMIT_MEMORY      | 6442450944    |
       | MAVEN_ARGS_APPEND | -Ppersistence |
@@ -137,8 +137,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
   Scenario: Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable          | value                            |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable | value |
       | NATIVE            | false                            |
       | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
       | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am |
@@ -154,8 +154,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable          | value                            |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable | value |
       | NATIVE            | true                             |
       | LIMIT_MEMORY      | 6442450944                       |
       | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
@@ -172,7 +172,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.11.0
       | variable | value |
       | NATIVE   | false |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
@@ -189,7 +189,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.11.0
       | variable | value |
       | NATIVE   | false |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -206,8 +206,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | ["hello","world"]     |
 
   Scenario: Perform a third incremental s2i build, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
-      | variable     | value      |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.11.0
+      | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -247,8 +247,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable       | value          |
+    Given s2i build /tmp/kogito-examples from dmn-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable | value |
       | NATIVE         | false          |
       | KOGITO_VERSION | 8.0.0-SNAPSHOT |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
@@ -263,8 +263,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable       | value          |
+    Given s2i build /tmp/kogito-examples from dmn-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+      | variable | value |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
       | KOGITO_VERSION | 8.0.0-SNAPSHOT |
@@ -280,8 +280,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable            | value          |
+    Given s2i build /tmp/kogito-examples from dmn-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+      | variable | value |
       | NATIVE              | false          |
       | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
       | PROJECT_GROUP_ID    | com.mycompany  |
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 03aa5dce5ed..bdebddb44f3 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -2,8 +2,8 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable     | value        |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable | value |
       | JAVA_OPTIONS | -Ddebug=true |
     Then check that page is served
       | property             | value     |
@@ -16,8 +16,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
-      | variable            | value        |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.11.0
+      | variable | value |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
       | property             | value     |
@@ -30,7 +30,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build /tmp/kogito-examples from process-springboot-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
@@ -43,8 +43,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable          | value         |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable | value |
       | MAVEN_ARGS_APPEND | -Ppersistence |
     Then file /home/kogito/bin/process-springboot-example.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
@@ -54,8 +54,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable          | value                              |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | ARTIFACT_DIR      | process-springboot-example/target  |
       | MAVEN_ARGS_APPEND | -pl process-springboot-example -am |
@@ -70,7 +70,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using 0.11.0
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
@@ -83,7 +83,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using 0.11.0
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -108,7 +108,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable            | value          |
+    Given s2i build /tmp/kogito-examples from dmn-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable | value |
       | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index a83013dd265..3ea216381ca 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -20,7 +20,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
 git fetch origin --tags
-git checkout master
+git checkout -b 0.11.0 0.11.0
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/

From cafe40ea2de5373a0cf33266882c2c430845bcd4 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 22 Jun 2020 14:48:36 -0300
Subject: [PATCH 151/709] [KOGITO-2005] - Release Kogito Images 0.11.0 (#184)

Prepare master branch for the next iteration.

See https://issues.redhat.com/browse/KOGITO-2005

Signed-off-by: spolti <fspolti@redhat.com>
---
 image.yaml                                    |  2 +-
 kogito-imagestream.yaml                       | 48 +++++++++----------
 modules/kogito-data-index/module.yaml         |  6 +--
 modules/kogito-image-dependencies/module.yaml |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 modules/kogito-jobs-service/module.yaml       |  6 +--
 modules/kogito-jq/module.yaml                 |  2 +-
 modules/kogito-kubernetes-client/module.yaml  |  2 +-
 modules/kogito-launch-scripts/module.yaml     |  2 +-
 modules/kogito-logging/module.yaml            |  2 +-
 modules/kogito-management-console/module.yaml |  6 +--
 modules/kogito-persistence/module.yaml        |  2 +-
 modules/kogito-quarkus-jvm/module.yaml        |  2 +-
 modules/kogito-quarkus-s2i/module.yaml        |  4 +-
 modules/kogito-quarkus/module.yaml            |  2 +-
 modules/kogito-s2i-core/module.yaml           |  2 +-
 modules/kogito-springboot-s2i/module.yaml     |  4 +-
 modules/kogito-springboot/module.yaml         |  2 +-
 modules/kogito-system-user/module.yaml        |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 32 ++++++-------
 .../kogito-springboot-ubi8-s2i.feature        | 16 +++----
 tests/test-apps/clone-repo.sh                 |  2 +-
 22 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/image.yaml b/image.yaml
index b4082bb1108..626b357bf9d 100644
--- a/image.yaml
+++ b/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.11.0"
+version: "0.12.0-rc1"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 149446fb92c..bdf716d833f 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.11.0'
+        - name: '0.12.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.11.0'
+            version: '0.12.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.11.0
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.12.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.11.0'
+        - name: '0.12.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.11.0'
+            version: '0.12.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.11.0
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.12.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.11.0'
+        - name: '0.12.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.11.0'
+            version: '0.12.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.11.0
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.12.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.11.0'
+        - name: '0.12.0-rc1'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.11.0'
+            version: '0.12.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.11.0
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.12.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.11.0'
+        - name: '0.12.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.11.0'
+            version: '0.12.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.11.0
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.12.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.11.0'
+        - name: '0.12.0-rc1'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: persistence backed by Infinispan server
-            version: '0.11.0'
+            version: '0.12.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.11.0
+            name: quay.io/kiegroup/kogito-data-index:0.12.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.11.0'
+        - name: '0.12.0-rc1'
           annotations:
             description: Runtime image for the Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.11.0'
+            version: '0.12.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.11.0
+            name: quay.io/kiegroup/kogito-jobs-service:0.12.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,16 +162,16 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.11.0'
+        - name: '0.12.0-rc1'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '0.11.0'
+            version: '0.12.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:0.11.0
+            name: quay.io/kiegroup/kogito-management-console:0.12.0-rc1
 
diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index f154dbbbe88..91ab319bc7f 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 artifacts:
   - name: kogito-data-index-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.11.0/data-index-service-0.11.0-runner.jar
-    md5: cd6d7decc93d83671cce7b99aef12182
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200618.192711-319-runner.jar
+    md5: 48b84a0d84430d64681624b95dd0dd71
 
 execute:
   - script: configure
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index de9f81a6c0d..f3363258774 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.11.0"
+version: "0.12.0-rc1"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
index 8383ee56d89..8bfb6a8ca16 100644
--- a/modules/kogito-infinispan-properties/module.yaml
+++ b/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 9c1d926ac39..ef7f18b6fbd 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/jobs-service/0.11.0/jobs-service-0.11.0-runner.jar
-    md5: 5b5648251ab15900752f8e223b41ed49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200618.192623-243-runner.jar
+    md5: f1b1ff887b00a4c3aeab0d58391628b5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
index 6d252b9b80e..f305ee101a5 100644
--- a/modules/kogito-jq/module.yaml
+++ b/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 modules:
   install:
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 256df58481e..dcadd96e983 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index f09456214a6..856d775e4b1 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index 71513735e3e..e11f7033f3f 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 227effac13f..d2362f16d44 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
@@ -8,8 +8,8 @@ envs:
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/org/kie/kogito/management-console/0.11.0/management-console-0.11.0-runner.jar
-    md5: 655eaf81bfcf5c3122facf3229b223a6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200618.192858-150-runner.jar
+    md5: 1c52ddf4d8be967a86ed3d7ee803eb74
 
 execute:
   - script: configure
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index 33cb65c7655..e43c3a6eb0b 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 modules:
   install:
diff --git a/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-quarkus-jvm/module.yaml
index 2a115d41385..454dfbeb32d 100644
--- a/modules/kogito-quarkus-jvm/module.yaml
+++ b/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
index ae9b56fa621..a46ebbb6b23 100644
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ b/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.11.0"
+    value: "8.0.0-SNAPSHOT"
diff --git a/modules/kogito-quarkus/module.yaml b/modules/kogito-quarkus/module.yaml
index bbd2751dcd4..076d9e1ac86 100644
--- a/modules/kogito-quarkus/module.yaml
+++ b/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 4a797b6b66c..40f386cca24 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.11.0'
+version: '0.12.0-rc1'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
index 16772f9eacc..c4f3b0252fb 100644
--- a/modules/kogito-springboot-s2i/module.yaml
+++ b/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.11.0"
+    value: "8.0.0-SNAPSHOT"
diff --git a/modules/kogito-springboot/module.yaml b/modules/kogito-springboot/module.yaml
index 0089f3e0a31..7b66e0ccbb2 100644
--- a/modules/kogito-springboot/module.yaml
+++ b/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index e828086be2d..e20bb1609af 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.11.0"
+version: "0.12.0-rc1"
 
 execute:
   - script: add-user
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 78d9ed3d23b..b1944c67b09 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 3221225472 |
@@ -21,7 +21,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.11.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 3221225472 |
@@ -40,7 +40,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.11.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -57,7 +57,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE       | false                     |
       | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG |
@@ -75,7 +75,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -90,7 +90,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
@@ -106,7 +106,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE            | false         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
@@ -122,7 +122,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
   # ignore until https://issues.redhat.com/browse/KOGITO-2003 is not fixed.
   @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE            | true          |
       | LIMIT_MEMORY      | 6442450944    |
@@ -137,7 +137,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
   Scenario: Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE            | false                            |
       | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
@@ -154,7 +154,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE            | true                             |
       | LIMIT_MEMORY      | 6442450944                       |
@@ -172,7 +172,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.11.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
       | variable | value |
       | NATIVE   | false |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
@@ -189,7 +189,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.11.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
       | variable | value |
       | NATIVE   | false |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -206,7 +206,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | ["hello","world"]     |
 
   Scenario: Perform a third incremental s2i build, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.11.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
@@ -247,7 +247,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE         | false          |
       | KOGITO_VERSION | 8.0.0-SNAPSHOT |
@@ -263,7 +263,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
@@ -280,7 +280,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE              | false          |
       | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index bdebddb44f3..3babefb3b24 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | JAVA_OPTIONS | -Ddebug=true |
     Then check that page is served
@@ -16,7 +16,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.11.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
       | variable | value |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -30,7 +30,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | MAVEN_ARGS_APPEND | -Ppersistence |
     Then file /home/kogito/bin/process-springboot-example.jar should exist
@@ -54,7 +54,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | ARTIFACT_DIR      | process-springboot-example/target  |
@@ -70,7 +70,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using 0.11.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
@@ -83,7 +83,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using 0.11.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -108,7 +108,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using 0.11.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 3ea216381ca..a83013dd265 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -20,7 +20,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
 git fetch origin --tags
-git checkout -b 0.11.0 0.11.0
+git checkout master
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/

From 8a33bd81c0a9a7545e6a02050d4696b584da3c32 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Mon, 22 Jun 2020 23:25:36 +0530
Subject: [PATCH 152/709] [Kogito-2475] - Migrate kogito-images PR check to
 RHBA jenkins (#186)

See: https://issues.redhat.com/browse/KOGITO-2475

Signed-off-by: Tarun Khandelwal <tarkhand@redhat.com>
---
 Jenkinsfile | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 832dbecb885..794de525843 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,11 +1,9 @@
-// Setup milestone to stop previous build from running when a new one is launched
-// The result would be:
-//  Build 1 runs and creates milestone 1
-//  While build 1 is running, suppose build 2 fires. It has milestone 1 and milestone 2. It passes 1, which causes build #1 to abort
+@Library('jenkins-pipeline-shared-libraries')_
+
+def changeAuthor = env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR
+def changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
+def changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > 1) milestone(buildNumber - 1)
-milestone(buildNumber)
 IMAGES = ["kogito-quarkus-ubi8", 
             "kogito-quarkus-jvm-ubi8",
             "kogito-quarkus-ubi8-s2i",
@@ -16,7 +14,13 @@ IMAGES = ["kogito-quarkus-ubi8",
             "kogito-management-console"]
 
 pipeline{
-    agent { label 'jenkins-slave'}
+    agent { label 'kogito-image-slave && !master'}
+    tools {
+        jdk 'kie-jdk11'
+    }
+    environment {
+        JAVA_HOME = "${GRAALVM_HOME}"
+    }
     stages{
         stage('Initialization'){
             steps{
@@ -28,6 +32,7 @@ pipeline{
                             && env.MAVEN_MIRROR_REPOSITORY != ''){
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
                     }
+                    githubscm.checkoutIfExists('kogito-images', changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
                 }
                 sh "docker rm -f \$(docker ps -a -q) || date"
                 sh "docker rmi -f \$(docker images -q) || date"

From f229b91aeeec09c12a20c3a68010a8f7d40ddde0 Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Wed, 24 Jun 2020 23:05:10 +0530
Subject: [PATCH 153/709] =?UTF-8?q?[KOGITO-1336]=20-=20Improve=20the=20exp?=
 =?UTF-8?q?osed=20HTTP=20port=20configuration=20for=20Kogit=E2=80=A6=20(#1?=
 =?UTF-8?q?76)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-1336] - Improve the exposed HTTP port configuration for Kogito Runtime Services


Co-authored-by: Vaibhav jain <vaibhavjain.wiz@gmail.com>
---
 kogito-data-index-overrides.yaml              |  2 +-
 kogito-jobs-service-overrides.yaml            |  3 +++
 kogito-management-console-overrides.yaml      |  3 +++
 kogito-quarkus-jvm-overrides.yaml             |  4 ++++
 kogito-quarkus-overrides.yaml                 |  1 +
 kogito-quarkus-s2i-overrides.yaml             |  3 +++
 kogito-springboot-overrides.yaml              |  4 ++++
 kogito-springboot-s2i-overrides.yaml          |  3 +++
 .../added/launch/kogito-data-index.sh         |  4 ++--
 .../tests/bats/kogito-data-index.bats         |  2 +-
 .../added/launch/kogito-jobs-service.sh       |  7 ++++++
 .../tests/bats/kogito-jobs-service.bats       | 23 +++++++++++++++++++
 .../added/launch/kogito-management-console.sh |  6 +++++
 .../tests/bats/kogito-management-console.bats | 23 +++++++++++++++++++
 .../added/kogito-app-launch.sh                | 10 +++++++-
 .../added/launch/kogito-quarkus-jvm.sh        | 16 +++++++++++++
 modules/kogito-quarkus-jvm/configure          |  1 +
 .../tests/bats/kogito-quarkus-jvm.bats        | 16 +++++++++++++
 .../added/kogito-app-launch.sh                | 13 ++++++++---
 .../added/launch/kogito-quarkus-s2i.sh        | 16 +++++++++++++
 modules/kogito-quarkus-s2i/configure          |  1 +
 .../tests/bats/kogito-quarkus-s2i.bats        | 16 +++++++++++++
 .../kogito-quarkus/added/kogito-app-launch.sh | 12 ++++++++--
 .../added/launch/kogito-quarkus-native.sh     | 16 +++++++++++++
 modules/kogito-quarkus/configure              |  1 +
 .../tests/bats/kogito-quarkus-native.bats     | 16 +++++++++++++
 .../added/kogito-app-launch.sh                | 10 +++++++-
 .../added/launch/kogito-springboot-s2i.sh     | 16 +++++++++++++
 modules/kogito-springboot-s2i/configure       |  1 +
 .../tests/bats/kogito-springboot-s2i.bats     | 16 +++++++++++++
 .../added/kogito-app-launch.sh                | 10 +++++++-
 .../added/launch/kogito-springboot.sh         | 16 +++++++++++++
 modules/kogito-springboot/configure           |  1 +
 .../tests/bats/kogito-springboot.bats         | 16 +++++++++++++
 tests/features/kogito-data-index.feature      |  6 ++---
 tests/features/kogito-jobs-service.feature    |  9 +++++++-
 .../kogito-management-console.feature         | 11 +++++++--
 .../features/kogito-quarkus-jvm-ubi8.feature  | 17 ++++++++++++++
 tests/features/kogito-quarkus-ubi8.feature    | 17 ++++++++++++++
 .../kogito-springboot-ubi8-s2i.feature        | 13 +++++++++++
 tests/features/kogito-springboot-ubi8.feature | 15 ++++++++++++
 41 files changed, 378 insertions(+), 18 deletions(-)
 create mode 100644 modules/kogito-quarkus-jvm/added/launch/kogito-quarkus-jvm.sh
 create mode 100644 modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats
 create mode 100644 modules/kogito-quarkus-s2i/added/launch/kogito-quarkus-s2i.sh
 create mode 100644 modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats
 create mode 100644 modules/kogito-quarkus/added/launch/kogito-quarkus-native.sh
 create mode 100644 modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats
 create mode 100644 modules/kogito-springboot-s2i/added/launch/kogito-springboot-s2i.sh
 create mode 100644 modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats
 create mode 100644 modules/kogito-springboot/added/launch/kogito-springboot.sh
 create mode 100644 modules/kogito-springboot/tests/bats/kogito-springboot.bats

diff --git a/kogito-data-index-overrides.yaml b/kogito-data-index-overrides.yaml
index 7eb11d50446..96234730d33 100644
--- a/kogito-data-index-overrides.yaml
+++ b/kogito-data-index-overrides.yaml
@@ -17,7 +17,7 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "KOGITO_DATA_INDEX_HTTP_PORT"
+  - name: "HTTP_PORT"
     example: "9090"
     description: "Defines which port the Data Index Container Image will listen on."
   - name: "QUARKUS_INFINISPAN_CLIENT_SERVER_LIST"
diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index 565d98ee085..28a7718d909 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -35,6 +35,9 @@ envs:
 - name: "KAFKA_BOOTSTRAP_SERVERS"
   example: "localhost:9092"
   description: "When enabling events for the Jobs Service, this variable also needs to be set to allow the service to connect to the given Kafka instance."
+- name: "HTTP_PORT"
+  example: "9090"
+  description: "Defines which port the Job service Container Image will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index 621b9661dbe..248c9b939f8 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -20,6 +20,9 @@ envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
     example: "http://data-index.service:8080"
     description: "Data Index service address, defaults tohttp://localhost:8180."
+  - name: "HTTP_PORT"
+    example: "9090"
+    description: "Defines which port the management console Container Image will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-quarkus-jvm-overrides.yaml b/kogito-quarkus-jvm-overrides.yaml
index 759e16651e8..0a2caad047a 100644
--- a/kogito-quarkus-jvm-overrides.yaml
+++ b/kogito-quarkus-jvm-overrides.yaml
@@ -20,6 +20,9 @@ envs:
 - name: JAVA_OPTIONS
   example: "-Dquarkus.log.level=DEBUG"
   description: JVM options passed to the Java command.
+- name: "HTTP_PORT"
+  example: "9090"
+  description: "Defines on which port the service will listen on."
 
 ports:
 - value: 8080
@@ -29,6 +32,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.logging
+  - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.s2i.core
diff --git a/kogito-quarkus-overrides.yaml b/kogito-quarkus-overrides.yaml
index cd7f85db990..b7037ad12b2 100644
--- a/kogito-quarkus-overrides.yaml
+++ b/kogito-quarkus-overrides.yaml
@@ -32,6 +32,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.logging
+  - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
     version: "19.3.1-java-11"
   - name: org.kie.kogito.s2i.core
diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
index 477ba50cc4f..e802fc84d3b 100644
--- a/kogito-quarkus-s2i-overrides.yaml
+++ b/kogito-quarkus-s2i-overrides.yaml
@@ -27,6 +27,9 @@ envs:
 - name: ARTIFACT_DIR
   example: mymodule/target
   description:  Path to target/ where the jar files are created for multi-module builds
+- name: "HTTP_PORT"
+  example: "9090"
+  description: "Defines on which port the service will listen on."
 
 modules:
   install:
diff --git a/kogito-springboot-overrides.yaml b/kogito-springboot-overrides.yaml
index de6068f5934..4787bec3a44 100644
--- a/kogito-springboot-overrides.yaml
+++ b/kogito-springboot-overrides.yaml
@@ -23,6 +23,9 @@ envs:
 - name: BINARY_BUILD
   example: "true"
   description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
+- name: "HTTP_PORT"
+  example: "9090"
+  description: "Defines on which port the service will listen on."
 
 ports:
 - value: 8080
@@ -32,6 +35,7 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.logging
+  - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.s2i.core
diff --git a/kogito-springboot-s2i-overrides.yaml b/kogito-springboot-s2i-overrides.yaml
index c399f1c3354..243a80efc12 100644
--- a/kogito-springboot-s2i-overrides.yaml
+++ b/kogito-springboot-s2i-overrides.yaml
@@ -24,6 +24,9 @@ envs:
 - name: ARTIFACT_DIR
   example: mymodule/target
   description:  Path to target/ where the jar files are created for multi-module builds
+- name: "HTTP_PORT"
+  example: "9090"
+  description: "Defines on which port the service will listen on."
 
 modules:
   install:
diff --git a/modules/kogito-data-index/added/launch/kogito-data-index.sh b/modules/kogito-data-index/added/launch/kogito-data-index.sh
index fb3be84b38f..380244ca325 100644
--- a/modules/kogito-data-index/added/launch/kogito-data-index.sh
+++ b/modules/kogito-data-index/added/launch/kogito-data-index.sh
@@ -3,7 +3,7 @@
 
 function prepareEnv() {
     # keep it on alphabetical order
-    unset KOGITO_DATA_INDEX_HTTP_PORT
+    unset HTTP_PORT
 }
 
 function configure() {
@@ -11,7 +11,7 @@ function configure() {
 }
 
 function configure_data_index_http_port {
-    local httpPort=${KOGITO_DATA_INDEX_HTTP_PORT:-8080}
+    local httpPort=${HTTP_PORT:-8080}
     KOGITO_DATA_INDEX_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dquarkus.http.port=${httpPort}"
 }
 
diff --git a/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
index 5bcfa4d8306..1dcc591d0bf 100644
--- a/modules/kogito-data-index/tests/bats/kogito-data-index.bats
+++ b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
@@ -23,7 +23,7 @@ teardown() {
 }
 
 @test "http port configuration custom value" {
-    export KOGITO_DATA_INDEX_HTTP_PORT="9090"
+    export HTTP_PORT="9090"
     configure_data_index_http_port
     expected=" -Dquarkus.http.port=9090"
     echo "Result is ${KOGITO_DATA_INDEX_PROPS} and expected is ${expected}"
diff --git a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
index 52cac74f87c..57c23e2b275 100644
--- a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
+++ b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
@@ -4,12 +4,14 @@ function prepareEnv() {
     # keep it on alphabetical order
     unset BACKOFF_RETRY
     unset ENABLE_PERSISTENCE
+    unset HTTP_PORT
     unset INFINISPAN_CLIENT_SERVER_LIST
     unset MAX_INTERVAL_LIMIT_RETRY
 }
 
 function configure() {
     configure_jobs_service
+    configure_jobs_service_http_port
 }
 
 
@@ -44,3 +46,8 @@ function configure_jobs_service() {
     fi
 }
 
+function configure_jobs_service_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.http.port=${httpPort}"
+}
+
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index 03c88947e66..1afe459bd85 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -78,4 +78,27 @@ teardown() {
     run configure_jobs_service
     echo "status is ${status}"
     [ "$status" -eq 1 ]
+}
+
+@test "check if default http port is correctly set" {
+
+  configure_jobs_service_http_port
+
+  result="${KOGITO_JOBS_PROPS}"
+  expected=" -Dquarkus.http.port=8080"
+
+  echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
+
+@test "check if custom http port is correctly set" {
+  export HTTP_PORT="9090"
+
+  configure_jobs_service_http_port
+
+  result="${KOGITO_JOBS_PROPS}"
+  expected=" -Dquarkus.http.port=9090"
+
+  echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
 }
\ No newline at end of file
diff --git a/modules/kogito-management-console/added/launch/kogito-management-console.sh b/modules/kogito-management-console/added/launch/kogito-management-console.sh
index 65beee33539..94cf5deb6b2 100644
--- a/modules/kogito-management-console/added/launch/kogito-management-console.sh
+++ b/modules/kogito-management-console/added/launch/kogito-management-console.sh
@@ -5,11 +5,13 @@ source ${KOGITO_HOME}/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
+    unset HTTP_PORT
     unset KOGITO_DATAINDEX_HTTP_URL
 }
 
 function configure() {
     configure_data_index_url
+    configure_mgmt_console_http_port
 }
 
 # Exit codes:
@@ -29,3 +31,7 @@ function configure_data_index_url {
     KOGITO_MANAGEMENT_CONSOLE_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
 }
 
+function configure_mgmt_console_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_MANAGEMENT_CONSOLE_PROPS="${KOGITO_MANAGEMENT_CONSOLE_PROPS} -Dquarkus.http.port=${httpPort}"
+}
diff --git a/modules/kogito-management-console/tests/bats/kogito-management-console.bats b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
index f0c063ce7e3..aa607597a1a 100644
--- a/modules/kogito-management-console/tests/bats/kogito-management-console.bats
+++ b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
@@ -33,3 +33,26 @@ teardown() {
     [ "${status}" == "10" ]
 }
 
+@test "check if default http port is correctly set" {
+
+  configure_mgmt_console_http_port
+
+  result="${KOGITO_MANAGEMENT_CONSOLE_PROPS}"
+  expected=" -Dquarkus.http.port=8080"
+
+  echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
+
+@test "check if custom http port is correctly set" {
+  export HTTP_PORT="9090"
+
+  configure_mgmt_console_http_port
+
+  result="${KOGITO_MANAGEMENT_CONSOLE_PROPS}"
+  expected=" -Dquarkus.http.port=9090"
+
+  echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
+
diff --git a/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh b/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
index 2c0e0c27150..24f9b6ebc96 100644
--- a/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
@@ -12,4 +12,12 @@ if [[ "$1" == "-h" ]]; then
     exit 0
 fi
 
-exec java ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-quarkus-jvm.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_JVM_PROPS} -Dquarkus.http.host=0.0.0.0 -jar $KOGITO_HOME/bin/*runner.jar
diff --git a/modules/kogito-quarkus-jvm/added/launch/kogito-quarkus-jvm.sh b/modules/kogito-quarkus-jvm/added/launch/kogito-quarkus-jvm.sh
new file mode 100644
index 00000000000..b816451457e
--- /dev/null
+++ b/modules/kogito-quarkus-jvm/added/launch/kogito-quarkus-jvm.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+}
+
+function configure() {
+    configure_quarkus_jvm_http_port
+}
+
+function configure_quarkus_jvm_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_QUARKUS_JVM_PROPS="${KOGITO_QUARKUS_JVM_PROPS} -Dquarkus.http.port=${httpPort}"
+}
\ No newline at end of file
diff --git a/modules/kogito-quarkus-jvm/configure b/modules/kogito-quarkus-jvm/configure
index b3a28b4803e..af3e51b84a2 100644
--- a/modules/kogito-quarkus-jvm/configure
+++ b/modules/kogito-quarkus-jvm/configure
@@ -7,6 +7,7 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
 chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
 
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
diff --git a/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats b/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats
new file mode 100644
index 00000000000..43c6e4e4477
--- /dev/null
+++ b/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats
@@ -0,0 +1,16 @@
+#!/usr/bin/env bats
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-quarkus-jvm.sh
+
+@test "check if custom http port is correctly set" {
+  export HTTP_PORT="9090"
+
+  configure_quarkus_jvm_http_port
+
+  result="${KOGITO_QUARKUS_JVM_PROPS}"
+  expected=" -Dquarkus.http.port=9090"
+
+  echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
index a566e37e958..44cf41d2166 100644
--- a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
@@ -11,11 +11,18 @@ if [[ "$1" == "-h" ]]; then
     exec /usr/local/s2i/usage
     exit 0
 fi
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-quarkus-s2i.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
 
 if [ "${NATIVE^^}" == "TRUE" ]; then
-    exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/ssl-libs \
+    exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
+         -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/ssl-libs \
         -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
 else
-    exec java ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
+    exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -jar $KOGITO_HOME/bin/*runner.jar
 fi
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/added/launch/kogito-quarkus-s2i.sh b/modules/kogito-quarkus-s2i/added/launch/kogito-quarkus-s2i.sh
new file mode 100644
index 00000000000..6293eaf1902
--- /dev/null
+++ b/modules/kogito-quarkus-s2i/added/launch/kogito-quarkus-s2i.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+}
+
+function configure() {
+    configure_quarkus_s2i_http_port
+}
+
+function configure_quarkus_s2i_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_QUARKUS_S2I_PROPS="${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.port=${httpPort}"
+}
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/configure b/modules/kogito-quarkus-s2i/configure
index 6879dba19ed..7b20b2a80ee 100644
--- a/modules/kogito-quarkus-s2i/configure
+++ b/modules/kogito-quarkus-s2i/configure
@@ -9,6 +9,7 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
 chmod +x ${KOGITO_HOME}/kogito-app-launch.sh
 
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
diff --git a/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats b/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats
new file mode 100644
index 00000000000..7f49fe76b71
--- /dev/null
+++ b/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats
@@ -0,0 +1,16 @@
+#!/usr/bin/env bats
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-quarkus-s2i.sh
+
+@test "check if custom http port is correctly set" {
+  export HTTP_PORT="9090"
+
+  configure_quarkus_s2i_http_port
+
+  result="${KOGITO_QUARKUS_S2I_PROPS}"
+  expected=" -Dquarkus.http.port=9090"
+
+  echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
\ No newline at end of file
diff --git a/modules/kogito-quarkus/added/kogito-app-launch.sh b/modules/kogito-quarkus/added/kogito-app-launch.sh
index d898862dc1d..501fcf88665 100644
--- a/modules/kogito-quarkus/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus/added/kogito-app-launch.sh
@@ -12,6 +12,14 @@ if [[ "$1" == "-h" ]]; then
     exit 0
 fi
 
-exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} -Dquarkus.http.host=0.0.0.0 \
-    -Dquarkus.http.port=8080 -Djava.library.path=$KOGITO_HOME/ssl-libs \
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-quarkus-native.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_NATIVE_PROPS} \
+    -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/ssl-libs \
     -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
diff --git a/modules/kogito-quarkus/added/launch/kogito-quarkus-native.sh b/modules/kogito-quarkus/added/launch/kogito-quarkus-native.sh
new file mode 100644
index 00000000000..4a3c83e1033
--- /dev/null
+++ b/modules/kogito-quarkus/added/launch/kogito-quarkus-native.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+}
+
+function configure() {
+    configure_quarkus_native_http_port
+}
+
+function configure_quarkus_native_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_QUARKUS_NATIVE_PROPS="${KOGITO_QUARKUS_NATIVE_PROPS} -Dquarkus.http.port=${httpPort}"
+}
\ No newline at end of file
diff --git a/modules/kogito-quarkus/configure b/modules/kogito-quarkus/configure
index cf8dec725ca..94d2498a146 100644
--- a/modules/kogito-quarkus/configure
+++ b/modules/kogito-quarkus/configure
@@ -7,6 +7,7 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
 chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
 
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
diff --git a/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats b/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats
new file mode 100644
index 00000000000..62d7bbde5c6
--- /dev/null
+++ b/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats
@@ -0,0 +1,16 @@
+#!/usr/bin/env bats
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-quarkus-native.sh
+
+@test "check if custom http port is correctly set" {
+  export HTTP_PORT="9090"
+
+  configure_quarkus_native_http_port
+
+  result="${KOGITO_QUARKUS_NATIVE_PROPS}"
+  expected=" -Dquarkus.http.port=9090"
+
+  echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
\ No newline at end of file
diff --git a/modules/kogito-springboot-s2i/added/kogito-app-launch.sh b/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
index 13f5c37da14..51b9920120e 100644
--- a/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
+++ b/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
@@ -12,5 +12,13 @@ if [[ "$1" == "-h" ]]; then
     exit 0
 fi
 
-exec java ${JAVA_OPTIONS} -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-springboot-s2i.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -jar $KOGITO_HOME/bin/*.jar
 
diff --git a/modules/kogito-springboot-s2i/added/launch/kogito-springboot-s2i.sh b/modules/kogito-springboot-s2i/added/launch/kogito-springboot-s2i.sh
new file mode 100644
index 00000000000..e71140a3bd5
--- /dev/null
+++ b/modules/kogito-springboot-s2i/added/launch/kogito-springboot-s2i.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+}
+
+function configure() {
+    configure_springboot_s2i_http_port
+}
+
+function configure_springboot_s2i_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_SPRINGBOOT_S2I_PROPS="${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.port=${httpPort}"
+}
\ No newline at end of file
diff --git a/modules/kogito-springboot-s2i/configure b/modules/kogito-springboot-s2i/configure
index 744d336a65f..fb8b032aa89 100644
--- a/modules/kogito-springboot-s2i/configure
+++ b/modules/kogito-springboot-s2i/configure
@@ -8,6 +8,7 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
 chmod +x ${KOGITO_HOME}/kogito-app-launch.sh
 
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
diff --git a/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats b/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats
new file mode 100644
index 00000000000..7f5689388cf
--- /dev/null
+++ b/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats
@@ -0,0 +1,16 @@
+#!/usr/bin/env bats
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-springboot-s2i.sh
+
+@test "check if custom http port is correctly set" {
+  export HTTP_PORT="9090"
+
+  configure_springboot_s2i_http_port
+
+  result="${KOGITO_SPRINGBOOT_S2I_PROPS}"
+  expected=" -Dserver.port=9090"
+
+  echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
\ No newline at end of file
diff --git a/modules/kogito-springboot/added/kogito-app-launch.sh b/modules/kogito-springboot/added/kogito-app-launch.sh
index 1336f5ec8e0..2ca3ecd9dd1 100644
--- a/modules/kogito-springboot/added/kogito-app-launch.sh
+++ b/modules/kogito-springboot/added/kogito-app-launch.sh
@@ -12,4 +12,12 @@ if [[ "$1" == "-h" ]]; then
     exit 0
 fi
 
-exec java ${JAVA_OPTIONS} -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-springboot.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -jar $KOGITO_HOME/bin/*.jar
diff --git a/modules/kogito-springboot/added/launch/kogito-springboot.sh b/modules/kogito-springboot/added/launch/kogito-springboot.sh
new file mode 100644
index 00000000000..95b6e3d7baf
--- /dev/null
+++ b/modules/kogito-springboot/added/launch/kogito-springboot.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+}
+
+function configure() {
+    configure_springboot_http_port
+}
+
+function configure_springboot_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_SPRINGBOOT_PROPS="${KOGITO_SPRINGBOOT_PROPS} -Dserver.port=${httpPort}"
+}
\ No newline at end of file
diff --git a/modules/kogito-springboot/configure b/modules/kogito-springboot/configure
index ac80ff52500..8bfcae1526c 100644
--- a/modules/kogito-springboot/configure
+++ b/modules/kogito-springboot/configure
@@ -8,6 +8,7 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
 chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
 
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
diff --git a/modules/kogito-springboot/tests/bats/kogito-springboot.bats b/modules/kogito-springboot/tests/bats/kogito-springboot.bats
new file mode 100644
index 00000000000..b22b2865eaa
--- /dev/null
+++ b/modules/kogito-springboot/tests/bats/kogito-springboot.bats
@@ -0,0 +1,16 @@
+#!/usr/bin/env bats
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-springboot.sh
+
+@test "check if custom http port is correctly set" {
+  export HTTP_PORT="9090"
+
+  configure_springboot_http_port
+
+  result="${KOGITO_SPRINGBOOT_PROPS}"
+  expected=" -Dserver.port=9090"
+
+  echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
\ No newline at end of file
diff --git a/tests/features/kogito-data-index.feature b/tests/features/kogito-data-index.feature
index 81768476894..7379932e9c3 100644
--- a/tests/features/kogito-data-index.feature
+++ b/tests/features/kogito-data-index.feature
@@ -23,9 +23,9 @@ Feature: Kogito-data-index feature.
 
   Scenario: Verify if the debug is correctly enabled and test custom http port
     When container is started with env
-      | variable                     | value |
-      | SCRIPT_DEBUG                 | true  |
-      | KOGITO_DATA_INDEX_HTTP_PORT  | 9090  |
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
     Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-data-index-runner.jar
 
   Scenario: Verify data-index default configuration
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 53f6026c168..66e6996f121 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -19,10 +19,17 @@ Feature: Kogito-jobs-service feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false -jar /home/kogito/bin/kogito-jobs-service-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Dquarkus.infinispan-client.use-auth=false -jar /home/kogito/bin/kogito-jobs-service-runner.jar
     And container log should contain started in
     And container log should not contain Application failed to start
 
+  Scenario: Verify if the debug is correctly enabled and test custom http port
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Dquarkus.infinispan-client.use-auth=false -jar /home/kogito/bin/kogito-jobs-service-runner.jar
+
   Scenario: verify if container fails if persistence is enabled but there is no infinispan server list.
     When container is started with env
       | variable           | value |
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index 282e9fc4d3b..da31c2ff9f9 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -19,17 +19,24 @@ Feature: kogito-management-console feature
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
     And container log should contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
 
+  Scenario: Verify if the debug is correctly enabled and test custom http port
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.port=9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
+
   Scenario: Verify if the debug is correctly enabled and set data-index url
     When container is started with env
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/kogito-quarkus-jvm-ubi8.feature b/tests/features/kogito-quarkus-jvm-ubi8.feature
index 0760ed483fb..600e1b1fa24 100644
--- a/tests/features/kogito-quarkus-jvm-ubi8.feature
+++ b/tests/features/kogito-quarkus-jvm-ubi8.feature
@@ -34,6 +34,23 @@ Feature: Kogito-quarkus-ubi8 feature.
       | expected_phrase | ["hello","world"]        |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the custom port
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
+      | variable            | value                     |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+      | HTTP_PORT           | 9090                      |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 9090                     |
+      | path            | /hello                   |
+      | request_method  | POST                     |
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
+      | wait            | 80                       |
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+
   Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
       | variable            | value                     |
diff --git a/tests/features/kogito-quarkus-ubi8.feature b/tests/features/kogito-quarkus-ubi8.feature
index 4131b7a1612..03656f9e44b 100644
--- a/tests/features/kogito-quarkus-ubi8.feature
+++ b/tests/features/kogito-quarkus-ubi8.feature
@@ -31,4 +31,21 @@ Feature: Kogito-quarkus-ubi8 feature.
       | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
       | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the custom port
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld-native/ from target
+      | variable            | value                     |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+      | HTTP_PORT           | 9090                      |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 9090                     |
+      | path            | /hello                   |
+      | request_method  | POST                     |
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
+      | wait            | 80                       |
+      | expected_phrase | ["hello","world"]        |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
\ No newline at end of file
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 3babefb3b24..6d8435f67ab 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -42,6 +42,19 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain Tomcat initialized with port(s): 8080 (http)
 
+  Scenario: Verify if the s2i build is finished as expected and if it is listening on the custom port, test uses custom properties file to test the port configuration.
+    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+      | variable            | value |
+      | HTTP_PORT           | 9090  |
+    Then check that page is served
+      | property             | value     |
+      | port                 | 9090      |
+      | path                 | /orders/1 |
+      | wait                 | 80        |
+      | expected_status_code | 204       |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain Tomcat initialized with port(s): 9090 (http)
+
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
diff --git a/tests/features/kogito-springboot-ubi8.feature b/tests/features/kogito-springboot-ubi8.feature
index 992b96246fd..cb2ea58e2e7 100644
--- a/tests/features/kogito-springboot-ubi8.feature
+++ b/tests/features/kogito-springboot-ubi8.feature
@@ -32,6 +32,21 @@ Feature: springboot-quarkus-ubi8 feature.
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the custom port
+    Given s2i build /tmp/kogito-examples/process-springboot-example from target
+      | variable            | value        |
+      | JAVA_OPTIONS        | -Ddebug=true |
+      | HTTP_PORT           | 9090         |
+    Then check that page is served
+      | property             | value     |
+      | port                 | 9090      |
+      | path                 | /orders/1 |
+      | wait                 | 80        |
+      | expected_status_code | 204       |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+
   Scenario: Verify if the (forcing) binary build is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples/process-springboot-example from target
       | variable            | value        |

From d3f70ba3d372da3216f8f021c1f12584de5207b9 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 3 Jul 2020 16:35:46 +0200
Subject: [PATCH 154/709] KOGITO-2451 Migrate nightly pipelines to RHBA (#182)

---
 Jenkinsfile.deploy                  | 211 +++++++++++++++-------------
 Jenkinsfile.promote                 | 187 ++++++++++++------------
 Makefile                            |  34 ++---
 README.md                           |  84 ++++++-----
 modules/kogito-epel/7/configure     |   3 +-
 scripts/manage-kogito-version.py    |   4 +-
 scripts/update-maven-information.py |  44 +-----
 scripts/update-tests-maven-repo.py  |  66 +++++++++
 tests/test-apps/clone-repo.sh       |   3 +
 9 files changed, 352 insertions(+), 284 deletions(-)
 create mode 100644 scripts/update-tests-maven-repo.py

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 88bdfd78cd9..ee29ce8aa8f 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -1,22 +1,36 @@
-//Checks master branch for updates every day
-//If found triggers the pipeline, 
-//The pipeline is set to run between 12:00AM - 3:00AM UTC
+@Library('jenkins-pipeline-shared-libraries')_
 
-IMAGES = ["kogito-quarkus-ubi8", 
+// As Cekit is not compatible with podman, we use docker in that pipeline
+
+IMAGES = [
+            "kogito-quarkus-ubi8", 
             "kogito-quarkus-jvm-ubi8",
             "kogito-quarkus-ubi8-s2i",
             "kogito-springboot-ubi8",
             "kogito-springboot-ubi8-s2i",
             "kogito-data-index",
             "kogito-jobs-service",
-            "kogito-management-console"]
+            "kogito-management-console"
+         ]
 
+// Should be a single pipeline (not multibranch)
 pipeline {
-    agent { label 'jenkins-slave' }
+    agent {
+        label 'kogito-image-slave && !master'
+    }
+
+    // Needed for local build
+    tools {
+        jdk 'kie-jdk11'
+    }
+
     parameters {
         string(name: 'DISPLAY_NAME', defaultValue: '', description: 'Setup a specific build display name')
+        
         string(name: 'BUILD_BRANCH_NAME', defaultValue: 'master', description: 'Which branch to build ? Set if you are not on a multibranch pipeline.')
+        string(name: 'GIT_AUTHOR', defaultValue: 'kiegroup', description: 'Which Git author repository ?')
 
+        booleanParam(name: 'IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
         string(name: 'IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
         string(name: 'IMAGE_REGISTRY', defaultValue: '', description: 'Image registry to use to deploy images')
         string(name: 'IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Image namespace to use to deploy images')
@@ -28,42 +42,25 @@ pipeline {
         booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: 'Skip tests')
     }
 
-    // Keep commented if no env var is defined
-    // environment {
-        // Keep commented. It is for documentation only
-        // Cannot define here as an env variable defined here is immutable ...
-        // BRANCH_NAME => should be set by the multibranch pipeline. If single pipeline, then it is set with value from ${params.BUILD_BRANCH_NAME}
-
-        // OPENSHIFT_API => Taken from Jenkins global env
-        // OPENSHIFT_REGISTRY_ROUTE => Taken from Jenkins global env
+    environment {
+        JAVA_HOME = "${GRAALVM_HOME}"
 
-        // DEPLOY_IMAGE_REGISTRY_CREDENTIALS
-        // DEPLOY_IMAGE_USE_OPENSHIFT
-        // DEPLOY_IMAGE_REGISTRY
-        // DEPLOY_IMAGE_NAMESPACE
-        // DEPLOY_IMAGE_NAME_SUFFIX
-        // DEPLOY_IMAGE_TAG
-    // }
+        OPENSHIFT_API = credentials("OPENSHIFT_API")
+        OPENSHIFT_REGISTRY = credentials("OPENSHIFT_REGISTRY")
+        OPENSHIFT_CREDS_KEY = "OPENSHIFT_CREDS"
+    }
 
     stages {
         stage('Initialization') {
             steps {
-                script {
-                    cleanWorkspaces()
-                    sh "docker rm -f \$(docker ps -a -q) || date"
-                    sh "docker rmi -f \$(docker images -q) || date"
-                    
-                    setupImageEnvVarsFromParams("","DEPLOY")
+                script {  
+                    clean()
 
                     if (params.DISPLAY_NAME != "") {
                         currentBuild.displayName = params.DISPLAY_NAME
                     }
 
-                    if (env.BRANCH_NAME != "") {
-                        // Switch to branch if not on a multibranch pipeline
-                        env.BRANCH_NAME = params.BUILD_BRANCH_NAME
-                        checkout([$class: 'GitSCM', branches: [[name: env.BRANCH_NAME]], browser: [$class: 'GithubWeb', repoUrl: "${GIT_URL}"], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'user-kie-ci10', url: "${GIT_URL}"]]])
-                    }
+                    checkout(githubscm.resolveRepository("kogito-images", params.GIT_AUTHOR, params.BUILD_BRANCH_NAME, false))
 
                     // Set the mirror url only if no artifact repository is given
                     if (params.MAVEN_ARTIFACT_REPOSITORY == '' 
@@ -85,10 +82,25 @@ pipeline {
                     }
                     sh updateArtifactCmd
 
-                    // For debug
+                    // Debug purpose in case of issue
                     sh "cat modules/kogito-data-index/module.yaml"
                     sh "cat modules/kogito-jobs-service/module.yaml"
                     sh "cat modules/kogito-management-console/module.yaml"
+                }
+            }
+        }
+        stage('Setup tests repository') {
+            when {
+                expression {
+                    return params.MAVEN_ARTIFACT_REPOSITORY != ''
+                }
+            }
+            steps {
+                script {
+                    // Update repo in tests
+                    sh "python3 scripts/update-tests-maven-repo.py --repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
+
+                    // Debug purpose in case of issue
                     sh "cat tests/test-apps/clone-repo.sh"
                     sh "cat tests/features/kogito-quarkus-ubi8-s2i.feature"
                     sh "cat tests/features/kogito-springboot-ubi8-s2i.feature"
@@ -130,12 +142,11 @@ pipeline {
             steps{
                 script {
                     build_stages = [:]
-                    IMAGES.each{ image -> build_stages["${image}"] = {
-                            createWorkspace("$image")
-                            copyWorkspace("$image")
-                            dir(getWorkspacePath("$image")){
+                    IMAGES.each{ image -> build_stages[image] = {
+                            initWorkspace(image)
+                            dir(getWorkspacePath(image)){
                                 try{
-                                    sh "make ${image} ignore_test=${params.SKIP_TESTS}"
+                                    sh "make ${image} ignore_test=${params.SKIP_TESTS} cekit_option='--work-dir .'"
                                 }
                                 finally{
                                     junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
@@ -158,34 +169,38 @@ pipeline {
         stage('Pushing') {
             steps {
                 script {
-                    if (env.DEPLOY_IMAGE_USE_OPENSHIFT == "true") {
+                    if (isDeployImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
-                        pushImages()
-                    } else if (env.DEPLOY_IMAGE_REGISTRY_CREDENTIALS != '') {
-                        withDockerRegistry([ credentialsId: "${DEPLOY_IMAGE_REGISTRY_CREDENTIALS}", url: "https://${DEPLOY_IMAGE_REGISTRY}" ]) {        
-                            pushImages()
-                        }
-                    } else {
-                        pushImages()
+                    } else if (getDeployImageRegistryCredentials() != ''){
+                        loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials())
                     }
+                    pushImages()
                 }
             }
         }
-        stage('Finishing') {
-            steps {
-                sh "docker rmi -f \$(docker images -q) || date"
-            }
-        }
     }
     post {
         always {
             script{
-                cleanWorkspaces()
+                clean()
             }
         }
     }
 }
 
+void clean() {
+    cleanWorkspaces()
+    cleanImages()
+
+    // Clean Cekit cache, in case we reuse an old node
+    sh "rm -rf \$HOME/.cekit/cache"
+}
+
+void cleanImages(){
+    sh "docker rm -f \$(docker ps -a -q) || date"
+    sh "docker rmi -f \$(docker images -q) || date"
+}
+
 void tagImages() {
     for(String imageName : IMAGES) {
         sh "docker tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"
@@ -200,76 +215,80 @@ void pushImages() {
 
 String buildImageName(String imageName) {
     String finalImageName = imageName
-    if(env.DEPLOY_IMAGE_NAME_SUFFIX != null && env.DEPLOY_IMAGE_NAME_SUFFIX != '') {
-        finalImageName += "-" + env.DEPLOY_IMAGE_NAME_SUFFIX
+    if(getDeployImageNameSuffix() != ''){
+        finalImageName += "-" + getDeployImageNameSuffix()
     }
-    return "${DEPLOY_IMAGE_REGISTRY}/${DEPLOY_IMAGE_NAMESPACE}/${finalImageName}:${DEPLOY_IMAGE_TAG}"
+    return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${finalImageName}:${getDeployImageTag()}"
 }
 
-void loginOpenshiftRegistry() {
-    // Use creds & route as `jenkins-slave` is not running directly on Openshift
-    withCredentials([string(credentialsId: 'openshift-login-passwd', variable: 'OC_PASSWORD')]) {
-        sh "set +x && oc login -u admin -p ${OC_PASSWORD} --server=${OPENSHIFT_API} --insecure-skip-tls-verify"
-        sh "set +x && docker login -u admin -p \$(oc whoami -t) ${OPENSHIFT_REGISTRY_ROUTE}"
+void loginOpenshift(){
+    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]){
+        sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
     }
 }
 
-/**
-    Setup env variables for image registry/namesapce/tag, depending on parameters
-*/
-void setupImageEnvVarsFromParams(String prefixParam, String prefixEnv) {
-    if(getParam(prefixParam, "IMAGE_REGISTRY") == '') {
-        setEnv(prefixEnv, "IMAGE_REGISTRY", env.OPENSHIFT_REGISTRY_ROUTE) // Use route as `jenkins-slave` is not running directly on Openshift
-        setEnv(prefixEnv, "IMAGE_NAMESPACE", "openshift")
-        setEnv(prefixEnv, "IMAGE_USE_OPENSHIFT", "true")
-    } else {
-        setEnvFromParam("IMAGE_REGISTRY_CREDENTIALS", prefixEnv, prefixParam)
-        setEnvFromParam("IMAGE_REGISTRY", prefixEnv, prefixParam)
-        setEnvFromParam("IMAGE_NAMESPACE", prefixEnv, prefixParam)
-        setEnv(prefixEnv, "IMAGE_USE_OPENSHIFT", "false")
-    }
-    if (getParam(prefixParam, "IMAGE_TAG") != '') {
-        setEnvFromParam("IMAGE_TAG", prefixEnv, prefixParam)
-    } else {
-        setEnv(prefixEnv, "IMAGE_TAG", sh(script: "echo ${GIT_COMMIT} | cut -c1-7", returnStdout: true).trim())
-    }
-    if(getParam(prefixParam, "IMAGE_NAME_SUFFIX") != '') {
-        setEnvFromParam("IMAGE_NAME_SUFFIX", prefixEnv, prefixParam)
-    }
+void loginOpenshiftRegistry(){
+    loginOpenshift()
+    // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
+    sh "set +x && docker login -u anything -p \$(oc whoami -t) ${env.OPENSHIFT_REGISTRY}"
 }
 
-String getKey(String prefix, String envVarName) {
-    if (prefix == '') {
-        return envVarName
+void loginContainerRegistry(String registry, String credsId){
+    withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
+        sh "docker login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${registry}"
     }
-    return "${prefix}_${envVarName}"
 }
 
-void setEnv(String keyPrefix, String keyId, String value){
-    echo "setEnv ${getKey(keyPrefix, keyId)} = ${value}"
-    env."${getKey(keyPrefix, keyId)}" = value
+////////////////////////////////////////////////////////////////////////
+// Deploy image information
+////////////////////////////////////////////////////////////////////////
+
+boolean isDeployImageInOpenshiftRegistry(){
+    return params.IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-void setEnvFromParam(String keyId, String prefixEnv, String prefixParam){
-    setEnv(prefixEnv, keyId, getParam(prefixParam, keyId))
+String getDeployImageRegistryCredentials(){
+    return isDeployImageInOpenshiftRegistry() ? "" : params.IMAGE_REGISTRY_CREDENTIALS
 }
 
-String getParam(String keyPrefix, String keyId){
-    return params."${getKey(keyPrefix, keyId)}"
+String getDeployImageRegistry(){
+    return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.IMAGE_REGISTRY
 }
 
-void  createWorkspace(String image){
-    sh "mkdir -p ${getWorkspacePath(image)}"
+String getDeployImageNamespace(){
+    return isDeployImageInOpenshiftRegistry() ? "openshift" : params.IMAGE_NAMESPACE
+}
+
+String getDeployImageNameSuffix(){
+    return params.IMAGE_NAME_SUFFIX
+}
+
+String getDeployImageTag(){
+    if (params.IMAGE_TAG != ""){
+        return params.IMAGE_TAG
+    } else {
+        return sh(script: "git rev-parse --short HEAD", returnStdout: true).trim()
+    }
 }
-void copyWorkspace(String image){
+
+
+////////////////////////////////////////////////////////////////////////
+// Workspaces
+////////////////////////////////////////////////////////////////////////
+
+void initWorkspace(String image){
+    sh "mkdir -p ${getWorkspacePath(image)}"
     sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
 }
+
 void cleanWorkspaces(){
     sh "rm -rf ${getWorkspacesPath()}"
 }
+
 String getWorkspacesPath(){
     return "${WORKSPACE}/workspaces"
 }
+
 String getWorkspacePath(String image){
     return "${getWorkspacesPath()}/${image}"
 }
\ No newline at end of file
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index b2b6d41f358..e2a32b6c39b 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -10,17 +10,21 @@ IMAGES = ["kogito-quarkus-ubi8",
                     "kogito-management-console"]
 
 pipeline {
-    agent { label 'jenkins-slave' }
+    agent {
+        label 'kogito-image-slave && !master'
+    }
 
     parameters {
         string(name: 'DISPLAY_NAME', defaultValue: '', description: 'Setup a specific build display name')
 
+        booleanParam(name: 'BASE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
         string(name: 'BASE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
         string(name: 'BASE_IMAGE_REGISTRY', defaultValue: '', description: 'Base image registry')
         string(name: 'BASE_IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Base image namespace')
         string(name: 'BASE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Base image name suffix')
         string(name: 'BASE_IMAGE_TAG', defaultValue: '', description: 'Base image tag')
 
+        booleanParam(name: 'PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
         string(name: 'PROMOTE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
         string(name: 'PROMOTE_IMAGE_REGISTRY', defaultValue: '', description: 'Promote image registry')
         string(name: 'PROMOTE_IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Promote image namespace')
@@ -30,37 +34,17 @@ pipeline {
         booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', defaultValue: false, description: 'Set to true if you want the deployed images to also be with the `latest` tag')
     }
 
-    // Keep commented if no env var is defined
-    // environment {
-        // Keep commented. It is for documentation only
-        // Cannot define here as an env variable defined here is immutable ...
-
-        // OPENSHIFT_API => Taken from Jenkins global env
-        // OPENSHIFT_REGISTRY_ROUTE => Taken from Jenkins global env
-
-        // OLD_IMAGE_REGISTRY_CREDENTIALS
-        // OLD_IMAGE_USE_OPENSHIFT
-        // OLD_IMAGE_REGISTRY
-        // OLD_IMAGE_NAMESPACE
-        // OLD_IMAGE_NAME_SUFFIX
-        // OLD_IMAGE_TAG
-        
-        // NEW_IMAGE_REGISTRY_CREDENTIALS
-        // NEW_IMAGE_USE_OPENSHIFT
-        // NEW_IMAGE_REGISTRY
-        // NEW_IMAGE_NAMESPACE
-        // NEW_IMAGE_NAME_SUFFIX
-        // NEW_IMAGE_TAG
-    // }
+    environment {
+        OPENSHIFT_API = credentials("OPENSHIFT_API")
+        OPENSHIFT_REGISTRY = credentials("OPENSHIFT_REGISTRY")
+        OPENSHIFT_CREDS_KEY = "OPENSHIFT_CREDS"
+    }
 
     stages {
         stage('Initialization') {
             steps {
                 script {
-                    sh "docker rm -f \$(docker ps -a -q) || docker rmi -f \$(docker images -q) || date"
-
-                    setupImageEnvVarsFromParams("BASE","OLD")
-                    setupImageEnvVarsFromParams("PROMOTE","NEW")
+                    cleanImages()
 
                     if (params.DISPLAY_NAME != "") {
                         currentBuild.displayName = params.DISPLAY_NAME
@@ -71,16 +55,12 @@ pipeline {
         stage('Pull "old" images'){
             steps{
                 script {
-                    if (env.OLD_IMAGE_USE_OPENSHIFT == "true") {
+                    if (isOldImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
-                        pullImages()
-                    } else if (env.OLD_IMAGE_REGISTRY_CREDENTIALS != ''){
-                        withDockerRegistry([ credentialsId: "${OLD_IMAGE_REGISTRY_CREDENTIALS}", url: "https://${OLD_IMAGE_REGISTRY}" ]){        
-                            pullImages()
-                        }
-                    } else {
-                        pullImages()
+                    } else if (getOldImageRegistryCredentials() != ''){
+                        loginContainerRegistry(getOldImageRegistry(), getOldImageRegistryCredentials())
                     }
+                    pullImages()
                 }
             }
         }
@@ -94,57 +74,60 @@ pipeline {
         stage('Pushing'){
             steps{
                 script {
-                    if (env.NEW_IMAGE_USE_OPENSHIFT == "true") {
+                    if (isNewImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
-                        pushImages()
-                    } else if (env.NEW_IMAGE_REGISTRY_CREDENTIALS != ''){
-                        withDockerRegistry([ credentialsId: "${NEW_IMAGE_REGISTRY_CREDENTIALS}", url: "https://${NEW_IMAGE_REGISTRY}" ]){
-                            pushImages()
-                        }
-                    } else {
-                        pushImages()
+                    } else if (getNewImageRegistryCredentials() != ''){
+                        loginContainerRegistry(getNewImageRegistry(), getNewImageRegistryCredentials())
                     }
+                    pushImages()
                 }
             }
         }
-        stage('Finishing'){
-            steps{
-                sh "docker rmi -f \$(docker images -q) || date"
+    }
+    post {
+        always {
+            script {
+                cleanImages()
             }
         }
     }
 }
 
+void cleanImages(){
+    sh "podman rm -f \$(podman ps -a -q) || date"
+    sh "podman rmi -f \$(podman images -q) || date"
+}
+
 void pullImages(){
     for(String imageName : IMAGES){
-        sh "docker pull ${getOldImageFullTag(imageName)}"
+        sh "podman pull ${getOldImageFullTag(imageName)}"
     }
 }
 
 void tagImages() {
     for(String imageName : IMAGES){
-        sh "docker tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, env.NEW_IMAGE_TAG)}"
+        sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, getNewImageTag())}"
         if(isDeployLatestTag()){
-            sh "docker tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, "latest")}"
+            sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, "latest")}"
         }
     }
 }
 
 void pushImages(){
     for(String imageName : IMAGES){
-        sh "docker push ${getNewImageFullTag(imageName, env.NEW_IMAGE_TAG)}"
+        sh "podman push ${getNewImageFullTag(imageName, getNewImageTag())}"
         if(isDeployLatestTag()){
-            sh "docker push ${getNewImageFullTag(imageName, "latest")}"
+            sh "podman push ${getNewImageFullTag(imageName, "latest")}"
         }
     }
 }
 
 String getOldImageFullTag(String imageName){
-    return "${OLD_IMAGE_REGISTRY}/${OLD_IMAGE_NAMESPACE}/${buildImageNameWithSuffix(imageName, env.OLD_IMAGE_NAME_SUFFIX)}:${OLD_IMAGE_TAG}"
+    return "${getOldImageRegistry()}/${getOldImageNamespace()}/${buildImageNameWithSuffix(imageName, getOldImageNameSuffix())}:${getOldImageTag()}"
 }
 
 String getNewImageFullTag(String imageName, String tag){
-    return "${NEW_IMAGE_REGISTRY}/${NEW_IMAGE_NAMESPACE}/${buildImageNameWithSuffix(imageName, env.NEW_IMAGE_NAME_SUFFIX)}:${tag}"
+    return "${getNewImageRegistry()}/${getNewImageNamespace()}/${buildImageNameWithSuffix(imageName, getNewImageNameSuffix())}:${tag}"
 }
 
 String buildImageNameWithSuffix(String imageName, String suffix) {
@@ -159,54 +142,76 @@ boolean isDeployLatestTag(){
     return params.DEPLOY_WITH_LATEST_TAG
 }
 
-void loginOpenshiftRegistry() {
-    // Use creds & route as `jenkins-slave` is not running directly on Openshift
-    withCredentials([string(credentialsId: 'openshift-login-passwd', variable: 'OC_PASSWORD')]) {
-        sh "set +x && oc login -u admin -p ${OC_PASSWORD} --server=${OPENSHIFT_API} --insecure-skip-tls-verify"
-        sh "set +x && docker login -u admin -p \$(oc whoami -t) ${OPENSHIFT_REGISTRY_ROUTE}"
+void loginOpenshift(){
+    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]){
+        sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
     }
 }
 
-/**
-    Setup env variables for image registry/namesapce/tag, depending on parameters
-*/
-void setupImageEnvVarsFromParams(String prefixParam, String prefixEnv) {
-    if(getParam(prefixParam, "IMAGE_REGISTRY") == '') {
-        setEnv(prefixEnv, "IMAGE_REGISTRY", env.OPENSHIFT_REGISTRY_ROUTE) // Use route as `jenkins-slave` is not running directly on Openshift
-        setEnv(prefixEnv, "IMAGE_NAMESPACE", "openshift")
-        setEnv(prefixEnv, "IMAGE_USE_OPENSHIFT", "true")
-    } else {
-        setEnvFromParam("IMAGE_REGISTRY_CREDENTIALS", prefixEnv, prefixParam)
-        setEnvFromParam("IMAGE_REGISTRY", prefixEnv, prefixParam)
-        setEnvFromParam("IMAGE_NAMESPACE", prefixEnv, prefixParam)
-        setEnv(prefixEnv, "IMAGE_USE_OPENSHIFT", "false")
-    }
-    if (getParam(prefixParam, "IMAGE_TAG") != '') {
-        setEnvFromParam("IMAGE_TAG", prefixEnv, prefixParam)
-    } else {
-        setEnv(prefixEnv, "IMAGE_TAG", sh(script: "echo ${GIT_COMMIT} | cut -c1-7", returnStdout: true).trim())
-    }
-    if(getParam(prefixParam, "IMAGE_NAME_SUFFIX") != '') {
-        setEnvFromParam("IMAGE_NAME_SUFFIX", prefixEnv, prefixParam)
-    }
+void loginOpenshiftRegistry(){
+    loginOpenshift()
+    // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
+    sh "set +x && podman login -u anything -p \$(oc whoami -t) --tls-verify=false ${env.OPENSHIFT_REGISTRY}"
 }
 
-String getKey(String prefix, String envVarName) {
-    if (prefix == '') {
-        return envVarName
+void loginContainerRegistry(String registry, String credsId){
+    withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
+        sh "podman login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} --tls-verify=false ${registry}"
     }
-    return "${prefix}_${envVarName}"
 }
 
-void setEnv(String keyPrefix, String keyId, String value){
-    echo "setEnv ${getKey(keyPrefix, keyId)} = ${value}"
-    env."${getKey(keyPrefix, keyId)}" = value
+////////////////////////////////////////////////////////////////////////
+// Old image information
+////////////////////////////////////////////////////////////////////////
+
+boolean isOldImageInOpenshiftRegistry(){
+    return params.BASE_IMAGE_USE_OPENSHIFT_REGISTRY
+}
+
+String getOldImageRegistryCredentials(){
+    return isOldImageInOpenshiftRegistry() ? "" : params.BASE_IMAGE_REGISTRY_CREDENTIALS
+}
+
+String getOldImageRegistry(){
+    return isOldImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.BASE_IMAGE_REGISTRY
+}
+
+String getOldImageNamespace(){
+    return isOldImageInOpenshiftRegistry() ? "openshift" : params.BASE_IMAGE_NAMESPACE
+}
+
+String getOldImageNameSuffix(){
+    return params.BASE_IMAGE_NAME_SUFFIX
+}
+
+String getOldImageTag(){
+    return params.BASE_IMAGE_TAG
+}
+
+////////////////////////////////////////////////////////////////////////
+// New image information
+////////////////////////////////////////////////////////////////////////
+
+boolean isNewImageInOpenshiftRegistry(){
+    return params.PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY
+}
+
+String getNewImageRegistryCredentials(){
+    return isNewImageInOpenshiftRegistry() ? "" : params.PROMOTE_IMAGE_REGISTRY_CREDENTIALS
+}
+
+String getNewImageRegistry(){
+    return isNewImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.PROMOTE_IMAGE_REGISTRY
+}
+
+String getNewImageNamespace(){
+    return isNewImageInOpenshiftRegistry() ? "openshift" : params.PROMOTE_IMAGE_NAMESPACE
 }
 
-void setEnvFromParam(String keyId, String prefixEnv, String prefixParam){
-    setEnv(prefixEnv, keyId, getParam(prefixParam, keyId))
+String getNewImageNameSuffix(){
+    return params.PROMOTE_IMAGE_NAME_SUFFIX
 }
 
-String getParam(String keyPrefix, String keyId){
-    return params."${getKey(keyPrefix, keyId)}"
+String getNewImageTag(){
+    return params.PROMOTE_IMAGE_TAG
 }
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 79560d2bb7c..433ec754364 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
 SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
 BUILD_ENGINE := docker
 .DEFAULT_GOAL := build
-
+CEKIT_CMD := cekit -v ${cekit_option}
 
 # Build all images
 .PHONY: build
@@ -18,11 +18,11 @@ endif
 # build the quay.io/kiegroup/kogito-quarkus-ubi8 image
 kogito-quarkus-ubi8:
 ifneq ($(ignore_build),true)
-	cekit -v build --overrides-file kogito-quarkus-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} build --overrides-file kogito-quarkus-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set tu true, ignore the tests
 ifneq ($(ignore_test),true)
-	cekit -v test --overrides-file kogito-quarkus-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file kogito-quarkus-overrides.yaml behave
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${SHORTENED_LATEST_VERSION}
@@ -31,11 +31,11 @@ endif
 # build the quay.io/kiegroup/kogito-quarkus-jvm-ubi8 image
 kogito-quarkus-jvm-ubi8:
 ifneq ($(ignore_build),true)
-	cekit -v build --overrides-file kogito-quarkus-jvm-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} build --overrides-file kogito-quarkus-jvm-overrides.yaml ${BUILD_ENGINE}
 endif
 # if no NO_TEST env defined, test the image
 ifneq ($(ignore_test),true)
-	cekit -v test --overrides-file kogito-quarkus-jvm-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file kogito-quarkus-jvm-overrides.yaml behave
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${SHORTENED_LATEST_VERSION}
@@ -44,11 +44,11 @@ endif
 # build the quay.io/kiegroup/kogito-quarkus-ubi8-s2i image
 kogito-quarkus-ubi8-s2i:
 ifneq ($(ignore_build),true)
-	cekit -v build --overrides-file kogito-quarkus-s2i-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} build --overrides-file kogito-quarkus-s2i-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set tu true, ignore the tests
 ifneq ($(ignore_test),true)
-	cekit -v test --overrides-file kogito-quarkus-s2i-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file kogito-quarkus-s2i-overrides.yaml behave
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${SHORTENED_LATEST_VERSION}
@@ -57,11 +57,11 @@ endif
 # build the quay.io/kiegroup/kogito-springboot-ubi8 image
 kogito-springboot-ubi8:
 ifneq ($(ignore_build),true)
-	cekit -v build --overrides-file kogito-springboot-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} build --overrides-file kogito-springboot-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set tu true, ignore the tests
 ifneq ($(ignore_test),true)
-	cekit -v test --overrides-file kogito-springboot-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file kogito-springboot-overrides.yaml behave
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${SHORTENED_LATEST_VERSION}
@@ -70,11 +70,11 @@ endif
 # build the quay.io/kiegroup/kogito-springboot-ubi8-s2i image
 kogito-springboot-ubi8-s2i:
 ifneq ($(ignore_build),true)
-	cekit -v build --overrides-file kogito-springboot-s2i-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} build --overrides-file kogito-springboot-s2i-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set tu true, ignore the tests
 ifneq ($(ignore_test),true)
-	cekit -v test --overrides-file kogito-springboot-s2i-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file kogito-springboot-s2i-overrides.yaml behave
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${SHORTENED_LATEST_VERSION}
@@ -83,11 +83,11 @@ endif
 # build the quay.io/kiegroup/kogito-data-index image
 kogito-data-index:
 ifneq ($(ignore_build),true)
-	cekit -v build --overrides-file kogito-data-index-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} build --overrides-file kogito-data-index-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set tu true, ignore the tests
 ifneq ($(ignore_test),true)
-	cekit -v test --overrides-file kogito-data-index-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file kogito-data-index-overrides.yaml behave
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
@@ -96,11 +96,11 @@ endif
 # build the quay.io/kiegroup/kogito-jobs-service image
 kogito-jobs-service:
 ifneq ($(ignore_build),true)
-	cekit -v build --overrides-file kogito-jobs-service-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} build --overrides-file kogito-jobs-service-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set tu true, ignore the tests
 ifneq ($(ignore_test),true)
-	cekit -v test --overrides-file kogito-jobs-service-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file kogito-jobs-service-overrides.yaml behave
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION} quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
@@ -109,11 +109,11 @@ endif
 # build the quay.io/kiegroup/kogito-management-console image
 kogito-management-console:
 ifneq ($(ignore_build),true)
-	cekit -v build --overrides-file kogito-management-console-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} build --overrides-file kogito-management-console-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set tu true, ignore the tests
 ifneq ($(ignore_test),true)
-	cekit -v test --overrides-file kogito-management-console-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file kogito-management-console-overrides.yaml behave
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION} quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
diff --git a/README.md b/README.md
index cec8bd3130e..e45384c109e 100644
--- a/README.md
+++ b/README.md
@@ -23,41 +23,51 @@ the components, the builder images and the runtime images.
 Table of Contents
 =================
 
-* [Kogito Images](#kogito-container-images)
-    * [Kogito Images Requirements](#kogito-images-requirements)
-    * [Kogito Runtime and Builder Images](#kogito-runtime-and-builder-images)
-        * [Kogito Builder Images](#kogito-builder-images)
-            * [Kogito Quarkus Builder Image](#kogito-quarkus-builder-image)
-                * [Kogito Quarkus Builder Image Usage](#kogito-quarkus-builder-image-usage)
-                * [Kogito Quarkus Builder Image example](#kogito-quarkus-builder-image-example)
-            * [Kogito Spring Boot Builder Image](#kogito-spring-boot-builder-image)
-                * [Kogito Spring Boot Builder Image usage](#kogito-spring-boot-builder-image-usage)
-                * [Kogito Spring Boot Builder Image example](#kogito-spring-boot-builder-image-example) 
-            * [Improving Build Time](#improving-build-time)
-                * [Using incremental builds](#using-incremental-builds)
-                * [Using a Maven mirror](#using-a-maven-mirror)
-        * [Kogito Runtime Images](#kogito-runtime-images)
-            * [Binary Builds](#binary-builds)
-                * [KJAR Maven Project](#kjar-maven-project)
-                * [Assets Only](#assets-only)
-            * [Kogito Quarkus JVM Runtime Image](#kogito-quarkus-jvm-runtime-image)
-                * [Kogito Quarkus JVM Runtime Image usage](#kogito-quarkus-jvm-runtime-image-usage)
-                * [Kogito Quarkus JVM Runtime Image examples](#kogito-quarkus-jvm-runtime-image-examples)
-            * [Kogito Quarkus Native Runtime Image](#kogito-quarkus-native-runtime-image)
-                * [Kogito Quarkus Native Runtime Image usage](#kogito-quarkus-native-runtime-image-usage)
-                * [Kogito Quarkus Native Runtime Image example](#kogito-quarkus-native-runtime-image-example)
-            * [Kogito Spring Boot Runtime Image](#kogito-spring-boot-runtime-image)
-                * [Kogito Spring Boot Runtime Image usage](#kogito-spring-boot-runtime-image-usage)
-                * [Kogito Spring Boot Runtime Image example](#kogito-spring-boot-runtime-image-example)
-    * [Kogito Component Images](#kogito-components-images)
-        * [Kogito Data Index Component Image](#kogito-data-index-component-image)
-        * [Kogito Jobs Service Component Image](#kogito-jobs-service-component-image)
-        * [Kogito Management Console Component Image](#kogito-management-console-component-image)
-    * [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift)
-        * [Using released Images](#using-released-images)
-        * [Pushing the built images to a local OCP registry](#pushing-the-built-images-to-a-local-ocp-registry)
-    * [Contributing to Kogito Images repository](#contributing-to-kogito-images-repository)
-        * [Building Images](#building-images)
+- [Kogito Container Images](#kogito-container-images)
+- [Table of Contents](#table-of-contents)
+  - [Kogito Images Requirements](#kogito-images-requirements)
+  - [Kogito Runtime and Builder Images](#kogito-runtime-and-builder-images)
+    - [Kogito Builder Images](#kogito-builder-images)
+      - [Kogito Quarkus Builder Image](#kogito-quarkus-builder-image)
+        - [Kogito Quarkus Builder Image usage](#kogito-quarkus-builder-image-usage)
+        - [Kogito Quarkus Builder Image example](#kogito-quarkus-builder-image-example)
+      - [Kogito Spring Boot Builder Image](#kogito-spring-boot-builder-image)
+        - [Kogito Spring Boot Builder Image usage](#kogito-spring-boot-builder-image-usage)
+        - [Kogito Spring Boot Builder Image example](#kogito-spring-boot-builder-image-example)
+      - [Improving Build Time](#improving-build-time)
+        - [Using incremental builds](#using-incremental-builds)
+        - [Using a Maven mirror](#using-a-maven-mirror)
+    - [Kogito Runtime Images](#kogito-runtime-images)
+      - [Binary Builds](#binary-builds)
+        - [KJAR Maven Project](#kjar-maven-project)
+        - [Assets only](#assets-only)
+      - [Kogito Quarkus JVM Runtime Image](#kogito-quarkus-jvm-runtime-image)
+        - [Kogito Quarkus JVM Runtime Image usage](#kogito-quarkus-jvm-runtime-image-usage)
+        - [Kogito Quarkus JVM Runtime Image examples](#kogito-quarkus-jvm-runtime-image-examples)
+      - [Kogito Quarkus Native Runtime Image](#kogito-quarkus-native-runtime-image)
+        - [Kogito Quarkus Native Runtime Image usage](#kogito-quarkus-native-runtime-image-usage)
+        - [Kogito Quarkus Native Runtime Image example](#kogito-quarkus-native-runtime-image-example)
+      - [Kogito Spring Boot Runtime Image](#kogito-spring-boot-runtime-image)
+        - [Kogito Spring Boot Runtime Image usage](#kogito-spring-boot-runtime-image-usage)
+        - [Kogito Spring Boot Runtime Image example](#kogito-spring-boot-runtime-image-example)
+  - [Kogito Component Images](#kogito-component-images)
+    - [Kogito Data Index Component Image](#kogito-data-index-component-image)
+    - [Kogito Jobs Service Component Image](#kogito-jobs-service-component-image)
+    - [Kogito Management Console Component Image](#kogito-management-console-component-image)
+  - [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift)
+    - [Using released images](#using-released-images)
+    - [Pushing the built images to a local OCP registry:](#pushing-the-built-images-to-a-local-ocp-registry)
+  - [Contributing to Kogito Images repository](#contributing-to-kogito-images-repository)
+    - [Building Images](#building-images)
+      - [Image Modules](#image-modules)
+    - [Testing Images](#testing-images)
+      - [Behave tests](#behave-tests)
+        - [Running Behave tests](#running-behave-tests)
+        - [Writing Behave tests](#writing-behave-tests)
+      - [Bats tests](#bats-tests)
+        - [Running Bats tests](#running-bats-tests)
+        - [Writing Bats tests](#writing-bats-tests)
+    - [Reporting new issues](#reporting-new-issues)
             [Image Modules](#image-modules)
         * [Testing Images](#testing-images)
             * [Behave tests](#behave-tests)
@@ -896,6 +906,8 @@ With this Makefile you can:
       It uses the [push-local-registry.sh](scripts/push-local-registry.sh) script properly tag the images and push to the
       desired registry.
 
+- You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
+
 #### Image Modules
 
 CeKit can use modules to better separate concerns and reuse these modules on different images. 
@@ -959,6 +971,8 @@ make test
 CeKit also allows you to run a specific test.
 See [Writing Behave Tests](#writing-behave-tests).
 
+You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
+
 
 ##### Writing Behave tests
 
diff --git a/modules/kogito-epel/7/configure b/modules/kogito-epel/7/configure
index daa8140d025..1ded449d026 100644
--- a/modules/kogito-epel/7/configure
+++ b/modules/kogito-epel/7/configure
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -e
 
-rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+rpm -i https://download.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+
 
 microdnf clean all
 rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 5eceada5a79..fd65374fa5e 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -70,6 +70,7 @@ def update_test_apps_clone_repo(target_branch):
     parser.add_argument('--bump-to', dest='bump_to', help='bump everything to the next version')
     parser.add_argument('--apps-branch', dest='apps_branch',
                         help='Update Behave tests to use the desired branch for kogito-examples')
+    parser.add_argument('--confirm', default=False, action='store_true', help='To confirm automatically the setup')
 
     args = parser.parse_args()
 
@@ -90,7 +91,8 @@ def update_test_apps_clone_repo(target_branch):
             print("Version will be updated to {0}".format(args.bump_to))
             print("Version on behave tests examples will be updated to version {0} and branch {1}".format(args.bump_to,
                                                                                                           tests_branch))
-            input("Is the information correct? If so press any key to continue...")
+            if not args.confirm:
+                input("Is the information correct? If so press any key to continue...")
 
             common.update_image_version(args.bump_to)
             common.update_image_stream(args.bump_to)
diff --git a/scripts/update-maven-information.py b/scripts/update-maven-information.py
index 10fa2244805..7145b7dc727 100644
--- a/scripts/update-maven-information.py
+++ b/scripts/update-maven-information.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-#Script responsible for fetching the latest artifacts of kogito services and updating their module.yaml files
+#Script responsible for fetching the latest artifacts of kogito services and updating their module.yaml files as well as updating Maven version
 #Should be run from root directory of the repository
 #Sample usage:  python3 scripts/update-maven-information.py
 #
@@ -15,20 +15,14 @@
 import xml.etree.ElementTree as ET
 import requests
 import subprocess as sp
-import re
 import os
 import argparse
 from ruamel.yaml import YAML
 
-MAVEN_MODULE="kogito-maven/3.6.x"
-
 DEFAULT_REPO_URL = "https://repository.jboss.org/nexus/content/groups/public/"
 DEFAULT_VERSION = "8.0.0-SNAPSHOT"
 DEFAULT_ARTIFACT_PATH = "org/kie/kogito"
 
-# behave tests that needs to be update
-S2I_BEHAVE_TESTS = {"kogito-quarkus-ubi8-s2i.feature", "kogito-springboot-ubi8-s2i.feature"}
-
 Modules = {
     #service-name: module-name(directory in which module's module.yaml file is present)
     #Note: Service name should be same as given in the repository
@@ -107,47 +101,11 @@ def update_artifacts(service,modulePath):
     with open(modulePath, 'w') as module:
         common.yaml_loader().dump(data, module)
 
-def update_test_apps_clone_repo(repo_url):
-    '''
-    Updates the clone-repo.sh script for testing with the given repository URL.
-    :param repo_url: Maven Repository URL to set
-    '''
-    file = 'tests/test-apps/clone-repo.sh'
-    print('Updating file {}'.format(file))
-    os.system('sed -i \'s|^export JBOSS_MAVEN_REPO_URL=.*|export JBOSS_MAVEN_REPO_URL=\"{}\"|\' '.format(repo_url) + file)
-
-def update_maven_repo_in_features(repo_url):
-    '''
-    Updates S2I feature tests with the given repository URL.
-    :param repo_url: Maven Repository URL to set
-    '''
-    base_dir = 'tests/features'
-    pattern_branch = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
-
-    for feature in S2I_BEHAVE_TESTS:
-        print("Updating feature {0}".format(feature))
-        with open(os.path.join(base_dir, feature)) as fe:
-            updated_value = pattern_branch.sub("| variable | value |\n      | JBOSS_MAVEN_REPO_URL | {} |".format(repo_url), fe.read())
-
-        with open(os.path.join(base_dir, feature), 'w') as fe:
-            fe.write(updated_value)
-
-def update_maven_repo_in_tests(repo_url):
-    '''
-    Updates images tests with the given repository URL.
-    :param repo_url: Maven Repository URL to set
-    '''
-    update_maven_repo_in_features(repo_url)
-    update_test_apps_clone_repo(repo_url)
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and version.')
     parser.add_argument('--repo-url', dest='repo_url', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
     parser.add_argument('--version', dest='version', default=DEFAULT_VERSION, help='Defines the version of artifacts to retrieve from the repository url, defaults to {}'.format(DEFAULT_VERSION))
     args = parser.parse_args()
-
-    if(args.repo_url != DEFAULT_REPO_URL):
-        update_maven_repo_in_tests(args.repo_url)
     
     # Update Kogito Service modules
     for serviceName, modulePath in Modules.items():
diff --git a/scripts/update-tests-maven-repo.py b/scripts/update-tests-maven-repo.py
new file mode 100644
index 00000000000..9c9e64daab1
--- /dev/null
+++ b/scripts/update-tests-maven-repo.py
@@ -0,0 +1,66 @@
+#!/usr/bin/python3
+#Script responsible to update the tests with 
+#Should be run from root directory of the repository
+#Sample usage:  python3 scripts/update-tests-maven-repo.py
+
+import re
+import os
+import argparse
+
+MAVEN_MODULE="kogito-maven/3.6.x"
+
+# behave tests that needs to be update
+S2I_BEHAVE_TESTS = {"kogito-quarkus-ubi8-s2i.feature", "kogito-springboot-ubi8-s2i.feature"}
+
+def update_test_apps_clone_repo(repo_url, replaceJbossRepository):
+    '''
+    Updates the clone-repo.sh script for adding the given repository URL to the Maven settings.
+    :param repo_url: Maven Repository URL to set
+    :param replaceJbossRepository: If enabled, replace the default JBoss repository
+    '''
+    file = 'tests/test-apps/clone-repo.sh'
+    print('Updating file {}'.format(file))
+    if replaceJbossRepository:
+        os.system('sed -i \'s|^export JBOSS_MAVEN_REPO_URL=.*|export JBOSS_MAVEN_REPO_URL=\"{}\"|\' '.format(repo_url) + file)
+    else :
+        os.system('sed -i \'s|^# export MAVEN_REPO_URL=.*|export MAVEN_REPO_URL=\"{}\"|\' '.format(repo_url) + file)
+
+def update_maven_repo_in_features(repo_url, replaceJbossRepository):
+    '''
+    Updates S2I feature tests with the given repository URL.
+    :param repo_url: Maven Repository URL to set
+    :param replaceJbossRepository: If enabled, replace the default JBoss repository
+    '''
+    base_dir = 'tests/features'
+    pattern_branch = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
+
+    envVarKey = "MAVEN_REPO_URL"
+    if replaceJbossRepository:
+        envVarKey = "JBOSS_MAVEN_REPO_URL"
+
+
+    for feature in S2I_BEHAVE_TESTS:
+        print("Updating feature {0}".format(feature))
+        with open(os.path.join(base_dir, feature)) as fe:
+            updated_value = pattern_branch.sub("| variable | value |\n      | {} | {} |\n      | MAVEN_DOWNLOAD_OUTPUT | true |".format(envVarKey, repo_url), fe.read())
+
+        with open(os.path.join(base_dir, feature), 'w') as fe:
+            fe.write(updated_value)
+
+def update_maven_repo_in_tests(repo_url, replaceJbossRepository):
+    '''
+    Updates images tests with the given repository URL.
+    :param repo_url: Maven Repository URL to set
+    :param replaceJbossRepository: If enabled, replace the default JBoss repository
+    '''
+    update_maven_repo_in_features(repo_url, replaceJbossRepository)
+    update_test_apps_clone_repo(repo_url, replaceJbossRepository)
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and version.')
+    parser.add_argument('--repo-url', dest='repo_url', default='', help='Defines the url of the repository to setup into the tests')
+    parser.add_argument('--replace-jboss-repo', dest='replace_jboss_repo', default=False, action='store_true', help='Enable if repo-url should replace the main JBoss repository')
+    args = parser.parse_args()
+
+    if args.repo_url != '':
+        update_maven_repo_in_tests(args.repo_url, args.replace_jboss_repo)
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index a83013dd265..a2392632a2b 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -10,10 +10,13 @@ set -e
 
 # setup maven env
 export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
+# export MAVEN_REPO_URL=
 cp ${MVN_MODULE}/maven/settings.xml ${HOME}/.m2/settings.xml
 source ${MVN_MODULE}/added/configure-maven.sh
 configure
 
+cat ${HOME}/.m2/settings.xml
+
 # Clone examples
 cd /tmp
 rm -rf kogito-examples/

From 64260981e572e51144b2c1482ef383ad66704d81 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 14 Jul 2020 14:26:55 -0300
Subject: [PATCH 155/709] [KOGITO-2634] - Release Kogito Images 0.12.0 (#190)

Signed-off-by: spolti <fspolti@redhat.com>
---
 image.yaml                                    |  2 +-
 kogito-imagestream.yaml                       | 48 +++++++++----------
 modules/kogito-data-index/module.yaml         |  6 +--
 modules/kogito-image-dependencies/module.yaml |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 modules/kogito-jobs-service/module.yaml       |  6 +--
 modules/kogito-jq/module.yaml                 |  2 +-
 modules/kogito-kubernetes-client/module.yaml  |  2 +-
 modules/kogito-launch-scripts/module.yaml     |  2 +-
 modules/kogito-logging/module.yaml            |  2 +-
 modules/kogito-management-console/module.yaml |  6 +--
 modules/kogito-persistence/module.yaml        |  2 +-
 modules/kogito-quarkus-jvm/module.yaml        |  2 +-
 modules/kogito-quarkus-s2i/module.yaml        |  4 +-
 modules/kogito-quarkus/module.yaml            |  2 +-
 modules/kogito-s2i-core/module.yaml           |  2 +-
 modules/kogito-springboot-s2i/module.yaml     |  4 +-
 modules/kogito-springboot/module.yaml         |  2 +-
 modules/kogito-system-user/module.yaml        |  2 +-
 scripts/README.md                             |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 32 ++++++-------
 .../kogito-springboot-ubi8-s2i.feature        | 18 +++----
 tests/test-apps/clone-repo.sh                 |  2 +-
 23 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/image.yaml b/image.yaml
index 626b357bf9d..315e014afa2 100644
--- a/image.yaml
+++ b/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.12.0-rc1"
+version: "0.12.0"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index bdf716d833f..69beec40c11 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0-rc1'
+        - name: '0.12.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.12.0-rc1'
+            version: '0.12.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.12.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.12.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0-rc1'
+        - name: '0.12.0'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.12.0-rc1'
+            version: '0.12.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.12.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.12.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0-rc1'
+        - name: '0.12.0'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.12.0-rc1'
+            version: '0.12.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.12.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.12.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0-rc1'
+        - name: '0.12.0'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.12.0-rc1'
+            version: '0.12.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.12.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.12.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0-rc1'
+        - name: '0.12.0'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.12.0-rc1'
+            version: '0.12.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.12.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.12.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0-rc1'
+        - name: '0.12.0'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: persistence backed by Infinispan server
-            version: '0.12.0-rc1'
+            version: '0.12.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.12.0-rc1
+            name: quay.io/kiegroup/kogito-data-index:0.12.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0-rc1'
+        - name: '0.12.0'
           annotations:
             description: Runtime image for the Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.12.0-rc1'
+            version: '0.12.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.12.0-rc1
+            name: quay.io/kiegroup/kogito-jobs-service:0.12.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,16 +162,16 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0-rc1'
+        - name: '0.12.0'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '0.12.0-rc1'
+            version: '0.12.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:0.12.0-rc1
+            name: quay.io/kiegroup/kogito-management-console:0.12.0
 
diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index 91ab319bc7f..d4734f3b217 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 artifacts:
   - name: kogito-data-index-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200618.192711-319-runner.jar
-    md5: 48b84a0d84430d64681624b95dd0dd71
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service/0.12.0/data-index-service-0.12.0-runner.jar
+    md5: 386533a8cd26df6e4779b1a1f23e14c2
 
 execute:
   - script: configure
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index f3363258774..287feb7501c 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.12.0-rc1"
+version: "0.12.0"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
index 8bfb6a8ca16..e9987cc018f 100644
--- a/modules/kogito-infinispan-properties/module.yaml
+++ b/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index ef7f18b6fbd..4a252f0691a 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200618.192623-243-runner.jar
-    md5: f1b1ff887b00a4c3aeab0d58391628b5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/0.12.0/jobs-service-0.12.0-runner.jar
+    md5: 13c2fe9fe79453abe5b93d05390e494e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
index f305ee101a5..299f15a0d56 100644
--- a/modules/kogito-jq/module.yaml
+++ b/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 modules:
   install:
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index dcadd96e983..25032db37a0 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index 856d775e4b1..dfe63a1d911 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index e11f7033f3f..a196740c2eb 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index d2362f16d44..afeaa13051b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
@@ -8,8 +8,8 @@ envs:
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200618.192858-150-runner.jar
-    md5: 1c52ddf4d8be967a86ed3d7ee803eb74
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/0.12.0/management-console-0.12.0-runner.jar
+    md5: 3bc18385a43e0fb7ed2ed750877e3080
 
 execute:
   - script: configure
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index e43c3a6eb0b..5fe09206983 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 modules:
   install:
diff --git a/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-quarkus-jvm/module.yaml
index 454dfbeb32d..8011a888342 100644
--- a/modules/kogito-quarkus-jvm/module.yaml
+++ b/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
index a46ebbb6b23..46de9de89f6 100644
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ b/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "8.0.0-SNAPSHOT"
+    value: "0.12.0"
diff --git a/modules/kogito-quarkus/module.yaml b/modules/kogito-quarkus/module.yaml
index 076d9e1ac86..e8b5b3049af 100644
--- a/modules/kogito-quarkus/module.yaml
+++ b/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 40f386cca24..2c82a536dc7 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.12.0-rc1'
+version: '0.12.0'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
index c4f3b0252fb..962ff32ac4e 100644
--- a/modules/kogito-springboot-s2i/module.yaml
+++ b/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "8.0.0-SNAPSHOT"
+    value: "0.12.0"
diff --git a/modules/kogito-springboot/module.yaml b/modules/kogito-springboot/module.yaml
index 7b66e0ccbb2..bd683a04fff 100644
--- a/modules/kogito-springboot/module.yaml
+++ b/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 execute:
   - script: configure
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index e20bb1609af..4ac4f9c0fdc 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.12.0-rc1"
+version: "0.12.0"
 
 execute:
   - script: add-user
diff --git a/scripts/README.md b/scripts/README.md
index d5f5e085a50..be24c60baae 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -123,7 +123,7 @@ This script also accepts `--version` as argument in specifying the current versi
 
 ```bash
 $ python update-maven-information.py --version='8.0.0-SNAPSHOT'
-$ python update-maven-information.py --version='0.10.0'
+$ python update-maven-information.py --version='0.12.0'
 ```
 if no argument is given, it takes the default value of `8.0.0-SNAPSHOT`
 
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index b1944c67b09..20969ef6431 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 3221225472 |
@@ -21,7 +21,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.12.0
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 3221225472 |
@@ -40,7 +40,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.12.0
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -57,7 +57,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE       | false                     |
       | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG |
@@ -75,7 +75,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -90,7 +90,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
@@ -106,7 +106,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE            | false         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
@@ -122,7 +122,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
   # ignore until https://issues.redhat.com/browse/KOGITO-2003 is not fixed.
   @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE            | true          |
       | LIMIT_MEMORY      | 6442450944    |
@@ -137,7 +137,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
   Scenario: Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE            | false                            |
       | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
@@ -154,7 +154,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE            | true                             |
       | LIMIT_MEMORY      | 6442450944                       |
@@ -172,7 +172,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.12.0
       | variable | value |
       | NATIVE   | false |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
@@ -189,7 +189,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.12.0
       | variable | value |
       | NATIVE   | false |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -206,7 +206,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | ["hello","world"]     |
 
   Scenario: Perform a third incremental s2i build, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.12.0
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
@@ -247,7 +247,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE         | false          |
       | KOGITO_VERSION | 8.0.0-SNAPSHOT |
@@ -263,7 +263,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
@@ -280,7 +280,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE              | false          |
       | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 6d8435f67ab..3e9d2a756e3 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | JAVA_OPTIONS | -Ddebug=true |
     Then check that page is served
@@ -16,7 +16,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.12.0
       | variable | value |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -30,7 +30,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build /tmp/kogito-examples from process-springboot-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the custom port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build /tmp/kogito-examples from process-springboot-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value |
       | HTTP_PORT           | 9090  |
     Then check that page is served
@@ -56,7 +56,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And container log should contain Tomcat initialized with port(s): 9090 (http)
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | MAVEN_ARGS_APPEND | -Ppersistence |
     Then file /home/kogito/bin/process-springboot-example.jar should exist
@@ -67,7 +67,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | ARTIFACT_DIR      | process-springboot-example/target  |
@@ -83,7 +83,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using 0.12.0
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
@@ -96,7 +96,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using 0.12.0
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -121,7 +121,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index a2392632a2b..3d774812d2f 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -23,7 +23,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
 git fetch origin --tags
-git checkout master
+git checkout -b 0.12.0 0.12.0
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/

From 412f6e49795b19cf9ad153444dc10a69cf10151b Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 15 Jul 2020 11:38:41 -0300
Subject: [PATCH 156/709] [KOGITO-2634] - prepare for next release iteration.
 (#191)

Signed-off-by: spolti <fspolti@redhat.com>
---
 image.yaml                                    |  2 +-
 kogito-imagestream.yaml                       | 48 +++++++++----------
 modules/kogito-data-index/module.yaml         |  6 +--
 modules/kogito-image-dependencies/module.yaml |  2 +-
 .../kogito-infinispan-properties/module.yaml  |  2 +-
 modules/kogito-jobs-service/module.yaml       |  6 +--
 modules/kogito-jq/module.yaml                 |  2 +-
 modules/kogito-kubernetes-client/module.yaml  |  2 +-
 modules/kogito-launch-scripts/module.yaml     |  2 +-
 modules/kogito-logging/module.yaml            |  2 +-
 modules/kogito-management-console/module.yaml |  6 +--
 modules/kogito-persistence/module.yaml        |  2 +-
 modules/kogito-quarkus-jvm/module.yaml        |  2 +-
 modules/kogito-quarkus-s2i/module.yaml        |  4 +-
 modules/kogito-quarkus/module.yaml            |  2 +-
 modules/kogito-s2i-core/module.yaml           |  2 +-
 modules/kogito-springboot-s2i/module.yaml     |  4 +-
 modules/kogito-springboot/module.yaml         |  2 +-
 modules/kogito-system-user/module.yaml        |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  | 32 ++++++-------
 .../kogito-springboot-ubi8-s2i.feature        | 18 +++----
 tests/test-apps/clone-repo.sh                 |  2 +-
 22 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/image.yaml b/image.yaml
index 315e014afa2..d021cc1482b 100644
--- a/image.yaml
+++ b/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.12.0"
+version: "0.13.0-rc1"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 69beec40c11..c1691aa8f78 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0'
+        - name: '0.13.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.12.0'
+            version: '0.13.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.12.0
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.13.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0'
+        - name: '0.13.0-rc1'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.12.0'
+            version: '0.13.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.12.0
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.13.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0'
+        - name: '0.13.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.12.0'
+            version: '0.13.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.12.0
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.13.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0'
+        - name: '0.13.0-rc1'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.12.0'
+            version: '0.13.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.12.0
+            name: quay.io/kiegroup/kogito-springboot-ubi8:0.13.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0'
+        - name: '0.13.0-rc1'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.12.0'
+            version: '0.13.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.12.0
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.13.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0'
+        - name: '0.13.0-rc1'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: persistence backed by Infinispan server
-            version: '0.12.0'
+            version: '0.13.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.12.0
+            name: quay.io/kiegroup/kogito-data-index:0.13.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0'
+        - name: '0.13.0-rc1'
           annotations:
             description: Runtime image for the Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.12.0'
+            version: '0.13.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.12.0
+            name: quay.io/kiegroup/kogito-jobs-service:0.13.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,16 +162,16 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0'
+        - name: '0.13.0-rc1'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '0.12.0'
+            version: '0.13.0-rc1'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:0.12.0
+            name: quay.io/kiegroup/kogito-management-console:0.13.0-rc1
 
diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index d4734f3b217..e53f97deb79 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 artifacts:
   - name: kogito-data-index-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service/0.12.0/data-index-service-0.12.0-runner.jar
-    md5: 386533a8cd26df6e4779b1a1f23e14c2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200714.111547-364-runner.jar
+    md5: 00e3d54713261250dd566ecf6a084f54
 
 execute:
   - script: configure
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index 287feb7501c..fc043cbb69c 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.12.0"
+version: "0.13.0-rc1"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
index e9987cc018f..ee4be174d7a 100644
--- a/modules/kogito-infinispan-properties/module.yaml
+++ b/modules/kogito-infinispan-properties/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.infinispan.properties
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 envs:
   - name: "INFINISPAN_USEAUTH"
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 4a252f0691a..b4d7eefaa27 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/0.12.0/jobs-service-0.12.0-runner.jar
-    md5: 13c2fe9fe79453abe5b93d05390e494e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200714.111450-288-runner.jar
+    md5: ac5ec1f4203e5280c70c1cf78814bc4e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
index 299f15a0d56..566aa801771 100644
--- a/modules/kogito-jq/module.yaml
+++ b/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 modules:
   install:
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 25032db37a0..9030878156e 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index dfe63a1d911..20ab08b17fc 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index a196740c2eb..8112cf540fe 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index afeaa13051b..6f2fcbe111b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
@@ -8,8 +8,8 @@ envs:
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/0.12.0/management-console-0.12.0-runner.jar
-    md5: 3bc18385a43e0fb7ed2ed750877e3080
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200714.111829-195-runner.jar
+    md5: 7849f39587751eae60e3de6b6e655d50
 
 execute:
   - script: configure
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index 5fe09206983..ad44c13b96c 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 modules:
   install:
diff --git a/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-quarkus-jvm/module.yaml
index 8011a888342..28f892edfe6 100644
--- a/modules/kogito-quarkus-jvm/module.yaml
+++ b/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
index 46de9de89f6..6e6b3a32109 100644
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ b/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.12.0"
+    value: "8.0.0-SNAPSHOT"
diff --git a/modules/kogito-quarkus/module.yaml b/modules/kogito-quarkus/module.yaml
index e8b5b3049af..5e129650f95 100644
--- a/modules/kogito-quarkus/module.yaml
+++ b/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 2c82a536dc7..15009e3ed21 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.12.0'
+version: '0.13.0-rc1'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
index 962ff32ac4e..3079d209cae 100644
--- a/modules/kogito-springboot-s2i/module.yaml
+++ b/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "0.12.0"
+    value: "8.0.0-SNAPSHOT"
diff --git a/modules/kogito-springboot/module.yaml b/modules/kogito-springboot/module.yaml
index bd683a04fff..65b2bb45f8f 100644
--- a/modules/kogito-springboot/module.yaml
+++ b/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 execute:
   - script: configure
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index 4ac4f9c0fdc..39d0bb06b40 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.12.0"
+version: "0.13.0-rc1"
 
 execute:
   - script: add-user
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 20969ef6431..b1944c67b09 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 3221225472 |
@@ -21,7 +21,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.12.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 3221225472 |
@@ -40,7 +40,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain -J-Xmx2576980377
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.12.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -57,7 +57,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE       | false                     |
       | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG |
@@ -75,7 +75,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE   | false |
     Then check that page is served
@@ -90,7 +90,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
@@ -106,7 +106,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE            | false         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
@@ -122,7 +122,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
   # ignore until https://issues.redhat.com/browse/KOGITO-2003 is not fixed.
   @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE            | true          |
       | LIMIT_MEMORY      | 6442450944    |
@@ -137,7 +137,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
   Scenario: Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE            | false                            |
       | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
@@ -154,7 +154,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE            | true                             |
       | LIMIT_MEMORY      | 6442450944                       |
@@ -172,7 +172,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
   Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.12.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
       | variable | value |
       | NATIVE   | false |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
@@ -189,7 +189,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.12.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
       | variable | value |
       | NATIVE   | false |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -206,7 +206,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | ["hello","world"]     |
 
   Scenario: Perform a third incremental s2i build, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using 0.12.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
       | variable | value |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
@@ -247,7 +247,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE         | false          |
       | KOGITO_VERSION | 8.0.0-SNAPSHOT |
@@ -263,7 +263,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
@@ -280,7 +280,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE              | false          |
       | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 3e9d2a756e3..6d8435f67ab 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -2,7 +2,7 @@
 Feature: kogito-springboot-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | JAVA_OPTIONS | -Ddebug=true |
     Then check that page is served
@@ -16,7 +16,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.12.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
       | variable | value |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
@@ -30,7 +30,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
 
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the custom port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable            | value |
       | HTTP_PORT           | 9090  |
     Then check that page is served
@@ -56,7 +56,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And container log should contain Tomcat initialized with port(s): 9090 (http)
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | MAVEN_ARGS_APPEND | -Ppersistence |
     Then file /home/kogito/bin/process-springboot-example.jar should exist
@@ -67,7 +67,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | ARTIFACT_DIR      | process-springboot-example/target  |
@@ -83,7 +83,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using 0.12.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
@@ -96,7 +96,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using 0.12.0
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -121,7 +121,7 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using 0.12.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
       | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 3d774812d2f..a2392632a2b 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -23,7 +23,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
 git fetch origin --tags
-git checkout -b 0.12.0 0.12.0
+git checkout master
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/

From a8eaba3707c51b4b181ed7f010e05b38b579b957 Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Fri, 17 Jul 2020 15:55:27 +0530
Subject: [PATCH 157/709] [KOGITO-2543] - Maven downloading process output not
 turned off for archetype generation (#187)

---
 modules/kogito-s2i-core/added/s2i-core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 1a6e068ff06..e62f1a500de 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -143,7 +143,7 @@ function build_kogito_app() {
         log_info "---> Generating $RUNTIME_TYPE project structure..."
         $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=$ARCHETYPE_ARTIFACT_ID \
         -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
-        -s $KOGITO_HOME/.m2/settings.xml
+        ${MAVEN_ARGS_APPEND} -s $KOGITO_HOME/.m2/settings.xml
 
         # copy resources into the generated project
         for item in *

From 0c32a0bf73327db8c9e1b0530c227a5045dd13ec Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 20 Jul 2020 12:03:36 +0200
Subject: [PATCH 158/709] KOGITO-2799 Harmonize Jenkinfiles (#192)

---
 Jenkinsfile | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 794de525843..ff46339ee92 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,17 +25,16 @@ pipeline{
         stage('Initialization'){
             steps{
                 script{
-                    cleanWorkspaces()                    
+                    clean()
                     
                     // Set the mirror url only if exist
                     if (env.MAVEN_MIRROR_REPOSITORY != null
                             && env.MAVEN_MIRROR_REPOSITORY != ''){
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
                     }
+
                     githubscm.checkoutIfExists('kogito-images', changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
                 }
-                sh "docker rm -f \$(docker ps -a -q) || date"
-                sh "docker rmi -f \$(docker images -q) || date"
             }
         }
         stage('Validate CeKit Image and Modules descriptors'){
@@ -68,15 +67,14 @@ pipeline{
             steps{
                 script {
                     build_stages = [:]
-                    IMAGES.each{ image -> build_stages["${image}"] = {
-                            createWorkspace("$image")
-                            copyWorkspace("$image")
-                            dir(getWorkspacePath("$image")){
+                    IMAGES.each{ image -> build_stages[image] = {
+                            initWorkspace(image)
+                            dir(getWorkspacePath(image)){
                                 try{
-                                    sh "make ${image}"
+                                    sh "make ${image} cekit_option='--work-dir .'"
                                 }
                                 finally{
-                                    junit 'target/test/results/*.xml'
+                                    junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
                                 }
                             
                             }
@@ -86,35 +84,43 @@ pipeline{
                 }
             }
         }
-        stage('Finishing'){
-            steps{
-                sh "docker rmi -f \$(docker images -q) || date"
-            }
-        }
     }
     post{
         always{
             script{
-                cleanWorkspaces()
+                clean()
             }
         }
     }
 }
 
+void clean() {
+    cleanWorkspaces()
+    cleanImages()
 
+    // Clean Cekit cache, in case we reuse an old node
+    sh "rm -rf \$HOME/.cekit/cache"
+}
 
-void  createWorkspace(String image){
-    sh "mkdir -p ${getWorkspacePath(image)}"
+void cleanImages(){
+    sh "docker rm -f \$(docker ps -a -q) || date"
+    sh "docker rmi -f \$(docker images -q) || date"
 }
-void copyWorkspace(String image){
+
+
+void initWorkspace(String image){
+    sh "mkdir -p ${getWorkspacePath(image)}"
     sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
 }
+
 void cleanWorkspaces(){
     sh "rm -rf ${getWorkspacesPath()}"
 }
+
 String getWorkspacesPath(){
     return "${WORKSPACE}/workspaces"
 }
+
 String getWorkspacePath(String image){
     return "${getWorkspacesPath()}/${image}"
 }
\ No newline at end of file

From 22ff849470d0015728f300273896bf78e925c93f Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Fri, 24 Jul 2020 12:20:50 +0200
Subject: [PATCH 159/709] KOGITO-2812 - add explainability image (#193)

* add explainability image

* update pipeline
---
 .github/workflows/run-bats-tests.yml          |  5 +++
 Jenkinsfile                                   |  2 +
 Jenkinsfile-Nightly                           |  4 ++
 Jenkinsfile.deploy                            |  3 ++
 Jenkinsfile.promote                           |  1 +
 Makefile                                      | 18 +++++++-
 README.md                                     | 25 +++++++++++
 kogito-explainability-overrides.yaml          | 42 +++++++++++++++++++
 .../added/kogito-app-launch.sh                | 25 +++++++++++
 .../added/launch/kogito-explainability.sh     | 17 ++++++++
 modules/kogito-explainability/configure       | 16 +++++++
 modules/kogito-explainability/module.yaml     | 12 ++++++
 .../tests/bats/kogito-explainability.bats     | 30 +++++++++++++
 scripts/common.py                             |  2 +-
 scripts/push-local-registry.sh                |  2 +-
 scripts/push-staging.py                       |  1 +
 scripts/update-maven-information.py           |  1 +
 tests/features/kogito-explainability.feature  | 29 +++++++++++++
 18 files changed, 232 insertions(+), 3 deletions(-)
 create mode 100644 kogito-explainability-overrides.yaml
 create mode 100644 modules/kogito-explainability/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-explainability/added/launch/kogito-explainability.sh
 create mode 100644 modules/kogito-explainability/configure
 create mode 100644 modules/kogito-explainability/module.yaml
 create mode 100644 modules/kogito-explainability/tests/bats/kogito-explainability.bats
 create mode 100644 tests/features/kogito-explainability.feature

diff --git a/.github/workflows/run-bats-tests.yml b/.github/workflows/run-bats-tests.yml
index a55c3a38dc4..cc5777981d0 100644
--- a/.github/workflows/run-bats-tests.yml
+++ b/.github/workflows/run-bats-tests.yml
@@ -22,6 +22,11 @@ jobs:
         run: |
           $HOME/bin/bats modules/kogito-data-index/tests/bats
 
+      - name: run kogito-explainability tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats modules/kogito-explainability/tests/bats
+
       - name: run kogito-graalvm-scripts tests
         working-directory: ${{ github.workspace }}
         run: |
diff --git a/Jenkinsfile b/Jenkinsfile
index ff46339ee92..54095fc2e8d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,6 +10,7 @@ IMAGES = ["kogito-quarkus-ubi8",
             "kogito-springboot-ubi8",
             "kogito-springboot-ubi8-s2i",
             "kogito-data-index",
+            "kogito-explainability",
             "kogito-jobs-service",
             "kogito-management-console"]
 
@@ -48,6 +49,7 @@ pipeline{
                 sh """
                     ./cekit-image-validator-runner image.yaml
                     ./cekit-image-validator-runner kogito-data-index-overrides.yaml
+                    ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
index 5e3b7f01b4d..8f7bf02cd9c 100644
--- a/Jenkinsfile-Nightly
+++ b/Jenkinsfile-Nightly
@@ -8,6 +8,7 @@ IMAGES = ["kogito-quarkus-ubi8",
             "kogito-springboot-ubi8",
             "kogito-springboot-ubi8-s2i",
             "kogito-data-index",
+            "kogito-explainability",
             "kogito-jobs-service",
             "kogito-management-console"]
 
@@ -46,6 +47,7 @@ pipeline{
                 sh """
                     ./cekit-image-validator-runner image.yaml
                     ./cekit-image-validator-runner kogito-data-index-overrides.yaml
+                    ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
@@ -97,6 +99,7 @@ pipeline{
                 docker tag quay.io/kiegroup/kogito-springboot-ubi8:latest                 quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest             quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-data-index:latest                      quay.io/kiegroup/kogito-data-index-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                docker tag quay.io/kiegroup/kogito-explainability:latest                  quay.io/kiegroup/kogito-explainability-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-jobs-service:latest                    quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-management-console:latest              quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
 	        """
@@ -112,6 +115,7 @@ pipeline{
                         docker push quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                         docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                         docker push quay.io/kiegroup/kogito-data-index-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                        docker push quay.io/kiegroup/kogito-explainability-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                         docker push quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                         docker push quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                        """
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index ee29ce8aa8f..1a25a6e9139 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -9,6 +9,7 @@ IMAGES = [
             "kogito-springboot-ubi8",
             "kogito-springboot-ubi8-s2i",
             "kogito-data-index",
+            "kogito-explainability",
             "kogito-jobs-service",
             "kogito-management-console"
          ]
@@ -84,6 +85,7 @@ pipeline {
 
                     // Debug purpose in case of issue
                     sh "cat modules/kogito-data-index/module.yaml"
+                    sh "cat modules/kogito-explainability/module.yaml"
                     sh "cat modules/kogito-jobs-service/module.yaml"
                     sh "cat modules/kogito-management-console/module.yaml"
                 }
@@ -118,6 +120,7 @@ pipeline {
                 sh """
                     ./cekit-image-validator-runner image.yaml
                     ./cekit-image-validator-runner kogito-data-index-overrides.yaml
+                    ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index e2a32b6c39b..a0151d03254 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -6,6 +6,7 @@ IMAGES = ["kogito-quarkus-ubi8",
                     "kogito-springboot-ubi8",
                     "kogito-springboot-ubi8-s2i",
                     "kogito-data-index",
+                    "kogito-explainability",
                     "kogito-jobs-service",
                     "kogito-management-console"]
 
diff --git a/Makefile b/Makefile
index 433ec754364..4eee222f520 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ CEKIT_CMD := cekit -v ${cekit_option}
 # Build all images
 .PHONY: build
 # start to build the images
-build: clone-repos kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-jobs-service kogito-management-console
+build: clone-repos kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-jobs-service kogito-management-console
 
 clone-repos:
 # if the NO_TEST env defined, proceed with the tests, as first step prepare the repo to be used
@@ -93,6 +93,19 @@ ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-explainability image
+kogito-explainability:
+ifneq ($(ignore_build),true)
+	${CEKIT_CMD} build --overrides-file kogito-explainability-overrides.yaml ${BUILD_ENGINE}
+endif
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
+	${CEKIT_CMD} test --overrides-file kogito-explainability-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-explainability:${IMAGE_VERSION} quay.io/kiegroup/kogito-explainability:${SHORTENED_LATEST_VERSION}
+endif
+
 # build the quay.io/kiegroup/kogito-jobs-service image
 kogito-jobs-service:
 ifneq ($(ignore_build),true)
@@ -136,6 +149,8 @@ _push:
 	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest
 	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-data-index:latest
+	docker push quay.io/kiegroup/kogito-explainability:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-explainability:latest
 	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-jobs-service:latest
 	docker push quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION}
@@ -148,6 +163,7 @@ ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	docker push quay.io/kiegroup/kogito-springboot-ubi8:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-explainability:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
 endif
diff --git a/README.md b/README.md
index e45384c109e..7892c00d960 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ Table of Contents
         - [Kogito Spring Boot Runtime Image example](#kogito-spring-boot-runtime-image-example)
   - [Kogito Component Images](#kogito-component-images)
     - [Kogito Data Index Component Image](#kogito-data-index-component-image)
+    - [Kogito Explainability Component Image](#kogito-explainability-component-image)
     - [Kogito Jobs Service Component Image](#kogito-jobs-service-component-image)
     - [Kogito Management Console Component Image](#kogito-management-console-component-image)
   - [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift)
@@ -565,6 +566,7 @@ by providing extra capabilities, like managing the processes on a web UI or prov
 Today we have 3 Kogito Component Images:
 
 * [quay.io/kiegroup/kogito-data-index](https://quay.io/kiegroup/kogito-data-index)
+* [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
 * [quay.io/kiegroup/kogito-jobs-service](htps://quay.io/kiegroup/kogito-jobs-service)
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
 
@@ -593,6 +595,26 @@ To know what configurations this image accepts please take a look [here](kogito-
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Data Index Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
+### Kogito Explainability Component Image
+
+The Explainability Service aims to provide explainability on the decisions that have been taken by kogito runtime applications. 
+
+Basic usage
+```bash
+$ docker run -it quay.io/kiegroup/kogito-explainability:latest
+```
+
+To enable debug just use this env while running this image:
+
+```bash
+docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-explainability:latest
+```
+You should notice a few debug messages being printed in the system output.
+
+To know what configurations this image accepts please take a look [here](kogito-explainability-overrides.yaml) on the **envs** section.
+
+The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Explainability Service 
+to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
 ### Kogito Jobs Service Component Image
 
@@ -869,6 +891,7 @@ With this Makefile you can:
      $ make kogito-springboot-ubi8 
      $ make kogito-springboot-ubi8-s2i
      $ make kogito-data-index
+     $ make kogito-explainability
      $ make kogito-jobs-service 
      $ make kogito-management-console
      ```
@@ -917,6 +940,7 @@ To better understand the CeKit Modules, please visit this [link](https://docs.ce
 Below you can find all modules used to build the Kogito Images
 
 - [kogito-data-index](modules/kogito-data-index): Installs and Configure the data-index jar inside the image.
+- [kogito-explainability](modules/kogito-explainability): Installs and Configure the explainability jar inside the image.
 - [kogito-epel](modules/kogito-epel): Configures the epel repository on the target image.
 - [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image.
 - [kogito-graalvm-scripts](modules/kogito-graalvm-scripts): Configures the GraalVM on the target image and provides custom configuration script. 
@@ -943,6 +967,7 @@ For each image, we use a specific *-overrides.yaml file which will specific the
 Please inspect the images overrides files to learn which modules are being installed:
 
 - [quay.io/kiegroup/kogito-data-index](kogito-data-index-overrides.yaml)
+- [quay.io/kiegroup/kogito-explainability](kogito-explainability-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service](kogito-jobs-service-overrides.yaml)
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
 - [quay.io/kiegroup/kogito-quarkus-jvm-ubi8](kogito-quarkus-jvm-overrides.yaml)
diff --git a/kogito-explainability-overrides.yaml b/kogito-explainability-overrides.yaml
new file mode 100644
index 00000000000..23dfb30c7a7
--- /dev/null
+++ b/kogito-explainability-overrides.yaml
@@ -0,0 +1,42 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-explainability"
+description: "Runtime image for Kogito Explainability Service"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Explainability Service"
+- name: "io.k8s.display-name"
+  value: "Kogito Explainability Service"
+- name: "io.openshift.tags"
+  value: "kogito,explainability"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "HTTP_PORT"
+    example: "9090"
+    description: "Defines which port the Explainability Container Image will listen on."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.explainability
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..e8a3e93974a
--- /dev/null
+++ b/modules/kogito-explainability/added/kogito-app-launch.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+fi
+
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-explainability.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} \
+        -Djava.library.path=$KOGITO_HOME/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -jar $KOGITO_HOME/bin/kogito-explainability-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-explainability/added/launch/kogito-explainability.sh b/modules/kogito-explainability/added/launch/kogito-explainability.sh
new file mode 100644
index 00000000000..8ef93b07e47
--- /dev/null
+++ b/modules/kogito-explainability/added/launch/kogito-explainability.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+}
+
+function configure() {
+    configure_explainability_http_port
+}
+
+function configure_explainability_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_EXPLAINABILITY_PROPS="${KOGITO_EXPLAINABILITY_PROPS} -Dquarkus.http.port=${httpPort}"
+}
+
diff --git a/modules/kogito-explainability/configure b/modules/kogito-explainability/configure
new file mode 100644
index 00000000000..bc7c802d127
--- /dev/null
+++ b/modules/kogito-explainability/configure
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+cp -v ${SOURCES_DIR}/kogito-explainability-runner.jar ${KOGITO_HOME}/bin/
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
+cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
new file mode 100644
index 00000000000..e7988c172e1
--- /dev/null
+++ b/modules/kogito-explainability/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.explainability
+version: "0.13.0-rc1"
+
+artifacts:
+  - name: kogito-explainability-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service/8.0.0-SNAPSHOT/explainability-service-8.0.0-20200720.112616-115-runner.jar
+    md5: a85ebcc521ef22d5f9372f43cf2de5cf
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-explainability/tests/bats/kogito-explainability.bats b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
new file mode 100644
index 00000000000..84af508864a
--- /dev/null
+++ b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
@@ -0,0 +1,30 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME=$KOGITO_HOME
+mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-explainability.sh
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+}
+
+
+@test "http port configuration default value" {
+    configure_explainability_http_port
+    expected=" -Dquarkus.http.port=8080"
+    echo "Result is ${KOGITO_EXPLAINABILITY_PROPS} and expected is ${expected}"
+    [ "${KOGITO_EXPLAINABILITY_PROPS}" = "${expected}" ]
+}
+
+@test "http port configuration custom value" {
+    export HTTP_PORT="9090"
+    configure_explainability_http_port
+    expected=" -Dquarkus.http.port=9090"
+    echo "Result is ${KOGITO_EXPLAINABILITY_PROPS} and expected is ${expected}"
+    [ "${KOGITO_EXPLAINABILITY_PROPS}" = "${expected}" ]
+}
+
diff --git a/scripts/common.py b/scripts/common.py
index 152ffe56b98..47b1d092ebf 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -8,7 +8,7 @@
 from ruamel.yaml import YAML
 
 # All kogito-image modules that have the kogito version.
-MODULES = {"kogito-data-index", "kogito-image-dependencies",
+MODULES = {"kogito-data-index", "kogito-explainability", "kogito-image-dependencies",
            "kogito-infinispan-properties", "kogito-jobs-service",
            "kogito-jq", "kogito-kubernetes-client",
            "kogito-launch-scripts", "kogito-logging",
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index dc38146fa22..3b748cfdbed 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -4,7 +4,7 @@
 BUILD_ENGINE="docker"
 
 # All Kogito images
-IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-jobs-service kogito-management-console"
+IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-jobs-service kogito-management-console"
 
 registry=${REGISTRY:-{1}}
 version=${2:-latest}
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 8dfd466c5ec..58081a5b337 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -18,6 +18,7 @@
 # All Kogito images
 IMAGES = ["kogito-quarkus-ubi8", "kogito-quarkus-jvm-ubi8", "kogito-quarkus-ubi8-s2i",
           "kogito-springboot-ubi8", "kogito-springboot-ubi8-s2i", "kogito-data-index",
+          "kogito-explainability",
           "kogito-jobs-service", "kogito-management-console"]
 
 IMAGES_NEXT_RC_TAG = []
diff --git a/scripts/update-maven-information.py b/scripts/update-maven-information.py
index 7145b7dc727..2fcbdc92651 100644
--- a/scripts/update-maven-information.py
+++ b/scripts/update-maven-information.py
@@ -27,6 +27,7 @@
     #service-name: module-name(directory in which module's module.yaml file is present)
     #Note: Service name should be same as given in the repository
     "data-index-service": "kogito-data-index",
+    "explainability-service": "kogito-explainability",
     "jobs-service": "kogito-jobs-service",
     "management-console": "kogito-management-console"
 }
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
new file mode 100644
index 00000000000..9334525f72e
--- /dev/null
+++ b/tests/features/kogito-explainability.feature
@@ -0,0 +1,29 @@
+@quay.io/kiegroup/kogito-explainability
+Feature: Kogito-explainability feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Explainability Service
+    And the image should contain label io.k8s.display-name with value Kogito Explainability Service
+    And the image should contain label io.openshift.tags with value kogito,explainability
+
+  Scenario: verify if the binary index is available on /home/kogito
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/kogito-explainability-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-explainability-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and test default http port
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-runner.jar
\ No newline at end of file

From b4c202559a6c0ce862f72b18e41c0dd4bac6616e Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Fri, 24 Jul 2020 19:21:01 +0530
Subject: [PATCH 160/709] =?UTF-8?q?[KOGITO-2046]=20-=20Remove=20"infinispa?=
 =?UTF-8?q?n=20properties=20module"=20from=20Data=20Index=E2=80=A6=20(#189?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/run-bats-tests.yml          |   5 -
 README.md                                     |   1 -
 kogito-data-index-overrides.yaml              |   4 -
 kogito-jobs-service-overrides.yaml            |   4 -
 .../added/kogito-app-launch.sh                |   5 +-
 .../tests/bats/kogito-data-index.bats         |   2 -
 .../added/kogito-infinispan-properties.sh     |  42 -------
 .../kogito-infinispan-properties/configure    |  10 --
 .../kogito-infinispan-properties/module.yaml  |  23 ----
 .../bats/kogito-infinispan-properties.bats    | 104 ------------------
 .../added/kogito-app-launch.sh                |   6 +-
 .../added/launch/kogito-jobs-service.sh       |  10 +-
 .../tests/bats/kogito-jobs-service.bats       |  14 +--
 scripts/common.py                             |   2 +-
 tests/features/kogito-data-index.feature      |  57 +++-------
 tests/features/kogito-jobs-service.feature    |  76 ++++---------
 16 files changed, 46 insertions(+), 319 deletions(-)
 delete mode 100755 modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
 delete mode 100644 modules/kogito-infinispan-properties/configure
 delete mode 100644 modules/kogito-infinispan-properties/module.yaml
 delete mode 100644 modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats

diff --git a/.github/workflows/run-bats-tests.yml b/.github/workflows/run-bats-tests.yml
index cc5777981d0..09b5e6459af 100644
--- a/.github/workflows/run-bats-tests.yml
+++ b/.github/workflows/run-bats-tests.yml
@@ -32,11 +32,6 @@ jobs:
         run: |
           $HOME/bin/bats modules/kogito-graalvm-scripts/tests/bats
 
-      - name: run kogito-infinispan-properties tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-infinispan-properties/tests/bats
-
       - name: run kogito-jobs-service tests
         working-directory: ${{ github.workspace }}
         run: |
diff --git a/README.md b/README.md
index 7892c00d960..611f1fd1333 100644
--- a/README.md
+++ b/README.md
@@ -945,7 +945,6 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image.
 - [kogito-graalvm-scripts](modules/kogito-graalvm-scripts): Configures the GraalVM on the target image and provides custom configuration script. 
 - [kogito-image-dependencies](modules/kogito-image-dependencies): Installs rpm packages on the target image. Contains common dependencies for Kogito Images.
-- [kogito-infinispan-properties](modules/kogito-infinispan-properties): Provides Infinispan custom script to configure Infinispan properties during image startup.
 - [kogito-jobs-service](modules/kogito-jobs-service): Installs and Configure the jobs-service jar inside the image
 - [kogito-jq](modules/kogito-jq): Provides jq binary.
 - [kogito-kubernetes-client](modules/kogito-kubernetes-client): Provides a simple wrapper to interact with Kubernetes API.
diff --git a/kogito-data-index-overrides.yaml b/kogito-data-index-overrides.yaml
index 96234730d33..bec8d9814c0 100644
--- a/kogito-data-index-overrides.yaml
+++ b/kogito-data-index-overrides.yaml
@@ -20,9 +20,6 @@ envs:
   - name: "HTTP_PORT"
     example: "9090"
     description: "Defines which port the Data Index Container Image will listen on."
-  - name: "QUARKUS_INFINISPAN_CLIENT_SERVER_LIST"
-    example: "localhost:11222"
-    description: "Defines the Infinispan Server address, multiple values comma separated. If empty defaults to localhost:11222"
 
 ports:
 - value: 8080
@@ -35,7 +32,6 @@ modules:
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.infinispan.properties
   - name: org.kie.kogito.dataindex
 
 run:
diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index 28a7718d909..fb78d66a931 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -20,9 +20,6 @@ envs:
 - name: "ENABLE_PERSISTENCE"
   example: "true"
   description: "By default the Jobs services runs on memory only, if persistence is needed then set it to true. (Sets the property kogito.jobs-service.persistence to infinispan)."
-- name: "INFINISPAN_CLIENT_SERVER_LIST"
-  example: "localhost:11222,localhost:11223"
-  description: "Required when persisted is enabled. (Sets the property quarkus.infinispan-client.server-list)."
 - name: "MAX_INTERVAL_LIMIT_RETRY"
   example: "60000"
   description: "Maximum interval in milliseconds when retrying to execute jobs, in case of failures, defaults to 60000ms. (Sets the property kogito.jobs-service.maxIntervalLimitToRetryMillis)."
@@ -50,7 +47,6 @@ modules:
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.infinispan.properties
   - name: org.kie.kogito.jobs.service
 
 run:
diff --git a/modules/kogito-data-index/added/kogito-app-launch.sh b/modules/kogito-data-index/added/kogito-app-launch.sh
index 28e7de9c423..3fc12279364 100644
--- a/modules/kogito-data-index/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index/added/kogito-app-launch.sh
@@ -14,13 +14,14 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
   ${KOGITO_HOME}/launch/kogito-data-index.sh
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${INFINISPAN_PROPERTIES} ${KOGITO_DATA_INDEX_PROPS} \
+printenv
+
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -jar $KOGITO_HOME/bin/kogito-data-index-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
index 1dcc591d0bf..300daed6e6d 100644
--- a/modules/kogito-data-index/tests/bats/kogito-data-index.bats
+++ b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
@@ -3,11 +3,9 @@
 export KOGITO_HOME=/tmp/kogito
 export HOME=$KOGITO_HOME
 mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-infinispan-properties/added/kogito-infinispan-properties.sh ${KOGITO_HOME}/launch/
 cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
 
 # imports
-load ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-data-index.sh
 
 teardown() {
diff --git a/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh b/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
deleted file mode 100755
index 2b7baa0b099..00000000000
--- a/modules/kogito-infinispan-properties/added/kogito-infinispan-properties.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash -e
-
-#import
-source ${KOGITO_HOME}/launch/logging.sh
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset INFINISPAN_AUTHREALM
-    unset INFINISPAN_PASSWORD
-    unset INFINISPAN_SASLMECHANISM
-    unset INFINISPAN_USEAUTH
-    unset INFINISPAN_USERNAME
-}
-
-function configure() {
-    configure_infinispan_props
-}
-
-
-# see https://quarkus.io/guides/infinispan-client-guide#quarkus-infinispan-client_configuration
-function configure_infinispan_props() {
-    local infinispan_props=""
-
-    if [[ "${INFINISPAN_USEAUTH}" == "true" ]] && [[ -z "${INFINISPAN_USERNAME}"  || -z "${INFINISPAN_PASSWORD}" ]]; then
-        log_error "Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
-        exit 1
-    fi
-
-    # default to false if empty or any value different than true or false.
-    if  [ -z "${INFINISPAN_USEAUTH}" ] || [[ ! ${INFINISPAN_USEAUTH^^} =~ FALSE$|TRUE$ ]]; then
-        INFINISPAN_USEAUTH="false"
-    fi
-
-    if [ ! -z "${INFINISPAN_USERNAME}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-username=${INFINISPAN_USERNAME}"); INFINISPAN_USEAUTH="true"; fi
-    if [ ! -z "${INFINISPAN_PASSWORD}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-password=${INFINISPAN_PASSWORD}"); fi
-    if [ ! -z "${INFINISPAN_USEAUTH}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.use-auth=${INFINISPAN_USEAUTH}"); fi
-    if [ ! -z "${INFINISPAN_AUTHREALM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.auth-realm=${INFINISPAN_AUTHREALM}"); fi
-    if [ ! -z "${INFINISPAN_SASLMECHANISM}" ]; then infinispan_props=$(echo "${infinispan_props} -Dquarkus.infinispan-client.sasl-mechanism=${INFINISPAN_SASLMECHANISM}"); fi
-
-    INFINISPAN_PROPERTIES="${infinispan_props}"
-}
-
diff --git a/modules/kogito-infinispan-properties/configure b/modules/kogito-infinispan-properties/configure
deleted file mode 100644
index 549fdac3cd6..00000000000
--- a/modules/kogito-infinispan-properties/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-
-cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch
-
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
diff --git a/modules/kogito-infinispan-properties/module.yaml b/modules/kogito-infinispan-properties/module.yaml
deleted file mode 100644
index ee4be174d7a..00000000000
--- a/modules/kogito-infinispan-properties/module.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.infinispan.properties
-version: "0.13.0-rc1"
-
-envs:
-  - name: "INFINISPAN_USEAUTH"
-    example: "false"
-    description: "Flag that signals to Infinispan Hotrod client to use authentication (Used to set the infinispan.client.hotrod.use_auth system property). Defaults to false"
-  - name: "INFINISPAN_USERNAME"
-    example: "myUsername"
-    description: "Username for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_username system property)"
-  - name: "INFINISPAN_PASSWORD"
-    example: "myPassword"
-    description: "Password for the user credential used by the Hotrod client (Used to set the infinispan.client.hotrod.auth_password system property)"
-  - name: "INFINISPAN_AUTHREALM"
-    example: ""
-    description: "Infinispan authentication realm (Used to set the infinispan.client.hotrod.auth_realm system property)"
-  - name: "INFINISPAN_SASLMECHANISM"
-    example: ""
-    description: "Sasl mechanism to use during authentication. Example: PLAIN (Used to set the infinispan.client.hotrod.sasl_mechanism system property)"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats b/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
deleted file mode 100644
index e9b11846fe9..00000000000
--- a/modules/kogito-infinispan-properties/tests/bats/kogito-infinispan-properties.bats
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env bats
-
-export TEST=true
-export KOGITO_HOME=/tmp/kogito
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
-
-# import
-load $BATS_TEST_DIRNAME/../../added/kogito-infinispan-properties.sh
-
-function setup(){
-  function log_error() { echo "ERROR ${1}"; }
-}
-
-function clear_vars() {
-    unset INFINISPAN_USEAUTH
-    unset INFINISPAN_USERNAME
-    unset INFINISPAN_PASSWORD
-    unset INFINISPAN_AUTHREALM
-    unset INFINISPAN_SASLMECHANISM
-}
-
-@test "check if infinispan properties is blank" {
-    clear_vars
-    local expected=" -Dquarkus.infinispan-client.use-auth=false"
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "check if infinispan auth is false" {
-    clear_vars
-    export INFINISPAN_USEAUTH="false"
-    local expected=" -Dquarkus.infinispan-client.use-auth=false"
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "check if infinispan has auth props" {
-    clear_vars
-    export INFINISPAN_USERNAME="developer"
-    export INFINISPAN_USEAUTH="true"
-    export INFINISPAN_PASSWORD="developer"
-    export INFINISPAN_AUTHREALM="default"
-    export INFINISPAN_SASLMECHANISM="PLAIN"
-
-    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.auth-password=developer -Dquarkus.infinispan-client.use-auth=true -Dquarkus.infinispan-client.auth-realm=default -Dquarkus.infinispan-client.sasl-mechanism=PLAIN"
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "setting username, useauth is true" {
-    clear_vars
-    export INFINISPAN_USERNAME="developer"
-    export INFINISPAN_USEAUTH="false"
-    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
-
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "when use auth is set to nonsense and no credentials" {
-    clear_vars
-    export INFINISPAN_USEAUTH="dsadsadasdsa"
-    local expected=" -Dquarkus.infinispan-client.use-auth=false"
-
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "when use auth is set to nonsense and has credentials" {
-    clear_vars
-    export INFINISPAN_USEAUTH="dsadsadasdsa"
-    export INFINISPAN_USERNAME="developer"
-    local expected=" -Dquarkus.infinispan-client.auth-username=developer -Dquarkus.infinispan-client.use-auth=true"
-
-    configure_infinispan_props
-
-    echo "Result is ${INFINISPAN_PROPERTIES} and expected is ${expected}" >&2
-    [ "${expected}" = "${INFINISPAN_PROPERTIES}" ]
-}
-
-@test "when use auth is set to true and no credentials" {
-    clear_vars
-    export INFINISPAN_USEAUTH="true"
-
-    run configure_infinispan_props
-
-    expected="ERROR Flag INFINISPAN_USEAUTH set to true, but no username or password informed. Please use INFINISPAN_USERNAME and INFINISPAN_PASSWORD variables to set the right credentials."
-    echo "Result is ${output} and expected is ${expected}"
-    echo "Expected status is 1, outcome status is ${status}"
-    [ "$status" -eq 1 ]
-    [ "${output}" = "${expected}" ]
-}
-
diff --git a/modules/kogito-jobs-service/added/kogito-app-launch.sh b/modules/kogito-jobs-service/added/kogito-app-launch.sh
index eea5f4bcfb9..bc9529f6ad3 100644
--- a/modules/kogito-jobs-service/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service/added/kogito-app-launch.sh
@@ -14,12 +14,12 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
   ${KOGITO_HOME}/launch/kogito-jobs-service.sh
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${INFINISPAN_PROPERTIES} \
-    -jar $KOGITO_HOME/bin/kogito-jobs-service-runner.jar
+printenv
 
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} \
+    -jar $KOGITO_HOME/bin/kogito-jobs-service-runner.jar
diff --git a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
index 57c23e2b275..c5c7842e8a8 100644
--- a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
+++ b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
@@ -5,7 +5,6 @@ function prepareEnv() {
     unset BACKOFF_RETRY
     unset ENABLE_PERSISTENCE
     unset HTTP_PORT
-    unset INFINISPAN_CLIENT_SERVER_LIST
     unset MAX_INTERVAL_LIMIT_RETRY
 }
 
@@ -17,14 +16,7 @@ function configure() {
 
 function configure_jobs_service() {
     if [ "${ENABLE_PERSISTENCE^^}" == "TRUE" ]; then
-
-        if [ "${INFINISPAN_CLIENT_SERVER_LIST}x" = "x" ]; then
-            echo "INFINISPAN_CLIENT_SERVER_LIST env not found, please set it."
-            exit 1
-        else
-            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.persistence=infinispan"
-            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.infinispan-client.server-list=${INFINISPAN_CLIENT_SERVER_LIST}"
-        fi
+       KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.persistence=infinispan"
     fi
 
     if [ "${BACKOFF_RETRY}x" != "x" ]; then
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index 1afe459bd85..d1168102120 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -3,27 +3,16 @@
 export KOGITO_HOME=/tmp/kogito
 export HOME=$KOGITO_HOME
 mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-infinispan-properties/added/kogito-infinispan-properties.sh ${KOGITO_HOME}/launch/
 cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-jobs-service.sh
-load ${KOGITO_HOME}/launch/kogito-infinispan-properties.sh
 
 
 teardown() {
     rm -rf ${KOGITO_HOME}
 }
 
-@test "test enable persistence without set infinispan server list" {
-    export ENABLE_PERSISTENCE="true"
-    run configure_jobs_service
-    expected="INFINISPAN_CLIENT_SERVER_LIST env not found, please set it."
-    echo "Result is ${output} and expected is ${expected}"
-    [ "$status" -eq 1 ]
-    [ "${output}" = "${expected}" ]
-}
-
 @test "check if the backoffRetryMillis is correctly set" {
     export BACKOFF_RETRY="2000"
     configure_jobs_service
@@ -51,11 +40,10 @@ teardown() {
 
 @test "check if the persistence is correctly configured with auth" {
     export ENABLE_PERSISTENCE="true"
-    export INFINISPAN_CLIENT_SERVER_LIST="localhost:11222"
     configure_jobs_service
 
     result="${KOGITO_JOBS_PROPS}"
-    expected=" -Dkogito.jobs-service.persistence=infinispan -Dquarkus.infinispan-client.server-list=localhost:11222"
+    expected=" -Dkogito.jobs-service.persistence=infinispan"
 
     echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
diff --git a/scripts/common.py b/scripts/common.py
index 47b1d092ebf..d03e60fdc7e 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -9,7 +9,7 @@
 
 # All kogito-image modules that have the kogito version.
 MODULES = {"kogito-data-index", "kogito-explainability", "kogito-image-dependencies",
-           "kogito-infinispan-properties", "kogito-jobs-service",
+           "kogito-jobs-service",
            "kogito-jq", "kogito-kubernetes-client",
            "kogito-launch-scripts", "kogito-logging",
            "kogito-management-console", "kogito-persistence",
diff --git a/tests/features/kogito-data-index.feature b/tests/features/kogito-data-index.feature
index 7379932e9c3..10ae680d8aa 100644
--- a/tests/features/kogito-data-index.feature
+++ b/tests/features/kogito-data-index.feature
@@ -19,53 +19,28 @@ Feature: Kogito-data-index feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-data-index-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-data-index-runner.jar
 
   Scenario: Verify if the debug is correctly enabled and test custom http port
     When container is started with env
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
       | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.infinispan-client.use-auth=false -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-data-index-runner.jar
-
-  Scenario: Verify data-index default configuration
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then container log should contain quarkus.infinispan-client.use-auth = false
-
-  Scenario: verify if auth is correctly set
-    When container is started with env
-      | variable            | value       |
-      | SCRIPT_DEBUG        | true        |
-      | INFINISPAN_USEAUTH  | true        |
-      | INFINISPAN_USERNAME | IamNotExist |
-      | INFINISPAN_PASSWORD | hard2guess  |
-    Then container log should contain quarkus.infinispan-client.use-auth = true
-    And container log should contain quarkus.infinispan-client.auth-password = hard2guess
-    And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-data-index-runner.jar
 
   Scenario: verify if all parameters are correctly set
     When container is started with env
-      | variable                 | value       |
-      | SCRIPT_DEBUG             | true        |
-      | INFINISPAN_USEAUTH       | true        |
-      | INFINISPAN_USERNAME      | IamNotExist |
-      | INFINISPAN_PASSWORD      | hard2guess  |
-      | INFINISPAN_AUTHREALM     | SecretRealm |
-      | INFINISPAN_SASLMECHANISM | COOLGSSAPI  |
-    Then container log should contain quarkus.infinispan-client.use-auth = true
-    And container log should contain quarkus.infinispan-client.auth-password = hard2guess
-    And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
-    And container log should contain quarkus.infinispan-client.auth-realm = SecretRealm
-    And container log should contain quarkus.infinispan-client.sasl-mechanism = COOLGSSAPI
-
-  Scenario: verify if image is started
-    When container is started with env
-      | variable                        | value                  |
-      | INFINISPAN_CREDENTIAL_SECRET    | infinispan-credentials |
-      | INFINISPAN_AUTHREALM            | default                |
-      | INFINISPAN_USEAUTH              | true                   |
-      | INFINISPAN_SASLMECHANISM        | PLAIN                  |
-     Then container log should not contain Error: Could not find or load main class [ERROR]
-
+      | variable                                  | value             |
+      | SCRIPT_DEBUG                              | true              |
+      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
+      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
+      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
+    Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+    Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 66e6996f121..0608034d945 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -19,7 +19,7 @@ Feature: Kogito-jobs-service feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Dquarkus.infinispan-client.use-auth=false -jar /home/kogito/bin/kogito-jobs-service-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-jobs-service-runner.jar
     And container log should contain started in
     And container log should not contain Application failed to start
 
@@ -28,60 +28,7 @@ Feature: Kogito-jobs-service feature.
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
       | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Dquarkus.infinispan-client.use-auth=false -jar /home/kogito/bin/kogito-jobs-service-runner.jar
-
-  Scenario: verify if container fails if persistence is enabled but there is no infinispan server list.
-    When container is started with env
-      | variable           | value |
-      | ENABLE_PERSISTENCE | true  |
-    Then container log should contain INFINISPAN_CLIENT_SERVER_LIST env not found, please set it.
-
-  Scenario: verify if the persistence is correctly enabled without auth
-    When container is started with env
-      | variable                      | value           |
-      | SCRIPT_DEBUG                  | true            |
-      | ENABLE_PERSISTENCE            | true            |
-      | INFINISPAN_CLIENT_SERVER_LIST | localhost:11111 |
-    Then container log should contain quarkus.infinispan-client.server-list = localhost:11111
-    And container log should contain quarkus.infinispan-client.use-auth = false
-    And container log should contain started in
-    And container log should not contain Application failed to start
-
-  Scenario: verify if auth is correctly set
-    When container is started with env
-      | variable                      | value           |
-      | SCRIPT_DEBUG                  | true            |
-      | ENABLE_PERSISTENCE            | true            |
-      | INFINISPAN_CLIENT_SERVER_LIST | localhost:11111 |
-      | INFINISPAN_USEAUTH            | true            |
-      | INFINISPAN_USERNAME           | IamNotExist     |
-      | INFINISPAN_PASSWORD           | hard2guess      |
-    Then container log should contain quarkus.infinispan-client.use-auth = true
-    And container log should contain quarkus.infinispan-client.auth-password = hard2guess
-    And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
-    And container log should contain quarkus.infinispan-client.server-list = localhost:11111
-    And container log should contain started in
-    And container log should not contain Application failed to start
-
-  Scenario: verify if all parameters are correctly set
-    When container is started with env
-      | variable                      | value           |
-      | SCRIPT_DEBUG                  | true            |
-      | ENABLE_PERSISTENCE            | true            |
-      | INFINISPAN_CLIENT_SERVER_LIST | localhost:11111 |
-      | INFINISPAN_USEAUTH            | true            |
-      | INFINISPAN_USERNAME           | IamNotExist     |
-      | INFINISPAN_PASSWORD           | hard2guess      |
-      | INFINISPAN_AUTHREALM          | SecretRealm     |
-      | INFINISPAN_SASLMECHANISM      | COOLGSSAPI      |
-    Then container log should contain quarkus.infinispan-client.use-auth = true
-    And container log should contain quarkus.infinispan-client.auth-password = hard2guess
-    And container log should contain quarkus.infinispan-client.auth-username = IamNotExist
-    And container log should contain quarkus.infinispan-client.auth-realm = SecretRealm
-    And container log should contain quarkus.infinispan-client.sasl-mechanism = COOLGSSAPI
-    And container log should contain quarkus.infinispan-client.server-list = localhost:11111
-    And container log should contain started in
-    And container log should not contain Application failed to start
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -jar /home/kogito/bin/kogito-jobs-service-runner.jar
 
   Scenario: verify if container fails if event is enabled but there is no Kafka bootstrap server set.
     When container is started with env
@@ -99,3 +46,22 @@ Feature: Kogito-jobs-service feature.
     And container log should contain started in
     And container log should contain Connection to node -1 (localhost/127.0.0.1:11111) could not be established.
 
+  Scenario: verify if auth is correctly set
+    When container is started with env
+      | variable                      | value           |
+      | SCRIPT_DEBUG                  | true            |
+      | ENABLE_PERSISTENCE            | true            |
+      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
+      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
+      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
+    Then container log should contain kogito.jobs-service.persistence=infinispan
+    Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+    Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
+    And container log should not contain Application failed to start

From 8478a8a058c68f91a8aa60111f1d570475b6d177 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 24 Jul 2020 15:52:42 +0200
Subject: [PATCH 161/709] KOGITO-2867 Changes in scripts for next release
 (#194)

---
 README.md                           |  6 +++---
 scripts/manage-kogito-version.py    | 25 +++++++++++++++++--------
 scripts/update-maven-information.py |  1 -
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 611f1fd1333..dafedbbe527 100644
--- a/README.md
+++ b/README.md
@@ -171,7 +171,7 @@ $ s2i build https://github.com/kiegroup/kogito-examples.git \
 [INFO] ------------------------------------------------------------------------
 ---> Build finished, installing application from path /tmp/src
 ---> Installing jar file
-'target/rules-quarkus-helloworld-8.0.0-SNAPSHOT-runner.jar' -> '/home/kogito/bin/rules-quarkus-helloworld-8.0.0-SNAPSHOT-runner.jar'
+'target/rules-quarkus-helloworld-runner.jar' -> '/home/kogito/bin/rules-quarkus-helloworld-runner.jar'
 ---> Copying application libraries
 ---> [s2i-core] Copy image metadata file...
 '/tmp/src/target/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'
@@ -423,7 +423,7 @@ Once you have checked out the example on your local machine follow the steps bel
 # build the example using uberjar reference
 $ mvn clean package -Dquarkus.package.uber-jar
 # inspect and run the generated uberjar, for instructions on how to use this example see its README file.
-$ java -jar target/jbpm-quarkus-example-8.0.0-SNAPSHOT-runner.jar 
+$ java -jar target/jbpm-quarkus-example-runner.jar 
 
 # performing a source to image build to copy the artifacts to the runtime image
 $ s2i build target/ quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest process-quarkus-example
@@ -493,7 +493,7 @@ s2i build target/ quay.io/kiegroup/kogito-quarkus-ubi8:latest binary-test-exampl
 -----> Cleaning up unneeded jar files
 ...
 ---> Installing application binaries
-'./process-quarkus-example-8.0.0-SNAPSHOT-runner' -> '/home/kogito/bin/process-quarkus-example-8.0.0-SNAPSHOT-runner'
+'./process-quarkus-example-runner' -> '/home/kogito/bin/process-quarkus-example-runner'
 ...
 
 # run the output image
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index fd65374fa5e..5c62dbc078b 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -25,18 +25,17 @@
 
 
 
-def update_behave_tests(tests_branch):
+def update_behave_tests(target_version, tests_branch):
     """
-    will update the behave tests accordingly.
-    If master, the app 8.0.0-SNAPSHOT otherwise use the same value for branch and version
+    Will update the behave tests accordingly.
+    :param target_version:
     :param tests_branch:
     """
     base_dir = 'tests/features'
-    # if 'master' in target_branch:
-    #     artifact_version = '8.0.0-SNAPSHOT'
 
     # this pattern will look for any occurrences of using master or using x.x.x
     pattern_branch = re.compile(r'(using master)|(using \s*([\d.]+.x))|(using \s*([\d.]+))')
+    pattern_version_env = re.compile('\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT))[\s]*\|')
     # kogito examples does not have the version on built examples anymore, let's comment it out for now.
     # quarkus_native_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner\s)|((\s*([\d.]+)-runner\s)|(\s*([\d.]+)-SNAPSHOT-runner\s))')
     # quarkus_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner.jar)|((\s*([\d.]+)-runner.jar)|(\s*([\d.]+)-SNAPSHOT-runner.jar))')
@@ -45,6 +44,7 @@ def update_behave_tests(tests_branch):
         print("Updating feature {0}".format(feature))
         with open(os.path.join(base_dir, feature)) as fe:
             updated_value = pattern_branch.sub('using ' + tests_branch, fe.read())
+            updated_value = pattern_version_env.sub('| KOGITO_VERSION | ' + target_version + ' | ', updated_value)
             # kogito examples does not have the version on built examples anymore, let's comment it out for now.
             # updated_value = quarkus_native_pattern_app_version.sub(tests_version + '-runner ', updated_value)
             # updated_value = quarkus_pattern_app_version.sub(tests_version + '-runner.jar', updated_value)
@@ -64,6 +64,14 @@ def update_test_apps_clone_repo(target_branch):
     else:
         os.system('sed -i \'s/^git checkout.*/git checkout -b ' + target_branch + ' ' + target_branch + '/\' ' + file)
 
+def update_python_scripts(target_version):
+    '''
+    Updates the clone-repo.sh script for adding the given repository URL to the Maven settings.
+    :param target_version: Maven Repository URL to set
+    '''
+    file = 'scripts/update-maven-information.py'
+    print('Updating file {}'.format(file))
+    os.system('sed -i \'s|^DEFAULT_VERSION = .*|DEFAULT_VERSION = \"{}\"|\' '.format(target_version) + file)
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Kogito Version Manager')
@@ -77,8 +85,8 @@ def update_test_apps_clone_repo(target_branch):
     if args.bump_to:
         # validate if the provided version is valid.
         # e.g. 1.10.0 or 1.0.0-rc1
-        pattern = '\d.\d{1,2}.(\d$|\d-rc\d+$)'
-        regex = re.compile(r'\d.\d{1,2}.(\d$|\d-rc\d+$)')
+        pattern = '\d+.\d+.(\d+$|\d+-rc\d+$|\d+-snapshot$)'
+        regex = re.compile(r'\d+.\d+.(\d+$|\d+-rc\d+|\d+-snapshot$)')
         valid = regex.match(args.bump_to)
         tests_branch = ""
         if valid:
@@ -98,8 +106,9 @@ def update_test_apps_clone_repo(target_branch):
             common.update_image_stream(args.bump_to)
             common.update_modules_version(args.bump_to)
             common.update_kogito_version_env_in_modules(args.bump_to)
-            update_behave_tests(tests_branch)
+            update_behave_tests(args.bump_to, tests_branch)
             update_test_apps_clone_repo(tests_branch)
+            update_python_scripts(args.bump_to)
         else:
             print("Provided version {0} does not match the expected regex - {1}".format(args.bump_to, pattern))
     else:
diff --git a/scripts/update-maven-information.py b/scripts/update-maven-information.py
index 2fcbdc92651..3fd8d4ce5c7 100644
--- a/scripts/update-maven-information.py
+++ b/scripts/update-maven-information.py
@@ -17,7 +17,6 @@
 import subprocess as sp
 import os
 import argparse
-from ruamel.yaml import YAML
 
 DEFAULT_REPO_URL = "https://repository.jboss.org/nexus/content/groups/public/"
 DEFAULT_VERSION = "8.0.0-SNAPSHOT"

From e5c9bbcbb9fd8ba09e1f42483fa64cdd7a03dc6f Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Fri, 24 Jul 2020 21:00:56 +0200
Subject: [PATCH 162/709] [KOGITO 2707] - add trusty image (#188)

---
 .github/workflows/run-bats-tests.yml          |  5 ++
 Jenkinsfile                                   |  2 +
 Jenkinsfile-Nightly                           |  4 ++
 Jenkinsfile.deploy                            |  3 ++
 Jenkinsfile.promote                           |  1 +
 Makefile                                      | 18 ++++++-
 README.md                                     | 30 ++++++++++++
 kogito-imagestream.yaml                       | 21 ++++++++
 kogito-trusty-overrides.yaml                  | 42 ++++++++++++++++
 .../kogito-trusty/added/kogito-app-launch.sh  | 27 +++++++++++
 .../added/launch/kogito-trusty.sh             | 17 +++++++
 modules/kogito-trusty/configure               | 16 +++++++
 modules/kogito-trusty/module.yaml             | 12 +++++
 .../tests/bats/kogito-trusty.bats             | 30 ++++++++++++
 scripts/common.py                             |  3 +-
 scripts/push-local-registry.sh                |  2 +-
 scripts/push-staging.py                       |  2 +-
 scripts/update-maven-information.py           |  1 +
 tests/features/common.feature                 |  2 +-
 tests/features/kogito-trusty.feature          | 48 +++++++++++++++++++
 20 files changed, 281 insertions(+), 5 deletions(-)
 create mode 100644 kogito-trusty-overrides.yaml
 create mode 100644 modules/kogito-trusty/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-trusty/added/launch/kogito-trusty.sh
 create mode 100644 modules/kogito-trusty/configure
 create mode 100644 modules/kogito-trusty/module.yaml
 create mode 100644 modules/kogito-trusty/tests/bats/kogito-trusty.bats
 create mode 100644 tests/features/kogito-trusty.feature

diff --git a/.github/workflows/run-bats-tests.yml b/.github/workflows/run-bats-tests.yml
index 09b5e6459af..09b465bfe4d 100644
--- a/.github/workflows/run-bats-tests.yml
+++ b/.github/workflows/run-bats-tests.yml
@@ -22,6 +22,11 @@ jobs:
         run: |
           $HOME/bin/bats modules/kogito-data-index/tests/bats
 
+      - name: run kogito-trusty tests
+        working-directory: ${{ github.workspace }}
+        run: |
+          $HOME/bin/bats modules/kogito-trusty/tests/bats
+
       - name: run kogito-explainability tests
         working-directory: ${{ github.workspace }}
         run: |
diff --git a/Jenkinsfile b/Jenkinsfile
index 54095fc2e8d..917e591371a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,6 +10,7 @@ IMAGES = ["kogito-quarkus-ubi8",
             "kogito-springboot-ubi8",
             "kogito-springboot-ubi8-s2i",
             "kogito-data-index",
+            "kogito-trusty",
             "kogito-explainability",
             "kogito-jobs-service",
             "kogito-management-console"]
@@ -49,6 +50,7 @@ pipeline{
                 sh """
                     ./cekit-image-validator-runner image.yaml
                     ./cekit-image-validator-runner kogito-data-index-overrides.yaml
+                    ./cekit-image-validator-runner kogito-trusty-overrides.yaml
                     ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
index 8f7bf02cd9c..97d9d23a042 100644
--- a/Jenkinsfile-Nightly
+++ b/Jenkinsfile-Nightly
@@ -8,6 +8,7 @@ IMAGES = ["kogito-quarkus-ubi8",
             "kogito-springboot-ubi8",
             "kogito-springboot-ubi8-s2i",
             "kogito-data-index",
+            "kogito-trusty",
             "kogito-explainability",
             "kogito-jobs-service",
             "kogito-management-console"]
@@ -47,6 +48,7 @@ pipeline{
                 sh """
                     ./cekit-image-validator-runner image.yaml
                     ./cekit-image-validator-runner kogito-data-index-overrides.yaml
+                    ./cekit-image-validator-runner kogito-trusty-overrides.yaml
                     ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
@@ -99,6 +101,7 @@ pipeline{
                 docker tag quay.io/kiegroup/kogito-springboot-ubi8:latest                 quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest             quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-data-index:latest                      quay.io/kiegroup/kogito-data-index-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                docker tag quay.io/kiegroup/kogito-trusty:latest                          quay.io/kiegroup/kogito-trusty-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-explainability:latest                  quay.io/kiegroup/kogito-explainability-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-jobs-service:latest                    quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                 docker tag quay.io/kiegroup/kogito-management-console:latest              quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
@@ -115,6 +118,7 @@ pipeline{
                         docker push quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                         docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                         docker push quay.io/kiegroup/kogito-data-index-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
+                        docker push quay.io/kiegroup/kogito-trusty-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                         docker push quay.io/kiegroup/kogito-explainability-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                         docker push quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
                         docker push quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 1a25a6e9139..dc8b42d1e8a 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -9,6 +9,7 @@ IMAGES = [
             "kogito-springboot-ubi8",
             "kogito-springboot-ubi8-s2i",
             "kogito-data-index",
+            "kogito-trusty",
             "kogito-explainability",
             "kogito-jobs-service",
             "kogito-management-console"
@@ -85,6 +86,7 @@ pipeline {
 
                     // Debug purpose in case of issue
                     sh "cat modules/kogito-data-index/module.yaml"
+                    sh "cat modules/kogito-trusty/module.yaml"
                     sh "cat modules/kogito-explainability/module.yaml"
                     sh "cat modules/kogito-jobs-service/module.yaml"
                     sh "cat modules/kogito-management-console/module.yaml"
@@ -120,6 +122,7 @@ pipeline {
                 sh """
                     ./cekit-image-validator-runner image.yaml
                     ./cekit-image-validator-runner kogito-data-index-overrides.yaml
+                    ./cekit-image-validator-runner kogito-trusty-overrides.yaml
                     ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index a0151d03254..fc0af95f895 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -6,6 +6,7 @@ IMAGES = ["kogito-quarkus-ubi8",
                     "kogito-springboot-ubi8",
                     "kogito-springboot-ubi8-s2i",
                     "kogito-data-index",
+                    "kogito-trusty",
                     "kogito-explainability",
                     "kogito-jobs-service",
                     "kogito-management-console"]
diff --git a/Makefile b/Makefile
index 4eee222f520..742eec2f71f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ CEKIT_CMD := cekit -v ${cekit_option}
 # Build all images
 .PHONY: build
 # start to build the images
-build: clone-repos kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-jobs-service kogito-management-console
+build: clone-repos kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-trusty kogito-explainability kogito-jobs-service kogito-management-console
 
 clone-repos:
 # if the NO_TEST env defined, proceed with the tests, as first step prepare the repo to be used
@@ -93,6 +93,19 @@ ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-trusty image
+kogito-trusty:
+ifneq ($(ignore_build),true)
+	${CEKIT_CMD} build --overrides-file kogito-trusty-overrides.yaml ${BUILD_ENGINE}
+endif
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
+	${CEKIT_CMD} test --overrides-file kogito-trusty-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-trusty:${IMAGE_VERSION} quay.io/kiegroup/kogito-trusty:${SHORTENED_LATEST_VERSION}
+endif
+
 # build the quay.io/kiegroup/kogito-explainability image
 kogito-explainability:
 ifneq ($(ignore_build),true)
@@ -149,6 +162,8 @@ _push:
 	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest
 	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-data-index:latest
+	docker push quay.io/kiegroup/kogito-trusty:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-trusty:latest
 	docker push quay.io/kiegroup/kogito-explainability:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-explainability:latest
 	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}
@@ -163,6 +178,7 @@ ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	docker push quay.io/kiegroup/kogito-springboot-ubi8:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-trusty:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-explainability:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
diff --git a/README.md b/README.md
index dafedbbe527..cc2b04d9f2d 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ Table of Contents
         - [Kogito Spring Boot Runtime Image example](#kogito-spring-boot-runtime-image-example)
   - [Kogito Component Images](#kogito-component-images)
     - [Kogito Data Index Component Image](#kogito-data-index-component-image)
+    - [Kogito Trusty Component Image](#kogito-trusty-component-image)
     - [Kogito Explainability Component Image](#kogito-explainability-component-image)
     - [Kogito Jobs Service Component Image](#kogito-jobs-service-component-image)
     - [Kogito Management Console Component Image](#kogito-management-console-component-image)
@@ -566,6 +567,7 @@ by providing extra capabilities, like managing the processes on a web UI or prov
 Today we have 3 Kogito Component Images:
 
 * [quay.io/kiegroup/kogito-data-index](https://quay.io/kiegroup/kogito-data-index)
+* [quay.io/kiegroup/kogito-trusty](https://quay.io/kiegroup/kogito-trusty)
 * [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
 * [quay.io/kiegroup/kogito-jobs-service](htps://quay.io/kiegroup/kogito-jobs-service)
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
@@ -616,6 +618,30 @@ To know what configurations this image accepts please take a look [here](kogito-
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Explainability Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
+### Kogito Trusty Component Image
+
+The Trusty Service aims at collecting tracing information by one or more Kogito runtime services and provides analytical capabilities on top of the collected data. 
+The Trusty Service depends on a running Infinispan Server.
+
+
+Basic usage
+```bash
+$ docker run -it -e QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 -e KAFKA_BOOTSTRAP_SERVER=my-kafka:9092 quay.io/kiegroup/kogito-trusty:latest
+```
+
+To enable debug just use this env while running this image:
+
+```bash
+docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty:latest
+```
+You should notice a few debug messages being printed in the system output.
+
+To know what configurations this image accepts please take a look [here](kogito-trusty-overrides.yaml) on the **envs** section.
+
+The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty Service 
+to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
+
+
 ### Kogito Jobs Service Component Image
 
 The Kogito Jobs Service is a dedicated lightweight service responsible for scheduling jobs that aim at firing at a given time. 
@@ -705,6 +731,7 @@ imagestream.image.openshift.io/kogito-quarkus-ubi8-s2i created
 imagestream.image.openshift.io/kogito-springboot-ubi8 created
 imagestream.image.openshift.io/kogito-springboot-ubi8-s2i created
 imagestream.image.openshift.io/kogito-data-index created
+imagestream.image.openshift.io/kogito-trusty created
 imagestream.image.openshift.io/kogito-jobs-service created
 imagestream.image.openshift.io/kogito-management-console created
 
@@ -891,6 +918,7 @@ With this Makefile you can:
      $ make kogito-springboot-ubi8 
      $ make kogito-springboot-ubi8-s2i
      $ make kogito-data-index
+     $ make kogito-trusty
      $ make kogito-explainability
      $ make kogito-jobs-service 
      $ make kogito-management-console
@@ -940,6 +968,7 @@ To better understand the CeKit Modules, please visit this [link](https://docs.ce
 Below you can find all modules used to build the Kogito Images
 
 - [kogito-data-index](modules/kogito-data-index): Installs and Configure the data-index jar inside the image.
+- [kogito-trusty](modules/kogito-trusty): Installs and Configure the trusty jar inside the image.
 - [kogito-explainability](modules/kogito-explainability): Installs and Configure the explainability jar inside the image.
 - [kogito-epel](modules/kogito-epel): Configures the epel repository on the target image.
 - [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image.
@@ -966,6 +995,7 @@ For each image, we use a specific *-overrides.yaml file which will specific the
 Please inspect the images overrides files to learn which modules are being installed:
 
 - [quay.io/kiegroup/kogito-data-index](kogito-data-index-overrides.yaml)
+- [quay.io/kiegroup/kogito-trusty](kogito-trusty-overrides.yaml)
 - [quay.io/kiegroup/kogito-explainability](kogito-explainability-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service](kogito-jobs-service-overrides.yaml)
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index c1691aa8f78..6ca5ca8c37f 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -132,6 +132,27 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-data-index:0.13.0-rc1
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-trusty
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Trusty Service
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '0.12.0-rc1'
+          annotations:
+            description: Runtime image for the Kogito Trusty Service
+            iconClass: icon-jbpm
+            tags: kogito,trusty
+            supports: persistence backed by Infinispan server
+            version: '0.12.0-rc1'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-trusty:0.12.0-rc1
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-trusty-overrides.yaml b/kogito-trusty-overrides.yaml
new file mode 100644
index 00000000000..aea55eae9c0
--- /dev/null
+++ b/kogito-trusty-overrides.yaml
@@ -0,0 +1,42 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-trusty"
+description: "Runtime image for Kogito Trusty Service"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Trusty Service"
+- name: "io.k8s.display-name"
+  value: "Kogito Trusty Service"
+- name: "io.openshift.tags"
+  value: "kogito,trusty"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "HTTP_PORT"
+    example: "9090"
+    description: "Defines which port the Trusty Container Image will listen on."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.trusty
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/modules/kogito-trusty/added/kogito-app-launch.sh b/modules/kogito-trusty/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..acd904cb984
--- /dev/null
+++ b/modules/kogito-trusty/added/kogito-app-launch.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+fi
+
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-trusty.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+printenv
+
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} \
+        -Djava.library.path=$KOGITO_HOME/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -jar $KOGITO_HOME/bin/kogito-trusty-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty/added/launch/kogito-trusty.sh b/modules/kogito-trusty/added/launch/kogito-trusty.sh
new file mode 100644
index 00000000000..11365ff180e
--- /dev/null
+++ b/modules/kogito-trusty/added/launch/kogito-trusty.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+}
+
+function configure() {
+    configure_trusty_http_port
+}
+
+function configure_trusty_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_TRUSTY_PROPS="${KOGITO_TRUSTY_PROPS} -Dquarkus.http.port=${httpPort}"
+}
+
diff --git a/modules/kogito-trusty/configure b/modules/kogito-trusty/configure
new file mode 100644
index 00000000000..ba1c36e5d89
--- /dev/null
+++ b/modules/kogito-trusty/configure
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+cp -v ${SOURCES_DIR}/kogito-trusty-runner.jar ${KOGITO_HOME}/bin/
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
+cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
new file mode 100644
index 00000000000..f81761b89e1
--- /dev/null
+++ b/modules/kogito-trusty/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.trusty
+version: "0.12.0-rc1"
+
+artifacts:
+  - name: kogito-trusty-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/8.0.0-SNAPSHOT/trusty-service-8.0.0-20200724.024218-120-runner.jar
+    md5: 279d44ddb3bb603ae1c0b882b098e90a
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-trusty/tests/bats/kogito-trusty.bats b/modules/kogito-trusty/tests/bats/kogito-trusty.bats
new file mode 100644
index 00000000000..ed87ef95209
--- /dev/null
+++ b/modules/kogito-trusty/tests/bats/kogito-trusty.bats
@@ -0,0 +1,30 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME=$KOGITO_HOME
+mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-trusty.sh
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+}
+
+
+@test "http port configuration default value" {
+    configure_trusty_http_port
+    expected=" -Dquarkus.http.port=8080"
+    echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}"
+    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
+}
+
+@test "http port configuration custom value" {
+    export HTTP_PORT="9090"
+    configure_trusty_http_port
+    expected=" -Dquarkus.http.port=9090"
+    echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}"
+    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
+}
+
diff --git a/scripts/common.py b/scripts/common.py
index d03e60fdc7e..57598d310a1 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -8,7 +8,8 @@
 from ruamel.yaml import YAML
 
 # All kogito-image modules that have the kogito version.
-MODULES = {"kogito-data-index", "kogito-explainability", "kogito-image-dependencies",
+MODULES = {"kogito-data-index", "kogito-trusty", 
+           "kogito-explainability", "kogito-image-dependencies",
            "kogito-jobs-service",
            "kogito-jq", "kogito-kubernetes-client",
            "kogito-launch-scripts", "kogito-logging",
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index 3b748cfdbed..ab6cf51a2ea 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -4,7 +4,7 @@
 BUILD_ENGINE="docker"
 
 # All Kogito images
-IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-jobs-service kogito-management-console"
+IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-trusty kogito-jobs-service kogito-management-console"
 
 registry=${REGISTRY:-{1}}
 version=${2:-latest}
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 58081a5b337..3ffa44caaf6 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -18,7 +18,7 @@
 # All Kogito images
 IMAGES = ["kogito-quarkus-ubi8", "kogito-quarkus-jvm-ubi8", "kogito-quarkus-ubi8-s2i",
           "kogito-springboot-ubi8", "kogito-springboot-ubi8-s2i", "kogito-data-index",
-          "kogito-explainability",
+          "kogito-trusty", "kogito-explainability",
           "kogito-jobs-service", "kogito-management-console"]
 
 IMAGES_NEXT_RC_TAG = []
diff --git a/scripts/update-maven-information.py b/scripts/update-maven-information.py
index 3fd8d4ce5c7..8456493cebe 100644
--- a/scripts/update-maven-information.py
+++ b/scripts/update-maven-information.py
@@ -26,6 +26,7 @@
     #service-name: module-name(directory in which module's module.yaml file is present)
     #Note: Service name should be same as given in the repository
     "data-index-service": "kogito-data-index",
+    "trusty-service": "kogito-trusty",
     "explainability-service": "kogito-explainability",
     "jobs-service": "kogito-jobs-service",
     "management-console": "kogito-management-console"
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 477159b71b1..3cf558bb0d3 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8 @quay.io/kiegroup/kiegroup/kogito-data-index
+@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8 @quay.io/kiegroup/kiegroup/kogito-data-index @quay.io/kiegroup/kiegroup/kogito-trusty
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/kogito-trusty.feature b/tests/features/kogito-trusty.feature
new file mode 100644
index 00000000000..a3e2e692366
--- /dev/null
+++ b/tests/features/kogito-trusty.feature
@@ -0,0 +1,48 @@
+@quay.io/kiegroup/kogito-trusty
+Feature: Kogito-trusty feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service
+    And the image should contain label io.k8s.display-name with value Kogito Trusty Service
+    And the image should contain label io.openshift.tags with value kogito,trusty
+
+  Scenario: verify if the binary index is available on /home/kogito
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/kogito-trusty-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-trusty-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and test default http port
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
+
+  Scenario: verify if auth is correctly set
+    When container is started with env
+      | variable                      | value           |
+      | SCRIPT_DEBUG                  | true            |
+      | ENABLE_PERSISTENCE            | true            |
+      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
+      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM       | SecretRealm       |
+      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
+    Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+    Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
+    And container log should not contain Application failed to start

From 2662e0404fe853386558de6439c55fa0cfa1c58a Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Tue, 4 Aug 2020 22:27:48 +0530
Subject: [PATCH 163/709] =?UTF-8?q?[KOGITO-2353]=20-=20Add=20option=20to?=
 =?UTF-8?q?=20run=20the=20kogito=20images'=20bats=20tests=20using=E2=80=A6?=
 =?UTF-8?q?=20(#196)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-2353] - Add option to run the kogito images' bats tests using make command

See: https://issues.redhat.com/browse/KOGITO-2353

Signed-off-by: Tarun Khandelwal <tarkhand@redhat.com>
---
 .github/workflows/kogito-images-pr-check.yml | 40 ++++++++++++
 .github/workflows/run-bats-tests.yml         | 69 --------------------
 .github/workflows/validate-imagestreams.yml  | 20 ------
 .gitignore                                   |  3 +
 Makefile                                     |  4 ++
 scripts/run-bats.sh                          | 41 ++++++++++++
 6 files changed, 88 insertions(+), 89 deletions(-)
 create mode 100644 .github/workflows/kogito-images-pr-check.yml
 delete mode 100644 .github/workflows/run-bats-tests.yml
 delete mode 100644 .github/workflows/validate-imagestreams.yml
 create mode 100755 scripts/run-bats.sh

diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
new file mode 100644
index 00000000000..6dffd3c3937
--- /dev/null
+++ b/.github/workflows/kogito-images-pr-check.yml
@@ -0,0 +1,40 @@
+name: Images PR check
+
+on: pull_request
+jobs:
+  bats_test:
+    name: Bats Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install xmllint
+        run: |
+          sudo apt-get update
+          sudo apt-get install libxml2-utils --fix-missing
+      - name: Cache bats binaries
+        uses: actions/cache@v1
+        with:
+          path: $GITHUB_WORKSPACE/bats/
+          key: ${{ runner.os }}-bats-binaries
+          restore-keys: |
+            ${{ runner.os }}-bats-binaries
+      - name: run bats
+        run: |
+          ./scripts/run-bats.sh
+          
+  validate_kogito_imagestream:
+    name: Validate Kogito imagestreams
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download openshift-validator-tool
+        run: |
+          wget https://github.com/jboss-container-images/jboss-kie-modules/raw/master/tools/openshift-template-validator/openshift-template-validator-linux-amd64
+      - name: Add execution permission to openshift-validator-tool
+        run: |
+          chmod +x openshift-template-validator-linux-amd64
+          mv openshift-template-validator-linux-amd64 ${HOME} 	
+      - name: validate imagestream
+        run: |
+          ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
\ No newline at end of file
diff --git a/.github/workflows/run-bats-tests.yml b/.github/workflows/run-bats-tests.yml
deleted file mode 100644
index 09b465bfe4d..00000000000
--- a/.github/workflows/run-bats-tests.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-name: Run S2I modules Bats Tests
-
-on: pull_request
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install xmllint
-        run: |
-          sudo apt-get update
-          sudo apt-get install libxml2-utils --fix-missing
-      - name: install bats
-        run: |
-          git clone https://github.com/bats-core/bats-core.git
-          cd bats-core
-          ./install.sh $HOME
-
-      - name: run kogito-data-index tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-data-index/tests/bats
-
-      - name: run kogito-trusty tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-trusty/tests/bats
-
-      - name: run kogito-explainability tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-explainability/tests/bats
-
-      - name: run kogito-graalvm-scripts tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-graalvm-scripts/tests/bats
-
-      - name: run kogito-jobs-service tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-jobs-service/tests/bats
-
-      - name: run kogito-kubernetes-client tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-kubernetes-client/tests/bats/
-
-      - name: run kogito-management-console tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-management-console/tests/bats/
-
-      - name: run kogito-maven tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-maven/tests/bats
-
-      - name: run kogito-persistence tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-persistence/tests/bats
-
-      - name: run kogito-s2i-core tests
-        working-directory: ${{ github.workspace }}
-        run: |
-          $HOME/bin/bats modules/kogito-s2i-core/tests/bats
-
diff --git a/.github/workflows/validate-imagestreams.yml b/.github/workflows/validate-imagestreams.yml
deleted file mode 100644
index b267c65f5e7..00000000000
--- a/.github/workflows/validate-imagestreams.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Validate Kogito imagestreams
-
-on: pull_request
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Download openshift-validator-tool
-        run: |
-          wget https://github.com/jboss-container-images/jboss-kie-modules/raw/master/tools/openshift-template-validator/openshift-template-validator-linux-amd64
-      - name: Add execution permission to openshift-validator-tool
-        run: |
-          chmod +x openshift-template-validator-linux-amd64
-          mv openshift-template-validator-linux-amd64 ${HOME} 	
-      - name: validate imagestream
-        run: |
-          ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
-
diff --git a/.gitignore b/.gitignore
index c383190e398..04a78e23e5d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,9 @@
 /local
 target/
 
+# bats
+bats/*
+
 # Eclipse, Netbeans and IntelliJ files
 /.*
 !.gitignore
diff --git a/Makefile b/Makefile
index 742eec2f71f..f3f609777a7 100644
--- a/Makefile
+++ b/Makefile
@@ -202,3 +202,7 @@ _push-staging:
 push-local-registry:
 	/bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}
 
+# run bat tests locally
+.PHONY: bats
+bats:
+	./scripts/run-bats.sh
\ No newline at end of file
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
new file mode 100755
index 00000000000..1d2be17a645
--- /dev/null
+++ b/scripts/run-bats.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -e
+
+if [[ $(command -v ./bats/bin/bats) ]]; then    #skip if bats already installed else will install the bats
+    echo "---> bats already available running tests"
+else
+    git clone https://github.com/bats-core/bats-core.git
+    ./bats-core/install.sh bats
+    rm -rf bats-core
+fi 
+
+echo "----> running bats on kogito-data-index"
+./bats/bin/bats modules/kogito-data-index/tests/bats
+
+echo  "----> running bats on kogito-trusty"
+./bats/bin/bats modules/kogito-trusty/tests/bats
+
+echo "----> running bats on kogito-explainability"
+./bats/bin/bats modules/kogito-explainability/tests/bats
+
+echo "----> running bats on kogito-graalvm-scripts"
+./bats/bin/bats modules/kogito-graalvm-scripts/tests/bats
+
+echo "----> running bats on kogito-jobs-service"
+./bats/bin/bats modules/kogito-jobs-service/tests/bats
+
+echo "----> running bats on kogito-kubernetes-client"
+./bats/bin/bats modules/kogito-kubernetes-client/tests/bats/
+
+echo "----> running bats on kogito-management-console"
+./bats/bin/bats modules/kogito-management-console/tests/bats/
+
+echo "----> running bats on kogito-maven"
+./bats/bin/bats modules/kogito-maven/tests/bats
+
+echo "----> running bats on kogito-persistence"
+./bats/bin/bats modules/kogito-persistence/tests/bats
+
+echo "----> running bats on kogito-s2i-core"
+./bats/bin/bats modules/kogito-s2i-core/tests/bats
\ No newline at end of file

From 1cfba627655ee46d38adbaaa765b341fec8a1661 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 4 Aug 2020 21:13:55 +0200
Subject: [PATCH 164/709] [KOGITO-2912] Reorganized scripts (#199)

* KOGITO-2855 version only in 1 script

* KOGITO-2912 reorganized scripts

* Update scripts/README.md

Co-authored-by: Kevin Mok <kevin.mok@live.ca>

Co-authored-by: Spolti <filippespolti@gmail.com>
Co-authored-by: Kevin Mok <kevin.mok@live.ca>
---
 Jenkinsfile-Nightly                           |   2 +-
 Jenkinsfile.deploy                            |   4 +-
 scripts/README.md                             | 111 +++++++++------
 scripts/common.py                             | 134 +++++++++++++++++-
 scripts/manage-kogito-version.py              |  90 +++---------
 scripts/push-staging.py                       |   2 +-
 ...formation.py => update-maven-artifacts.py} |  17 +--
 scripts/update-tests-maven-repo.py            |  66 ---------
 scripts/update-tests.py                       |  35 +++++
 9 files changed, 272 insertions(+), 189 deletions(-)
 rename scripts/{update-maven-information.py => update-maven-artifacts.py} (85%)
 delete mode 100644 scripts/update-tests-maven-repo.py
 create mode 100644 scripts/update-tests.py

diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
index 97d9d23a042..ae250aa9329 100644
--- a/Jenkinsfile-Nightly
+++ b/Jenkinsfile-Nightly
@@ -62,7 +62,7 @@ pipeline{
         }
         stage('Update Artifacts'){
             steps{
-                sh "python3 scripts/update-maven-information.py"
+                sh "python3 scripts/update-maven-artifacts.py"
             }
         }
         stage('Prepare offline kogito-examples'){
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index dc8b42d1e8a..5f702f6e85d 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -78,7 +78,7 @@ pipeline {
             steps {
                 script {
                     // Update artifacts
-                    updateArtifactCmd = "python3 scripts/update-maven-information.py"
+                    updateArtifactCmd = "python3 scripts/update-maven-artifacts.py"
                     if(params.MAVEN_ARTIFACT_REPOSITORY != ''){
                         updateArtifactCmd += " --repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
                     }
@@ -102,7 +102,7 @@ pipeline {
             steps {
                 script {
                     // Update repo in tests
-                    sh "python3 scripts/update-tests-maven-repo.py --repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
+                    sh "python3 scripts/update-tests.py --repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
 
                     // Debug purpose in case of issue
                     sh "cat tests/test-apps/clone-repo.sh"
diff --git a/scripts/README.md b/scripts/README.md
index be24c60baae..9ca3636d098 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -7,13 +7,13 @@ Today we have these scripts:
 - [manage-kogito-version.py](manage-kogito-version.py)
 - [push-local-registry.sh](push-local-registry.sh)
 - [push-staging.py](push-staging.py)
-- [update-maven-information.py](update-maven-information.py)
+- [update-maven-artifacts.py](update-maven-artifacts.py)
+- [update-tests.py](update-tests.py)
 - [common.py](common.py)
 
 ### Managing Kogito images version
 
-The manage-kogito-version script will help when we need to update the current version due a new release or prepare the
-master branch for the next release.
+The manage-kogito-version script will help when we need to update the current version due a new release.
 
 #### Script dependencies
 
@@ -22,27 +22,32 @@ The `manage-kogito-version.py` has one dependency that needs to be manually inst
 ```bash
 $ pip install -U ruamel.yaml
 ```
-This script has a dependency on `common.py`.
+
+This script has also a dependency on `common.py`.
 
 #### Usage
-Its usage is pretty simple, only one parameter is accepted:
+
+Its default behavior is pretty simple:
 
 ```bash
 $ python manage-kogito-version.py --bump-to 1.0.0  
 ```
 
-The script also allows you to set a custom branch for the kogito-examples repository on the behave tests. Useful for minor
-releases, e.g. 0.9.x branch.
+This will set images' version, artifacts reference version and examples reference to 1.0.0.
+
+You can also set a custom version for artifacts and/or a custom reference to the kogito-examples repository:
 
 ```bash
-$ python manage-kogito-version.py --bump-to 0.10.1-rc1 --apps-branch 0.10.x
+$ python manage-kogito-version.py --bump-to 0.10.2 --artifacts-version 0.10.5 --examples-ref 0.10.x
 ```
 
-The command above will update all the needed files to the version 1.0.0. These changes includes updates on
+The command above will update all the needed files to the given version(s).  
+These changes include updates on
 
  - all cekit modules
  - image.yaml file descriptor
  - kogito-imagestream.yaml
+ - tests files for default values
  
 
 ### Pushing Images to a local registry
@@ -68,17 +73,16 @@ To execute the script directly:
 $ /bin/sh scripts/push-local-registry.sh my_registry_address 0.10 my_namespace
 ```
 
-### Pushing staging images.
+### Pushing staging images
 
 Staging images are the release candidates which are pushed mainly after big changes that has direct impact on how
 the images will behave and also when new functionality is added.
 
 The script updates the version on:
 
- - all cekit modules
- - image.yaml file descriptor
- - kogito-imagestream.yaml
- 
+- all cekit modules
+- image.yaml file descriptor
+- kogito-imagestream.yaml
 
 #### Script dependencies
 
@@ -96,61 +100,88 @@ This script is called as the last step of the `make push-staging` command define
 It will look for the current RC images available on [quay.io](https://quay.io/organization/kiegroup) to increase the rc tag 
 accordingly then push the new tag so it can be tested by others. 
 
-### Updating Kogito Images service artifacts.
+### Updating Kogito Images Service artifacts
 
-The update-maven-information script will help in fetching the artifacts from the Maven repository
-and update them in the `module.yaml` files of the kogito services
+The `update-maven-artifacts` script will help in fetching the artifacts from the Maven repository and update them into service modules (`module.yaml` will be updated)
 
 #### Script dependencies
 
-The `update-maven-information.py` has some dependencies that needs to be manually installed:
+The `update-maven-artifacts.py` has some dependencies that needs to be manually installed:
 
 ```bash
 $ pip install -U ruamel.yaml
 $ pip install -U elementpath
 ```
-It's usage is pretty simple as well:
+
+#### Usage
+
+Its default behavior is pretty simple:
 
 ```bash
-$ python update-maven-information.py
+$ python update-maven-artifacts.py
 ```
 
-#### Usage
+##### Update Maven artifact repository url
+
+This script also accepts `--repo-url` as argument in specifying the Maven repository from where to fetch the artifacts
+
+```bash
+$ python update-maven-artifacts.py --repo-url='https://maven-repository.mirror.com/public'
+```
+
+If no argument is given, it takes the JBoss repository as the default value.
+
+The command will update the needed files with the new URL:
+
+- kogito-data-index/module.yaml
+- kogito-jobs-service/module.yaml
+- kogito-management-console/module.yaml
+- kogito-trusty/module.yaml
+- kogito-explainability/module.yaml
+
+### Update tests script
 
-##### Update Maven artifact version
+The `update-tests` script allows you to change some information in order to perform some testing.
+
+#### Script dependencies
 
-This script also accepts `--version` as argument in specifying the current version of artifacts which need to be fetched
+The `update-tests.py` has some dependencies that needs to be manually installed:
 
 ```bash
-$ python update-maven-information.py --version='8.0.0-SNAPSHOT'
-$ python update-maven-information.py --version='0.12.0'
+$ pip install -U ruamel.yaml
 ```
-if no argument is given, it takes the default value of `8.0.0-SNAPSHOT`
 
-The command will update the needed files with latest  URL:
+#### Usage
 
- - kogito-data-index/module.yaml
- - kogito-jobs-service/module.yaml
- - kogito-management-console/module.yaml
+##### Update repository url
 
-as well as the `KOGITO_VERSION` environment variable present in the Kogito modules.
+```bash
+$ python update-tests.py --repo-url 'https://maven-repository.mirror.com/public'
+```
 
-##### Update Maven artifact repository url
+This will add this repository as an extra repository for artifacts to be retrieved from into the behave tests, next to the default JBoss repository.
 
-This script also accepts `--repo-url` as argument in specifying the Maven repository from where to fetch the artifacts
+You can also completely replace the main Jboss repository:
 
 ```bash
-$ python update-maven-information.py --repo-url='https://maven-repository.mirror.com/public'
+$ python update-tests.py --repo-url 'https://maven-repository.mirror.com/public' --replace-jboss-repo
 ```
-if no argument is given, it takes the JBoss repository as the default value.
 
-The command will update the needed files with the new URL:
+##### Update artifacts version
+
+```bash
+$ python update-tests.py --artifacts-version 1.0.0
+```
 
- - kogito-data-index/module.yaml
- - kogito-jobs-service/module.yaml
- - kogito-management-console/module.yaml
+This will set the default artifacts version to 1.0.0 into the behave tests.
+
+##### Update Examples URI and Ref
+
+```bash
+$ python update-tests.py --examples-uri https://github.com/<yournamespace>/kogito-examples --examples-ref 1.0.0
+```
 
-as well as the `JBOSS_MAVEN_REPO_URL` where present in the repository.
+This will update the examples uri and/or the ref for the tests.
 
 ### Common script
 
diff --git a/scripts/common.py b/scripts/common.py
index 57598d310a1..066464c0714 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -26,6 +26,13 @@
 # image.yaml file definition that needs to be updated
 IMAGE_FILENAME = "image.yaml"
 
+# behave tests that needs to be update
+BEHAVE_BASE_DIR = 'tests/features'
+BEHAVE_TESTS = {"kogito-quarkus-ubi8-s2i.feature", "kogito-springboot-ubi8-s2i.feature",
+                "kogito-quarkus-jvm-ubi8.feature", "kogito-springboot-ubi8.feature"}
+
+CLONE_REPO_SCRIPT='tests/test-apps/clone-repo.sh'
+
 def yaml_loader():
     """
     default yaml Loader
@@ -83,6 +90,9 @@ def update_image_stream(target_version):
         raise
 
 def get_all_module_dirs():
+    """
+    Retrieve the module directories
+    """
     modules = []
 
     # r=>root, d=>directories, f=>files
@@ -94,6 +104,9 @@ def get_all_module_dirs():
     return modules
 
 def get_kogito_module_dirs():
+    """
+    Retrieve the Kogito module directories
+    """
     modules = []
 
     for moduleName in MODULES:
@@ -129,12 +142,12 @@ def update_module_version(moduleDir, target_version):
         raise
 
 
-def update_kogito_version_env_in_modules(target_version):
+def update_artifacts_version_env_in_modules(artifacts_version):
     """
     Update all modules which contains the `KOGITO_VERSION` env var.
     :param target_version: kogito version used to update all modules which contains the `KOGITO_VERSION` env var
     """
-    update_env_in_all_modules("KOGITO_VERSION", target_version)
+    update_env_in_all_modules("KOGITO_VERSION", artifacts_version)
 
 def update_env_in_all_modules(envKey, envValue):
     """
@@ -170,6 +183,123 @@ def update_env_in_module(module_dir, envKey, envValue):
     except TypeError:
         raise
 
+def update_artifacts_version_in_python_scripts(artifacts_version):
+    """
+    Update python scripts with the default artifacts version
+    :param artifacts_version: artifacts version to set
+    """
+    print("Set artifacts_version {} in python scripts".format(artifacts_version))
+    pattern = re.compile(r'(ARTIFACTS_VERSION=.*)')
+    replacement = 'ARTIFACTS_VERSION="{}"'.format(artifacts_version)
+    update_in_file("scripts/update-maven-artifacts.py", pattern, replacement)
+
+def update_examples_ref_in_behave_tests(examples_ref):
+    """
+    Update examples git reference into behave tests
+    :param examples_ref: kogito-examples reference
+    """
+    print("Set examples_ref {} in behave tests".format(examples_ref))
+    # this pattern will look for any occurrences of using master or using x.x.x
+    pattern = re.compile(r'(using master)|(using \s*([\d.]+.x))|(using \s*([\d.]+))')
+    replacement = 'using {}'.format(examples_ref)
+    update_in_behave_tests(pattern, replacement)
+
+def update_examples_uri_in_behave_tests(examples_uri):
+    """
+    Update examples uri into behave tests
+    :param examples_uri: kogito-examples uri
+    """
+    print("Set examples_uri {} in behave tests".format(examples_uri))
+    # pattern to get the default examples uri
+    pattern = re.compile(r'(https://github.com/kiegroup/kogito-examples.git)')
+    replacement = examples_uri
+    update_in_behave_tests(pattern, replacement)
+
+def update_artifacts_version_in_behave_tests(artifacts_version):
+    """
+    Update artifacts version into behave tests
+    :param artifacts_version: artifacts version to set
+    """
+    print("Set artifacts_version {} in behave tests".format(artifacts_version))
+    # pattern to change the KOGITO_VERSION
+    pattern = re.compile('\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT))[\s]*\|')
+    replacement = '| KOGITO_VERSION | {} | '.format(artifacts_version)
+    update_in_behave_tests(pattern, replacement)
+
+def update_maven_repo_in_behave_tests(repo_url, replaceJbossRepository):
+    """
+    Update maven repository into behave tests
+    :param repo_url: Maven repository url
+    :param replaceJbossRepository: Set to true if default Jboss repository needs to be overriden
+    """
+    print("Set maven repo {} in behave tests".format(repo_url))
+    pattern = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
+    envVarKey = "MAVEN_REPO_URL"
+    if replaceJbossRepository:
+        envVarKey = "JBOSS_MAVEN_REPO_URL"
+    replacement = "| variable | value |\n      | {} | {} |\n      | MAVEN_DOWNLOAD_OUTPUT | true |".format(envVarKey, repo_url)
+    update_in_behave_tests(pattern, replacement)
+
+def update_in_behave_tests(pattern, replacement):
+    """
+    Update all behave tests files
+    :param pattern: Pattern to look for into file
+    :param replacement: What to put instead if pattern found
+    """
+    for feature in BEHAVE_TESTS:
+        update_in_file(os.path.join(BEHAVE_BASE_DIR, feature), pattern, replacement)
+
+def update_examples_ref_in_clone_repo(examples_ref):
+    """
+    Update examples git reference into clone-repo.sh script
+    :param examples_ref: kogito-examples reference
+    """
+    print("Set examples_ref {} in clone-repo script".format(examples_ref))
+    pattern = re.compile(r'(git checkout.*)')
+    replacement = "git checkout master"
+    if examples_ref != 'master':
+        replacement = "git checkout -b {} {}".format(examples_ref, examples_ref)
+    update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
+
+def update_examples_uri_in_clone_repo(examples_uri):
+    """
+    Update examples uri into clone-repo.sh script
+    :param examples_uri: kogito-examples uri
+    """
+    print("Set examples_uri {} in clone-repo script".format(examples_uri))
+    pattern = re.compile(r'(git clone.*)')
+    replacement = "git clone {}".format(examples_uri)
+    update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
+
+def update_maven_repo_in_clone_repo(repo_url, replaceJbossRepository):
+    """
+    Update maven repository into clone-repo.sh script
+    :param repo_url: Maven repository url
+    :param replaceJbossRepository: Set to true if default Jboss repository needs to be overriden
+    """
+    print("Set maven repo {} in clone-repo script".format(repo_url))
+    pattern = ""
+    replacement = ""
+    if replaceJbossRepository:
+        pattern = re.compile(r'(export JBOSS_MAVEN_REPO_URL=.*)')
+        replacement = 'export JBOSS_MAVEN_REPO_URL="{}"'.format(repo_url)
+    else :
+        pattern = re.compile(r'(# export MAVEN_REPO_URL=.*)')
+        replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
+    update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
+
+def update_in_file(file, pattern, replacement):
+    """
+    Update in given file
+    :param file: file to update
+    :param pattern: Pattern to look for into file
+    :param replacement: What to put instead if pattern found
+    """
+    with open(file) as fe:
+        updated_value = pattern.sub(replacement, fe.read())
+    with open(file, 'w') as fe:
+        fe.write(updated_value)
+    
 if __name__ == "__main__":
     for m in get_kogito_module_dirs():
         print("module {}".format(m))
\ No newline at end of file
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 5c62dbc078b..f169116b4d6 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -19,64 +19,11 @@
 import re
 import os
 
-# behave tests that needs to be update
-BEHAVE_TESTS = {"kogito-quarkus-ubi8-s2i.feature", "kogito-springboot-ubi8-s2i.feature",
-                "kogito-quarkus-jvm-ubi8.feature", "kogito-springboot-ubi8.feature"}
-
-
-
-def update_behave_tests(target_version, tests_branch):
-    """
-    Will update the behave tests accordingly.
-    :param target_version:
-    :param tests_branch:
-    """
-    base_dir = 'tests/features'
-
-    # this pattern will look for any occurrences of using master or using x.x.x
-    pattern_branch = re.compile(r'(using master)|(using \s*([\d.]+.x))|(using \s*([\d.]+))')
-    pattern_version_env = re.compile('\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT))[\s]*\|')
-    # kogito examples does not have the version on built examples anymore, let's comment it out for now.
-    # quarkus_native_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner\s)|((\s*([\d.]+)-runner\s)|(\s*([\d.]+)-SNAPSHOT-runner\s))')
-    # quarkus_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT-runner.jar)|((\s*([\d.]+)-runner.jar)|(\s*([\d.]+)-SNAPSHOT-runner.jar))')
-    # spring_pattern_app_version = re.compile(r'(8.0.0-SNAPSHOT.jar)|((\s*([\d.]+).jar)|(\s*([\d.]+)-SNAPSHOT.jar))')
-    for feature in BEHAVE_TESTS:
-        print("Updating feature {0}".format(feature))
-        with open(os.path.join(base_dir, feature)) as fe:
-            updated_value = pattern_branch.sub('using ' + tests_branch, fe.read())
-            updated_value = pattern_version_env.sub('| KOGITO_VERSION | ' + target_version + ' | ', updated_value)
-            # kogito examples does not have the version on built examples anymore, let's comment it out for now.
-            # updated_value = quarkus_native_pattern_app_version.sub(tests_version + '-runner ', updated_value)
-            # updated_value = quarkus_pattern_app_version.sub(tests_version + '-runner.jar', updated_value)
-            # updated_value = spring_pattern_app_version.sub(tests_version + '.jar', updated_value)
-
-        with open(os.path.join(base_dir, feature), 'w') as fe:
-            fe.write(updated_value)
-
-
-def update_test_apps_clone_repo(target_branch):
-    file = 'tests/test-apps/clone-repo.sh'
-    print('Updating file {}'.format(file))
-    if target_branch == 'master':
-        os.system('sed -i \'s/^git checkout.*/git checkout master/\' ' + file)
-    elif 'x' in target_branch:
-        os.system('sed -i \'s/^git checkout.*/git checkout -b ' + target_branch + '/\' ' + file)
-    else:
-        os.system('sed -i \'s/^git checkout.*/git checkout -b ' + target_branch + ' ' + target_branch + '/\' ' + file)
-
-def update_python_scripts(target_version):
-    '''
-    Updates the clone-repo.sh script for adding the given repository URL to the Maven settings.
-    :param target_version: Maven Repository URL to set
-    '''
-    file = 'scripts/update-maven-information.py'
-    print('Updating file {}'.format(file))
-    os.system('sed -i \'s|^DEFAULT_VERSION = .*|DEFAULT_VERSION = \"{}\"|\' '.format(target_version) + file)
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Kogito Version Manager')
     parser.add_argument('--bump-to', dest='bump_to', help='bump everything to the next version')
-    parser.add_argument('--apps-branch', dest='apps_branch',
+    parser.add_argument('--artifacts-version', dest='artifacts_version', help='update the artifacts version in modules/tests. Default is equal to bump-to')
+    parser.add_argument('--examples-ref', dest='examples_ref',
                         help='Update Behave tests to use the desired branch for kogito-examples')
     parser.add_argument('--confirm', default=False, action='store_true', help='To confirm automatically the setup')
 
@@ -88,27 +35,36 @@ def update_python_scripts(target_version):
         pattern = '\d+.\d+.(\d+$|\d+-rc\d+$|\d+-snapshot$)'
         regex = re.compile(r'\d+.\d+.(\d+$|\d+-rc\d+|\d+-snapshot$)')
         valid = regex.match(args.bump_to)
-        tests_branch = ""
+        examples_ref = ""
         if valid:
-            tests_branch = args.bump_to
-            if args.apps_branch is not None:
-                tests_branch = args.apps_branch
+            examples_ref = args.bump_to
+            if args.examples_ref is not None:
+                examples_ref = args.examples_ref
             if 'rc' in args.bump_to:
-                tests_branch = 'master'
+                examples_ref = 'master'
+            
+            artifacts_version = args.bump_to
+            if args.artifacts_version:
+                artifacts_version = args.artifacts_version
+
+            print("Images version will be updated to {0}".format(args.bump_to))
+            print("Artifacts version will be updated to {0}".format(artifacts_version))
+            print("Examples ref will be updated to {}".format(examples_ref))
 
-            print("Version will be updated to {0}".format(args.bump_to))
-            print("Version on behave tests examples will be updated to version {0} and branch {1}".format(args.bump_to,
-                                                                                                          tests_branch))
             if not args.confirm:
                 input("Is the information correct? If so press any key to continue...")
 
+            # modules
             common.update_image_version(args.bump_to)
             common.update_image_stream(args.bump_to)
             common.update_modules_version(args.bump_to)
-            common.update_kogito_version_env_in_modules(args.bump_to)
-            update_behave_tests(args.bump_to, tests_branch)
-            update_test_apps_clone_repo(tests_branch)
-            update_python_scripts(args.bump_to)
+            common.update_artifacts_version_env_in_modules(artifacts_version)
+            common.update_artifacts_version_in_python_scripts(artifacts_version)
+
+            # tests default values
+            common.update_examples_ref_in_behave_tests(examples_ref)
+            common.update_examples_ref_in_clone_repo(examples_ref)
+            common.update_artifacts_version_in_behave_tests(artifacts_version)
         else:
             print("Provided version {0} does not match the expected regex - {1}".format(args.bump_to, pattern))
     else:
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 3ffa44caaf6..e02e82c9348 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -140,7 +140,7 @@ def get_next_rc_version(current_rc_version):
     common.update_image_version(version)
     common.update_image_stream(version)
     common.update_modules_version(version)
-    common.update_kogito_version_env_in_modules(version)
+    common.update_artifacts_version_env_in_modules(version)
 
     find_next_tag()
     tag_and_push_images()
diff --git a/scripts/update-maven-information.py b/scripts/update-maven-artifacts.py
similarity index 85%
rename from scripts/update-maven-information.py
rename to scripts/update-maven-artifacts.py
index 8456493cebe..eb6a8b08583 100644
--- a/scripts/update-maven-information.py
+++ b/scripts/update-maven-artifacts.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 #Script responsible for fetching the latest artifacts of kogito services and updating their module.yaml files as well as updating Maven version
 #Should be run from root directory of the repository
-#Sample usage:  python3 scripts/update-maven-information.py
+#Sample usage:  python3 scripts/update-maven-artifacts.py
 #
 #Dependencies
 # ruamel.yaml
@@ -19,8 +19,9 @@
 import argparse
 
 DEFAULT_REPO_URL = "https://repository.jboss.org/nexus/content/groups/public/"
-DEFAULT_VERSION = "8.0.0-SNAPSHOT"
-DEFAULT_ARTIFACT_PATH = "org/kie/kogito"
+KOGITO_ARTIFACT_PATH = "org/kie/kogito"
+
+ARTIFACTS_VERSION="8.0.0-SNAPSHOT"
 
 Modules = {
     #service-name: module-name(directory in which module's module.yaml file is present)
@@ -103,22 +104,18 @@ def update_artifacts(service,modulePath):
         common.yaml_loader().dump(data, module)
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and version.')
+    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given maven repository')
     parser.add_argument('--repo-url', dest='repo_url', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
-    parser.add_argument('--version', dest='version', default=DEFAULT_VERSION, help='Defines the version of artifacts to retrieve from the repository url, defaults to {}'.format(DEFAULT_VERSION))
     args = parser.parse_args()
     
     # Update Kogito Service modules
     for serviceName, modulePath in Modules.items():
         service = {
-            "repo_url" : args.repo_url + "{}/{}/{}/".format(DEFAULT_ARTIFACT_PATH, serviceName, args.version),
+            "repo_url" : args.repo_url + "{}/{}/{}/".format(KOGITO_ARTIFACT_PATH, serviceName, ARTIFACTS_VERSION),
             "name" : serviceName,
-            "version" : args.version
+            "version" : ARTIFACTS_VERSION
         }
         moduleYamlFile = "modules/{}/module.yaml".format(modulePath)
         
         update_artifacts(service, moduleYamlFile)
         print("Successfully updated the artifacts for: ", serviceName)
-    
-    # Need also to set the KOGITO_VERSION for artifacts to the given one
-    common.update_kogito_version_env_in_modules(args.version)
diff --git a/scripts/update-tests-maven-repo.py b/scripts/update-tests-maven-repo.py
deleted file mode 100644
index 9c9e64daab1..00000000000
--- a/scripts/update-tests-maven-repo.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python3
-#Script responsible to update the tests with 
-#Should be run from root directory of the repository
-#Sample usage:  python3 scripts/update-tests-maven-repo.py
-
-import re
-import os
-import argparse
-
-MAVEN_MODULE="kogito-maven/3.6.x"
-
-# behave tests that needs to be update
-S2I_BEHAVE_TESTS = {"kogito-quarkus-ubi8-s2i.feature", "kogito-springboot-ubi8-s2i.feature"}
-
-def update_test_apps_clone_repo(repo_url, replaceJbossRepository):
-    '''
-    Updates the clone-repo.sh script for adding the given repository URL to the Maven settings.
-    :param repo_url: Maven Repository URL to set
-    :param replaceJbossRepository: If enabled, replace the default JBoss repository
-    '''
-    file = 'tests/test-apps/clone-repo.sh'
-    print('Updating file {}'.format(file))
-    if replaceJbossRepository:
-        os.system('sed -i \'s|^export JBOSS_MAVEN_REPO_URL=.*|export JBOSS_MAVEN_REPO_URL=\"{}\"|\' '.format(repo_url) + file)
-    else :
-        os.system('sed -i \'s|^# export MAVEN_REPO_URL=.*|export MAVEN_REPO_URL=\"{}\"|\' '.format(repo_url) + file)
-
-def update_maven_repo_in_features(repo_url, replaceJbossRepository):
-    '''
-    Updates S2I feature tests with the given repository URL.
-    :param repo_url: Maven Repository URL to set
-    :param replaceJbossRepository: If enabled, replace the default JBoss repository
-    '''
-    base_dir = 'tests/features'
-    pattern_branch = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
-
-    envVarKey = "MAVEN_REPO_URL"
-    if replaceJbossRepository:
-        envVarKey = "JBOSS_MAVEN_REPO_URL"
-
-
-    for feature in S2I_BEHAVE_TESTS:
-        print("Updating feature {0}".format(feature))
-        with open(os.path.join(base_dir, feature)) as fe:
-            updated_value = pattern_branch.sub("| variable | value |\n      | {} | {} |\n      | MAVEN_DOWNLOAD_OUTPUT | true |".format(envVarKey, repo_url), fe.read())
-
-        with open(os.path.join(base_dir, feature), 'w') as fe:
-            fe.write(updated_value)
-
-def update_maven_repo_in_tests(repo_url, replaceJbossRepository):
-    '''
-    Updates images tests with the given repository URL.
-    :param repo_url: Maven Repository URL to set
-    :param replaceJbossRepository: If enabled, replace the default JBoss repository
-    '''
-    update_maven_repo_in_features(repo_url, replaceJbossRepository)
-    update_test_apps_clone_repo(repo_url, replaceJbossRepository)
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and version.')
-    parser.add_argument('--repo-url', dest='repo_url', default='', help='Defines the url of the repository to setup into the tests')
-    parser.add_argument('--replace-jboss-repo', dest='replace_jboss_repo', default=False, action='store_true', help='Enable if repo-url should replace the main JBoss repository')
-    args = parser.parse_args()
-
-    if args.repo_url != '':
-        update_maven_repo_in_tests(args.repo_url, args.replace_jboss_repo)
diff --git a/scripts/update-tests.py b/scripts/update-tests.py
new file mode 100644
index 00000000000..ea52662b81e
--- /dev/null
+++ b/scripts/update-tests.py
@@ -0,0 +1,35 @@
+#!/usr/bin/python3
+#Script responsible to update the tests with 
+#Should be run from root directory of the repository
+#Sample usage:  python3 scripts/update-tests.py
+
+import sys
+sys.dont_write_bytecode = True
+
+import common
+
+import argparse
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and version.')
+    parser.add_argument('--repo-url', dest='repo_url', help='Defines the url of the repository to setup into the tests')
+    parser.add_argument('--replace-jboss-repo', dest='replace_jboss_repo', default=False, action='store_true', help='Enable if repo-url should replace the main JBoss repository')
+    parser.add_argument('--examples-uri', dest='examples_uri', help='To update the examples uri for testing')
+    parser.add_argument('--examples-ref', dest='examples_ref', help='To update the examples ref for testing')
+    parser.add_argument('--artifacts-version', dest='artifacts_version', help='To update the artifacts version for testing')
+    args = parser.parse_args()
+
+    if args.repo_url:
+        common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_jboss_repo)
+        common.update_maven_repo_in_clone_repo(args.repo_url, args.replace_jboss_repo)
+
+    if args.examples_uri:
+        common.update_examples_uri_in_behave_tests(args.examples_uri)
+        common.update_examples_uri_in_clone_repo(args.examples_uri)
+
+    if args.examples_ref:
+        common.update_examples_ref_in_behave_tests(args.examples_ref)
+        common.update_examples_ref_in_clone_repo(args.examples_ref)
+
+    if args.artifacts_version:
+        common.update_artifacts_version_in_behave_tests(args.artifacts_version)
\ No newline at end of file

From a347f11fcb82c4d1a35e8a13cea99242cf1ce49e Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 5 Aug 2020 18:57:27 +0200
Subject: [PATCH 165/709] KOGITO-2946 maven artifacts should fail on 404 (#201)

---
 scripts/common.py                 |  2 +-
 scripts/update-maven-artifacts.py | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/common.py b/scripts/common.py
index 066464c0714..26acd9b2c97 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -258,7 +258,7 @@ def update_examples_ref_in_clone_repo(examples_ref):
     pattern = re.compile(r'(git checkout.*)')
     replacement = "git checkout master"
     if examples_ref != 'master':
-        replacement = "git checkout -b {} {}".format(examples_ref, examples_ref)
+        replacement = "git checkout -b {0} origin/{1}".format(examples_ref, examples_ref)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
 def update_examples_uri_in_clone_repo(examples_uri):
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index eb6a8b08583..7d7ec5d6cd6 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -75,7 +75,8 @@ def getRunnerURL(service):
     finalVersion = service["version"]
     if isSnapshotVersion(finalVersion):
         finalVersion=getSnapshotVersion(service)
-    url = service["repo_url"] + "{}-{}-runner.jar".format(service["name"], finalVersion)
+    url = service["repo_url"] + "{0}-{1}-runner.jar".format(service["name"], finalVersion)
+    checkUrl(url)
     return url
 
 def getMD5(service):
@@ -86,9 +87,19 @@ def getMD5(service):
     '''
     runnerURL=getRunnerURL(service)
     runnerMD5URL=runnerURL+".md5"
+    checkUrl(runnerMD5URL)
     runnerMD5=sp.getoutput("curl -s  {}".format(runnerMD5URL))
     return runnerMD5
 
+def checkUrl(url):
+    '''
+    Check url returns 2xx code. 
+    :param url
+    '''
+    resultCode=int(sp.getoutput('curl -I -s -o /dev/null -w "%{0}" {1}'.format('{http_code}', url)))
+    if resultCode < 200 or resultCode >= 300:
+        raise ValueError('Got http code {0} for url {1}'.format(resultCode, url))
+
 def update_artifacts(service,modulePath):
     '''
     Updates the module.yaml file of services with latest artifacts

From ba3a848706b62d8cdcd4af25ac3dca277621281b Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 6 Aug 2020 15:10:40 +0200
Subject: [PATCH 166/709] KOGITO-2767 Fix master to 1.0.0-snapshot version
 (#200)

* KOGITO-2767 Fix master to 1.0.0-snapshot version

* added removal of generated resources
---
 image.yaml                                    |  2 +-
 kogito-imagestream.yaml                       | 54 +++++++++----------
 modules/kogito-data-index/module.yaml         |  6 +--
 modules/kogito-explainability/module.yaml     |  6 +--
 modules/kogito-image-dependencies/module.yaml |  2 +-
 modules/kogito-jobs-service/module.yaml       |  6 +--
 modules/kogito-jq/module.yaml                 |  2 +-
 modules/kogito-kubernetes-client/module.yaml  |  2 +-
 modules/kogito-launch-scripts/module.yaml     |  2 +-
 modules/kogito-logging/module.yaml            |  2 +-
 modules/kogito-management-console/module.yaml |  6 +--
 modules/kogito-persistence/module.yaml        |  2 +-
 modules/kogito-quarkus-jvm/module.yaml        |  2 +-
 modules/kogito-quarkus-s2i/module.yaml        |  4 +-
 modules/kogito-quarkus/module.yaml            |  2 +-
 modules/kogito-s2i-core/added/s2i-core        |  4 ++
 modules/kogito-s2i-core/module.yaml           |  2 +-
 modules/kogito-springboot-s2i/module.yaml     |  4 +-
 modules/kogito-springboot/module.yaml         |  2 +-
 modules/kogito-system-user/module.yaml        |  2 +-
 modules/kogito-trusty/module.yaml             |  6 +--
 scripts/update-maven-artifacts.py             |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  |  6 +--
 .../kogito-springboot-ubi8-s2i.feature        |  2 +-
 24 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/image.yaml b/image.yaml
index d021cc1482b..d20033e4d7f 100644
--- a/image.yaml
+++ b/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 6ca5ca8c37f..6bfe2522af0 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.13.0-rc1'
+        - name: '1.0.0-snapshot'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '0.13.0-rc1'
+            version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:0.13.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.13.0-rc1'
+        - name: '1.0.0-snapshot'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '0.13.0-rc1'
+            version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.13.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.13.0-rc1'
+        - name: '1.0.0-snapshot'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '0.13.0-rc1'
+            version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.13.0-rc1
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.13.0-rc1'
+        - name: '1.0.0-snapshot'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '0.13.0-rc1'
+            version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:0.13.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.13.0-rc1'
+        - name: '1.0.0-snapshot'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '0.13.0-rc1'
+            version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.13.0-rc1
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.13.0-rc1'
+        - name: '1.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Data Index Service
             iconClass: icon-jbpm
             tags: kogito,data-index
             supports: persistence backed by Infinispan server
-            version: '0.13.0-rc1'
+            version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:0.13.0-rc1
+            name: quay.io/kiegroup/kogito-data-index:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.12.0-rc1'
+        - name: '1.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Trusty Service
             iconClass: icon-jbpm
             tags: kogito,trusty
             supports: persistence backed by Infinispan server
-            version: '0.12.0-rc1'
+            version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty:0.12.0-rc1
+            name: quay.io/kiegroup/kogito-trusty:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,18 +162,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.13.0-rc1'
+        - name: '1.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '0.13.0-rc1'
+            version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:0.13.0-rc1
+            name: quay.io/kiegroup/kogito-jobs-service:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -183,16 +183,16 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '0.13.0-rc1'
+        - name: '1.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '0.13.0-rc1'
+            version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:0.13.0-rc1
+            name: quay.io/kiegroup/kogito-management-console:1.0.0-snapshot
 
diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index e53f97deb79..77a7344c1ce 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.dataindex
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-data-index-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20200714.111547-364-runner.jar
-    md5: 00e3d54713261250dd566ecf6a084f54
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service/1.0.0-SNAPSHOT/data-index-service-1.0.0-20200805.111853-4-runner.jar
+    md5: fb97dc0981ed1bfb5d0689b3779dfbec
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index e7988c172e1..7601d40c080 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.explainability
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service/8.0.0-SNAPSHOT/explainability-service-8.0.0-20200720.112616-115-runner.jar
-    md5: a85ebcc521ef22d5f9372f43cf2de5cf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service/1.0.0-SNAPSHOT/explainability-service-1.0.0-20200805.112339-4-runner.jar
+    md5: 562914e133231f088010ef2c9dd0f2c4
 
 execute:
   - script: configure
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index fc043cbb69c..b96d2f635f9 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index b4d7eefaa27..d931e8591a5 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20200714.111450-288-runner.jar
-    md5: ac5ec1f4203e5280c70c1cf78814bc4e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/1.0.0-SNAPSHOT/jobs-service-1.0.0-20200805.111753-5-runner.jar
+    md5: 0faba2a1151175b92c672356d797e8d9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
index 566aa801771..600b0365619 100644
--- a/modules/kogito-jq/module.yaml
+++ b/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 modules:
   install:
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 9030878156e..1dbec6fe976 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index 20ab08b17fc..92d33e7cadf 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index 8112cf540fe..38c09fef01e 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 6f2fcbe111b..4badade39f5 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
@@ -8,8 +8,8 @@ envs:
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/8.0.0-SNAPSHOT/management-console-8.0.0-20200714.111829-195-runner.jar
-    md5: 7849f39587751eae60e3de6b6e655d50
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/1.0.0-SNAPSHOT/management-console-1.0.0-20200805.112213-4-runner.jar
+    md5: a14ed2e58242f0ce4c75660252808bd9
 
 execute:
   - script: configure
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index ad44c13b96c..0f7edba6c96 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 modules:
   install:
diff --git a/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-quarkus-jvm/module.yaml
index 28f892edfe6..2b3374f4e36 100644
--- a/modules/kogito-quarkus-jvm/module.yaml
+++ b/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
index 6e6b3a32109..1cf42804941 100644
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ b/modules/kogito-quarkus-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "8.0.0-SNAPSHOT"
+    value: "1.0.0-SNAPSHOT"
diff --git a/modules/kogito-quarkus/module.yaml b/modules/kogito-quarkus/module.yaml
index 5e129650f95..749033fef23 100644
--- a/modules/kogito-quarkus/module.yaml
+++ b/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index e62f1a500de..a1e4cc042ad 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -145,6 +145,10 @@ function build_kogito_app() {
         -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
         ${MAVEN_ARGS_APPEND} -s $KOGITO_HOME/.m2/settings.xml
 
+        # remove resources generated by the archetype
+        log_info "--> Remove archetype generated resources"
+        rm -rf $PROJECT_ARTIFACT_ID/src/main/resources/*
+
         # copy resources into the generated project
         for item in *
         do
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 15009e3ed21..3ceff48a064 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '0.13.0-rc1'
+version: '1.0.0-snapshot'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
index 3079d209cae..89a2438c5c6 100644
--- a/modules/kogito-springboot-s2i/module.yaml
+++ b/modules/kogito-springboot-s2i/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 execute:
   - script: configure
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "8.0.0-SNAPSHOT"
+    value: "1.0.0-SNAPSHOT"
diff --git a/modules/kogito-springboot/module.yaml b/modules/kogito-springboot/module.yaml
index 65b2bb45f8f..90bc6bc9294 100644
--- a/modules/kogito-springboot/module.yaml
+++ b/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index 39d0bb06b40..a9511a30528 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "0.13.0-rc1"
+version: "1.0.0-snapshot"
 
 execute:
   - script: add-user
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index f81761b89e1..fcd9ec92077 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.trusty
-version: "0.12.0-rc1"
+version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/8.0.0-SNAPSHOT/trusty-service-8.0.0-20200724.024218-120-runner.jar
-    md5: 279d44ddb3bb603ae1c0b882b098e90a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/1.0.0-SNAPSHOT/trusty-service-1.0.0-20200805.112415-4-runner.jar
+    md5: d767b0f1ca2096ac7e320b940ebc5779
 
 execute:
   - script: configure
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 7d7ec5d6cd6..5770c945c92 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -21,7 +21,7 @@
 DEFAULT_REPO_URL = "https://repository.jboss.org/nexus/content/groups/public/"
 KOGITO_ARTIFACT_PATH = "org/kie/kogito"
 
-ARTIFACTS_VERSION="8.0.0-SNAPSHOT"
+ARTIFACTS_VERSION="1.0.0-SNAPSHOT"
 
 Modules = {
     #service-name: module-name(directory in which module's module.yaml file is present)
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index b1944c67b09..fa77323543b 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -250,7 +250,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 8.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 1.0.0-SNAPSHOT | 
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
     And check that page is served
       | property        | value                                                                                            |
@@ -267,7 +267,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | variable | value |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 8.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 1.0.0-SNAPSHOT | 
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
@@ -283,7 +283,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE              | false          |
-      | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
+      | KOGITO_VERSION      | 1.0.0-SNAPSHOT | 
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 6d8435f67ab..078d73a30f2 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -123,5 +123,5 @@ Feature: kogito-springboot-ubi8-s2i image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
-      | KOGITO_VERSION      | 8.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 1.0.0-SNAPSHOT | 
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist

From 8fe7e880e13366ca0912f1e6790cb32f92fdd797 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 6 Aug 2020 15:18:58 +0200
Subject: [PATCH 167/709] KOGITO-2951 Separate build & test stages (#202)

---
 Jenkinsfile        | 49 ++++++++++++++++++++++++++++--------------
 Jenkinsfile.deploy | 53 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 917e591371a..4f131815bd1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -67,24 +67,18 @@ pipeline{
                 sh "make clone-repos"
             }
         }
-        stage('Build and Test Images'){
+        stage('Build Images') {
             steps{
                 script {
-                    build_stages = [:]
-                    IMAGES.each{ image -> build_stages[image] = {
-                            initWorkspace(image)
-                            dir(getWorkspacePath(image)){
-                                try{
-                                    sh "make ${image} cekit_option='--work-dir .'"
-                                }
-                                finally{
-                                    junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
-                                }
-                            
-                            }
-                        }
-                    }
-                    parallel build_stages
+                    IMAGES.each{ image -> initWorkspace(image) }
+                    launchParallelForEachImage("Build", {img -> buildImage(img)})
+                }
+            }
+        }
+        stage('Test Images') {
+            steps {
+                script {
+                    launchParallelForEachImage("Test", {img -> testImage(img)})
                 }
             }
         }
@@ -111,6 +105,29 @@ void cleanImages(){
     sh "docker rmi -f \$(docker images -q) || date"
 }
 
+void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
+    parallelStages = [:]
+    IMAGES.each{ image -> 
+        parallelStages["${stageNamePrefix} ${image}"] = {
+            dir(getWorkspacePath(image)){
+                executeOnImage(image)
+            }
+        }
+    }
+    parallel parallelStages
+}
+
+void buildImage(image) {
+    sh "make ${image} ignore_test=true cekit_option='--work-dir .'"
+}
+
+void testImage(image) {
+    try {
+        sh "make ${image} ignore_build=true cekit_option='--work-dir .'"
+    } finally {
+        junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
+    }
+}
 
 void initWorkspace(String image){
     sh "mkdir -p ${getWorkspacePath(image)}"
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 5f702f6e85d..f2eaa3608b5 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -144,24 +144,21 @@ pipeline {
                 sh "make clone-repos"
             }
         }
-        stage('Build and Test Images'){
+        stage('Build Images') {
             steps{
                 script {
-                    build_stages = [:]
-                    IMAGES.each{ image -> build_stages[image] = {
-                            initWorkspace(image)
-                            dir(getWorkspacePath(image)){
-                                try{
-                                    sh "make ${image} ignore_test=${params.SKIP_TESTS} cekit_option='--work-dir .'"
-                                }
-                                finally{
-                                    junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
-                                }
-                            
-                            }
-                        }
-                    }
-                    parallel build_stages
+                    IMAGES.each{ image -> initWorkspace(image) }
+                    launchParallelForEachImage("Build", {img -> buildImage(img)})
+                }
+            }
+        }
+        stage('Test Images') {
+            when {
+                expression { return !params.SKIP_TESTS }
+            }
+            steps {
+                script {
+                    launchParallelForEachImage("Test", {img -> testImage(img)})
                 }
             }
         }
@@ -207,6 +204,30 @@ void cleanImages(){
     sh "docker rmi -f \$(docker images -q) || date"
 }
 
+void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
+    parallelStages = [:]
+    IMAGES.each{ image -> 
+        parallelStages["${stageNamePrefix} ${image}"] = {
+            dir(getWorkspacePath(image)){
+                executeOnImage(image)
+            }
+        }
+    }
+    parallel parallelStages
+}
+
+void buildImage(image) {
+    sh "make ${image} ignore_test=true cekit_option='--work-dir .'"
+}
+
+void testImage(image) {
+    try {
+        sh "make ${image} ignore_build=true cekit_option='--work-dir .'"
+    } finally {
+        junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
+    }
+}
+
 void tagImages() {
     for(String imageName : IMAGES) {
         sh "docker tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"

From d6d457beb3857f6041d14da8710ad9c6f506b8bf Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Sat, 8 Aug 2020 17:49:47 +0200
Subject: [PATCH 168/709] KOGITO-2995 - Update explainability jars (#205)

* update explainability jars

* update explainability tests

* update python script to handle more than one jar in the image

* check uppercase env variable
---
 .../added/kogito-app-launch.sh                |  8 ++++++-
 modules/kogito-explainability/configure       |  3 ++-
 modules/kogito-explainability/module.yaml     | 10 +++++----
 scripts/update-maven-artifacts.py             | 11 ++++++----
 tests/features/kogito-explainability.feature  | 21 +++++++++++++++----
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
index e8a3e93974a..dee4a2ecb45 100644
--- a/modules/kogito-explainability/added/kogito-app-launch.sh
+++ b/modules/kogito-explainability/added/kogito-app-launch.sh
@@ -19,7 +19,13 @@ CONFIGURE_SCRIPTS=(
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
+if [ ${EXPLAINABILITY_COMMUNICATION^^} = "REST" ] ; then 
+      EXPLAINABILITY_JAR="kogito-explainability-rest-runner.jar"
+    else
+      EXPLAINABILITY_JAR="kogito-explainability-messaging-runner.jar"
+fi
+
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
-        -jar $KOGITO_HOME/bin/kogito-explainability-runner.jar
\ No newline at end of file
+        -jar $KOGITO_HOME/bin/$EXPLAINABILITY_JAR
\ No newline at end of file
diff --git a/modules/kogito-explainability/configure b/modules/kogito-explainability/configure
index bc7c802d127..3cea225bde5 100644
--- a/modules/kogito-explainability/configure
+++ b/modules/kogito-explainability/configure
@@ -5,7 +5,8 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname $0)
 ADDED_DIR=${SCRIPT_DIR}/added
 
-cp -v ${SOURCES_DIR}/kogito-explainability-runner.jar ${KOGITO_HOME}/bin/
+cp -v ${SOURCES_DIR}/kogito-explainability-rest-runner.jar ${KOGITO_HOME}/bin/
+cp -v ${SOURCES_DIR}/kogito-explainability-messaging-runner.jar ${KOGITO_HOME}/bin/
 cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 
 chown -R 1001:0 ${KOGITO_HOME}
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 7601d40c080..e1848374693 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -3,10 +3,12 @@ name: org.kie.kogito.explainability
 version: "1.0.0-snapshot"
 
 artifacts:
-  - name: kogito-explainability-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service/1.0.0-SNAPSHOT/explainability-service-1.0.0-20200805.112339-4-runner.jar
-    md5: 562914e133231f088010ef2c9dd0f2c4
+  - name: kogito-explainability-rest-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/1.0.0-SNAPSHOT/explainability-service-rest-1.0.0-20200807.112159-1-runner.jar
+    md5: 6d4575cad75344c8855a3c186d4ce7de
+  - name: kogito-explainability-messaging-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/1.0.0-SNAPSHOT/explainability-service-messaging-1.0.0-20200807.112136-1-runner.jar
+    md5: 0c81d8af996bcff1b9fbab187a4514b5
 
 execute:
   - script: configure
-
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 5770c945c92..f89ff824b41 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -28,7 +28,8 @@
     #Note: Service name should be same as given in the repository
     "data-index-service": "kogito-data-index",
     "trusty-service": "kogito-trusty",
-    "explainability-service": "kogito-explainability",
+    "explainability-service-rest": "kogito-explainability",
+    "explainability-service-messaging": "kogito-explainability",
     "jobs-service": "kogito-jobs-service",
     "management-console": "kogito-management-console"
 }
@@ -102,15 +103,17 @@ def checkUrl(url):
 
 def update_artifacts(service,modulePath):
     '''
-    Updates the module.yaml file of services with latest artifacts
+    Updates the module.yaml file of services with latest artifacts. When an image contains more than one jar, the correct one is selected by
+    checking if the name of the service is contained in the url of the artifact. 
     :param service: Service information (repo_url, version, name)
     :param modulePath: relative file location of the module.yaml for the kogito service
     '''
 
     with open(modulePath) as module:
         data=common.yaml_loader().load(module)
-        data['artifacts'][0]['url']=getRunnerURL(service)
-        data['artifacts'][0]['md5']=getMD5(service)
+        artifact = next(filter(lambda x: service['name'] in x['url'], data['artifacts']))
+        artifact['url']=getRunnerURL(service)
+        artifact['md5']=getMD5(service)
     with open(modulePath, 'w') as module:
         common.yaml_loader().dump(data, module)
 
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index 9334525f72e..496a007ca86 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -11,19 +11,32 @@ Feature: Kogito-explainability feature.
     And the image should contain label io.k8s.display-name with value Kogito Explainability Service
     And the image should contain label io.openshift.tags with value kogito,explainability
 
-  Scenario: verify if the binary index is available on /home/kogito
+  Scenario: verify if the messaging binary is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-explainability-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-explainability-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/kogito-explainability-messaging-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-explainability-messaging-runner.jar
+
+  Scenario: verify if the rest binary is available on /home/kogito
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/kogito-explainability-rest-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-explainability-rest-runner.jar
 
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-messaging-runner.jar
 
   Scenario: Verify if the debug is correctly enabled and test custom http port
     When container is started with env
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
       | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-runner.jar
\ No newline at end of file
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-messaging-runner.jar
+
+
+  Scenario: Verify if the explainability rest binary is selected by the enviroment variable EXPLAINABILITY_COMMUNICATION
+    When container is started with env
+      | variable      | value |
+      | EXPLAINABILITY_COMMUNICATION  | rest |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-rest-runner.jar
\ No newline at end of file

From c92ad85cf4331f740ed662238efd6294adb9238e Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 11 Aug 2020 10:44:01 +0200
Subject: [PATCH 169/709] KOGITO-2993: Quarkus 1.7.0 => Bump GraalVM to 20.1.0
 (#212)

Co-authored-by: Jose Carvajal <josecarvajalhilario@gmail.com>
---
 README.md                                        |  4 ++--
 kogito-quarkus-overrides.yaml                    |  2 +-
 kogito-quarkus-s2i-overrides.yaml                |  2 +-
 .../{19.x-java-1.8 => 20.x-java-1.8}/configure   |  0
 .../{19.x-java-1.8 => 20.x-java-1.8}/module.yaml | 16 ++++++++--------
 .../{19.x-java-11 => 20.x-java-11}/configure     |  0
 .../{19.x-java-11 => 20.x-java-11}/module.yaml   | 16 ++++++++--------
 modules/kogito-graalvm-scripts/module.yaml       |  2 +-
 tests/features/kogito-quarkus-ubi8-s2i.feature   |  2 +-
 9 files changed, 22 insertions(+), 22 deletions(-)
 rename modules/kogito-graalvm-installer/{19.x-java-1.8 => 20.x-java-1.8}/configure (100%)
 rename modules/kogito-graalvm-installer/{19.x-java-1.8 => 20.x-java-1.8}/module.yaml (54%)
 rename modules/kogito-graalvm-installer/{19.x-java-11 => 20.x-java-11}/configure (100%)
 rename modules/kogito-graalvm-installer/{19.x-java-11 => 20.x-java-11}/module.yaml (54%)

diff --git a/README.md b/README.md
index cc2b04d9f2d..9a80ff8402c 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ To interact with Kogito images, you would need to install the needed dependencie
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
         * used to perform local s2i images using some of the [builder images](#builder-images)
-    * [GraalVM 19.3.1](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-19.3.1) Java 11 or higher
+    * [GraalVM 20.1.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-20.1.0) Java 11 or higher
         * Useful to test Kogito apps on native mode before create a Container image with it.
     * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
         
@@ -131,7 +131,7 @@ lightweight and fast applications ready to run in the Cloud.
 
 The Kogito Quarkus Builder Image is equipped with the following components:
 
- * GraalVM 19.3.1-java11
+ * GraalVM 20.1.0-java11
  * OpenJDK 11.0.6
  * Maven 3.6.2
  
diff --git a/kogito-quarkus-overrides.yaml b/kogito-quarkus-overrides.yaml
index b7037ad12b2..c8e83854e3d 100644
--- a/kogito-quarkus-overrides.yaml
+++ b/kogito-quarkus-overrides.yaml
@@ -34,7 +34,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "19.3.1-java-11"
+    version: "20.1.0-java-11"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.quarkus
 
diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
index e802fc84d3b..aa48d44a0fd 100644
--- a/kogito-quarkus-s2i-overrides.yaml
+++ b/kogito-quarkus-s2i-overrides.yaml
@@ -38,7 +38,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "19.3.1-java-11"
+    version: "20.1.0-java-11"
   - name: org.kie.kogito.graalvm.scripts
   - name: org.kie.kogito.openjdk
     version: "11"
diff --git a/modules/kogito-graalvm-installer/19.x-java-1.8/configure b/modules/kogito-graalvm-installer/20.x-java-1.8/configure
similarity index 100%
rename from modules/kogito-graalvm-installer/19.x-java-1.8/configure
rename to modules/kogito-graalvm-installer/20.x-java-1.8/configure
diff --git a/modules/kogito-graalvm-installer/19.x-java-1.8/module.yaml b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
similarity index 54%
rename from modules/kogito-graalvm-installer/19.x-java-1.8/module.yaml
rename to modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
index 19d7a0fecd0..3e888a7a98e 100644
--- a/modules/kogito-graalvm-installer/19.x-java-1.8/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "19.3.1-java-1.8"
+version: "20.1.0-java-1.8"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,17 +9,17 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "19.3.1"
+    value: "20.1.0"
   - name: "GRAALVM_JAVA_VERSION"
     value: "8"
 
 artifacts:
-- name: graalvm-ce-java8-linux-amd64-19.3.1.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.1/graalvm-ce-java8-linux-amd64-19.3.1.tar.gz
-  md5: dbd66c43fd7c1e13702ec72b3638f49b
-- name: native-image-installable-svm-java8-linux-amd64-19.3.1.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.1/native-image-installable-svm-java8-linux-amd64-19.3.1.jar
-  md5: 495fbab410664f8c070d86f2bef4ecaa
+- name: graalvm-ce-java8-linux-amd64-20.1.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java8-linux-amd64-20.1.0.tar.gz
+  md5: 18ab19e0a739c9172f2e88d3cda09a6d
+- name: native-image-installable-svm-java8-linux-amd64-20.1.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/native-image-installable-svm-java8-linux-amd64-20.1.0.jar
+  md5: bb79277a6fa0f91de88298fe853041e7
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-installer/19.x-java-11/configure b/modules/kogito-graalvm-installer/20.x-java-11/configure
similarity index 100%
rename from modules/kogito-graalvm-installer/19.x-java-11/configure
rename to modules/kogito-graalvm-installer/20.x-java-11/configure
diff --git a/modules/kogito-graalvm-installer/19.x-java-11/module.yaml b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
similarity index 54%
rename from modules/kogito-graalvm-installer/19.x-java-11/module.yaml
rename to modules/kogito-graalvm-installer/20.x-java-11/module.yaml
index 9a86750ca3b..b52b0a497f2 100644
--- a/modules/kogito-graalvm-installer/19.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "19.3.1-java-11"
+version: "20.1.0-java-11"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,17 +9,17 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "19.3.1"
+    value: "20.1.0"
   - name: "GRAALVM_JAVA_VERSION"
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-19.3.1.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.1/graalvm-ce-java11-linux-amd64-19.3.1.tar.gz
-  md5: d2644fee760ff102866c705a7d6b6634
-- name: native-image-installable-svm-java11-linux-amd64-19.3.1.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.1/native-image-installable-svm-java11-linux-amd64-19.3.1.jar
-  md5: e415d5dc0f1249b81a0571300da35db9
+- name: graalvm-ce-java11-linux-amd64-20.1.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz
+  md5: 9061a89c71a1ff00364b7dd99c595935
+- name: native-image-installable-svm-java11-linux-amd64-20.1.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/native-image-installable-svm-java11-linux-amd64-20.1.0.jar
+  md5: c9cd0488bc6536ce7ceb8b34f6bafdee
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml
index 0e735b75c0b..183da12724f 100644
--- a/modules/kogito-graalvm-scripts/module.yaml
+++ b/modules/kogito-graalvm-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
-version: "19.3.1"
+version: "20.1.0"
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index fa77323543b..faf4de0a584 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -244,7 +244,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.3.1
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 20.1.0
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
     Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest

From 79a51ea21fa140150cc094a8bcccc89f5a39e408 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 11 Aug 2020 12:04:48 +0200
Subject: [PATCH 170/709] KOGITO-3024 S2i archetype: rm only process file
 (#210)

---
 modules/kogito-s2i-core/added/s2i-core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index a1e4cc042ad..6751fe8effc 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -147,7 +147,7 @@ function build_kogito_app() {
 
         # remove resources generated by the archetype
         log_info "--> Remove archetype generated resources"
-        rm -rf $PROJECT_ARTIFACT_ID/src/main/resources/*
+        rm -rfv $PROJECT_ARTIFACT_ID/src/main/resources/*.{bpm,bpmn2,dmn,drl}
 
         # copy resources into the generated project
         for item in *

From e20bfa619ea343e5d19a104c4770f4a164726963 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 11 Aug 2020 15:43:05 -0300
Subject: [PATCH 171/709] [KOGITO-1934] - Add a flag on the push-staging.py
 script to allow-override rc images (#208)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Makefile                |  3 ++-
 README.md               |  4 ++++
 scripts/README.md       |  2 ++
 scripts/push-staging.py | 43 +++++++++++++++++++++++++++--------------
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index f3f609777a7..75a20f321b0 100644
--- a/Makefile
+++ b/Makefile
@@ -186,10 +186,11 @@ endif
 
 
 # push staging images to quay.io, done before release, this requires permissions under kiegroup organization
+# to force updating an existing tag instead create a new one, use `$ make push-staging override=-o`
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	python3 scripts/push-staging.py
+	python3 scripts/push-staging.py ${override}
 
 
 # push to local registry, useful to push the built images to local registry
diff --git a/README.md b/README.md
index 9a80ff8402c..cf2a99d8fd1 100644
--- a/README.md
+++ b/README.md
@@ -948,6 +948,10 @@ With this Makefile you can:
       ```bash
       $ make push-staging
       ```
+      To override an existing tag use:
+      ```bash
+      $ make push-staging override=-o
+      ```
       It uses the [push-staging.py](scripts/push-staging.py) script to handle the images.
 
 - Push images to a local registry for testing 
diff --git a/scripts/README.md b/scripts/README.md
index 9ca3636d098..978f92e6be0 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -84,6 +84,7 @@ The script updates the version on:
 - image.yaml file descriptor
 - kogito-imagestream.yaml
 
+
 #### Script dependencies
 
 The `push-staging.py` has a few dependencies that probably needs to be manually installed:
@@ -99,6 +100,7 @@ This script is called as the last step of the `make push-staging` command define
 
 It will look for the current RC images available on [quay.io](https://quay.io/organization/kiegroup) to increase the rc tag 
 accordingly then push the new tag so it can be tested by others. 
+If there is no need to update the tag, there is the option to override it, just set the flag "-o".
 
 ### Updating Kogito Images Service artifacts
 
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index e02e82c9348..e1c39567e8d 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -7,6 +7,7 @@
 # this token can be retrieved from https://quay.io/repository/kiegroup
 #
 import sys
+
 sys.dont_write_bytecode = True
 
 import docker
@@ -14,6 +15,7 @@
 import requests
 import yaml
 import common
+import argparse
 
 # All Kogito images
 IMAGES = ["kogito-quarkus-ubi8", "kogito-quarkus-jvm-ubi8", "kogito-quarkus-ubi8-s2i",
@@ -26,23 +28,24 @@
 QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG = "quay.io/kiegroup/{}"
 
 
-def find_next_tag():
+def find_next_tag(override_tags):
     '''
     Populate the IMAGES_NEXT_RC_TAGS with the next rc tag for each image.
     '''
     global IMAGES_NEXT_RC_TAG
     for image in IMAGES:
-        tag = fetch_tag(image)
+        tag = fetch_tag(image, override_tags)
         print("Next tag for image %s is %s" % (image, tag))
         IMAGES_NEXT_RC_TAG.append('{}:{}'.format(image, tag))
 
 
-def fetch_tag(image):
+def fetch_tag(image, override_tags):
     '''
     fetch the rcX tag for the given image, keep increasing until no rc tag is found
     then return the next tag to be used.
     :param image: image to be verified
-    :return: the next rc tag
+    :param override_tags: if true, does not increase the rc-X tag
+    :return: the next rc tag if override_tags is false.
     '''
     version = find_current_rc_version()
     while True:
@@ -54,10 +57,11 @@ def fetch_tag(image):
         if response.status_code == 404:
             return version
         else:
-            # increase number
-            current_number = version[-1]
-            print("Image found, current rc tag number is %s, increasing..." % current_number)
-            version = get_next_rc_version(version)
+            if override_tags:
+                # increase number
+                current_number = version[-1]
+                print("Image found, current rc tag number is %s, increasing..." % current_number)
+            version = get_next_rc_version(version, override_tags)
 
 
 def tag_and_push_images():
@@ -120,27 +124,36 @@ def find_current_rc_version():
     if '-rc' in version:
         CURRENT_IMAGE_VERSION = version
     else:
-        CURRENT_IMAGE_VERSION = version+'-rc1'
+        CURRENT_IMAGE_VERSION = version + '-rc1'
     return CURRENT_IMAGE_VERSION
 
-def get_next_rc_version(current_rc_version):
+
+def get_next_rc_version(current_rc_version, override_tags):
     '''
     After finding the current rc tag of the image, adds one to it
     e.g: 0.10.0-rc1 will returned as 0.10.0-rc2
     :param current_rc_version: takes the current rc version of the image as input
     :return: returns the next rc version of the image
-    '''    
-    return (current_rc_version.split("rc")[0] + "rc" + str(int(current_rc_version.split("rc")[1]) + 1 ))
+    '''
+    return current_rc_version if override_tags else (
+                current_rc_version.split("rc")[0] + "rc" + str(int(current_rc_version.split("rc")[1]) + 1))
+
 
 if __name__ == "__main__":
-    if 'QUAY_TOKEN' not in  os.environ:
+    if 'QUAY_TOKEN' not in os.environ:
         print("Env QUAY_TOKEN not found, aborting...")
         os._exit(1)
-    version = get_next_rc_version(find_current_rc_version())
+
+    parser = argparse.ArgumentParser(description='Push staging images to Quay.io registry.')
+    parser.add_argument('-o', action='store_true', dest='override_tags',
+                        help='If true, instead increase the tag version, it will use the latest tag retrieved from Quay.')
+    args = parser.parse_args()
+
+    version = get_next_rc_version(find_current_rc_version(), args.override_tags)
     common.update_image_version(version)
     common.update_image_stream(version)
     common.update_modules_version(version)
     common.update_artifacts_version_env_in_modules(version)
 
-    find_next_tag()
+    find_next_tag(args.override_tags)
     tag_and_push_images()

From 990003e07ff8b500ea40fe1d843d3ea6c9453064 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Wed, 12 Aug 2020 02:33:44 +0530
Subject: [PATCH 172/709] [KOGITO-3010] - Add kie-github-ci-bot to
 kogito-images repository (#211)

* KOGITO-3010 - Add kie-github-ci-bot to kogito-images repository

Signed-off-by: Tarun Khandelwal <tarkhand@redhat.com>

* CI trigger phrase changed
---
 .github/bot-files/comments.yml  |  7 +++++++
 .github/bot-files/labels.yml    | 11 +++++++++++
 .github/bot-files/paths.yml     |  4 ++++
 .github/bot-files/reviewers.yml | 11 +++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 .github/bot-files/comments.yml
 create mode 100644 .github/bot-files/labels.yml
 create mode 100644 .github/bot-files/paths.yml
 create mode 100644 .github/bot-files/reviewers.yml

diff --git a/.github/bot-files/comments.yml b/.github/bot-files/comments.yml
new file mode 100644
index 00000000000..f2dd55c2d48
--- /dev/null
+++ b/.github/bot-files/comments.yml
@@ -0,0 +1,7 @@
+prFirstTimeContributor: Welcome to the Kogito Community!. Please make sure you've read the [contributors' guide](README.md#contributing-to-kogito-images-repository)
+
+prCiTrigger: /jenkins test
+
+prEdit: Change detected in the PR, requesting reviews and running pipeline(if required) again
+
+prReopen: PR reopened. requesting reviews and running pipeline(if required) again
\ No newline at end of file
diff --git a/.github/bot-files/labels.yml b/.github/bot-files/labels.yml
new file mode 100644
index 00000000000..23e3e638400
--- /dev/null
+++ b/.github/bot-files/labels.yml
@@ -0,0 +1,11 @@
+# we don't need path labels here but the bot expects atleast one row inside it.
+# This compulsion will be removed after https://issues.redhat.com/browse/KOGITO-3026
+
+labels:
+  - paths:
+      - anything/**
+    labels:
+      - "won't trigger"
+
+default:
+  - 'needs review :mag:'
\ No newline at end of file
diff --git a/.github/bot-files/paths.yml b/.github/bot-files/paths.yml
new file mode 100644
index 00000000000..582ae026c36
--- /dev/null
+++ b/.github/bot-files/paths.yml
@@ -0,0 +1,4 @@
+# In this repository we trigger the CI for every PR
+# After https://issues.redhat.com/browse/KOGITO-3027 this file creation will be optional.
+files:
+  - Jenkinsfile*
\ No newline at end of file
diff --git a/.github/bot-files/reviewers.yml b/.github/bot-files/reviewers.yml
new file mode 100644
index 00000000000..bf733b7098a
--- /dev/null
+++ b/.github/bot-files/reviewers.yml
@@ -0,0 +1,11 @@
+# we don't need path reviewers here but the bot expects atleast one row inside it.
+# This compulsion will be removed after https://issues.redhat.com/browse/KOGITO-3026
+
+review:
+  - paths:
+      - anything/**
+    reviewers:
+      - Kaitou786
+default:
+  - Kaitou786
+  - spolti
\ No newline at end of file

From 81323fd7f1227e358d2ddf9c9ec3c53107a5e4b8 Mon Sep 17 00:00:00 2001
From: shashank <shashankjag3@gmail.com>
Date: Wed, 12 Aug 2020 10:08:23 -0400
Subject: [PATCH 173/709] [KOGITO-2288][KOGITO-2289] Modify jenkinsfiles for
 release pipeline (#183)

* Added parameters

* Kogito 2288 2289

* Changes done in Build Image Stage

Co-authored-by: shashank pathak <shashankpathak@shashanks-MacBook-Air.local>
Co-authored-by: radtriste <tradisso@redhat.com>
---
 Jenkinsfile.deploy  | 310 +++++++++++++++++++++++++++++++++----------
 Jenkinsfile.promote | 311 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 515 insertions(+), 106 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index f2eaa3608b5..2e150278fd4 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -1,21 +1,22 @@
 @Library('jenkins-pipeline-shared-libraries')_
 
-// As Cekit is not compatible with podman, we use docker in that pipeline
-
 IMAGES = [
-            "kogito-quarkus-ubi8", 
-            "kogito-quarkus-jvm-ubi8",
-            "kogito-quarkus-ubi8-s2i",
-            "kogito-springboot-ubi8",
-            "kogito-springboot-ubi8-s2i",
-            "kogito-data-index",
-            "kogito-trusty",
-            "kogito-explainability",
-            "kogito-jobs-service",
-            "kogito-management-console"
+            'kogito-quarkus-ubi8', 
+            'kogito-quarkus-jvm-ubi8',
+            'kogito-quarkus-ubi8-s2i',
+            'kogito-springboot-ubi8',
+            'kogito-springboot-ubi8-s2i',
+            'kogito-data-index',
+            'kogito-trusty',
+            'kogito-explainability',
+            'kogito-jobs-service',
+            'kogito-management-console'
          ]
 
-// Should be a single pipeline (not multibranch)
+
+deployProperties = [ : ]
+
+
 pipeline {
     agent {
         label 'kogito-image-slave && !master'
@@ -26,30 +27,47 @@ pipeline {
         jdk 'kie-jdk11'
     }
 
+    options {
+        buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
+    }
+
     parameters {
         string(name: 'DISPLAY_NAME', defaultValue: '', description: 'Setup a specific build display name')
-        
+
+        // Git information
         string(name: 'BUILD_BRANCH_NAME', defaultValue: 'master', description: 'Which branch to build ? Set if you are not on a multibranch pipeline.')
         string(name: 'GIT_AUTHOR', defaultValue: 'kiegroup', description: 'Which Git author repository ?')
+        
+        // Build&Test information
+        booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: 'Skip tests')
+        string(name: 'MAVEN_ARTIFACT_REPOSITORY', defaultValue: '', description: 'Maven repository where the build artifacts are present')
+        string(name: 'EXAMPLES_URI', defaultValue: '', description: 'Git uri to the kogito-examples repository to use for tests.')
+        string(name: 'EXAMPLES_REF', defaultValue: '', description: 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
 
+        // Deploy information
         booleanParam(name: 'IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
         string(name: 'IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
         string(name: 'IMAGE_REGISTRY', defaultValue: '', description: 'Image registry to use to deploy images')
         string(name: 'IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Image namespace to use to deploy images')
         string(name: 'IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
         string(name: 'IMAGE_TAG', defaultValue: '', description: 'Image tag to use to deploy images')
-
-        string(name: 'MAVEN_ARTIFACT_REPOSITORY', defaultValue: '', description: 'Maven repository where the build artifacts are present')
-
-        booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: 'Skip tests')
+        
+        // Release information
+        booleanParam(name: 'RELEASE', defaultValue: false, description: 'Is this build for a release?')
+        string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Optional if not RELEASE. If RELEASE, cannot be empty.')
     }
 
     environment {
         JAVA_HOME = "${GRAALVM_HOME}"
 
-        OPENSHIFT_API = credentials("OPENSHIFT_API")
-        OPENSHIFT_REGISTRY = credentials("OPENSHIFT_REGISTRY")
-        OPENSHIFT_CREDS_KEY = "OPENSHIFT_CREDS"
+        OPENSHIFT_API = credentials('OPENSHIFT_API')
+        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
+        OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
+
+        BOT_CREDENTIALS_ID = 'bsig-gh-bot'
+        GIT_AUTHOR_BOT = 'bsig-gh-bot'
+
+        BOT_BRANCH_HASH = "${util.generateHash(10)}"
     }
 
     stages {
@@ -58,68 +76,89 @@ pipeline {
                 script {  
                     clean()
 
-                    if (params.DISPLAY_NAME != "") {
+                    if (params.DISPLAY_NAME != '') {
                         currentBuild.displayName = params.DISPLAY_NAME
                     }
 
-                    checkout(githubscm.resolveRepository("kogito-images", params.GIT_AUTHOR, params.BUILD_BRANCH_NAME, false))
-
                     // Set the mirror url only if no artifact repository is given
-                    if (params.MAVEN_ARTIFACT_REPOSITORY == '' 
+                    if (getMavenArtifactRepository() == '' 
                             && env.MAVEN_MIRROR_REPOSITORY != null
                             && env.MAVEN_MIRROR_REPOSITORY != ''){
-                        echo "Set Maven mirror url"
+                        echo 'Set Maven mirror url'
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
                     }
+
+                    checkoutRepo()
+
+                    if (isRelease()) {
+                        assert getProjectVersion() != ''
+                    }
+                }
+            }
+            post {
+                success {
+                    script {
+                        setDeployPropertyIfNeeded('git.branch', getBuildBranch())
+                        setDeployPropertyIfNeeded('git.author', getGitAuthor())
+                        setDeployPropertyIfNeeded('project.version', getProjectVersion())
+                        setDeployPropertyIfNeeded('release', isRelease())
+                    }
                 }
             }
         }
-        stage('Update Maven information') {
+        stage('Prepare for PR') {
+            when {
+                expression { return isRelease() }
+            }
             steps {
                 script {
-                    // Update artifacts
-                    updateArtifactCmd = "python3 scripts/update-maven-artifacts.py"
-                    if(params.MAVEN_ARTIFACT_REPOSITORY != ''){
-                        updateArtifactCmd += " --repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
-                    }
-                    sh updateArtifactCmd
-
-                    // Debug purpose in case of issue
-                    sh "cat modules/kogito-data-index/module.yaml"
-                    sh "cat modules/kogito-trusty/module.yaml"
-                    sh "cat modules/kogito-explainability/module.yaml"
-                    sh "cat modules/kogito-jobs-service/module.yaml"
-                    sh "cat modules/kogito-management-console/module.yaml"
+                    githubscm.forkRepo(env.BOT_CREDENTIALS_ID)
+                    githubscm.createBranch(getBotBranch())
                 }
             }
         }
-        stage('Setup tests repository') {
+        stage('Update project version'){
             when {
-                expression {
-                    return params.MAVEN_ARTIFACT_REPOSITORY != ''
+                expression { return getProjectVersion() != '' }
+            }
+            steps {
+                script{
+                    versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
+                    if(getBuildBranch() != 'master'){
+                        versionCmd += " --examples-ref ${getBuildBranch()}"
+                    }
+                    sh versionCmd
                 }
             }
+        }
+        stage('Update Maven information') {
             steps {
                 script {
-                    // Update repo in tests
-                    sh "python3 scripts/update-tests.py --repo-url ${params.MAVEN_ARTIFACT_REPOSITORY}"
+                    // Update artifacts
+                    updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
+                    if(getMavenArtifactRepository() != ''){
+                        updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()}"
+                    }
+                    sh updateArtifactCmd
 
                     // Debug purpose in case of issue
-                    sh "cat tests/test-apps/clone-repo.sh"
-                    sh "cat tests/features/kogito-quarkus-ubi8-s2i.feature"
-                    sh "cat tests/features/kogito-springboot-ubi8-s2i.feature"
+                    sh 'cat modules/kogito-data-index/module.yaml'
+                    sh 'cat modules/kogito-trusty/module.yaml'
+                    sh 'cat modules/kogito-explainability/module.yaml'
+                    sh 'cat modules/kogito-jobs-service/module.yaml'
+                    sh 'cat modules/kogito-management-console/module.yaml'
                 }
             }
         }
         stage('Validate CeKit Image and Modules descriptors') {
             steps {
-                sh """
+                sh '''
                     curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                     tar -xzvf cekit-image-validator-runner.tgz
                     chmod +x cekit-image-validator-runner
-                """
-                sh "./cekit-image-validator-runner modules/"
-                sh """
+                '''
+                sh './cekit-image-validator-runner modules/'
+                sh '''
                     ./cekit-image-validator-runner image.yaml
                     ./cekit-image-validator-runner kogito-data-index-overrides.yaml
                     ./cekit-image-validator-runner kogito-trusty-overrides.yaml
@@ -131,23 +170,64 @@ pipeline {
                     ./cekit-image-validator-runner kogito-quarkus-s2i-overrides.yaml
                     ./cekit-image-validator-runner kogito-springboot-overrides.yaml
                     ./cekit-image-validator-runner kogito-springboot-s2i-overrides.yaml
-                """
+                '''
+            }
+            post {
+                always {
+                    sh 'rm -rf cekit-image-validator-runner*'
+                }
             }
         }
-        stage('Prepare offline kogito-examples') {
+        stage('Commit Changes'){
             when {
-                expression {
-                    return !params.SKIP_TESTS;
-                }
+                expression { return isRelease() }
             }
             steps {
-                sh "make clone-repos"
+                script {
+                    // Commit changes before changing tests repository
+                    githubscm.commitChanges("Update project version to ${getProjectVersion()} for release")
+                } 
+            }
+        }
+        stage('Setup for testing') {
+            when {
+                expression { return !shouldSkipTests() }
+            }
+            steps {
+                script {
+                    updateTestsCommand = 'python3 scripts/update-tests.py'
+                    if(getMavenArtifactRepository() != ''){
+                        // Update repo in tests
+                        updateTestsCommand += " --repo-url ${getMavenArtifactRepository()}"
+                    }
+
+                    // Set kogito-examples to bot author/branch if release
+                    if(params.EXAMPLES_REF != ""){
+                        updateTestsCommand += " --examples-ref ${params.EXAMPLES_REF}"
+                    }
+                    if(params.EXAMPLES_URI){
+                        updateTestsCommand += " --examples-uri ${params.EXAMPLES_URI}"
+                    }
+
+                    // Launch update tests
+                    sh updateTestsCommand
+
+                    // Debug purpose in case of issue
+                    sh 'cat tests/test-apps/clone-repo.sh'
+                    sh 'cat tests/features/kogito-quarkus-ubi8-s2i.feature'
+                    sh 'cat tests/features/kogito-springboot-ubi8-s2i.feature'
+
+                    // Prepare local examples
+                    sh 'make clone-repos'
+                }
             }
         }
         stage('Build Images') {
-            steps{
+            steps {
                 script {
+                    // Init workspaces before build
                     IMAGES.each{ image -> initWorkspace(image) }
+                    // Build images
                     launchParallelForEachImage("Build", {img -> buildImage(img)})
                 }
             }
@@ -180,28 +260,74 @@ pipeline {
                     pushImages()
                 }
             }
+            post {
+                success {
+                    script {
+                        // Store image deployment information
+                        String imgPrefix = 'kogito-images.image'
+                        setDeployPropertyIfNeeded("${imgPrefix}.registry", getDeployImageRegistry())
+                        setDeployPropertyIfNeeded("${imgPrefix}.namespace", getDeployImageNamespace())
+                        setDeployPropertyIfNeeded("${imgPrefix}.name-suffix", getDeployImageNameSuffix())
+                        setDeployPropertyIfNeeded("${imgPrefix}.tag", getDeployImageTag())
+                    }
+                }
+            }
+        }
+        stage('Create PR') {
+            when {
+                expression {
+                    return isRelease()
+                }
+            }
+            steps{
+                script{
+                    githubscm.pushObject('origin', getBotBranch(), env.BOT_CREDENTIALS_ID)
+                    
+                    def commitMsg = "Update project version to ${getProjectVersion()} for release"
+                    def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}.\nPlease do not merge, it will be merged automatically after testing."
+                    deployProperties['kogito-images.pr.link'] = githubscm.createPR(commitMsg, prBody, getBuildBranch(), env.BOT_CREDENTIALS_ID)
+                }
+            }
+            post {
+                success {
+                    script {
+                        setDeployPropertyIfNeeded('kogito-images.pr.source.uri', "https://github.com/${getBotAuthor()}/kogito-images")
+                        setDeployPropertyIfNeeded('kogito-images.pr.source.ref', getBotBranch())
+                        setDeployPropertyIfNeeded('kogito-images.pr.target.uri', "https://github.com/${getGitAuthor()}/kogito-images")
+                        setDeployPropertyIfNeeded('kogito-images.pr.target.ref', getBuildBranch())
+                    }
+                }
+            }
         }
     }
     post {
         always {
-            script{
+            script {
+                def propertiesStr = deployProperties.collect{ entry -> "${entry.key}=${entry.value}" }.join('\n')
+                writeFile( file : 'deployment.properties' , text : propertiesStr)
+                archiveArtifacts artifacts: 'deployment.properties', allowEmptyArchive:true
                 clean()
             }
         }
     }
 }
 
+void checkoutRepo() {
+    deleteDir()
+    checkout(githubscm.resolveRepository('kogito-images', getGitAuthor(), getBuildBranch(), false))
+}
+
 void clean() {
-    cleanWorkspaces()
+    cleanWs()
     cleanImages()
 
     // Clean Cekit cache, in case we reuse an old node
-    sh "rm -rf \$HOME/.cekit/cache"
+    sh 'rm -rf \$HOME/.cekit/cache'
 }
 
 void cleanImages(){
-    sh "docker rm -f \$(docker ps -a -q) || date"
-    sh "docker rmi -f \$(docker images -q) || date"
+    sh 'docker rm -f \$(docker ps -a -q) || date'
+    sh 'docker rmi -f \$(docker images -q) || date'
 }
 
 void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
@@ -243,7 +369,7 @@ void pushImages() {
 String buildImageName(String imageName) {
     String finalImageName = imageName
     if(getDeployImageNameSuffix() != ''){
-        finalImageName += "-" + getDeployImageNameSuffix()
+        finalImageName += '-' + getDeployImageNameSuffix()
     }
     return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${finalImageName}:${getDeployImageTag()}"
 }
@@ -266,6 +392,12 @@ void loginContainerRegistry(String registry, String credsId){
     }
 }
 
+void setDeployPropertyIfneeded(String key, def value){
+    if(value != null && value != '') {
+        deployProperties[key] = value
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////
 // Deploy image information
 ////////////////////////////////////////////////////////////////////////
@@ -275,7 +407,7 @@ boolean isDeployImageInOpenshiftRegistry(){
 }
 
 String getDeployImageRegistryCredentials(){
-    return isDeployImageInOpenshiftRegistry() ? "" : params.IMAGE_REGISTRY_CREDENTIALS
+    return isDeployImageInOpenshiftRegistry() ? '' : params.IMAGE_REGISTRY_CREDENTIALS
 }
 
 String getDeployImageRegistry(){
@@ -283,7 +415,7 @@ String getDeployImageRegistry(){
 }
 
 String getDeployImageNamespace(){
-    return isDeployImageInOpenshiftRegistry() ? "openshift" : params.IMAGE_NAMESPACE
+    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
 }
 
 String getDeployImageNameSuffix(){
@@ -294,7 +426,7 @@ String getDeployImageTag(){
     if (params.IMAGE_TAG != ""){
         return params.IMAGE_TAG
     } else {
-        return sh(script: "git rev-parse --short HEAD", returnStdout: true).trim()
+        return sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
     }
 }
 
@@ -318,4 +450,46 @@ String getWorkspacesPath(){
 
 String getWorkspacePath(String image){
     return "${getWorkspacesPath()}/${image}"
+}
+
+////////////////////////////////////////////////////////////////////////
+// utils
+////////////////////////////////////////////////////////////////////////
+
+boolean isRelease() {
+    return params.RELEASE
+}
+
+String getBuildBranch() {
+    return params.BUILD_BRANCH_NAME
+}
+
+String getGitAuthor() {
+    return params.GIT_AUTHOR
+}
+
+String getBotBranch(){
+    return "${getProjectVersion()}-${env.BOT_BRANCH_HASH}"
+}
+
+String getBotAuthor(){
+    return env.GIT_AUTHOR_BOT
+}
+
+String getProjectVersion() {
+    return params.PROJECT_VERSION
+}
+
+String getMavenArtifactRepository() {
+    return params.MAVEN_ARTIFACT_REPOSITORY
+}
+
+boolean shouldSkipTests(){
+    return params.SKIP_TESTS
+}
+
+void setDeployPropertyIfNeeded(String key, def value){
+    if (value != null && value != ''){
+        deployProperties[key] = value
+    }
 }
\ No newline at end of file
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index fc0af95f895..aaeab08fb2b 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -1,56 +1,129 @@
 // Promote images
-
-IMAGES = ["kogito-quarkus-ubi8", 
-                    "kogito-quarkus-jvm-ubi8",
-                    "kogito-quarkus-ubi8-s2i",
-                    "kogito-springboot-ubi8",
-                    "kogito-springboot-ubi8-s2i",
-                    "kogito-data-index",
-                    "kogito-trusty",
-                    "kogito-explainability",
-                    "kogito-jobs-service",
-                    "kogito-management-console"]
+@Library('jenkins-pipeline-shared-libraries')_
+
+IMAGES = [
+            'kogito-quarkus-ubi8', 
+            'kogito-quarkus-jvm-ubi8',
+            'kogito-quarkus-ubi8-s2i',
+            'kogito-springboot-ubi8',
+            'kogito-springboot-ubi8-s2i',
+            'kogito-data-index',
+            'kogito-trusty',
+            'kogito-explainability',
+            'kogito-jobs-service',
+            'kogito-management-console'
+         ]
+
+deployProperties=[:]
 
 pipeline {
     agent {
         label 'kogito-image-slave && !master'
     }
 
+    options {
+        buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
+    }
+
     parameters {
         string(name: 'DISPLAY_NAME', defaultValue: '', description: 'Setup a specific build display name')
 
-        booleanParam(name: 'BASE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
-        string(name: 'BASE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
-        string(name: 'BASE_IMAGE_REGISTRY', defaultValue: '', description: 'Base image registry')
-        string(name: 'BASE_IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Base image namespace')
-        string(name: 'BASE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Base image name suffix')
-        string(name: 'BASE_IMAGE_TAG', defaultValue: '', description: 'Base image tag')
-
+        // Deploy job url to retrieve deployment.properties
+        string(name: 'DEPLOY_BUILD_URL', defaultValue: '', description: 'URL to jenkins deploy build to retrieve the `deployment.properties` file. If base parameters are defined, they will override the `deployment.properties` information')
+        
+        // Git information which can override `deployment.properties`
+        string(name: 'BUILD_BRANCH_NAME', defaultValue: '', description: 'Override `deployment.properties`. Which branch to build? Set if you are not on a multibranch pipeline.')
+        string(name: 'GIT_AUTHOR', defaultValue: '', description: 'Override `deployment.properties`. Which Git author repository ?')
+
+        // Base images information which can override `deployment.properties`
+        booleanParam(name: 'BASE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Override `deployment.properties`. Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
+        string(name: 'BASE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Override `deployment.properties`. Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
+        string(name: 'BASE_IMAGE_REGISTRY', defaultValue: '', description: 'Override `deployment.properties`. Base image registry')
+        string(name: 'BASE_IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Override `deployment.properties`. Base image namespace')
+        string(name: 'BASE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Override `deployment.properties`. Base image name suffix')
+        string(name: 'BASE_IMAGE_TAG', defaultValue: '', description: 'Override `deployment.properties`. Base image tag')
+
+        // Promote images information
         booleanParam(name: 'PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
         string(name: 'PROMOTE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
         string(name: 'PROMOTE_IMAGE_REGISTRY', defaultValue: '', description: 'Promote image registry')
         string(name: 'PROMOTE_IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Promote image namespace')
         string(name: 'PROMOTE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Promote image name suffix')
         string(name: 'PROMOTE_IMAGE_TAG', defaultValue: '', description: 'Promote image tag')
+        booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', defaultValue: false, description: 'Set to true if you want the deployed images to also be with the `latest` tag')         
 
-        booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', defaultValue: false, description: 'Set to true if you want the deployed images to also be with the `latest` tag')
+        // Release information which can override `deployment.properties`
+        booleanParam(name: 'RELEASE', defaultValue: false, description: 'Override `deployment.properties`. Is this build for a release?')
+        string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Override `deployment.properties`. Optional if not RELEASE. If RELEASE, cannot be empty.')
+        string(name: 'GIT_TAG', defaultValue: '', description: 'Git tag to set, if different from PROJECT_VERSION')
     }
 
     environment {
-        OPENSHIFT_API = credentials("OPENSHIFT_API")
-        OPENSHIFT_REGISTRY = credentials("OPENSHIFT_REGISTRY")
-        OPENSHIFT_CREDS_KEY = "OPENSHIFT_CREDS"
+        OPENSHIFT_API = credentials('OPENSHIFT_API')
+        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
+        OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
+
+        AUTHOR_CREDS_ID = 'kie-ci'
+        BOT_CREDENTIALS_ID = 'bsig-gh-bot'
+
+        BOT_BRANCH_HASH = "${util.generateHash(10)}"
     }
 
     stages {
         stage('Initialization') {
             steps {
                 script {
-                    cleanImages()
+                    clean()
 
-                    if (params.DISPLAY_NAME != "") {
+                    if (params.DISPLAY_NAME != '') {
                         currentBuild.displayName = params.DISPLAY_NAME
                     }
+
+                    readDeployProperties()
+
+                    if(isRelease()) {
+                        assert getProjectVersion() != ''
+                    }
+                }
+            }
+        }
+        stage('Update PR with released Maven artifacts') {
+            when {
+                expression { return isRelease() && getPRSourceBranch() != ''}
+            }
+            steps {
+                script {
+                    // Update maven information with new artifacts from Maven central in the PR
+                    dir('kogito-images-update'){
+                        checkoutRepo()
+                        githubscm.forkRepo(env.BOT_CREDENTIALS_ID)
+
+                        // Get the working branch
+                        sh 'git fetch origin'
+                        sh "git checkout ${getPRSourceBranch()}"
+
+                        sh 'python3 scripts/update-maven-artifacts.py'
+
+                        // Debug purpose in case of issue
+                        sh 'cat modules/kogito-data-index/module.yaml'
+                        sh 'cat modules/kogito-trusty/module.yaml'
+                        sh 'cat modules/kogito-explainability/module.yaml'
+                        sh 'cat modules/kogito-jobs-service/module.yaml'
+                        sh 'cat modules/kogito-management-console/module.yaml'
+
+                        // Input for checking new artifacts have been set correctly
+                        withCredentials([string(credentialsId: 'KOGITO_CI_EMAIL_TO', variable: 'ZULIP_EMAIL')]) {
+                            emailext body: "Images' modules have been set with latest artifacts from JBoss repository.\n" +
+                                    "Please verify in the logs if it has been set correctly: ${env.BUILD_URL}console.\n" +
+                                    "And take your decision here: ${env.BUILD_URL}input",
+                                    subject: "Kogito Release on #${getBuildBranch()}",
+                                    to: ZULIP_EMAIL
+                        }
+                        input message: 'Are the artifacts set correctly ?', ok: 'Yes'
+
+                        githubscm.commitChanges('Setup Maven artifacts to released ones')
+                        githubscm.pushObject('origin', getPRSourceBranch(), env.BOT_CREDENTIALS_ID)
+                    }
                 }
             }
         }
@@ -85,19 +158,90 @@ pipeline {
                 }
             }
         }
+        stage('Merge PR and tag') {
+            when {
+                expression { return isRelease() }
+            }
+            steps{
+                script {
+                    dir('kogito-images') {
+                        checkoutRepo()
+
+                        // Merge PR
+                        String prLink = getDeployProperty('kogito-images.pr.link')
+                        if(prLink != ''){                            
+                            githubscm.mergePR(prLink, env.AUTHOR_CREDS_ID)
+                            githubscm.pushObject('origin', getBuildBranch(), env.AUTHOR_CREDS_ID)
+                        }
+
+                        if(getGitTag() != ""){
+                            githubscm.tagRepository(getGitTag() , env.BUILD_TAG)
+                            githubscm.pushObject('origin', "--tags ${getGitTag()}", env.AUTHOR_CREDS_ID)
+                        }
+                    }
+                }
+            }
+        }
+        stage('Set next version')
+        {
+            when {
+               expression { return isRelease() }
+            }
+            steps {
+                script {
+                    String prLink = ''
+                    String nextVersion = getNextVersion()
+                    dir('kogito-images-snapshot') { // Use different folder from `Update PR with released Maven artifacts` to avoid conflicts
+                        // Prepare PR
+                        checkoutRepo()
+                        githubscm.forkRepo(env.BOT_CREDENTIALS_ID)
+                        githubscm.createBranch(getSnapshotBranch())
+
+                        // Update version to next snapshot
+                        versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${nextVersion} --artifacts-version ${getArtifactsNextVersion()} --confirm"
+                        if(getBuildBranch() != 'master') {
+                            versionCmd += " --examples-ref ${getBuildBranch()}"
+                        }
+                        sh versionCmd
+
+                        def commitMsg = "Update snapshot version to ${nextVersion}"
+                        def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}"
+                        githubscm.commitChanges(commitMsg)
+                        githubscm.pushObject('origin', getSnapshotBranch(), env.BOT_CREDENTIALS_ID)
+                        prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), env.BOT_CREDENTIALS_ID)
+                    }
+                    dir('kogito-images') {
+                        if (prLink != '') {
+                            githubscm.mergePR(prLink, env.AUTHOR_CREDS_ID)
+                            githubscm.pushObject('origin', getBuildBranch(), env.AUTHOR_CREDS_ID)
+                        }
+                    }
+                }
+            }
+        }
     }
     post {
         always {
-            script {
-                cleanImages()
-            }
+            clean()
         }
     }
 }
 
+void checkoutRepo() {
+    deleteDir()
+    checkout(githubscm.resolveRepository('kogito-images', getGitAuthor(), getBuildBranch(), false))
+    // need to manually checkout branch since on a detached branch after checkout command
+    sh "git checkout ${getBuildBranch()}"
+}
+
+void clean() {
+    cleanWs()
+    cleanImages()
+}
+
 void cleanImages(){
-    sh "podman rm -f \$(podman ps -a -q) || date"
-    sh "podman rmi -f \$(podman images -q) || date"
+    sh 'podman rm -f \$(podman ps -a -q) || date'
+    sh 'podman rmi -f \$(podman images -q) || date'
 }
 
 void pullImages(){
@@ -112,6 +256,10 @@ void tagImages() {
         if(isDeployLatestTag()){
             sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, "latest")}"
         }
+        String reducedTag = getReducedTag()
+        if(reducedTag != ''){
+            sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, reducedTag)}"
+        }
     }
 }
 
@@ -121,6 +269,10 @@ void pushImages(){
         if(isDeployLatestTag()){
             sh "podman push ${getNewImageFullTag(imageName, "latest")}"
         }
+        String reducedTag = getReducedTag()
+        if(reducedTag != ''){
+            sh "podman push ${getNewImageFullTag(imageName, reducedTag)}"
+        }
     }
 }
 
@@ -135,7 +287,7 @@ String getNewImageFullTag(String imageName, String tag){
 String buildImageNameWithSuffix(String imageName, String suffix) {
     String finalImageName = imageName
     if(suffix != null && suffix != '') {
-        finalImageName += "-" + suffix
+        finalImageName += '-' + suffix
     }
     return finalImageName
 }
@@ -144,6 +296,17 @@ boolean isDeployLatestTag(){
     return params.DEPLOY_WITH_LATEST_TAG
 }
 
+String getReducedTag(){
+    try {
+        String version = getNewImageTag()
+        String[] versionSplit = version.split("\\.")
+        return "${versionSplit[0]}.${versionSplit[1]}"
+    } catch(error) {
+        echo "${getNewImageTag()} cannot be reduced to the format X.Y"
+    }
+    return ''
+}
+
 void loginOpenshift(){
     withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]){
         sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
@@ -161,33 +324,104 @@ void loginContainerRegistry(String registry, String credsId){
         sh "podman login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} --tls-verify=false ${registry}"
     }
 }
+void readDeployProperties(){
+    String deployUrl = params.DEPLOY_BUILD_URL
+    if(deployUrl != ''){
+        if(!deployUrl.endsWith('/')){
+            deployUrl += '/'
+        }
+        sh "wget ${deployUrl}artifact/deployment.properties"
+        deployProperties = readProperties file: 'deployment.properties'
+        echo deployProperties.collect{ entry -> "${entry.key}=${entry.value}" }.join('\n')
+    }
+}
+boolean hasDeployProperty(String key) {
+    return deployProperties[key] != null
+}
+String getDeployProperty(String key) {
+    if(hasDeployProperty(key)){
+        return deployProperties[key]
+    }
+    return ''
+}
+String getParamOrDeployProperty(String paramKey, String deployPropertyKey) {
+    if (params[paramKey] != '') {
+        return params[paramKey]
+    }
+    return getDeployProperty(deployPropertyKey)
+}
+
+////////////////////////////////////////////////////////////////////////
+// Utils
+////////////////////////////////////////////////////////////////////////
+
+boolean isRelease() {
+    return params.RELEASE || (getDeployProperty('release') == 'true')
+}
+
+String getProjectVersion() {
+    return getParamOrDeployProperty('PROJECT_VERSION' , 'project.version')
+}
+
+String getGitTag() {
+    return params.GIT_TAG != '' ? params.GIT_TAG : getProjectVersion()
+}
+
+String getBuildBranch() {
+    return getParamOrDeployProperty('BUILD_BRANCH_NAME', 'git.branch')
+}
+
+String getPRSourceBranch() {
+    return getDeployProperty('kogito-images.pr.source.ref')
+}
+
+String getGitAuthor() {
+    return getParamOrDeployProperty('GIT_AUTHOR', 'git.author')
+}
+
+String getNextVersion() {
+    return util.getNextVersion(getProjectVersion(), 'micro', 'snapshot')
+}
+
+// To be later changed by artifacts version parameter
+String getArtifactsNextVersion() {
+    return util.getNextVersion(getProjectVersion(), 'micro', 'SNAPSHOT')
+}
+
+String getSnapshotBranch(){
+    return "${getNextVersion()}-${env.BOT_BRANCH_HASH}"
+}
 
 ////////////////////////////////////////////////////////////////////////
 // Old image information
 ////////////////////////////////////////////////////////////////////////
 
+String getOldImagePrefix() {
+    return 'kogito-images.image'
+}
+
 boolean isOldImageInOpenshiftRegistry(){
     return params.BASE_IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
 String getOldImageRegistryCredentials(){
-    return isOldImageInOpenshiftRegistry() ? "" : params.BASE_IMAGE_REGISTRY_CREDENTIALS
+    return isOldImageInOpenshiftRegistry() ? '' : params.BASE_IMAGE_REGISTRY_CREDENTIALS
 }
 
 String getOldImageRegistry(){
-    return isOldImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.BASE_IMAGE_REGISTRY
+    return isOldImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : getParamOrDeployProperty('BASE_IMAGE_REGISTRY' , "${getOldImagePrefix()}.registry")
 }
 
 String getOldImageNamespace(){
-    return isOldImageInOpenshiftRegistry() ? "openshift" : params.BASE_IMAGE_NAMESPACE
+    return isOldImageInOpenshiftRegistry() ? 'openshift' : getParamOrDeployProperty('BASE_IMAGE_NAMESPACE' , "${getOldImagePrefix()}.namespace")
 }
 
 String getOldImageNameSuffix(){
-    return params.BASE_IMAGE_NAME_SUFFIX
+    return getParamOrDeployProperty('BASE_IMAGE_NAME_SUFFIX' , "${getOldImagePrefix()}.name-suffix")
 }
 
 String getOldImageTag(){
-    return params.BASE_IMAGE_TAG
+    return getParamOrDeployProperty('BASE_IMAGE_TAG' , "${getOldImagePrefix()}.tag")
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -199,7 +433,7 @@ boolean isNewImageInOpenshiftRegistry(){
 }
 
 String getNewImageRegistryCredentials(){
-    return isNewImageInOpenshiftRegistry() ? "" : params.PROMOTE_IMAGE_REGISTRY_CREDENTIALS
+    return isNewImageInOpenshiftRegistry() ? '' : params.PROMOTE_IMAGE_REGISTRY_CREDENTIALS
 }
 
 String getNewImageRegistry(){
@@ -207,7 +441,7 @@ String getNewImageRegistry(){
 }
 
 String getNewImageNamespace(){
-    return isNewImageInOpenshiftRegistry() ? "openshift" : params.PROMOTE_IMAGE_NAMESPACE
+    return isNewImageInOpenshiftRegistry() ? 'openshift' : params.PROMOTE_IMAGE_NAMESPACE
 }
 
 String getNewImageNameSuffix(){
@@ -216,4 +450,5 @@ String getNewImageNameSuffix(){
 
 String getNewImageTag(){
     return params.PROMOTE_IMAGE_TAG
-}
\ No newline at end of file
+}
+

From ec981d1786ce7a15a4ce316f2e476177a9032d3a Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 12 Aug 2020 16:12:12 +0200
Subject: [PATCH 174/709] KOGITO-2888 Cleanup old pipeline(s) (#215)

---
 Jenkinsfile-Nightly | 158 --------------------------------------------
 1 file changed, 158 deletions(-)
 delete mode 100644 Jenkinsfile-Nightly

diff --git a/Jenkinsfile-Nightly b/Jenkinsfile-Nightly
deleted file mode 100644
index ae250aa9329..00000000000
--- a/Jenkinsfile-Nightly
+++ /dev/null
@@ -1,158 +0,0 @@
-//Checks master branch for updates every day
-//If found triggers the pipeline, 
-//The pipeline is set to run between 12:00AM - 3:00AM UTC
-
-IMAGES = ["kogito-quarkus-ubi8", 
-            "kogito-quarkus-jvm-ubi8",
-            "kogito-quarkus-ubi8-s2i",
-            "kogito-springboot-ubi8",
-            "kogito-springboot-ubi8-s2i",
-            "kogito-data-index",
-            "kogito-trusty",
-            "kogito-explainability",
-            "kogito-jobs-service",
-            "kogito-management-console"]
-
-pipeline{
-    agent { label 'jenkins-slave'}
-     triggers{
-        pollSCM(
-            scmpoll_spec: '@midnight', 
-            ignorePostCommitHooks: true
-        )
-    }
-    stages{
-        stage('Initialization'){
-            steps{
-                script{
-                    cleanWorkspaces()
-                    
-                    // Set the mirror url only if exist
-                    if (env.MAVEN_MIRROR_REPOSITORY != null
-                            && env.MAVEN_MIRROR_REPOSITORY != ''){
-                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
-                    }
-                }
-                sh "docker rm -f \$(docker ps -a -q) || date"
-                sh "docker rmi -f \$(docker images -q) || date"
-            }
-        }
-        stage('Validate CeKit Image and Modules descriptors'){
-            steps {
-                sh """
-                    curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
-                    tar -xzvf cekit-image-validator-runner.tgz
-                    chmod +x cekit-image-validator-runner
-                """
-                sh "./cekit-image-validator-runner modules/"
-                sh """
-                    ./cekit-image-validator-runner image.yaml
-                    ./cekit-image-validator-runner kogito-data-index-overrides.yaml
-                    ./cekit-image-validator-runner kogito-trusty-overrides.yaml
-                    ./cekit-image-validator-runner kogito-explainability-overrides.yaml
-                    ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
-                    ./cekit-image-validator-runner kogito-management-console-overrides.yaml
-                    ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
-                    ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
-                    ./cekit-image-validator-runner kogito-quarkus-s2i-overrides.yaml
-                    ./cekit-image-validator-runner kogito-springboot-overrides.yaml
-                    ./cekit-image-validator-runner kogito-springboot-s2i-overrides.yaml
-                """
-            }
-        }
-        stage('Update Artifacts'){
-            steps{
-                sh "python3 scripts/update-maven-artifacts.py"
-            }
-        }
-        stage('Prepare offline kogito-examples'){
-            steps{
-                sh "make clone-repos"
-            }
-        }
-        stage('Build and Test Images'){
-            steps{
-                script {
-                    build_stages = [:]
-                    IMAGES.each{ image -> build_stages["${image}"] = {
-                            createWorkspace("$image")
-                            copyWorkspace("$image")
-                            dir(getWorkspacePath("$image")){
-                                try{
-                                    sh "make ${image}"
-                                }
-                                finally{
-                                    junit 'target/test/results/*.xml'
-                                }
-                            
-                            }
-                        }
-                    }
-                    parallel build_stages
-                }
-            }
-        }
-        stage('Tagging'){
-            steps{
-                sh """
-                docker tag quay.io/kiegroup/kogito-quarkus-ubi8:latest                    quay.io/kiegroup/kogito-quarkus-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                docker tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest                quay.io/kiegroup/kogito-quarkus-jvm-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest                quay.io/kiegroup/kogito-quarkus-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                docker tag quay.io/kiegroup/kogito-springboot-ubi8:latest                 quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                docker tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest             quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                docker tag quay.io/kiegroup/kogito-data-index:latest                      quay.io/kiegroup/kogito-data-index-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                docker tag quay.io/kiegroup/kogito-trusty:latest                          quay.io/kiegroup/kogito-trusty-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                docker tag quay.io/kiegroup/kogito-explainability:latest                  quay.io/kiegroup/kogito-explainability-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                docker tag quay.io/kiegroup/kogito-jobs-service:latest                    quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                docker tag quay.io/kiegroup/kogito-management-console:latest              quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-	        """
-            }
-        }
-        stage('Pushing'){
-            steps{
-                withDockerRegistry([ credentialsId: "quay", url: "https://quay.io" ]){
-                    sh """
-                        docker push quay.io/kiegroup/kogito-quarkus-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                        docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                        docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                        docker push quay.io/kiegroup/kogito-springboot-ubi8-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                        docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                        docker push quay.io/kiegroup/kogito-data-index-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                        docker push quay.io/kiegroup/kogito-trusty-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                        docker push quay.io/kiegroup/kogito-explainability-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                        docker push quay.io/kiegroup/kogito-jobs-service-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                        docker push quay.io/kiegroup/kogito-management-console-nightly:\$(echo \${GIT_COMMIT} | cut -c1-7)
-                       """
-                }
-            }
-        }
-        stage('Finishing'){
-            steps{
-                sh "docker rmi -f \$(docker images -q) || date"
-            }
-        }
-    }
-    post{
-        always{
-            script{
-                cleanWorkspaces()
-            }
-        }
-    }
-}
-
-void  createWorkspace(String image){
-    sh "mkdir -p ${getWorkspacePath(image)}"
-}
-void copyWorkspace(String image){
-    sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
-}
-void cleanWorkspaces(){
-    sh "rm -rf ${getWorkspacesPath()}"
-}
-String getWorkspacesPath(){
-    return "${WORKSPACE}/workspaces"
-}
-String getWorkspacePath(String image){
-    return "${getWorkspacesPath()}/${image}"
-}
\ No newline at end of file

From 4f56be8b91995e2c66c6b296559eb06cb4787a9c Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 19 Aug 2020 16:47:56 +0200
Subject: [PATCH 175/709] KOGITO-2997 Test native build in container (#218)

---
 Jenkinsfile                   | 3 ---
 tests/test-apps/clone-repo.sh | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4f131815bd1..2ea7aa252ae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,9 +20,6 @@ pipeline{
     tools {
         jdk 'kie-jdk11'
     }
-    environment {
-        JAVA_HOME = "${GRAALVM_HOME}"
-    }
     stages{
         stage('Initialization'){
             steps{
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index a2392632a2b..3fb6e374fce 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -4,6 +4,8 @@
 
 SCRIPT_DIR=`pwd`
 MVN_MODULE="${SCRIPT_DIR}/../../modules/kogito-maven/3.6.x"
+CONTAINER_ENGINE="docker"
+MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS="-Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=${CONTAINER_ENGINE}"
 
 # exit when any command fails
 set -e
@@ -31,7 +33,7 @@ cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rule
 # generating the app binaries to test the binary build
 mvn -f rules-quarkus-helloworld clean package -DskipTests -U
 mvn -f process-springboot-example clean package -DskipTests -U
-mvn -f rules-quarkus-helloworld-native -Pnative clean package -DskipTests -U
+mvn -f rules-quarkus-helloworld-native -Pnative clean package -DskipTests -U ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
 
 # preparing directory to run kogito maven archetypes tests
 mkdir -pv /tmp/kogito-examples/dmn-example

From e6958999cdd9ee7c7f20d0540a7e9b473ff20a76 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 20 Aug 2020 08:25:10 +0200
Subject: [PATCH 176/709] KOGITO-2909 Promote pipeline: add release create
 (#224)

---
 Jenkinsfile.promote | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index aaeab08fb2b..8d822750a53 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -56,6 +56,7 @@ pipeline {
         booleanParam(name: 'RELEASE', defaultValue: false, description: 'Override `deployment.properties`. Is this build for a release?')
         string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Override `deployment.properties`. Optional if not RELEASE. If RELEASE, cannot be empty.')
         string(name: 'GIT_TAG', defaultValue: '', description: 'Git tag to set, if different from PROJECT_VERSION')
+        string(name: 'RELEASE_NOTES', defaultValue: '', description: 'Release notes to be added. If none provided, a default one will be given.')
     }
 
     environment {
@@ -66,6 +67,10 @@ pipeline {
         AUTHOR_CREDS_ID = 'kie-ci'
         BOT_CREDENTIALS_ID = 'bsig-gh-bot'
 
+        // for github-release
+        GITHUB_REPO = 'kogito-images'
+        GITHUB_TOKEN_CREDS_ID = 'kie-ci2-token'
+
         BOT_BRANCH_HASH = "${util.generateHash(10)}"
     }
 
@@ -84,6 +89,8 @@ pipeline {
                     if(isRelease()) {
                         assert getProjectVersion() != ''
                     }
+
+                    installGitHubReleaseCLI()
                 }
             }
         }
@@ -175,8 +182,14 @@ pipeline {
                         }
 
                         if(getGitTag() != ""){
-                            githubscm.tagRepository(getGitTag() , env.BUILD_TAG)
-                            githubscm.pushObject('origin', "--tags ${getGitTag()}", env.AUTHOR_CREDS_ID)
+                            def releaseName = "Kogito Images Version ${getProjectVersion()}" 
+                            def description = params.RELEASE_NOTES != '' ? params.RELEASE_NOTES : "We are glad to announce that the Kogito ${getProjectVersion()} release is now available!"
+                            withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
+                                sh """
+                                    export GITHUB_USER=${getGitAuthor()}
+                                    github-release release --tag ${getGitTag()} --target '${getBuildBranch()}' --name '${releaseName}' --description '${description}' --pre-release
+                                """
+                            }
                         }
                     }
                 }
@@ -227,6 +240,10 @@ pipeline {
     }
 }
 
+void installGitHubReleaseCLI(){
+    sh 'go get github.com/github-release/github-release'
+}
+
 void checkoutRepo() {
     deleteDir()
     checkout(githubscm.resolveRepository('kogito-images', getGitAuthor(), getBuildBranch(), false))

From 765b6a4189be90f26aae4ec57973f9abc795ced4 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 20 Aug 2020 16:20:01 +0200
Subject: [PATCH 177/709] KOGITO-3144 Zulip topic naming convention (#225)

---
 Jenkinsfile.promote | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 8d822750a53..3b449632051 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -123,7 +123,7 @@ pipeline {
                             emailext body: "Images' modules have been set with latest artifacts from JBoss repository.\n" +
                                     "Please verify in the logs if it has been set correctly: ${env.BUILD_URL}console.\n" +
                                     "And take your decision here: ${env.BUILD_URL}input",
-                                    subject: "Kogito Release on #${getBuildBranch()}",
+                                    subject: "[${getBuildBranch()}] Release Pipeline",
                                     to: ZULIP_EMAIL
                         }
                         input message: 'Are the artifacts set correctly ?', ok: 'Yes'

From b680ebec041097300ad211468bc006fb3808be06 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 24 Aug 2020 11:18:56 -0300
Subject: [PATCH 178/709] small typo (#226)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf2a99d8fd1..718db73e68b 100644
--- a/README.md
+++ b/README.md
@@ -498,7 +498,7 @@ s2i build target/ quay.io/kiegroup/kogito-quarkus-ubi8:latest binary-test-exampl
 ...
 
 # run the output image
-$ docker run -it -p 8080:8080 binary-test-example-3
+$ docker run -it -p 8080:8080 binary-test-example
 
 # on another terminal, interact with the kogito service
 $ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders

From 284d4703353957320acd4d4c37f676946523ff42 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 3 Sep 2020 11:29:43 -0300
Subject: [PATCH 179/709] [KOGITO-3248] - Fix Kogito images Springboot tests
 (#232)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .../kogito-springboot-ubi8-s2i.feature        | 80 ++++++++++++-------
 tests/features/kogito-springboot-ubi8.feature | 39 +++++----
 2 files changed, 73 insertions(+), 46 deletions(-)

diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 078d73a30f2..3d6199f7645 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -6,11 +6,14 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | variable | value |
       | JAVA_OPTIONS | -Ddebug=true |
     Then check that page is served
-      | property             | value     |
-      | port                 | 8080      |
-      | path                 | /orders/1 |
-      | wait                 | 80        |
-      | expected_status_code | 204       |
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain main] .c.l.ClasspathLoggingApplicationListener
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
@@ -20,11 +23,14 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | variable | value |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
-      | property             | value     |
-      | port                 | 8080      |
-      | path                 | /orders/1 |
-      | wait                 | 80        |
-      | expected_status_code | 204       |
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain main] .c.l.ClasspathLoggingApplicationListener
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
@@ -34,11 +40,14 @@ Feature: kogito-springboot-ubi8-s2i image tests
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
-      | property             | value     |
-      | port                 | 8080      |
-      | path                 | /orders/1 |
-      | wait                 | 80        |
-      | expected_status_code | 204       |
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain Tomcat initialized with port(s): 8080 (http)
 
@@ -47,11 +56,14 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | variable            | value |
       | HTTP_PORT           | 9090  |
     Then check that page is served
-      | property             | value     |
-      | port                 | 9090      |
-      | path                 | /orders/1 |
-      | wait                 | 80        |
-      | expected_status_code | 204       |
+      | property             | value                                                                         |
+      | port                 | 9090                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain Tomcat initialized with port(s): 9090 (http)
 
@@ -73,25 +85,31 @@ Feature: kogito-springboot-ubi8-s2i image tests
       | ARTIFACT_DIR      | process-springboot-example/target  |
       | MAVEN_ARGS_APPEND | -pl process-springboot-example -am |
     Then check that page is served
-      | property             | value     |
-      | port                 | 8080      |
-      | path                 | /orders/1 |
-      | wait                 | 80        |
-      | expected_status_code | 204       |
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain main] .c.l.ClasspathLoggingApplicationListener
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
-  Scenario: Scenario: Perform a incremental s2i build
+  Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable | value |
     Then check that page is served
-      | property             | value     |
-      | port                 | 8080      |
-      | path                 | /orders/1 |
-      | wait                 | 80        |
-      | expected_status_code | 204       |
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
diff --git a/tests/features/kogito-springboot-ubi8.feature b/tests/features/kogito-springboot-ubi8.feature
index cb2ea58e2e7..650c0818c4f 100644
--- a/tests/features/kogito-springboot-ubi8.feature
+++ b/tests/features/kogito-springboot-ubi8.feature
@@ -23,11 +23,14 @@ Feature: springboot-quarkus-ubi8 feature.
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
     Then check that page is served
-      | property             | value     |
-      | port                 | 8080      |
-      | path                 | /orders/1 |
-      | wait                 | 80        |
-      | expected_status_code | 204       |
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
@@ -38,11 +41,14 @@ Feature: springboot-quarkus-ubi8 feature.
       | JAVA_OPTIONS        | -Ddebug=true |
       | HTTP_PORT           | 9090         |
     Then check that page is served
-      | property             | value     |
-      | port                 | 9090      |
-      | path                 | /orders/1 |
-      | wait                 | 80        |
-      | expected_status_code | 204       |
+      | property             | value                                                                         |
+      | port                 | 9090                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
@@ -53,11 +59,14 @@ Feature: springboot-quarkus-ubi8 feature.
       | JAVA_OPTIONS        | -Ddebug=true |
       | BINARY_BUILD        | true         |
     Then check that page is served
-      | property             | value     |
-      | port                 | 8080      |
-      | path                 | /orders/1 |
-      | wait                 | 80        |
-      | expected_status_code | 204       |
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true

From 53e452aba8996b0515fe4a4ea1b1284429a67723 Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Thu, 3 Sep 2020 18:27:54 +0200
Subject: [PATCH 180/709] KOGITO-3224 - Enable explainability messaging in
 trusty image (#231)

---
 kogito-explainability-overrides.yaml          |  4 +++-
 .../added/kogito-app-launch.sh                |  9 ++-----
 .../added/launch/kogito-explainability.sh     | 16 +++++++++++++
 .../tests/bats/kogito-explainability.bats     | 22 +++++++++++++++++
 .../added/launch/kogito-trusty.sh             | 15 ++++++++++++
 .../tests/bats/kogito-trusty.bats             | 24 ++++++++++++++++++-
 tests/features/kogito-explainability.feature  | 12 ++++++++--
 tests/features/kogito-trusty.feature          | 12 ++++++++--
 8 files changed, 101 insertions(+), 13 deletions(-)

diff --git a/kogito-explainability-overrides.yaml b/kogito-explainability-overrides.yaml
index 23dfb30c7a7..236c91b6e06 100644
--- a/kogito-explainability-overrides.yaml
+++ b/kogito-explainability-overrides.yaml
@@ -20,7 +20,9 @@ envs:
   - name: "HTTP_PORT"
     example: "9090"
     description: "Defines which port the Explainability Container Image will listen on."
-
+  - name: "EXPLAINABILITY_COMMUNICATION"
+    example: "REST"
+    description: "Defines which kind of communication should be used by the Explainability Container: rest api or kafka events."
 ports:
 - value: 8080
 
diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
index dee4a2ecb45..ae7ec957322 100644
--- a/modules/kogito-explainability/added/kogito-app-launch.sh
+++ b/modules/kogito-explainability/added/kogito-app-launch.sh
@@ -8,6 +8,7 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     SHOW_JVM_SETTINGS="-XshowSettings:properties"
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
     log_info "JVM settings debug is enabled."
+    printenv
 fi
 
 
@@ -19,13 +20,7 @@ CONFIGURE_SCRIPTS=(
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-if [ ${EXPLAINABILITY_COMMUNICATION^^} = "REST" ] ; then 
-      EXPLAINABILITY_JAR="kogito-explainability-rest-runner.jar"
-    else
-      EXPLAINABILITY_JAR="kogito-explainability-messaging-runner.jar"
-fi
-
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
-        -jar $KOGITO_HOME/bin/$EXPLAINABILITY_JAR
\ No newline at end of file
+        -jar $KOGITO_HOME/bin/$EXPLAINABILITY_SERVICE_JAR
\ No newline at end of file
diff --git a/modules/kogito-explainability/added/launch/kogito-explainability.sh b/modules/kogito-explainability/added/launch/kogito-explainability.sh
index 8ef93b07e47..042ed3b8d9a 100644
--- a/modules/kogito-explainability/added/launch/kogito-explainability.sh
+++ b/modules/kogito-explainability/added/launch/kogito-explainability.sh
@@ -1,13 +1,17 @@
 #!/usr/bin/env bash
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
+    unset EXPLAINABILITY_COMMUNICATION
     unset HTTP_PORT
 }
 
 function configure() {
     configure_explainability_http_port
+    configure_explainability_jar
 }
 
 function configure_explainability_http_port {
@@ -15,3 +19,15 @@ function configure_explainability_http_port {
     KOGITO_EXPLAINABILITY_PROPS="${KOGITO_EXPLAINABILITY_PROPS} -Dquarkus.http.port=${httpPort}"
 }
 
+function configure_explainability_jar {
+    local allowed_communication_types=("REST" "MESSAGING")
+    local communication="MESSAGING"
+    if [[ ! "${allowed_communication_types[@]}" =~ "${EXPLAINABILITY_COMMUNICATION^^}" ]]; then
+        log_warning "Explainability communication type ${EXPLAINABILITY_COMMUNICATION} is not allowed, the allowed types are [${allowed_communication_types[*]}]. Defaulting to ${communication}."
+    elif [ "${EXPLAINABILITY_COMMUNICATION^^}" == "REST" ]; then
+        communication="${EXPLAINABILITY_COMMUNICATION^^}"
+    fi
+
+    log_info "Explainability communication is set to ${communication}"
+    EXPLAINABILITY_SERVICE_JAR="kogito-explainability-${communication,,}-runner.jar"
+}
diff --git a/modules/kogito-explainability/tests/bats/kogito-explainability.bats b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
index 84af508864a..6afe3bab3be 100644
--- a/modules/kogito-explainability/tests/bats/kogito-explainability.bats
+++ b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
@@ -28,3 +28,25 @@ teardown() {
     [ "${KOGITO_EXPLAINABILITY_PROPS}" = "${expected}" ]
 }
 
+@test "test if the default explainability communication type is correctly set" {
+    configure_explainability_jar
+    expected="kogito-explainability-messaging-runner.jar"
+    echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
+    [ "${EXPLAINABILITY_SERVICE_JAR}" = "${expected}" ]
+}
+
+@test "test if explainability communication service default value is correctly set if a nonsense type is set" {
+    EXPLAINABILITY_COMMUNICATION="nonsense"
+    configure_explainability_jar
+    expected="kogito-explainability-messaging-runner.jar"
+    echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
+    [ "${EXPLAINABILITY_SERVICE_JAR}" = "${expected}" ]
+}
+
+@test "test if explainability communication service default value s correctly set if set to rest" {
+    EXPLAINABILITY_COMMUNICATION="rest"
+    configure_explainability_jar
+    expected="kogito-explainability-rest-runner.jar"
+    echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
+    [ "${EXPLAINABILITY_SERVICE_JAR}" = "${expected}" ]
+}
\ No newline at end of file
diff --git a/modules/kogito-trusty/added/launch/kogito-trusty.sh b/modules/kogito-trusty/added/launch/kogito-trusty.sh
index 11365ff180e..264b0ec12f3 100644
--- a/modules/kogito-trusty/added/launch/kogito-trusty.sh
+++ b/modules/kogito-trusty/added/launch/kogito-trusty.sh
@@ -1,13 +1,17 @@
 #!/usr/bin/env bash
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
+    unset EXPLAINABILITY_ENABLED
     unset HTTP_PORT
 }
 
 function configure() {
     configure_trusty_http_port
+    enable_explainability
 }
 
 function configure_trusty_http_port {
@@ -15,3 +19,14 @@ function configure_trusty_http_port {
     KOGITO_TRUSTY_PROPS="${KOGITO_TRUSTY_PROPS} -Dquarkus.http.port=${httpPort}"
 }
 
+function enable_explainability {
+    local allowed_values=("TRUE" "FALSE")
+    local explainability_enabled="true"
+    if [[ ! "${allowed_values[@]}" =~ "${EXPLAINABILITY_ENABLED^^}" ]]; then
+        log_warning "Explainability enabled type ${EXPLAINABILITY_ENABLED} is not allowed, the allowed types are [${allowed_values[*]}]. Defaulting to ${explainability_enabled}."
+    elif [ "${EXPLAINABILITY_ENABLED^^}" == "FALSE" ]; then
+        explainability_enabled="${EXPLAINABILITY_ENABLED^^}"
+    fi
+    log_info "Explainability is enabled: ${explainability_enabled}"
+    KOGITO_TRUSTY_PROPS="${KOGITO_TRUSTY_PROPS} -Dtrusty.explainability.enabled=${explainability_enabled,,}"
+}
diff --git a/modules/kogito-trusty/tests/bats/kogito-trusty.bats b/modules/kogito-trusty/tests/bats/kogito-trusty.bats
index ed87ef95209..271e543e78f 100644
--- a/modules/kogito-trusty/tests/bats/kogito-trusty.bats
+++ b/modules/kogito-trusty/tests/bats/kogito-trusty.bats
@@ -12,7 +12,6 @@ teardown() {
     rm -rf ${KOGITO_HOME}
 }
 
-
 @test "http port configuration default value" {
     configure_trusty_http_port
     expected=" -Dquarkus.http.port=8080"
@@ -28,3 +27,26 @@ teardown() {
     [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
 }
 
+
+@test "explainability is enabled by default" {
+    enable_explainability
+    expected=" -Dtrusty.explainability.enabled=true"
+    echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}"
+    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
+}
+
+@test "disable explainability" {
+    export EXPLAINABILITY_ENABLED="false" 
+    enable_explainability
+    expected=" -Dtrusty.explainability.enabled=false"
+    echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}"
+    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
+}
+
+@test "explainability is enabled even if nonsense values are provided" {
+    EXPLAINABILITY_ENABLED="nonsense"
+    enable_explainability
+    expected=" -Dtrusty.explainability.enabled=true"
+    echo "result: ${KOGITO_TRUSTY_PROPS} \n expected: ${expected}"
+    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
+}
\ No newline at end of file
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index 496a007ca86..26002c814da 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -14,6 +14,8 @@ Feature: Kogito-explainability feature.
   Scenario: verify if the messaging binary is available on /home/kogito
     When container is started with command bash
     Then run sh -c 'ls /home/kogito/bin/kogito-explainability-messaging-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-explainability-messaging-runner.jar
+    And run sh -c 'ls /home/kogito/bin/kogito-explainability-rest-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-explainability-rest-runner.jar
+
 
   Scenario: verify if the rest binary is available on /home/kogito
     When container is started with command bash
@@ -32,11 +34,17 @@ Feature: Kogito-explainability feature.
       | HTTP_PORT     | 9090  |
     Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-messaging-runner.jar
 
-
   Scenario: Verify if the explainability rest binary is selected by the enviroment variable EXPLAINABILITY_COMMUNICATION
     When container is started with env
       | variable      | value |
       | EXPLAINABILITY_COMMUNICATION  | rest |
       | SCRIPT_DEBUG  | true  |
       | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-rest-runner.jar
\ No newline at end of file
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-rest-runner.jar
+
+  Scenario: Verify if the communication is correctly set to its default value if a wrong communication type is set
+    When container is started with env
+      | variable               | value    |
+      | SCRIPT_DEBUG           | true     |
+      | EXPLAINABILITY_COMMUNICATION | nonsense |
+    Then container log should contain WARN Explainability communication type nonsense is not allowed, the allowed types are [REST MESSAGING]. Defaulting to MESSAGING.
diff --git a/tests/features/kogito-trusty.feature b/tests/features/kogito-trusty.feature
index a3e2e692366..2ce90bc3e9e 100644
--- a/tests/features/kogito-trusty.feature
+++ b/tests/features/kogito-trusty.feature
@@ -19,14 +19,22 @@ Feature: Kogito-trusty feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
 
   Scenario: Verify if the debug is correctly enabled and test custom http port
     When container is started with env
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
       | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
+
+  Scenario: Verify if the explainability messaging is disabled
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+      | EXPLAINABILITY_ENABLED     | false  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
 
   Scenario: verify if auth is correctly set
     When container is started with env

From 99076711eec517210a4c1706e4c7272f2b58f426 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 3 Sep 2020 17:04:49 -0300
Subject: [PATCH 181/709] [KOGITO-2890] - Provide alternative persistence
 solutions for data index (#230)

Signed-off-by: spolti <fspolti@redhat.com>
---
 README.md                                     | 10 ++++-
 kogito-data-index-overrides.yaml              |  3 ++
 .../added/kogito-app-launch.sh                |  6 +--
 .../added/launch/kogito-data-index.sh         | 18 +++++++-
 modules/kogito-data-index/configure           |  3 +-
 modules/kogito-data-index/module.yaml         |  9 ++--
 .../tests/bats/kogito-data-index.bats         | 44 ++++++++++++++++++-
 modules/kogito-explainability/module.yaml     |  8 ++--
 .../added/kogito-app-launch.sh                |  4 +-
 modules/kogito-jobs-service/module.yaml       |  4 +-
 .../tests/bats/kogito-jobs-service.bats       | 23 +++++-----
 modules/kogito-management-console/module.yaml |  4 +-
 .../tests/bats/kogito-quarkus-jvm.bats        | 10 ++---
 .../tests/bats/kogito-quarkus-s2i.bats        | 10 ++---
 .../tests/bats/kogito-quarkus-native.bats     | 10 ++---
 .../tests/bats/kogito-springboot-s2i.bats     | 10 ++---
 .../tests/bats/kogito-springboot.bats         | 10 ++---
 .../kogito-trusty/added/kogito-app-launch.sh  |  4 +-
 modules/kogito-trusty/module.yaml             |  4 +-
 scripts/README.md                             |  2 +
 scripts/update-maven-artifacts.py             |  5 ++-
 tests/features/kogito-data-index.feature      | 35 ++++++++++++---
 22 files changed, 165 insertions(+), 71 deletions(-)

diff --git a/README.md b/README.md
index 718db73e68b..67b89917f17 100644
--- a/README.md
+++ b/README.md
@@ -577,7 +577,15 @@ Today we have 3 Kogito Component Images:
 
 The Data Index Service aims at capturing and indexing data produced by one more Kogito runtime services. 
 For more information please visit this (link)(https://docs.jboss.org/kogito/release/latest/html_single/#proc_kogito-travel-agency-enable-data-index). 
-The Data Index Service depends on a running Infinispan Server.
+The Data Index Service depends on a running Infinispan or MongoDB Server.
+The Persistence service can be switched by setting the following variable:
+
+```bash
+DATA_INDEX_PERSISTENCE
+```
+
+The supported values are: `infinispan` and `mongodb`. If the environment variable above is empty, then `infinispan` will be used.
+
 
 
 Basic usage
diff --git a/kogito-data-index-overrides.yaml b/kogito-data-index-overrides.yaml
index bec8d9814c0..78e1ec2f517 100644
--- a/kogito-data-index-overrides.yaml
+++ b/kogito-data-index-overrides.yaml
@@ -20,6 +20,9 @@ envs:
   - name: "HTTP_PORT"
     example: "9090"
     description: "Defines which port the Data Index Container Image will listen on."
+  - name: "DATA_INDEX_PERSISTENCE"
+    example: "mongodb"
+    description: "Defines which Data Index Service persistence implementation will be used. If empty defaults to 'infinispan'. Allowed types are 'infinispan' and 'mongodb'."
 
 ports:
 - value: 8080
diff --git a/modules/kogito-data-index/added/kogito-app-launch.sh b/modules/kogito-data-index/added/kogito-app-launch.sh
index 3fc12279364..1503eb75fbe 100644
--- a/modules/kogito-data-index/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index/added/kogito-app-launch.sh
@@ -8,9 +8,9 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     SHOW_JVM_SETTINGS="-XshowSettings:properties"
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
     log_info "JVM settings debug is enabled."
+    printenv
 fi
 
-
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
@@ -19,9 +19,7 @@ CONFIGURE_SCRIPTS=(
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-printenv
-
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
-        -jar $KOGITO_HOME/bin/kogito-data-index-runner.jar
\ No newline at end of file
+        -jar $KOGITO_HOME/bin/${KOGITO_DATA_INDEX_SERVICE_JAR}
\ No newline at end of file
diff --git a/modules/kogito-data-index/added/launch/kogito-data-index.sh b/modules/kogito-data-index/added/launch/kogito-data-index.sh
index 380244ca325..f0d20c28c6b 100644
--- a/modules/kogito-data-index/added/launch/kogito-data-index.sh
+++ b/modules/kogito-data-index/added/launch/kogito-data-index.sh
@@ -1,17 +1,33 @@
 #!/usr/bin/env bash
 
+#import
+source ${KOGITO_HOME}/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
+    unset DATA_INDEX_PERSISTENCE
     unset HTTP_PORT
 }
 
 function configure() {
+    configure_data_index_persistence
     configure_data_index_http_port
 }
 
-function configure_data_index_http_port {
+function configure_data_index_http_port() {
     local httpPort=${HTTP_PORT:-8080}
     KOGITO_DATA_INDEX_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dquarkus.http.port=${httpPort}"
 }
 
+function configure_data_index_persistence() {
+    local allowed_persistence_types=("INFINISPAN" "MONGODB")
+    local persistence="INFINISPAN"
+    if [[ ! "${allowed_persistence_types[@]}" =~ "${DATA_INDEX_PERSISTENCE^^}" ]]; then
+        log_warning "Data index persistence type ${DATA_INDEX_PERSISTENCE} is not allowed, the allowed types are [${allowed_persistence_types[*]}]. Defaulting to ${persistence}."
+    elif [ "${DATA_INDEX_PERSISTENCE^^}" == "MONGODB" ]; then
+        persistence="${DATA_INDEX_PERSISTENCE^^}"
+    fi
+    log_info "Data index persistence is set to ${persistence}"
+    KOGITO_DATA_INDEX_SERVICE_JAR="data-index-service-${persistence,,}.jar"
+}
+
diff --git a/modules/kogito-data-index/configure b/modules/kogito-data-index/configure
index 308afeb581c..a8782e2ae25 100644
--- a/modules/kogito-data-index/configure
+++ b/modules/kogito-data-index/configure
@@ -5,7 +5,8 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname $0)
 ADDED_DIR=${SCRIPT_DIR}/added
 
-cp -v ${SOURCES_DIR}/kogito-data-index-runner.jar ${KOGITO_HOME}/bin/
+cp -v ${SOURCES_DIR}/data-index-service-infinispan.jar ${KOGITO_HOME}/bin/
+cp -v ${SOURCES_DIR}/data-index-service-mongodb.jar ${KOGITO_HOME}/bin/
 cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 
 mkdir -p ${KOGITO_HOME}/data/protobufs/
diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index 77a7344c1ce..2a91456e0f8 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -3,9 +3,12 @@ name: org.kie.kogito.dataindex
 version: "1.0.0-snapshot"
 
 artifacts:
-  - name: kogito-data-index-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service/1.0.0-SNAPSHOT/data-index-service-1.0.0-20200805.111853-4-runner.jar
-    md5: fb97dc0981ed1bfb5d0689b3779dfbec
+  - name: data-index-service-infinispan.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/1.0.0-SNAPSHOT/data-index-service-infinispan-1.0.0-20200831.024637-4-runner.jar
+    md5: 69f2d2fd634a02a70b8aa39b02786eca
+  - name: data-index-service-mongodb.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/1.0.0-SNAPSHOT/data-index-service-mongodb-1.0.0-20200831.024717-4-runner.jar
+    md5: b95b5f3a0567f24c96e9448aa53396fc
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
index 300daed6e6d..3b2b4eea745 100644
--- a/modules/kogito-data-index/tests/bats/kogito-data-index.bats
+++ b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
@@ -12,7 +12,6 @@ teardown() {
     rm -rf ${KOGITO_HOME}
 }
 
-
 @test "http port configuration default value" {
     configure_data_index_http_port
     expected=" -Dquarkus.http.port=8080"
@@ -28,3 +27,46 @@ teardown() {
     [ "${KOGITO_DATA_INDEX_PROPS}" = "${expected}" ]
 }
 
+@test "test if the default data index persistence service is correctly set" {
+    configure_data_index_persistence
+    expected="data-index-service-infinispan.jar"
+    echo "result: ${KOGITO_DATA_INDEX_SERVICE_JAR} \n expected: ${expected}"
+    [ "${KOGITO_DATA_INDEX_SERVICE_JAR}" = "${expected}" ]
+}
+
+@test "test if the default data index persistence service is correctly set (messages output only)" {
+    run configure_data_index_persistence
+    echo "output: ${output}"
+    [[ "${output}" = *"INFO Data index persistence is set to INFINISPAN"* ]]
+}
+
+@test "test if data index persistence service default value s correctly set if a nonsense type is set" {
+    DATA_INDEX_PERSISTENCE="nonsense"
+    configure_data_index_persistence
+    expected="data-index-service-infinispan.jar"
+    echo "result: ${KOGITO_DATA_INDEX_SERVICE_JAR} \n expected: ${expected}"
+    [ "${KOGITO_DATA_INDEX_SERVICE_JAR}" = "${expected}" ]
+}
+
+@test "test if data index persistence service default value s correctly set if a nonsense type is set (messages output only)" {
+    DATA_INDEX_PERSISTENCE="nonsense"
+    run configure_data_index_persistence
+    echo "lines: ${lines[@]}"
+    [[ "${lines[0]}" = *"WARN Data index persistence type nonsense is not allowed, the allowed types are [INFINISPAN MONGODB]. Defaulting to INFINISPAN."* ]]
+    [[ "${lines[1]}" = *"INFO Data index persistence is set to INFINISPAN"* ]]
+}
+
+@test "test if data index persistence service default value s correctly set if set to mongodb" {
+    DATA_INDEX_PERSISTENCE="mongodb"
+    configure_data_index_persistence
+    expected="data-index-service-mongodb.jar"
+    echo "result: ${KOGITO_DATA_INDEX_SERVICE_JAR} \n expected: ${expected}"
+    [ "${KOGITO_DATA_INDEX_SERVICE_JAR}" = "${expected}" ]
+}
+
+@test "test if data index persistence service default value s correctly set if set to mongodb (messages output only)" {
+    DATA_INDEX_PERSISTENCE="mongodb"
+    run configure_data_index_persistence
+    echo "output: ${output}"
+    [[ "${output}" = *"INFO Data index persistence is set to MONGODB"* ]]
+}
\ No newline at end of file
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index e1848374693..39c20330683 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/1.0.0-SNAPSHOT/explainability-service-rest-1.0.0-20200807.112159-1-runner.jar
-    md5: 6d4575cad75344c8855a3c186d4ce7de
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/1.0.0-SNAPSHOT/explainability-service-rest-1.0.0-20200831.025314-25-runner.jar
+    md5: 056d113d1e012599c77e3b174f0ce951
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/1.0.0-SNAPSHOT/explainability-service-messaging-1.0.0-20200807.112136-1-runner.jar
-    md5: 0c81d8af996bcff1b9fbab187a4514b5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/1.0.0-SNAPSHOT/explainability-service-messaging-1.0.0-20200831.025251-25-runner.jar
+    md5: 631460787e31ad6276450ee981b9f243
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/added/kogito-app-launch.sh b/modules/kogito-jobs-service/added/kogito-app-launch.sh
index bc9529f6ad3..657df560895 100644
--- a/modules/kogito-jobs-service/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service/added/kogito-app-launch.sh
@@ -8,9 +8,9 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     SHOW_JVM_SETTINGS="-XshowSettings:properties"
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
     log_info "JVM settings debug is enabled."
+    printenv
 fi
 
-
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
@@ -19,7 +19,5 @@ CONFIGURE_SCRIPTS=(
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-printenv
-
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} \
     -jar $KOGITO_HOME/bin/kogito-jobs-service-runner.jar
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index d931e8591a5..000409c5883 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/1.0.0-SNAPSHOT/jobs-service-1.0.0-20200805.111753-5-runner.jar
-    md5: 0faba2a1151175b92c672356d797e8d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/1.0.0-SNAPSHOT/jobs-service-1.0.0-20200831.024525-33-runner.jar
+    md5: f90187029827f14e9c88dd77668ceea2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index d1168102120..a98e8cb8472 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -21,6 +21,7 @@ teardown() {
     [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
 }
 
+
 @test "check if the maxIntervalLimitToRetryMillis is correctly set" {
     export MAX_INTERVAL_LIMIT_RETRY="8000"
     configure_jobs_service
@@ -69,24 +70,24 @@ teardown() {
 }
 
 @test "check if default http port is correctly set" {
+    configure_jobs_service_http_port
 
-  configure_jobs_service_http_port
-
-  result="${KOGITO_JOBS_PROPS}"
-  expected=" -Dquarkus.http.port=8080"
+    result="${KOGITO_JOBS_PROPS}"
+    expected=" -Dquarkus.http.port=8080"
 
-  echo "Result is ${result} and expected is ${expected}"
+    echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
 }
 
 @test "check if custom http port is correctly set" {
-  export HTTP_PORT="9090"
+    export HTTP_PORT="9090"
 
-  configure_jobs_service_http_port
+    configure_jobs_service_http_port
 
-  result="${KOGITO_JOBS_PROPS}"
-  expected=" -Dquarkus.http.port=9090"
+    result="${KOGITO_JOBS_PROPS}"
+    expected=" -Dquarkus.http.port=9090"
 
-  echo "Result is ${result} and expected is ${expected}"
+    echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
-}
\ No newline at end of file
+}
+
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 4badade39f5..fa77af90d5b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -8,8 +8,8 @@ envs:
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/1.0.0-SNAPSHOT/management-console-1.0.0-20200805.112213-4-runner.jar
-    md5: a14ed2e58242f0ce4c75660252808bd9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/1.0.0-SNAPSHOT/management-console-1.0.0-20200831.025059-32-runner.jar
+    md5: 636a914ff331e0addd72aa3908e24d20
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats b/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats
index 43c6e4e4477..3a63c8533ae 100644
--- a/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats
+++ b/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats
@@ -4,13 +4,13 @@
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-quarkus-jvm.sh
 
 @test "check if custom http port is correctly set" {
-  export HTTP_PORT="9090"
+    export HTTP_PORT="9090"
 
-  configure_quarkus_jvm_http_port
+    configure_quarkus_jvm_http_port
 
-  result="${KOGITO_QUARKUS_JVM_PROPS}"
-  expected=" -Dquarkus.http.port=9090"
+    result="${KOGITO_QUARKUS_JVM_PROPS}"
+    expected=" -Dquarkus.http.port=9090"
 
-  echo "Result is ${result} and expected is ${expected}"
+    echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
 }
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats b/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats
index 7f49fe76b71..99d99c36649 100644
--- a/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats
+++ b/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats
@@ -4,13 +4,13 @@
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-quarkus-s2i.sh
 
 @test "check if custom http port is correctly set" {
-  export HTTP_PORT="9090"
+    export HTTP_PORT="9090"
 
-  configure_quarkus_s2i_http_port
+    configure_quarkus_s2i_http_port
 
-  result="${KOGITO_QUARKUS_S2I_PROPS}"
-  expected=" -Dquarkus.http.port=9090"
+    result="${KOGITO_QUARKUS_S2I_PROPS}"
+    expected=" -Dquarkus.http.port=9090"
 
-  echo "Result is ${result} and expected is ${expected}"
+    echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
 }
\ No newline at end of file
diff --git a/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats b/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats
index 62d7bbde5c6..44cf9faf4e3 100644
--- a/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats
+++ b/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats
@@ -4,13 +4,13 @@
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-quarkus-native.sh
 
 @test "check if custom http port is correctly set" {
-  export HTTP_PORT="9090"
+    export HTTP_PORT="9090"
 
-  configure_quarkus_native_http_port
+    configure_quarkus_native_http_port
 
-  result="${KOGITO_QUARKUS_NATIVE_PROPS}"
-  expected=" -Dquarkus.http.port=9090"
+    result="${KOGITO_QUARKUS_NATIVE_PROPS}"
+    expected=" -Dquarkus.http.port=9090"
 
-  echo "Result is ${result} and expected is ${expected}"
+    echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
 }
\ No newline at end of file
diff --git a/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats b/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats
index 7f5689388cf..7279c024bb4 100644
--- a/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats
+++ b/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats
@@ -4,13 +4,13 @@
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-springboot-s2i.sh
 
 @test "check if custom http port is correctly set" {
-  export HTTP_PORT="9090"
+    export HTTP_PORT="9090"
 
-  configure_springboot_s2i_http_port
+    configure_springboot_s2i_http_port
 
-  result="${KOGITO_SPRINGBOOT_S2I_PROPS}"
-  expected=" -Dserver.port=9090"
+    result="${KOGITO_SPRINGBOOT_S2I_PROPS}"
+    expected=" -Dserver.port=9090"
 
-  echo "Result is ${result} and expected is ${expected}"
+    echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
 }
\ No newline at end of file
diff --git a/modules/kogito-springboot/tests/bats/kogito-springboot.bats b/modules/kogito-springboot/tests/bats/kogito-springboot.bats
index b22b2865eaa..84caf6cc8ba 100644
--- a/modules/kogito-springboot/tests/bats/kogito-springboot.bats
+++ b/modules/kogito-springboot/tests/bats/kogito-springboot.bats
@@ -4,13 +4,13 @@
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-springboot.sh
 
 @test "check if custom http port is correctly set" {
-  export HTTP_PORT="9090"
+    export HTTP_PORT="9090"
 
-  configure_springboot_http_port
+    configure_springboot_http_port
 
-  result="${KOGITO_SPRINGBOOT_PROPS}"
-  expected=" -Dserver.port=9090"
+    result="${KOGITO_SPRINGBOOT_PROPS}"
+    expected=" -Dserver.port=9090"
 
-  echo "Result is ${result} and expected is ${expected}"
+    echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
 }
\ No newline at end of file
diff --git a/modules/kogito-trusty/added/kogito-app-launch.sh b/modules/kogito-trusty/added/kogito-app-launch.sh
index acd904cb984..f57dca2bb69 100644
--- a/modules/kogito-trusty/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty/added/kogito-app-launch.sh
@@ -8,9 +8,9 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     SHOW_JVM_SETTINGS="-XshowSettings:properties"
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
     log_info "JVM settings debug is enabled."
+    printenv
 fi
 
-
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
@@ -19,8 +19,6 @@ CONFIGURE_SCRIPTS=(
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-printenv
-
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index fcd9ec92077..c1964acdb2b 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/1.0.0-SNAPSHOT/trusty-service-1.0.0-20200805.112415-4-runner.jar
-    md5: d767b0f1ca2096ac7e320b940ebc5779
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/1.0.0-SNAPSHOT/trusty-service-1.0.0-20200831.025350-34-runner.jar
+    md5: 8571eb5eb2a0900d881c73d159c41157
 
 execute:
   - script: configure
diff --git a/scripts/README.md b/scripts/README.md
index 978f92e6be0..0828d3b3a77 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -136,6 +136,8 @@ If no argument is given, it takes the JBoss repository as the default value.
 The command will update the needed files with the new URL:
 
 - kogito-data-index/module.yaml
+    - data-index-service-infinispan
+    - data-index-service-mongodb
 - kogito-jobs-service/module.yaml
 - kogito-management-console/module.yaml
 - kogito-trusty/module.yaml
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index f89ff824b41..163a132282b 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -21,12 +21,13 @@
 DEFAULT_REPO_URL = "https://repository.jboss.org/nexus/content/groups/public/"
 KOGITO_ARTIFACT_PATH = "org/kie/kogito"
 
-ARTIFACTS_VERSION="1.0.0-SNAPSHOT"
+ARTIFACTS_VERSION = "1.0.0-SNAPSHOT"
 
 Modules = {
     #service-name: module-name(directory in which module's module.yaml file is present)
     #Note: Service name should be same as given in the repository
-    "data-index-service": "kogito-data-index",
+    "data-index-service-infinispan": "kogito-data-index",
+    "data-index-service-mongodb": "kogito-data-index",
     "trusty-service": "kogito-trusty",
     "explainability-service-rest": "kogito-explainability",
     "explainability-service-messaging": "kogito-explainability",
diff --git a/tests/features/kogito-data-index.feature b/tests/features/kogito-data-index.feature
index 10ae680d8aa..7e63e75d316 100644
--- a/tests/features/kogito-data-index.feature
+++ b/tests/features/kogito-data-index.feature
@@ -11,22 +11,45 @@ Feature: Kogito-data-index feature.
     And the image should contain label io.k8s.display-name with value Kogito Data Index Service
     And the image should contain label io.openshift.tags with value kogito,data-index
 
-  Scenario: verify if the binary index is available on /home/kogito
+  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-data-index-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-data-index-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-infinispan.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-infinispan.jar
+     And run sh -c 'ls /home/kogito/bin/data-index-service-mongodb.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-mongodb.jar
 
-  Scenario: Verify if the debug is correctly enabled and test default http port
+  Scenario: Verify if the debug is correctly enabled and test default http port with default infinispan indexing service
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-data-index-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-infinispan.jar
 
-  Scenario: Verify if the debug is correctly enabled and test custom http port
+  Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port with mongodb indexing service
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+      | DATA_INDEX_PERSISTENCE | mongodb |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-mongodb.jar
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port using default infinispan indexing service
     When container is started with env
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
       | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-data-index-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-infinispan.jar
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port using mongodb indexing service
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+      | HTTP_PORT              | 9090    |
+      | DATA_INDEX_PERSISTENCE | mongodb |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-mongodb.jar
+
+  Scenario: Verify if the persistence is correctly set to its default value if a wrong persistence type is set
+    When container is started with env
+      | variable               | value    |
+      | SCRIPT_DEBUG           | true     |
+      | DATA_INDEX_PERSISTENCE | nonsense |
+    Then container log should contain WARN Data index persistence type nonsense is not allowed, the allowed types are [INFINISPAN MONGODB]. Defaulting to INFINISPAN.
 
   Scenario: verify if all parameters are correctly set
     When container is started with env

From fec1d1e2c91b38efb479c4218e1c27894fde4934 Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Fri, 4 Sep 2020 00:40:07 +0200
Subject: [PATCH 182/709] KOGITO-3180 - add trusty-ui image (#227)

Co-authored-by: Tarun Khandelwal <tarkhand@redhat.com>
---
 Jenkinsfile                                   |  4 +-
 Jenkinsfile.deploy                            |  5 +-
 Jenkinsfile.promote                           |  4 +-
 Makefile                                      | 17 +++++-
 README.md                                     | 29 ++++++++++
 kogito-trusty-ui-overrides.yaml               | 44 ++++++++++++++
 .../added/kogito-app-launch.sh                | 25 ++++++++
 .../added/launch/kogito-trusty-ui.sh          | 37 ++++++++++++
 modules/kogito-trusty-ui/configure            | 16 ++++++
 modules/kogito-trusty-ui/module.yaml          | 12 ++++
 .../tests/bats/kogito-trusty-ui.bats          | 57 +++++++++++++++++++
 scripts/README.md                             |  1 +
 scripts/common.py                             |  2 +-
 scripts/push-local-registry.sh                |  2 +-
 scripts/push-staging.py                       |  2 +-
 scripts/run-bats.sh                           |  3 +
 scripts/update-maven-artifacts.py             |  3 +-
 tests/features/kogito-trusty-ui.feature       | 43 ++++++++++++++
 18 files changed, 298 insertions(+), 8 deletions(-)
 create mode 100644 kogito-trusty-ui-overrides.yaml
 create mode 100644 modules/kogito-trusty-ui/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
 create mode 100644 modules/kogito-trusty-ui/configure
 create mode 100644 modules/kogito-trusty-ui/module.yaml
 create mode 100644 modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
 create mode 100644 tests/features/kogito-trusty-ui.feature

diff --git a/Jenkinsfile b/Jenkinsfile
index 2ea7aa252ae..da71ee96abb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,8 @@ IMAGES = ["kogito-quarkus-ubi8",
             "kogito-trusty",
             "kogito-explainability",
             "kogito-jobs-service",
-            "kogito-management-console"]
+            "kogito-management-console",
+            "kogito-trusty-ui"]
 
 pipeline{
     agent { label 'kogito-image-slave && !master'}
@@ -51,6 +52,7 @@ pipeline{
                     ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
+                    ./cekit-image-validator-runner kogito-trusty-ui-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-s2i-overrides.yaml
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 2e150278fd4..d85f1867209 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -10,7 +10,8 @@ IMAGES = [
             'kogito-trusty',
             'kogito-explainability',
             'kogito-jobs-service',
-            'kogito-management-console'
+            'kogito-management-console',
+            'kogito-trusty-ui'
          ]
 
 
@@ -147,6 +148,7 @@ pipeline {
                     sh 'cat modules/kogito-explainability/module.yaml'
                     sh 'cat modules/kogito-jobs-service/module.yaml'
                     sh 'cat modules/kogito-management-console/module.yaml'
+                    sh 'cat modules/kogito-trusty-ui/module.yaml'
                 }
             }
         }
@@ -165,6 +167,7 @@ pipeline {
                     ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
+                    ./cekit-image-validator-runner kogito-trusty-ui-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-s2i-overrides.yaml
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 3b449632051..f00985f64c9 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -11,7 +11,8 @@ IMAGES = [
             'kogito-trusty',
             'kogito-explainability',
             'kogito-jobs-service',
-            'kogito-management-console'
+            'kogito-management-console',
+            'kogito-trusty-ui'
          ]
 
 deployProperties=[:]
@@ -117,6 +118,7 @@ pipeline {
                         sh 'cat modules/kogito-explainability/module.yaml'
                         sh 'cat modules/kogito-jobs-service/module.yaml'
                         sh 'cat modules/kogito-management-console/module.yaml'
+                        sh 'cat modules/kogito-trusty-ui/module.yaml'
 
                         // Input for checking new artifacts have been set correctly
                         withCredentials([string(credentialsId: 'KOGITO_CI_EMAIL_TO', variable: 'ZULIP_EMAIL')]) {
diff --git a/Makefile b/Makefile
index 75a20f321b0..15f431e8b6a 100644
--- a/Makefile
+++ b/Makefile
@@ -145,6 +145,18 @@ ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION} quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-trusty-ui image
+kogito-trusty-ui:
+ifneq ($(ignore_build),true)
+	${CEKIT_CMD} build --overrides-file kogito-trusty-ui-overrides.yaml ${BUILD_ENGINE}
+endif
+# if ignore_test is set tu true, ignore the tests
+ifneq ($(ignore_test),true)
+	${CEKIT_CMD} test --overrides-file kogito-trusty-ui-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-trusty-ui:${IMAGE_VERSION} quay.io/kiegroup/kogito-trusty-ui:${SHORTENED_LATEST_VERSION}
+endif
 
 # push images to quay.io, this requires permissions under kiegroup organization
 .PHONY: push
@@ -169,7 +181,9 @@ _push:
 	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-jobs-service:latest
 	docker push quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-management-console:latest
+	docker push quay.io/kiegroup/kogito-management-console:latest	
+	docker push quay.io/kiegroup/kogito-trusty-ui:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-trusty-ui:latest
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	@echo "${SHORTENED_LATEST_VERSION} will be pushed"
 	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${SHORTENED_LATEST_VERSION}
@@ -182,6 +196,7 @@ ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	docker push quay.io/kiegroup/kogito-explainability:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-trusty-ui:${SHORTENED_LATEST_VERSION}
 endif
 
 
diff --git a/README.md b/README.md
index 67b89917f17..8948c8a9f51 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ Table of Contents
     - [Kogito Explainability Component Image](#kogito-explainability-component-image)
     - [Kogito Jobs Service Component Image](#kogito-jobs-service-component-image)
     - [Kogito Management Console Component Image](#kogito-management-console-component-image)
+    - [Kogito Trusty UI Component Image](#kogito-trusty-ui-component-image)
   - [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift)
     - [Using released images](#using-released-images)
     - [Pushing the built images to a local OCP registry:](#pushing-the-built-images-to-a-local-ocp-registry)
@@ -571,6 +572,7 @@ Today we have 3 Kogito Component Images:
 * [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
 * [quay.io/kiegroup/kogito-jobs-service](htps://quay.io/kiegroup/kogito-jobs-service)
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
+* [quay.io/kiegroup/kogito-trusty-ui](https://quay.io/kiegroup/kogito-trusty-ui)
 
 
 ### Kogito Data Index Component Image
@@ -705,6 +707,30 @@ To know what configurations this image accepts please take a look [here](kogito-
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Management Console 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
+### Kogito Trusty UI Component Image
+
+The Kogito Trusty UI provides an audit tool that allows you to retrieve and inspect the decisions that have been taken by Kogito Runtime Services.
+It depends on the Kogito Trusty Service on which the Trusty UI will connect to so it can be able to retrieve the information to display.
+
+To work correctly, the Kogito Trusty UI needs the Kogito Trusty Service url. If not provided, it will try to connect to the default one (http://localhost:8180).
+
+Basic usage:
+
+```bash
+$ docker run -it --env KOGITO_TRUSTY_ENDPOINT=trusty-service-url:9090 quay.io/kiegroup/kogito-trusty-ui:latest
+```
+
+To enable debug just use this env while running this image:
+
+```bash
+docker run -it --env SCRIPT_DEBUG=true --env KOGITO_TRUSTY_ENDPOINT=trusty-service-url:9090 quay.io/kiegroup/kogito-trusty-ui:latest
+```
+You should notice a few debug messages being printed in the system output.
+
+To know what configurations this image accepts please take a look [here](kogito-trusty-ui-overrides.yaml) on the **envs** section.
+
+The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty UI 
+to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
 ## Using Kogito Images to Deploy Apps on OpenShift
 
@@ -930,6 +956,7 @@ With this Makefile you can:
      $ make kogito-explainability
      $ make kogito-jobs-service 
      $ make kogito-management-console
+     $ make kogito-trusty-ui
      ```
   
      We can ignore the build or the tests while interacting with a specific image as well, to build only:
@@ -992,6 +1019,7 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
 - [kogito-logging](modules/kogito-logging): Provides common logging functions.
 - [kogito-management-console](modules/kogito-management-console): Installs and Configure the management-console jar inside the image
+- [kogito-trusty-ui](modules/kogito-trusty-ui): Installs and Configure the trusty-ui jar inside the image
 - [kogito-maven](modules/kogito-maven): Installs and configure Maven on the S2I images, also provides custom configuration script.
 - [kogito-openjdk](modules/kogito-openjdk): Provides OpenJDK and JRE.
 - [kogito-persistence](modules/kogito-persistence): Provides the needed configuration scripts to properly configure the Kogito Services in the target image.
@@ -1011,6 +1039,7 @@ Please inspect the images overrides files to learn which modules are being insta
 - [quay.io/kiegroup/kogito-explainability](kogito-explainability-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service](kogito-jobs-service-overrides.yaml)
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
+- [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-overrides.yaml)
 - [quay.io/kiegroup/kogito-quarkus-jvm-ubi8](kogito-quarkus-jvm-overrides.yaml)
 - [quay.io/kiegroup/kogito-quarkus-ubi8](kogito-quarkus-overrides.yaml)
 - [quay.io/kiegroup/kogito-quarkus-ubi8-s2i](kogito-quarkus-s2i-overrides.yaml)
diff --git a/kogito-trusty-ui-overrides.yaml b/kogito-trusty-ui-overrides.yaml
new file mode 100644
index 00000000000..15d5b6c857d
--- /dev/null
+++ b/kogito-trusty-ui-overrides.yaml
@@ -0,0 +1,44 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-trusty-ui"
+description: "Runtime image for Kogito Trusty UI"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Trusty UI, manage your Business Process easily."
+- name: "io.k8s.display-name"
+  value: "Kogito Trusty UI"
+- name: "io.openshift.tags"
+  value: "kogito,trusty,trusty-ui"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "KOGITO_TRUSTY_ENDPOINT"
+    example: "http://trusty.service:8080"
+    description: "Trusty service address, defaults to http://localhost:8180."
+  - name: "HTTP_PORT"
+    example: "9090"
+    description: "Defines which port the trusty ui Container Image will listen on."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.trusty.ui
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..b2114a5b5dd
--- /dev/null
+++ b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-trusty-ui.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} \
+        -Dquarkus.http.host=0.0.0.0 \
+        -jar $KOGITO_HOME/bin/kogito-trusty-ui-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
new file mode 100644
index 00000000000..3c8829a886f
--- /dev/null
+++ b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+    unset KOGITO_TRUSTY_ENDPOINT
+}
+
+function configure() {
+    configure_trusty_url
+    configure_trusty_ui_http_port
+}
+
+# Exit codes:
+#   10 - invalid url
+function configure_trusty_url {
+    url_simple_regex='(https?)://'
+    local trustyURL=${KOGITO_TRUSTY_ENDPOINT}
+    if [ "${trustyURL}x" != "x" ]; then
+        if [[ ! "${trustyURL}x" =~ $url_simple_regex ]]; then
+            log_error "URL must start with http or https."
+            exit 10
+        fi
+    else
+        log_info "Trusty url not set, default will be used: http://localhost:8180"
+        trustyURL="http://localhost:8180"
+    fi
+    KOGITO_TRUSTY_UI_PROPS="${KOGITO_TRUSTY_PROPS} -Dkogito.trusty.http.url=${trustyURL}"
+}
+
+function configure_trusty_ui_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_TRUSTY_UI_PROPS="${KOGITO_TRUSTY_UI_PROPS} -Dquarkus.http.port=${httpPort}"
+}
diff --git a/modules/kogito-trusty-ui/configure b/modules/kogito-trusty-ui/configure
new file mode 100644
index 00000000000..70002d4fe00
--- /dev/null
+++ b/modules/kogito-trusty-ui/configure
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+cp -v ${SOURCES_DIR}/kogito-trusty-ui-runner.jar ${KOGITO_HOME}/bin/
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
+cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
new file mode 100644
index 00000000000..c6c5241c11e
--- /dev/null
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.trusty.ui
+version: "1.0.0-snapshot"
+
+artifacts:
+  - name: kogito-trusty-ui-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/1.0.0-SNAPSHOT/trusty-ui-1.0.0-20200828.024416-1-runner.jar
+    md5: 8ff7d58e4868e3f474715d737ba1b6e9
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
new file mode 100644
index 00000000000..37e03beb8ee
--- /dev/null
+++ b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
@@ -0,0 +1,57 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME=$KOGITO_HOME
+mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-trusty-ui.sh
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+}
+
+@test "test if the default value for trusty url will be set" {
+    local expected=" -Dkogito.trusty.http.url=http://localhost:8180"
+    configure_trusty_url
+    echo "Result is [${KOGITO_TRUSTY_UI_PROPS}] and expected is [${expected}]" >&2
+    [ "${expected}" = "${KOGITO_TRUSTY_UI_PROPS}" ]
+}
+
+@test "test if KOGITO_TRUSTY_URL will be correctly set " {
+    export KOGITO_TRUSTY_ENDPOINT="http://10.10.10.10:8080"
+    local expected=" -Dkogito.trusty.http.url=http://10.10.10.10:8080"
+    configure_trusty_url
+    echo "Result is [${KOGITO_TRUSTY_UI_PROPS}] and expected is [${expected}]" >&2
+    [ "${expected}" = "${KOGITO_TRUSTY_UI_PROPS}" ]
+}
+
+@test "test if a invalid value for trusty url will return the expected exit code" {
+    export KOGITO_TRUSTY_ENDPOINT="a.b.c"
+    run configure_trusty_url
+    [ "${status}" == "10" ]
+}
+
+@test "check if default http port is correctly set" {
+    configure_trusty_ui_http_port
+
+    result="${KOGITO_TRUSTY_UI_PROPS}"
+    expected=" -Dquarkus.http.port=8080"
+
+    echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
+
+@test "check if custom http port is correctly set" {
+    export HTTP_PORT="9090"
+
+    configure_trusty_ui_http_port
+
+    result="${KOGITO_TRUSTY_UI_PROPS}"
+    expected=" -Dquarkus.http.port=9090"
+
+    echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
+
diff --git a/scripts/README.md b/scripts/README.md
index 0828d3b3a77..10e8e187b62 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -140,6 +140,7 @@ The command will update the needed files with the new URL:
     - data-index-service-mongodb
 - kogito-jobs-service/module.yaml
 - kogito-management-console/module.yaml
+- kogito-trusty-ui/module.yaml
 - kogito-trusty/module.yaml
 - kogito-explainability/module.yaml
 
diff --git a/scripts/common.py b/scripts/common.py
index 26acd9b2c97..ce443cd799e 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -10,7 +10,7 @@
 # All kogito-image modules that have the kogito version.
 MODULES = {"kogito-data-index", "kogito-trusty", 
            "kogito-explainability", "kogito-image-dependencies",
-           "kogito-jobs-service",
+           "kogito-jobs-service", "kogito-trusty-ui"
            "kogito-jq", "kogito-kubernetes-client",
            "kogito-launch-scripts", "kogito-logging",
            "kogito-management-console", "kogito-persistence",
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index ab6cf51a2ea..4e509018d22 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -4,7 +4,7 @@
 BUILD_ENGINE="docker"
 
 # All Kogito images
-IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-trusty kogito-jobs-service kogito-management-console"
+IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-trusty kogito-jobs-service kogito-management-console kogito-trusty-ui"
 
 registry=${REGISTRY:-{1}}
 version=${2:-latest}
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index e1c39567e8d..9468b74923f 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -20,7 +20,7 @@
 # All Kogito images
 IMAGES = ["kogito-quarkus-ubi8", "kogito-quarkus-jvm-ubi8", "kogito-quarkus-ubi8-s2i",
           "kogito-springboot-ubi8", "kogito-springboot-ubi8-s2i", "kogito-data-index",
-          "kogito-trusty", "kogito-explainability",
+          "kogito-trusty", "kogito-explainability", "kogito-trusty-ui",
           "kogito-jobs-service", "kogito-management-console"]
 
 IMAGES_NEXT_RC_TAG = []
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 1d2be17a645..caec4a8e1bc 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -31,6 +31,9 @@ echo "----> running bats on kogito-kubernetes-client"
 echo "----> running bats on kogito-management-console"
 ./bats/bin/bats modules/kogito-management-console/tests/bats/
 
+echo "----> running bats on kogito-trusty-ui"
+./bats/bin/bats modules/kogito-trusty-ui/tests/bats/
+
 echo "----> running bats on kogito-maven"
 ./bats/bin/bats modules/kogito-maven/tests/bats
 
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 163a132282b..4d05ded7b65 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -32,7 +32,8 @@
     "explainability-service-rest": "kogito-explainability",
     "explainability-service-messaging": "kogito-explainability",
     "jobs-service": "kogito-jobs-service",
-    "management-console": "kogito-management-console"
+    "management-console": "kogito-management-console",
+    "trusty-ui": "kogito-trusty-ui"
 }
 
 def isSnapshotVersion(version):
diff --git a/tests/features/kogito-trusty-ui.feature b/tests/features/kogito-trusty-ui.feature
new file mode 100644
index 00000000000..8f68feb0776
--- /dev/null
+++ b/tests/features/kogito-trusty-ui.feature
@@ -0,0 +1,43 @@
+@quay.io/kiegroup/kogito-trusty-ui
+Feature: kogito-trusty-ui feature
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty UI, manage your Business Process easily.
+    And the image should contain label io.k8s.display-name with value Kogito Trusty UI
+    And the image should contain label io.openshift.tags with value kogito,trusty,trusty-ui
+
+  Scenario: verify if the trusty ui jar is available on /home/kogito
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/kogito-trusty-ui-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-trusty-ui-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and test default http port
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
+    And container log should contain Trusty url not set, default will be used: http://localhost:8180
+    And container log should contain started in
+    And container log should not contain Application failed to start
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.port=9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and set trusty url
+    When container is started with env
+      | variable                  | value            |
+      | SCRIPT_DEBUG              | true             |
+      | KOGITO_TRUSTY_ENDPOINT | http://test:9090 |
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
+    And container log should not contain Trusty url not set, default will be used: http://localhost:8180
+    And container log should contain started in
+    And container log should not contain Application failed to start
+

From c07b75691c7fe425acb68cf36a04e62d6c77f6a2 Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Mon, 14 Sep 2020 16:10:56 +0200
Subject: [PATCH 183/709] KOGITO-3303 - update imagestream with trusty-ui and
 explainability (#233)

* Update kogito-imagestream.yaml

* Update kogito-imagestream.yaml
---
 kogito-imagestream.yaml | 42 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 6bfe2522af0..044ead2da74 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -153,6 +153,48 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-trusty:1.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-trusty-ui
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Trusty UI Service
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '1.0.0-snapshot'
+          annotations:
+            description: Runtime image for the Kogito Trusty UI Service
+            iconClass: icon-jbpm
+            tags: kogito,trusty-ui
+            supports: Audit UI
+            version: '1.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-trusty-ui:1.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-explainability
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Explainability Service
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '1.0.0-snapshot'
+          annotations:
+            description: Runtime image for the Kogito Explainability Service
+            iconClass: icon-jbpm
+            tags: kogito,explainability
+            supports: explainability for decisions
+            version: '1.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-explainability:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:

From b4cee30c1f6dc11f2d51f36c50fc7dcdb699f0bc Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Tue, 15 Sep 2020 15:51:27 +0200
Subject: [PATCH 184/709] fix comma (#234)

---
 scripts/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/common.py b/scripts/common.py
index ce443cd799e..e7e1825781b 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -10,7 +10,7 @@
 # All kogito-image modules that have the kogito version.
 MODULES = {"kogito-data-index", "kogito-trusty", 
            "kogito-explainability", "kogito-image-dependencies",
-           "kogito-jobs-service", "kogito-trusty-ui"
+           "kogito-jobs-service", "kogito-trusty-ui",
            "kogito-jq", "kogito-kubernetes-client",
            "kogito-launch-scripts", "kogito-logging",
            "kogito-management-console", "kogito-persistence",

From 973041e842a6f72ae547e459fab4b65a528baa18 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 17 Sep 2020 17:33:36 +0200
Subject: [PATCH 185/709] Update Jenkinsfile.promote (#238) (#240)

---
 Jenkinsfile.promote | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index f00985f64c9..ffc5ab7ea83 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -130,8 +130,18 @@ pipeline {
                         }
                         input message: 'Are the artifacts set correctly ?', ok: 'Yes'
 
-                        githubscm.commitChanges('Setup Maven artifacts to released ones')
-                        githubscm.pushObject('origin', getPRSourceBranch(), env.BOT_CREDENTIALS_ID)
+                        try {
+                            githubscm.commitChanges('Setup Maven artifacts to released ones')
+                            githubscm.pushObject('origin', getPRSourceBranch(), env.BOT_CREDENTIALS_ID)
+                        } catch (err) {
+                            withCredentials([string(credentialsId: 'KOGITO_CI_EMAIL_TO', variable: 'ZULIP_EMAIL')]) {
+                            emailext body: "Seems like no change is to be committed.\nPlease review in ${env.BUILD_URL}console.\n" +
+                                    "And take your decision here: ${env.BUILD_URL}input",
+                                    subject: "[${getBuildBranch()}] Release Pipeline",
+                                    to: ZULIP_EMAIL
+                            }
+                            input message: 'Should the pipeline continue ?', ok: 'Yes'
+                        }
                     }
                 }
             }

From 594b5c3faf9436a36e53a105be00d0bfa90c090a Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Tue, 29 Sep 2020 18:32:03 +0530
Subject: [PATCH 186/709] =?UTF-8?q?[KOGITO-3446]=20-=20Remove=20KAFKA=5FBO?=
 =?UTF-8?q?OTSTRAP=5FSERVERS=20env=20check=20from=20Jobs=20se=E2=80=A6=20(?=
 =?UTF-8?q?#241)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-3446] - Remove KAFKA_BOOTSTRAP_SERVERS env check from Jobs service scripts
---
 kogito-jobs-service-overrides.yaml                 |  3 ---
 .../added/launch/kogito-jobs-service.sh            |  8 +-------
 .../tests/bats/kogito-jobs-service.bats            | 10 +---------
 tests/features/kogito-jobs-service.feature         | 14 ++++----------
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index fb78d66a931..39e95cbc61b 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -29,9 +29,6 @@ envs:
 - name: "ENABLE_EVENTS"
   example: "true"
   description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
-- name: "KAFKA_BOOTSTRAP_SERVERS"
-  example: "localhost:9092"
-  description: "When enabling events for the Jobs Service, this variable also needs to be set to allow the service to connect to the given Kafka instance."
 - name: "HTTP_PORT"
   example: "9090"
   description: "Defines which port the Job service Container Image will listen on."
diff --git a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
index c5c7842e8a8..908f7c14db0 100644
--- a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
+++ b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
@@ -28,13 +28,7 @@ function configure_jobs_service() {
     fi
 
     if [ "${ENABLE_EVENTS^^}" == "TRUE" ]; then
-        if [ "${KAFKA_BOOTSTRAP_SERVERS}x" = "x" ]; then
-            echo "KAFKA_BOOTSTRAP_SERVERS env not found, please set it."
-            exit 1
-        else
-            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.profile=events-support"
-            KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dmp.messaging.outgoing.kogito-job-service-job-status-events.bootstrap.servers=${KAFKA_BOOTSTRAP_SERVERS} -Devents-support.quarkus.kafka.bootstrap-servers=${KAFKA_BOOTSTRAP_SERVERS}"
-        fi
+        KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.profile=events-support"
     fi
 }
 
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index a98e8cb8472..aa419777046 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -52,23 +52,15 @@ teardown() {
 
 @test "check if the event is correctly set" {
     export ENABLE_EVENTS="true"
-    export KAFKA_BOOTSTRAP_SERVERS="localhost:9999"
     configure_jobs_service
 
     result="${KOGITO_JOBS_PROPS}"
-    expected=" -Dquarkus.profile=events-support -Dmp.messaging.outgoing.kogito-job-service-job-status-events.bootstrap.servers=${KAFKA_BOOTSTRAP_SERVERS} -Devents-support.quarkus.kafka.bootstrap-servers=${KAFKA_BOOTSTRAP_SERVERS}"
+    expected=" -Dquarkus.profile=events-support"
 
     echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
 }
 
-@test "enable event without set kafka bootstrap server" {
-    export ENABLE_EVENTS="true"
-    run configure_jobs_service
-    echo "status is ${status}"
-    [ "$status" -eq 1 ]
-}
-
 @test "check if default http port is correctly set" {
     configure_jobs_service_http_port
 
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 0608034d945..d550496e2f6 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -30,18 +30,12 @@ Feature: Kogito-jobs-service feature.
       | HTTP_PORT     | 9090  |
     Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -jar /home/kogito/bin/kogito-jobs-service-runner.jar
 
-  Scenario: verify if container fails if event is enabled but there is no Kafka bootstrap server set.
-    When container is started with env
-      | variable      | value |
-      | ENABLE_EVENTS | true  |
-    Then container log should contain KAFKA_BOOTSTRAP_SERVERS env not found, please set it.
-
   Scenario: verify if the events is correctly enabled
     When container is started with env
-      | variable                | value           |
-      | SCRIPT_DEBUG            | true            |
-      | ENABLE_EVENTS           | true            |
-      | KAFKA_BOOTSTRAP_SERVERS | localhost:11111 |
+      | variable                | value                                     |
+      | SCRIPT_DEBUG            | true                                      |
+      | ENABLE_EVENTS           | true                                      |
+      | KOGITO_JOBS_PROPS       | -Dkafka.bootstrap.servers=localhost:11111 |
     Then container log should contain bootstrap.servers = [localhost:11111]
     And container log should contain started in
     And container log should contain Connection to node -1 (localhost/127.0.0.1:11111) could not be established.

From 067a4f004806e676f69df2c2e620e39d3ec1eee8 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 29 Sep 2020 15:07:49 +0200
Subject: [PATCH 187/709] KOGITO-3461 Moved KOGITO_VERSION to image.yaml (#242)

---
 image.yaml                                |  4 ++
 modules/kogito-quarkus-s2i/module.yaml    |  4 --
 modules/kogito-springboot-s2i/module.yaml |  4 --
 scripts/common.py                         | 61 ++++++++---------------
 scripts/manage-kogito-version.py          |  3 +-
 scripts/update-maven-artifacts.py         |  9 ++--
 6 files changed, 32 insertions(+), 53 deletions(-)

diff --git a/image.yaml b/image.yaml
index d20033e4d7f..8df70e2b3c2 100644
--- a/image.yaml
+++ b/image.yaml
@@ -21,6 +21,10 @@ modules:
   repositories:
     - path: modules
 
+envs:
+  - name: "KOGITO_VERSION"
+    value: "1.0.0-SNAPSHOT"
+
 packages:
   manager: microdnf
 
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
index 1cf42804941..1222ec4b806 100644
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ b/modules/kogito-quarkus-s2i/module.yaml
@@ -4,7 +4,3 @@ version: "1.0.0-snapshot"
 
 execute:
   - script: configure
-
-envs:
-  - name: "KOGITO_VERSION"
-    value: "1.0.0-SNAPSHOT"
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
index 89a2438c5c6..21311313eb6 100644
--- a/modules/kogito-springboot-s2i/module.yaml
+++ b/modules/kogito-springboot-s2i/module.yaml
@@ -4,7 +4,3 @@ version: "1.0.0-snapshot"
 
 execute:
   - script: configure
-
-envs:
-  - name: "KOGITO_VERSION"
-    value: "1.0.0-SNAPSHOT"
diff --git a/scripts/common.py b/scripts/common.py
index e7e1825781b..cfd6132f88a 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -25,6 +25,7 @@
 IMAGE_STREAM_FILENAME = "kogito-imagestream.yaml"
 # image.yaml file definition that needs to be updated
 IMAGE_FILENAME = "image.yaml"
+ARTIFACTS_VERSION_ENV_KEY="KOGITO_VERSION"
 
 # behave tests that needs to be update
 BEHAVE_BASE_DIR = 'tests/features'
@@ -142,57 +143,39 @@ def update_module_version(moduleDir, target_version):
         raise
 
 
-def update_artifacts_version_env_in_modules(artifacts_version):
+def retrieve_artifacts_version():
     """
-    Update all modules which contains the `KOGITO_VERSION` env var.
-    :param target_version: kogito version used to update all modules which contains the `KOGITO_VERSION` env var
+    Retrieve the artifacts version from envs in main image.yaml
     """
-    update_env_in_all_modules("KOGITO_VERSION", artifacts_version)
+    try:
+        with open(IMAGE_FILENAME) as imageFile:
+            data = yaml_loader().load(imageFile)
+            for index, env in enumerate(data['envs'], start=0):
+                if env['name'] == ARTIFACTS_VERSION_ENV_KEY:
+                    return data['envs'][index]['value']
 
-def update_env_in_all_modules(envKey, envValue):
-    """
-    Update all modules which contains the given envKey to the given envValue.
-    :param envKey: Environment variable key to update
-    :param envValue: Environment variable value to set
-    """
-    for module_dir in get_all_module_dirs():
-        update_env_in_module(module_dir, envKey, envValue)
+    except TypeError:
+        raise
 
-def update_env_in_module(module_dir, envKey, envValue):
+def update_artifacts_version_env_in_image(artifacts_version):
     """
-    Update a module if it contains the given envKey to the given envValue.
-    :param envKey: Environment variable key to update if exists
-    :param envValue: Environment variable value to set if exists
+    Update `KOGITO_VERSION` env var in image.yaml.
+    :param target_version: kogito version used to update image.yaml which contains the `KOGITO_VERSION` env var
     """
     try:
-        moduleFile = os.path.join(module_dir, "module.yaml")
-        changed = False
-        with open(moduleFile) as module:
-            data = yaml_loader().load(module)
-            if 'envs' in data:
-                for index, env in enumerate(data['envs'], start=0):
-                    if envKey == env['name']:
-                        print("Updating module {0} env var {1} with value {2}".format(data['name'], envKey, envValue))
-                        data['envs'][index]['value'] = envValue
-                        changed = True
+        with open(IMAGE_FILENAME) as imageFile:
+            data = yaml_loader().load(imageFile)
+            for index, env in enumerate(data['envs'], start=0):
+                if env['name'] == ARTIFACTS_VERSION_ENV_KEY:
+                    print("Updating image.yaml env var {0} with value {1}".format(ARTIFACTS_VERSION_ENV_KEY, artifacts_version))
+                    data['envs'][index]['value'] = artifacts_version
 
-        if (changed):
-            with open(moduleFile, 'w') as module:
-                yaml_loader().dump(data, module)
+        with open(IMAGE_FILENAME, 'w') as imageFile:
+            yaml_loader().dump(data, imageFile)
 
     except TypeError:
         raise
 
-def update_artifacts_version_in_python_scripts(artifacts_version):
-    """
-    Update python scripts with the default artifacts version
-    :param artifacts_version: artifacts version to set
-    """
-    print("Set artifacts_version {} in python scripts".format(artifacts_version))
-    pattern = re.compile(r'(ARTIFACTS_VERSION=.*)')
-    replacement = 'ARTIFACTS_VERSION="{}"'.format(artifacts_version)
-    update_in_file("scripts/update-maven-artifacts.py", pattern, replacement)
-
 def update_examples_ref_in_behave_tests(examples_ref):
     """
     Update examples git reference into behave tests
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index f169116b4d6..cc86717d00d 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -58,8 +58,7 @@
             common.update_image_version(args.bump_to)
             common.update_image_stream(args.bump_to)
             common.update_modules_version(args.bump_to)
-            common.update_artifacts_version_env_in_modules(artifacts_version)
-            common.update_artifacts_version_in_python_scripts(artifacts_version)
+            common.update_artifacts_version_env_in_image(artifacts_version)
 
             # tests default values
             common.update_examples_ref_in_behave_tests(examples_ref)
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 4d05ded7b65..85fae4a7848 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -21,8 +21,6 @@
 DEFAULT_REPO_URL = "https://repository.jboss.org/nexus/content/groups/public/"
 KOGITO_ARTIFACT_PATH = "org/kie/kogito"
 
-ARTIFACTS_VERSION = "1.0.0-SNAPSHOT"
-
 Modules = {
     #service-name: module-name(directory in which module's module.yaml file is present)
     #Note: Service name should be same as given in the repository
@@ -124,12 +122,15 @@ def update_artifacts(service,modulePath):
     parser.add_argument('--repo-url', dest='repo_url', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
     args = parser.parse_args()
     
+    artifactsVersion = common.retrieve_artifacts_version()
+    print("Retrieve artifacts version: ", artifactsVersion)
+
     # Update Kogito Service modules
     for serviceName, modulePath in Modules.items():
         service = {
-            "repo_url" : args.repo_url + "{}/{}/{}/".format(KOGITO_ARTIFACT_PATH, serviceName, ARTIFACTS_VERSION),
+            "repo_url" : args.repo_url + "{}/{}/{}/".format(KOGITO_ARTIFACT_PATH, serviceName, artifactsVersion),
             "name" : serviceName,
-            "version" : ARTIFACTS_VERSION
+            "version" : artifactsVersion
         }
         moduleYamlFile = "modules/{}/module.yaml".format(modulePath)
         

From da601d6187bf574d534f23ed7f46347ad537e19e Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 30 Sep 2020 03:27:01 -0300
Subject: [PATCH 188/709] [KOGITO-3433] - Update Graalvm version to 20.2.0
 (#243)

Signed-off-by: spolti <fspolti@redhat.com>
---
 README.md                                        |  4 ++--
 kogito-quarkus-overrides.yaml                    |  2 +-
 kogito-quarkus-s2i-overrides.yaml                |  2 +-
 .../20.x-java-1.8/module.yaml                    | 16 ++++++++--------
 .../20.x-java-11/module.yaml                     | 16 ++++++++--------
 modules/kogito-graalvm-scripts/module.yaml       |  2 +-
 tests/features/kogito-quarkus-ubi8-s2i.feature   |  8 ++++++--
 7 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 8948c8a9f51..1e016e39a0a 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ To interact with Kogito images, you would need to install the needed dependencie
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
         * used to perform local s2i images using some of the [builder images](#builder-images)
-    * [GraalVM 20.1.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-20.1.0) Java 11 or higher
+    * [GraalVM 20.2.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-20.2.0) Java 11 or higher
         * Useful to test Kogito apps on native mode before create a Container image with it.
     * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
         
@@ -132,7 +132,7 @@ lightweight and fast applications ready to run in the Cloud.
 
 The Kogito Quarkus Builder Image is equipped with the following components:
 
- * GraalVM 20.1.0-java11
+ * GraalVM 20.2.0-java11
  * OpenJDK 11.0.6
  * Maven 3.6.2
  
diff --git a/kogito-quarkus-overrides.yaml b/kogito-quarkus-overrides.yaml
index c8e83854e3d..cee65a29c7c 100644
--- a/kogito-quarkus-overrides.yaml
+++ b/kogito-quarkus-overrides.yaml
@@ -34,7 +34,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "20.1.0-java-11"
+    version: "20.2.0-java-11"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.quarkus
 
diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-s2i-overrides.yaml
index aa48d44a0fd..f9afec06bfc 100644
--- a/kogito-quarkus-s2i-overrides.yaml
+++ b/kogito-quarkus-s2i-overrides.yaml
@@ -38,7 +38,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "20.1.0-java-11"
+    version: "20.2.0-java-11"
   - name: org.kie.kogito.graalvm.scripts
   - name: org.kie.kogito.openjdk
     version: "11"
diff --git a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
index 3e888a7a98e..b4bbab16d65 100644
--- a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "20.1.0-java-1.8"
+version: "20.2.0-java-1.8"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,17 +9,17 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "20.1.0"
+    value: "20.2.0"
   - name: "GRAALVM_JAVA_VERSION"
     value: "8"
 
 artifacts:
-- name: graalvm-ce-java8-linux-amd64-20.1.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java8-linux-amd64-20.1.0.tar.gz
-  md5: 18ab19e0a739c9172f2e88d3cda09a6d
-- name: native-image-installable-svm-java8-linux-amd64-20.1.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/native-image-installable-svm-java8-linux-amd64-20.1.0.jar
-  md5: bb79277a6fa0f91de88298fe853041e7
+- name: graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
+  md5: 1bde5d9638c13c5b50e7628eb045b6f7
+- name: native-image-installable-svm-java8-linux-amd64-20.2.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java8-linux-amd64-20.2.0.jar
+  md5: 7b41bbd2c7ba5e731167348df31765d5
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
index b52b0a497f2..386698de769 100644
--- a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "20.1.0-java-11"
+version: "20.2.0-java-11"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,17 +9,17 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "20.1.0"
+    value: "20.2.0"
   - name: "GRAALVM_JAVA_VERSION"
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-20.1.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz
-  md5: 9061a89c71a1ff00364b7dd99c595935
-- name: native-image-installable-svm-java11-linux-amd64-20.1.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/native-image-installable-svm-java11-linux-amd64-20.1.0.jar
-  md5: c9cd0488bc6536ce7ceb8b34f6bafdee
+- name: graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
+  md5: 17669cb10b439c0522b4d56a6b277e85
+- name: native-image-installable-svm-java11-linux-amd64-20.2.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java11-linux-amd64-20.2.0.jar
+  md5: 574dc13cde215d1098f349a07b0e6592
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml
index 183da12724f..706fb8148d8 100644
--- a/modules/kogito-graalvm-scripts/module.yaml
+++ b/modules/kogito-graalvm-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
-version: "20.1.0"
+version: "20.2.0"
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index faf4de0a584..d52403cbe1d 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -136,7 +136,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/persons.proto with the name: /home/kogito/data/protobufs/persons-md5.txt
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
-  Scenario: Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
+  # https://issues.redhat.com/browse/KOGITO-3469
+  @ignore
+  Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE            | false                            |
@@ -153,6 +155,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
+  # https://issues.redhat.com/browse/KOGITO-3469
+  @ignore
   Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
@@ -244,7 +248,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 20.1.0
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 20.2.0
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
     Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest

From 42a76f03c1b263cb437d2eeac62166efdf3cd999 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Thu, 1 Oct 2020 20:01:37 +0530
Subject: [PATCH 189/709] [KOGITO-3463] - Review make commands on kogito images
 (#246)

See: https://issues.redhat.com/browse/KOGITO-3463

Signed-off-by: Tarun Khandelwal <tarkhand@redhat.com>
---
 Jenkinsfile                   |  3 +++
 Jenkinsfile.deploy            |  1 +
 Jenkinsfile.promote           |  1 +
 tests/test-apps/clone-repo.sh | 18 +++++++++++-------
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index da71ee96abb..606ea1e1a8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,6 +21,9 @@ pipeline{
     tools {
         jdk 'kie-jdk11'
     }
+    environment {
+        CI = true
+    }
     stages{
         stage('Initialization'){
             steps{
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index d85f1867209..a7a3ce5ef41 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -59,6 +59,7 @@ pipeline {
     }
 
     environment {
+        CI = true
         JAVA_HOME = "${GRAALVM_HOME}"
 
         OPENSHIFT_API = credentials('OPENSHIFT_API')
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index ffc5ab7ea83..d2152fabe58 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -61,6 +61,7 @@ pipeline {
     }
 
     environment {
+        CI = true
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 3fb6e374fce..27ab403b571 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -9,13 +9,15 @@ MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS="-Dquarkus.native.container-build=true
 
 # exit when any command fails
 set -e
-
+#Setup maven configuration only on CI
+if [ $CI ]; then
 # setup maven env
-export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
-# export MAVEN_REPO_URL=
-cp ${MVN_MODULE}/maven/settings.xml ${HOME}/.m2/settings.xml
-source ${MVN_MODULE}/added/configure-maven.sh
-configure
+    export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
+    # export MAVEN_REPO_URL=
+    cp ${MVN_MODULE}/maven/settings.xml ${HOME}/.m2/settings.xml
+    source ${MVN_MODULE}/added/configure-maven.sh
+    configure
+fi
 
 cat ${HOME}/.m2/settings.xml
 
@@ -48,4 +50,6 @@ cp ${SCRIPT_DIR}/application.properties /tmp/kogito-examples/rules-quarkus-hello
 git add --all  :/
 git commit -am "test"
 
-rm ${HOME}/.m2/settings.xml
\ No newline at end of file
+if [ $CI ]; then
+    rm ${HOME}/.m2/settings.xml
+fi
\ No newline at end of file

From ff3dfad0ffb388a6672952a737f7d72c4a24db10 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 2 Oct 2020 17:02:48 +0200
Subject: [PATCH 190/709] [KOGITO-3463] Corrected clone-repo.sh (#250)

---
 tests/test-apps/clone-repo.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 27ab403b571..609dc5bf797 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -17,9 +17,9 @@ if [ $CI ]; then
     cp ${MVN_MODULE}/maven/settings.xml ${HOME}/.m2/settings.xml
     source ${MVN_MODULE}/added/configure-maven.sh
     configure
-fi
 
-cat ${HOME}/.m2/settings.xml
+    cat ${HOME}/.m2/settings.xml
+fi
 
 # Clone examples
 cd /tmp

From fdbed569ef65217a7a1d555b030c79106ae84229 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 2 Oct 2020 15:29:53 -0300
Subject: [PATCH 191/709] [KOGITO-3469] - Investigate maven multi module tests
 on Kogito s2i image (#244)

Signed-off-by: spolti <fspolti@redhat.com>
---
 tests/features/kogito-quarkus-ubi8-s2i.feature | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index d52403cbe1d..b65078e1033 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -136,8 +136,6 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/persons.proto with the name: /home/kogito/data/protobufs/persons-md5.txt
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
-  # https://issues.redhat.com/browse/KOGITO-3469
-  @ignore
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
@@ -155,8 +153,6 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
-  # https://issues.redhat.com/browse/KOGITO-3469
-  @ignore
   Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |

From a21049e7962ee451860d4aac351ab5a9e0f4b82f Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 2 Oct 2020 16:48:13 -0300
Subject: [PATCH 192/709] [KOGITO-2003] - Behave tests with native builds and
 persistene enabled fail with to check files under /bin (#245)

Signed-off-by: spolti <fspolti@redhat.com>
---
 tests/features/kogito-quarkus-ubi8-s2i.feature | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index b65078e1033..8dee6724368 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -119,8 +119,6 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/persons.proto with the name: /home/kogito/data/protobufs/persons-md5.txt
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
-  # ignore until https://issues.redhat.com/browse/KOGITO-2003 is not fixed.
-  @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |

From b6c46ef0b0cd604c0663e790b9ce93abb6a9c16d Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Thu, 8 Oct 2020 19:11:47 +0530
Subject: [PATCH 193/709] =?UTF-8?q?[KOGITO-3553]=20-=20Ignore=20Self=20sig?=
 =?UTF-8?q?ned=20certificates=20from=20maven=20while=20bui=E2=80=A6=20(#25?=
 =?UTF-8?q?3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-3553] - Ingnore Self signed certificates from maven while building images
See: https://issues.redhat.com/browse/KOGITO-3553
---
 Jenkinsfile                                   |  7 ++++++-
 Jenkinsfile.deploy                            |  8 +++++--
 .../3.6.x/added/configure-maven.sh            | 11 +++++++++-
 modules/kogito-maven/3.6.x/module.yaml        |  4 +++-
 .../tests/bats/maven-settings.bats            | 21 +++++++++++++++++++
 scripts/common.py                             | 10 ++++++++-
 scripts/update-tests.py                       |  6 +++++-
 7 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 606ea1e1a8a..7ea8bd11c01 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,6 +37,11 @@ pipeline{
                     }
 
                     githubscm.checkoutIfExists('kogito-images', changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
+
+                    //Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
+                    if(env.MAVEN_MIRROR_URL != ''){
+                        sh 'python3 scripts/update-tests.py --ignore-self-signed-cert'
+                    }
                 }
             }
         }
@@ -146,4 +151,4 @@ String getWorkspacesPath(){
 
 String getWorkspacePath(String image){
     return "${getWorkspacesPath()}/${image}"
-}
\ No newline at end of file
+}
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index a7a3ce5ef41..19351b25f18 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -206,13 +206,17 @@ pipeline {
                     }
 
                     // Set kogito-examples to bot author/branch if release
-                    if(params.EXAMPLES_REF != ""){
+                    if(params.EXAMPLES_REF != ''){
                         updateTestsCommand += " --examples-ref ${params.EXAMPLES_REF}"
                     }
                     if(params.EXAMPLES_URI){
                         updateTestsCommand += " --examples-uri ${params.EXAMPLES_URI}"
                     }
 
+                    //Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
+                    if(env.MAVEN_MIRROR_URL != ''){
+                        updateTestsCommand += ' --ignore-self-signed-cert'
+                    }
                     // Launch update tests
                     sh updateTestsCommand
 
@@ -496,4 +500,4 @@ void setDeployPropertyIfNeeded(String key, def value){
     if (value != null && value != ''){
         deployProperties[key] = value
     }
-}
\ No newline at end of file
+}
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index 70cc7ebca38..196426c23ef 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+#Please keep them in alphabatical order
 function prepareEnv() {
     unset HTTP_PROXY_HOST
     unset HTTP_PROXY_PORT
@@ -7,8 +8,9 @@ function prepareEnv() {
     unset HTTP_PROXY_USERNAME
     unset HTTP_PROXY_NONPROXYHOSTS
     unset HTTPS_PROXY
-    unset MAVEN_MIRROR_URL
     unset MAVEN_DOWNLOAD_OUTPUT
+    unset MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE
+    unset MAVEN_MIRROR_URL
     unset MAVEN_REPO_ID
     unset MAVEN_REPO_LAYOUT
     unset MAVEN_REPO_RELEASES_ENABLED
@@ -25,6 +27,7 @@ function configure() {
     configure_proxy
     configure_mirrors
     configure_maven_download_output
+    ignore_maven_self_signed_certificates
     set_kogito_maven_repo
     add_maven_repo
 }
@@ -92,6 +95,12 @@ function configure_maven_download_output() {
     fi
 }
 
+function ignore_maven_self_signed_certificates() {
+    if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
+    fi
+}
+
 function set_kogito_maven_repo() {
     local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
     if [ -n "${kogito_maven_repo_url}" ]; then
diff --git a/modules/kogito-maven/3.6.x/module.yaml b/modules/kogito-maven/3.6.x/module.yaml
index 0d60c957261..2f5dc84625d 100644
--- a/modules/kogito-maven/3.6.x/module.yaml
+++ b/modules/kogito-maven/3.6.x/module.yaml
@@ -62,7 +62,9 @@ envs:
   - name: "MAVEN_REPOS"
     description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories."
     example: "CENTRAL,INTERNAL"
-
+  - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
+    description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
+    example: "true"
 # unfortunately by now the version needs to be hardcoded.
 artifacts:
   - name: apache-maven-3.6.2-bin.tar.gz
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index d687ef4d645..b6cf58789c6 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -164,6 +164,27 @@ function _generate_random_id() {
     [ "${expected}" = "${result}" ]
 }
 
+@test "test maven args when IGNORE_SELF_SIGNED_CERTIFICATE is true" {
+    prepareEnv
+    MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE="true"
+    ignore_maven_self_signed_certificates
+    expected=" -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
+    result="${MAVEN_ARGS_APPEND}"
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
+@test "test maven args when IGNORE_SELF_SIGNED_CERTIFICATE is false" {
+    prepareEnv
+    ignore_maven_self_signed_certificates
+    expected=""
+    result="${MAVEN_ARGS_APPEND}"
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
+
 @test "test maven custom repo with ID and all supported configurations" {
     prepareEnv
     MAVEN_REPO_URL="http://my.cool.mvn.repo.severinolabs.com/group/public"
diff --git a/scripts/common.py b/scripts/common.py
index cfd6132f88a..1b1d0cef800 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -222,7 +222,15 @@ def update_maven_repo_in_behave_tests(repo_url, replaceJbossRepository):
         envVarKey = "JBOSS_MAVEN_REPO_URL"
     replacement = "| variable | value |\n      | {} | {} |\n      | MAVEN_DOWNLOAD_OUTPUT | true |".format(envVarKey, repo_url)
     update_in_behave_tests(pattern, replacement)
-
+def ignore_maven_self_signed_certificate_in_behave_tests():
+    """
+    Sets the environment variable to ignore the self-signed certificates in maven
+    """
+    print("Setting MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE env in behave tests")
+    pattern = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
+    replacement = "| variable | value |\n      | MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE | true |"
+    update_in_behave_tests(pattern, replacement)
+    
 def update_in_behave_tests(pattern, replacement):
     """
     Update all behave tests files
diff --git a/scripts/update-tests.py b/scripts/update-tests.py
index ea52662b81e..c1d1e0132c2 100644
--- a/scripts/update-tests.py
+++ b/scripts/update-tests.py
@@ -17,6 +17,7 @@
     parser.add_argument('--examples-uri', dest='examples_uri', help='To update the examples uri for testing')
     parser.add_argument('--examples-ref', dest='examples_ref', help='To update the examples ref for testing')
     parser.add_argument('--artifacts-version', dest='artifacts_version', help='To update the artifacts version for testing')
+    parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False, action='store_true', help='If set to true will relax the SSL for user-generated self-signed certificates')
     args = parser.parse_args()
 
     if args.repo_url:
@@ -32,4 +33,7 @@
         common.update_examples_ref_in_clone_repo(args.examples_ref)
 
     if args.artifacts_version:
-        common.update_artifacts_version_in_behave_tests(args.artifacts_version)
\ No newline at end of file
+        common.update_artifacts_version_in_behave_tests(args.artifacts_version)
+    
+    if args.ignore_self_signed_cert:
+        common.ignore_maven_self_signed_certificate_in_behave_tests()
\ No newline at end of file

From 2cf9892f3dd2939ecb8a51f112031c15c48933e6 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 8 Oct 2020 16:21:17 -0300
Subject: [PATCH 194/709] [KOGITO-815] - Create image for Task Console (#252)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Jenkinsfile                                   |  2 +
 Jenkinsfile.deploy                            |  3 +
 Jenkinsfile.promote                           |  2 +
 Makefile                                      | 40 +++++++++----
 kogito-imagestream.yaml                       | 22 ++++++-
 kogito-management-console-overrides.yaml      |  4 +-
 kogito-task-console-overrides.yaml            | 45 ++++++++++++++
 modules/kogito-management-console/module.yaml |  4 --
 .../added/kogito-app-launch.sh                | 24 ++++++++
 .../added/launch/kogito-task-console.sh       | 37 ++++++++++++
 modules/kogito-task-console/configure         | 16 +++++
 modules/kogito-task-console/module.yaml       | 12 ++++
 .../tests/bats/kogito-task-console.bats       | 58 +++++++++++++++++++
 scripts/common.py                             | 10 ++--
 scripts/push-local-registry.sh                |  2 +-
 scripts/push-staging.py                       |  2 +-
 scripts/run-bats.sh                           |  3 +
 scripts/update-maven-artifacts.py             |  1 +
 tests/features/kogito-task-console.feature    | 43 ++++++++++++++
 19 files changed, 304 insertions(+), 26 deletions(-)
 create mode 100644 kogito-task-console-overrides.yaml
 create mode 100644 modules/kogito-task-console/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-task-console/added/launch/kogito-task-console.sh
 create mode 100644 modules/kogito-task-console/configure
 create mode 100644 modules/kogito-task-console/module.yaml
 create mode 100644 modules/kogito-task-console/tests/bats/kogito-task-console.bats
 create mode 100644 tests/features/kogito-task-console.feature

diff --git a/Jenkinsfile b/Jenkinsfile
index 7ea8bd11c01..17d45379042 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,6 +14,7 @@ IMAGES = ["kogito-quarkus-ubi8",
             "kogito-explainability",
             "kogito-jobs-service",
             "kogito-management-console",
+            "kogito-task-console",
             "kogito-trusty-ui"]
 
 pipeline{
@@ -60,6 +61,7 @@ pipeline{
                     ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
+                    ./cekit-image-validator-runner kogito-task-console-overrides.yaml
                     ./cekit-image-validator-runner kogito-trusty-ui-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 19351b25f18..128b4c7c393 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -11,6 +11,7 @@ IMAGES = [
             'kogito-explainability',
             'kogito-jobs-service',
             'kogito-management-console',
+            'kogito-task-console',
             'kogito-trusty-ui'
          ]
 
@@ -149,6 +150,7 @@ pipeline {
                     sh 'cat modules/kogito-explainability/module.yaml'
                     sh 'cat modules/kogito-jobs-service/module.yaml'
                     sh 'cat modules/kogito-management-console/module.yaml'
+                    sh 'cat modules/kogito-task-console/module.yaml'
                     sh 'cat modules/kogito-trusty-ui/module.yaml'
                 }
             }
@@ -168,6 +170,7 @@ pipeline {
                     ./cekit-image-validator-runner kogito-explainability-overrides.yaml
                     ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
                     ./cekit-image-validator-runner kogito-management-console-overrides.yaml
+                    ./cekit-image-validator-runner kogito-task-console-overrides.yaml
                     ./cekit-image-validator-runner kogito-trusty-ui-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
                     ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index d2152fabe58..9a432cf81eb 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -12,6 +12,7 @@ IMAGES = [
             'kogito-explainability',
             'kogito-jobs-service',
             'kogito-management-console',
+            'kogito-task-console',
             'kogito-trusty-ui'
          ]
 
@@ -119,6 +120,7 @@ pipeline {
                         sh 'cat modules/kogito-explainability/module.yaml'
                         sh 'cat modules/kogito-jobs-service/module.yaml'
                         sh 'cat modules/kogito-management-console/module.yaml'
+                        sh 'cat modules/kogito-task-console/module.yaml'
                         sh 'cat modules/kogito-trusty-ui/module.yaml'
 
                         // Input for checking new artifacts have been set correctly
diff --git a/Makefile b/Makefile
index 15f431e8b6a..27b9006bb1e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ CEKIT_CMD := cekit -v ${cekit_option}
 # Build all images
 .PHONY: build
 # start to build the images
-build: clone-repos kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-trusty kogito-explainability kogito-jobs-service kogito-management-console
+build: clone-repos kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-trusty kogito-explainability kogito-jobs-service kogito-management-console kogito-task-console kogito-trusty-ui
 
 clone-repos:
 # if the NO_TEST env defined, proceed with the tests, as first step prepare the repo to be used
@@ -20,7 +20,7 @@ kogito-quarkus-ubi8:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-quarkus-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-quarkus-overrides.yaml behave
 endif
@@ -46,7 +46,7 @@ kogito-quarkus-ubi8-s2i:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-quarkus-s2i-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-quarkus-s2i-overrides.yaml behave
 endif
@@ -59,7 +59,7 @@ kogito-springboot-ubi8:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-springboot-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-springboot-overrides.yaml behave
 endif
@@ -72,7 +72,7 @@ kogito-springboot-ubi8-s2i:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-springboot-s2i-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-springboot-s2i-overrides.yaml behave
 endif
@@ -85,7 +85,7 @@ kogito-data-index:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-data-index-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-data-index-overrides.yaml behave
 endif
@@ -98,7 +98,7 @@ kogito-trusty:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-trusty-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-trusty-overrides.yaml behave
 endif
@@ -111,7 +111,7 @@ kogito-explainability:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-explainability-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-explainability-overrides.yaml behave
 endif
@@ -124,7 +124,7 @@ kogito-jobs-service:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-jobs-service-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-jobs-service-overrides.yaml behave
 endif
@@ -137,7 +137,7 @@ kogito-management-console:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-management-console-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-management-console-overrides.yaml behave
 endif
@@ -145,12 +145,25 @@ ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION} quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
 endif
 
+# build the quay.io/kiegroup/kogito-task-console image
+kogito-task-console:
+ifneq ($(ignore_build),true)
+	${CEKIT_CMD} build --overrides-file kogito-task-console-overrides.yaml ${BUILD_ENGINE}
+endif
+# if ignore_test is set to true, ignore the tests
+ifneq ($(ignore_test),true)
+	${CEKIT_CMD} test --overrides-file kogito-task-console-overrides.yaml behave
+endif
+ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
+	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-task-console:${IMAGE_VERSION} quay.io/kiegroup/kogito-task-console:${SHORTENED_LATEST_VERSION}
+endif
+
 # build the quay.io/kiegroup/kogito-trusty-ui image
 kogito-trusty-ui:
 ifneq ($(ignore_build),true)
 	${CEKIT_CMD} build --overrides-file kogito-trusty-ui-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set tu true, ignore the tests
+# if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file kogito-trusty-ui-overrides.yaml behave
 endif
@@ -181,7 +194,9 @@ _push:
 	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-jobs-service:latest
 	docker push quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-management-console:latest	
+	docker push quay.io/kiegroup/kogito-management-console:latest
+	docker push quay.io/kiegroup/kogito-task-console:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/kogito-task-console:latest
 	docker push quay.io/kiegroup/kogito-trusty-ui:${IMAGE_VERSION}
 	docker push quay.io/kiegroup/kogito-trusty-ui:latest
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
@@ -196,6 +211,7 @@ ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	docker push quay.io/kiegroup/kogito-explainability:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/kogito-task-console:${SHORTENED_LATEST_VERSION}
 	docker push quay.io/kiegroup/kogito-trusty-ui:${SHORTENED_LATEST_VERSION}
 endif
 
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 044ead2da74..2f7d74ae9de 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -237,4 +237,24 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-management-console:1.0.0-snapshot
-
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-task-console
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Task Console
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '1.0.0-snapshot'
+          annotations:
+            description: Runtime image for the Kogito Task Console
+            iconClass: icon-jbpm
+            tags: kogito,task-console
+            supports: business process management
+            version: '1.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-task-console:1.0.0-snapshot
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index 248c9b939f8..93290dd8e2f 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -19,10 +19,10 @@ envs:
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
   - name: "KOGITO_DATAINDEX_HTTP_URL"
     example: "http://data-index.service:8080"
-    description: "Data Index service address, defaults tohttp://localhost:8180."
+    description: "Data Index service address, defaults to http://localhost:8180."
   - name: "HTTP_PORT"
     example: "9090"
-    description: "Defines which port the management console Container Image will listen on."
+    description: "Defines which port the Management Console Container Image will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-task-console-overrides.yaml b/kogito-task-console-overrides.yaml
new file mode 100644
index 00000000000..573ce162eec
--- /dev/null
+++ b/kogito-task-console-overrides.yaml
@@ -0,0 +1,45 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-task-console"
+description: "Runtime image for Kogito Task Console"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Task Console, manage your Business Process easily."
+- name: "io.k8s.display-name"
+  value: "Kogito Task Console"
+- name: "io.openshift.tags"
+  value: "kogito,task,task-console"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "KOGITO_DATAINDEX_HTTP_URL"
+    example: "http://data-index.service:8080"
+    description: "Data Index service address, defaults to http://localhost:8180."
+  - name: "HTTP_PORT"
+    example: "8080"
+    description: "Defines which port the Task Console Container Image will listen on."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.task.console
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index fa77af90d5b..284cfe7d38a 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -2,10 +2,6 @@ schema_version: 1
 name: org.kie.kogito.management.console
 version: "1.0.0-snapshot"
 
-envs:
-  - name: "KOGITO_DATAINDEX_HTTP_URL"
-    description: "Kogito Data Index address, if empty defaults to http://localhost:8180."
-
 artifacts:
   - name: kogito-management-console-runner.jar
     url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/1.0.0-SNAPSHOT/management-console-1.0.0-20200831.025059-32-runner.jar
diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..d49a0d10d0d
--- /dev/null
+++ b/modules/kogito-task-console/added/kogito-app-launch.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+fi
+
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-task-console.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} \
+        -Dquarkus.http.host=0.0.0.0 \
+        -jar $KOGITO_HOME/bin/kogito-task-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-task-console/added/launch/kogito-task-console.sh b/modules/kogito-task-console/added/launch/kogito-task-console.sh
new file mode 100644
index 00000000000..6bcc9b9d0c3
--- /dev/null
+++ b/modules/kogito-task-console/added/launch/kogito-task-console.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+    unset KOGITO_DATAINDEX_HTTP_URL
+}
+
+function configure() {
+    configure_data_index_url
+    configure_task_console_http_port
+}
+
+# Exit codes:
+#   10 - invalid url
+function configure_data_index_url {
+    url_simple_regex='(https?)://'
+    local dataIndexURL=${KOGITO_DATAINDEX_HTTP_URL}
+    if [ "${dataIndexURL}x" != "x" ]; then
+        if [[ ! "${dataIndexURL}x" =~ $url_simple_regex ]]; then
+            log_error "URL must start with http or https."
+            exit 10
+        fi
+    else
+        log_info "Data index url not set, default will be used: http://localhost:8180"
+        dataIndexURL="http://localhost:8180"
+    fi
+    KOGITO_TASK_CONSOLE_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
+}
+
+function configure_task_console_http_port {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_TASK_CONSOLE_PROPS="${KOGITO_TASK_CONSOLE_PROPS} -Dquarkus.http.port=${httpPort}"
+}
diff --git a/modules/kogito-task-console/configure b/modules/kogito-task-console/configure
new file mode 100644
index 00000000000..f12412cdc0a
--- /dev/null
+++ b/modules/kogito-task-console/configure
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+cp -v ${SOURCES_DIR}/kogito-task-console-runner.jar ${KOGITO_HOME}/bin/
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
+cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
new file mode 100644
index 00000000000..d266f72f292
--- /dev/null
+++ b/modules/kogito-task-console/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.task.console
+version: "1.0.0-snapshot"
+
+artifacts:
+  - name: kogito-task-console-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/1.0.0-SNAPSHOT/task-console-1.0.0-20200831.025059-32-runner.jar
+    md5: d4535b4dc1d9a87a6af311a730f784a0
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-task-console/tests/bats/kogito-task-console.bats b/modules/kogito-task-console/tests/bats/kogito-task-console.bats
new file mode 100644
index 00000000000..c484504a09c
--- /dev/null
+++ b/modules/kogito-task-console/tests/bats/kogito-task-console.bats
@@ -0,0 +1,58 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME=$KOGITO_HOME
+mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-task-console.sh
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+}
+
+@test "test if the default value for data-index url will be set" {
+    local expected=" -Dkogito.dataindex.http.url=http://localhost:8180"
+    configure_data_index_url
+    echo "Result is [${KOGITO_TASK_CONSOLE_PROPS}] and expected is [${expected}]" >&2
+    [ "${expected}" = "${KOGITO_TASK_CONSOLE_PROPS}" ]
+}
+
+@test "test if KOGITO_DATA_INDEX_URL will be correctly set " {
+    export KOGITO_DATAINDEX_HTTP_URL="http://10.10.10.10:8080"
+    local expected=" -Dkogito.dataindex.http.url=http://10.10.10.10:8080"
+    configure_data_index_url
+    echo "Result is [${KOGITO_TASK_CONSOLE_PROPS}] and expected is [${expected}]" >&2
+    [ "${expected}" = "${KOGITO_TASK_CONSOLE_PROPS}" ]
+}
+
+@test "test if a invalid value for data-index url will return the expected exit code" {
+    export KOGITO_DATAINDEX_HTTP_URL="a.b.c"
+    run configure_data_index_url
+    [ "${status}" == "10" ]
+}
+
+@test "check if default http port is correctly set" {
+
+    configure_task_console_http_port
+
+    result="${KOGITO_TASK_CONSOLE_PROPS}"
+    expected=" -Dquarkus.http.port=8080"
+
+    echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
+
+@test "check if custom http port is correctly set" {
+    export HTTP_PORT="9090"
+
+    configure_task_console_http_port
+
+    result="${KOGITO_TASK_CONSOLE_PROPS}"
+    expected=" -Dquarkus.http.port=9090"
+
+    echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
+
diff --git a/scripts/common.py b/scripts/common.py
index 1b1d0cef800..f3206966b6f 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -13,11 +13,11 @@
            "kogito-jobs-service", "kogito-trusty-ui",
            "kogito-jq", "kogito-kubernetes-client",
            "kogito-launch-scripts", "kogito-logging",
-           "kogito-management-console", "kogito-persistence",
-           "kogito-quarkus", "kogito-quarkus-jvm",
-           "kogito-quarkus-s2i", "kogito-s2i-core",
-           "kogito-springboot", "kogito-springboot-s2i",
-           "kogito-system-user"}
+           "kogito-management-console", "kogito-task-console",
+           "kogito-persistence", "kogito-quarkus",
+           "kogito-quarkus-jvm", "kogito-quarkus-s2i",
+           "kogito-s2i-core", "kogito-springboot",
+           "kogito-springboot-s2i", "kogito-system-user"}
 MODULE_FILENAME = "module.yaml"
 MODULES_DIR = "modules"
 
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index 4e509018d22..5a540bf8878 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -4,7 +4,7 @@
 BUILD_ENGINE="docker"
 
 # All Kogito images
-IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-trusty kogito-jobs-service kogito-management-console kogito-trusty-ui"
+IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-trusty kogito-jobs-service kogito-management-console kogito-task-console kogito-trusty-ui"
 
 registry=${REGISTRY:-{1}}
 version=${2:-latest}
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 9468b74923f..4e9bb9e76fe 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -21,7 +21,7 @@
 IMAGES = ["kogito-quarkus-ubi8", "kogito-quarkus-jvm-ubi8", "kogito-quarkus-ubi8-s2i",
           "kogito-springboot-ubi8", "kogito-springboot-ubi8-s2i", "kogito-data-index",
           "kogito-trusty", "kogito-explainability", "kogito-trusty-ui",
-          "kogito-jobs-service", "kogito-management-console"]
+          "kogito-jobs-service", "kogito-management-console", "kogito-task-console"]
 
 IMAGES_NEXT_RC_TAG = []
 QUAY_KOGITO_ORG_PLACE_HOLDER = "quay.io/kiegroup/{}:{}"
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index caec4a8e1bc..7480e5374b3 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -31,6 +31,9 @@ echo "----> running bats on kogito-kubernetes-client"
 echo "----> running bats on kogito-management-console"
 ./bats/bin/bats modules/kogito-management-console/tests/bats/
 
+echo "----> running bats on kogito-task-console"
+./bats/bin/bats modules/kogito-task-console/tests/bats/
+
 echo "----> running bats on kogito-trusty-ui"
 ./bats/bin/bats modules/kogito-trusty-ui/tests/bats/
 
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 85fae4a7848..b48299749e4 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -31,6 +31,7 @@
     "explainability-service-messaging": "kogito-explainability",
     "jobs-service": "kogito-jobs-service",
     "management-console": "kogito-management-console",
+    "task-console": "kogito-task-console",
     "trusty-ui": "kogito-trusty-ui"
 }
 
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
new file mode 100644
index 00000000000..09fcd29a50f
--- /dev/null
+++ b/tests/features/kogito-task-console.feature
@@ -0,0 +1,43 @@
+@quay.io/kiegroup/kogito-task-console
+Feature: kogito-task-console feature
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Task Console, manage your Business Process easily.
+    And the image should contain label io.k8s.display-name with value Kogito Task Console
+    And the image should contain label io.openshift.tags with value kogito,task,task-console
+
+  Scenario: verify if the task console jar is available on /home/kogito
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/kogito-task-console-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-task-console-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and test default http port
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-task-console-runner.jar
+    And container log should contain Data index url not set, default will be used: http://localhost:8180
+    And container log should contain started in
+    And container log should not contain Application failed to start
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.port=9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-task-console-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and set data-index url
+    When container is started with env
+      | variable                  | value            |
+      | SCRIPT_DEBUG              | true             |
+      | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-task-console-runner.jar
+    And container log should not contain Data index url not set, default will be used: http://localhost:8180
+    And container log should contain started in
+    And container log should not contain Application failed to start
+

From db125d34e7c5b450f52d26620a2d8ceefcdb6b8c Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 9 Oct 2020 13:10:09 +0200
Subject: [PATCH 195/709] [KOGITO-3510] Deploy/Promote pipelines: set
 credentials as params (#251)

* KOGITO-3510 Set creds as params
---
 Jenkinsfile.deploy  | 19 ++++++++-----
 Jenkinsfile.promote | 65 ++++++++++++++++++++++++++++++---------------
 2 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 128b4c7c393..2b748ac63ad 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -57,6 +57,10 @@ pipeline {
         // Release information
         booleanParam(name: 'RELEASE', defaultValue: false, description: 'Is this build for a release?')
         string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Optional if not RELEASE. If RELEASE, cannot be empty.')
+
+        // Bot author information. Set as params for easy testing.
+        string(name: 'GIT_AUTHOR_BOT', defaultValue: 'bsig-gh-bot', description: 'From which author should the PR be created ?')
+        string(name: 'BOT_CREDENTIALS_ID', defaultValue: 'bsig-gh-bot', description: 'Credentials for PR creation')
     }
 
     environment {
@@ -67,9 +71,6 @@ pipeline {
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
 
-        BOT_CREDENTIALS_ID = 'bsig-gh-bot'
-        GIT_AUTHOR_BOT = 'bsig-gh-bot'
-
         BOT_BRANCH_HASH = "${util.generateHash(10)}"
     }
 
@@ -115,7 +116,7 @@ pipeline {
             }
             steps {
                 script {
-                    githubscm.forkRepo(env.BOT_CREDENTIALS_ID)
+                    githubscm.forkRepo(getBotAuthorCredsID())
                     githubscm.createBranch(getBotBranch())
                 }
             }
@@ -292,11 +293,11 @@ pipeline {
             }
             steps{
                 script{
-                    githubscm.pushObject('origin', getBotBranch(), env.BOT_CREDENTIALS_ID)
+                    githubscm.pushObject('origin', getBotBranch(), getBotAuthorCredsID())
                     
                     def commitMsg = "Update project version to ${getProjectVersion()} for release"
                     def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}.\nPlease do not merge, it will be merged automatically after testing."
-                    deployProperties['kogito-images.pr.link'] = githubscm.createPR(commitMsg, prBody, getBuildBranch(), env.BOT_CREDENTIALS_ID)
+                    deployProperties['kogito-images.pr.link'] = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
                 }
             }
             post {
@@ -484,7 +485,11 @@ String getBotBranch(){
 }
 
 String getBotAuthor(){
-    return env.GIT_AUTHOR_BOT
+    return params.GIT_AUTHOR_BOT
+}
+
+String getBotAuthorCredsID(){
+    return params.BOT_CREDENTIALS_ID
 }
 
 String getProjectVersion() {
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 9a432cf81eb..e4c693e3350 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -41,7 +41,7 @@ pipeline {
         booleanParam(name: 'BASE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Override `deployment.properties`. Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
         string(name: 'BASE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Override `deployment.properties`. Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
         string(name: 'BASE_IMAGE_REGISTRY', defaultValue: '', description: 'Override `deployment.properties`. Base image registry')
-        string(name: 'BASE_IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Override `deployment.properties`. Base image namespace')
+        string(name: 'BASE_IMAGE_NAMESPACE', defaultValue: '', description: 'Override `deployment.properties`. Base image namespace')
         string(name: 'BASE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Override `deployment.properties`. Base image name suffix')
         string(name: 'BASE_IMAGE_TAG', defaultValue: '', description: 'Override `deployment.properties`. Base image tag')
 
@@ -49,7 +49,7 @@ pipeline {
         booleanParam(name: 'PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
         string(name: 'PROMOTE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
         string(name: 'PROMOTE_IMAGE_REGISTRY', defaultValue: '', description: 'Promote image registry')
-        string(name: 'PROMOTE_IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Promote image namespace')
+        string(name: 'PROMOTE_IMAGE_NAMESPACE', defaultValue: '', description: 'Promote image namespace')
         string(name: 'PROMOTE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Promote image name suffix')
         string(name: 'PROMOTE_IMAGE_TAG', defaultValue: '', description: 'Promote image tag')
         booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', defaultValue: false, description: 'Set to true if you want the deployed images to also be with the `latest` tag')         
@@ -58,23 +58,27 @@ pipeline {
         booleanParam(name: 'RELEASE', defaultValue: false, description: 'Override `deployment.properties`. Is this build for a release?')
         string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Override `deployment.properties`. Optional if not RELEASE. If RELEASE, cannot be empty.')
         string(name: 'GIT_TAG', defaultValue: '', description: 'Git tag to set, if different from PROJECT_VERSION')
+        string(name: 'MAVEN_ARTIFACT_REPOSITORY', defaultValue: '', description: 'Maven repository where the released jar artifacts are present. To be set if git author is not `kiegroup` and repository is different from JBoss repository.')
         string(name: 'RELEASE_NOTES', defaultValue: '', description: 'Release notes to be added. If none provided, a default one will be given.')
+
+        // Bot author information. Set as params for easy testing.
+        string(name: 'BOT_CREDENTIALS_ID', defaultValue: 'bsig-gh-bot', description: 'Credentials for PR creation')
+
+        // Main author creds
+        string(name: 'AUTHOR_CREDS_ID', defaultValue: 'kie-ci', description: 'Credentials for PR merge')
+        string(name: 'GITHUB_TOKEN_CREDS_ID', defaultValue: 'kie-ci2-token', description: 'GH token to be used with GH CLI')        
     }
 
     environment {
-        CI = true
+        CI = true // Used by scripts
+        
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
-
-        AUTHOR_CREDS_ID = 'kie-ci'
-        BOT_CREDENTIALS_ID = 'bsig-gh-bot'
-
-        // for github-release
-        GITHUB_REPO = 'kogito-images'
-        GITHUB_TOKEN_CREDS_ID = 'kie-ci2-token'
-
+        
         BOT_BRANCH_HASH = "${util.generateHash(10)}"
+        
+        GITHUB_REPO = 'kogito-images' // for github-release cli
     }
 
     stages {
@@ -106,13 +110,18 @@ pipeline {
                     // Update maven information with new artifacts from Maven central in the PR
                     dir('kogito-images-update'){
                         checkoutRepo()
-                        githubscm.forkRepo(env.BOT_CREDENTIALS_ID)
+                        githubscm.forkRepo(getBotAuthorCredsID())
 
                         // Get the working branch
                         sh 'git fetch origin'
                         sh "git checkout ${getPRSourceBranch()}"
 
-                        sh 'python3 scripts/update-maven-artifacts.py'
+                        // Update artifacts
+                        updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
+                        if(getMavenArtifactRepository() != ''){
+                            updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()}"
+                        }
+                        sh updateArtifactCmd
 
                         // Debug purpose in case of issue
                         sh 'cat modules/kogito-data-index/module.yaml'
@@ -135,7 +144,7 @@ pipeline {
 
                         try {
                             githubscm.commitChanges('Setup Maven artifacts to released ones')
-                            githubscm.pushObject('origin', getPRSourceBranch(), env.BOT_CREDENTIALS_ID)
+                            githubscm.pushObject('origin', getPRSourceBranch(), getBotAuthorCredsID())
                         } catch (err) {
                             withCredentials([string(credentialsId: 'KOGITO_CI_EMAIL_TO', variable: 'ZULIP_EMAIL')]) {
                             emailext body: "Seems like no change is to be committed.\nPlease review in ${env.BUILD_URL}console.\n" +
@@ -192,14 +201,14 @@ pipeline {
                         // Merge PR
                         String prLink = getDeployProperty('kogito-images.pr.link')
                         if(prLink != ''){                            
-                            githubscm.mergePR(prLink, env.AUTHOR_CREDS_ID)
-                            githubscm.pushObject('origin', getBuildBranch(), env.AUTHOR_CREDS_ID)
+                            githubscm.mergePR(prLink, getGitAuthorCredsID())
+                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
                         }
 
                         if(getGitTag() != ""){
                             def releaseName = "Kogito Images Version ${getProjectVersion()}" 
                             def description = params.RELEASE_NOTES != '' ? params.RELEASE_NOTES : "We are glad to announce that the Kogito ${getProjectVersion()} release is now available!"
-                            withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
+                            withCredentials([string(credentialsId: params.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
                                 sh """
                                     export GITHUB_USER=${getGitAuthor()}
                                     github-release release --tag ${getGitTag()} --target '${getBuildBranch()}' --name '${releaseName}' --description '${description}' --pre-release
@@ -222,7 +231,7 @@ pipeline {
                     dir('kogito-images-snapshot') { // Use different folder from `Update PR with released Maven artifacts` to avoid conflicts
                         // Prepare PR
                         checkoutRepo()
-                        githubscm.forkRepo(env.BOT_CREDENTIALS_ID)
+                        githubscm.forkRepo(getBotAuthorCredsID())
                         githubscm.createBranch(getSnapshotBranch())
 
                         // Update version to next snapshot
@@ -235,13 +244,13 @@ pipeline {
                         def commitMsg = "Update snapshot version to ${nextVersion}"
                         def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}"
                         githubscm.commitChanges(commitMsg)
-                        githubscm.pushObject('origin', getSnapshotBranch(), env.BOT_CREDENTIALS_ID)
-                        prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), env.BOT_CREDENTIALS_ID)
+                        githubscm.pushObject('origin', getSnapshotBranch(), getBotAuthorCredsID())
+                        prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
                     }
                     dir('kogito-images') {
                         if (prLink != '') {
-                            githubscm.mergePR(prLink, env.AUTHOR_CREDS_ID)
-                            githubscm.pushObject('origin', getBuildBranch(), env.AUTHOR_CREDS_ID)
+                            githubscm.mergePR(prLink, getGitAuthorCredsID())
+                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
                         }
                     }
                 }
@@ -411,6 +420,18 @@ String getGitAuthor() {
     return getParamOrDeployProperty('GIT_AUTHOR', 'git.author')
 }
 
+String getGitAuthorCredsID(){
+    return params.AUTHOR_CREDS_ID
+}
+
+String getBotAuthorCredsID(){
+    return params.BOT_CREDENTIALS_ID
+}
+
+String getMavenArtifactRepository() {
+    return params.MAVEN_ARTIFACT_REPOSITORY
+}
+
 String getNextVersion() {
     return util.getNextVersion(getProjectVersion(), 'micro', 'snapshot')
 }

From eff0d391ac0ddb8b8cd69a0c2d91453cc37caa35 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 9 Oct 2020 15:16:30 +0200
Subject: [PATCH 196/709] KOGITO-3467 script to retrieve list of images (#249)

---
 Jenkinsfile                                   |  56 ++---
 Jenkinsfile.deploy                            |  63 ++----
 Jenkinsfile.promote                           |  24 +-
 Makefile                                      | 210 ++----------------
 ... => kogito-quarkus-jvm-ubi8-overrides.yaml |   0
 ...yaml => kogito-quarkus-ubi8-overrides.yaml |   0
 ... => kogito-quarkus-ubi8-s2i-overrides.yaml |   0
 ...l => kogito-springboot-ubi8-overrides.yaml |   0
 ... kogito-springboot-ubi8-s2i-overrides.yaml |   0
 scripts/common.py                             |  14 ++
 scripts/list-images.py                        |  15 ++
 scripts/push-local-registry.sh                |   4 +-
 scripts/push-staging.py                       |   2 +-
 13 files changed, 100 insertions(+), 288 deletions(-)
 rename kogito-quarkus-jvm-overrides.yaml => kogito-quarkus-jvm-ubi8-overrides.yaml (100%)
 rename kogito-quarkus-overrides.yaml => kogito-quarkus-ubi8-overrides.yaml (100%)
 rename kogito-quarkus-s2i-overrides.yaml => kogito-quarkus-ubi8-s2i-overrides.yaml (100%)
 rename kogito-springboot-overrides.yaml => kogito-springboot-ubi8-overrides.yaml (100%)
 rename kogito-springboot-s2i-overrides.yaml => kogito-springboot-ubi8-s2i-overrides.yaml (100%)
 create mode 100644 scripts/list-images.py

diff --git a/Jenkinsfile b/Jenkinsfile
index 17d45379042..faa38f8fc45 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,19 +4,6 @@ def changeAuthor = env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR
 def changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
 def changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 
-IMAGES = ["kogito-quarkus-ubi8", 
-            "kogito-quarkus-jvm-ubi8",
-            "kogito-quarkus-ubi8-s2i",
-            "kogito-springboot-ubi8",
-            "kogito-springboot-ubi8-s2i",
-            "kogito-data-index",
-            "kogito-trusty",
-            "kogito-explainability",
-            "kogito-jobs-service",
-            "kogito-management-console",
-            "kogito-task-console",
-            "kogito-trusty-ui"]
-
 pipeline{
     agent { label 'kogito-image-slave && !master'}
     tools {
@@ -48,27 +35,16 @@ pipeline{
         }
         stage('Validate CeKit Image and Modules descriptors'){
             steps {
-                sh """
-                    curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
-                    tar -xzvf cekit-image-validator-runner.tgz
-                    chmod +x cekit-image-validator-runner
-                """
-                sh "./cekit-image-validator-runner modules/"
-                sh """
-                    ./cekit-image-validator-runner image.yaml
-                    ./cekit-image-validator-runner kogito-data-index-overrides.yaml
-                    ./cekit-image-validator-runner kogito-trusty-overrides.yaml
-                    ./cekit-image-validator-runner kogito-explainability-overrides.yaml
-                    ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
-                    ./cekit-image-validator-runner kogito-management-console-overrides.yaml
-                    ./cekit-image-validator-runner kogito-task-console-overrides.yaml
-                    ./cekit-image-validator-runner kogito-trusty-ui-overrides.yaml
-                    ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
-                    ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
-                    ./cekit-image-validator-runner kogito-quarkus-s2i-overrides.yaml
-                    ./cekit-image-validator-runner kogito-springboot-overrides.yaml
-                    ./cekit-image-validator-runner kogito-springboot-s2i-overrides.yaml
-                """
+                script {
+                    sh '''
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        tar -xzvf cekit-image-validator-runner.tgz
+                        chmod +x cekit-image-validator-runner
+                    '''
+                    sh './cekit-image-validator-runner modules/'
+                    sh './cekit-image-validator-runner image.yaml'
+                    getImages().each{ image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }   
+                }
             }
         }
         stage('Prepare offline kogito-examples'){
@@ -79,7 +55,7 @@ pipeline{
         stage('Build Images') {
             steps{
                 script {
-                    IMAGES.each{ image -> initWorkspace(image) }
+                    getImages().each{ image -> initWorkspace(image) }
                     launchParallelForEachImage("Build", {img -> buildImage(img)})
                 }
             }
@@ -116,7 +92,7 @@ void cleanImages(){
 
 void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
     parallelStages = [:]
-    IMAGES.each{ image -> 
+    getImages().each{ image -> 
         parallelStages["${stageNamePrefix} ${image}"] = {
             dir(getWorkspacePath(image)){
                 executeOnImage(image)
@@ -127,12 +103,12 @@ void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
 }
 
 void buildImage(image) {
-    sh "make ${image} ignore_test=true cekit_option='--work-dir .'"
+    sh "make build-image image_name=${image} ignore_test=true cekit_option='--work-dir .'"
 }
 
 void testImage(image) {
     try {
-        sh "make ${image} ignore_build=true cekit_option='--work-dir .'"
+        sh "make build-image image_name=${image} ignore_build=true cekit_option='--work-dir .'"
     } finally {
         junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
     }
@@ -154,3 +130,7 @@ String getWorkspacesPath(){
 String getWorkspacePath(String image){
     return "${getWorkspacesPath()}/${image}"
 }
+
+String[] getImages(){
+    return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
+}
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 2b748ac63ad..f13ba14275e 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -1,21 +1,5 @@
 @Library('jenkins-pipeline-shared-libraries')_
 
-IMAGES = [
-            'kogito-quarkus-ubi8', 
-            'kogito-quarkus-jvm-ubi8',
-            'kogito-quarkus-ubi8-s2i',
-            'kogito-springboot-ubi8',
-            'kogito-springboot-ubi8-s2i',
-            'kogito-data-index',
-            'kogito-trusty',
-            'kogito-explainability',
-            'kogito-jobs-service',
-            'kogito-management-console',
-            'kogito-task-console',
-            'kogito-trusty-ui'
-         ]
-
-
 deployProperties = [ : ]
 
 
@@ -158,27 +142,16 @@ pipeline {
         }
         stage('Validate CeKit Image and Modules descriptors') {
             steps {
-                sh '''
-                    curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
-                    tar -xzvf cekit-image-validator-runner.tgz
-                    chmod +x cekit-image-validator-runner
-                '''
-                sh './cekit-image-validator-runner modules/'
-                sh '''
-                    ./cekit-image-validator-runner image.yaml
-                    ./cekit-image-validator-runner kogito-data-index-overrides.yaml
-                    ./cekit-image-validator-runner kogito-trusty-overrides.yaml
-                    ./cekit-image-validator-runner kogito-explainability-overrides.yaml
-                    ./cekit-image-validator-runner kogito-jobs-service-overrides.yaml
-                    ./cekit-image-validator-runner kogito-management-console-overrides.yaml
-                    ./cekit-image-validator-runner kogito-task-console-overrides.yaml
-                    ./cekit-image-validator-runner kogito-trusty-ui-overrides.yaml
-                    ./cekit-image-validator-runner kogito-quarkus-jvm-overrides.yaml
-                    ./cekit-image-validator-runner kogito-quarkus-overrides.yaml
-                    ./cekit-image-validator-runner kogito-quarkus-s2i-overrides.yaml
-                    ./cekit-image-validator-runner kogito-springboot-overrides.yaml
-                    ./cekit-image-validator-runner kogito-springboot-s2i-overrides.yaml
-                '''
+                script {
+                    sh '''
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        tar -xzvf cekit-image-validator-runner.tgz
+                        chmod +x cekit-image-validator-runner
+                    '''
+                    sh './cekit-image-validator-runner modules/'
+                    sh './cekit-image-validator-runner image.yaml'
+                    getImages().each{ image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }   
+                }
             }
             post {
                 always {
@@ -238,7 +211,7 @@ pipeline {
             steps {
                 script {
                     // Init workspaces before build
-                    IMAGES.each{ image -> initWorkspace(image) }
+                    getImages().each{ image -> initWorkspace(image) }
                     // Build images
                     launchParallelForEachImage("Build", {img -> buildImage(img)})
                 }
@@ -344,7 +317,7 @@ void cleanImages(){
 
 void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
     parallelStages = [:]
-    IMAGES.each{ image -> 
+    getImages().each{ image -> 
         parallelStages["${stageNamePrefix} ${image}"] = {
             dir(getWorkspacePath(image)){
                 executeOnImage(image)
@@ -355,25 +328,25 @@ void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
 }
 
 void buildImage(image) {
-    sh "make ${image} ignore_test=true cekit_option='--work-dir .'"
+    sh "make build-image image_name=${image} ignore_test=true cekit_option='--work-dir .'"
 }
 
 void testImage(image) {
     try {
-        sh "make ${image} ignore_build=true cekit_option='--work-dir .'"
+        sh "make build-image image_name=${image} ignore_build=true cekit_option='--work-dir .'"
     } finally {
         junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
     }
 }
 
 void tagImages() {
-    for(String imageName : IMAGES) {
+    for(String imageName : getImages()) {
         sh "docker tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"
     }
 }
 
 void pushImages() {
-    for(String imageName : IMAGES) {
+    for(String imageName : getImages()) {
         sh "docker push ${buildImageName(imageName)}"
     }
 }
@@ -509,3 +482,7 @@ void setDeployPropertyIfNeeded(String key, def value){
         deployProperties[key] = value
     }
 }
+
+String[] getImages(){
+    return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
+}
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index e4c693e3350..e2384105aad 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -1,21 +1,6 @@
 // Promote images
 @Library('jenkins-pipeline-shared-libraries')_
 
-IMAGES = [
-            'kogito-quarkus-ubi8', 
-            'kogito-quarkus-jvm-ubi8',
-            'kogito-quarkus-ubi8-s2i',
-            'kogito-springboot-ubi8',
-            'kogito-springboot-ubi8-s2i',
-            'kogito-data-index',
-            'kogito-trusty',
-            'kogito-explainability',
-            'kogito-jobs-service',
-            'kogito-management-console',
-            'kogito-task-console',
-            'kogito-trusty-ui'
-         ]
-
 deployProperties=[:]
 
 pipeline {
@@ -286,13 +271,13 @@ void cleanImages(){
 }
 
 void pullImages(){
-    for(String imageName : IMAGES){
+    for(String imageName : getImages()){
         sh "podman pull ${getOldImageFullTag(imageName)}"
     }
 }
 
 void tagImages() {
-    for(String imageName : IMAGES){
+    for(String imageName : getImages()){
         sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, getNewImageTag())}"
         if(isDeployLatestTag()){
             sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, "latest")}"
@@ -305,7 +290,7 @@ void tagImages() {
 }
 
 void pushImages(){
-    for(String imageName : IMAGES){
+    for(String imageName : getImages()){
         sh "podman push ${getNewImageFullTag(imageName, getNewImageTag())}"
         if(isDeployLatestTag()){
             sh "podman push ${getNewImageFullTag(imageName, "latest")}"
@@ -505,3 +490,6 @@ String getNewImageTag(){
     return params.PROMOTE_IMAGE_TAG
 }
 
+String[] getImages(){
+    return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
+}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 27b9006bb1e..5d6efaa587a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,215 +4,53 @@ BUILD_ENGINE := docker
 .DEFAULT_GOAL := build
 CEKIT_CMD := cekit -v ${cekit_option}
 
-# Build all images
-.PHONY: build
-# start to build the images
-build: clone-repos kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-trusty kogito-explainability kogito-jobs-service kogito-management-console kogito-task-console kogito-trusty-ui
-
 clone-repos:
 # if the NO_TEST env defined, proceed with the tests, as first step prepare the repo to be used
 ifneq ($(ignore_test),true)
 	cd tests/test-apps && sh clone-repo.sh
 endif
 
-# build the quay.io/kiegroup/kogito-quarkus-ubi8 image
-kogito-quarkus-ubi8:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-quarkus-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-quarkus-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8:${SHORTENED_LATEST_VERSION}
-endif
+.PHONY: list
+list:
+	@python3 scripts/list-images.py
 
-# build the quay.io/kiegroup/kogito-quarkus-jvm-ubi8 image
-kogito-quarkus-jvm-ubi8:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-quarkus-jvm-overrides.yaml ${BUILD_ENGINE}
-endif
-# if no NO_TEST env defined, test the image
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-quarkus-jvm-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${SHORTENED_LATEST_VERSION}
-endif
+# Build all images
+.PHONY: build
+# start to build the images
+build: clone-repos _build
 
-# build the quay.io/kiegroup/kogito-quarkus-ubi8-s2i image
-kogito-quarkus-ubi8-s2i:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-quarkus-s2i-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-quarkus-s2i-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${SHORTENED_LATEST_VERSION}
-endif
+_build:
+	@for f in $(shell make list); do make build-image image_name=$${f}; done
 
-# build the quay.io/kiegroup/kogito-springboot-ubi8 image
-kogito-springboot-ubi8:
+.PHONY: build-image
+image_name=
+build-image:
 ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-springboot-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-springboot-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8:${SHORTENED_LATEST_VERSION}
-endif
-
-# build the quay.io/kiegroup/kogito-springboot-ubi8-s2i image
-kogito-springboot-ubi8-s2i:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-springboot-s2i-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-springboot-s2i-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION} quay.io/kiegroup/kogito-springboot-ubi8-s2i:${SHORTENED_LATEST_VERSION}
-endif
-
-# build the quay.io/kiegroup/kogito-data-index image
-kogito-data-index:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-data-index-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-data-index-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION} quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
-endif
-
-# build the quay.io/kiegroup/kogito-trusty image
-kogito-trusty:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-trusty-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-trusty-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-trusty:${IMAGE_VERSION} quay.io/kiegroup/kogito-trusty:${SHORTENED_LATEST_VERSION}
-endif
-
-# build the quay.io/kiegroup/kogito-explainability image
-kogito-explainability:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-explainability-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-explainability-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-explainability:${IMAGE_VERSION} quay.io/kiegroup/kogito-explainability:${SHORTENED_LATEST_VERSION}
-endif
-
-# build the quay.io/kiegroup/kogito-jobs-service image
-kogito-jobs-service:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-jobs-service-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-jobs-service-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION} quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
-endif
-
-# build the quay.io/kiegroup/kogito-management-console image
-kogito-management-console:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-management-console-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-management-console-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION} quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
-endif
-
-# build the quay.io/kiegroup/kogito-task-console image
-kogito-task-console:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-task-console-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-task-console-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-task-console:${IMAGE_VERSION} quay.io/kiegroup/kogito-task-console:${SHORTENED_LATEST_VERSION}
-endif
-
-# build the quay.io/kiegroup/kogito-trusty-ui image
-kogito-trusty-ui:
-ifneq ($(ignore_build),true)
-	${CEKIT_CMD} build --overrides-file kogito-trusty-ui-overrides.yaml ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file kogito-trusty-ui-overrides.yaml behave
-endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/kogito-trusty-ui:${IMAGE_VERSION} quay.io/kiegroup/kogito-trusty-ui:${SHORTENED_LATEST_VERSION}
+	${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
 endif
 
 # push images to quay.io, this requires permissions under kiegroup organization
 .PHONY: push
 push: build _push
+
 _push:
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:latest
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:latest
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest
-	docker push quay.io/kiegroup/kogito-data-index:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-data-index:latest
-	docker push quay.io/kiegroup/kogito-trusty:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-trusty:latest
-	docker push quay.io/kiegroup/kogito-explainability:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-explainability:latest
-	docker push quay.io/kiegroup/kogito-jobs-service:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-jobs-service:latest
-	docker push quay.io/kiegroup/kogito-management-console:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-management-console:latest
-	docker push quay.io/kiegroup/kogito-task-console:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-task-console:latest
-	docker push quay.io/kiegroup/kogito-trusty-ui:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/kogito-trusty-ui:latest
+	@for f in $(shell make list); do make push-image image_name=$${f}; done
+
+.PHONY: push-image
+image_name=
+push-image:
+	docker push quay.io/kiegroup/${image_name}:${IMAGE_VERSION}
+	docker push quay.io/kiegroup/${image_name}:latest
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	@echo "${SHORTENED_LATEST_VERSION} will be pushed"
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-quarkus-jvm-ubi8:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-quarkus-ubi8-s2i:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-springboot-ubi8:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-springboot-ubi8-s2i:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-data-index:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-trusty:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-explainability:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-jobs-service:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-management-console:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-task-console:${SHORTENED_LATEST_VERSION}
-	docker push quay.io/kiegroup/kogito-trusty-ui:${SHORTENED_LATEST_VERSION}
+	docker push quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
 endif
 
 
diff --git a/kogito-quarkus-jvm-overrides.yaml b/kogito-quarkus-jvm-ubi8-overrides.yaml
similarity index 100%
rename from kogito-quarkus-jvm-overrides.yaml
rename to kogito-quarkus-jvm-ubi8-overrides.yaml
diff --git a/kogito-quarkus-overrides.yaml b/kogito-quarkus-ubi8-overrides.yaml
similarity index 100%
rename from kogito-quarkus-overrides.yaml
rename to kogito-quarkus-ubi8-overrides.yaml
diff --git a/kogito-quarkus-s2i-overrides.yaml b/kogito-quarkus-ubi8-s2i-overrides.yaml
similarity index 100%
rename from kogito-quarkus-s2i-overrides.yaml
rename to kogito-quarkus-ubi8-s2i-overrides.yaml
diff --git a/kogito-springboot-overrides.yaml b/kogito-springboot-ubi8-overrides.yaml
similarity index 100%
rename from kogito-springboot-overrides.yaml
rename to kogito-springboot-ubi8-overrides.yaml
diff --git a/kogito-springboot-s2i-overrides.yaml b/kogito-springboot-ubi8-s2i-overrides.yaml
similarity index 100%
rename from kogito-springboot-s2i-overrides.yaml
rename to kogito-springboot-ubi8-s2i-overrides.yaml
diff --git a/scripts/common.py b/scripts/common.py
index f3206966b6f..02e88262703 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -115,6 +115,20 @@ def get_kogito_module_dirs():
 
     return modules
 
+def get_all_images():
+    """
+    Retrieve the Kogito images' names
+    """
+    images = []
+
+    # r=>root, d=>directories, f=>files
+    for r, d, f in os.walk("."):
+        for item in f:
+            if re.compile(r'.*-overrides.yaml').match(item):
+                images.append(item.replace("-overrides.yaml", ''))
+
+    return images
+
 def update_modules_version(target_version):
     """
     Update every Kogito module.yaml to the given version.
diff --git a/scripts/list-images.py b/scripts/list-images.py
new file mode 100644
index 00000000000..3a67ab66d2f
--- /dev/null
+++ b/scripts/list-images.py
@@ -0,0 +1,15 @@
+#!/usr/bin/python3
+#Script responsible to update the tests with 
+#Should be run from root directory of the repository
+#Sample usage:  python3 scripts/update-tests.py
+
+import sys
+sys.dont_write_bytecode = True
+
+import common
+
+if __name__ == "__main__":
+    images = common.get_all_images()
+
+    for img in images:
+        print(img)
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index 5a540bf8878..56b08217255 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -24,10 +24,10 @@ fi
 
 echo "Images version ${version} will be pushed to registry ${registry}"
 
-for image in ${IMAGES}; do
+while read image; do
     echo "tagging image ${image} to ${registry}/${namespace}/${image}:${version}"
     ${BUILD_ENGINE} tag quay.io/kiegroup/${image}:${version} ${registry}/${namespace}/${image}:${version}
     echo "Deleting imagestream ${image} if exists `oc delete oc -n ${namespace} ${image}`"
     ${BUILD_ENGINE} push ${registry}/${namespace}/${image}:${version}
-done
+done <<<$(python3 scripts/list-images.py)
 
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 4e9bb9e76fe..82323564605 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -33,7 +33,7 @@ def find_next_tag(override_tags):
     Populate the IMAGES_NEXT_RC_TAGS with the next rc tag for each image.
     '''
     global IMAGES_NEXT_RC_TAG
-    for image in IMAGES:
+    for image in common.get_all_images():
         tag = fetch_tag(image, override_tags)
         print("Next tag for image %s is %s" % (image, tag))
         IMAGES_NEXT_RC_TAG.append('{}:{}'.format(image, tag))

From d2c31defbfd39beef439fb4a1a640df297ba67c6 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 12 Oct 2020 17:32:39 +0200
Subject: [PATCH 197/709] [KOGITO-3580] Checkout repo in promote pipeline
 (#256)

* KOGITO-3580 Checkout repo in promote pipeline

* docker command in specific folder
---
 Jenkinsfile.promote | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index e2384105aad..a95ccc39509 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -82,6 +82,10 @@ pipeline {
                         assert getProjectVersion() != ''
                     }
 
+                    dir('kogito-images') {
+                        checkoutRepo()
+                    }
+
                     installGitHubReleaseCLI()
                 }
             }
@@ -151,14 +155,18 @@ pipeline {
                     } else if (getOldImageRegistryCredentials() != ''){
                         loginContainerRegistry(getOldImageRegistry(), getOldImageRegistryCredentials())
                     }
-                    pullImages()
+                    dir('kogito-images') {
+                        pullImages()
+                    }
                 }
             }
         }
         stage('Tag images'){
             steps{
                 script {
-                    tagImages()
+                    dir('kogito-images') {
+                        tagImages()
+                    }
                 }
             }
         }
@@ -170,7 +178,9 @@ pipeline {
                     } else if (getNewImageRegistryCredentials() != ''){
                         loginContainerRegistry(getNewImageRegistry(), getNewImageRegistryCredentials())
                     }
-                    pushImages()
+                    dir('kogito-images') {
+                        pushImages()
+                    }
                 }
             }
         }
@@ -181,8 +191,6 @@ pipeline {
             steps{
                 script {
                     dir('kogito-images') {
-                        checkoutRepo()
-
                         // Merge PR
                         String prLink = getDeployProperty('kogito-images.pr.link')
                         if(prLink != ''){                            

From 3db7a2fcb3a3581d59f52eb85bf733489b0fcf68 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 13 Oct 2020 10:27:26 +0200
Subject: [PATCH 198/709] KOGITO-3581 clean workspaces at stage end (#257)

---
 Jenkinsfile.deploy | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index f13ba14275e..ce22b15ce85 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -216,6 +216,13 @@ pipeline {
                     launchParallelForEachImage("Build", {img -> buildImage(img)})
                 }
             }
+            post {
+                always {
+                    script {
+                        cleanWorkspaces()
+                    }
+                }
+            }
         }
         stage('Test Images') {
             when {
@@ -223,9 +230,19 @@ pipeline {
             }
             steps {
                 script {
+                    // Init workspaces before test
+                    getImages().each{ image -> initWorkspace(image) }
+                    // Test images
                     launchParallelForEachImage("Test", {img -> testImage(img)})
                 }
             }
+            post {
+                always {
+                    script {
+                        cleanWorkspaces()
+                    }
+                }
+            }
         }
         stage('Tagging') {
             steps {

From 46b57d63b7cc2ded6bde4a934d72ba9fdc4d0f60 Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Thu, 15 Oct 2020 19:25:43 +0530
Subject: [PATCH 199/709] [KOGITO-3482] - Remove handling of runtime
 configuration from kogtio images (#258)

---
 kogito-jobs-service-overrides.yaml            |  6 -----
 .../added/launch/kogito-jobs-service.sh       | 11 --------
 .../tests/bats/kogito-jobs-service.bats       | 26 -------------------
 3 files changed, 43 deletions(-)

diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index 39e95cbc61b..a8b46875ffe 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -20,12 +20,6 @@ envs:
 - name: "ENABLE_PERSISTENCE"
   example: "true"
   description: "By default the Jobs services runs on memory only, if persistence is needed then set it to true. (Sets the property kogito.jobs-service.persistence to infinispan)."
-- name: "MAX_INTERVAL_LIMIT_RETRY"
-  example: "60000"
-  description: "Maximum interval in milliseconds when retrying to execute jobs, in case of failures, defaults to 60000ms. (Sets the property kogito.jobs-service.maxIntervalLimitToRetryMillis)."
-- name: "BACKOFF_RETRY"
-  example: "1000"
-  description: "Retry backoff time in milliseconds between the job execution attempts, in case of execution failure, defaults to 1000. (Sets the property kogito.jobs-service.backoffRetryMillis)."
 - name: "ENABLE_EVENTS"
   example: "true"
   description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
diff --git a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
index 908f7c14db0..21c35d94c4e 100644
--- a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
+++ b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
@@ -2,10 +2,8 @@
 
 function prepareEnv() {
     # keep it on alphabetical order
-    unset BACKOFF_RETRY
     unset ENABLE_PERSISTENCE
     unset HTTP_PORT
-    unset MAX_INTERVAL_LIMIT_RETRY
 }
 
 function configure() {
@@ -19,14 +17,6 @@ function configure_jobs_service() {
        KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.persistence=infinispan"
     fi
 
-    if [ "${BACKOFF_RETRY}x" != "x" ]; then
-        KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.backoffRetryMillis=${BACKOFF_RETRY}"
-    fi
-
-    if [ "${MAX_INTERVAL_LIMIT_RETRY}x" != "x" ]; then
-        KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.maxIntervalLimitToRetryMillis=${MAX_INTERVAL_LIMIT_RETRY}"
-    fi
-
     if [ "${ENABLE_EVENTS^^}" == "TRUE" ]; then
         KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.profile=events-support"
     fi
@@ -36,4 +26,3 @@ function configure_jobs_service_http_port {
     local httpPort=${HTTP_PORT:-8080}
     KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.http.port=${httpPort}"
 }
-
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index aa419777046..72adf7e9299 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -13,32 +13,6 @@ teardown() {
     rm -rf ${KOGITO_HOME}
 }
 
-@test "check if the backoffRetryMillis is correctly set" {
-    export BACKOFF_RETRY="2000"
-    configure_jobs_service
-    expected=" -Dkogito.jobs-service.backoffRetryMillis=2000"
-    echo "Result is ${KOGITO_JOBS_PROPS} and expected is ${expected}"
-    [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
-}
-
-
-@test "check if the maxIntervalLimitToRetryMillis is correctly set" {
-    export MAX_INTERVAL_LIMIT_RETRY="8000"
-    configure_jobs_service
-    expected=" -Dkogito.jobs-service.maxIntervalLimitToRetryMillis=8000"
-    echo "Result is ${KOGITO_JOBS_PROPS} and expected is ${expected}"
-    [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
-}
-
-@test "check if the maxIntervalLimitToRetryMillis and backoffRetryMillis are correctly set" {
-    export MAX_INTERVAL_LIMIT_RETRY="8000"
-    export BACKOFF_RETRY="2000"
-    configure_jobs_service
-    expected=" -Dkogito.jobs-service.backoffRetryMillis=2000 -Dkogito.jobs-service.maxIntervalLimitToRetryMillis=8000"
-    echo "Result is ${KOGITO_JOBS_PROPS} and expected is ${expected}"
-    [ "${KOGITO_JOBS_PROPS}" = "${expected}" ]
-}
-
 @test "check if the persistence is correctly configured with auth" {
     export ENABLE_PERSISTENCE="true"
     configure_jobs_service

From 0b8c62cff8e97c57b99cb76dde7b98dc628513fa Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Tue, 20 Oct 2020 20:57:33 +0530
Subject: [PATCH 200/709] [KOGITO-3639] - Ignore Verify if the s2i build is
 finished as expected performing a native build with persistence enabled
 Scenario on kogito images (#262)

* Ignore failing scenario

* update artifacts in modules
---
 modules/kogito-data-index/module.yaml          | 8 ++++----
 modules/kogito-explainability/module.yaml      | 8 ++++----
 modules/kogito-jobs-service/module.yaml        | 4 ++--
 modules/kogito-management-console/module.yaml  | 4 ++--
 modules/kogito-task-console/module.yaml        | 4 ++--
 modules/kogito-trusty-ui/module.yaml           | 4 ++--
 modules/kogito-trusty/module.yaml              | 4 ++--
 tests/features/kogito-quarkus-ubi8-s2i.feature | 4 +++-
 8 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
index 2a91456e0f8..d5c1a777319 100644
--- a/modules/kogito-data-index/module.yaml
+++ b/modules/kogito-data-index/module.yaml
@@ -4,11 +4,11 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/1.0.0-SNAPSHOT/data-index-service-infinispan-1.0.0-20200831.024637-4-runner.jar
-    md5: 69f2d2fd634a02a70b8aa39b02786eca
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/1.0.0-SNAPSHOT/data-index-service-infinispan-1.0.0-20201019.092259-48-runner.jar
+    md5: dfd2b683a507dd912bd3fd67fe9396a9
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/1.0.0-SNAPSHOT/data-index-service-mongodb-1.0.0-20200831.024717-4-runner.jar
-    md5: b95b5f3a0567f24c96e9448aa53396fc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/1.0.0-SNAPSHOT/data-index-service-mongodb-1.0.0-20201019.092349-47-runner.jar
+    md5: 88796b3b79ac420430ad80638dc8b325
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 39c20330683..6769f221f6e 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/1.0.0-SNAPSHOT/explainability-service-rest-1.0.0-20200831.025314-25-runner.jar
-    md5: 056d113d1e012599c77e3b174f0ce951
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/1.0.0-SNAPSHOT/explainability-service-rest-1.0.0-20201019.093027-68-runner.jar
+    md5: d562b6bf388a6449177ee70edee0ac2a
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/1.0.0-SNAPSHOT/explainability-service-messaging-1.0.0-20200831.025251-25-runner.jar
-    md5: 631460787e31ad6276450ee981b9f243
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/1.0.0-SNAPSHOT/explainability-service-messaging-1.0.0-20201019.093000-69-runner.jar
+    md5: 38c74904a99dced2be57cf2971a818f1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 000409c5883..e35c3f4a2e4 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/1.0.0-SNAPSHOT/jobs-service-1.0.0-20200831.024525-33-runner.jar
-    md5: f90187029827f14e9c88dd77668ceea2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/1.0.0-SNAPSHOT/jobs-service-1.0.0-20201019.092133-77-runner.jar
+    md5: ae1b0a135ac65e23135586be50e328b3
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 284cfe7d38a..3ccc3647718 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/1.0.0-SNAPSHOT/management-console-1.0.0-20200831.025059-32-runner.jar
-    md5: 636a914ff331e0addd72aa3908e24d20
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/1.0.0-SNAPSHOT/management-console-1.0.0-20201019.092749-76-runner.jar
+    md5: 6d98e978cc1a787e989f33975181c142
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d266f72f292..a31cea27d54 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/1.0.0-SNAPSHOT/task-console-1.0.0-20200831.025059-32-runner.jar
-    md5: d4535b4dc1d9a87a6af311a730f784a0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/1.0.0-SNAPSHOT/task-console-1.0.0-20201019.092850-76-runner.jar
+    md5: cf6577212298aaf7e2130111adbc872f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index c6c5241c11e..e2e9a44fe60 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/1.0.0-SNAPSHOT/trusty-ui-1.0.0-20200828.024416-1-runner.jar
-    md5: 8ff7d58e4868e3f474715d737ba1b6e9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/1.0.0-SNAPSHOT/trusty-ui-1.0.0-20201019.092817-47-runner.jar
+    md5: b74db8947d7cd111f3c7b3b7f402adbf
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index c1964acdb2b..b9ae1da35f0 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/1.0.0-SNAPSHOT/trusty-service-1.0.0-20200831.025350-34-runner.jar
-    md5: 8571eb5eb2a0900d881c73d159c41157
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/1.0.0-SNAPSHOT/trusty-service-1.0.0-20201019.093110-77-runner.jar
+    md5: 534ef8c24c27c279cb69b48fd2dec830
 
 execute:
   - script: configure
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 8dee6724368..4cd4ae19b67 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -119,6 +119,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/persons.proto with the name: /home/kogito/data/protobufs/persons-md5.txt
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
+  #ignore until https://issues.redhat.com/browse/KOGITO-3638 is resolved
+  @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
       | variable | value |
@@ -294,4 +296,4 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | expected_phrase | Should the driver be suspended?                                                                  |
       | request_method  | POST                                                                                             |
       | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
\ No newline at end of file
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |

From 24f85e05c91bb073b9c42bae374b3e6d30c63b04 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 28 Oct 2020 11:17:31 -0300
Subject: [PATCH 201/709] [KOGITO-3094] - Provide data-index-infinispan/mongodb
 as independent images (#265)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Jenkinsfile.deploy                            |  3 +-
 Jenkinsfile.promote                           |  3 +-
 README.md                                     | 83 +++++++++++--------
 ...ogito-data-index-infinispan-overrides.yaml | 16 ++--
 kogito-data-index-mongodb-overrides.yaml      | 43 ++++++++++
 kogito-imagestream.yaml                       | 31 +++++--
 .../added/launch/kogito-data-index.sh         | 19 +++++
 modules/kogito-data-index-common/configure    | 14 ++++
 modules/kogito-data-index-common/module.yaml  |  8 ++
 .../tests/bats/kogito-data-index.bats         | 28 +++++++
 .../added/kogito-app-launch.sh                | 25 ++++++
 .../configure                                 |  7 --
 .../kogito-data-index-infinispan/module.yaml  | 12 +++
 .../added/kogito-app-launch.sh                |  2 +-
 modules/kogito-data-index-mongodb/configure   | 12 +++
 modules/kogito-data-index-mongodb/module.yaml | 12 +++
 .../added/launch/kogito-data-index.sh         | 33 --------
 modules/kogito-data-index/module.yaml         | 15 ----
 .../tests/bats/kogito-data-index.bats         | 72 ----------------
 modules/kogito-explainability/module.yaml     |  8 +-
 modules/kogito-jobs-service/module.yaml       |  4 +-
 modules/kogito-management-console/module.yaml |  4 +-
 modules/kogito-task-console/module.yaml       |  4 +-
 modules/kogito-trusty-ui/module.yaml          |  4 +-
 modules/kogito-trusty/module.yaml             |  4 +-
 scripts/README.md                             |  5 +-
 scripts/common.py                             | 25 +++++-
 scripts/list-images.py                        |  2 +-
 scripts/manage-kogito-version.py              |  1 -
 scripts/push-local-registry.sh                |  3 -
 scripts/push-staging.py                       |  6 --
 scripts/run-bats.sh                           |  4 +-
 scripts/update-maven-artifacts.py             |  4 +-
 tests/features/common-build-runtime.feature   |  6 ++
 tests/features/common.feature                 |  5 +-
 .../kogito-data-index-common.feature          | 16 ++++
 .../kogito-data-index-infinispan.feature      | 41 +++++++++
 .../kogito-data-index-mongodb.feature         | 39 +++++++++
 tests/features/kogito-data-index.feature      | 69 ---------------
 39 files changed, 404 insertions(+), 288 deletions(-)
 rename kogito-data-index-overrides.yaml => kogito-data-index-infinispan-overrides.yaml (64%)
 create mode 100644 kogito-data-index-mongodb-overrides.yaml
 create mode 100644 modules/kogito-data-index-common/added/launch/kogito-data-index.sh
 create mode 100644 modules/kogito-data-index-common/configure
 create mode 100644 modules/kogito-data-index-common/module.yaml
 create mode 100644 modules/kogito-data-index-common/tests/bats/kogito-data-index.bats
 create mode 100644 modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
 rename modules/{kogito-data-index => kogito-data-index-infinispan}/configure (55%)
 create mode 100644 modules/kogito-data-index-infinispan/module.yaml
 rename modules/{kogito-data-index => kogito-data-index-mongodb}/added/kogito-app-launch.sh (92%)
 create mode 100644 modules/kogito-data-index-mongodb/configure
 create mode 100644 modules/kogito-data-index-mongodb/module.yaml
 delete mode 100644 modules/kogito-data-index/added/launch/kogito-data-index.sh
 delete mode 100644 modules/kogito-data-index/module.yaml
 delete mode 100644 modules/kogito-data-index/tests/bats/kogito-data-index.bats
 create mode 100644 tests/features/common-build-runtime.feature
 create mode 100644 tests/features/data-index/kogito-data-index-common.feature
 create mode 100644 tests/features/data-index/kogito-data-index-infinispan.feature
 create mode 100644 tests/features/data-index/kogito-data-index-mongodb.feature
 delete mode 100644 tests/features/kogito-data-index.feature

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index ce22b15ce85..46dc1837a91 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -130,7 +130,8 @@ pipeline {
                     sh updateArtifactCmd
 
                     // Debug purpose in case of issue
-                    sh 'cat modules/kogito-data-index/module.yaml'
+                    sh 'cat modules/kogito-data-index-infinispan/module.yaml'
+                    sh 'cat modules/kogito-data-index-mongodb/module.yaml'
                     sh 'cat modules/kogito-trusty/module.yaml'
                     sh 'cat modules/kogito-explainability/module.yaml'
                     sh 'cat modules/kogito-jobs-service/module.yaml'
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index a95ccc39509..bf7a52005c4 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -113,7 +113,8 @@ pipeline {
                         sh updateArtifactCmd
 
                         // Debug purpose in case of issue
-                        sh 'cat modules/kogito-data-index/module.yaml'
+                        sh 'cat modules/kogito-data-index-infinispan/module.yaml'
+                        sh 'cat modules/kogito-data-index-mongodb/module.yaml'
                         sh 'cat modules/kogito-trusty/module.yaml'
                         sh 'cat modules/kogito-explainability/module.yaml'
                         sh 'cat modules/kogito-jobs-service/module.yaml'
diff --git a/README.md b/README.md
index 1e016e39a0a..6999ac2dd91 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Table of Contents
         - [Kogito Spring Boot Runtime Image usage](#kogito-spring-boot-runtime-image-usage)
         - [Kogito Spring Boot Runtime Image example](#kogito-spring-boot-runtime-image-example)
   - [Kogito Component Images](#kogito-component-images)
-    - [Kogito Data Index Component Image](#kogito-data-index-component-image)
+    - [Kogito Data Index Component Images](#kogito-data-index-component-images)
     - [Kogito Trusty Component Image](#kogito-trusty-component-image)
     - [Kogito Explainability Component Image](#kogito-explainability-component-image)
     - [Kogito Jobs Service Component Image](#kogito-jobs-service-component-image)
@@ -567,7 +567,8 @@ The Kogito Component Images can be considered as lightweight images that will co
 by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications.
 Today we have 3 Kogito Component Images:
 
-* [quay.io/kiegroup/kogito-data-index](https://quay.io/kiegroup/kogito-data-index)
+* [quay.io/kiegroup/kogito-data-index-infinispan](https://quay.io/kiegroup/kogito-data-index-infinispan)
+* [quay.io/kiegroup/kogito-data-index-mongodb](https://quay.io/kiegroup/kogito-data-index-mongodb)
 * [quay.io/kiegroup/kogito-trusty](https://quay.io/kiegroup/kogito-trusty)
 * [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
 * [quay.io/kiegroup/kogito-jobs-service](htps://quay.io/kiegroup/kogito-jobs-service)
@@ -575,34 +576,36 @@ Today we have 3 Kogito Component Images:
 * [quay.io/kiegroup/kogito-trusty-ui](https://quay.io/kiegroup/kogito-trusty-ui)
 
 
-### Kogito Data Index Component Image
+### Kogito Data Index Component Images
 
 The Data Index Service aims at capturing and indexing data produced by one more Kogito runtime services. 
-For more information please visit this (link)(https://docs.jboss.org/kogito/release/latest/html_single/#proc_kogito-travel-agency-enable-data-index). 
+For more information please visit this (link)(https://docs.jboss.org/kogito/release/latest/html_single/#proc-kogito-travel-agency-enable-data-index_kogito-deploying-on-openshift). 
 The Data Index Service depends on a running Infinispan or MongoDB Server.
-The Persistence service can be switched by setting the following variable:
+The Persistence service can be switched by using its corresponding image
 
-```bash
-DATA_INDEX_PERSISTENCE
-```
-
-The supported values are: `infinispan` and `mongodb`. If the environment variable above is empty, then `infinispan` will be used.
+- Infinispan: quay.io/kiegroup/kogito-data-index-infinispan
+    [image.yaml](kogito-data-index-infinispan-overrides.yaml)
+- Mongodb: quay.io/kiegroup/kogito-data-index-mongodb
+    [image.yaml](kogito-data-index-mongodb-overrides.yaml)
 
 
+Basic usage with Infinispan:
+```bash
+$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
+```
 
-Basic usage
+Basic usage with Mongodb:
 ```bash
-$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index:latest
+$ docker run -it --env QUARKUS_MONGODB_CONNECTION_STRING=mongodb://localhost:27017 quay.io/kiegroup/kogito-data-index-mongodb:latest
 ```
 
 To enable debug just use this env while running this image:
 
 ```bash
-docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index:latest
+docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
 ```
-You should notice a few debug messages being printed in the system output.
+You should notice a few debug messages present in the system output.
 
-To know what configurations this image accepts please take a look [here](kogito-data-index-overrides.yaml) on the **envs** section.
 
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Data Index Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
@@ -758,13 +761,14 @@ You can add applications to this project with the 'new-app' command. For example
 to build a new example application in Ruby.
 
 # installing the imagestream on the current namespace
-$ oc create -f https://raw.githubusercontent.com/kiegroup/kogito-images/0.9.0/kogito-imagestream.yaml
+$ oc create -f https://raw.githubusercontent.com/kiegroup/kogito-images/0.16.0/kogito-imagestream.yaml
 imagestream.image.openshift.io/kogito-quarkus-ubi8 created
 imagestream.image.openshift.io/kogito-quarkus-jvm-ubi8 created
 imagestream.image.openshift.io/kogito-quarkus-ubi8-s2i created
 imagestream.image.openshift.io/kogito-springboot-ubi8 created
 imagestream.image.openshift.io/kogito-springboot-ubi8-s2i created
-imagestream.image.openshift.io/kogito-data-index created
+imagestream.image.openshift.io/kogito-data-index-infinispan created
+imagestream.image.openshift.io/kogito-data-index-mongodb created
 imagestream.image.openshift.io/kogito-trusty created
 imagestream.image.openshift.io/kogito-jobs-service created
 imagestream.image.openshift.io/kogito-management-console created
@@ -946,28 +950,29 @@ With this Makefile you can:
  
 - Build images individually, by default it will build and test each image
      ```bash
-     $ make kogito-quarkus-ubi8
-     $ make kogito-quarkus-jvm-ubi8
-     $ make kogito-quarkus-ubi8-s2i
-     $ make kogito-springboot-ubi8 
-     $ make kogito-springboot-ubi8-s2i
-     $ make kogito-data-index
-     $ make kogito-trusty
-     $ make kogito-explainability
-     $ make kogito-jobs-service 
-     $ make kogito-management-console
-     $ make kogito-trusty-ui
+     $ make build-image image_name=kogito-quarkus-ubi8
+     $ make build-image image_name=kogito-quarkus-jvm-ubi8
+     $ make build-image image_name=kogito-quarkus-ubi8-s2i
+     $ make build-image image_name=kogito-springboot-ubi8 
+     $ make build-image image_name=kogito-springboot-ubi8-s2i
+     $ make build-image image_name=kogito-data-index-infinispan
+     $ make build-image image_name=kogito-data-index-mongodb
+     $ make build-image image_name=kogito-trusty
+     $ make build-image image_name=kogito-explainability
+     $ make build-image image_name=kogito-jobs-service 
+     $ make build-image image_name=kogito-management-console
+     $ make build-image image_name=kogito-trusty-ui
      ```
   
      We can ignore the build or the tests while interacting with a specific image as well, to build only:
      ```bash
-     $ make ignore_test=true {image_name}
+     $ make ignore_test=true image_name={image_name}
 
      ```
      
      Or to test only:
      ```bash
-     $ make ignore_build=true {image_name}
+     $ make ignore_build=true image_name={image_name}
      ```      
      
 - Build and Push the Images to quay or a repo for you preference, for this you need to edit the Makefile accordingly: 
@@ -979,6 +984,11 @@ With this Makefile you can:
         - X.Y.z
         - latest
         
+      to push a single image:
+      ```bash
+      $ make push-image image_name={image_name}
+      ```     
+        
 - Push staging images (release candidates, a.k.a rcX tags), the following command will build and push RC images to quay. 
       ```bash
       $ make push-staging
@@ -1006,7 +1016,9 @@ To better understand the CeKit Modules, please visit this [link](https://docs.ce
 
 Below you can find all modules used to build the Kogito Images
 
-- [kogito-data-index](modules/kogito-data-index): Installs and Configure the data-index jar inside the image.
+- [kogito-data-index-common](modules/kogito-data-index-common): Data Index common module.
+- [kogito-data-index-infinispan](modules/kogito-data-index-infinispan): Installs and Configure the infinispan data-index jar inside the image.
+- [kogito-data-index-mongodb](modules/kogito-data-index-mongodb): Installs and Configure the mongodb data-index jar inside the image.
 - [kogito-trusty](modules/kogito-trusty): Installs and Configure the trusty jar inside the image.
 - [kogito-explainability](modules/kogito-explainability): Installs and Configure the explainability jar inside the image.
 - [kogito-epel](modules/kogito-epel): Configures the epel repository on the target image.
@@ -1032,9 +1044,10 @@ Below you can find all modules used to build the Kogito Images
 
 
 For each image, we use a specific *-overrides.yaml file which will specific the modules needed.
-Please inspect the images overrides files to learn which modules are being installed:
+Please inspect the images overrides files to learn which modules are installed on each image:
 
-- [quay.io/kiegroup/kogito-data-index](kogito-data-index-overrides.yaml)
+- [quay.io/kiegroup/kogito-data-index-infinispan](kogito-data-index-infinispan-overrides.yaml)
+- [quay.io/kiegroup/kogito-data-index-mongodb](kogito-data-index-mongodb-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty](kogito-trusty-overrides.yaml)
 - [quay.io/kiegroup/kogito-explainability](kogito-explainability-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service](kogito-jobs-service-overrides.yaml)
@@ -1133,8 +1146,8 @@ For example, if we are creating a new image called quay.io/kiegroup/kogito-moon-
 example:
 
 ```text
-@quay.io/kiegroup/kogito-data-index
-Feature: Kogito-data-index feature.
+@quay.io/kiegroup/kogito-data-index-infinispan
+Feature: Kogito-data-index-infinispan feature.
     ...
     Scenarios......
 ```
diff --git a/kogito-data-index-overrides.yaml b/kogito-data-index-infinispan-overrides.yaml
similarity index 64%
rename from kogito-data-index-overrides.yaml
rename to kogito-data-index-infinispan-overrides.yaml
index 78e1ec2f517..e50a9252e45 100644
--- a/kogito-data-index-overrides.yaml
+++ b/kogito-data-index-infinispan-overrides.yaml
@@ -1,15 +1,15 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-data-index"
-description: "Runtime image for Kogito Data Index Service"
+name: "quay.io/kiegroup/kogito-data-index-infinispan"
+description: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
 
 labels:
 - name: "io.k8s.description"
-  value: "Runtime image for Kogito Data Index Service"
+  value: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
 - name: "io.k8s.display-name"
-  value: "Kogito Data Index Service"
+  value: "Kogito Data Index Service - Infinispan"
 - name: "io.openshift.tags"
-  value: "kogito,data-index"
+  value: "kogito,data-index,data-index-infinispan"
 - name: "io.openshift.expose-services"
   value: "8080:http"
 
@@ -20,9 +20,6 @@ envs:
   - name: "HTTP_PORT"
     example: "9090"
     description: "Defines which port the Data Index Container Image will listen on."
-  - name: "DATA_INDEX_PERSISTENCE"
-    example: "mongodb"
-    description: "Defines which Data Index Service persistence implementation will be used. If empty defaults to 'infinispan'. Allowed types are 'infinispan' and 'mongodb'."
 
 ports:
 - value: 8080
@@ -35,7 +32,8 @@ modules:
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.dataindex
+  - name: org.kie.kogito.dataindex.infinispan
+  - name: org.kie.kogito.dataindex.common
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-data-index-mongodb-overrides.yaml b/kogito-data-index-mongodb-overrides.yaml
new file mode 100644
index 00000000000..c3f765fbb7c
--- /dev/null
+++ b/kogito-data-index-mongodb-overrides.yaml
@@ -0,0 +1,43 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-data-index-mongodb"
+description: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
+- name: "io.k8s.display-name"
+  value: "Kogito Data Index Service - Mongodb"
+- name: "io.openshift.tags"
+  value: "kogito,data-index,data-index-mongodb"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "HTTP_PORT"
+    example: "9090"
+    description: "Defines which port the Data Index Container Image will listen on."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.dataindex.mongodb
+  - name: org.kie.kogito.dataindex.common
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 2f7d74ae9de..4babeb56631 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -114,24 +114,45 @@ items:
   - kind: ImageStream
     apiVersion: v1
     metadata:
-      name: kogito-data-index
+      name: kogito-data-index-infinispan
       annotations:
-        openshift.io/display-name: Runtime image for the Kogito Data Index Service
+        openshift.io/display-name: Runtime image for the Kogito Data Index Service for Infinispan persistence provider
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
         - name: '1.0.0-snapshot'
           annotations:
-            description: Runtime image for the Kogito Data Index Service
+            description: Runtime image for the Kogito Data Index Service with Infinispan
             iconClass: icon-jbpm
-            tags: kogito,data-index
+            tags: kogito,data-index,data-index-infinispan
             supports: persistence backed by Infinispan server
             version: '1.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-infinispan:1.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-data-index-mongodb
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Data Index Service for MongoDB persistence provider
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '1.0.0-snapshot'
+          annotations:
+            description: Runtime image for the Kogito Data Index Service with Mongodb
+            iconClass: icon-jbpm
+            tags: kogito,data-index,data-index-mongodb
+            supports: persistence backed by Mongodb server
+            version: '1.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-data-index-mongodb:1.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/modules/kogito-data-index-common/added/launch/kogito-data-index.sh b/modules/kogito-data-index-common/added/launch/kogito-data-index.sh
new file mode 100644
index 00000000000..19ff7071937
--- /dev/null
+++ b/modules/kogito-data-index-common/added/launch/kogito-data-index.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset HTTP_PORT
+}
+
+function configure() {
+    configure_data_index_http_port
+}
+
+function configure_data_index_http_port() {
+    local httpPort=${HTTP_PORT:-8080}
+    KOGITO_DATA_INDEX_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dquarkus.http.port=${httpPort}"
+}
+
diff --git a/modules/kogito-data-index-common/configure b/modules/kogito-data-index-common/configure
new file mode 100644
index 00000000000..b36a15f05a4
--- /dev/null
+++ b/modules/kogito-data-index-common/configure
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+
+mkdir -p ${KOGITO_HOME}/data/protobufs/
+
+chown -R 1001:0 ${KOGITO_HOME}
+chmod -R ug+rwX ${KOGITO_HOME}
+
diff --git a/modules/kogito-data-index-common/module.yaml b/modules/kogito-data-index-common/module.yaml
new file mode 100644
index 00000000000..7c820efc38e
--- /dev/null
+++ b/modules/kogito-data-index-common/module.yaml
@@ -0,0 +1,8 @@
+schema_version: 1
+name: org.kie.kogito.dataindex.common
+version: "1.0.0-snapshot"
+description: "Common modules for data-index persistence provider images, any addition that is common must be added in this module"
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-data-index-common/tests/bats/kogito-data-index.bats b/modules/kogito-data-index-common/tests/bats/kogito-data-index.bats
new file mode 100644
index 00000000000..7c79d747101
--- /dev/null
+++ b/modules/kogito-data-index-common/tests/bats/kogito-data-index.bats
@@ -0,0 +1,28 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME=$KOGITO_HOME
+mkdir -p ${KOGITO_HOME}/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-data-index.sh
+
+teardown() {
+    rm -rf ${KOGITO_HOME}
+}
+
+@test "http port configuration default value" {
+    configure_data_index_http_port
+    expected=" -Dquarkus.http.port=8080"
+    echo "Result is ${KOGITO_DATA_INDEX_PROPS} and expected is ${expected}"
+    [ "${KOGITO_DATA_INDEX_PROPS}" = "${expected}" ]
+}
+
+@test "http port configuration custom value" {
+    export HTTP_PORT="9090"
+    configure_data_index_http_port
+    expected=" -Dquarkus.http.port=9090"
+    echo "Result is ${KOGITO_DATA_INDEX_PROPS} and expected is ${expected}"
+    [ "${KOGITO_DATA_INDEX_PROPS}" = "${expected}" ]
+}
diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..d35ddcd9084
--- /dev/null
+++ b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+#import
+source ${KOGITO_HOME}/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  ${KOGITO_HOME}/launch/kogito-data-index.sh
+)
+source ${KOGITO_HOME}/launch/configure.sh
+#############################################
+
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
+        -Djava.library.path=$KOGITO_HOME/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -jar $KOGITO_HOME/bin/data-index-service-infinispan.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index/configure b/modules/kogito-data-index-infinispan/configure
similarity index 55%
rename from modules/kogito-data-index/configure
rename to modules/kogito-data-index-infinispan/configure
index a8782e2ae25..c88dcaec10c 100644
--- a/modules/kogito-data-index/configure
+++ b/modules/kogito-data-index-infinispan/configure
@@ -6,13 +6,6 @@ SCRIPT_DIR=$(dirname $0)
 ADDED_DIR=${SCRIPT_DIR}/added
 
 cp -v ${SOURCES_DIR}/data-index-service-infinispan.jar ${KOGITO_HOME}/bin/
-cp -v ${SOURCES_DIR}/data-index-service-mongodb.jar ${KOGITO_HOME}/bin/
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
-
-mkdir -p ${KOGITO_HOME}/data/protobufs/
-
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
 
 cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
 chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
new file mode 100644
index 00000000000..6b919ba115f
--- /dev/null
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.dataindex.infinispan
+version: "1.0.0-snapshot"
+
+artifacts:
+  - name: data-index-service-infinispan.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/1.0.0-SNAPSHOT/data-index-service-infinispan-1.0.0-20201020.073543-49-runner.jar
+    md5: d947f3500a2ba7cd0ce05105be34fc39
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-data-index/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
similarity index 92%
rename from modules/kogito-data-index/added/kogito-app-launch.sh
rename to modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index 1503eb75fbe..bdcda1d352f 100644
--- a/modules/kogito-data-index/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -22,4 +22,4 @@ source ${KOGITO_HOME}/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
-        -jar $KOGITO_HOME/bin/${KOGITO_DATA_INDEX_SERVICE_JAR}
\ No newline at end of file
+        -jar $KOGITO_HOME/bin/data-index-service-mongodb.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-mongodb/configure b/modules/kogito-data-index-mongodb/configure
new file mode 100644
index 00000000000..bf3e68674e9
--- /dev/null
+++ b/modules/kogito-data-index-mongodb/configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname $0)
+ADDED_DIR=${SCRIPT_DIR}/added
+
+cp -v ${SOURCES_DIR}/data-index-service-mongodb.jar ${KOGITO_HOME}/bin/
+
+cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
+chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
new file mode 100644
index 00000000000..c7a19d94ebb
--- /dev/null
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.dataindex.mongodb
+version: "1.0.0-snapshot"
+
+artifacts:
+  - name: data-index-service-mongodb.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/1.0.0-SNAPSHOT/data-index-service-mongodb-1.0.0-20201020.073628-48-runner.jar
+    md5: 3b32642c8e0fbac375922bd24263481c
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-data-index/added/launch/kogito-data-index.sh b/modules/kogito-data-index/added/launch/kogito-data-index.sh
deleted file mode 100644
index f0d20c28c6b..00000000000
--- a/modules/kogito-data-index/added/launch/kogito-data-index.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-#import
-source ${KOGITO_HOME}/launch/logging.sh
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset DATA_INDEX_PERSISTENCE
-    unset HTTP_PORT
-}
-
-function configure() {
-    configure_data_index_persistence
-    configure_data_index_http_port
-}
-
-function configure_data_index_http_port() {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_DATA_INDEX_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dquarkus.http.port=${httpPort}"
-}
-
-function configure_data_index_persistence() {
-    local allowed_persistence_types=("INFINISPAN" "MONGODB")
-    local persistence="INFINISPAN"
-    if [[ ! "${allowed_persistence_types[@]}" =~ "${DATA_INDEX_PERSISTENCE^^}" ]]; then
-        log_warning "Data index persistence type ${DATA_INDEX_PERSISTENCE} is not allowed, the allowed types are [${allowed_persistence_types[*]}]. Defaulting to ${persistence}."
-    elif [ "${DATA_INDEX_PERSISTENCE^^}" == "MONGODB" ]; then
-        persistence="${DATA_INDEX_PERSISTENCE^^}"
-    fi
-    log_info "Data index persistence is set to ${persistence}"
-    KOGITO_DATA_INDEX_SERVICE_JAR="data-index-service-${persistence,,}.jar"
-}
-
diff --git a/modules/kogito-data-index/module.yaml b/modules/kogito-data-index/module.yaml
deleted file mode 100644
index d5c1a777319..00000000000
--- a/modules/kogito-data-index/module.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.dataindex
-version: "1.0.0-snapshot"
-
-artifacts:
-  - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/1.0.0-SNAPSHOT/data-index-service-infinispan-1.0.0-20201019.092259-48-runner.jar
-    md5: dfd2b683a507dd912bd3fd67fe9396a9
-  - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/1.0.0-SNAPSHOT/data-index-service-mongodb-1.0.0-20201019.092349-47-runner.jar
-    md5: 88796b3b79ac420430ad80638dc8b325
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-data-index/tests/bats/kogito-data-index.bats b/modules/kogito-data-index/tests/bats/kogito-data-index.bats
deleted file mode 100644
index 3b2b4eea745..00000000000
--- a/modules/kogito-data-index/tests/bats/kogito-data-index.bats
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env bats
-
-export KOGITO_HOME=/tmp/kogito
-export HOME=$KOGITO_HOME
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-data-index.sh
-
-teardown() {
-    rm -rf ${KOGITO_HOME}
-}
-
-@test "http port configuration default value" {
-    configure_data_index_http_port
-    expected=" -Dquarkus.http.port=8080"
-    echo "Result is ${KOGITO_DATA_INDEX_PROPS} and expected is ${expected}"
-    [ "${KOGITO_DATA_INDEX_PROPS}" = "${expected}" ]
-}
-
-@test "http port configuration custom value" {
-    export HTTP_PORT="9090"
-    configure_data_index_http_port
-    expected=" -Dquarkus.http.port=9090"
-    echo "Result is ${KOGITO_DATA_INDEX_PROPS} and expected is ${expected}"
-    [ "${KOGITO_DATA_INDEX_PROPS}" = "${expected}" ]
-}
-
-@test "test if the default data index persistence service is correctly set" {
-    configure_data_index_persistence
-    expected="data-index-service-infinispan.jar"
-    echo "result: ${KOGITO_DATA_INDEX_SERVICE_JAR} \n expected: ${expected}"
-    [ "${KOGITO_DATA_INDEX_SERVICE_JAR}" = "${expected}" ]
-}
-
-@test "test if the default data index persistence service is correctly set (messages output only)" {
-    run configure_data_index_persistence
-    echo "output: ${output}"
-    [[ "${output}" = *"INFO Data index persistence is set to INFINISPAN"* ]]
-}
-
-@test "test if data index persistence service default value s correctly set if a nonsense type is set" {
-    DATA_INDEX_PERSISTENCE="nonsense"
-    configure_data_index_persistence
-    expected="data-index-service-infinispan.jar"
-    echo "result: ${KOGITO_DATA_INDEX_SERVICE_JAR} \n expected: ${expected}"
-    [ "${KOGITO_DATA_INDEX_SERVICE_JAR}" = "${expected}" ]
-}
-
-@test "test if data index persistence service default value s correctly set if a nonsense type is set (messages output only)" {
-    DATA_INDEX_PERSISTENCE="nonsense"
-    run configure_data_index_persistence
-    echo "lines: ${lines[@]}"
-    [[ "${lines[0]}" = *"WARN Data index persistence type nonsense is not allowed, the allowed types are [INFINISPAN MONGODB]. Defaulting to INFINISPAN."* ]]
-    [[ "${lines[1]}" = *"INFO Data index persistence is set to INFINISPAN"* ]]
-}
-
-@test "test if data index persistence service default value s correctly set if set to mongodb" {
-    DATA_INDEX_PERSISTENCE="mongodb"
-    configure_data_index_persistence
-    expected="data-index-service-mongodb.jar"
-    echo "result: ${KOGITO_DATA_INDEX_SERVICE_JAR} \n expected: ${expected}"
-    [ "${KOGITO_DATA_INDEX_SERVICE_JAR}" = "${expected}" ]
-}
-
-@test "test if data index persistence service default value s correctly set if set to mongodb (messages output only)" {
-    DATA_INDEX_PERSISTENCE="mongodb"
-    run configure_data_index_persistence
-    echo "output: ${output}"
-    [[ "${output}" = *"INFO Data index persistence is set to MONGODB"* ]]
-}
\ No newline at end of file
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 6769f221f6e..cb23747ca56 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/1.0.0-SNAPSHOT/explainability-service-rest-1.0.0-20201019.093027-68-runner.jar
-    md5: d562b6bf388a6449177ee70edee0ac2a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/1.0.0-SNAPSHOT/explainability-service-rest-1.0.0-20201020.074251-69-runner.jar
+    md5: 73ebe2e9cef755dba4c00cb2fd327385
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/1.0.0-SNAPSHOT/explainability-service-messaging-1.0.0-20201019.093000-69-runner.jar
-    md5: 38c74904a99dced2be57cf2971a818f1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/1.0.0-SNAPSHOT/explainability-service-messaging-1.0.0-20201020.074228-70-runner.jar
+    md5: 4b35d9f1b3eb8a96365641b86c5a0d49
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index e35c3f4a2e4..4d84db3b854 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/1.0.0-SNAPSHOT/jobs-service-1.0.0-20201019.092133-77-runner.jar
-    md5: ae1b0a135ac65e23135586be50e328b3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/1.0.0-SNAPSHOT/jobs-service-1.0.0-20201020.073432-78-runner.jar
+    md5: ad2da27e1550ead2c55aa0d36570ede1
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 3ccc3647718..cdeb3daf22b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/1.0.0-SNAPSHOT/management-console-1.0.0-20201019.092749-76-runner.jar
-    md5: 6d98e978cc1a787e989f33975181c142
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/1.0.0-SNAPSHOT/management-console-1.0.0-20201020.074035-77-runner.jar
+    md5: fe4522a404cba2d0e0fd0bf4a618f45d
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index a31cea27d54..5c05be88ac7 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/1.0.0-SNAPSHOT/task-console-1.0.0-20201019.092850-76-runner.jar
-    md5: cf6577212298aaf7e2130111adbc872f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/1.0.0-SNAPSHOT/task-console-1.0.0-20201020.074130-77-runner.jar
+    md5: 2db874d66ea1f1e4fc6a2348ef1e0f3c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index e2e9a44fe60..a6f15ba8d95 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/1.0.0-SNAPSHOT/trusty-ui-1.0.0-20201019.092817-47-runner.jar
-    md5: b74db8947d7cd111f3c7b3b7f402adbf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/1.0.0-SNAPSHOT/trusty-ui-1.0.0-20201020.074101-48-runner.jar
+    md5: 268e44cfa317509f21626cc23802d44a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index b9ae1da35f0..05350dcf8ab 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "1.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/1.0.0-SNAPSHOT/trusty-service-1.0.0-20201019.093110-77-runner.jar
-    md5: 534ef8c24c27c279cb69b48fd2dec830
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/1.0.0-SNAPSHOT/trusty-service-1.0.0-20201020.074326-78-runner.jar
+    md5: 756610b74514004ab2e35cbb7a0e4a48
 
 execute:
   - script: configure
diff --git a/scripts/README.md b/scripts/README.md
index 10e8e187b62..8af1f61fafd 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -135,9 +135,8 @@ If no argument is given, it takes the JBoss repository as the default value.
 
 The command will update the needed files with the new URL:
 
-- kogito-data-index/module.yaml
-    - data-index-service-infinispan
-    - data-index-service-mongodb
+- kogito-data-index-infinispan/module.yaml
+- kogito-data-index-mongodb/module.yaml
 - kogito-jobs-service/module.yaml
 - kogito-management-console/module.yaml
 - kogito-trusty-ui/module.yaml
diff --git a/scripts/common.py b/scripts/common.py
index 02e88262703..89cbeeb3ce8 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -8,7 +8,8 @@
 from ruamel.yaml import YAML
 
 # All kogito-image modules that have the kogito version.
-MODULES = {"kogito-data-index", "kogito-trusty", 
+MODULES = {"kogito-data-index-common", "kogito-data-index-mongodb",
+           "kogito-data-index-infinispan", "kogito-trusty",
            "kogito-explainability", "kogito-image-dependencies",
            "kogito-jobs-service", "kogito-trusty-ui",
            "kogito-jq", "kogito-kubernetes-client",
@@ -115,6 +116,7 @@ def get_kogito_module_dirs():
 
     return modules
 
+
 def get_all_images():
     """
     Retrieve the Kogito images' names
@@ -129,6 +131,7 @@ def get_all_images():
 
     return images
 
+
 def update_modules_version(target_version):
     """
     Update every Kogito module.yaml to the given version.
@@ -137,6 +140,7 @@ def update_modules_version(target_version):
     for module_dir in get_kogito_module_dirs():
         update_module_version(module_dir, target_version)
 
+
 def update_module_version(moduleDir, target_version):
     """
     Set Kogito module.yaml to given version.
@@ -171,6 +175,7 @@ def retrieve_artifacts_version():
     except TypeError:
         raise
 
+
 def update_artifacts_version_env_in_image(artifacts_version):
     """
     Update `KOGITO_VERSION` env var in image.yaml.
@@ -190,6 +195,7 @@ def update_artifacts_version_env_in_image(artifacts_version):
     except TypeError:
         raise
 
+
 def update_examples_ref_in_behave_tests(examples_ref):
     """
     Update examples git reference into behave tests
@@ -201,6 +207,7 @@ def update_examples_ref_in_behave_tests(examples_ref):
     replacement = 'using {}'.format(examples_ref)
     update_in_behave_tests(pattern, replacement)
 
+
 def update_examples_uri_in_behave_tests(examples_uri):
     """
     Update examples uri into behave tests
@@ -212,6 +219,7 @@ def update_examples_uri_in_behave_tests(examples_uri):
     replacement = examples_uri
     update_in_behave_tests(pattern, replacement)
 
+
 def update_artifacts_version_in_behave_tests(artifacts_version):
     """
     Update artifacts version into behave tests
@@ -223,6 +231,7 @@ def update_artifacts_version_in_behave_tests(artifacts_version):
     replacement = '| KOGITO_VERSION | {} | '.format(artifacts_version)
     update_in_behave_tests(pattern, replacement)
 
+
 def update_maven_repo_in_behave_tests(repo_url, replaceJbossRepository):
     """
     Update maven repository into behave tests
@@ -236,6 +245,8 @@ def update_maven_repo_in_behave_tests(repo_url, replaceJbossRepository):
         envVarKey = "JBOSS_MAVEN_REPO_URL"
     replacement = "| variable | value |\n      | {} | {} |\n      | MAVEN_DOWNLOAD_OUTPUT | true |".format(envVarKey, repo_url)
     update_in_behave_tests(pattern, replacement)
+
+
 def ignore_maven_self_signed_certificate_in_behave_tests():
     """
     Sets the environment variable to ignore the self-signed certificates in maven
@@ -244,7 +255,8 @@ def ignore_maven_self_signed_certificate_in_behave_tests():
     pattern = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
     replacement = "| variable | value |\n      | MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE | true |"
     update_in_behave_tests(pattern, replacement)
-    
+
+
 def update_in_behave_tests(pattern, replacement):
     """
     Update all behave tests files
@@ -254,6 +266,7 @@ def update_in_behave_tests(pattern, replacement):
     for feature in BEHAVE_TESTS:
         update_in_file(os.path.join(BEHAVE_BASE_DIR, feature), pattern, replacement)
 
+
 def update_examples_ref_in_clone_repo(examples_ref):
     """
     Update examples git reference into clone-repo.sh script
@@ -266,6 +279,7 @@ def update_examples_ref_in_clone_repo(examples_ref):
         replacement = "git checkout -b {0} origin/{1}".format(examples_ref, examples_ref)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
+
 def update_examples_uri_in_clone_repo(examples_uri):
     """
     Update examples uri into clone-repo.sh script
@@ -276,6 +290,7 @@ def update_examples_uri_in_clone_repo(examples_uri):
     replacement = "git clone {}".format(examples_uri)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
+
 def update_maven_repo_in_clone_repo(repo_url, replaceJbossRepository):
     """
     Update maven repository into clone-repo.sh script
@@ -293,6 +308,7 @@ def update_maven_repo_in_clone_repo(repo_url, replaceJbossRepository):
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
+
 def update_in_file(file, pattern, replacement):
     """
     Update in given file
@@ -304,7 +320,8 @@ def update_in_file(file, pattern, replacement):
         updated_value = pattern.sub(replacement, fe.read())
     with open(file, 'w') as fe:
         fe.write(updated_value)
-    
+
+
 if __name__ == "__main__":
     for m in get_kogito_module_dirs():
-        print("module {}".format(m))
\ No newline at end of file
+        print("module {}".format(m))
diff --git a/scripts/list-images.py b/scripts/list-images.py
index 3a67ab66d2f..b544e137d60 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -9,7 +9,7 @@
 import common
 
 if __name__ == "__main__":
-    images = common.get_all_images()
+    images = sorted(common.get_all_images())
 
     for img in images:
         print(img)
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index cc86717d00d..9010d1b2a45 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -17,7 +17,6 @@
 import argparse
 import common
 import re
-import os
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Kogito Version Manager')
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index 56b08217255..4c34c9df21c 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -3,9 +3,6 @@
 
 BUILD_ENGINE="docker"
 
-# All Kogito images
-IMAGES="kogito-quarkus-ubi8 kogito-quarkus-jvm-ubi8 kogito-quarkus-ubi8-s2i kogito-springboot-ubi8 kogito-springboot-ubi8-s2i kogito-data-index kogito-explainability kogito-trusty kogito-jobs-service kogito-management-console kogito-task-console kogito-trusty-ui"
-
 registry=${REGISTRY:-{1}}
 version=${2:-latest}
 namespace=${3:-openshift}
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 82323564605..f6ae565382c 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -17,12 +17,6 @@
 import common
 import argparse
 
-# All Kogito images
-IMAGES = ["kogito-quarkus-ubi8", "kogito-quarkus-jvm-ubi8", "kogito-quarkus-ubi8-s2i",
-          "kogito-springboot-ubi8", "kogito-springboot-ubi8-s2i", "kogito-data-index",
-          "kogito-trusty", "kogito-explainability", "kogito-trusty-ui",
-          "kogito-jobs-service", "kogito-management-console", "kogito-task-console"]
-
 IMAGES_NEXT_RC_TAG = []
 QUAY_KOGITO_ORG_PLACE_HOLDER = "quay.io/kiegroup/{}:{}"
 QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG = "quay.io/kiegroup/{}"
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 7480e5374b3..4d375901a7a 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -10,8 +10,8 @@ else
     rm -rf bats-core
 fi 
 
-echo "----> running bats on kogito-data-index"
-./bats/bin/bats modules/kogito-data-index/tests/bats
+echo "----> running bats on kogito-data-index-common"
+./bats/bin/bats modules/kogito-data-index-common/tests/bats
 
 echo  "----> running bats on kogito-trusty"
 ./bats/bin/bats modules/kogito-trusty/tests/bats
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index b48299749e4..c86e0207c1f 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -24,8 +24,8 @@
 Modules = {
     #service-name: module-name(directory in which module's module.yaml file is present)
     #Note: Service name should be same as given in the repository
-    "data-index-service-infinispan": "kogito-data-index",
-    "data-index-service-mongodb": "kogito-data-index",
+    "data-index-service-infinispan": "kogito-data-index-infinispan",
+    "data-index-service-mongodb": "kogito-data-index-mongodb",
     "trusty-service": "kogito-trusty",
     "explainability-service-rest": "kogito-explainability",
     "explainability-service-messaging": "kogito-explainability",
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
new file mode 100644
index 00000000000..d9948f944ca
--- /dev/null
+++ b/tests/features/common-build-runtime.feature
@@ -0,0 +1,6 @@
+@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8
+Feature: Common tests for Kogito builder and runtime images
+
+  Scenario: Verify if usage help is correctly called
+    When container is started with command /home/kogito/kogito-app-launch.sh -h
+    Then container log should contain This is the
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 3cf558bb0d3..b302031ca6e 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8 @quay.io/kiegroup/kiegroup/kogito-data-index @quay.io/kiegroup/kiegroup/kogito-trusty
+@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8 @quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-trusty
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
@@ -7,6 +7,3 @@ Feature: Common tests for Kogito images
      And run sh -c 'echo $HOME' in container and check its output for /home/kogito
      And run sh -c 'id' in container and check its output for uid=1001(kogito) gid=1001(kogito) groups=1001(kogito)
 
-  Scenario: Verify if usage help is correctly called
-    When container is started with command /home/kogito/kogito-app-launch.sh -h
-    Then container log should contain This is the
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
new file mode 100644
index 00000000000..cfa96475b2e
--- /dev/null
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -0,0 +1,16 @@
+@quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb
+Feature: Kogito-data-index common feature.
+
+  Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar
+
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
new file mode 100644
index 00000000000..13267c0f019
--- /dev/null
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -0,0 +1,41 @@
+@quay.io/kiegroup/kogito-data-index-infinispan
+Feature: Kogito-data-index infinispan feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+     And the image should contain label io.openshift.s2i.destination with value /tmp
+     And the image should contain label io.openshift.expose-services with value 8080:http
+     And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Infinispan persistence provider
+     And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Infinispan
+     And the image should contain label io.openshift.tags with value kogito,data-index,data-index-infinispan
+
+  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-infinispan.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-infinispan.jar
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port using default infinispan indexing service
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-infinispan.jar
+
+  Scenario: verify if all parameters are correctly set
+    When container is started with env
+      | variable                                  | value             |
+      | SCRIPT_DEBUG                              | true              |
+      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
+      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
+      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
+    Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+     And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
+     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
+     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
+     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
+     And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
+
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
new file mode 100644
index 00000000000..0828668f1d7
--- /dev/null
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -0,0 +1,39 @@
+@quay.io/kiegroup/kogito-data-index-mongodb
+Feature: Kogito-data-index mongodb feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+      And the image should contain label io.openshift.s2i.destination with value /tmp
+      And the image should contain label io.openshift.expose-services with value 8080:http
+      And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Mongodb persistence provider
+      And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Mongodb
+      And the image should contain label io.openshift.tags with value kogito,data-index,data-index-mongodb
+
+  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-mongodb.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-mongodb.jar
+
+  Scenario: Verify if the debug is correctly enabled and test custom http port
+    When container is started with env
+      | variable      | value |
+      | SCRIPT_DEBUG  | true  |
+      | HTTP_PORT     | 9090  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-mongodb.jar
+
+  Scenario: verify if all parameters are correctly set
+    When container is started with env
+      | variable                                   | value                       |
+      | SCRIPT_DEBUG                               | true                        |
+      | QUARKUS_MONGODB_CONNECTION_STRING          | mongodb://172.18.0.1:27071  |
+      | QUARKUS_MONGODB_DATABASE                   | database                    |
+      | QUARKUS_MONGODB_CREDENTIALS_AUTH_USERNAME  | IamNotExist                 |
+      | QUARKUS_MONGODB_CREDENTIALS_AUTH_PASSWORD  | SecretRealm                 |
+      | QUARKUS_MONGODB_CREDENTIALS_AUTH_MECHANISM | MONGODB-X509                |
+    Then container log should contain QUARKUS_MONGODB_CONNECTION_STRING=mongodb://172.18.0.1:27071
+     And container log should contain QUARKUS_MONGODB_DATABASE=database
+     And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_USERNAME=IamNotExist
+     And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_PASSWORD=SecretRealm
+     And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_MECHANISM=MONGODB-X509
+
diff --git a/tests/features/kogito-data-index.feature b/tests/features/kogito-data-index.feature
deleted file mode 100644
index 7e63e75d316..00000000000
--- a/tests/features/kogito-data-index.feature
+++ /dev/null
@@ -1,69 +0,0 @@
-@quay.io/kiegroup/kogito-data-index
-Feature: Kogito-data-index feature.
-
-  Scenario: verify if all labels are correctly set.
-    Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service
-    And the image should contain label io.k8s.display-name with value Kogito Data Index Service
-    And the image should contain label io.openshift.tags with value kogito,data-index
-
-  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-infinispan.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-infinispan.jar
-     And run sh -c 'ls /home/kogito/bin/data-index-service-mongodb.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-mongodb.jar
-
-  Scenario: Verify if the debug is correctly enabled and test default http port with default infinispan indexing service
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-infinispan.jar
-
-  Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port with mongodb indexing service
-    When container is started with env
-      | variable               | value   |
-      | SCRIPT_DEBUG           | true    |
-      | DATA_INDEX_PERSISTENCE | mongodb |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-mongodb.jar
-
-  Scenario: Verify if the debug is correctly enabled and test custom http port using default infinispan indexing service
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-infinispan.jar
-
-  Scenario: Verify if the debug is correctly enabled and test custom http port using mongodb indexing service
-    When container is started with env
-      | variable               | value   |
-      | SCRIPT_DEBUG           | true    |
-      | HTTP_PORT              | 9090    |
-      | DATA_INDEX_PERSISTENCE | mongodb |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-mongodb.jar
-
-  Scenario: Verify if the persistence is correctly set to its default value if a wrong persistence type is set
-    When container is started with env
-      | variable               | value    |
-      | SCRIPT_DEBUG           | true     |
-      | DATA_INDEX_PERSISTENCE | nonsense |
-    Then container log should contain WARN Data index persistence type nonsense is not allowed, the allowed types are [INFINISPAN MONGODB]. Defaulting to INFINISPAN.
-
-  Scenario: verify if all parameters are correctly set
-    When container is started with env
-      | variable                                  | value             |
-      | SCRIPT_DEBUG                              | true              |
-      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
-      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
-      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
-    Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI

From b64c6231c5211c0d3653ec21d5b5f2cae250bb41 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 28 Oct 2020 19:03:04 +0100
Subject: [PATCH 202/709] KOGITO-3722 Correcting tests (#267)

---
 tests/features/kogito-quarkus-ubi8-s2i.feature | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 4cd4ae19b67..94c1a965759 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -18,7 +18,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
-    And s2i build log should contain -J-Xmx2576980377
+    And s2i build log should contain -J-Xmx4g
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
@@ -37,7 +37,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
-    And s2i build log should contain -J-Xmx2576980377
+    And s2i build log should contain -J-Xmx4g
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master

From 343b01677596eadb0af5dc59d86b820f40714df5 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Thu, 29 Oct 2020 20:55:00 +0530
Subject: [PATCH 203/709] Kogito 3568 - Remove spec.httpPort attribute from
 Operator and HTTP_PORT env var from Kogito images (#268)

* [KOGITO-3568] - Remove spec.httpPort attribute from Operator and HTTP_PORT env var from Kogito images
See: https://issues.redhat.com/browse/KOGITO-3568

Signed-off-by: Tarun Khandelwal <tarkhand@redhat.com>
---
 kogito-data-index-infinispan-overrides.yaml   |  3 --
 kogito-data-index-mongodb-overrides.yaml      |  4 ---
 kogito-explainability-overrides.yaml          |  3 --
 kogito-jobs-service-overrides.yaml            |  3 --
 kogito-management-console-overrides.yaml      |  3 --
 kogito-quarkus-jvm-ubi8-overrides.yaml        |  3 --
 kogito-quarkus-ubi8-s2i-overrides.yaml        |  3 --
 kogito-springboot-ubi8-overrides.yaml         |  3 --
 kogito-springboot-ubi8-s2i-overrides.yaml     |  3 --
 kogito-task-console-overrides.yaml            |  3 --
 kogito-trusty-overrides.yaml                  |  3 --
 kogito-trusty-ui-overrides.yaml               |  3 --
 .../added/launch/kogito-data-index.sh         | 19 -------------
 modules/kogito-data-index-common/configure    |  5 +---
 modules/kogito-data-index-common/module.yaml  |  3 +-
 .../tests/bats/kogito-data-index.bats         | 28 -------------------
 .../added/kogito-app-launch.sh                |  2 +-
 .../added/kogito-app-launch.sh                |  1 +
 .../added/kogito-app-launch.sh                |  1 +
 .../added/launch/kogito-explainability.sh     |  7 -----
 .../tests/bats/kogito-explainability.bats     | 15 ----------
 .../added/kogito-app-launch.sh                |  2 ++
 .../added/launch/kogito-jobs-service.sh       |  7 -----
 .../tests/bats/kogito-jobs-service.bats       | 21 --------------
 .../added/kogito-app-launch.sh                |  1 +
 .../added/launch/kogito-management-console.sh |  7 -----
 .../tests/bats/kogito-management-console.bats | 23 ---------------
 .../added/kogito-app-launch.sh                |  7 +++--
 .../added/launch/kogito-quarkus-jvm.sh        | 16 -----------
 .../tests/bats/kogito-quarkus-jvm.bats        | 16 -----------
 .../added/kogito-app-launch.sh                |  7 +++--
 .../added/launch/kogito-quarkus-s2i.sh        | 16 -----------
 modules/kogito-quarkus-s2i/configure          |  1 -
 .../tests/bats/kogito-quarkus-s2i.bats        | 16 -----------
 .../kogito-quarkus/added/kogito-app-launch.sh |  3 +-
 .../added/launch/kogito-quarkus-native.sh     | 16 -----------
 .../tests/bats/kogito-quarkus-native.bats     | 16 -----------
 .../added/kogito-app-launch.sh                |  4 +--
 .../added/launch/kogito-springboot-s2i.sh     | 16 -----------
 modules/kogito-springboot-s2i/configure       |  1 -
 .../tests/bats/kogito-springboot-s2i.bats     | 16 -----------
 .../added/kogito-app-launch.sh                |  4 +--
 .../added/launch/kogito-springboot.sh         | 16 -----------
 modules/kogito-springboot/configure           |  1 -
 .../tests/bats/kogito-springboot.bats         | 16 -----------
 .../added/kogito-app-launch.sh                |  1 +
 .../added/launch/kogito-task-console.sh       |  6 ----
 .../tests/bats/kogito-task-console.bats       | 23 ---------------
 .../added/kogito-app-launch.sh                |  1 +
 .../added/launch/kogito-trusty-ui.sh          |  9 +-----
 .../tests/bats/kogito-trusty-ui.bats          | 21 --------------
 .../kogito-trusty/added/kogito-app-launch.sh  |  1 +
 .../added/launch/kogito-trusty.sh             |  6 ----
 .../tests/bats/kogito-trusty.bats             | 15 ----------
 scripts/run-bats.sh                           |  3 --
 .../kogito-data-index-common.feature          | 11 +-------
 .../kogito-data-index-infinispan.feature      |  7 -----
 .../kogito-data-index-mongodb.feature         |  7 -----
 tests/features/kogito-explainability.feature  | 12 ++------
 tests/features/kogito-jobs-service.feature    |  9 +-----
 .../kogito-management-console.feature         | 11 ++------
 .../features/kogito-quarkus-jvm-ubi8.feature  | 17 -----------
 tests/features/kogito-quarkus-ubi8.feature    | 17 -----------
 .../kogito-springboot-ubi8-s2i.feature        | 16 -----------
 tests/features/kogito-springboot-ubi8.feature | 18 ------------
 tests/features/kogito-task-console.feature    | 11 ++------
 tests/features/kogito-trusty-ui.feature       | 11 ++------
 tests/features/kogito-trusty.feature          | 12 ++------
 68 files changed, 39 insertions(+), 573 deletions(-)
 delete mode 100644 modules/kogito-data-index-common/added/launch/kogito-data-index.sh
 delete mode 100644 modules/kogito-data-index-common/tests/bats/kogito-data-index.bats
 delete mode 100644 modules/kogito-quarkus-jvm/added/launch/kogito-quarkus-jvm.sh
 delete mode 100644 modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats
 delete mode 100644 modules/kogito-quarkus-s2i/added/launch/kogito-quarkus-s2i.sh
 delete mode 100644 modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats
 delete mode 100644 modules/kogito-quarkus/added/launch/kogito-quarkus-native.sh
 delete mode 100644 modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats
 delete mode 100644 modules/kogito-springboot-s2i/added/launch/kogito-springboot-s2i.sh
 delete mode 100644 modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats
 delete mode 100644 modules/kogito-springboot/added/launch/kogito-springboot.sh
 delete mode 100644 modules/kogito-springboot/tests/bats/kogito-springboot.bats

diff --git a/kogito-data-index-infinispan-overrides.yaml b/kogito-data-index-infinispan-overrides.yaml
index e50a9252e45..1773d301747 100644
--- a/kogito-data-index-infinispan-overrides.yaml
+++ b/kogito-data-index-infinispan-overrides.yaml
@@ -17,9 +17,6 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "HTTP_PORT"
-    example: "9090"
-    description: "Defines which port the Data Index Container Image will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-data-index-mongodb-overrides.yaml b/kogito-data-index-mongodb-overrides.yaml
index c3f765fbb7c..bba983bf241 100644
--- a/kogito-data-index-mongodb-overrides.yaml
+++ b/kogito-data-index-mongodb-overrides.yaml
@@ -17,10 +17,6 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "HTTP_PORT"
-    example: "9090"
-    description: "Defines which port the Data Index Container Image will listen on."
-
 ports:
 - value: 8080
 
diff --git a/kogito-explainability-overrides.yaml b/kogito-explainability-overrides.yaml
index 236c91b6e06..caeff6be0c6 100644
--- a/kogito-explainability-overrides.yaml
+++ b/kogito-explainability-overrides.yaml
@@ -17,9 +17,6 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "HTTP_PORT"
-    example: "9090"
-    description: "Defines which port the Explainability Container Image will listen on."
   - name: "EXPLAINABILITY_COMMUNICATION"
     example: "REST"
     description: "Defines which kind of communication should be used by the Explainability Container: rest api or kafka events."
diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index a8b46875ffe..fbbfb0591a6 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -23,9 +23,6 @@ envs:
 - name: "ENABLE_EVENTS"
   example: "true"
   description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
-- name: "HTTP_PORT"
-  example: "9090"
-  description: "Defines which port the Job service Container Image will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index 93290dd8e2f..02e1cf3d0d9 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -20,9 +20,6 @@ envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
     example: "http://data-index.service:8080"
     description: "Data Index service address, defaults to http://localhost:8180."
-  - name: "HTTP_PORT"
-    example: "9090"
-    description: "Defines which port the Management Console Container Image will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-quarkus-jvm-ubi8-overrides.yaml b/kogito-quarkus-jvm-ubi8-overrides.yaml
index 0a2caad047a..1a522bf2848 100644
--- a/kogito-quarkus-jvm-ubi8-overrides.yaml
+++ b/kogito-quarkus-jvm-ubi8-overrides.yaml
@@ -20,9 +20,6 @@ envs:
 - name: JAVA_OPTIONS
   example: "-Dquarkus.log.level=DEBUG"
   description: JVM options passed to the Java command.
-- name: "HTTP_PORT"
-  example: "9090"
-  description: "Defines on which port the service will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-quarkus-ubi8-s2i-overrides.yaml b/kogito-quarkus-ubi8-s2i-overrides.yaml
index f9afec06bfc..7a421770c28 100644
--- a/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/kogito-quarkus-ubi8-s2i-overrides.yaml
@@ -27,9 +27,6 @@ envs:
 - name: ARTIFACT_DIR
   example: mymodule/target
   description:  Path to target/ where the jar files are created for multi-module builds
-- name: "HTTP_PORT"
-  example: "9090"
-  description: "Defines on which port the service will listen on."
 
 modules:
   install:
diff --git a/kogito-springboot-ubi8-overrides.yaml b/kogito-springboot-ubi8-overrides.yaml
index 4787bec3a44..0eec685bea8 100644
--- a/kogito-springboot-ubi8-overrides.yaml
+++ b/kogito-springboot-ubi8-overrides.yaml
@@ -23,9 +23,6 @@ envs:
 - name: BINARY_BUILD
   example: "true"
   description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
-- name: "HTTP_PORT"
-  example: "9090"
-  description: "Defines on which port the service will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-springboot-ubi8-s2i-overrides.yaml b/kogito-springboot-ubi8-s2i-overrides.yaml
index 243a80efc12..c399f1c3354 100644
--- a/kogito-springboot-ubi8-s2i-overrides.yaml
+++ b/kogito-springboot-ubi8-s2i-overrides.yaml
@@ -24,9 +24,6 @@ envs:
 - name: ARTIFACT_DIR
   example: mymodule/target
   description:  Path to target/ where the jar files are created for multi-module builds
-- name: "HTTP_PORT"
-  example: "9090"
-  description: "Defines on which port the service will listen on."
 
 modules:
   install:
diff --git a/kogito-task-console-overrides.yaml b/kogito-task-console-overrides.yaml
index 573ce162eec..a1878079899 100644
--- a/kogito-task-console-overrides.yaml
+++ b/kogito-task-console-overrides.yaml
@@ -20,9 +20,6 @@ envs:
   - name: "KOGITO_DATAINDEX_HTTP_URL"
     example: "http://data-index.service:8080"
     description: "Data Index service address, defaults to http://localhost:8180."
-  - name: "HTTP_PORT"
-    example: "8080"
-    description: "Defines which port the Task Console Container Image will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-trusty-overrides.yaml b/kogito-trusty-overrides.yaml
index aea55eae9c0..6a2206755a0 100644
--- a/kogito-trusty-overrides.yaml
+++ b/kogito-trusty-overrides.yaml
@@ -17,9 +17,6 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "HTTP_PORT"
-    example: "9090"
-    description: "Defines which port the Trusty Container Image will listen on."
 
 ports:
 - value: 8080
diff --git a/kogito-trusty-ui-overrides.yaml b/kogito-trusty-ui-overrides.yaml
index 15d5b6c857d..066fa3460c3 100644
--- a/kogito-trusty-ui-overrides.yaml
+++ b/kogito-trusty-ui-overrides.yaml
@@ -20,9 +20,6 @@ envs:
   - name: "KOGITO_TRUSTY_ENDPOINT"
     example: "http://trusty.service:8080"
     description: "Trusty service address, defaults to http://localhost:8180."
-  - name: "HTTP_PORT"
-    example: "9090"
-    description: "Defines which port the trusty ui Container Image will listen on."
 
 ports:
 - value: 8080
diff --git a/modules/kogito-data-index-common/added/launch/kogito-data-index.sh b/modules/kogito-data-index-common/added/launch/kogito-data-index.sh
deleted file mode 100644
index 19ff7071937..00000000000
--- a/modules/kogito-data-index-common/added/launch/kogito-data-index.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-#import
-source ${KOGITO_HOME}/launch/logging.sh
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset HTTP_PORT
-}
-
-function configure() {
-    configure_data_index_http_port
-}
-
-function configure_data_index_http_port() {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_DATA_INDEX_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dquarkus.http.port=${httpPort}"
-}
-
diff --git a/modules/kogito-data-index-common/configure b/modules/kogito-data-index-common/configure
index b36a15f05a4..191fc9fc209 100644
--- a/modules/kogito-data-index-common/configure
+++ b/modules/kogito-data-index-common/configure
@@ -5,10 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname $0)
 ADDED_DIR=${SCRIPT_DIR}/added
 
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
-
 mkdir -p ${KOGITO_HOME}/data/protobufs/
 
 chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
-
+chmod -R ug+rwX ${KOGITO_HOME}
\ No newline at end of file
diff --git a/modules/kogito-data-index-common/module.yaml b/modules/kogito-data-index-common/module.yaml
index 7c820efc38e..292dea185f6 100644
--- a/modules/kogito-data-index-common/module.yaml
+++ b/modules/kogito-data-index-common/module.yaml
@@ -4,5 +4,4 @@ version: "1.0.0-snapshot"
 description: "Common modules for data-index persistence provider images, any addition that is common must be added in this module"
 
 execute:
-  - script: configure
-
+  - script: configure
\ No newline at end of file
diff --git a/modules/kogito-data-index-common/tests/bats/kogito-data-index.bats b/modules/kogito-data-index-common/tests/bats/kogito-data-index.bats
deleted file mode 100644
index 7c79d747101..00000000000
--- a/modules/kogito-data-index-common/tests/bats/kogito-data-index.bats
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bats
-
-export KOGITO_HOME=/tmp/kogito
-export HOME=$KOGITO_HOME
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-data-index.sh
-
-teardown() {
-    rm -rf ${KOGITO_HOME}
-}
-
-@test "http port configuration default value" {
-    configure_data_index_http_port
-    expected=" -Dquarkus.http.port=8080"
-    echo "Result is ${KOGITO_DATA_INDEX_PROPS} and expected is ${expected}"
-    [ "${KOGITO_DATA_INDEX_PROPS}" = "${expected}" ]
-}
-
-@test "http port configuration custom value" {
-    export HTTP_PORT="9090"
-    configure_data_index_http_port
-    expected=" -Dquarkus.http.port=9090"
-    echo "Result is ${KOGITO_DATA_INDEX_PROPS} and expected is ${expected}"
-    [ "${KOGITO_DATA_INDEX_PROPS}" = "${expected}" ]
-}
diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
index d35ddcd9084..958283a99cc 100644
--- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
@@ -14,7 +14,6 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-data-index.sh
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
@@ -22,4 +21,5 @@ source ${KOGITO_HOME}/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
         -jar $KOGITO_HOME/bin/data-index-service-infinispan.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index bdcda1d352f..031160ab213 100644
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -22,4 +22,5 @@ source ${KOGITO_HOME}/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
         -jar $KOGITO_HOME/bin/data-index-service-mongodb.jar
\ No newline at end of file
diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
index ae7ec957322..1112987c872 100644
--- a/modules/kogito-explainability/added/kogito-app-launch.sh
+++ b/modules/kogito-explainability/added/kogito-app-launch.sh
@@ -23,4 +23,5 @@ source ${KOGITO_HOME}/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
         -jar $KOGITO_HOME/bin/$EXPLAINABILITY_SERVICE_JAR
\ No newline at end of file
diff --git a/modules/kogito-explainability/added/launch/kogito-explainability.sh b/modules/kogito-explainability/added/launch/kogito-explainability.sh
index 042ed3b8d9a..282c23dae45 100644
--- a/modules/kogito-explainability/added/launch/kogito-explainability.sh
+++ b/modules/kogito-explainability/added/launch/kogito-explainability.sh
@@ -6,19 +6,12 @@ source ${KOGITO_HOME}/launch/logging.sh
 function prepareEnv() {
     # keep it on alphabetical order
     unset EXPLAINABILITY_COMMUNICATION
-    unset HTTP_PORT
 }
 
 function configure() {
-    configure_explainability_http_port
     configure_explainability_jar
 }
 
-function configure_explainability_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_EXPLAINABILITY_PROPS="${KOGITO_EXPLAINABILITY_PROPS} -Dquarkus.http.port=${httpPort}"
-}
-
 function configure_explainability_jar {
     local allowed_communication_types=("REST" "MESSAGING")
     local communication="MESSAGING"
diff --git a/modules/kogito-explainability/tests/bats/kogito-explainability.bats b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
index 6afe3bab3be..ac70745b5e1 100644
--- a/modules/kogito-explainability/tests/bats/kogito-explainability.bats
+++ b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
@@ -13,21 +13,6 @@ teardown() {
 }
 
 
-@test "http port configuration default value" {
-    configure_explainability_http_port
-    expected=" -Dquarkus.http.port=8080"
-    echo "Result is ${KOGITO_EXPLAINABILITY_PROPS} and expected is ${expected}"
-    [ "${KOGITO_EXPLAINABILITY_PROPS}" = "${expected}" ]
-}
-
-@test "http port configuration custom value" {
-    export HTTP_PORT="9090"
-    configure_explainability_http_port
-    expected=" -Dquarkus.http.port=9090"
-    echo "Result is ${KOGITO_EXPLAINABILITY_PROPS} and expected is ${expected}"
-    [ "${KOGITO_EXPLAINABILITY_PROPS}" = "${expected}" ]
-}
-
 @test "test if the default explainability communication type is correctly set" {
     configure_explainability_jar
     expected="kogito-explainability-messaging-runner.jar"
diff --git a/modules/kogito-jobs-service/added/kogito-app-launch.sh b/modules/kogito-jobs-service/added/kogito-app-launch.sh
index 657df560895..cf937682de3 100644
--- a/modules/kogito-jobs-service/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service/added/kogito-app-launch.sh
@@ -20,4 +20,6 @@ source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} \
+    -Dquarkus.http.host=0.0.0.0 \
+    -Dquarkus.http.port=8080 \
     -jar $KOGITO_HOME/bin/kogito-jobs-service-runner.jar
diff --git a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
index 21c35d94c4e..cccf844d0e2 100644
--- a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
+++ b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
@@ -3,12 +3,10 @@
 function prepareEnv() {
     # keep it on alphabetical order
     unset ENABLE_PERSISTENCE
-    unset HTTP_PORT
 }
 
 function configure() {
     configure_jobs_service
-    configure_jobs_service_http_port
 }
 
 
@@ -21,8 +19,3 @@ function configure_jobs_service() {
         KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.profile=events-support"
     fi
 }
-
-function configure_jobs_service_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.http.port=${httpPort}"
-}
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index 72adf7e9299..dca53281bc2 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -35,25 +35,4 @@ teardown() {
     [ "${result}" = "${expected}" ]
 }
 
-@test "check if default http port is correctly set" {
-    configure_jobs_service_http_port
-
-    result="${KOGITO_JOBS_PROPS}"
-    expected=" -Dquarkus.http.port=8080"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
-
-@test "check if custom http port is correctly set" {
-    export HTTP_PORT="9090"
-
-    configure_jobs_service_http_port
-
-    result="${KOGITO_JOBS_PROPS}"
-    expected=" -Dquarkus.http.port=9090"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
 
diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
index b8132695221..505983fe4a0 100644
--- a/modules/kogito-management-console/added/kogito-app-launch.sh
+++ b/modules/kogito-management-console/added/kogito-app-launch.sh
@@ -21,4 +21,5 @@ source ${KOGITO_HOME}/launch/configure.sh
 
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} \
         -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
         -jar $KOGITO_HOME/bin/kogito-management-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-management-console/added/launch/kogito-management-console.sh b/modules/kogito-management-console/added/launch/kogito-management-console.sh
index 94cf5deb6b2..e0e0b6e3648 100644
--- a/modules/kogito-management-console/added/launch/kogito-management-console.sh
+++ b/modules/kogito-management-console/added/launch/kogito-management-console.sh
@@ -5,13 +5,11 @@ source ${KOGITO_HOME}/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
-    unset HTTP_PORT
     unset KOGITO_DATAINDEX_HTTP_URL
 }
 
 function configure() {
     configure_data_index_url
-    configure_mgmt_console_http_port
 }
 
 # Exit codes:
@@ -30,8 +28,3 @@ function configure_data_index_url {
     fi
     KOGITO_MANAGEMENT_CONSOLE_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
 }
-
-function configure_mgmt_console_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_MANAGEMENT_CONSOLE_PROPS="${KOGITO_MANAGEMENT_CONSOLE_PROPS} -Dquarkus.http.port=${httpPort}"
-}
diff --git a/modules/kogito-management-console/tests/bats/kogito-management-console.bats b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
index aa607597a1a..f0c063ce7e3 100644
--- a/modules/kogito-management-console/tests/bats/kogito-management-console.bats
+++ b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
@@ -33,26 +33,3 @@ teardown() {
     [ "${status}" == "10" ]
 }
 
-@test "check if default http port is correctly set" {
-
-  configure_mgmt_console_http_port
-
-  result="${KOGITO_MANAGEMENT_CONSOLE_PROPS}"
-  expected=" -Dquarkus.http.port=8080"
-
-  echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
-
-@test "check if custom http port is correctly set" {
-  export HTTP_PORT="9090"
-
-  configure_mgmt_console_http_port
-
-  result="${KOGITO_MANAGEMENT_CONSOLE_PROPS}"
-  expected=" -Dquarkus.http.port=9090"
-
-  echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
-
diff --git a/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh b/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
index 24f9b6ebc96..57abe77d0d9 100644
--- a/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
@@ -15,9 +15,12 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-quarkus-jvm.sh
+
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_JVM_PROPS} -Dquarkus.http.host=0.0.0.0 -jar $KOGITO_HOME/bin/*runner.jar
+exec java ${JAVA_OPTIONS}  ${KOGITO_QUARKUS_JVM_PROPS} \
+      -Dquarkus.http.host=0.0.0.0 \
+      -Dquarkus.http.port=8080 \
+      -jar $KOGITO_HOME/bin/*runner.jar
diff --git a/modules/kogito-quarkus-jvm/added/launch/kogito-quarkus-jvm.sh b/modules/kogito-quarkus-jvm/added/launch/kogito-quarkus-jvm.sh
deleted file mode 100644
index b816451457e..00000000000
--- a/modules/kogito-quarkus-jvm/added/launch/kogito-quarkus-jvm.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset HTTP_PORT
-}
-
-function configure() {
-    configure_quarkus_jvm_http_port
-}
-
-function configure_quarkus_jvm_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_QUARKUS_JVM_PROPS="${KOGITO_QUARKUS_JVM_PROPS} -Dquarkus.http.port=${httpPort}"
-}
\ No newline at end of file
diff --git a/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats b/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats
deleted file mode 100644
index 3a63c8533ae..00000000000
--- a/modules/kogito-quarkus-jvm/tests/bats/kogito-quarkus-jvm.bats
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bats
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-quarkus-jvm.sh
-
-@test "check if custom http port is correctly set" {
-    export HTTP_PORT="9090"
-
-    configure_quarkus_jvm_http_port
-
-    result="${KOGITO_QUARKUS_JVM_PROPS}"
-    expected=" -Dquarkus.http.port=9090"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
index 44cf41d2166..938f6a42afb 100644
--- a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
@@ -14,7 +14,7 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-quarkus-s2i.sh
+
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
@@ -22,7 +22,8 @@ source ${KOGITO_HOME}/launch/configure.sh
 if [ "${NATIVE^^}" == "TRUE" ]; then
     exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
          -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/ssl-libs \
-        -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
+         -Dquarkus.http.port=8080 \
+         -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
 else
-    exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -jar $KOGITO_HOME/bin/*runner.jar
+    exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
 fi
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/added/launch/kogito-quarkus-s2i.sh b/modules/kogito-quarkus-s2i/added/launch/kogito-quarkus-s2i.sh
deleted file mode 100644
index 6293eaf1902..00000000000
--- a/modules/kogito-quarkus-s2i/added/launch/kogito-quarkus-s2i.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset HTTP_PORT
-}
-
-function configure() {
-    configure_quarkus_s2i_http_port
-}
-
-function configure_quarkus_s2i_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_QUARKUS_S2I_PROPS="${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.port=${httpPort}"
-}
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/configure b/modules/kogito-quarkus-s2i/configure
index 7b20b2a80ee..6879dba19ed 100644
--- a/modules/kogito-quarkus-s2i/configure
+++ b/modules/kogito-quarkus-s2i/configure
@@ -9,7 +9,6 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
 chmod +x ${KOGITO_HOME}/kogito-app-launch.sh
 
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
diff --git a/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats b/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats
deleted file mode 100644
index 99d99c36649..00000000000
--- a/modules/kogito-quarkus-s2i/tests/bats/kogito-quarkus-s2i.bats
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bats
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-quarkus-s2i.sh
-
-@test "check if custom http port is correctly set" {
-    export HTTP_PORT="9090"
-
-    configure_quarkus_s2i_http_port
-
-    result="${KOGITO_QUARKUS_S2I_PROPS}"
-    expected=" -Dquarkus.http.port=9090"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
\ No newline at end of file
diff --git a/modules/kogito-quarkus/added/kogito-app-launch.sh b/modules/kogito-quarkus/added/kogito-app-launch.sh
index 501fcf88665..23fce3e9752 100644
--- a/modules/kogito-quarkus/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus/added/kogito-app-launch.sh
@@ -15,11 +15,12 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-quarkus-native.sh
+
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
 exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_NATIVE_PROPS} \
     -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/ssl-libs \
+    -Dquarkus.http.port=8080 \
     -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
diff --git a/modules/kogito-quarkus/added/launch/kogito-quarkus-native.sh b/modules/kogito-quarkus/added/launch/kogito-quarkus-native.sh
deleted file mode 100644
index 4a3c83e1033..00000000000
--- a/modules/kogito-quarkus/added/launch/kogito-quarkus-native.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset HTTP_PORT
-}
-
-function configure() {
-    configure_quarkus_native_http_port
-}
-
-function configure_quarkus_native_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_QUARKUS_NATIVE_PROPS="${KOGITO_QUARKUS_NATIVE_PROPS} -Dquarkus.http.port=${httpPort}"
-}
\ No newline at end of file
diff --git a/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats b/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats
deleted file mode 100644
index 44cf9faf4e3..00000000000
--- a/modules/kogito-quarkus/tests/bats/kogito-quarkus-native.bats
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bats
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-quarkus-native.sh
-
-@test "check if custom http port is correctly set" {
-    export HTTP_PORT="9090"
-
-    configure_quarkus_native_http_port
-
-    result="${KOGITO_QUARKUS_NATIVE_PROPS}"
-    expected=" -Dquarkus.http.port=9090"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
\ No newline at end of file
diff --git a/modules/kogito-springboot-s2i/added/kogito-app-launch.sh b/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
index 51b9920120e..70dd8c4e448 100644
--- a/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
+++ b/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
@@ -15,10 +15,10 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-springboot-s2i.sh
+
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -jar $KOGITO_HOME/bin/*.jar
+exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
 
diff --git a/modules/kogito-springboot-s2i/added/launch/kogito-springboot-s2i.sh b/modules/kogito-springboot-s2i/added/launch/kogito-springboot-s2i.sh
deleted file mode 100644
index e71140a3bd5..00000000000
--- a/modules/kogito-springboot-s2i/added/launch/kogito-springboot-s2i.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset HTTP_PORT
-}
-
-function configure() {
-    configure_springboot_s2i_http_port
-}
-
-function configure_springboot_s2i_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_SPRINGBOOT_S2I_PROPS="${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.port=${httpPort}"
-}
\ No newline at end of file
diff --git a/modules/kogito-springboot-s2i/configure b/modules/kogito-springboot-s2i/configure
index fb8b032aa89..744d336a65f 100644
--- a/modules/kogito-springboot-s2i/configure
+++ b/modules/kogito-springboot-s2i/configure
@@ -8,7 +8,6 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
 chmod +x ${KOGITO_HOME}/kogito-app-launch.sh
 
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
diff --git a/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats b/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats
deleted file mode 100644
index 7279c024bb4..00000000000
--- a/modules/kogito-springboot-s2i/tests/bats/kogito-springboot-s2i.bats
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bats
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-springboot-s2i.sh
-
-@test "check if custom http port is correctly set" {
-    export HTTP_PORT="9090"
-
-    configure_springboot_s2i_http_port
-
-    result="${KOGITO_SPRINGBOOT_S2I_PROPS}"
-    expected=" -Dserver.port=9090"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
\ No newline at end of file
diff --git a/modules/kogito-springboot/added/kogito-app-launch.sh b/modules/kogito-springboot/added/kogito-app-launch.sh
index 2ca3ecd9dd1..edb3174e781 100644
--- a/modules/kogito-springboot/added/kogito-app-launch.sh
+++ b/modules/kogito-springboot/added/kogito-app-launch.sh
@@ -15,9 +15,9 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-springboot.sh
+
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
 
-exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -jar $KOGITO_HOME/bin/*.jar
+exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
diff --git a/modules/kogito-springboot/added/launch/kogito-springboot.sh b/modules/kogito-springboot/added/launch/kogito-springboot.sh
deleted file mode 100644
index 95b6e3d7baf..00000000000
--- a/modules/kogito-springboot/added/launch/kogito-springboot.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset HTTP_PORT
-}
-
-function configure() {
-    configure_springboot_http_port
-}
-
-function configure_springboot_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_SPRINGBOOT_PROPS="${KOGITO_SPRINGBOOT_PROPS} -Dserver.port=${httpPort}"
-}
\ No newline at end of file
diff --git a/modules/kogito-springboot/configure b/modules/kogito-springboot/configure
index 8bfcae1526c..ac80ff52500 100644
--- a/modules/kogito-springboot/configure
+++ b/modules/kogito-springboot/configure
@@ -8,7 +8,6 @@ ADDED_DIR=${SCRIPT_DIR}/added
 cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
 chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
 
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
 cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
diff --git a/modules/kogito-springboot/tests/bats/kogito-springboot.bats b/modules/kogito-springboot/tests/bats/kogito-springboot.bats
deleted file mode 100644
index 84caf6cc8ba..00000000000
--- a/modules/kogito-springboot/tests/bats/kogito-springboot.bats
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bats
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-springboot.sh
-
-@test "check if custom http port is correctly set" {
-    export HTTP_PORT="9090"
-
-    configure_springboot_http_port
-
-    result="${KOGITO_SPRINGBOOT_PROPS}"
-    expected=" -Dserver.port=9090"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
\ No newline at end of file
diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh
index d49a0d10d0d..9c6bd991609 100644
--- a/modules/kogito-task-console/added/kogito-app-launch.sh
+++ b/modules/kogito-task-console/added/kogito-app-launch.sh
@@ -21,4 +21,5 @@ source ${KOGITO_HOME}/launch/configure.sh
 
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} \
         -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
         -jar $KOGITO_HOME/bin/kogito-task-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-task-console/added/launch/kogito-task-console.sh b/modules/kogito-task-console/added/launch/kogito-task-console.sh
index 6bcc9b9d0c3..9e18b5d4bbf 100644
--- a/modules/kogito-task-console/added/launch/kogito-task-console.sh
+++ b/modules/kogito-task-console/added/launch/kogito-task-console.sh
@@ -5,13 +5,11 @@ source ${KOGITO_HOME}/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
-    unset HTTP_PORT
     unset KOGITO_DATAINDEX_HTTP_URL
 }
 
 function configure() {
     configure_data_index_url
-    configure_task_console_http_port
 }
 
 # Exit codes:
@@ -31,7 +29,3 @@ function configure_data_index_url {
     KOGITO_TASK_CONSOLE_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
 }
 
-function configure_task_console_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_TASK_CONSOLE_PROPS="${KOGITO_TASK_CONSOLE_PROPS} -Dquarkus.http.port=${httpPort}"
-}
diff --git a/modules/kogito-task-console/tests/bats/kogito-task-console.bats b/modules/kogito-task-console/tests/bats/kogito-task-console.bats
index c484504a09c..c17425f8288 100644
--- a/modules/kogito-task-console/tests/bats/kogito-task-console.bats
+++ b/modules/kogito-task-console/tests/bats/kogito-task-console.bats
@@ -33,26 +33,3 @@ teardown() {
     [ "${status}" == "10" ]
 }
 
-@test "check if default http port is correctly set" {
-
-    configure_task_console_http_port
-
-    result="${KOGITO_TASK_CONSOLE_PROPS}"
-    expected=" -Dquarkus.http.port=8080"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
-
-@test "check if custom http port is correctly set" {
-    export HTTP_PORT="9090"
-
-    configure_task_console_http_port
-
-    result="${KOGITO_TASK_CONSOLE_PROPS}"
-    expected=" -Dquarkus.http.port=9090"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
-
diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
index b2114a5b5dd..098e05a17ac 100644
--- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
@@ -22,4 +22,5 @@ source ${KOGITO_HOME}/launch/configure.sh
 
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} \
         -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
         -jar $KOGITO_HOME/bin/kogito-trusty-ui-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
index 3c8829a886f..8ddfa34c6d6 100644
--- a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
+++ b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
@@ -5,13 +5,11 @@ source ${KOGITO_HOME}/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
-    unset HTTP_PORT
     unset KOGITO_TRUSTY_ENDPOINT
 }
 
 function configure() {
     configure_trusty_url
-    configure_trusty_ui_http_port
 }
 
 # Exit codes:
@@ -29,9 +27,4 @@ function configure_trusty_url {
         trustyURL="http://localhost:8180"
     fi
     KOGITO_TRUSTY_UI_PROPS="${KOGITO_TRUSTY_PROPS} -Dkogito.trusty.http.url=${trustyURL}"
-}
-
-function configure_trusty_ui_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_TRUSTY_UI_PROPS="${KOGITO_TRUSTY_UI_PROPS} -Dquarkus.http.port=${httpPort}"
-}
+}
\ No newline at end of file
diff --git a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
index 37e03beb8ee..6ade5906d8f 100644
--- a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
+++ b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
@@ -33,25 +33,4 @@ teardown() {
     [ "${status}" == "10" ]
 }
 
-@test "check if default http port is correctly set" {
-    configure_trusty_ui_http_port
-
-    result="${KOGITO_TRUSTY_UI_PROPS}"
-    expected=" -Dquarkus.http.port=8080"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
-
-@test "check if custom http port is correctly set" {
-    export HTTP_PORT="9090"
-
-    configure_trusty_ui_http_port
-
-    result="${KOGITO_TRUSTY_UI_PROPS}"
-    expected=" -Dquarkus.http.port=9090"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
 
diff --git a/modules/kogito-trusty/added/kogito-app-launch.sh b/modules/kogito-trusty/added/kogito-app-launch.sh
index f57dca2bb69..a7143a68bc9 100644
--- a/modules/kogito-trusty/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty/added/kogito-app-launch.sh
@@ -22,4 +22,5 @@ source ${KOGITO_HOME}/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} \
         -Djava.library.path=$KOGITO_HOME/lib \
         -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
         -jar $KOGITO_HOME/bin/kogito-trusty-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty/added/launch/kogito-trusty.sh b/modules/kogito-trusty/added/launch/kogito-trusty.sh
index 264b0ec12f3..927f68a67a0 100644
--- a/modules/kogito-trusty/added/launch/kogito-trusty.sh
+++ b/modules/kogito-trusty/added/launch/kogito-trusty.sh
@@ -6,18 +6,12 @@ source ${KOGITO_HOME}/launch/logging.sh
 function prepareEnv() {
     # keep it on alphabetical order
     unset EXPLAINABILITY_ENABLED
-    unset HTTP_PORT
 }
 
 function configure() {
-    configure_trusty_http_port
     enable_explainability
 }
 
-function configure_trusty_http_port {
-    local httpPort=${HTTP_PORT:-8080}
-    KOGITO_TRUSTY_PROPS="${KOGITO_TRUSTY_PROPS} -Dquarkus.http.port=${httpPort}"
-}
 
 function enable_explainability {
     local allowed_values=("TRUE" "FALSE")
diff --git a/modules/kogito-trusty/tests/bats/kogito-trusty.bats b/modules/kogito-trusty/tests/bats/kogito-trusty.bats
index 271e543e78f..634da351e64 100644
--- a/modules/kogito-trusty/tests/bats/kogito-trusty.bats
+++ b/modules/kogito-trusty/tests/bats/kogito-trusty.bats
@@ -12,21 +12,6 @@ teardown() {
     rm -rf ${KOGITO_HOME}
 }
 
-@test "http port configuration default value" {
-    configure_trusty_http_port
-    expected=" -Dquarkus.http.port=8080"
-    echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}"
-    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
-}
-
-@test "http port configuration custom value" {
-    export HTTP_PORT="9090"
-    configure_trusty_http_port
-    expected=" -Dquarkus.http.port=9090"
-    echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}"
-    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
-}
-
 
 @test "explainability is enabled by default" {
     enable_explainability
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 4d375901a7a..5c3866e30a8 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -10,9 +10,6 @@ else
     rm -rf bats-core
 fi 
 
-echo "----> running bats on kogito-data-index-common"
-./bats/bin/bats modules/kogito-data-index-common/tests/bats
-
 echo  "----> running bats on kogito-trusty"
 ./bats/bin/bats modules/kogito-trusty/tests/bats
 
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index cfa96475b2e..2c9079c1a1f 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -1,16 +1,7 @@
 @quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb
 Feature: Kogito-data-index common feature.
-
   Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable               | value   |
       | SCRIPT_DEBUG           | true    |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0
-
-  Scenario: Verify if the debug is correctly enabled and test custom http port
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar
-
+    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index 13267c0f019..d60e8afbd71 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -15,13 +15,6 @@ Feature: Kogito-data-index infinispan feature.
     When container is started with command bash
     Then run sh -c 'ls /home/kogito/bin/data-index-service-infinispan.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-infinispan.jar
 
-  Scenario: Verify if the debug is correctly enabled and test custom http port using default infinispan indexing service
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-infinispan.jar
-
   Scenario: verify if all parameters are correctly set
     When container is started with env
       | variable                                  | value             |
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
index 0828668f1d7..4def584ef1c 100644
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -15,13 +15,6 @@ Feature: Kogito-data-index mongodb feature.
     When container is started with command bash
     Then run sh -c 'ls /home/kogito/bin/data-index-service-mongodb.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-mongodb.jar
 
-  Scenario: Verify if the debug is correctly enabled and test custom http port
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/data-index-service-mongodb.jar
-
   Scenario: verify if all parameters are correctly set
     When container is started with env
       | variable                                   | value                       |
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index 26002c814da..0809b3a34da 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -25,22 +25,14 @@ Feature: Kogito-explainability feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-messaging-runner.jar
-
-  Scenario: Verify if the debug is correctly enabled and test custom http port
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-messaging-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-explainability-messaging-runner.jar
 
   Scenario: Verify if the explainability rest binary is selected by the enviroment variable EXPLAINABILITY_COMMUNICATION
     When container is started with env
       | variable      | value |
       | EXPLAINABILITY_COMMUNICATION  | rest |
       | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-explainability-rest-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-explainability-rest-runner.jar
 
   Scenario: Verify if the communication is correctly set to its default value if a wrong communication type is set
     When container is started with env
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index d550496e2f6..3245685009c 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -19,17 +19,10 @@ Feature: Kogito-jobs-service feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-jobs-service-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-jobs-service-runner.jar
     And container log should contain started in
     And container log should not contain Application failed to start
 
-  Scenario: Verify if the debug is correctly enabled and test custom http port
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -jar /home/kogito/bin/kogito-jobs-service-runner.jar
-
   Scenario: verify if the events is correctly enabled
     When container is started with env
       | variable                | value                                     |
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index da31c2ff9f9..e197bef0631 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -19,24 +19,17 @@ Feature: kogito-management-console feature
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-management-console-runner.jar
     And container log should contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
 
-  Scenario: Verify if the debug is correctly enabled and test custom http port
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.port=9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
-
   Scenario: Verify if the debug is correctly enabled and set data-index url
     When container is started with env
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-management-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-management-console-runner.jar
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/kogito-quarkus-jvm-ubi8.feature b/tests/features/kogito-quarkus-jvm-ubi8.feature
index 600e1b1fa24..0760ed483fb 100644
--- a/tests/features/kogito-quarkus-jvm-ubi8.feature
+++ b/tests/features/kogito-quarkus-jvm-ubi8.feature
@@ -34,23 +34,6 @@ Feature: Kogito-quarkus-ubi8 feature.
       | expected_phrase | ["hello","world"]        |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the custom port
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
-      | variable            | value                     |
-      | NATIVE              | false                     |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-      | HTTP_PORT           | 9090                      |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 9090                     |
-      | path            | /hello                   |
-      | request_method  | POST                     |
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
-
   Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
       | variable            | value                     |
diff --git a/tests/features/kogito-quarkus-ubi8.feature b/tests/features/kogito-quarkus-ubi8.feature
index 03656f9e44b..4131b7a1612 100644
--- a/tests/features/kogito-quarkus-ubi8.feature
+++ b/tests/features/kogito-quarkus-ubi8.feature
@@ -31,21 +31,4 @@ Feature: Kogito-quarkus-ubi8 feature.
       | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
       | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the custom port
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld-native/ from target
-      | variable            | value                     |
-      | NATIVE              | false                     |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-      | HTTP_PORT           | 9090                      |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 9090                     |
-      | path            | /hello                   |
-      | request_method  | POST                     |
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
\ No newline at end of file
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 3d6199f7645..598cef0d23e 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -51,22 +51,6 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain Tomcat initialized with port(s): 8080 (http)
 
-  Scenario: Verify if the s2i build is finished as expected and if it is listening on the custom port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable            | value |
-      | HTTP_PORT           | 9090  |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 9090                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain Tomcat initialized with port(s): 9090 (http)
-
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
diff --git a/tests/features/kogito-springboot-ubi8.feature b/tests/features/kogito-springboot-ubi8.feature
index 650c0818c4f..ca0b3250dfe 100644
--- a/tests/features/kogito-springboot-ubi8.feature
+++ b/tests/features/kogito-springboot-ubi8.feature
@@ -35,24 +35,6 @@ Feature: springboot-quarkus-ubi8 feature.
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the custom port
-    Given s2i build /tmp/kogito-examples/process-springboot-example from target
-      | variable            | value        |
-      | JAVA_OPTIONS        | -Ddebug=true |
-      | HTTP_PORT           | 9090         |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 9090                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
   Scenario: Verify if the (forcing) binary build is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples/process-springboot-example from target
       | variable            | value        |
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index 09fcd29a50f..5e4948c2fa8 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -19,24 +19,17 @@ Feature: kogito-task-console feature
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-task-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-task-console-runner.jar
     And container log should contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
 
-  Scenario: Verify if the debug is correctly enabled and test custom http port
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.port=9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-task-console-runner.jar
-
   Scenario: Verify if the debug is correctly enabled and set data-index url
     When container is started with env
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-task-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-task-console-runner.jar
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/kogito-trusty-ui.feature b/tests/features/kogito-trusty-ui.feature
index 8f68feb0776..c4024da0e9c 100644
--- a/tests/features/kogito-trusty-ui.feature
+++ b/tests/features/kogito-trusty-ui.feature
@@ -19,24 +19,17 @@ Feature: kogito-trusty-ui feature
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
     And container log should contain Trusty url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
 
-  Scenario: Verify if the debug is correctly enabled and test custom http port
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.port=9090 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
-
   Scenario: Verify if the debug is correctly enabled and set trusty url
     When container is started with env
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_TRUSTY_ENDPOINT | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.port=8080 -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
     And container log should not contain Trusty url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/kogito-trusty.feature b/tests/features/kogito-trusty.feature
index 2ce90bc3e9e..7221d081000 100644
--- a/tests/features/kogito-trusty.feature
+++ b/tests/features/kogito-trusty.feature
@@ -19,22 +19,14 @@ Feature: Kogito-trusty feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=8080 -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
-
-  Scenario: Verify if the debug is correctly enabled and test custom http port
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-trusty-runner.jar
 
   Scenario: Verify if the explainability messaging is disabled
     When container is started with env
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
-      | HTTP_PORT     | 9090  |
       | EXPLAINABILITY_ENABLED     | false  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.port=9090 -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -jar /home/kogito/bin/kogito-trusty-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-trusty-runner.jar
 
   Scenario: verify if auth is correctly set
     When container is started with env

From 8743be9de6d1369d4cab06b445d8a5be05c69ada Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Fri, 30 Oct 2020 19:59:57 +0530
Subject: [PATCH 204/709] [KOGITO-3746] - Fix failing test on kogito images
 master (#272)

* [KOGITO-3746] - Fix failing test on kogito images master
See: https://issues.redhat.com/browse/KOGITO-3746
Signed-off-by: Tarun Khandelwal <tarkhand@redhat.com>

* change hash codes
---
 tests/features/kogito-quarkus-ubi8-s2i.feature    | 4 ++--
 tests/features/kogito-springboot-ubi8-s2i.feature | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 94c1a965759..3861eaea4aa 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -114,8 +114,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
-    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
-    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
+    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for 29ff4ac73aaeace2e0b35bbfd10b8df9
+    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for cad0e594b6c80f0e284ec271f122b47b
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/persons.proto with the name: /home/kogito/data/protobufs/persons-md5.txt
     And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index 598cef0d23e..e8b6acacbe8 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -59,8 +59,8 @@ Feature: kogito-springboot-ubi8-s2i image tests
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
     And s2i build log should contain ---> [persistence] generating md5 for persistence files
-    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
-    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
+    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for 29ff4ac73aaeace2e0b35bbfd10b8df9
+    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for cad0e594b6c80f0e284ec271f122b47b
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest

From 7077406b7eb74cbe1433b5a7201f6e6f2122d36c Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 3 Nov 2020 16:08:47 +0100
Subject: [PATCH 205/709] [KOGITO-3745] RepoURL should be ignored by mirror
 (#271)

* KOGITO-3745 RepoURL should be ignored by mirror
---
 Jenkinsfile.deploy                                  | 12 +++++-------
 modules/kogito-maven/3.6.x/added/configure-maven.sh |  3 +++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 46dc1837a91..6e3adf95125 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -69,9 +69,7 @@ pipeline {
                     }
 
                     // Set the mirror url only if no artifact repository is given
-                    if (getMavenArtifactRepository() == '' 
-                            && env.MAVEN_MIRROR_REPOSITORY != null
-                            && env.MAVEN_MIRROR_REPOSITORY != ''){
+                    if (env.MAVEN_MIRROR_REPOSITORY){
                         echo 'Set Maven mirror url'
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
                     }
@@ -178,21 +176,21 @@ pipeline {
             steps {
                 script {
                     updateTestsCommand = 'python3 scripts/update-tests.py'
-                    if(getMavenArtifactRepository() != ''){
+                    if(getMavenArtifactRepository()){
                         // Update repo in tests
                         updateTestsCommand += " --repo-url ${getMavenArtifactRepository()}"
                     }
 
                     // Set kogito-examples to bot author/branch if release
-                    if(params.EXAMPLES_REF != ''){
+                    if(params.EXAMPLES_REF){
                         updateTestsCommand += " --examples-ref ${params.EXAMPLES_REF}"
                     }
                     if(params.EXAMPLES_URI){
                         updateTestsCommand += " --examples-uri ${params.EXAMPLES_URI}"
                     }
 
-                    //Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                    if(env.MAVEN_MIRROR_URL != ''){
+                    //Ignore self-signed certificates if MAVEN_MIRROR_URL and/or artifact repo is defined
+                    if(env.MAVEN_MIRROR_URL || getMavenArtifactRepository()){
                         updateTestsCommand += ' --ignore-self-signed-cert'
                     }
                     // Launch update tests
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index 196426c23ef..800e054c2aa 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -186,6 +186,9 @@ function _add_maven_repo() {
                 <!-- ### configured plugin repositories ### -->"
 
     sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" $HOME/.m2/settings.xml
+
+    # new repo should be skipped by mirror if exists
+    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" $HOME/.m2/settings.xml
 }
 
 # Finds the environment variable  and returns its value if found.

From 378467a838719a391cdac1914a411e0319a6a052 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kmok@redhat.com>
Date: Tue, 3 Nov 2020 11:10:42 -0500
Subject: [PATCH 206/709] [KOGITO-3376] Remove post-hook persistence script
 (#270)

Protobuf ConfigMap now updated using fetched files.
---
 .../added/kogito-persistence.sh               |  69 -----------
 .../added/post-hook-persistence.sh            |   8 --
 modules/kogito-persistence/configure          |   3 +-
 .../bats/expected/patch_cm_travel_agency.json |   1 -
 .../tests/bats/expected/patch_empty_data.json |   1 -
 .../tests/bats/kogito-persistence.bats        | 100 ---------------
 .../tests/bats/mocks/config_map.json          |  33 -----
 .../mocks/config_map_empty_annotations.json   |  26 ----
 .../bats/mocks/config_map_file1_only.json     |  31 -----
 .../bats/mocks/config_map_no_annotations.json |  30 -----
 .../tests/bats/mocks/travels.proto            | 115 ------------------
 .../tests/bats/mocks/visaApplications.proto   |  39 ------
 .../tests/bats/post-hook-persistence.bats     |  26 ----
 .../features/kogito-quarkus-ubi8-s2i.feature  |  12 +-
 .../kogito-springboot-ubi8-s2i.feature        |   3 -
 15 files changed, 2 insertions(+), 495 deletions(-)
 delete mode 100755 modules/kogito-persistence/added/post-hook-persistence.sh
 delete mode 100644 modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json
 delete mode 100644 modules/kogito-persistence/tests/bats/expected/patch_empty_data.json
 delete mode 100644 modules/kogito-persistence/tests/bats/mocks/config_map.json
 delete mode 100644 modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json
 delete mode 100644 modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json
 delete mode 100644 modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json
 delete mode 100644 modules/kogito-persistence/tests/bats/mocks/travels.proto
 delete mode 100644 modules/kogito-persistence/tests/bats/mocks/visaApplications.proto
 delete mode 100644 modules/kogito-persistence/tests/bats/post-hook-persistence.bats

diff --git a/modules/kogito-persistence/added/kogito-persistence.sh b/modules/kogito-persistence/added/kogito-persistence.sh
index 5503d49d70a..4e48d9f0a4f 100644
--- a/modules/kogito-persistence/added/kogito-persistence.sh
+++ b/modules/kogito-persistence/added/kogito-persistence.sh
@@ -32,76 +32,7 @@ function move_persistence_files() {
     if ls $KOGITO_HOME/bin/*.proto &>/dev/null; then
         # copy to the final dir, so we keep bin clean
         cp -v $KOGITO_HOME/bin/*.proto $KOGITO_HOME/data/protobufs/
-        generate_md5_persistence_files
     else
         log_info "---> [persistence] Skip copying files, $KOGITO_HOME/bin directory does not have proto files!"
     fi
 }
-
-# generate_md5_persistence_files generates md5 files for each *.proto file found in $KOGITO_HOME/data/protobufs/
-function generate_md5_persistence_files() {
-    if ls $KOGITO_HOME/data/protobufs/*.proto &>/dev/null; then
-        log_info "---> [persistence] generating md5 for persistence files"
-        for entry in "$KOGITO_HOME/data/protobufs"/*.proto; do
-            md5sum ${entry} | awk '{ print $1 }' >${entry%.*}-md5.txt
-            log_info "----> [persistence] Generated checksum for ${entry} with the name: ${entry%.*}-md5.txt"
-        done
-    fi
-}
-
-# Updates the configMap for this Kogito Runtime instance 
-# with the generated proto files mounted in the file system.
-# Can be called multiple times or outside of a k8s cluster.
-# If outside the cluster, just skips the update
-function update_configmap() {
-    if ! is_running_on_kubernetes; then
-        log_info "---> [persistence] Not running on kubernetes cluster, skipping config map update"
-        return 0
-    fi
-
-    local config_map=$(cat $KOGITO_HOME/podinfo/protobufcm)
-    local file_contents=""
-    local file_name=""
-    local md5=""
-    local annotation=""
-    local data=""
-    local metadata=""
-    local body=""
-
-    if ls $KOGITO_HOME/data/protobufs/*.proto &>/dev/null; then
-        for entry in "$KOGITO_HOME/data/protobufs"/*.proto; do
-            # sanitize input
-            file_contents=$(jq -aRs . <<<$(cat $entry))
-            file_name=$(basename $entry)
-            md5=$(cat ${entry%.*}-md5.txt)
-            annotation="org.kie.kogito.protobuf.hash/${file_name%.*}"
-            metadata="${metadata} \"${annotation}\": \"${md5}\","
-            # doesn't need quotes since jq already added
-            data="${data} \"${file_name}\": ${file_contents},"
-        done
-    fi
-
-    if [ "${metadata}" != "" ]; then
-        metadata="${metadata%,}" # cut last comma
-    fi
-
-    if [ "${data}" != "" ]; then
-        data="${data%,}"
-    fi
-
-    body="[ { \"op\": \"replace\", \"path\": \"/metadata/annotations\", \"value\": { ${metadata} } }, { \"op\": \"replace\", \"path\": \"/data\", \"value\": { ${data} } } ]"
-    log_info "---> [persistence] About to patch configMap ${config_map}"
-    # prints the raw data
-    echo "Body: ${body}"
-    printf "%s" "${body}" >$KOGITO_HOME/data/protobufs/configmap_patched.json
-    response=$(patch_json_k8s_resource "api" "configmaps/${config_map}" $KOGITO_HOME/data/protobufs/configmap_patched.json)
-    if [ "${response: -3}" != "200" ]; then
-        log_warning "---> [persistence] Fail to patch configMap ${config_map}, the Service Account might not have the necessary privileges"
-        if [ ! -z "${response}" ]; then
-            log_warning "---> [persistence] Response message: ${response::-3} - HTTP Status code: ${response: -3}"
-        fi
-        return 1
-    fi
-
-    return 0
-}
diff --git a/modules/kogito-persistence/added/post-hook-persistence.sh b/modules/kogito-persistence/added/post-hook-persistence.sh
deleted file mode 100755
index 0e56d99cab7..00000000000
--- a/modules/kogito-persistence/added/post-hook-persistence.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Post Hook script that should be called by Kogito Service Kubernetes Pod upon initialization
-# Updates the Kogito Service protobuf configMap with the persistence files located at ${KOGITO_HOME}/data/protobufs
-
-source $KOGITO_HOME/launch/kogito-persistence.sh
-
-update_configmap
\ No newline at end of file
diff --git a/modules/kogito-persistence/configure b/modules/kogito-persistence/configure
index 88df0dc3785..b90cd469bb9 100644
--- a/modules/kogito-persistence/configure
+++ b/modules/kogito-persistence/configure
@@ -6,7 +6,6 @@ SCRIPT_DIR=$(dirname $0)
 mkdir -p ${KOGITO_HOME}/launch/
 cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
 chmod +x-w ${KOGITO_HOME}/launch/kogito-persistence.sh
-chmod +x-w ${KOGITO_HOME}/launch/post-hook-persistence.sh
 
 mkdir -p ${KOGITO_HOME}/data/protobufs
-chmod +w ${KOGITO_HOME}/data/protobufs
\ No newline at end of file
+chmod +w ${KOGITO_HOME}/data/protobufs
diff --git a/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json b/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json
deleted file mode 100644
index af0b7499960..00000000000
--- a/modules/kogito-persistence/tests/bats/expected/patch_cm_travel_agency.json
+++ /dev/null
@@ -1 +0,0 @@
-[ { "op": "replace", "path": "/metadata/annotations", "value": {  "org.kie.kogito.protobuf.hash/travels": "8aa1ca180547a589d2d681fe111117e8", "org.kie.kogito.protobuf.hash/visaApplications": "62004537e95b23ddd4a9da5a13920250" } }, { "op": "replace", "path": "/data", "value": {  "travels.proto": "syntax = \"proto2\"; \npackage org.acme.travels.travels; \nimport \"kogito-index.proto\";\nimport \"kogito-types.proto\";\noption kogito_model = \"Travels\";\noption kogito_id = \"travels\";\n\n/* @Indexed */ \nmessage Address { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string city = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string country = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string street = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string zipCode = 4; \n}\n/* @Indexed */ \nmessage Flight { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional kogito.Date arrival = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional kogito.Date departure = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string flightNumber = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string gate = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string seat = 5; \n}\n/* @Indexed */ \nmessage Hotel { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Address address = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string bookingNumber = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string name = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string phone = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string room = 5; \n}\n/* @Indexed */ \nmessage Traveller { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Address address = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string email = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string firstName = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string lastName = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string nationality = 5; \n}\n/* @Indexed */ \nmessage Travels { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Flight flight = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Hotel hotel = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string id = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Traveller traveller = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional Trip trip = 5; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional VisaApplication visaApplication = 6; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  repeated org.kie.kogito.index.model.ProcessInstanceMeta processInstances = 7; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  repeated org.kie.kogito.index.model.UserTaskInstanceMeta userTasks = 8; \n}\n/* @Indexed */ \nmessage Trip { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional kogito.Date begin = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string city = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string country = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional kogito.Date end = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional bool visaRequired = 5; \n}\n/* @Indexed */ \nmessage VisaApplication { \n  option java_package = \"org.acme.travels.travels\";\n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional bool approved = 1; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string city = 2; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string country = 3; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional int32 duration = 4; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string firstName = 5; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string lastName = 6; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string nationality = 7; \n  /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n  optional string passportNumber = 8; \n}\n", "visaApplications.proto": " syntax = \"proto2\"; \n    package org.acme.travels.visaApplications; \n    import \"kogito-index.proto\";\n    import \"kogito-types.proto\";\n    option kogito_model = \"VisaApplications\";\n    option kogito_id = \"visaApplications\";\n\n    /* @Indexed */ \n    message VisaApplication { \n      option java_package = \"org.acme.travels.visaApplications\";\n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional bool approved = 1; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string city = 2; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string country = 3; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional int32 duration = 4; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string firstName = 5; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string lastName = 6; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string nationality = 7; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string passportNumber = 8; \n    }\n    /* @Indexed */ \n    message VisaApplications { \n      option java_package = \"org.acme.travels.visaApplications\";\n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional string id = 1; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      optional VisaApplication visaApplication = 2; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      repeated org.kie.kogito.index.model.ProcessInstanceMeta processInstances = 3; \n      /* @Field(store = Store.YES, analyze = Analyze.YES) */ \n      repeated org.kie.kogito.index.model.UserTaskInstanceMeta userTasks = 4; \n    }\n" } } ]
\ No newline at end of file
diff --git a/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json b/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json
deleted file mode 100644
index 617ea60812a..00000000000
--- a/modules/kogito-persistence/tests/bats/expected/patch_empty_data.json
+++ /dev/null
@@ -1 +0,0 @@
-[ { "op": "replace", "path": "/metadata/annotations", "value": {  } }, { "op": "replace", "path": "/data", "value": {  } } ]
\ No newline at end of file
diff --git a/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
index 6426bf65b6e..6c971c73b11 100644
--- a/modules/kogito-persistence/tests/bats/kogito-persistence.bats
+++ b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
@@ -10,31 +10,6 @@ cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-
 # imports
 source $BATS_TEST_DIRNAME/../../added/kogito-persistence.sh
 
-unset -f list_or_get_k8s_resource
-unset -f patch_json_k8s_resource
-unset -f is_running_on_kubernetes
-
-function is_running_on_kubernetes() {
-    # yes, we are :)
-    log_info "Yes, we are in kubernetes"
-    return 0
-}
-
-function patch_json_k8s_resource() {
-    local api="${1}"
-    local resource="${2}"
-    local body="${3}"
-
-    log_info "Calling k8s api '${api}', resource '${resource}'"
-    echo "${body}200"
-}
-
-function list_or_get_k8s_resource() {
-    local response=$(cat $BATS_TEST_DIRNAME/mocks/$MOCK_RESPONSE)
-    response="${response}200"
-    echo "${response}"
-}
-
 setup() {
     export HOME=$KOGITO_HOME
     mkdir -p ${KOGITO_HOME}
@@ -65,9 +40,6 @@ teardown() {
     [ "${lines[3]}" = "removed '${KOGITO_HOME}/bin/kogito-application.proto'" ]
     [ "${lines[4]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
     [ "${lines[5]}" = "'${KOGITO_HOME}/bin/file1.proto' -> '${KOGITO_HOME}/data/protobufs/file1.proto'" ]
-    [ "${lines[6]}" = "INFO ---> [persistence] generating md5 for persistence files" ]
-    [ "${lines[7]}" = "INFO ----> [persistence] Generated checksum for ${KOGITO_HOME}/data/protobufs/file1.proto with the name: ${KOGITO_HOME}/data/protobufs/file1-md5.txt" ]
-
 }
 
 @test "There are no persistence files" {
@@ -92,8 +64,6 @@ teardown() {
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
     [ "${lines[1]}" = "'${KOGITO_HOME}/bin/file1.proto' -> '${KOGITO_HOME}/data/protobufs/file1.proto'" ]
-    [ "${lines[2]}" = "INFO ---> [persistence] generating md5 for persistence files" ]
-    [ "${lines[3]}" = "INFO ----> [persistence] Generated checksum for ${KOGITO_HOME}/data/protobufs/file1.proto with the name: ${KOGITO_HOME}/data/protobufs/file1-md5.txt" ]
 }
 
 @test "There's no proto files in the bin directory" {
@@ -105,73 +75,3 @@ teardown() {
     [ "${lines[0]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
     [ "${lines[1]}" = "INFO ---> [persistence] Skip copying files, ${KOGITO_HOME}/bin directory does not have proto files!" ]
 }
-
-@test "MD5 correctly generated for file1.proto" {
-    touch $KOGITO_HOME/data/protobufs/file1.proto
-
-    run generate_md5_persistence_files
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "INFO ---> [persistence] generating md5 for persistence files" ]
-    [ "${lines[1]}" = "INFO ----> [persistence] Generated checksum for ${KOGITO_HOME}/data/protobufs/file1.proto with the name: ${KOGITO_HOME}/data/protobufs/file1-md5.txt" ]
-    [ -e $KOGITO_HOME/data/protobufs/file1-md5.txt ]
-    # if md5 isn't generated, grep will fail to find the given string
-    grep -q "d41d8cd98f00b204e9800998ecf8427e" $KOGITO_HOME/data/protobufs/file1-md5.txt
-}
-
-@test "MD5 not generated for file1.proto1" {
-    touch $KOGITO_HOME/data/protobufs/file1.proto1
-
-    run generate_md5_persistence_files
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ ! -e $KOGITO_HOME/data/protobufs/file1-md5.txt ]
-}
-
-@test "Patch a configMap when we have empty annotations and data" {
-    MOCK_RESPONSE="config_map_no_annotations.json"
-    cp -v $BATS_TEST_DIRNAME/mocks/travels.proto $KOGITO_HOME/data/protobufs/
-    cp -v $BATS_TEST_DIRNAME/mocks/visaApplications.proto $KOGITO_HOME/data/protobufs/
-    generate_md5_persistence_files
-
-    local expected=$(cat $BATS_TEST_DIRNAME/expected/patch_cm_travel_agency.json)
-
-    run update_configmap
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[1]}" = "INFO ---> [persistence] About to patch configMap exampleapp-cm" ]
-    [ "${lines[2]}" = "Body: ${expected}" ]
-}
-
-@test "Patch a configMap with empty data" {
-    MOCK_RESPONSE="config_map.json" # we have annotations, but no files in the file system
-    
-    local expected=$(cat $BATS_TEST_DIRNAME/expected/patch_empty_data.json)
-
-    run update_configmap
-    
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[1]}" = "INFO ---> [persistence] About to patch configMap exampleapp-cm" ]
-    [ "${lines[2]}" = "Body: ${expected}" ]
-}
-
-@test "Patch with an empty annotations configmap with files in disk" {
-    MOCK_RESPONSE="config_map_empty_annotations.json" # we have empty annotations and files in disk
-    
-    cp -v $BATS_TEST_DIRNAME/mocks/travels.proto $KOGITO_HOME/data/protobufs/
-    cp -v $BATS_TEST_DIRNAME/mocks/visaApplications.proto $KOGITO_HOME/data/protobufs/
-    generate_md5_persistence_files
-
-    local expected=$(cat $BATS_TEST_DIRNAME/expected/patch_cm_travel_agency.json)
-
-    run update_configmap
-    
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[1]}" = "INFO ---> [persistence] About to patch configMap exampleapp-cm" ]
-    [ "${lines[2]}" = "Body: ${expected}" ]
-}
\ No newline at end of file
diff --git a/modules/kogito-persistence/tests/bats/mocks/config_map.json b/modules/kogito-persistence/tests/bats/mocks/config_map.json
deleted file mode 100644
index ad311b2404c..00000000000
--- a/modules/kogito-persistence/tests/bats/mocks/config_map.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "kind": "ConfigMap",
-    "apiVersion": "v1",
-    "metadata": {
-        "name": "example-quarkus-protobuf-files",
-        "namespace": "kogito-587",
-        "selfLink": "/api/v1/namespaces/kogito-587/configmaps/example-quarkus-protobuf-files",
-        "uid": "e9a77236-20fe-11ea-92d6-52fdfc072182",
-        "resourceVersion": "851604",
-        "creationTimestamp": "2019-12-17T18:56:20Z",
-        "labels": {
-            "app": "example-quarkus",
-            "kogito-protobuf": "true"
-        },
-        "annotations": {
-            "org.kie.kogito/managed-by": "Kogito Operator",
-            "org.kie.kogito/operator-crd": "KogitoApp",
-            "org.kie.kogito.protobuf.hash/visaApplications": "01010101",
-            "org.kie.kogito.protobuf.hash/travels": "0202020202",
-            "org.kie.kogito.protobuf.hash/file1" : "d41d8cd98f00b204e9800998ecf8427e"
-        },
-        "ownerReferences": [
-            {
-                "apiVersion": "app.kiegroup.org/v1alpha1",
-                "kind": "KogitoApp",
-                "name": "example-quarkus",
-                "uid": "e993c8b2-20fe-11ea-92d6-52fdfc072182",
-                "controller": true,
-                "blockOwnerDeletion": true
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json b/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json
deleted file mode 100644
index 19fc44ed74d..00000000000
--- a/modules/kogito-persistence/tests/bats/mocks/config_map_empty_annotations.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "kind": "ConfigMap",
-    "apiVersion": "v1",
-    "metadata": {
-        "name": "example-quarkus-protobuf-files",
-        "namespace": "kogito-587",
-        "selfLink": "/api/v1/namespaces/kogito-587/configmaps/example-quarkus-protobuf-files",
-        "uid": "e9a77236-20fe-11ea-92d6-52fdfc072182",
-        "resourceVersion": "851604",
-        "creationTimestamp": "2019-12-17T18:56:20Z",
-        "labels": {
-            "app": "example-quarkus",
-            "kogito-protobuf": "true"
-        },
-        "ownerReferences": [
-            {
-                "apiVersion": "app.kiegroup.org/v1alpha1",
-                "kind": "KogitoApp",
-                "name": "example-quarkus",
-                "uid": "e993c8b2-20fe-11ea-92d6-52fdfc072182",
-                "controller": true,
-                "blockOwnerDeletion": true
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json b/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json
deleted file mode 100644
index 921c3be9d7f..00000000000
--- a/modules/kogito-persistence/tests/bats/mocks/config_map_file1_only.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "kind": "ConfigMap",
-    "apiVersion": "v1",
-    "metadata": {
-        "name": "example-quarkus-protobuf-files",
-        "namespace": "kogito-587",
-        "selfLink": "/api/v1/namespaces/kogito-587/configmaps/example-quarkus-protobuf-files",
-        "uid": "e9a77236-20fe-11ea-92d6-52fdfc072182",
-        "resourceVersion": "851604",
-        "creationTimestamp": "2019-12-17T18:56:20Z",
-        "labels": {
-            "app": "example-quarkus",
-            "kogito-protobuf": "true"
-        },
-        "annotations": {
-            "org.kie.kogito/managed-by": "Kogito Operator",
-            "org.kie.kogito/operator-crd": "KogitoApp",
-            "org.kie.kogito.protobuf.hash/file1" : "d41d8cd98f00b204e9800998ecf8427e"
-        },
-        "ownerReferences": [
-            {
-                "apiVersion": "app.kiegroup.org/v1alpha1",
-                "kind": "KogitoApp",
-                "name": "example-quarkus",
-                "uid": "e993c8b2-20fe-11ea-92d6-52fdfc072182",
-                "controller": true,
-                "blockOwnerDeletion": true
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json b/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json
deleted file mode 100644
index 3565bad5f0b..00000000000
--- a/modules/kogito-persistence/tests/bats/mocks/config_map_no_annotations.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "kind": "ConfigMap",
-    "apiVersion": "v1",
-    "metadata": {
-        "name": "example-quarkus-protobuf-files",
-        "namespace": "kogito-587",
-        "selfLink": "/api/v1/namespaces/kogito-587/configmaps/example-quarkus-protobuf-files",
-        "uid": "e9a77236-20fe-11ea-92d6-52fdfc072182",
-        "resourceVersion": "851604",
-        "creationTimestamp": "2019-12-17T18:56:20Z",
-        "labels": {
-            "app": "example-quarkus",
-            "kogito-protobuf": "true"
-        },
-        "annotations": {
-            "org.kie.kogito/managed-by": "Kogito Operator",
-            "org.kie.kogito/operator-crd": "KogitoApp"
-        },
-        "ownerReferences": [
-            {
-                "apiVersion": "app.kiegroup.org/v1alpha1",
-                "kind": "KogitoApp",
-                "name": "example-quarkus",
-                "uid": "e993c8b2-20fe-11ea-92d6-52fdfc072182",
-                "controller": true,
-                "blockOwnerDeletion": true
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/modules/kogito-persistence/tests/bats/mocks/travels.proto b/modules/kogito-persistence/tests/bats/mocks/travels.proto
deleted file mode 100644
index 7cbe2f06559..00000000000
--- a/modules/kogito-persistence/tests/bats/mocks/travels.proto
+++ /dev/null
@@ -1,115 +0,0 @@
-syntax = "proto2"; 
-package org.acme.travels.travels; 
-import "kogito-index.proto";
-import "kogito-types.proto";
-option kogito_model = "Travels";
-option kogito_id = "travels";
-
-/* @Indexed */ 
-message Address { 
-  option java_package = "org.acme.travels.travels";
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string city = 1; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string country = 2; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string street = 3; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string zipCode = 4; 
-}
-/* @Indexed */ 
-message Flight { 
-  option java_package = "org.acme.travels.travels";
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional kogito.Date arrival = 1; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional kogito.Date departure = 2; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string flightNumber = 3; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string gate = 4; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string seat = 5; 
-}
-/* @Indexed */ 
-message Hotel { 
-  option java_package = "org.acme.travels.travels";
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional Address address = 1; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string bookingNumber = 2; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string name = 3; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string phone = 4; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string room = 5; 
-}
-/* @Indexed */ 
-message Traveller { 
-  option java_package = "org.acme.travels.travels";
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional Address address = 1; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string email = 2; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string firstName = 3; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string lastName = 4; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string nationality = 5; 
-}
-/* @Indexed */ 
-message Travels { 
-  option java_package = "org.acme.travels.travels";
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional Flight flight = 1; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional Hotel hotel = 2; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string id = 3; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional Traveller traveller = 4; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional Trip trip = 5; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional VisaApplication visaApplication = 6; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  repeated org.kie.kogito.index.model.ProcessInstanceMeta processInstances = 7; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  repeated org.kie.kogito.index.model.UserTaskInstanceMeta userTasks = 8; 
-}
-/* @Indexed */ 
-message Trip { 
-  option java_package = "org.acme.travels.travels";
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional kogito.Date begin = 1; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string city = 2; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string country = 3; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional kogito.Date end = 4; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional bool visaRequired = 5; 
-}
-/* @Indexed */ 
-message VisaApplication { 
-  option java_package = "org.acme.travels.travels";
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional bool approved = 1; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string city = 2; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string country = 3; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional int32 duration = 4; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string firstName = 5; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string lastName = 6; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string nationality = 7; 
-  /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-  optional string passportNumber = 8; 
-}
\ No newline at end of file
diff --git a/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto b/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto
deleted file mode 100644
index 09f201f81a4..00000000000
--- a/modules/kogito-persistence/tests/bats/mocks/visaApplications.proto
+++ /dev/null
@@ -1,39 +0,0 @@
- syntax = "proto2"; 
-    package org.acme.travels.visaApplications; 
-    import "kogito-index.proto";
-    import "kogito-types.proto";
-    option kogito_model = "VisaApplications";
-    option kogito_id = "visaApplications";
-
-    /* @Indexed */ 
-    message VisaApplication { 
-      option java_package = "org.acme.travels.visaApplications";
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional bool approved = 1; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional string city = 2; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional string country = 3; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional int32 duration = 4; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional string firstName = 5; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional string lastName = 6; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional string nationality = 7; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional string passportNumber = 8; 
-    }
-    /* @Indexed */ 
-    message VisaApplications { 
-      option java_package = "org.acme.travels.visaApplications";
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional string id = 1; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      optional VisaApplication visaApplication = 2; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      repeated org.kie.kogito.index.model.ProcessInstanceMeta processInstances = 3; 
-      /* @Field(store = Store.YES, analyze = Analyze.YES) */ 
-      repeated org.kie.kogito.index.model.UserTaskInstanceMeta userTasks = 4; 
-    }
\ No newline at end of file
diff --git a/modules/kogito-persistence/tests/bats/post-hook-persistence.bats b/modules/kogito-persistence/tests/bats/post-hook-persistence.bats
deleted file mode 100644
index ae51110d635..00000000000
--- a/modules/kogito-persistence/tests/bats/post-hook-persistence.bats
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bats
-
-export KOGITO_HOME=$BATS_TMPDIR/kogito_home
-mkdir -p $KOGITO_HOME/launch
-
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh $KOGITO_HOME/launch/
-cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh $KOGITO_HOME/launch/
-cp $BATS_TEST_DIRNAME/../../added/kogito-persistence.sh $KOGITO_HOME/launch/
-
-setup() {
-    export HOME=$KOGITO_HOME
-    mkdir -p ${KOGITO_HOME}
-}
-
-teardown() {
-    rm -rf ${KOGITO_HOME}
-}
-
-@test "Call post hook script (sanity check)" {
-    run $BATS_TEST_DIRNAME/../../added/post-hook-persistence.sh
-
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "INFO ---> [persistence] Not running on kubernetes cluster, skipping config map update" ]
-}
\ No newline at end of file
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 3861eaea4aa..04171b2cc50 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -113,11 +113,6 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     Then file /home/kogito/bin/process-quarkus-example-runner.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-    And s2i build log should contain ---> [persistence] generating md5 for persistence files
-    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for 29ff4ac73aaeace2e0b35bbfd10b8df9
-    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for cad0e594b6c80f0e284ec271f122b47b
-    And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/persons.proto with the name: /home/kogito/data/protobufs/persons-md5.txt
-    And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
   #ignore until https://issues.redhat.com/browse/KOGITO-3638 is resolved
   @ignore
@@ -127,14 +122,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | NATIVE            | true          |
       | LIMIT_MEMORY      | 6442450944    |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for b19f6d73a0a1fea0bfbd8e2e30701d78
-    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for 02b40df868ebda3acb3b318b6ebcc055
-    And file /home/kogito/bin/process-quarkus-example-runner should exist
+    Then file /home/kogito/bin/process-quarkus-example-runner should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-    And s2i build log should contain ---> [persistence] generating md5 for persistence files
-    And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/persons.proto with the name: /home/kogito/data/protobufs/persons-md5.txt
-    And s2i build log should contain [persistence] Generated checksum for /home/kogito/data/protobufs/demo.orders.proto with the name: /home/kogito/data/protobufs/demo.orders-md5.txt
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index e8b6acacbe8..e1e46a53e58 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -58,9 +58,6 @@ Feature: kogito-springboot-ubi8-s2i image tests
     Then file /home/kogito/bin/process-springboot-example.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-    And s2i build log should contain ---> [persistence] generating md5 for persistence files
-    And run sh -c 'cat /home/kogito/data/protobufs/persons-md5.txt' in container and immediately check its output for 29ff4ac73aaeace2e0b35bbfd10b8df9
-    And run sh -c 'cat /home/kogito/data/protobufs/demo.orders-md5.txt' in container and immediately check its output for cad0e594b6c80f0e284ec271f122b47b
 
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest

From 93259dab1b1246d091b1d4d1bb157fcc8810744b Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 6 Nov 2020 17:43:54 +0100
Subject: [PATCH 207/709] KOGITO-3006 Allow to artifacts version (#277) (#276)

---
 Jenkinsfile.deploy  |  9 +++++++++
 Jenkinsfile.promote | 12 +++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 6e3adf95125..501600ad708 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -41,6 +41,7 @@ pipeline {
         // Release information
         booleanParam(name: 'RELEASE', defaultValue: false, description: 'Is this build for a release?')
         string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Optional if not RELEASE. If RELEASE, cannot be empty.')
+        string(name: 'KOGITO_ARTIFACTS_VERSION', defaultValue: '', description: 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
 
         // Bot author information. Set as params for easy testing.
         string(name: 'GIT_AUTHOR_BOT', defaultValue: 'bsig-gh-bot', description: 'From which author should the PR be created ?')
@@ -88,6 +89,7 @@ pipeline {
                         setDeployPropertyIfNeeded('git.author', getGitAuthor())
                         setDeployPropertyIfNeeded('project.version', getProjectVersion())
                         setDeployPropertyIfNeeded('release', isRelease())
+                        setDeployPropertyIfNeeded('kogito_artifacts.version', getKogitoArtifactsVersion())
                     }
                 }
             }
@@ -113,6 +115,9 @@ pipeline {
                     if(getBuildBranch() != 'master'){
                         versionCmd += " --examples-ref ${getBuildBranch()}"
                     }
+                    if(getKogitoArtifactsVersion()){
+                        versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
+                    }
                     sh versionCmd
                 }
             }
@@ -485,6 +490,10 @@ String getProjectVersion() {
     return params.PROJECT_VERSION
 }
 
+String getKogitoArtifactsVersion() {
+    return params.KOGITO_ARTIFACTS_VERSION
+}
+
 String getMavenArtifactRepository() {
     return params.MAVEN_ARTIFACT_REPOSITORY
 }
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index bf7a52005c4..10d8d410a2a 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -42,6 +42,7 @@ pipeline {
         // Release information which can override `deployment.properties`
         booleanParam(name: 'RELEASE', defaultValue: false, description: 'Override `deployment.properties`. Is this build for a release?')
         string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Override `deployment.properties`. Optional if not RELEASE. If RELEASE, cannot be empty.')
+        string(name: 'KOGITO_ARTIFACTS_VERSION', defaultValue: '', description: 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
         string(name: 'GIT_TAG', defaultValue: '', description: 'Git tag to set, if different from PROJECT_VERSION')
         string(name: 'MAVEN_ARTIFACT_REPOSITORY', defaultValue: '', description: 'Maven repository where the released jar artifacts are present. To be set if git author is not `kiegroup` and repository is different from JBoss repository.')
         string(name: 'RELEASE_NOTES', defaultValue: '', description: 'Release notes to be added. If none provided, a default one will be given.')
@@ -229,7 +230,7 @@ pipeline {
                         githubscm.createBranch(getSnapshotBranch())
 
                         // Update version to next snapshot
-                        versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${nextVersion} --artifacts-version ${getArtifactsNextVersion()} --confirm"
+                        versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${nextVersion} --artifacts-version ${getKogitoArtifactsNextVersion()} --confirm"
                         if(getBuildBranch() != 'master') {
                             versionCmd += " --examples-ref ${getBuildBranch()}"
                         }
@@ -398,6 +399,11 @@ String getProjectVersion() {
     return getParamOrDeployProperty('PROJECT_VERSION' , 'project.version')
 }
 
+String getKogitoArtifactsVersion() {
+    artifactsVersion = getParamOrDeployProperty('KOGITO_ARTIFACTS_VERSION' , 'kogito_artifacts.version')
+    return artifactsVersion ?: getProjectVersion()
+}
+
 String getGitTag() {
     return params.GIT_TAG != '' ? params.GIT_TAG : getProjectVersion()
 }
@@ -431,8 +437,8 @@ String getNextVersion() {
 }
 
 // To be later changed by artifacts version parameter
-String getArtifactsNextVersion() {
-    return util.getNextVersion(getProjectVersion(), 'micro', 'SNAPSHOT')
+String getKogitoArtifactsNextVersion() {
+    return util.getNextVersion(getKogitoArtifactsVersion(), 'micro', 'SNAPSHOT')
 }
 
 String getSnapshotBranch(){

From 20b7dea21112ad45474676f8af5c432085927efb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 12 Nov 2020 14:27:39 +0100
Subject: [PATCH 208/709] [KOGITO-3837] Update master to 2.0.0-snapshot (#280)

* KOGITO-3837 Update master to 2.0.0-snapshot

* small update
---
 image.yaml                                    |  4 +-
 kogito-imagestream.yaml                       | 78 +++++++++----------
 modules/kogito-data-index-common/module.yaml  |  4 +-
 .../kogito-data-index-infinispan/module.yaml  |  2 +-
 modules/kogito-data-index-mongodb/module.yaml |  2 +-
 modules/kogito-explainability/module.yaml     |  2 +-
 modules/kogito-image-dependencies/module.yaml |  2 +-
 modules/kogito-jobs-service/module.yaml       |  2 +-
 modules/kogito-jq/module.yaml                 |  2 +-
 modules/kogito-kubernetes-client/module.yaml  |  2 +-
 modules/kogito-launch-scripts/module.yaml     |  2 +-
 modules/kogito-logging/module.yaml            |  2 +-
 modules/kogito-management-console/module.yaml |  2 +-
 modules/kogito-persistence/module.yaml        |  2 +-
 modules/kogito-quarkus-jvm/module.yaml        |  2 +-
 modules/kogito-quarkus-s2i/module.yaml        |  2 +-
 modules/kogito-quarkus/module.yaml            |  2 +-
 modules/kogito-s2i-core/module.yaml           |  2 +-
 modules/kogito-springboot-s2i/module.yaml     |  2 +-
 modules/kogito-springboot/module.yaml         |  2 +-
 modules/kogito-system-user/module.yaml        |  2 +-
 modules/kogito-task-console/module.yaml       |  2 +-
 modules/kogito-trusty-ui/module.yaml          |  2 +-
 modules/kogito-trusty/module.yaml             |  2 +-
 .../features/kogito-quarkus-ubi8-s2i.feature  |  6 +-
 .../kogito-springboot-ubi8-s2i.feature        |  2 +-
 26 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/image.yaml b/image.yaml
index 8df70e2b3c2..aad7bc9408e 100644
--- a/image.yaml
+++ b/image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 # until this issue is not fixed use 8.0 tag.
 # https://github.com/rpm-software-management/microdnf/issues/50
 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831
@@ -23,7 +23,7 @@ modules:
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "1.0.0-SNAPSHOT"
+    value: "2.0.0-SNAPSHOT"
 
 packages:
   manager: microdnf
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 4babeb56631..c18a7d04e8a 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-quarkus-ubi8:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for Kogito based on Quarkus JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,jvm
             supports: quarkus
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,quarkus
             supports: quarkus
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for Kogito based on SpringBoot
             iconClass: icon-jbpm
             tags: runtime,kogito,springboot
             supports: springboot
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-springboot-ubi8:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Platform for building Kogito based on Quarkus
             iconClass: icon-jbpm
             tags: builder,kogito,springboot
             supports: springboot
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Data Index Service with Infinispan
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-infinispan
             supports: persistence backed by Infinispan server
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-infinispan:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-infinispan:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Data Index Service with Mongodb
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-mongodb
             supports: persistence backed by Mongodb server
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-mongodb:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-mongodb:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,18 +162,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Trusty Service
             iconClass: icon-jbpm
             tags: kogito,trusty
             supports: persistence backed by Infinispan server
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -183,18 +183,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Trusty UI Service
             iconClass: icon-jbpm
             tags: kogito,trusty-ui
             supports: Audit UI
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-ui:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-ui:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -204,18 +204,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Explainability Service
             iconClass: icon-jbpm
             tags: kogito,explainability
             supports: explainability for decisions
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-explainability:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-explainability:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -225,18 +225,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -246,18 +246,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-management-console:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -267,15 +267,15 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '1.0.0-snapshot'
+        - name: '2.0.0-snapshot'
           annotations:
             description: Runtime image for the Kogito Task Console
             iconClass: icon-jbpm
             tags: kogito,task-console
             supports: business process management
-            version: '1.0.0-snapshot'
+            version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-task-console:1.0.0-snapshot
+            name: quay.io/kiegroup/kogito-task-console:2.0.0-snapshot
diff --git a/modules/kogito-data-index-common/module.yaml b/modules/kogito-data-index-common/module.yaml
index 292dea185f6..84de2749c6e 100644
--- a/modules/kogito-data-index-common/module.yaml
+++ b/modules/kogito-data-index-common/module.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.common
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 description: "Common modules for data-index persistence provider images, any addition that is common must be added in this module"
 
 execute:
-  - script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 6b919ba115f..907aa9f5350 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.infinispan
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index c7a19d94ebb..077b4d39478 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.mongodb
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index cb23747ca56..09b2f6ee8c1 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.explainability
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index b96d2f635f9..4d696804d96 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 4d84db3b854..9380fa28de5 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
index 600b0365619..7fd53f5ddc8 100644
--- a/modules/kogito-jq/module.yaml
+++ b/modules/kogito-jq/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jq
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 modules:
   install:
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 1dbec6fe976..74312456230 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index 92d33e7cadf..9d9c9802c31 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index 38c09fef01e..d8f6defdd7e 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index cdeb3daf22b..034dffd641b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index 0f7edba6c96..fd4705bef4f 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 modules:
   install:
diff --git a/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-quarkus-jvm/module.yaml
index 2b3374f4e36..c6925d498ca 100644
--- a/modules/kogito-quarkus-jvm/module.yaml
+++ b/modules/kogito-quarkus-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.jvm
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
index 1222ec4b806..dd6cb3cdf0b 100644
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ b/modules/kogito-quarkus-s2i/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus.s2i
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-quarkus/module.yaml b/modules/kogito-quarkus/module.yaml
index 749033fef23..8744127a6b4 100644
--- a/modules/kogito-quarkus/module.yaml
+++ b/modules/kogito-quarkus/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.quarkus
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 3ceff48a064..57391169fb6 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '1.0.0-snapshot'
+version: '2.0.0-snapshot'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
index 21311313eb6..7a7dcefd635 100644
--- a/modules/kogito-springboot-s2i/module.yaml
+++ b/modules/kogito-springboot-s2i/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot.s2i
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-springboot/module.yaml b/modules/kogito-springboot/module.yaml
index 90bc6bc9294..00fb77759cf 100644
--- a/modules/kogito-springboot/module.yaml
+++ b/modules/kogito-springboot/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.springboot
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index a9511a30528..a1da8a916bd 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 execute:
   - script: add-user
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 5c05be88ac7..d8adde82441 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.task.console
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index a6f15ba8d95..2efc3d58483 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.ui
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 05350dcf8ab..e2f3073ea14 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty
-version: "1.0.0-snapshot"
+version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-quarkus-ubi8-s2i.feature
index 04171b2cc50..bec0a576267 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-quarkus-ubi8-s2i.feature
@@ -240,7 +240,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 1.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
     And check that page is served
       | property        | value                                                                                            |
@@ -257,7 +257,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | variable | value |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 1.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
@@ -273,7 +273,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
       | variable | value |
       | NATIVE              | false          |
-      | KOGITO_VERSION      | 1.0.0-SNAPSHOT | 
+      | KOGITO_VERSION      | 2.0.0-SNAPSHOT |  
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
index e1e46a53e58..5149d80407e 100644
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ b/tests/features/kogito-springboot-ubi8-s2i.feature
@@ -122,5 +122,5 @@ Feature: kogito-springboot-ubi8-s2i image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
       | variable | value |
-      | KOGITO_VERSION | 1.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist

From 1558e24835a20a52eb2628388825b376285e3cf0 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 18 Nov 2020 10:38:27 -0300
Subject: [PATCH 209/709] [KOGITO-3861] - kogito user does not have permission
 on home directory when running on OCP (#282)

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-data-index-mongodb/added/kogito-app-launch.sh | 1 -
 modules/kogito-system-user/add-user                          | 4 ++--
 tests/features/common.feature                                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index 031160ab213..4455a92c992 100644
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -14,7 +14,6 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-data-index.sh
 )
 source ${KOGITO_HOME}/launch/configure.sh
 #############################################
diff --git a/modules/kogito-system-user/add-user b/modules/kogito-system-user/add-user
index ea8304aff28..2d5bae10496 100644
--- a/modules/kogito-system-user/add-user
+++ b/modules/kogito-system-user/add-user
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-groupadd -r kogito -g 1001 && useradd -u 1001 -r -g 1001 -m -d ${KOGITO_HOME} -s /sbin/nologin -c "Kogito user" ${USER}
+groupadd -r kogito -g 1001 && useradd -u 1001 -r -g root -G ${USER} -m -d ${KOGITO_HOME} -s /sbin/nologin -c "Kogito user" ${USER}
 
 mkdir ${KOGITO_HOME}/bin
-chown -R 1001:0 ${KOGITO_HOME}
+chmod ug+rwX ${KOGITO_HOME}
 
diff --git a/tests/features/common.feature b/tests/features/common.feature
index b302031ca6e..561ac3a0296 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -5,5 +5,5 @@ Feature: Common tests for Kogito images
     When container is started with command bash
     Then run bash -c 'echo $USER' in container and check its output for kogito
      And run sh -c 'echo $HOME' in container and check its output for /home/kogito
-     And run sh -c 'id' in container and check its output for uid=1001(kogito) gid=1001(kogito) groups=1001(kogito)
+     And run sh -c 'id' in container and check its output for uid=1001(kogito) gid=0(root) groups=0(root),1001(kogito)
 

From 7ecaaf705b380ad3d6012307712a5d5bfc9b8d9b Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Mon, 30 Nov 2020 22:06:25 +0530
Subject: [PATCH 210/709] [KOGITO-3766] - Integrate Shellcheck for all shell
 scripts (#274)

* [KOGITO-3766] - Integrate Shellcheck for all shell scripts
See: https://issues.redhat.com/browse/KOGITO-3766

Signed-off-by: Tarun Khandelwal <tarkhand@redhat.com>
---
 .github/workflows/kogito-images-pr-check.yml  |  16 ++-
 modules/kogito-data-index-common/configure    |  10 +-
 .../added/kogito-app-launch.sh                |   9 +-
 .../kogito-data-index-infinispan/configure    |  10 +-
 .../added/kogito-app-launch.sh                |   9 +-
 modules/kogito-data-index-mongodb/configure   |  10 +-
 .../added/kogito-app-launch.sh                |  11 +-
 .../added/launch/kogito-explainability.sh     |   4 +-
 modules/kogito-explainability/configure       |  18 +--
 .../tests/bats/kogito-explainability.bats     |   8 +-
 .../20.x-java-1.8/configure                   |  12 +-
 .../20.x-java-11/configure                    |  12 +-
 .../added/memory-limit.sh                     |   6 +-
 modules/kogito-graalvm-scripts/configure      |   6 +-
 .../tests/bats/memory-limits.bats             |   4 +-
 .../added/kogito-app-launch.sh                |   9 +-
 modules/kogito-jobs-service/configure         |  16 +--
 .../tests/bats/kogito-jobs-service.bats       |   8 +-
 .../added/kogito-kubernetes-client.sh         |  22 ++--
 modules/kogito-kubernetes-client/configure    |   8 +-
 .../tests/bats/kogito-kubernetes-client.bats  |   4 +-
 .../kogito-launch-scripts/added/configure.sh  |  45 ++++----
 modules/kogito-launch-scripts/configure       |   6 +-
 modules/kogito-logging/configure              |   8 +-
 .../added/kogito-app-launch.sh                |   9 +-
 .../added/launch/kogito-management-console.sh |   2 +-
 modules/kogito-management-console/configure   |  16 +--
 .../tests/bats/kogito-management-console.bats |   8 +-
 .../3.6.x/added/configure-maven.sh            |  60 +++++-----
 modules/kogito-maven/3.6.x/configure          |  12 +-
 .../added/kogito-persistence.sh               |  22 ++--
 modules/kogito-persistence/configure          |  12 +-
 .../tests/bats/kogito-persistence.bats        |  36 +++---
 .../added/kogito-app-launch.sh                |   5 +-
 modules/kogito-quarkus-jvm/configure          |  16 +--
 .../added/kogito-app-launch.sh                |  12 +-
 modules/kogito-quarkus-s2i/configure          |  14 +--
 modules/kogito-quarkus-s2i/s2i/bin/assemble   |  12 +-
 .../kogito-quarkus/added/kogito-app-launch.sh |   9 +-
 modules/kogito-quarkus/configure              |  18 +--
 modules/kogito-s2i-core/added/s2i-core        |  36 +++---
 modules/kogito-s2i-core/configure.sh          |  10 +-
 modules/kogito-s2i-core/s2i/bin/run           |   5 +-
 .../kogito-s2i-core/s2i/bin/save-artifacts    |   2 +-
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 108 +++++++++---------
 .../added/kogito-app-launch.sh                |   5 +-
 modules/kogito-springboot-s2i/configure       |  14 +--
 .../kogito-springboot-s2i/s2i/bin/assemble    |   9 +-
 .../added/kogito-app-launch.sh                |   5 +-
 modules/kogito-springboot/configure           |  14 +--
 modules/kogito-system-user/add-user           |   6 +-
 .../added/kogito-app-launch.sh                |   9 +-
 .../added/launch/kogito-task-console.sh       |   2 +-
 modules/kogito-task-console/configure         |  16 +--
 .../tests/bats/kogito-task-console.bats       |   8 +-
 .../added/kogito-app-launch.sh                |   9 +-
 .../added/launch/kogito-trusty-ui.sh          |   2 +-
 modules/kogito-trusty-ui/configure            |  16 +--
 .../tests/bats/kogito-trusty-ui.bats          |   8 +-
 .../kogito-trusty/added/kogito-app-launch.sh  |  11 +-
 .../added/launch/kogito-trusty.sh             |   5 +-
 modules/kogito-trusty/configure               |  16 +--
 .../tests/bats/kogito-trusty.bats             |   8 +-
 scripts/run-bats.sh                           |   2 +-
 tests/test-apps/clone-repo.sh                 |  16 +--
 65 files changed, 452 insertions(+), 424 deletions(-)

diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
index 6dffd3c3937..da68a90f022 100644
--- a/.github/workflows/kogito-images-pr-check.yml
+++ b/.github/workflows/kogito-images-pr-check.yml
@@ -37,4 +37,18 @@ jobs:
           mv openshift-template-validator-linux-amd64 ${HOME} 	
       - name: validate imagestream
         run: |
-          ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
\ No newline at end of file
+          ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
+
+  shellcheck:
+    name: ShellCheck
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Shellcheck
+        run: sudo apt install shellcheck
+      - name: Check configure scripts
+        run: |
+          # Ignore SC2034 since we have many var which are unused in the script but can be used while deployment at runtime by setting env. For eg: ${KOGITO_QUARKUS_JVM_PROPS}
+          # Ignore SC1090 since the source files in our case didn't need to be checked
+          shellcheck -e SC2034 -e SC1090 modules/**/configure modules/**/*.sh
\ No newline at end of file
diff --git a/modules/kogito-data-index-common/configure b/modules/kogito-data-index-common/configure
index 191fc9fc209..3c2e4e3deb6 100644
--- a/modules/kogito-data-index-common/configure
+++ b/modules/kogito-data-index-common/configure
@@ -2,10 +2,10 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
-mkdir -p ${KOGITO_HOME}/data/protobufs/
+mkdir -p "${KOGITO_HOME}"/data/protobufs/
 
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
\ No newline at end of file
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
\ No newline at end of file
diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
index 958283a99cc..0f8d20964ee 100644
--- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
@@ -15,11 +15,12 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+# shellcheck disable=SC2086
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
-        -Djava.library.path=$KOGITO_HOME/lib \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar $KOGITO_HOME/bin/data-index-service-infinispan.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/data-index-service-infinispan.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-infinispan/configure b/modules/kogito-data-index-infinispan/configure
index c88dcaec10c..ef5c9643efb 100644
--- a/modules/kogito-data-index-infinispan/configure
+++ b/modules/kogito-data-index-infinispan/configure
@@ -2,11 +2,11 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/data-index-service-infinispan.jar ${KOGITO_HOME}/bin/
+cp -v "${SOURCES_DIR}"/data-index-service-infinispan.jar "${KOGITO_HOME}"/bin/
 
-cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index 4455a92c992..eaa8c856f7a 100644
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
@@ -15,11 +15,12 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+# shellcheck disable=SC2086
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
-        -Djava.library.path=$KOGITO_HOME/lib \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar $KOGITO_HOME/bin/data-index-service-mongodb.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/data-index-service-mongodb.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-mongodb/configure b/modules/kogito-data-index-mongodb/configure
index bf3e68674e9..22738004df2 100644
--- a/modules/kogito-data-index-mongodb/configure
+++ b/modules/kogito-data-index-mongodb/configure
@@ -2,11 +2,11 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/data-index-service-mongodb.jar ${KOGITO_HOME}/bin/
+cp -v "${SOURCES_DIR}"/data-index-service-mongodb.jar "${KOGITO_HOME}"/bin/
 
-cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
index 1112987c872..49b928b9318 100644
--- a/modules/kogito-explainability/added/kogito-app-launch.sh
+++ b/modules/kogito-explainability/added/kogito-app-launch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
@@ -15,13 +15,14 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-explainability.sh
+  "${KOGITO_HOME}"/launch/kogito-explainability.sh
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+# shellcheck disable=SC2086
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} \
-        -Djava.library.path=$KOGITO_HOME/lib \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar $KOGITO_HOME/bin/$EXPLAINABILITY_SERVICE_JAR
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/"${EXPLAINABILITY_SERVICE_JAR}"
\ No newline at end of file
diff --git a/modules/kogito-explainability/added/launch/kogito-explainability.sh b/modules/kogito-explainability/added/launch/kogito-explainability.sh
index 282c23dae45..bbeccfafdee 100644
--- a/modules/kogito-explainability/added/launch/kogito-explainability.sh
+++ b/modules/kogito-explainability/added/launch/kogito-explainability.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
@@ -15,7 +15,7 @@ function configure() {
 function configure_explainability_jar {
     local allowed_communication_types=("REST" "MESSAGING")
     local communication="MESSAGING"
-    if [[ ! "${allowed_communication_types[@]}" =~ "${EXPLAINABILITY_COMMUNICATION^^}" ]]; then
+    if [[ ! "${allowed_communication_types[*]}" =~ ${EXPLAINABILITY_COMMUNICATION^^} ]]; then
         log_warning "Explainability communication type ${EXPLAINABILITY_COMMUNICATION} is not allowed, the allowed types are [${allowed_communication_types[*]}]. Defaulting to ${communication}."
     elif [ "${EXPLAINABILITY_COMMUNICATION^^}" == "REST" ]; then
         communication="${EXPLAINABILITY_COMMUNICATION^^}"
diff --git a/modules/kogito-explainability/configure b/modules/kogito-explainability/configure
index 3cea225bde5..8a1832dcdeb 100644
--- a/modules/kogito-explainability/configure
+++ b/modules/kogito-explainability/configure
@@ -2,16 +2,16 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/kogito-explainability-rest-runner.jar ${KOGITO_HOME}/bin/
-cp -v ${SOURCES_DIR}/kogito-explainability-messaging-runner.jar ${KOGITO_HOME}/bin/
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+cp -v "${SOURCES_DIR}"/kogito-explainability-rest-runner.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/kogito-explainability-messaging-runner.jar "${KOGITO_HOME}"/bin/
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
-cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
diff --git a/modules/kogito-explainability/tests/bats/kogito-explainability.bats b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
index ac70745b5e1..ef7cab617db 100644
--- a/modules/kogito-explainability/tests/bats/kogito-explainability.bats
+++ b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
@@ -1,15 +1,15 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=/tmp/kogito
-export HOME=$KOGITO_HOME
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+export HOME="${KOGITO_HOME}"
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-explainability.sh
 
 teardown() {
-    rm -rf ${KOGITO_HOME}
+    rm -rf "${KOGITO_HOME}"
 }
 
 
diff --git a/modules/kogito-graalvm-installer/20.x-java-1.8/configure b/modules/kogito-graalvm-installer/20.x-java-1.8/configure
index 30f63dfc37f..89d1e9e1345 100644
--- a/modules/kogito-graalvm-installer/20.x-java-1.8/configure
+++ b/modules/kogito-graalvm-installer/20.x-java-1.8/configure
@@ -2,13 +2,13 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(dirname "${0}")
 
-tar xzf ${SOURCES_DIR}/graalvm-ce-java${GRAALVM_JAVA_VERSION}-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION} /usr/share/graalvm
+tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr/share/graalvm
 
 #KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
-mkdir -p $KOGITO_HOME/ssl-libs
-cp -v $GRAALVM_HOME/jre/lib/amd64/libsunec.so $KOGITO_HOME/ssl-libs
-cp -v $GRAALVM_HOME/jre/lib/security/cacerts $KOGITO_HOME/
+mkdir -p "${KOGITO_HOME}"/ssl-libs
+cp -v "$GRAALVM_HOME"/jre/lib/amd64/libsunec.so "${KOGITO_HOME}"/ssl-libs
+cp -v "$GRAALVM_HOME"/jre/lib/security/cacerts "${KOGITO_HOME}"/
 
diff --git a/modules/kogito-graalvm-installer/20.x-java-11/configure b/modules/kogito-graalvm-installer/20.x-java-11/configure
index 675b2c071ab..939cb569277 100644
--- a/modules/kogito-graalvm-installer/20.x-java-11/configure
+++ b/modules/kogito-graalvm-installer/20.x-java-11/configure
@@ -2,13 +2,13 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(dirname "${0}")
 
-tar xzf ${SOURCES_DIR}/graalvm-ce-java${GRAALVM_JAVA_VERSION}-linux-amd64-${GRAALVM_VERSION}.tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION} /usr/share/graalvm
+tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr/share/graalvm
 
 #KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
-mkdir -p $KOGITO_HOME/ssl-libs
-cp -v $GRAALVM_HOME/lib/libsunec.so $KOGITO_HOME/ssl-libs
-cp -v $GRAALVM_HOME/lib/security/cacerts $KOGITO_HOME/
+mkdir -p "${KOGITO_HOME}"/ssl-libs
+cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
+cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
 
diff --git a/modules/kogito-graalvm-scripts/added/memory-limit.sh b/modules/kogito-graalvm-scripts/added/memory-limit.sh
index e2877730514..867cf2fb798 100644
--- a/modules/kogito-graalvm-scripts/added/memory-limit.sh
+++ b/modules/kogito-graalvm-scripts/added/memory-limit.sh
@@ -12,7 +12,7 @@
 # its value must be in binary bytes.
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 function configure() {
     # does not accepts
@@ -20,11 +20,11 @@ function configure() {
         # native builds requires at least 1024m (1073741824=1024MB - 1 MB = 2^20 B in base 2)
         local limit=1073741824
         # only 80% of the actual limit will be used for the JVM
-        local jvm_limit_memory=$(($LIMIT_MEMORY*80/100))
+        local jvm_limit_memory=$(("${LIMIT_MEMORY}"*80/100))
         log_info "Limit memory for this container is set to ${LIMIT_MEMORY}. Allocated memory for JVM will be set to ${jvm_limit_memory}."
         if [ "${jvm_limit_memory}" -lt "${limit}" ]; then
             limit=$(echo "scale=1; ${limit} / (80/100)" | bc -l)
-            printf "Provided memory (${LIMIT_MEMORY}) limit is too small (should be greater then %.0f bytes), native build will use all available memory.\n" $limit
+            printf "Provided memory (${LIMIT_MEMORY}) limit is too small (should be greater then %.0f bytes), native build will use all available memory.\n" "${limit}"
         else
             export KOGITO_OPTS="${KOGITO_OPTS} -Dnative-image.xmx=${jvm_limit_memory}"
         fi
diff --git a/modules/kogito-graalvm-scripts/configure b/modules/kogito-graalvm-scripts/configure
index 905e5f454d2..7e00fb055df 100644
--- a/modules/kogito-graalvm-scripts/configure
+++ b/modules/kogito-graalvm-scripts/configure
@@ -2,8 +2,8 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(dirname "${0}")
 
-cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
 
-/usr/share/graalvm/bin/gu -L install ${SOURCES_DIR}/native-image-installable-svm-java${GRAALVM_JAVA_VERSION}-linux-amd64-${GRAALVM_VERSION}.jar
+/usr/share/graalvm/bin/gu -L install "${SOURCES_DIR}"/native-image-installable-svm-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".jar
diff --git a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats b/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
index a1250a6c01e..eb147deb345 100644
--- a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
+++ b/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
@@ -1,8 +1,8 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=/tmp/kogito
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 
 # imports
 source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
diff --git a/modules/kogito-jobs-service/added/kogito-app-launch.sh b/modules/kogito-jobs-service/added/kogito-app-launch.sh
index cf937682de3..92b558eb8db 100644
--- a/modules/kogito-jobs-service/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service/added/kogito-app-launch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
@@ -14,12 +14,13 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-jobs-service.sh
+  "${KOGITO_HOME}"/launch/kogito-jobs-service.sh
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+# shellcheck disable=SC2086
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} \
     -Dquarkus.http.host=0.0.0.0 \
     -Dquarkus.http.port=8080 \
-    -jar $KOGITO_HOME/bin/kogito-jobs-service-runner.jar
+    -jar "${KOGITO_HOME}"/bin/kogito-jobs-service-runner.jar
diff --git a/modules/kogito-jobs-service/configure b/modules/kogito-jobs-service/configure
index 5745ad982cf..956d07b97f8 100644
--- a/modules/kogito-jobs-service/configure
+++ b/modules/kogito-jobs-service/configure
@@ -2,15 +2,15 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/kogito-jobs-service-runner.jar ${KOGITO_HOME}/bin/
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+cp -v "${SOURCES_DIR}"/kogito-jobs-service-runner.jar "${KOGITO_HOME}"/bin/
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
-cp ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index dca53281bc2..df0f9b6a742 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -1,16 +1,16 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=/tmp/kogito
-export HOME=$KOGITO_HOME
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+export HOME="${KOGITO_HOME}"
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-jobs-service.sh
 
 
 teardown() {
-    rm -rf ${KOGITO_HOME}
+    rm -rf "${KOGITO_HOME}"
 }
 
 @test "check if the persistence is correctly configured with auth" {
diff --git a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
index 0dce31dc1a8..472588e9066 100644
--- a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
+++ b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # imports
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 # checks if this script is running on a Kubernetes environment
 function is_running_on_kubernetes() {
@@ -28,13 +28,13 @@ function list_or_get_k8s_resource() {
     log_info "--> [k8s-client] Trying to fetch Kubernetes API ${api} for resource ${resource}"
 
     if is_running_on_kubernetes; then 
-        local namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
-        local token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
-        local response=$(curl -s -w "%{http_code}" --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
+        namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
+        token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
+        response=$(curl -s -w "%{http_code}" --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
             -H "Authorization: Bearer $token" \
             -H 'Accept: application/json' \
-            ${KUBERNETES_SERVICE_PROTOCOL:-https}://${KUBERNETES_SERVICE_HOST:-kubernetes.default.svc}:${KUBERNETES_SERVICE_PORT:-443}/${api}/v1/namespaces/${namespace}/${resource}?labelSelector=${labels}\&fieldSelector=${fields})
-        log_info ${response}
+            "${KUBERNETES_SERVICE_PROTOCOL:-https}://${KUBERNETES_SERVICE_HOST:-kubernetes.default.svc}:${KUBERNETES_SERVICE_PORT:-443}/${api}/v1/namespaces/${namespace}/${resource}?labelSelector=${labels}\&fieldSelector=${fields}")
+        log_info "${response}"
     else
         log_info "--> [k8s-client] Not running on Kubernetes, skipping..."
     fi
@@ -53,15 +53,15 @@ function patch_json_k8s_resource() {
     log_info "--> [k8s-client] Trying to patch resource ${resource} in Kubernetes API ${api}"
 
     if is_running_on_kubernetes; then
-        local namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
-        local token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
-        local response=$(curl --request PATCH -s -w "%{http_code}" --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
+        namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
+        token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
+        response=$(curl --request PATCH -s -w "%{http_code}" --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
             -H "Authorization: Bearer $token" \
             -H 'Accept: application/json' \
             -H 'Content-Type: application/json-patch+json' \
             --data "@${file}" \
-            ${KUBERNETES_SERVICE_PROTOCOL:-https}://${KUBERNETES_SERVICE_HOST:-kubernetes.default.svc}:${KUBERNETES_SERVICE_PORT:-443}/${api}/v1/namespaces/${namespace}/${resource})
-        echo ${response}
+            "${KUBERNETES_SERVICE_PROTOCOL:-https}://${KUBERNETES_SERVICE_HOST:-kubernetes.default.svc}:${KUBERNETES_SERVICE_PORT:-443}/${api}/v1/namespaces/${namespace}/${resource}")
+        echo "${response}"
     else
         log_info "--> [k8s-client] Not running on Kubernetes, skipping..."
     fi
diff --git a/modules/kogito-kubernetes-client/configure b/modules/kogito-kubernetes-client/configure
index 5784df283c7..9a5ee7cebdd 100644
--- a/modules/kogito-kubernetes-client/configure
+++ b/modules/kogito-kubernetes-client/configure
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(dirname "${0}")
 
 # kogito-kubernetes-client
-mkdir -p ${KOGITO_HOME}/launch/
-cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
-chmod +x-w ${KOGITO_HOME}/launch/kogito-kubernetes-client.sh
\ No newline at end of file
+mkdir -p "${KOGITO_HOME}"/launch/
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
+chmod +x-w "${KOGITO_HOME}"/launch/kogito-kubernetes-client.sh
\ No newline at end of file
diff --git a/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats b/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
index 850030cefd6..10876f6cf7c 100644
--- a/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
+++ b/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
@@ -1,9 +1,9 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=$BATS_TMPDIR/kogito_home
-mkdir -p $KOGITO_HOME/launch
+mkdir -p "${KOGITO_HOME}"/launch
 
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh $KOGITO_HOME/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 
 # imports
 source $BATS_TEST_DIRNAME/../../added/kogito-kubernetes-client.sh
diff --git a/modules/kogito-launch-scripts/added/configure.sh b/modules/kogito-launch-scripts/added/configure.sh
index 0f3f3ad23a5..1e24088305e 100644
--- a/modules/kogito-launch-scripts/added/configure.sh
+++ b/modules/kogito-launch-scripts/added/configure.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # This script executes a list of modules defined by CONFIGURE_SCRIPTS.
 #
 # Configuration occurs over three basic phases: preConfigure, configure and
@@ -47,7 +47,7 @@
 #
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 # clear functions from any previous module
 function prepareModule() {
@@ -65,18 +65,18 @@ function prepareModule() {
 # $1 - module file
 # $2 - function name
 function executeModule() {
-  source $1;
-  if [ -n "$(type -t $2)" ]; then
-    eval $2
+  source "$1"
+  if [ -n "$(type -t "$2")" ]; then
+    eval "$2"
   fi
 }
 
 # Run through the list of scripts, executing the specified function for each.
 # $1 - function name
 function executeModules() {
-  for module in ${CONFIGURE_SCRIPTS[@]}; do
+  for module in ${CONFIGURE_SCRIPTS[*]}; do
     prepareModule
-    executeModule $module $1
+    executeModule "${module}" "${1}"
   done
 }
 
@@ -88,23 +88,20 @@ function executeModules() {
 # (i.e. we don't have to run prepareEnv for each file).
 function processEnvFiles() {
   if [ -n "$ENV_FILES" ]; then
-    (
-      executeModules prepareEnv
-      for prop_file_arg in $(echo $ENV_FILES | sed "s/,/ /g"); do
-        for prop_file in $(find $prop_file_arg -maxdepth 0 2>/dev/null); do
-          (
-            if [ -f $prop_file ]; then
-              source $prop_file
-              executeModules preConfigureEnv
-              executeModules configureEnv
-              executeModules postConfigureEnv
-            else
-              log_warning "Could not process environment for $prop_file.  File does not exist."
-            fi
-          )
-        done
-      done
-    )
+    executeModules prepareEnv
+    for prop_file_arg in ${ENV_FILES//,/ }; do
+      while IFS= read -r -d '' prop_file
+        do
+          if [ -f "${prop_file}" ]; then
+            source "${prop_file}"
+            executeModules preConfigureEnv
+            executeModules configureEnv
+            executeModules postConfigureEnv
+          else
+            log_warning "Could not process environment for ${prop_file}.  File does not exist."
+          fi
+        done < <(find "${prop_file_arg}" -maxdepth 0 2>/dev/null)
+    done
   fi
 }
 
diff --git a/modules/kogito-launch-scripts/configure b/modules/kogito-launch-scripts/configure
index 079c3763968..96e16a503b0 100644
--- a/modules/kogito-launch-scripts/configure
+++ b/modules/kogito-launch-scripts/configure
@@ -2,7 +2,7 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(dirname "${0}")
 
-mkdir -p ${KOGITO_HOME}/launch
-cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch
\ No newline at end of file
+mkdir -p "${KOGITO_HOME}"/launch
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch
\ No newline at end of file
diff --git a/modules/kogito-logging/configure b/modules/kogito-logging/configure
index 12d94d9ade4..620777ae54d 100644
--- a/modules/kogito-logging/configure
+++ b/modules/kogito-logging/configure
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(dirname "${0}")
 
 # logging
-mkdir -p ${KOGITO_HOME}/launch/
-cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
-chmod +x-w ${KOGITO_HOME}/launch/logging.sh
\ No newline at end of file
+mkdir -p "${KOGITO_HOME}"/launch/
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
+chmod +x-w "${KOGITO_HOME}"/launch/logging.sh
\ No newline at end of file
diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
index 505983fe4a0..0a22fa3a29a 100644
--- a/modules/kogito-management-console/added/kogito-app-launch.sh
+++ b/modules/kogito-management-console/added/kogito-app-launch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
@@ -14,12 +14,13 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-management-console.sh
+  "${KOGITO_HOME}"/launch/kogito-management-console.sh
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+# shellcheck disable=SC2086
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar $KOGITO_HOME/bin/kogito-management-console-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/kogito-management-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-management-console/added/launch/kogito-management-console.sh b/modules/kogito-management-console/added/launch/kogito-management-console.sh
index e0e0b6e3648..185ee85f0d2 100644
--- a/modules/kogito-management-console/added/launch/kogito-management-console.sh
+++ b/modules/kogito-management-console/added/launch/kogito-management-console.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
diff --git a/modules/kogito-management-console/configure b/modules/kogito-management-console/configure
index 51aeeaec17e..dce541167fd 100644
--- a/modules/kogito-management-console/configure
+++ b/modules/kogito-management-console/configure
@@ -2,15 +2,15 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/kogito-management-console-runner.jar ${KOGITO_HOME}/bin/
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+cp -v "${SOURCES_DIR}"/kogito-management-console-runner.jar "${KOGITO_HOME}"/bin/
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
-cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
diff --git a/modules/kogito-management-console/tests/bats/kogito-management-console.bats b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
index f0c063ce7e3..cd7e2b033ce 100644
--- a/modules/kogito-management-console/tests/bats/kogito-management-console.bats
+++ b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
@@ -1,15 +1,15 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=/tmp/kogito
-export HOME=$KOGITO_HOME
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+export HOME="${KOGITO_HOME}"
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-management-console.sh
 
 teardown() {
-    rm -rf ${KOGITO_HOME}
+    rm -rf "${KOGITO_HOME}"
 }
 
 @test "test if the default value for data-index url will be set" {
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index 800e054c2aa..f5731bd6e7b 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -42,11 +42,11 @@ function configure_proxy() {
     proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}}
     # if http_proxy_host/port is set, prefer that (oldest mechanism)
     # before looking at HTTP(S)_PROXY
-    proxyhost=${HTTP_PROXY_HOST:-$(echo $proxy | cut -d : -f 1,2)}
-    proxyport=${HTTP_PROXY_PORT:-$(echo $proxy | cut -d : -f 3)}
+    proxyhost=${HTTP_PROXY_HOST:-$(echo "${proxy}" | cut -d : -f 1,2)}
+    proxyport=${HTTP_PROXY_PORT:-$(echo "${proxy}" | cut -d : -f 3)}
 
     if [ -n "$proxyhost" ]; then
-        if [[ `echo $proxyhost | grep -i https://` ]]; then
+        if echo "${proxyhost}" | grep -q -i https://; then
           proxyport=${proxyport:-443}
           proxyprotocol="https"
         else
@@ -61,19 +61,19 @@ function configure_proxy() {
          <host>$proxyhost</host>\
          <port>$proxyport</port>"
 
-        if [ -n "$HTTP_PROXY_USERNAME" -a -n "$HTTP_PROXY_PASSWORD" ]; then
+        if [ -n "$HTTP_PROXY_USERNAME" ] && [ -n "$HTTP_PROXY_PASSWORD" ]; then
             xml="$xml\
          <username>$HTTP_PROXY_USERNAME</username>\
          <password>$HTTP_PROXY_PASSWORD</password>"
         fi
         if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then
-            nonproxyhosts=$(echo ${HTTP_PROXY_NONPROXYHOSTS} | sed -e 's/|/\\|/')
+            nonproxyhosts="${HTTP_PROXY_NONPROXYHOSTS//|/\\|}"
             xml="$xml\
          <nonProxyHosts>$nonproxyhosts</nonProxyHosts>"
         fi
         xml="$xml\
        </proxy>"
-        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" $HOME/.m2/settings.xml
+        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${HOME}"/.m2/settings.xml
     fi
 }
 
@@ -85,7 +85,7 @@ function configure_mirrors() {
       <url>$MAVEN_MIRROR_URL</url>\
       <mirrorOf>external:*</mirrorOf>\
     </mirror>"
-        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" $HOME/.m2/settings.xml
+        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${HOME}"/.m2/settings.xml
     fi
 }
 
@@ -104,7 +104,7 @@ function ignore_maven_self_signed_certificates() {
 function set_kogito_maven_repo() {
     local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
     if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" $HOME/.m2/settings.xml
+        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${HOME}"/.m2/settings.xml
     fi
 }
 
@@ -112,18 +112,18 @@ function add_maven_repo() {
     # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service
     local single_repo_url="${MAVEN_REPO_URL}"
     if [ -n "$single_repo_url" ]; then
-        local single_repo_id=$(_maven_find_env "MAVEN_REPO_ID" "repo-$(_generate_random_id)")
+        single_repo_id=$(_maven_find_env "MAVEN_REPO_ID" "repo-$(_generate_random_id)")
         _add_maven_repo "$single_repo_url" "$single_repo_id" ""
     fi
 
     # multiple remote repositories scenario: respect fully qualified url(s) if specified, otherwise find and use service(s); can be used together with "single repo scenario" above
     local multi_repo_counter=1
-    IFS=',' read -a multi_repo_prefixes <<< ${MAVEN_REPOS}
-    for multi_repo_prefix in ${multi_repo_prefixes[@]}; do
-        local multi_repo_url=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_URL")
-        local multi_repo_id=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_ID" "repo${multi_repo_counter}-$(_generate_random_id)")
+    IFS=',' read -r -a multi_repo_prefixes <<<"${MAVEN_REPOS}"
+    for multi_repo_prefix in "${multi_repo_prefixes[@]}"; do
+        multi_repo_url=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_URL")
+        multi_repo_id=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_ID" "repo${multi_repo_counter}-$(_generate_random_id)")
         _add_maven_repo "$multi_repo_url" "$multi_repo_id" "$multi_repo_prefix"
-        multi_repo_counter=$((multi_repo_counter+1))
+        multi_repo_counter=$((multi_repo_counter + 1))
     done
 }
 # add maven repositories
@@ -136,14 +136,14 @@ function _add_maven_repo() {
     local repo_id=$2
     local prefix=$3
 
-    local repo_name=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_NAME" "${repo_id}")
-    local repo_layout=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_LAYOUT" "default")
-    local releases_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_ENABLED" "true")
-    local releases_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_UPDATE_POLICY" "always")
-    local releases_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" "warn")
-    local snapshots_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_ENABLED" "true")
-    local snapshots_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" "always")
-    local snapshots_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" "warn")
+    repo_name=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_NAME" "${repo_id}")
+    repo_layout=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_LAYOUT" "default")
+    releases_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_ENABLED" "true")
+    releases_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_UPDATE_POLICY" "always")
+    releases_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" "warn")
+    snapshots_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_ENABLED" "true")
+    snapshots_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" "always")
+    snapshots_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" "warn")
 
     local repo="\n\
                 <repository>\n\
@@ -163,8 +163,7 @@ function _add_maven_repo() {
                     </snapshots>\n\
                 </repository>\n\
                 <!-- ### configured repositories ### -->"
-    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" $HOME/.m2/settings.xml
-
+    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${HOME}"/.m2/settings.xml
 
     local pluginRepo="\n\
                 <pluginRepository>\n\
@@ -185,10 +184,10 @@ function _add_maven_repo() {
                 </pluginRepository>\n\
                 <!-- ### configured plugin repositories ### -->"
 
-    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" $HOME/.m2/settings.xml
+    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${HOME}"/.m2/settings.xml
 
     # new repo should be skipped by mirror if exists
-    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" $HOME/.m2/settings.xml
+    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${HOME}"/.m2/settings.xml
 }
 
 # Finds the environment variable  and returns its value if found.
@@ -214,18 +213,17 @@ function _maven_find_prefixed_env() {
     local prefix=$1
 
     if [[ -z $prefix ]]; then
-        _maven_find_env $2 $3
+        _maven_find_env "${2}" "${3}"
     else
         prefix=${prefix^^} # uppercase
         prefix=${prefix//-/_} #replace - by _
 
-        local var_name=$prefix"_"$2
-        echo ${!var_name:-$3}
+        local var_name="${prefix}_${2}"
+        echo "${!var_name:-${3}}"
       fi
 }
 
 # private
 function _generate_random_id() {
-    cat /dev/urandom | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
+    env LC_CTYPE=C < /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
 }
-
diff --git a/modules/kogito-maven/3.6.x/configure b/modules/kogito-maven/3.6.x/configure
index 5a70a5b1b45..aed8260a9ba 100644
--- a/modules/kogito-maven/3.6.x/configure
+++ b/modules/kogito-maven/3.6.x/configure
@@ -2,11 +2,11 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(dirname "${0}")
 
-tar xzf ${SOURCES_DIR}/apache-maven-${MAVEN_VERSION}-bin.tar.gz -C /usr/share
-mv /usr/share/apache-maven-${MAVEN_VERSION} /usr/share/maven
+tar xzf "${SOURCES_DIR}"/apache-maven-"${MAVEN_VERSION}"-bin.tar.gz -C /usr/share
+mv /usr/share/apache-maven-"${MAVEN_VERSION}" /usr/share/maven
 
-mkdir ${KOGITO_HOME}/.m2
-cp -v ${SCRIPT_DIR}/maven/* ${KOGITO_HOME}/.m2
-cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
\ No newline at end of file
+mkdir "${KOGITO_HOME}"/.m2
+cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
\ No newline at end of file
diff --git a/modules/kogito-persistence/added/kogito-persistence.sh b/modules/kogito-persistence/added/kogito-persistence.sh
index 4e48d9f0a4f..2eddd40152b 100644
--- a/modules/kogito-persistence/added/kogito-persistence.sh
+++ b/modules/kogito-persistence/added/kogito-persistence.sh
@@ -1,38 +1,38 @@
 #!/usr/bin/env bash
 
 # imports
-source ${KOGITO_HOME}/launch/kogito-kubernetes-client.sh
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/kogito-kubernetes-client.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 # copies the generated persistence files to
-# $KOGITO_HOME/bin, that's the directory used to exchange files between builds
+# "${KOGITO_HOME}"/bin, that's the directory used to exchange files between builds
 # TODO: copy those files directly to the final dir only when bin is not used to exchange data anymore
 function copy_persistence_files() {
     local persistenceDir="target"
-    if [ ! -z "${ARTIFACT_DIR}" ]; then
+    if [ -n "${ARTIFACT_DIR}" ]; then
         persistenceDir="${ARTIFACT_DIR}"
     fi
 
     log_info "---> [persistence] Copying persistence files..."
-    if [ -d /tmp/src/${persistenceDir}/classes/persistence ]; then
-        cp -v /tmp/src/${persistenceDir}/classes/persistence/* $KOGITO_HOME/bin/
+    if [ -d /tmp/src/"${persistenceDir}"/classes/persistence ]; then
+        cp -v /tmp/src/"${persistenceDir}"/classes/persistence/* "${KOGITO_HOME}"/bin/
         # we don't need this file to be indexed
-        rm -rfv $KOGITO_HOME/bin/kogito-application.proto
+        rm -rfv "${KOGITO_HOME}"/bin/kogito-application.proto
         move_persistence_files
     else
         log_info "---> [persistence] Skip copying files, persistence directory does not exist..."
     fi
 }
 
-# move_persistence_files moves persistence files from $KOGITO_HOME/bin to the final directory
+# move_persistence_files moves persistence files from "${KOGITO_HOME}"/bin to the final directory
 # where those files will be handled by the runtime image.
 # TODO: remove this function when s2i build move the KOGITO_HOME instead bin directory between images in chained builds
 function move_persistence_files() {
     log_info "---> [persistence] Moving persistence files to final directory"
-    if ls $KOGITO_HOME/bin/*.proto &>/dev/null; then
+    if ls "${KOGITO_HOME}"/bin/*.proto &>/dev/null; then
         # copy to the final dir, so we keep bin clean
-        cp -v $KOGITO_HOME/bin/*.proto $KOGITO_HOME/data/protobufs/
+        cp -v "${KOGITO_HOME}"/bin/*.proto "${KOGITO_HOME}"/data/protobufs/
     else
-        log_info "---> [persistence] Skip copying files, $KOGITO_HOME/bin directory does not have proto files!"
+        log_info "---> [persistence] Skip copying files, ${KOGITO_HOME}/bin directory does not have proto files!"
     fi
 }
diff --git a/modules/kogito-persistence/configure b/modules/kogito-persistence/configure
index b90cd469bb9..af187835961 100644
--- a/modules/kogito-persistence/configure
+++ b/modules/kogito-persistence/configure
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(dirname "${0}")
 
 # kogito-persistence
-mkdir -p ${KOGITO_HOME}/launch/
-cp -v ${SCRIPT_DIR}/added/* ${KOGITO_HOME}/launch/
-chmod +x-w ${KOGITO_HOME}/launch/kogito-persistence.sh
+mkdir -p "${KOGITO_HOME}"/launch/
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
+chmod +x-w "${KOGITO_HOME}"/launch/kogito-persistence.sh
 
-mkdir -p ${KOGITO_HOME}/data/protobufs
-chmod +w ${KOGITO_HOME}/data/protobufs
+mkdir -p "${KOGITO_HOME}"/data/protobufs
+chmod +w "${KOGITO_HOME}"/data/protobufs
diff --git a/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
index 6c971c73b11..2dbc317cd5f 100644
--- a/modules/kogito-persistence/tests/bats/kogito-persistence.bats
+++ b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
@@ -2,27 +2,27 @@
 
 export KOGITO_HOME=$BATS_TMPDIR/kogito_home
 export MOCK_RESPONSE=""
-mkdir -p $KOGITO_HOME/launch
+mkdir -p "${KOGITO_HOME}"/launch
 
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh $KOGITO_HOME/launch/
-cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh $KOGITO_HOME/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh "${KOGITO_HOME}"/launch/
 
 # imports
 source $BATS_TEST_DIRNAME/../../added/kogito-persistence.sh
 
 setup() {
-    export HOME=$KOGITO_HOME
-    mkdir -p ${KOGITO_HOME}
-    mkdir -p $KOGITO_HOME/bin
-    mkdir -p $KOGITO_HOME/data/protobufs/
-    mkdir -p $KOGITO_HOME/podinfo
-    echo "exampleapp-cm" > $KOGITO_HOME/podinfo/protobufcm
+    export HOME="${KOGITO_HOME}"
+    mkdir -p "${KOGITO_HOME}"
+    mkdir -p "${KOGITO_HOME}"/bin
+    mkdir -p "${KOGITO_HOME}"/data/protobufs/
+    mkdir -p "${KOGITO_HOME}"/podinfo
+    echo "exampleapp-cm" > "${KOGITO_HOME}"/podinfo/protobufcm
 }
 
 teardown() {
-    rm -rf ${KOGITO_HOME}
+    rm -rf "${KOGITO_HOME}"
     rm -rf /tmp/src
-    rm -rf $KOGITO_HOME/bin/*
+    rm -rf "${KOGITO_HOME}"/bin/*
 }
 
 @test "There's some proto files in the target directory" {
@@ -35,11 +35,11 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "INFO ---> [persistence] Copying persistence files..." ]
-    [ "${lines[1]}" = "'/tmp/src/target/classes/persistence/file1.proto' -> '${KOGITO_HOME}/bin/file1.proto'" ]
-    [ "${lines[2]}" = "'/tmp/src/target/classes/persistence/kogito-application.proto' -> '${KOGITO_HOME}/bin/kogito-application.proto'" ]
-    [ "${lines[3]}" = "removed '${KOGITO_HOME}/bin/kogito-application.proto'" ]
+    [ "${lines[1]}" = "'/tmp/src/target/classes/persistence/file1.proto' -> '"${KOGITO_HOME}"/bin/file1.proto'" ]
+    [ "${lines[2]}" = "'/tmp/src/target/classes/persistence/kogito-application.proto' -> '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
+    [ "${lines[3]}" = "removed '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
     [ "${lines[4]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
-    [ "${lines[5]}" = "'${KOGITO_HOME}/bin/file1.proto' -> '${KOGITO_HOME}/data/protobufs/file1.proto'" ]
+    [ "${lines[5]}" = "'"${KOGITO_HOME}"/bin/file1.proto' -> '"${KOGITO_HOME}"/data/protobufs/file1.proto'" ]
 }
 
 @test "There are no persistence files" {
@@ -55,7 +55,7 @@ teardown() {
 }
 
 @test "There's some proto files in the bin directory" {
-    touch $KOGITO_HOME/bin/file1.proto
+    touch "${KOGITO_HOME}"/bin/file1.proto
 
     run move_persistence_files
 
@@ -63,7 +63,7 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
-    [ "${lines[1]}" = "'${KOGITO_HOME}/bin/file1.proto' -> '${KOGITO_HOME}/data/protobufs/file1.proto'" ]
+    [ "${lines[1]}" = "'"${KOGITO_HOME}"/bin/file1.proto' -> '"${KOGITO_HOME}"/data/protobufs/file1.proto'" ]
 }
 
 @test "There's no proto files in the bin directory" {
@@ -73,5 +73,5 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
-    [ "${lines[1]}" = "INFO ---> [persistence] Skip copying files, ${KOGITO_HOME}/bin directory does not have proto files!" ]
+    [ "${lines[1]}" = "INFO ---> [persistence] Skip copying files, "${KOGITO_HOME}"/bin directory does not have proto files!" ]
 }
diff --git a/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh b/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
index 57abe77d0d9..1f9d8a7c2cd 100644
--- a/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
@@ -17,10 +17,11 @@ fi
 CONFIGURE_SCRIPTS=(
 
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+# shellcheck disable=SC2086
 exec java ${JAVA_OPTIONS}  ${KOGITO_QUARKUS_JVM_PROPS} \
       -Dquarkus.http.host=0.0.0.0 \
       -Dquarkus.http.port=8080 \
-      -jar $KOGITO_HOME/bin/*runner.jar
+      -jar "${KOGITO_HOME}"/bin/*runner.jar
diff --git a/modules/kogito-quarkus-jvm/configure b/modules/kogito-quarkus-jvm/configure
index af3e51b84a2..79a6447b8d1 100644
--- a/modules/kogito-quarkus-jvm/configure
+++ b/modules/kogito-quarkus-jvm/configure
@@ -1,16 +1,16 @@
 #!/bin/sh
 
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
 # kogito-launch
-cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
-cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
+cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
diff --git a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
index 938f6a42afb..e63c11aa13a 100644
--- a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
@@ -16,14 +16,16 @@ fi
 CONFIGURE_SCRIPTS=(
 
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 if [ "${NATIVE^^}" == "TRUE" ]; then
-    exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
-         -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/ssl-libs \
+    # shellcheck disable=SC2086
+    exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
+         -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
          -Dquarkus.http.port=8080 \
-         -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
+         -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
 else
-    exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar $KOGITO_HOME/bin/*runner.jar
+    # shellcheck disable=SC2086
+    exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar "${KOGITO_HOME}"/bin/*runner.jar
 fi
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/configure b/modules/kogito-quarkus-s2i/configure
index 6879dba19ed..480c0383e9a 100644
--- a/modules/kogito-quarkus-s2i/configure
+++ b/modules/kogito-quarkus-s2i/configure
@@ -2,16 +2,16 @@
 
 set -e
 
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
 # kogito-launch
-cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
-chmod +x ${KOGITO_HOME}/kogito-app-launch.sh
+cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
+chmod +x "${KOGITO_HOME}"/kogito-app-launch.sh
 
-cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
+cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
diff --git a/modules/kogito-quarkus-s2i/s2i/bin/assemble b/modules/kogito-quarkus-s2i/s2i/bin/assemble
index 4aed09df11e..5af77c8ab39 100644
--- a/modules/kogito-quarkus-s2i/s2i/bin/assemble
+++ b/modules/kogito-quarkus-s2i/s2i/bin/assemble
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+
 #
 # S2I assemble script for the 'kogito-quarkus-ubi8-s2i' image.
 # The 'assemble' script builds your application source so that it is ready to run.
@@ -6,6 +7,7 @@
 # For more information refer to the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
+set -e
 
 source ${S2I_MODULE_LOCATION}/s2i-core
 
@@ -15,10 +17,10 @@ source ${S2I_MODULE_LOCATION}/s2i-core
 # file.
 # Configure GraalVM memory limits
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/configure-maven.sh
-  ${KOGITO_HOME}/launch/memory-limit.sh
+  "${KOGITO_HOME}"/launch/configure-maven.sh
+  "${KOGITO_HOME}"/launch/memory-limit.sh
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 
@@ -28,7 +30,7 @@ manage_incremental_build
 # kogito app build
 build_kogito_app $QUARKUS_RUNTIME_TYPE
 
-# copy kogito app to ${KOGITO_HOME}/bin dir
+# copy kogito app to "${KOGITO_HOME}"/bin dir
 copy_kogito_app
 
 # handle custom image-metadata.json
diff --git a/modules/kogito-quarkus/added/kogito-app-launch.sh b/modules/kogito-quarkus/added/kogito-app-launch.sh
index 23fce3e9752..5ed0bfe5fca 100644
--- a/modules/kogito-quarkus/added/kogito-app-launch.sh
+++ b/modules/kogito-quarkus/added/kogito-app-launch.sh
@@ -17,10 +17,11 @@ fi
 CONFIGURE_SCRIPTS=(
 
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
-exec $KOGITO_HOME/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_NATIVE_PROPS} \
-    -Dquarkus.http.host=0.0.0.0 -Djava.library.path=$KOGITO_HOME/ssl-libs \
+# shellcheck disable=SC2086
+exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_NATIVE_PROPS} \
+    -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
     -Dquarkus.http.port=8080 \
-    -Djavax.net.ssl.trustStore=$KOGITO_HOME/cacerts
+    -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
diff --git a/modules/kogito-quarkus/configure b/modules/kogito-quarkus/configure
index 94d2498a146..d6690bc28dd 100644
--- a/modules/kogito-quarkus/configure
+++ b/modules/kogito-quarkus/configure
@@ -1,20 +1,20 @@
 #!/bin/sh
 
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
 # kogito-launch
-cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
-cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
+cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
-rm -rf  ${KOGITO_HOME}/launch/memory-limit.sh
+rm -rf  "${KOGITO_HOME}"/launch/memory-limit.sh
 rm -rf /usr/share/graalvm
 
 unset JAVA_HOME
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 6751fe8effc..168a0ea70ba 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # imports
-source ${KOGITO_HOME}/launch/logging.sh
-source $KOGITO_HOME/launch/kogito-persistence.sh
+source "${KOGITO_HOME}"/launch/logging.sh
+source "${KOGITO_HOME}"/launch/kogito-persistence.sh
 
 S2I_DESTINATION_DIR="${S2I_DESTINATION_DIR:-/tmp}"
 S2I_ARTIFACTS_DIR="${S2I_DESTINATION_DIR}/artifacts"
@@ -33,17 +33,17 @@ function manage_incremental_build() {
 
 
 function assemble_runtime() {
-    if [ -d "$KOGITO_HOME/bin" ]; then
+    if [ -d ""${KOGITO_HOME}"/bin" ]; then
         log_info "---> Application binaries found and ready to use"
 
         log_info "---> [s2i-core] Adding custom labels..."
-        if [ -e "${KOGITO_HOME}/bin/image_metadata.json" ]; then
+        if [ -e ""${KOGITO_HOME}"/bin/image_metadata.json" ]; then
             mkdir -pv /tmp/.s2i
             mkdir -pv /tmp/src/.s2i/
-            cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-            cp -v $KOGITO_HOME/bin/image_metadata.json /tmp/src/.s2i/image_metadata.json
+            cp -v "${KOGITO_HOME}"/bin/image_metadata.json /tmp/.s2i/image_metadata.json
+            cp -v "${KOGITO_HOME}"/bin/image_metadata.json /tmp/src/.s2i/image_metadata.json
         else
-            log_info "-----> Failed to copy metadata file, $KOGITO_HOME/bin/image_metadata.json does not exist"
+            log_info "-----> Failed to copy metadata file, "${KOGITO_HOME}"/bin/image_metadata.json does not exist"
         fi
     else
         log_error "---> Application binaries NOT found, failing build..."
@@ -79,14 +79,14 @@ function runtime_assemble() {
         rm -rfv *-tests.jar
         rm -rfv *-sources.jar
 
-        log_info "-----> Copying uploaded files to ${KOGITO_HOME}"
+        log_info "-----> Copying uploaded files to "${KOGITO_HOME}""
         artifactDir="."
         ARTIFACT_DIR=$artifactDir
         handle_image_metadata_json
         copy_kogito_app
         copy_persistence_files
     else
-        cp -Rv --parents ./* ${KOGITO_HOME}/
+        cp -Rv --parents ./* "${KOGITO_HOME}"/
     fi
     assemble_runtime
     log_info "-----> Cleaning up s2i directory"
@@ -101,7 +101,7 @@ function handle_image_metadata_json() {
         mkdir -p /tmp/src/.s2i/
         cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/.s2i
         cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/src/.s2i
-        cp -v /tmp/src/$artifactDir/image_metadata.json $KOGITO_HOME/bin
+        cp -v /tmp/src/$artifactDir/image_metadata.json "${KOGITO_HOME}"/bin
     else
         log_info "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
     fi
@@ -124,7 +124,7 @@ function build_kogito_app() {
     if [ -f "pom.xml" ]; then
 
         log_info "---> Building application from source..."
-        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
+        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \
             -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
             -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 
@@ -143,7 +143,7 @@ function build_kogito_app() {
         log_info "---> Generating $RUNTIME_TYPE project structure..."
         $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=$ARCHETYPE_ARTIFACT_ID \
         -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
-        ${MAVEN_ARGS_APPEND} -s $KOGITO_HOME/.m2/settings.xml
+        ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml
 
         # remove resources generated by the archetype
         log_info "--> Remove archetype generated resources"
@@ -163,7 +163,7 @@ function build_kogito_app() {
         # move all project content into the current directory
         mv -v $PROJECT_ARTIFACT_ID/* .
 
-        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s $KOGITO_HOME/.m2/settings.xml \
+        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \
             -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
             -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
     fi
@@ -177,20 +177,20 @@ function copy_kogito_app() {
       if ls $artifactDir/*-runner 1> /dev/null 2>&1; then
         # quarkus native builds
         log_info "---> Installing application binaries"
-        cp -v $artifactDir/*-runner $KOGITO_HOME/bin/
-        chmod +x $KOGITO_HOME/bin/*-runner
+        cp -v $artifactDir/*-runner "${KOGITO_HOME}"/bin/
+        chmod +x "${KOGITO_HOME}"/bin/*-runner
       fi
     elif ls $artifactDir/*-runner.jar 1> /dev/null 2>&1; then
       # handle quarkus java build
         log_info "---> Installing jar file"
-        cp -v $artifactDir/*-runner.jar $KOGITO_HOME/bin
+        cp -v $artifactDir/*-runner.jar "${KOGITO_HOME}"/bin
         if [ -d "${artifactDir}/lib" ]; then
             log_info "---> Copying application libraries"
-            cp -r $artifactDir/lib/ $KOGITO_HOME/bin
+            cp -r $artifactDir/lib/ "${KOGITO_HOME}"/bin
         fi
     else
         # handle normal java builds
         log_info "---> Installing application binaries"
-        cp -v $artifactDir/*.jar $KOGITO_HOME/bin
+        cp -v $artifactDir/*.jar "${KOGITO_HOME}"/bin
     fi
 }
\ No newline at end of file
diff --git a/modules/kogito-s2i-core/configure.sh b/modules/kogito-s2i-core/configure.sh
index a36c6a60e01..e61ce36f462 100644
--- a/modules/kogito-s2i-core/configure.sh
+++ b/modules/kogito-s2i-core/configure.sh
@@ -2,11 +2,11 @@
 # Configure module
 set -e
 
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR="${SCRIPT_DIR}/added"
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
 mkdir "${S2I_MODULE_LOCATION}"
 
-cp -v "${ADDED_DIR}/s2i-core" "${S2I_MODULE_LOCATION}"
-cp -rv ${SCRIPT_DIR}/s2i/bin/* "${S2I_MODULE_LOCATION}"
-chmod 755 ${S2I_MODULE_LOCATION}/*
\ No newline at end of file
+cp -v "${ADDED_DIR}"/s2i-core "${S2I_MODULE_LOCATION}"
+cp -rv "${SCRIPT_DIR}"/s2i/bin/* "${S2I_MODULE_LOCATION}"
+chmod 755 "${S2I_MODULE_LOCATION}"/*
\ No newline at end of file
diff --git a/modules/kogito-s2i-core/s2i/bin/run b/modules/kogito-s2i-core/s2i/bin/run
index c4da5b28200..e4379a95a5f 100644
--- a/modules/kogito-s2i-core/s2i/bin/run
+++ b/modules/kogito-s2i-core/s2i/bin/run
@@ -1,2 +1,3 @@
-#!/bin/bash -e
-exec $KOGITO_HOME/kogito-app-launch.sh ${1}
\ No newline at end of file
+#!/usr/bin/env bash
+set -e
+exec "${KOGITO_HOME}"/kogito-app-launch.sh ${1}
\ No newline at end of file
diff --git a/modules/kogito-s2i-core/s2i/bin/save-artifacts b/modules/kogito-s2i-core/s2i/bin/save-artifacts
index a610901f6cf..46e04c06080 100644
--- a/modules/kogito-s2i-core/s2i/bin/save-artifacts
+++ b/modules/kogito-s2i-core/s2i/bin/save-artifacts
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cd ${HOME}
 tar cf - .m2
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 03a61627517..c4a19618813 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -1,28 +1,28 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=$BATS_TMPDIR/kogito_home
-mkdir -p ${KOGITO_HOME}/launch/
+mkdir -p "${KOGITO_HOME}"/launch/
 
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh $KOGITO_HOME/launch/
-cp $BATS_TEST_DIRNAME/../../../kogito-persistence/added/kogito-persistence.sh $KOGITO_HOME/launch/
-cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh $KOGITO_HOME/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-persistence/added/kogito-persistence.sh "${KOGITO_HOME}"/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh "${KOGITO_HOME}"/launch/
 
 # imports
 source $BATS_TEST_DIRNAME/../../added/s2i-core
 
 setup() {
-    export HOME=$KOGITO_HOME
+    export HOME="${KOGITO_HOME}"
     mkdir -p target
     function log_error() { echo "${1}"; }
     function log_info() { echo "${1}"; }
 }
 
 teardown() {
-    rm -rf ${KOGITO_HOME}/bin
+    rm -rf "${KOGITO_HOME}"/bin
     rm -rf /tmp/.s2i
     rm -rf /tmp/src
     rm -rf target
-    rm -rf $KOGITO_HOME/bin/*
+    rm -rf "${KOGITO_HOME}"/bin/*
 }
 
 
@@ -64,27 +64,27 @@ teardown() {
 
 
 @test "test assemble_runtime with binaries binaries" {
-    mkdir $KOGITO_HOME/bin
-    touch $KOGITO_HOME/bin/artifact.jar
+    mkdir "${KOGITO_HOME}"/bin
+    touch "${KOGITO_HOME}"/bin/artifact.jar
 
     run assemble_runtime
 
-    rm -rf $KOGITO_HOME/bin/image_metadata.json
-    rm -rf $KOGITO_HOME/bin/artifact.jar
+    rm -rf "${KOGITO_HOME}"/bin/image_metadata.json
+    rm -rf "${KOGITO_HOME}"/bin/artifact.jar
 
     echo "result= ${lines[@]}"
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Application binaries found and ready to use" ]
     [ "${lines[1]}" = "---> [s2i-core] Adding custom labels..." ]
-    [ "${lines[2]}" = "-----> Failed to copy metadata file, ${KOGITO_HOME}/bin/image_metadata.json does not exist" ]
+    [ "${lines[2]}" = "-----> Failed to copy metadata file, "${KOGITO_HOME}"/bin/image_metadata.json does not exist" ]
 }
 
 
 @test "test assemble_runtime with binaries binaries and metadata" {
-    mkdir $KOGITO_HOME/bin
-    touch $KOGITO_HOME/bin/image_metadata.json
-    touch $KOGITO_HOME/bin/artifact.jar
+    mkdir "${KOGITO_HOME}"/bin
+    touch "${KOGITO_HOME}"/bin/image_metadata.json
+    touch "${KOGITO_HOME}"/bin/artifact.jar
 
     run assemble_runtime
 
@@ -96,13 +96,13 @@ teardown() {
     [ "${lines[2]}" = "mkdir: created directory '/tmp/.s2i'" ]
     [ "${lines[3]}" = "mkdir: created directory '/tmp/src'" ]
     [ "${lines[4]}" = "mkdir: created directory '/tmp/src/.s2i/'" ]
-    [ "${lines[5]}" = "'$KOGITO_HOME/bin/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
-    [ "${lines[6]}" = "'$KOGITO_HOME/bin/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
+    [ "${lines[5]}" = "'"${KOGITO_HOME}"/bin/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
+    [ "${lines[6]}" = "'"${KOGITO_HOME}"/bin/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
 
 }
 
 @test "test runtime_assemble" {
-    mkdir -p ${KOGITO_HOME}/bin
+    mkdir -p "${KOGITO_HOME}"/bin
     mkdir -p /tmp/src/bin
     touch /tmp/src/bin/myapp.jar
 
@@ -110,11 +110,11 @@ teardown() {
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[1]}" = "'./bin/myapp.jar' -> '$KOGITO_HOME/./bin/myapp.jar'" ]
+    [ "${lines[1]}" = "'./bin/myapp.jar' -> '"${KOGITO_HOME}"/./bin/myapp.jar'" ]
 }
 
 @test "test runtime_assemble with binary builds" {
-    mkdir -p ${KOGITO_HOME}/bin
+    mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
     mkdir -p /tmp/src/
     touch /tmp/src/myapp.jar
@@ -126,11 +126,11 @@ teardown() {
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[7]}" = "'./myapp.jar' -> '$KOGITO_HOME/bin/myapp.jar'" ]
+    [ "${lines[7]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
 }
 
 @test "test runtime_assemble with binary builds native binary" {
-    mkdir -p ${KOGITO_HOME}/bin
+    mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
     mkdir -p /tmp/src/
     cp $BATS_TEST_DIRNAME/mocks/myapp-0.0.1-runner /tmp/src/myapp-0.0.1-runner
@@ -139,14 +139,14 @@ teardown() {
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[8]}" = "'./myapp-0.0.1-runner' -> '$KOGITO_HOME/bin/myapp-0.0.1-runner'" ]
+    [ "${lines[8]}" = "'./myapp-0.0.1-runner' -> '"${KOGITO_HOME}"/bin/myapp-0.0.1-runner'" ]
 
     # Only runner is located in bin directory
-    [ -f "$KOGITO_HOME/bin/myapp-0.0.1-runner" ]
+    [ -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-runner" ]
 }
 
 @test "test runtime_assemble with binary builds entire target!" {
-    mkdir -p ${KOGITO_HOME}/bin
+    mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
     mkdir -p /tmp/src/target
     touch /tmp/src/target/myapp.jar
@@ -159,12 +159,12 @@ teardown() {
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[9]}" = "'./myapp.jar' -> '$KOGITO_HOME/bin/myapp.jar'" ]
+    [ "${lines[9]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
 }
 
 # Check that the irrelevant binaries are excluded
 @test "test runtime_assemble with binary builds entire target SpringBoot build" {
-    mkdir -p ${KOGITO_HOME}/bin
+    mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
     mkdir -p /tmp/src/target
     touch /tmp/src/target/myapp-0.0.1.jar
@@ -185,16 +185,16 @@ teardown() {
     [ ! -d "/tmp/src/target" ]
 
     # Only expected runnable is located in bin directory
-    [ -f "$KOGITO_HOME/bin/myapp-0.0.1.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1.jar.original" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-sources.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests-sources.jar" ]
+    [ -f ""${KOGITO_HOME}"/bin/myapp-0.0.1.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1.jar.original" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-sources.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests-sources.jar" ]
 }
 
 # Check that the irrelevant binaries are excluded
 @test "test runtime_assemble with binary builds entire target Quarkus build" {
-    mkdir -p ${KOGITO_HOME}/bin
+    mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
     mkdir -p /tmp/src/target
     touch /tmp/src/target/myapp-0.0.1.jar
@@ -216,17 +216,17 @@ teardown() {
     [ ! -d "/tmp/src/target" ]
 
     # Only runner and dependency is located in bin directory
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1.jar" ]
-    [ -f "$KOGITO_HOME/bin/myapp-0.0.1-runner.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-sources.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests-sources.jar" ]
-    [ -f "$KOGITO_HOME/bin/lib/mydependency-0.0.1.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1.jar" ]
+    [ -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-runner.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-sources.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests-sources.jar" ]
+    [ -f ""${KOGITO_HOME}"/bin/lib/mydependency-0.0.1.jar" ]
 }
 
 # Check that the irrelevant binaries are excluded
 @test "test runtime_assemble with binary builds entire target Quarkus native build" {
-    mkdir -p ${KOGITO_HOME}/bin
+    mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
     mkdir -p /tmp/src/target
     touch /tmp/src/target/myapp-0.0.1.jar
@@ -249,12 +249,12 @@ teardown() {
     [ ! -d "/tmp/src/target" ]
 
     # Only runner and dependency is located in bin directory
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-runner.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-sources.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/myapp-0.0.1-tests-sources.jar" ]
-    [ ! -f "$KOGITO_HOME/bin/lib/mydependency-0.0.1.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-runner.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-sources.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests-sources.jar" ]
+    [ ! -f ""${KOGITO_HOME}"/bin/lib/mydependency-0.0.1.jar" ]
 }
 
 @test "test handle_image_metadata_json no metadata" {
@@ -278,7 +278,7 @@ teardown() {
     [ "${lines[0]}" = "---> [s2i-core] Copy image metadata file..." ]
     [ "${lines[1]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
     [ "${lines[2]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
-    [ "${lines[3]}" = "'/tmp/src/target/image_metadata.json' -> '$KOGITO_HOME/bin'" ]
+    [ "${lines[3]}" = "'/tmp/src/target/image_metadata.json' -> '"${KOGITO_HOME}"/bin'" ]
 }
 
 @test "test copy_kogito_app default java build no jar file present" {
@@ -301,13 +301,13 @@ teardown() {
     echo "status= $status"
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Installing application binaries" ]
-    [ "${lines[1]}" = "'target/app.jar' -> '$KOGITO_HOME/bin'" ]
+    [ "${lines[1]}" = "'target/app.jar' -> '"${KOGITO_HOME}"/bin'" ]
 }
 
 
 @test "test copy_kogito_app default quarkus java build no jar file present" {
     NATIVE="false"
-    mkdir $KOGITO_HOME/bin
+    mkdir "${KOGITO_HOME}"/bin
     touch target/app-runner.jar
     mkdir target/lib
     touch target/lib/{lib.jar,lib1.jar}
@@ -320,13 +320,13 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Installing jar file" ]
-    [ "${lines[1]}" = "'target/app-runner.jar' -> '$KOGITO_HOME/bin/app-runner.jar'" ]
+    [ "${lines[1]}" = "'target/app-runner.jar' -> '"${KOGITO_HOME}"/bin/app-runner.jar'" ]
     [ "${lines[2]}" = "---> Copying application libraries" ]
 }
 
 @test "test copy_kogito_app default quarkus java build uberJar runner file present" {
     NATIVE="false"
-    mkdir $KOGITO_HOME/bin
+    mkdir "${KOGITO_HOME}"/bin
     touch target/app-runner.jar
 
     run copy_kogito_app
@@ -337,13 +337,13 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Installing jar file" ]
-    [ "${lines[1]}" = "'target/app-runner.jar' -> '$KOGITO_HOME/bin/app-runner.jar'" ]
+    [ "${lines[1]}" = "'target/app-runner.jar' -> '"${KOGITO_HOME}"/bin/app-runner.jar'" ]
 }
 
 @test "test copy_kogito_app default quarkus native builds file present" {
 
     NATIVE="true"
-    mkdir $KOGITO_HOME/bin
+    mkdir "${KOGITO_HOME}"/bin
     touch target/app-runner
     mkdir target/lib
     touch target/lib/{lib.jar,lib1.jar}
@@ -356,7 +356,7 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Installing application binaries" ]
-    [ "${lines[1]}" = "'target/app-runner' -> '$KOGITO_HOME/bin/app-runner'" ]
+    [ "${lines[1]}" = "'target/app-runner' -> '"${KOGITO_HOME}"/bin/app-runner'" ]
 }
 
 @test "build_kogito_app only checks if it will generate the project in case there's no pom.xml" {
diff --git a/modules/kogito-springboot-s2i/added/kogito-app-launch.sh b/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
index 70dd8c4e448..6528257da23 100644
--- a/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
+++ b/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
@@ -17,8 +17,9 @@ fi
 CONFIGURE_SCRIPTS=(
 
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
-exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
+# shellcheck disable=SC2086
+exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
 
diff --git a/modules/kogito-springboot-s2i/configure b/modules/kogito-springboot-s2i/configure
index 744d336a65f..359001e4bc9 100644
--- a/modules/kogito-springboot-s2i/configure
+++ b/modules/kogito-springboot-s2i/configure
@@ -1,15 +1,15 @@
 #!/bin/sh
 set -e
 
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
 # kogito-launch
-cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
-chmod +x ${KOGITO_HOME}/kogito-app-launch.sh
+cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
+chmod +x "${KOGITO_HOME}"/kogito-app-launch.sh
 
-cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
+cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-springboot-s2i/s2i/bin/assemble b/modules/kogito-springboot-s2i/s2i/bin/assemble
index 2d989309d8c..9f828130357 100755
--- a/modules/kogito-springboot-s2i/s2i/bin/assemble
+++ b/modules/kogito-springboot-s2i/s2i/bin/assemble
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 #
 # S2I assemble script for the '/kogito-springboot-ubi8-s2i' image.
 # The 'assemble' script builds your application source so that it is ready to run.
@@ -14,9 +15,9 @@ source ${S2I_MODULE_LOCATION}/s2i-core
 # supported values, please refer the module.yaml
 # file.
 CONFIGURE_SCRIPTS=(
-    ${KOGITO_HOME}/launch/configure-maven.sh
+    "${KOGITO_HOME}"/launch/configure-maven.sh
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 
@@ -26,7 +27,7 @@ manage_incremental_build
 # kogito app build
 build_kogito_app $SPRINGBOOT_RUNTIME_TYPE
 
-# copy kogito app to ${KOGITO_HOME}/bin dir
+# copy kogito app to "${KOGITO_HOME}"/bin dir
 copy_kogito_app
 
 # handle custom image-metadata.json
diff --git a/modules/kogito-springboot/added/kogito-app-launch.sh b/modules/kogito-springboot/added/kogito-app-launch.sh
index edb3174e781..dd41b723ec2 100644
--- a/modules/kogito-springboot/added/kogito-app-launch.sh
+++ b/modules/kogito-springboot/added/kogito-app-launch.sh
@@ -17,7 +17,8 @@ fi
 CONFIGURE_SCRIPTS=(
 
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
-exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar $KOGITO_HOME/bin/*.jar
+# shellcheck disable=SC2086
+exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
diff --git a/modules/kogito-springboot/configure b/modules/kogito-springboot/configure
index ac80ff52500..1c3bdf62ce2 100644
--- a/modules/kogito-springboot/configure
+++ b/modules/kogito-springboot/configure
@@ -1,16 +1,16 @@
 #!/bin/sh
 set -e
 
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
 # kogito-launch
-cp -p ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}/
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
-cp -rv ${SCRIPT_DIR}/s2i/bin/* /usr/local/s2i/
+cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
 
 chmod 755 /usr/local/s2i/*
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
diff --git a/modules/kogito-system-user/add-user b/modules/kogito-system-user/add-user
index 2d5bae10496..8f0ca354519 100644
--- a/modules/kogito-system-user/add-user
+++ b/modules/kogito-system-user/add-user
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-groupadd -r kogito -g 1001 && useradd -u 1001 -r -g root -G ${USER} -m -d ${KOGITO_HOME} -s /sbin/nologin -c "Kogito user" ${USER}
+groupadd -r kogito -g 1001 && useradd -u 1001 -r -g root -G "${USER}" -m -d "${KOGITO_HOME}" -s /sbin/nologin -c "Kogito user" ${USER}
 
-mkdir ${KOGITO_HOME}/bin
-chmod ug+rwX ${KOGITO_HOME}
+mkdir "${KOGITO_HOME}"/bin
+chmod ug+rwX "${KOGITO_HOME}"
 
diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh
index 9c6bd991609..56661d7fa40 100644
--- a/modules/kogito-task-console/added/kogito-app-launch.sh
+++ b/modules/kogito-task-console/added/kogito-app-launch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
@@ -14,12 +14,13 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-task-console.sh
+  "${KOGITO_HOME}"/launch/kogito-task-console.sh
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+# shellcheck disable=SC2086
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar $KOGITO_HOME/bin/kogito-task-console-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/kogito-task-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-task-console/added/launch/kogito-task-console.sh b/modules/kogito-task-console/added/launch/kogito-task-console.sh
index 9e18b5d4bbf..8abd0785dd0 100644
--- a/modules/kogito-task-console/added/launch/kogito-task-console.sh
+++ b/modules/kogito-task-console/added/launch/kogito-task-console.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
diff --git a/modules/kogito-task-console/configure b/modules/kogito-task-console/configure
index f12412cdc0a..30283ddb0e5 100644
--- a/modules/kogito-task-console/configure
+++ b/modules/kogito-task-console/configure
@@ -2,15 +2,15 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/kogito-task-console-runner.jar ${KOGITO_HOME}/bin/
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+cp -v ${SOURCES_DIR}/kogito-task-console-runner.jar "${KOGITO_HOME}"/bin/
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
-cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
diff --git a/modules/kogito-task-console/tests/bats/kogito-task-console.bats b/modules/kogito-task-console/tests/bats/kogito-task-console.bats
index c17425f8288..33a0a1eed45 100644
--- a/modules/kogito-task-console/tests/bats/kogito-task-console.bats
+++ b/modules/kogito-task-console/tests/bats/kogito-task-console.bats
@@ -1,15 +1,15 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=/tmp/kogito
-export HOME=$KOGITO_HOME
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+export HOME="${KOGITO_HOME}"
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-task-console.sh
 
 teardown() {
-    rm -rf ${KOGITO_HOME}
+    rm -rf "${KOGITO_HOME}"
 }
 
 @test "test if the default value for data-index url will be set" {
diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
index 098e05a17ac..ca2b28d6524 100644
--- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
@@ -15,12 +15,13 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-trusty-ui.sh
+  "${KOGITO_HOME}"/launch/kogito-trusty-ui.sh
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+# shellcheck disable=SC2086
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar $KOGITO_HOME/bin/kogito-trusty-ui-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/kogito-trusty-ui-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
index 8ddfa34c6d6..f8a16c7d61f 100644
--- a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
+++ b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
diff --git a/modules/kogito-trusty-ui/configure b/modules/kogito-trusty-ui/configure
index 70002d4fe00..d6694aacc99 100644
--- a/modules/kogito-trusty-ui/configure
+++ b/modules/kogito-trusty-ui/configure
@@ -2,15 +2,15 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/kogito-trusty-ui-runner.jar ${KOGITO_HOME}/bin/
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+cp -v ${SOURCES_DIR}/kogito-trusty-ui-runner.jar "${KOGITO_HOME}"/bin/
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
-cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
diff --git a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
index 6ade5906d8f..1eb510ab87c 100644
--- a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
+++ b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
@@ -1,15 +1,15 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=/tmp/kogito
-export HOME=$KOGITO_HOME
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+export HOME="${KOGITO_HOME}"
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-trusty-ui.sh
 
 teardown() {
-    rm -rf ${KOGITO_HOME}
+    rm -rf "${KOGITO_HOME}"
 }
 
 @test "test if the default value for trusty url will be set" {
diff --git a/modules/kogito-trusty/added/kogito-app-launch.sh b/modules/kogito-trusty/added/kogito-app-launch.sh
index a7143a68bc9..0876b7b6425 100644
--- a/modules/kogito-trusty/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty/added/kogito-app-launch.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
@@ -14,13 +14,14 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  ${KOGITO_HOME}/launch/kogito-trusty.sh
+  "${KOGITO_HOME}"/launch/kogito-trusty.sh
 )
-source ${KOGITO_HOME}/launch/configure.sh
+source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+# shellcheck disable=SC2086
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} \
-        -Djava.library.path=$KOGITO_HOME/lib \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar $KOGITO_HOME/bin/kogito-trusty-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/kogito-trusty-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty/added/launch/kogito-trusty.sh b/modules/kogito-trusty/added/launch/kogito-trusty.sh
index 927f68a67a0..02a945df25f 100644
--- a/modules/kogito-trusty/added/launch/kogito-trusty.sh
+++ b/modules/kogito-trusty/added/launch/kogito-trusty.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #import
-source ${KOGITO_HOME}/launch/logging.sh
+source "${KOGITO_HOME}"/launch/logging.sh
 
 function prepareEnv() {
     # keep it on alphabetical order
@@ -16,7 +16,8 @@ function configure() {
 function enable_explainability {
     local allowed_values=("TRUE" "FALSE")
     local explainability_enabled="true"
-    if [[ ! "${allowed_values[@]}" =~ "${EXPLAINABILITY_ENABLED^^}" ]]; then
+    # shellcheck disable=SC2153
+    if [[ ! "${allowed_values[*]}" =~ ${EXPLAINABILITY_ENABLED^^} ]]; then
         log_warning "Explainability enabled type ${EXPLAINABILITY_ENABLED} is not allowed, the allowed types are [${allowed_values[*]}]. Defaulting to ${explainability_enabled}."
     elif [ "${EXPLAINABILITY_ENABLED^^}" == "FALSE" ]; then
         explainability_enabled="${EXPLAINABILITY_ENABLED^^}"
diff --git a/modules/kogito-trusty/configure b/modules/kogito-trusty/configure
index ba1c36e5d89..7a940cb4f37 100644
--- a/modules/kogito-trusty/configure
+++ b/modules/kogito-trusty/configure
@@ -2,15 +2,15 @@
 set -e
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname $0)
-ADDED_DIR=${SCRIPT_DIR}/added
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/kogito-trusty-runner.jar ${KOGITO_HOME}/bin/
-cp -rv ${ADDED_DIR}/launch/* ${KOGITO_HOME}/launch/
+cp -v ${SOURCES_DIR}/kogito-trusty-runner.jar "${KOGITO_HOME}"/bin/
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
-chown -R 1001:0 ${KOGITO_HOME}
-chmod -R ug+rwX ${KOGITO_HOME}
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
 
-cp -v ${ADDED_DIR}/kogito-app-launch.sh ${KOGITO_HOME}
-chmod +x-w ${KOGITO_HOME}/kogito-app-launch.sh
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
diff --git a/modules/kogito-trusty/tests/bats/kogito-trusty.bats b/modules/kogito-trusty/tests/bats/kogito-trusty.bats
index 634da351e64..e66727f83a8 100644
--- a/modules/kogito-trusty/tests/bats/kogito-trusty.bats
+++ b/modules/kogito-trusty/tests/bats/kogito-trusty.bats
@@ -1,15 +1,15 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=/tmp/kogito
-export HOME=$KOGITO_HOME
-mkdir -p ${KOGITO_HOME}/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh ${KOGITO_HOME}/launch/
+export HOME="${KOGITO_HOME}"
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 
 # imports
 load $BATS_TEST_DIRNAME/../../added/launch/kogito-trusty.sh
 
 teardown() {
-    rm -rf ${KOGITO_HOME}
+    rm -rf "${KOGITO_HOME}"
 }
 
 
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 5c3866e30a8..389d207a3ad 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 609dc5bf797..b3057604b33 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
 
@@ -10,15 +10,15 @@ MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS="-Dquarkus.native.container-build=true
 # exit when any command fails
 set -e
 #Setup maven configuration only on CI
-if [ $CI ]; then
+if [ "${CI}" ]; then
 # setup maven env
     export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
     # export MAVEN_REPO_URL=
-    cp ${MVN_MODULE}/maven/settings.xml ${HOME}/.m2/settings.xml
-    source ${MVN_MODULE}/added/configure-maven.sh
+    cp "${MVN_MODULE}"/maven/settings.xml "${HOME}"/.m2/settings.xml
+    source "${MVN_MODULE}"/added/configure-maven.sh
     configure
 
-    cat ${HOME}/.m2/settings.xml
+    cat "${HOME}"/.m2/settings.xml
 fi
 
 # Clone examples
@@ -44,12 +44,12 @@ cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-exa
 # by adding the application.properties file telling app to start on
 # port 10000, the purpose of this tests is make sure that the images
 # will ensure the use of the port 8080.
-cp ${SCRIPT_DIR}/application.properties /tmp/kogito-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
+cp "${SCRIPT_DIR}"/application.properties /tmp/kogito-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
 (echo ""; echo "server.port=10000") >> /tmp/kogito-examples/process-springboot-example/src/main/resources/application.properties
 
 git add --all  :/
 git commit -am "test"
 
-if [ $CI ]; then
-    rm ${HOME}/.m2/settings.xml
+if [ "${CI}" ]; then
+    rm "${HOME}"/.m2/settings.xml
 fi
\ No newline at end of file

From f6bddda30e4f0774313f5a3ff7b8a208cabe6a1f Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 9 Dec 2020 17:34:50 +0100
Subject: [PATCH 211/709] KOGITO-3977 Release: Add branch to PR creation (#287)

---
 Jenkinsfile.deploy  | 2 +-
 Jenkinsfile.promote | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 501600ad708..1a4149e114c 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -289,7 +289,7 @@ pipeline {
                 script{
                     githubscm.pushObject('origin', getBotBranch(), getBotAuthorCredsID())
                     
-                    def commitMsg = "Update project version to ${getProjectVersion()} for release"
+                    def commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()} for release"
                     def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}.\nPlease do not merge, it will be merged automatically after testing."
                     deployProperties['kogito-images.pr.link'] = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
                 }
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 10d8d410a2a..d4f6d70c17b 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -236,7 +236,7 @@ pipeline {
                         }
                         sh versionCmd
 
-                        def commitMsg = "Update snapshot version to ${nextVersion}"
+                        def commitMsg = "[${getBuildBranch()}] Update snapshot version to ${nextVersion}"
                         def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}"
                         githubscm.commitChanges(commitMsg)
                         githubscm.pushObject('origin', getSnapshotBranch(), getBotAuthorCredsID())

From 8498777048eeba459235c9b7b2b22660562856eb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 9 Dec 2020 17:36:09 +0100
Subject: [PATCH 212/709] KOGITO-3978 Remove useless verification input (#288)

---
 Jenkinsfile.promote | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index d4f6d70c17b..840875b7146 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -123,16 +123,6 @@ pipeline {
                         sh 'cat modules/kogito-task-console/module.yaml'
                         sh 'cat modules/kogito-trusty-ui/module.yaml'
 
-                        // Input for checking new artifacts have been set correctly
-                        withCredentials([string(credentialsId: 'KOGITO_CI_EMAIL_TO', variable: 'ZULIP_EMAIL')]) {
-                            emailext body: "Images' modules have been set with latest artifacts from JBoss repository.\n" +
-                                    "Please verify in the logs if it has been set correctly: ${env.BUILD_URL}console.\n" +
-                                    "And take your decision here: ${env.BUILD_URL}input",
-                                    subject: "[${getBuildBranch()}] Release Pipeline",
-                                    to: ZULIP_EMAIL
-                        }
-                        input message: 'Are the artifacts set correctly ?', ok: 'Yes'
-
                         try {
                             githubscm.commitChanges('Setup Maven artifacts to released ones')
                             githubscm.pushObject('origin', getPRSourceBranch(), getBotAuthorCredsID())

From 3ed0934f8d03a7d53048769ad8a2d2ae653c8353 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 18 Dec 2020 17:58:07 +0100
Subject: [PATCH 213/709] KOGITO-3863 Setup timeout to pipelines (#289)

---
 Jenkinsfile         | 3 +++
 Jenkinsfile.deploy  | 1 +
 Jenkinsfile.promote | 1 +
 3 files changed, 5 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index faa38f8fc45..b2717084436 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,6 +9,9 @@ pipeline{
     tools {
         jdk 'kie-jdk11'
     }
+    options {
+        timeout(time: 120, unit: 'MINUTES')
+    }
     environment {
         CI = true
     }
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 1a4149e114c..49e83defa98 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -15,6 +15,7 @@ pipeline {
 
     options {
         buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
+        timeout(time: 120, unit: 'MINUTES')
     }
 
     parameters {
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 840875b7146..42297158a1d 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -10,6 +10,7 @@ pipeline {
 
     options {
         buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
+        timeout(time: 120, unit: 'MINUTES')
     }
 
     parameters {

From e2e7821c8fd93623145898e1e17c564211a1b475 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 21 Dec 2020 20:51:12 +0100
Subject: [PATCH 214/709] [KOGITO-1874] Send notif if images nightly success
 (#266)

* KOGITO-1824 Send notif if images nightly success

* formatting
---
 Jenkinsfile.deploy  | 167 +++++++++++++++++++++++++-------------------
 Jenkinsfile.promote | 146 +++++++++++++++++++-------------------
 2 files changed, 167 insertions(+), 146 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 49e83defa98..64056bc6a3e 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -2,6 +2,7 @@
 
 deployProperties = [ : ]
 
+commitDone = false
 
 pipeline {
     agent {
@@ -24,7 +25,7 @@ pipeline {
         // Git information
         string(name: 'BUILD_BRANCH_NAME', defaultValue: 'master', description: 'Which branch to build ? Set if you are not on a multibranch pipeline.')
         string(name: 'GIT_AUTHOR', defaultValue: 'kiegroup', description: 'Which Git author repository ?')
-        
+
         // Build&Test information
         booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: 'Skip tests')
         string(name: 'MAVEN_ARTIFACT_REPOSITORY', defaultValue: '', description: 'Maven repository where the build artifacts are present')
@@ -38,18 +39,22 @@ pipeline {
         string(name: 'IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Image namespace to use to deploy images')
         string(name: 'IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
         string(name: 'IMAGE_TAG', defaultValue: '', description: 'Image tag to use to deploy images')
-        
+
         // Release information
         booleanParam(name: 'RELEASE', defaultValue: false, description: 'Is this build for a release?')
         string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Optional if not RELEASE. If RELEASE, cannot be empty.')
         string(name: 'KOGITO_ARTIFACTS_VERSION', defaultValue: '', description: 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
 
+        booleanParam(name: 'CREATE_CHANGES_PR', defaultValue: false, description: 'In case of not releasing, you can ask to create a PR with the changes')
+
         // Bot author information. Set as params for easy testing.
         string(name: 'GIT_AUTHOR_BOT', defaultValue: 'bsig-gh-bot', description: 'From which author should the PR be created ?')
         string(name: 'BOT_CREDENTIALS_ID', defaultValue: 'bsig-gh-bot', description: 'Credentials for PR creation')
     }
 
     environment {
+        KOGITO_CI_EMAIL_TO = credentials('KOGITO_CI_EMAIL_TO')
+
         CI = true
         JAVA_HOME = "${GRAALVM_HOME}"
 
@@ -63,7 +68,7 @@ pipeline {
     stages {
         stage('Initialization') {
             steps {
-                script {  
+                script {
                     clean()
 
                     if (params.DISPLAY_NAME != '') {
@@ -71,7 +76,7 @@ pipeline {
                     }
 
                     // Set the mirror url only if no artifact repository is given
-                    if (env.MAVEN_MIRROR_REPOSITORY){
+                    if (env.MAVEN_MIRROR_REPOSITORY) {
                         echo 'Set Maven mirror url'
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
                     }
@@ -96,9 +101,6 @@ pipeline {
             }
         }
         stage('Prepare for PR') {
-            when {
-                expression { return isRelease() }
-            }
             steps {
                 script {
                     githubscm.forkRepo(getBotAuthorCredsID())
@@ -106,20 +108,22 @@ pipeline {
                 }
             }
         }
-        stage('Update project version'){
+        stage('Update project version') {
             when {
                 expression { return getProjectVersion() != '' }
             }
             steps {
-                script{
+                script {
                     versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
-                    if(getBuildBranch() != 'master'){
+                    if (getBuildBranch() != 'master') {
                         versionCmd += " --examples-ref ${getBuildBranch()}"
                     }
-                    if(getKogitoArtifactsVersion()){
+                    if (getKogitoArtifactsVersion()) {
                         versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
                     }
                     sh versionCmd
+
+                    commitChanges("Update project version to ${getProjectVersion()}")
                 }
             }
         }
@@ -128,7 +132,7 @@ pipeline {
                 script {
                     // Update artifacts
                     updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
-                    if(getMavenArtifactRepository() != ''){
+                    if (getMavenArtifactRepository() != '') {
                         updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()}"
                     }
                     sh updateArtifactCmd
@@ -142,6 +146,12 @@ pipeline {
                     sh 'cat modules/kogito-management-console/module.yaml'
                     sh 'cat modules/kogito-task-console/module.yaml'
                     sh 'cat modules/kogito-trusty-ui/module.yaml'
+
+                    if (isThereAnyChanges()) {
+                        commitChanges('Updated Maven artifacts')
+                    } else {
+                        echo 'No changes to commit'
+                    }
                 }
             }
         }
@@ -155,7 +165,7 @@ pipeline {
                     '''
                     sh './cekit-image-validator-runner modules/'
                     sh './cekit-image-validator-runner image.yaml'
-                    getImages().each{ image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }   
+                    getImages().each { image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }
                 }
             }
             post {
@@ -164,17 +174,6 @@ pipeline {
                 }
             }
         }
-        stage('Commit Changes'){
-            when {
-                expression { return isRelease() }
-            }
-            steps {
-                script {
-                    // Commit changes before changing tests repository
-                    githubscm.commitChanges("Update project version to ${getProjectVersion()} for release")
-                } 
-            }
-        }
         stage('Setup for testing') {
             when {
                 expression { return !shouldSkipTests() }
@@ -182,21 +181,21 @@ pipeline {
             steps {
                 script {
                     updateTestsCommand = 'python3 scripts/update-tests.py'
-                    if(getMavenArtifactRepository()){
+                    if (getMavenArtifactRepository()) {
                         // Update repo in tests
                         updateTestsCommand += " --repo-url ${getMavenArtifactRepository()}"
                     }
 
                     // Set kogito-examples to bot author/branch if release
-                    if(params.EXAMPLES_REF){
+                    if (params.EXAMPLES_REF) {
                         updateTestsCommand += " --examples-ref ${params.EXAMPLES_REF}"
                     }
-                    if(params.EXAMPLES_URI){
+                    if (params.EXAMPLES_URI) {
                         updateTestsCommand += " --examples-uri ${params.EXAMPLES_URI}"
                     }
 
                     //Ignore self-signed certificates if MAVEN_MIRROR_URL and/or artifact repo is defined
-                    if(env.MAVEN_MIRROR_URL || getMavenArtifactRepository()){
+                    if (env.MAVEN_MIRROR_URL || getMavenArtifactRepository()) {
                         updateTestsCommand += ' --ignore-self-signed-cert'
                     }
                     // Launch update tests
@@ -216,9 +215,9 @@ pipeline {
             steps {
                 script {
                     // Init workspaces before build
-                    getImages().each{ image -> initWorkspace(image) }
+                    getImages().each { image -> initWorkspace(image) }
                     // Build images
-                    launchParallelForEachImage("Build", {img -> buildImage(img)})
+                    launchParallelForEachImage('Build', { img -> buildImage(img) })
                 }
             }
             post {
@@ -236,9 +235,9 @@ pipeline {
             steps {
                 script {
                     // Init workspaces before test
-                    getImages().each{ image -> initWorkspace(image) }
+                    getImages().each { image -> initWorkspace(image) }
                     // Test images
-                    launchParallelForEachImage("Test", {img -> testImage(img)})
+                    launchParallelForEachImage('Test', { img -> testImage(img) })
                 }
             }
             post {
@@ -261,7 +260,7 @@ pipeline {
                 script {
                     if (isDeployImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
-                    } else if (getDeployImageRegistryCredentials() != ''){
+                    } else if (getDeployImageRegistryCredentials() != '') {
                         loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials())
                     }
                     pushImages()
@@ -283,16 +282,26 @@ pipeline {
         stage('Create PR') {
             when {
                 expression {
-                    return isRelease()
+                    return commitDone && (isRelease() || isCreateChangesPR())
                 }
             }
-            steps{
-                script{
+            steps {
+                script {
                     githubscm.pushObject('origin', getBotBranch(), getBotAuthorCredsID())
-                    
-                    def commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()} for release"
-                    def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}.\nPlease do not merge, it will be merged automatically after testing."
-                    deployProperties['kogito-images.pr.link'] = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
+
+                    def commitMsg = "[${getBuildBranch()}] Update Maven artifacts"
+                    def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}."
+                    if (isRelease()) {
+                        commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()} for release"
+                        prBody += '\nPlease do not merge, it will be merged automatically after testing.'
+                    }
+                    String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
+                    deployProperties['kogito-images.pr.link'] = prLink
+
+                    if (isCreateChangesPR()) {
+                        String bodyMsg = "PR has been created with update Maven artifacts.\nPlease review it here: ${prLink}"
+
+                        emailext body: bodyMsg, subject: "[${getBuildBranch()}][d] Kogito Images pipeline", to: env.KOGITO_CI_EMAIL_TO }
                 }
             }
             post {
@@ -310,7 +319,7 @@ pipeline {
     post {
         always {
             script {
-                def propertiesStr = deployProperties.collect{ entry -> "${entry.key}=${entry.value}" }.join('\n')
+                def propertiesStr = deployProperties.collect { entry -> "${entry.key}=${entry.value}" }.join('\n')
                 writeFile( file : 'deployment.properties' , text : propertiesStr)
                 archiveArtifacts artifacts: 'deployment.properties', allowEmptyArchive:true
                 clean()
@@ -324,6 +333,11 @@ void checkoutRepo() {
     checkout(githubscm.resolveRepository('kogito-images', getGitAuthor(), getBuildBranch(), false))
 }
 
+void commitChanges(String commitMsg) {
+    githubscm.commitChanges(commitMsg)
+    commitDone = true
+}
+
 void clean() {
     cleanWs()
     cleanImages()
@@ -332,16 +346,16 @@ void clean() {
     sh 'rm -rf \$HOME/.cekit/cache'
 }
 
-void cleanImages(){
+void cleanImages() {
     sh 'docker rm -f \$(docker ps -a -q) || date'
     sh 'docker rmi -f \$(docker images -q) || date'
 }
 
 void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
     parallelStages = [:]
-    getImages().each{ image -> 
+    getImages().each { image ->
         parallelStages["${stageNamePrefix} ${image}"] = {
-            dir(getWorkspacePath(image)){
+            dir(getWorkspacePath(image)) {
                 executeOnImage(image)
             }
         }
@@ -362,45 +376,45 @@ void testImage(image) {
 }
 
 void tagImages() {
-    for(String imageName : getImages()) {
+    for (String imageName : getImages()) {
         sh "docker tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"
     }
 }
 
 void pushImages() {
-    for(String imageName : getImages()) {
+    for (String imageName : getImages()) {
         sh "docker push ${buildImageName(imageName)}"
     }
 }
 
 String buildImageName(String imageName) {
     String finalImageName = imageName
-    if(getDeployImageNameSuffix() != ''){
+    if (getDeployImageNameSuffix() != '') {
         finalImageName += '-' + getDeployImageNameSuffix()
     }
     return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${finalImageName}:${getDeployImageTag()}"
 }
 
-void loginOpenshift(){
-    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]){
+void loginOpenshift() {
+    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]) {
         sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
     }
 }
 
-void loginOpenshiftRegistry(){
+void loginOpenshiftRegistry() {
     loginOpenshift()
     // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
     sh "set +x && docker login -u anything -p \$(oc whoami -t) ${env.OPENSHIFT_REGISTRY}"
 }
 
-void loginContainerRegistry(String registry, String credsId){
+void loginContainerRegistry(String registry, String credsId) {
     withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
         sh "docker login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${registry}"
     }
 }
 
-void setDeployPropertyIfneeded(String key, def value){
-    if(value != null && value != '') {
+void setDeployPropertyIfneeded(String key, def value) {
+    if (value != null && value != '') {
         deployProperties[key] = value
     }
 }
@@ -409,53 +423,52 @@ void setDeployPropertyIfneeded(String key, def value){
 // Deploy image information
 ////////////////////////////////////////////////////////////////////////
 
-boolean isDeployImageInOpenshiftRegistry(){
+boolean isDeployImageInOpenshiftRegistry() {
     return params.IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getDeployImageRegistryCredentials(){
+String getDeployImageRegistryCredentials() {
     return isDeployImageInOpenshiftRegistry() ? '' : params.IMAGE_REGISTRY_CREDENTIALS
 }
 
-String getDeployImageRegistry(){
+String getDeployImageRegistry() {
     return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.IMAGE_REGISTRY
 }
 
-String getDeployImageNamespace(){
+String getDeployImageNamespace() {
     return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
 }
 
-String getDeployImageNameSuffix(){
+String getDeployImageNameSuffix() {
     return params.IMAGE_NAME_SUFFIX
 }
 
-String getDeployImageTag(){
-    if (params.IMAGE_TAG != ""){
+String getDeployImageTag() {
+    if (params.IMAGE_TAG != '') {
         return params.IMAGE_TAG
     } else {
         return sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
     }
 }
 
-
 ////////////////////////////////////////////////////////////////////////
 // Workspaces
 ////////////////////////////////////////////////////////////////////////
 
-void initWorkspace(String image){
+void initWorkspace(String image) {
     sh "mkdir -p ${getWorkspacePath(image)}"
     sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
 }
 
-void cleanWorkspaces(){
+void cleanWorkspaces() {
     sh "rm -rf ${getWorkspacesPath()}"
 }
 
-String getWorkspacesPath(){
+String getWorkspacesPath() {
     return "${WORKSPACE}/workspaces"
 }
 
-String getWorkspacePath(String image){
+String getWorkspacePath(String image) {
     return "${getWorkspacesPath()}/${image}"
 }
 
@@ -467,6 +480,10 @@ boolean isRelease() {
     return params.RELEASE
 }
 
+boolean isCreateChangesPR() {
+    return params.CREATE_CHANGES_PR
+}
+
 String getBuildBranch() {
     return params.BUILD_BRANCH_NAME
 }
@@ -475,15 +492,15 @@ String getGitAuthor() {
     return params.GIT_AUTHOR
 }
 
-String getBotBranch(){
-    return "${getProjectVersion()}-${env.BOT_BRANCH_HASH}"
+String getBotBranch() {
+    return "${getProjectVersion() ?: getBuildBranch()}-${env.BOT_BRANCH_HASH}"
 }
 
-String getBotAuthor(){
+String getBotAuthor() {
     return params.GIT_AUTHOR_BOT
 }
 
-String getBotAuthorCredsID(){
+String getBotAuthorCredsID() {
     return params.BOT_CREDENTIALS_ID
 }
 
@@ -499,16 +516,20 @@ String getMavenArtifactRepository() {
     return params.MAVEN_ARTIFACT_REPOSITORY
 }
 
-boolean shouldSkipTests(){
+boolean shouldSkipTests() {
     return params.SKIP_TESTS
 }
 
-void setDeployPropertyIfNeeded(String key, def value){
-    if (value != null && value != ''){
+void setDeployPropertyIfNeeded(String key, def value) {
+    if (value != null && value != '') {
         deployProperties[key] = value
     }
 }
 
-String[] getImages(){
+String[] getImages() {
     return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
 }
+
+boolean isThereAnyChanges() {
+    return sh(script: 'git status --porcelain', returnStdout: true).trim() != ''
+}
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 42297158a1d..92700b8e2f5 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -1,7 +1,7 @@
 // Promote images
 @Library('jenkins-pipeline-shared-libraries')_
 
-deployProperties=[:]
+deployProperties = [:]
 
 pipeline {
     agent {
@@ -18,7 +18,7 @@ pipeline {
 
         // Deploy job url to retrieve deployment.properties
         string(name: 'DEPLOY_BUILD_URL', defaultValue: '', description: 'URL to jenkins deploy build to retrieve the `deployment.properties` file. If base parameters are defined, they will override the `deployment.properties` information')
-        
+
         // Git information which can override `deployment.properties`
         string(name: 'BUILD_BRANCH_NAME', defaultValue: '', description: 'Override `deployment.properties`. Which branch to build? Set if you are not on a multibranch pipeline.')
         string(name: 'GIT_AUTHOR', defaultValue: '', description: 'Override `deployment.properties`. Which Git author repository ?')
@@ -38,7 +38,7 @@ pipeline {
         string(name: 'PROMOTE_IMAGE_NAMESPACE', defaultValue: '', description: 'Promote image namespace')
         string(name: 'PROMOTE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Promote image name suffix')
         string(name: 'PROMOTE_IMAGE_TAG', defaultValue: '', description: 'Promote image tag')
-        booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', defaultValue: false, description: 'Set to true if you want the deployed images to also be with the `latest` tag')         
+        booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', defaultValue: false, description: 'Set to true if you want the deployed images to also be with the `latest` tag')
 
         // Release information which can override `deployment.properties`
         booleanParam(name: 'RELEASE', defaultValue: false, description: 'Override `deployment.properties`. Is this build for a release?')
@@ -53,18 +53,20 @@ pipeline {
 
         // Main author creds
         string(name: 'AUTHOR_CREDS_ID', defaultValue: 'kie-ci', description: 'Credentials for PR merge')
-        string(name: 'GITHUB_TOKEN_CREDS_ID', defaultValue: 'kie-ci2-token', description: 'GH token to be used with GH CLI')        
+        string(name: 'GITHUB_TOKEN_CREDS_ID', defaultValue: 'kie-ci2-token', description: 'GH token to be used with GH CLI')
     }
 
     environment {
+        KOGITO_CI_EMAIL_TO = credentials('KOGITO_CI_EMAIL_TO')
+
         CI = true // Used by scripts
-        
+
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
-        
+
         BOT_BRANCH_HASH = "${util.generateHash(10)}"
-        
+
         GITHUB_REPO = 'kogito-images' // for github-release cli
     }
 
@@ -80,7 +82,7 @@ pipeline {
 
                     readDeployProperties()
 
-                    if(isRelease()) {
+                    if (isRelease()) {
                         assert getProjectVersion() != ''
                     }
 
@@ -94,12 +96,12 @@ pipeline {
         }
         stage('Update PR with released Maven artifacts') {
             when {
-                expression { return isRelease() && getPRSourceBranch() != ''}
+                expression { return isRelease() && getPRSourceBranch() != '' }
             }
             steps {
                 script {
                     // Update maven information with new artifacts from Maven central in the PR
-                    dir('kogito-images-update'){
+                    dir('kogito-images-update') {
                         checkoutRepo()
                         githubscm.forkRepo(getBotAuthorCredsID())
 
@@ -109,7 +111,7 @@ pipeline {
 
                         // Update artifacts
                         updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
-                        if(getMavenArtifactRepository() != ''){
+                        if (getMavenArtifactRepository() != '') {
                             updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()}"
                         }
                         sh updateArtifactCmd
@@ -128,24 +130,22 @@ pipeline {
                             githubscm.commitChanges('Setup Maven artifacts to released ones')
                             githubscm.pushObject('origin', getPRSourceBranch(), getBotAuthorCredsID())
                         } catch (err) {
-                            withCredentials([string(credentialsId: 'KOGITO_CI_EMAIL_TO', variable: 'ZULIP_EMAIL')]) {
                             emailext body: "Seems like no change is to be committed.\nPlease review in ${env.BUILD_URL}console.\n" +
                                     "And take your decision here: ${env.BUILD_URL}input",
                                     subject: "[${getBuildBranch()}] Release Pipeline",
-                                    to: ZULIP_EMAIL
-                            }
+                                    to: env.KOGITO_CI_EMAIL_TO
                             input message: 'Should the pipeline continue ?', ok: 'Yes'
                         }
                     }
                 }
             }
         }
-        stage('Pull "old" images'){
-            steps{
+        stage('Pull "old" images') {
+            steps {
                 script {
                     if (isOldImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
-                    } else if (getOldImageRegistryCredentials() != ''){
+                    } else if (getOldImageRegistryCredentials() != '') {
                         loginContainerRegistry(getOldImageRegistry(), getOldImageRegistryCredentials())
                     }
                     dir('kogito-images') {
@@ -154,8 +154,8 @@ pipeline {
                 }
             }
         }
-        stage('Tag images'){
-            steps{
+        stage('Tag images') {
+            steps {
                 script {
                     dir('kogito-images') {
                         tagImages()
@@ -163,12 +163,12 @@ pipeline {
                 }
             }
         }
-        stage('Pushing'){
-            steps{
+        stage('Pushing') {
+            steps {
                 script {
                     if (isNewImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
-                    } else if (getNewImageRegistryCredentials() != ''){
+                    } else if (getNewImageRegistryCredentials() != '') {
                         loginContainerRegistry(getNewImageRegistry(), getNewImageRegistryCredentials())
                     }
                     dir('kogito-images') {
@@ -181,18 +181,18 @@ pipeline {
             when {
                 expression { return isRelease() }
             }
-            steps{
+            steps {
                 script {
                     dir('kogito-images') {
                         // Merge PR
                         String prLink = getDeployProperty('kogito-images.pr.link')
-                        if(prLink != ''){                            
+                        if (prLink != '') {
                             githubscm.mergePR(prLink, getGitAuthorCredsID())
                             githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
                         }
 
-                        if(getGitTag() != ""){
-                            def releaseName = "Kogito Images Version ${getProjectVersion()}" 
+                        if (getGitTag() != '') {
+                            def releaseName = "Kogito Images Version ${getProjectVersion()}"
                             def description = params.RELEASE_NOTES != '' ? params.RELEASE_NOTES : "We are glad to announce that the Kogito ${getProjectVersion()} release is now available!"
                             withCredentials([string(credentialsId: params.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
                                 sh """
@@ -208,7 +208,7 @@ pipeline {
         stage('Set next version')
         {
             when {
-               expression { return isRelease() }
+                expression { return isRelease() }
             }
             steps {
                 script {
@@ -222,7 +222,7 @@ pipeline {
 
                         // Update version to next snapshot
                         versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${nextVersion} --artifacts-version ${getKogitoArtifactsNextVersion()} --confirm"
-                        if(getBuildBranch() != 'master') {
+                        if (getBuildBranch() != 'master') {
                             versionCmd += " --examples-ref ${getBuildBranch()}"
                         }
                         sh versionCmd
@@ -250,7 +250,7 @@ pipeline {
     }
 }
 
-void installGitHubReleaseCLI(){
+void installGitHubReleaseCLI() {
     sh 'go get github.com/github-release/github-release'
 }
 
@@ -266,107 +266,107 @@ void clean() {
     cleanImages()
 }
 
-void cleanImages(){
+void cleanImages() {
     sh 'podman rm -f \$(podman ps -a -q) || date'
     sh 'podman rmi -f \$(podman images -q) || date'
 }
 
-void pullImages(){
-    for(String imageName : getImages()){
+void pullImages() {
+    for (String imageName : getImages()) {
         sh "podman pull ${getOldImageFullTag(imageName)}"
     }
 }
 
 void tagImages() {
-    for(String imageName : getImages()){
+    for (String imageName : getImages()) {
         sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, getNewImageTag())}"
-        if(isDeployLatestTag()){
-            sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, "latest")}"
+        if (isDeployLatestTag()) {
+            sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, 'latest')}"
         }
         String reducedTag = getReducedTag()
-        if(reducedTag != ''){
+        if (reducedTag != '') {
             sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, reducedTag)}"
         }
     }
 }
 
-void pushImages(){
-    for(String imageName : getImages()){
+void pushImages() {
+    for (String imageName : getImages()) {
         sh "podman push ${getNewImageFullTag(imageName, getNewImageTag())}"
-        if(isDeployLatestTag()){
-            sh "podman push ${getNewImageFullTag(imageName, "latest")}"
+        if (isDeployLatestTag()) {
+            sh "podman push ${getNewImageFullTag(imageName, 'latest')}"
         }
         String reducedTag = getReducedTag()
-        if(reducedTag != ''){
+        if (reducedTag != '') {
             sh "podman push ${getNewImageFullTag(imageName, reducedTag)}"
         }
     }
 }
 
-String getOldImageFullTag(String imageName){
+String getOldImageFullTag(String imageName) {
     return "${getOldImageRegistry()}/${getOldImageNamespace()}/${buildImageNameWithSuffix(imageName, getOldImageNameSuffix())}:${getOldImageTag()}"
 }
 
-String getNewImageFullTag(String imageName, String tag){
+String getNewImageFullTag(String imageName, String tag) {
     return "${getNewImageRegistry()}/${getNewImageNamespace()}/${buildImageNameWithSuffix(imageName, getNewImageNameSuffix())}:${tag}"
 }
 
 String buildImageNameWithSuffix(String imageName, String suffix) {
     String finalImageName = imageName
-    if(suffix != null && suffix != '') {
+    if (suffix != null && suffix != '') {
         finalImageName += '-' + suffix
     }
     return finalImageName
 }
 
-boolean isDeployLatestTag(){
+boolean isDeployLatestTag() {
     return params.DEPLOY_WITH_LATEST_TAG
 }
 
-String getReducedTag(){
+String getReducedTag() {
     try {
         String version = getNewImageTag()
         String[] versionSplit = version.split("\\.")
         return "${versionSplit[0]}.${versionSplit[1]}"
-    } catch(error) {
+    } catch (error) {
         echo "${getNewImageTag()} cannot be reduced to the format X.Y"
     }
     return ''
 }
 
-void loginOpenshift(){
-    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]){
+void loginOpenshift() {
+    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]) {
         sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
     }
 }
 
-void loginOpenshiftRegistry(){
+void loginOpenshiftRegistry() {
     loginOpenshift()
     // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
     sh "set +x && podman login -u anything -p \$(oc whoami -t) --tls-verify=false ${env.OPENSHIFT_REGISTRY}"
 }
 
-void loginContainerRegistry(String registry, String credsId){
+void loginContainerRegistry(String registry, String credsId) {
     withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
         sh "podman login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} --tls-verify=false ${registry}"
     }
 }
-void readDeployProperties(){
+void readDeployProperties() {
     String deployUrl = params.DEPLOY_BUILD_URL
-    if(deployUrl != ''){
-        if(!deployUrl.endsWith('/')){
+    if (deployUrl != '') {
+        if (!deployUrl.endsWith('/')) {
             deployUrl += '/'
         }
         sh "wget ${deployUrl}artifact/deployment.properties"
         deployProperties = readProperties file: 'deployment.properties'
-        echo deployProperties.collect{ entry -> "${entry.key}=${entry.value}" }.join('\n')
+        echo deployProperties.collect { entry -> "${entry.key}=${entry.value}" }.join('\n')
     }
 }
 boolean hasDeployProperty(String key) {
     return deployProperties[key] != null
 }
 String getDeployProperty(String key) {
-    if(hasDeployProperty(key)){
+    if (hasDeployProperty(key)) {
         return deployProperties[key]
     }
     return ''
@@ -411,11 +411,11 @@ String getGitAuthor() {
     return getParamOrDeployProperty('GIT_AUTHOR', 'git.author')
 }
 
-String getGitAuthorCredsID(){
+String getGitAuthorCredsID() {
     return params.AUTHOR_CREDS_ID
 }
 
-String getBotAuthorCredsID(){
+String getBotAuthorCredsID() {
     return params.BOT_CREDENTIALS_ID
 }
 
@@ -432,7 +432,7 @@ String getKogitoArtifactsNextVersion() {
     return util.getNextVersion(getKogitoArtifactsVersion(), 'micro', 'SNAPSHOT')
 }
 
-String getSnapshotBranch(){
+String getSnapshotBranch() {
     return "${getNextVersion()}-${env.BOT_BRANCH_HASH}"
 }
 
@@ -444,27 +444,27 @@ String getOldImagePrefix() {
     return 'kogito-images.image'
 }
 
-boolean isOldImageInOpenshiftRegistry(){
+boolean isOldImageInOpenshiftRegistry() {
     return params.BASE_IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getOldImageRegistryCredentials(){
+String getOldImageRegistryCredentials() {
     return isOldImageInOpenshiftRegistry() ? '' : params.BASE_IMAGE_REGISTRY_CREDENTIALS
 }
 
-String getOldImageRegistry(){
+String getOldImageRegistry() {
     return isOldImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : getParamOrDeployProperty('BASE_IMAGE_REGISTRY' , "${getOldImagePrefix()}.registry")
 }
 
-String getOldImageNamespace(){
+String getOldImageNamespace() {
     return isOldImageInOpenshiftRegistry() ? 'openshift' : getParamOrDeployProperty('BASE_IMAGE_NAMESPACE' , "${getOldImagePrefix()}.namespace")
 }
 
-String getOldImageNameSuffix(){
+String getOldImageNameSuffix() {
     return getParamOrDeployProperty('BASE_IMAGE_NAME_SUFFIX' , "${getOldImagePrefix()}.name-suffix")
 }
 
-String getOldImageTag(){
+String getOldImageTag() {
     return getParamOrDeployProperty('BASE_IMAGE_TAG' , "${getOldImagePrefix()}.tag")
 }
 
@@ -472,30 +472,30 @@ String getOldImageTag(){
 // New image information
 ////////////////////////////////////////////////////////////////////////
 
-boolean isNewImageInOpenshiftRegistry(){
+boolean isNewImageInOpenshiftRegistry() {
     return params.PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getNewImageRegistryCredentials(){
+String getNewImageRegistryCredentials() {
     return isNewImageInOpenshiftRegistry() ? '' : params.PROMOTE_IMAGE_REGISTRY_CREDENTIALS
 }
 
-String getNewImageRegistry(){
+String getNewImageRegistry() {
     return isNewImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.PROMOTE_IMAGE_REGISTRY
 }
 
-String getNewImageNamespace(){
+String getNewImageNamespace() {
     return isNewImageInOpenshiftRegistry() ? 'openshift' : params.PROMOTE_IMAGE_NAMESPACE
 }
 
-String getNewImageNameSuffix(){
+String getNewImageNameSuffix() {
     return params.PROMOTE_IMAGE_NAME_SUFFIX
 }
 
-String getNewImageTag(){
+String getNewImageTag() {
     return params.PROMOTE_IMAGE_TAG
 }
 
-String[] getImages(){
+String[] getImages() {
     return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
-}
\ No newline at end of file
+}

From ef38b71b7c276a66b3694e9d1cfa6e19366b95a1 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 23 Dec 2020 14:54:06 -0300
Subject: [PATCH 215/709] Updated Maven artifacts (#292)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 907aa9f5350..69075ae87c6 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/1.0.0-SNAPSHOT/data-index-service-infinispan-1.0.0-20201020.073543-49-runner.jar
-    md5: d947f3500a2ba7cd0ce05105be34fc39
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20201222.024343-38-runner.jar
+    md5: 402fb7fe9f4b39b8c7705e1e61dd07e2
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 077b4d39478..b03dcadacc8 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/1.0.0-SNAPSHOT/data-index-service-mongodb-1.0.0-20201020.073628-48-runner.jar
-    md5: 3b32642c8e0fbac375922bd24263481c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20201222.024425-38-runner.jar
+    md5: 614186153a0d37249e744a10a072357c
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 09b2f6ee8c1..2f9626520b6 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/1.0.0-SNAPSHOT/explainability-service-rest-1.0.0-20201020.074251-69-runner.jar
-    md5: 73ebe2e9cef755dba4c00cb2fd327385
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20201222.025105-38-runner.jar
+    md5: b63e627e05257a205d1417dda5c63350
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/1.0.0-SNAPSHOT/explainability-service-messaging-1.0.0-20201020.074228-70-runner.jar
-    md5: 4b35d9f1b3eb8a96365641b86c5a0d49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20201222.025038-35-runner.jar
+    md5: e7ea8f918ec41b72a0c5c7a2b900be81
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 9380fa28de5..972cd951a22 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/1.0.0-SNAPSHOT/jobs-service-1.0.0-20201020.073432-78-runner.jar
-    md5: ad2da27e1550ead2c55aa0d36570ede1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20201222.024242-36-runner.jar
+    md5: 0d390a03b1df3b553bc0d90e6ec3ab6f
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 034dffd641b..64f7661df6b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/1.0.0-SNAPSHOT/management-console-1.0.0-20201020.074035-77-runner.jar
-    md5: fe4522a404cba2d0e0fd0bf4a618f45d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20201222.024810-38-runner.jar
+    md5: e56e98b0b8e828b9ecf0c733da87557f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d8adde82441..bc97a4e2973 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/1.0.0-SNAPSHOT/task-console-1.0.0-20201020.074130-77-runner.jar
-    md5: 2db874d66ea1f1e4fc6a2348ef1e0f3c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20201222.024918-38-runner.jar
+    md5: 2c7515c00182a9b38ae6f8341d67f948
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 2efc3d58483..b04fcbf6b44 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/1.0.0-SNAPSHOT/trusty-ui-1.0.0-20201020.074101-48-runner.jar
-    md5: 268e44cfa317509f21626cc23802d44a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20201222.024843-38-runner.jar
+    md5: 1d36b65b5c4a4cd897fdbd509db8a81a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index e2f3073ea14..35927db6dc7 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/1.0.0-SNAPSHOT/trusty-service-1.0.0-20201020.074326-78-runner.jar
-    md5: 756610b74514004ab2e35cbb7a0e4a48
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20201222.025204-35-runner.jar
+    md5: 3019c03734caae5021137ab51c890977
 
 execute:
   - script: configure

From 609314ac1db0d7521cb093f76346eb6dc9e790a4 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 28 Dec 2020 10:40:38 -0300
Subject: [PATCH 216/709] Updated Maven artifacts (#297)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 69075ae87c6..e7f471b0223 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20201222.024343-38-runner.jar
-    md5: 402fb7fe9f4b39b8c7705e1e61dd07e2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20201228.025209-43-runner.jar
+    md5: 4c0d438f52503a6cd3fe782d5242ea01
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index b03dcadacc8..fb40f16e210 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20201222.024425-38-runner.jar
-    md5: 614186153a0d37249e744a10a072357c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20201228.025259-43-runner.jar
+    md5: 55c76d53b486d7249eb6eeff4e9106d4
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 2f9626520b6..d0febba0e8c 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20201222.025105-38-runner.jar
-    md5: b63e627e05257a205d1417dda5c63350
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20201228.030215-43-runner.jar
+    md5: 9cdd0fe4dc9729c7176e39c312b8f746
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20201222.025038-35-runner.jar
-    md5: e7ea8f918ec41b72a0c5c7a2b900be81
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20201228.030146-40-runner.jar
+    md5: 3241fc5ae54bfaa09097e87450a52cf8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 972cd951a22..b642b75fb1e 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20201222.024242-36-runner.jar
-    md5: 0d390a03b1df3b553bc0d90e6ec3ab6f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20201228.025004-41-runner.jar
+    md5: 9d1a6ff042bed2394a881b9f26f2596a
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 64f7661df6b..76e66fd10b7 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20201222.024810-38-runner.jar
-    md5: e56e98b0b8e828b9ecf0c733da87557f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20201228.025710-43-runner.jar
+    md5: f47086c9c4b3a28a73fd060b50120eec
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index bc97a4e2973..d21e9c31093 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20201222.024918-38-runner.jar
-    md5: 2c7515c00182a9b38ae6f8341d67f948
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20201228.025817-43-runner.jar
+    md5: d75a6e6f53cdfe98a29ba31e46510cc3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index b04fcbf6b44..6d691e98527 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20201222.024843-38-runner.jar
-    md5: 1d36b65b5c4a4cd897fdbd509db8a81a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20201228.025744-43-runner.jar
+    md5: 12dc68b9283ec33146b447bdd8745046
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 35927db6dc7..1e9b110d8b7 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20201222.025204-35-runner.jar
-    md5: 3019c03734caae5021137ab51c890977
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20201228.030329-40-runner.jar
+    md5: 791647b0a30f28662684c59d4477745b
 
 execute:
   - script: configure

From aa5ab7e140ab6e9c7ddad78be6bd9378e2fbac88 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 29 Dec 2020 20:24:26 -0300
Subject: [PATCH 217/709] Updated Maven artifacts (#298)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index e7f471b0223..d3c73755240 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20201228.025209-43-runner.jar
-    md5: 4c0d438f52503a6cd3fe782d5242ea01
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20201229.023933-44-runner.jar
+    md5: 0c0010365cb4ac7cf3e929c1ab3c0165
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index fb40f16e210..88f256591c6 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20201228.025259-43-runner.jar
-    md5: 55c76d53b486d7249eb6eeff4e9106d4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20201229.024033-44-runner.jar
+    md5: e14f1b9b181733c266361389c4ec23fb
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index d0febba0e8c..f5755a4927f 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20201228.030215-43-runner.jar
-    md5: 9cdd0fe4dc9729c7176e39c312b8f746
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20201229.024715-44-runner.jar
+    md5: 67e7fdcac71df5e43d2e8e3f5da8fbda
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20201228.030146-40-runner.jar
-    md5: 3241fc5ae54bfaa09097e87450a52cf8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20201229.024648-41-runner.jar
+    md5: ccc0c2abbf83f9fac5b07195beab5e49
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index b642b75fb1e..792eca4654d 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20201228.025004-41-runner.jar
-    md5: 9d1a6ff042bed2394a881b9f26f2596a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20201229.023812-42-runner.jar
+    md5: 3d9fdb6e976267f297fe96b9edca480e
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 76e66fd10b7..20d2d2611c5 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20201228.025710-43-runner.jar
-    md5: f47086c9c4b3a28a73fd060b50120eec
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20201229.024413-44-runner.jar
+    md5: cbff25eacf41dc8956515dd663459281
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d21e9c31093..d67dd1b8412 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20201228.025817-43-runner.jar
-    md5: d75a6e6f53cdfe98a29ba31e46510cc3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20201229.024516-44-runner.jar
+    md5: 0fa277aa249658301d030c131a59a448
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6d691e98527..b1e2e6ffb32 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20201228.025744-43-runner.jar
-    md5: 12dc68b9283ec33146b447bdd8745046
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20201229.024443-44-runner.jar
+    md5: 77f3f1f310e5c034ac9a7fbb6b2c85d6
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 1e9b110d8b7..86eb93b4642 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20201228.030329-40-runner.jar
-    md5: 791647b0a30f28662684c59d4477745b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20201229.024817-41-runner.jar
+    md5: 0762c15512ec458a749ded329b48a5fc
 
 execute:
   - script: configure

From 014d8fcb257d5bc91cb9a9c91aeeb0427f3eca59 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 30 Dec 2020 14:24:18 -0300
Subject: [PATCH 218/709] Updated Maven artifacts (#299)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index d3c73755240..9baa1e55d68 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20201229.023933-44-runner.jar
-    md5: 0c0010365cb4ac7cf3e929c1ab3c0165
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20201230.025256-45-runner.jar
+    md5: c82c719574eb9ab6a1af8fc2c58f0db8
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 88f256591c6..c4b731cf667 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20201229.024033-44-runner.jar
-    md5: e14f1b9b181733c266361389c4ec23fb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20201230.025337-45-runner.jar
+    md5: 3fd148e02775e388ea2ac83a9cb43707
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index f5755a4927f..83245191057 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20201229.024715-44-runner.jar
-    md5: 67e7fdcac71df5e43d2e8e3f5da8fbda
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20201230.030000-45-runner.jar
+    md5: 9aaed6e7ea290cbfc0648412caf366d8
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20201229.024648-41-runner.jar
-    md5: ccc0c2abbf83f9fac5b07195beab5e49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20201230.025937-42-runner.jar
+    md5: f8645a110a3c121034653081613dd236
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 792eca4654d..14421631419 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20201229.023812-42-runner.jar
-    md5: 3d9fdb6e976267f297fe96b9edca480e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20201230.025153-43-runner.jar
+    md5: 0f68c148a1c39ca679cefe9b1abbf746
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 20d2d2611c5..98f1ec6d30f 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20201229.024413-44-runner.jar
-    md5: cbff25eacf41dc8956515dd663459281
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20201230.025727-45-runner.jar
+    md5: f33fede4423ccaa142cbd0720a08950c
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d67dd1b8412..34cc9217a23 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20201229.024516-44-runner.jar
-    md5: 0fa277aa249658301d030c131a59a448
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20201230.025825-45-runner.jar
+    md5: 02fa0a19ea37cd34a6c7607e548acec1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index b1e2e6ffb32..7af6dce7520 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20201229.024443-44-runner.jar
-    md5: 77f3f1f310e5c034ac9a7fbb6b2c85d6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20201230.025755-45-runner.jar
+    md5: 1ecafa1a803cbe59087ee331d486a146
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 86eb93b4642..100df17a313 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20201229.024817-41-runner.jar
-    md5: 0762c15512ec458a749ded329b48a5fc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20201230.030055-42-runner.jar
+    md5: 6a70b4b4e963fe5d65514a0669f1e7da
 
 execute:
   - script: configure

From 339cfd2552f38f8fc98c7b55a9eb69f5e03a628b Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 4 Jan 2021 12:07:55 -0300
Subject: [PATCH 219/709] Updated Maven artifacts (#303)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 9baa1e55d68..64f7d654789 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20201230.025256-45-runner.jar
-    md5: c82c719574eb9ab6a1af8fc2c58f0db8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210104.024404-48-runner.jar
+    md5: 8d826d803081eade34ea51eae7f5eca3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index c4b731cf667..2e5c26e777b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20201230.025337-45-runner.jar
-    md5: 3fd148e02775e388ea2ac83a9cb43707
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210104.024454-48-runner.jar
+    md5: 195a79af9cc836d528c6e93f3568bf02
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 83245191057..09554450f10 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20201230.030000-45-runner.jar
-    md5: 9aaed6e7ea290cbfc0648412caf366d8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210104.025211-48-runner.jar
+    md5: 2dae34adfb002555aa77ec2264c21156
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20201230.025937-42-runner.jar
-    md5: f8645a110a3c121034653081613dd236
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210104.025137-45-runner.jar
+    md5: 394b0b342f83196df364f364357516ff
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 14421631419..75abee29445 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20201230.025153-43-runner.jar
-    md5: 0f68c148a1c39ca679cefe9b1abbf746
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210104.024235-46-runner.jar
+    md5: e69573848c79b4426153219701bdee49
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 98f1ec6d30f..c4372b4ea28 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20201230.025727-45-runner.jar
-    md5: f33fede4423ccaa142cbd0720a08950c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210104.024837-48-runner.jar
+    md5: 036bd436f2b3731bf92936511f9ad067
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 34cc9217a23..0fb828bd2be 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20201230.025825-45-runner.jar
-    md5: 02fa0a19ea37cd34a6c7607e548acec1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210104.024940-48-runner.jar
+    md5: 2d005117778613d981fbd44e1a2f1a01
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 7af6dce7520..94ac27cb138 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20201230.025755-45-runner.jar
-    md5: 1ecafa1a803cbe59087ee331d486a146
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210104.024908-48-runner.jar
+    md5: 5bfc8d68cf9c4e1d8b22ec3c6a750e6f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 100df17a313..592d3d312a0 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20201230.030055-42-runner.jar
-    md5: 6a70b4b4e963fe5d65514a0669f1e7da
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210104.025322-45-runner.jar
+    md5: 21a70f1e10f123c7b9a4912c30297d52
 
 execute:
   - script: configure

From 640efb7403a267df8eb0e4f190c2744d99663ff0 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 5 Jan 2021 14:13:27 -0300
Subject: [PATCH 220/709] Updated Maven artifacts (#304)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 64f7d654789..22cc97a8140 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210104.024404-48-runner.jar
-    md5: 8d826d803081eade34ea51eae7f5eca3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210105.030530-49-runner.jar
+    md5: cc66a05ffb50c44e27aa22f0608a0b38
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 2e5c26e777b..ae250db2d78 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210104.024454-48-runner.jar
-    md5: 195a79af9cc836d528c6e93f3568bf02
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210105.030612-49-runner.jar
+    md5: 3ea86b7232e00cc939f8c46174e329db
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 09554450f10..17c8f3f8ec5 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210104.025211-48-runner.jar
-    md5: 2dae34adfb002555aa77ec2264c21156
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210105.031233-49-runner.jar
+    md5: 959cf4d9d76b6fe91fa1a063797742ff
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210104.025137-45-runner.jar
-    md5: 394b0b342f83196df364f364357516ff
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210105.031209-46-runner.jar
+    md5: 4c612fe744d73fd69a2e414ab76ac888
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 75abee29445..22c6e5f8f06 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210104.024235-46-runner.jar
-    md5: e69573848c79b4426153219701bdee49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210105.030425-47-runner.jar
+    md5: 3ae8441518668422003236bb48597bec
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index c4372b4ea28..3965f832461 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210104.024837-48-runner.jar
-    md5: 036bd436f2b3731bf92936511f9ad067
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210105.030952-49-runner.jar
+    md5: d58591ca41e694fd07d980bcb0f073d5
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 0fb828bd2be..d34cedd41ea 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210104.024940-48-runner.jar
-    md5: 2d005117778613d981fbd44e1a2f1a01
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210105.031052-49-runner.jar
+    md5: 40bbacf72180b988d3f3a1a137c9b677
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 94ac27cb138..acc0eab79e6 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210104.024908-48-runner.jar
-    md5: 5bfc8d68cf9c4e1d8b22ec3c6a750e6f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210105.031021-49-runner.jar
+    md5: a128cad599cab511bd84d0cec4aca6be
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 592d3d312a0..74fbca96028 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210104.025322-45-runner.jar
-    md5: 21a70f1e10f123c7b9a4912c30297d52
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210105.031332-46-runner.jar
+    md5: 2673ab2e96112abdd1a99ed493935266
 
 execute:
   - script: configure

From 46c9c3c7c69eb7944c2c9eea9d11975b1edb806a Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 7 Jan 2021 16:41:34 +0100
Subject: [PATCH 221/709] KOGITO-4115 Fix protobuf files location (#308)

---
 modules/kogito-persistence/added/kogito-persistence.sh    | 4 ++--
 .../kogito-persistence/tests/bats/kogito-persistence.bats | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/kogito-persistence/added/kogito-persistence.sh b/modules/kogito-persistence/added/kogito-persistence.sh
index 2eddd40152b..a325e616fd6 100644
--- a/modules/kogito-persistence/added/kogito-persistence.sh
+++ b/modules/kogito-persistence/added/kogito-persistence.sh
@@ -14,8 +14,8 @@ function copy_persistence_files() {
     fi
 
     log_info "---> [persistence] Copying persistence files..."
-    if [ -d /tmp/src/"${persistenceDir}"/classes/persistence ]; then
-        cp -v /tmp/src/"${persistenceDir}"/classes/persistence/* "${KOGITO_HOME}"/bin/
+    if [ -d /tmp/src/"${persistenceDir}"/classes/META-INF/resources/persistence/protobuf ]; then
+        cp -v /tmp/src/"${persistenceDir}"/classes/META-INF/resources/persistence/protobuf/* "${KOGITO_HOME}"/bin/
         # we don't need this file to be indexed
         rm -rfv "${KOGITO_HOME}"/bin/kogito-application.proto
         move_persistence_files
diff --git a/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
index 2dbc317cd5f..74d936d0fce 100644
--- a/modules/kogito-persistence/tests/bats/kogito-persistence.bats
+++ b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
@@ -26,8 +26,8 @@ teardown() {
 }
 
 @test "There's some proto files in the target directory" {
-    mkdir -p /tmp/src/target/classes/persistence
-    touch /tmp/src/target/classes/persistence/{file1.proto,kogito-application.proto}
+    mkdir -p /tmp/src/target/META-INF/resources/persistence/protobuf
+    touch /tmp/src/target/META-INF/resources/persistence/protobuf/{file1.proto,kogito-application.proto}
 
     run copy_persistence_files
 
@@ -35,8 +35,8 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "INFO ---> [persistence] Copying persistence files..." ]
-    [ "${lines[1]}" = "'/tmp/src/target/classes/persistence/file1.proto' -> '"${KOGITO_HOME}"/bin/file1.proto'" ]
-    [ "${lines[2]}" = "'/tmp/src/target/classes/persistence/kogito-application.proto' -> '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
+    [ "${lines[1]}" = "'/tmp/src/target/META-INF/resources/persistence/protobuf/file1.proto' -> '"${KOGITO_HOME}"/bin/file1.proto'" ]
+    [ "${lines[2]}" = "'/tmp/src/target/META-INF/resources/persistence/protobuf/kogito-application.proto' -> '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
     [ "${lines[3]}" = "removed '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
     [ "${lines[4]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
     [ "${lines[5]}" = "'"${KOGITO_HOME}"/bin/file1.proto' -> '"${KOGITO_HOME}"/data/protobufs/file1.proto'" ]

From 0ea22f9cbca1b0f8670d66dfbe0be3a77416f684 Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Thu, 7 Jan 2021 18:32:55 +0100
Subject: [PATCH 222/709] KOGITO-4070 - Remove image_metadata from images
 (#291)

* remove image_metadata from images

* fix tests

* fix tests

* remove redundant log messages and tests

* fix tests
---
 README.md                                     | 12 ----
 modules/kogito-quarkus-s2i/s2i/bin/assemble   |  3 -
 modules/kogito-s2i-core/added/s2i-core        | 32 ---------
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 71 +------------------
 .../kogito-springboot-s2i/s2i/bin/assemble    |  3 -
 5 files changed, 3 insertions(+), 118 deletions(-)

diff --git a/README.md b/README.md
index 6999ac2dd91..2e4964b32e9 100644
--- a/README.md
+++ b/README.md
@@ -175,10 +175,6 @@ $ s2i build https://github.com/kiegroup/kogito-examples.git \
 ---> Installing jar file
 'target/rules-quarkus-helloworld-runner.jar' -> '/home/kogito/bin/rules-quarkus-helloworld-runner.jar'
 ---> Copying application libraries
----> [s2i-core] Copy image metadata file...
-'/tmp/src/target/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'
-'/tmp/src/target/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'
-'/tmp/src/target/image_metadata.json' -> '/home/kogito/bin/image_metadata.json'
 INFO ---> [persistence] Copying persistence files...
 INFO ---> [persistence] Skip copying files, persistence directory does not exist...
 Build completed successfully
@@ -542,10 +538,6 @@ removed 'process-springboot-example-tests.jar'
 removed 'process-springboot-example-sources.jar'
 removed 'process-springboot-example-test-sources.jar'
 -----> Copying uploaded files to /home/kogito
----> [s2i-core] Copy image metadata file...
-'/tmp/src/./image_metadata.json' -> '/tmp/.s2i/image_metadata.json'
-'/tmp/src/./image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'
-'/tmp/src/./image_metadata.json' -> '/home/kogito/bin/image_metadata.json'
 ---> Installing application binaries
 './process-springboot-example.jar' -> '/home/kogito/bin/process-springboot-example.jar'
 ...
@@ -1173,13 +1165,9 @@ As an example, let's execute the tests from the [kogito-s2i-core](modules/kogito
  $ bats modules/kogito-s2i-core/tests/bats/s2i-core.bats 
  ✓ test manage_incremental_builds
  ✓ test assemble_runtime no binaries
- ✓ test assemble_runtime with binaries binaries
- ✓ test assemble_runtime with binaries binaries and metadata
  ✓ test runtime_assemble
  ✓ test runtime_assemble with binary builds
  ✓ test runtime_assemble with binary builds entire target!
- ✓ test handle_image_metadata_json no metadata
- ✓ test handle_image_metadata_json with metadata
  ✓ test copy_kogito_app default java build no jar file present
  ✓ test copy_kogito_app default java build jar file present
  ✓ test copy_kogito_app default quarkus java build no jar file present
diff --git a/modules/kogito-quarkus-s2i/s2i/bin/assemble b/modules/kogito-quarkus-s2i/s2i/bin/assemble
index 5af77c8ab39..dd1fc8775ca 100644
--- a/modules/kogito-quarkus-s2i/s2i/bin/assemble
+++ b/modules/kogito-quarkus-s2i/s2i/bin/assemble
@@ -33,8 +33,5 @@ build_kogito_app $QUARKUS_RUNTIME_TYPE
 # copy kogito app to "${KOGITO_HOME}"/bin dir
 copy_kogito_app
 
-# handle custom image-metadata.json
-handle_image_metadata_json
-
 # handle persistence files
 copy_persistence_files
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 168a0ea70ba..0cc44e3f39b 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -33,22 +33,6 @@ function manage_incremental_build() {
 
 
 function assemble_runtime() {
-    if [ -d ""${KOGITO_HOME}"/bin" ]; then
-        log_info "---> Application binaries found and ready to use"
-
-        log_info "---> [s2i-core] Adding custom labels..."
-        if [ -e ""${KOGITO_HOME}"/bin/image_metadata.json" ]; then
-            mkdir -pv /tmp/.s2i
-            mkdir -pv /tmp/src/.s2i/
-            cp -v "${KOGITO_HOME}"/bin/image_metadata.json /tmp/.s2i/image_metadata.json
-            cp -v "${KOGITO_HOME}"/bin/image_metadata.json /tmp/src/.s2i/image_metadata.json
-        else
-            log_info "-----> Failed to copy metadata file, "${KOGITO_HOME}"/bin/image_metadata.json does not exist"
-        fi
-    else
-        log_error "---> Application binaries NOT found, failing build..."
-        exit 1
-    fi
     # handle persistence files
     move_persistence_files
 }
@@ -82,7 +66,6 @@ function runtime_assemble() {
         log_info "-----> Copying uploaded files to "${KOGITO_HOME}""
         artifactDir="."
         ARTIFACT_DIR=$artifactDir
-        handle_image_metadata_json
         copy_kogito_app
         copy_persistence_files
     else
@@ -93,21 +76,6 @@ function runtime_assemble() {
     rm -rfv ${S2I_DESTINATION_DIR}/src/*
 }
 
-
-function handle_image_metadata_json() {
-    log_info "---> [s2i-core] Copy image metadata file..."
-    if [ -e "/tmp/src/${artifactDir}/image_metadata.json" ]; then
-        mkdir /tmp/.s2i
-        mkdir -p /tmp/src/.s2i/
-        cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/.s2i
-        cp -v /tmp/src/$artifactDir/image_metadata.json /tmp/src/.s2i
-        cp -v /tmp/src/$artifactDir/image_metadata.json "${KOGITO_HOME}"/bin
-    else
-        log_info "-----> Failed to copy metadata file, /tmp/src/${artifactDir}/image_metadata.json not found."
-    fi
-}
-
-
 function build_kogito_app() {
     local RUNTIME_TYPE="${1:-$QUARKUS_RUNTIME_TYPE}"
     cd "${S2I_SOURCE_DIR}"
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index c4a19618813..8866d649dd0 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -57,48 +57,7 @@ teardown() {
 
 @test "test assemble_runtime no binaries" {
     run assemble_runtime
-    echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Application binaries NOT found, failing build..." ]
-    [ "$status" -eq 1 ]
-}
-
-
-@test "test assemble_runtime with binaries binaries" {
-    mkdir "${KOGITO_HOME}"/bin
-    touch "${KOGITO_HOME}"/bin/artifact.jar
-
-    run assemble_runtime
-
-    rm -rf "${KOGITO_HOME}"/bin/image_metadata.json
-    rm -rf "${KOGITO_HOME}"/bin/artifact.jar
-
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Application binaries found and ready to use" ]
-    [ "${lines[1]}" = "---> [s2i-core] Adding custom labels..." ]
-    [ "${lines[2]}" = "-----> Failed to copy metadata file, "${KOGITO_HOME}"/bin/image_metadata.json does not exist" ]
-}
-
-
-@test "test assemble_runtime with binaries binaries and metadata" {
-    mkdir "${KOGITO_HOME}"/bin
-    touch "${KOGITO_HOME}"/bin/image_metadata.json
-    touch "${KOGITO_HOME}"/bin/artifact.jar
-
-    run assemble_runtime
-
-    echo "result= ${lines[@]}"
-
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Application binaries found and ready to use" ]
-    [ "${lines[1]}" = "---> [s2i-core] Adding custom labels..." ]
-    [ "${lines[2]}" = "mkdir: created directory '/tmp/.s2i'" ]
-    [ "${lines[3]}" = "mkdir: created directory '/tmp/src'" ]
-    [ "${lines[4]}" = "mkdir: created directory '/tmp/src/.s2i/'" ]
-    [ "${lines[5]}" = "'"${KOGITO_HOME}"/bin/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
-    [ "${lines[6]}" = "'"${KOGITO_HOME}"/bin/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
-
 }
 
 @test "test runtime_assemble" {
@@ -126,7 +85,7 @@ teardown() {
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[7]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
+    [ "${lines[5]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
 }
 
 @test "test runtime_assemble with binary builds native binary" {
@@ -139,7 +98,7 @@ teardown() {
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[8]}" = "'./myapp-0.0.1-runner' -> '"${KOGITO_HOME}"/bin/myapp-0.0.1-runner'" ]
+    [ "${lines[6]}" = "'./myapp-0.0.1-runner' -> '"${KOGITO_HOME}"/bin/myapp-0.0.1-runner'" ]
 
     # Only runner is located in bin directory
     [ -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-runner" ]
@@ -159,7 +118,7 @@ teardown() {
 
     echo "result= ${lines[@]}"
     [ "$status" -eq 0 ]
-    [ "${lines[9]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
+    [ "${lines[7]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
 }
 
 # Check that the irrelevant binaries are excluded
@@ -257,30 +216,6 @@ teardown() {
     [ ! -f ""${KOGITO_HOME}"/bin/lib/mydependency-0.0.1.jar" ]
 }
 
-@test "test handle_image_metadata_json no metadata" {
-    mkdir -p /tmp/src/target
-    run handle_image_metadata_json
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> [s2i-core] Copy image metadata file..." ]
-    [ "${lines[1]}" = "-----> Failed to copy metadata file, /tmp/src/target/image_metadata.json not found." ]
-}
-
-
-@test "test handle_image_metadata_json with metadata" {
-    mkdir -p /tmp/src/target
-    touch /tmp/src/target/image_metadata.json
-    run handle_image_metadata_json
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> [s2i-core] Copy image metadata file..." ]
-    [ "${lines[1]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/.s2i/image_metadata.json'" ]
-    [ "${lines[2]}" = "'/tmp/src/target/image_metadata.json' -> '/tmp/src/.s2i/image_metadata.json'" ]
-    [ "${lines[3]}" = "'/tmp/src/target/image_metadata.json' -> '"${KOGITO_HOME}"/bin'" ]
-}
-
 @test "test copy_kogito_app default java build no jar file present" {
     run copy_kogito_app
 
diff --git a/modules/kogito-springboot-s2i/s2i/bin/assemble b/modules/kogito-springboot-s2i/s2i/bin/assemble
index 9f828130357..5287bd1e007 100755
--- a/modules/kogito-springboot-s2i/s2i/bin/assemble
+++ b/modules/kogito-springboot-s2i/s2i/bin/assemble
@@ -30,8 +30,5 @@ build_kogito_app $SPRINGBOOT_RUNTIME_TYPE
 # copy kogito app to "${KOGITO_HOME}"/bin dir
 copy_kogito_app
 
-# handle custom image-metadata.json
-handle_image_metadata_json
-
 # handle persistence files
 copy_persistence_files
\ No newline at end of file

From c5b9f79a1b2c24bf2c5331f3ab445826eb3cd7e8 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 8 Jan 2021 15:34:15 +0100
Subject: [PATCH 223/709] KOGITO-4115 correct bats (#310)

---
 .../kogito-persistence/tests/bats/kogito-persistence.bats | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
index 74d936d0fce..401d362f187 100644
--- a/modules/kogito-persistence/tests/bats/kogito-persistence.bats
+++ b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
@@ -26,8 +26,8 @@ teardown() {
 }
 
 @test "There's some proto files in the target directory" {
-    mkdir -p /tmp/src/target/META-INF/resources/persistence/protobuf
-    touch /tmp/src/target/META-INF/resources/persistence/protobuf/{file1.proto,kogito-application.proto}
+    mkdir -p /tmp/src/target/classes/META-INF/resources/persistence/protobuf
+    touch /tmp/src/target/classes/META-INF/resources/persistence/protobuf/{file1.proto,kogito-application.proto}
 
     run copy_persistence_files
 
@@ -35,8 +35,8 @@ teardown() {
 
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "INFO ---> [persistence] Copying persistence files..." ]
-    [ "${lines[1]}" = "'/tmp/src/target/META-INF/resources/persistence/protobuf/file1.proto' -> '"${KOGITO_HOME}"/bin/file1.proto'" ]
-    [ "${lines[2]}" = "'/tmp/src/target/META-INF/resources/persistence/protobuf/kogito-application.proto' -> '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
+    [ "${lines[1]}" = "'/tmp/src/target/classes/META-INF/resources/persistence/protobuf/file1.proto' -> '"${KOGITO_HOME}"/bin/file1.proto'" ]
+    [ "${lines[2]}" = "'/tmp/src/target/classes/META-INF/resources/persistence/protobuf/kogito-application.proto' -> '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
     [ "${lines[3]}" = "removed '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
     [ "${lines[4]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
     [ "${lines[5]}" = "'"${KOGITO_HOME}"/bin/file1.proto' -> '"${KOGITO_HOME}"/data/protobufs/file1.proto'" ]

From e5144b77214c1cdd45b7e7dfa4bae74cacf34a47 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 11 Jan 2021 12:51:06 -0300
Subject: [PATCH 224/709] Updated Maven artifacts (#314)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 22cc97a8140..46fb0b69693 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210105.030530-49-runner.jar
-    md5: cc66a05ffb50c44e27aa22f0608a0b38
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210111.025132-54-runner.jar
+    md5: e5b87959cef401db93385c42e630339f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index ae250db2d78..d88794477eb 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210105.030612-49-runner.jar
-    md5: 3ea86b7232e00cc939f8c46174e329db
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210111.025220-54-runner.jar
+    md5: 1a35fef7bc87c485a9de9743dae20a01
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 17c8f3f8ec5..237820b05b9 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210105.031233-49-runner.jar
-    md5: 959cf4d9d76b6fe91fa1a063797742ff
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210111.025938-54-runner.jar
+    md5: 5f6650016d297026722be0fae4c98767
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210105.031209-46-runner.jar
-    md5: 4c612fe744d73fd69a2e414ab76ac888
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210111.025908-51-runner.jar
+    md5: 3979544910e59e43ba733176a7003c68
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 22c6e5f8f06..6e94fd5c653 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210105.030425-47-runner.jar
-    md5: 3ae8441518668422003236bb48597bec
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210111.025019-52-runner.jar
+    md5: 9462331b8609cafaf8aa99916a1dfde9
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 3965f832461..21c183afb66 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210105.030952-49-runner.jar
-    md5: d58591ca41e694fd07d980bcb0f073d5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210111.025634-54-runner.jar
+    md5: 8df2593a3d9ba115f7a0d6657fd1848d
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d34cedd41ea..be611cd6b8c 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210105.031052-49-runner.jar
-    md5: 40bbacf72180b988d3f3a1a137c9b677
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210111.025735-54-runner.jar
+    md5: bd5773f0fc05f8d29623cee63cd0d234
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index acc0eab79e6..a41662b0361 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210105.031021-49-runner.jar
-    md5: a128cad599cab511bd84d0cec4aca6be
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210111.025703-54-runner.jar
+    md5: 11e8be76f4f361f59e1c4ec991dfeab1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 74fbca96028..cb0336756f9 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210105.031332-46-runner.jar
-    md5: 2673ab2e96112abdd1a99ed493935266
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210111.030051-51-runner.jar
+    md5: c1e3e32e26a9c8e617540ce67bc9bceb
 
 execute:
   - script: configure

From b79e5866c33f778356f48b5f0b197cec30030b2e Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 12 Jan 2021 09:44:29 -0300
Subject: [PATCH 225/709] Updated Maven artifacts (#315)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 46fb0b69693..d3aa6976025 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210111.025132-54-runner.jar
-    md5: e5b87959cef401db93385c42e630339f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210112.025617-55-runner.jar
+    md5: 7d20274083fc04c8f03c0113437db904
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index d88794477eb..0ddf4d474fa 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210111.025220-54-runner.jar
-    md5: 1a35fef7bc87c485a9de9743dae20a01
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210112.025704-55-runner.jar
+    md5: 7734b4fce3b012a26e0b1ab944e7e34c
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 237820b05b9..652219e61af 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210111.025938-54-runner.jar
-    md5: 5f6650016d297026722be0fae4c98767
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210112.030309-55-runner.jar
+    md5: f28afd8b23dd5bceddfba0ffabbf7bf6
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210111.025908-51-runner.jar
-    md5: 3979544910e59e43ba733176a7003c68
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210112.030241-52-runner.jar
+    md5: fe1282700b81bf7e1dd4fbbab7bf75a0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 6e94fd5c653..04a185ebcad 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210111.025019-52-runner.jar
-    md5: 9462331b8609cafaf8aa99916a1dfde9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210112.025511-53-runner.jar
+    md5: cb74c92c238555117baafb6a7b24d1d5
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 21c183afb66..503bb79fe22 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210111.025634-54-runner.jar
-    md5: 8df2593a3d9ba115f7a0d6657fd1848d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210112.030030-55-runner.jar
+    md5: 3e18ad4f8bb5b0dcd15ff523146a18b9
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index be611cd6b8c..c5384a85475 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210111.025735-54-runner.jar
-    md5: bd5773f0fc05f8d29623cee63cd0d234
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210112.030127-55-runner.jar
+    md5: eb9651e68d52236d70ecf8842a363da5
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index a41662b0361..4b2d1c95556 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210111.025703-54-runner.jar
-    md5: 11e8be76f4f361f59e1c4ec991dfeab1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210112.030058-55-runner.jar
+    md5: fb720d2ee6b072815d78497450c7b320
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index cb0336756f9..d8a96e5802c 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210111.030051-51-runner.jar
-    md5: c1e3e32e26a9c8e617540ce67bc9bceb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210112.030412-52-runner.jar
+    md5: bd5ac8f32be369648a4312618fb600a3
 
 execute:
   - script: configure

From 5c5047c91445a9cf850e6eb3e5f1cbe3a7d0efe1 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 13 Jan 2021 14:07:06 -0300
Subject: [PATCH 226/709] Updated Maven artifacts (#316)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index d3aa6976025..cad85075c7f 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210112.025617-55-runner.jar
-    md5: 7d20274083fc04c8f03c0113437db904
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210113.034244-56-runner.jar
+    md5: 7d98a12660810cd0b371eda363b11dde
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 0ddf4d474fa..595b69f4876 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210112.025704-55-runner.jar
-    md5: 7734b4fce3b012a26e0b1ab944e7e34c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210113.034326-56-runner.jar
+    md5: fa22f0a79cfc3c14c83f629d21402832
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 652219e61af..72f44d3cd60 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210112.030309-55-runner.jar
-    md5: f28afd8b23dd5bceddfba0ffabbf7bf6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210113.034940-56-runner.jar
+    md5: 6dac9002323db3737c7521aca8e3bcd7
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210112.030241-52-runner.jar
-    md5: fe1282700b81bf7e1dd4fbbab7bf75a0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210113.034912-53-runner.jar
+    md5: aa0ae9d833419e659fc3aaef82555049
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 04a185ebcad..835eeb350ed 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210112.025511-53-runner.jar
-    md5: cb74c92c238555117baafb6a7b24d1d5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210113.034144-54-runner.jar
+    md5: d04061e4c3b7df1296695c44124704c5
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 503bb79fe22..ce28ff69d0d 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210112.030030-55-runner.jar
-    md5: 3e18ad4f8bb5b0dcd15ff523146a18b9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210113.034655-56-runner.jar
+    md5: 5f796a9c4306faa7c9d2f287a98916fc
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index c5384a85475..215364ac8d5 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210112.030127-55-runner.jar
-    md5: eb9651e68d52236d70ecf8842a363da5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210113.034753-56-runner.jar
+    md5: f22ac056d616a4799333b24dc9bb6d5c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 4b2d1c95556..d6da1e9f7a6 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210112.030058-55-runner.jar
-    md5: fb720d2ee6b072815d78497450c7b320
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210113.034723-56-runner.jar
+    md5: cc432261d7139b1bb73a650d12ef1e2c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index d8a96e5802c..0bc01a55dfa 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210112.030412-52-runner.jar
-    md5: bd5ac8f32be369648a4312618fb600a3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210113.035043-53-runner.jar
+    md5: 48355d3b31eba72299ef6b179aa1bdbb
 
 execute:
   - script: configure

From 1cefa1fafc1c79e9b909f012da30fe7e120a0bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= <pefernan@users.noreply.github.com>
Date: Fri, 15 Jan 2021 18:12:23 +0100
Subject: [PATCH 227/709] KOGITO-4191: Fix Docker Image scripts for
 Task/Management Console (#318)

---
 README.md                                     | 27 +++++++++++++++++++
 .../added/launch/kogito-management-console.sh |  2 +-
 .../added/launch/kogito-task-console.sh       |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2e4964b32e9..ccd8f1054bc 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ Table of Contents
     - [Kogito Explainability Component Image](#kogito-explainability-component-image)
     - [Kogito Jobs Service Component Image](#kogito-jobs-service-component-image)
     - [Kogito Management Console Component Image](#kogito-management-console-component-image)
+    - [Kogito Task Console Component Image](#kogito-task-console-component-image)
     - [Kogito Trusty UI Component Image](#kogito-trusty-ui-component-image)
   - [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift)
     - [Using released images](#using-released-images)
@@ -565,6 +566,7 @@ Today we have 3 Kogito Component Images:
 * [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
 * [quay.io/kiegroup/kogito-jobs-service](htps://quay.io/kiegroup/kogito-jobs-service)
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
+* [quay.io/kiegroup/kogito-task-console](https://quay.io/kiegroup/kogito-task-console)
 * [quay.io/kiegroup/kogito-trusty-ui](https://quay.io/kiegroup/kogito-trusty-ui)
 
 
@@ -702,6 +704,31 @@ To know what configurations this image accepts please take a look [here](kogito-
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Management Console 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
+### Kogito Task Console Component Image
+
+The Kogito Task Console allows you to have a intuitive way to work with User Tasks in Kogito processes.
+It depends on the Kogito Data Index Service on which the Console will connect to so it can be able to manage it.
+
+To work correctly, the Kogito Task Console needs the Kogito Data Index Service url. If not provided, it will try to connect to the default one (http://localhost:8180).
+
+Basic usage:
+
+```bash
+$ docker run -it --env KOGITO_DATAINDEX_HTTP_URL=data-index-service-url:9090 quay.io/kiegroup/kogito-task-console:latest
+```
+
+To enable debug just use this env while running this image:
+
+```bash
+docker run -it --env SCRIPT_DEBUG=true --env KOGITO_DATAINDEX_HTTP_URL=data-index-service-url:9090 quay.io/kiegroup/kogito-task-console:latest
+```
+You should notice a few debug messages being printed in the system output.
+
+To know what configurations this image accepts please take a look [here](kogito-task-console-overrides.yaml) on the **envs** section.
+
+The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Task Console
+to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
+
 ### Kogito Trusty UI Component Image
 
 The Kogito Trusty UI provides an audit tool that allows you to retrieve and inspect the decisions that have been taken by Kogito Runtime Services.
diff --git a/modules/kogito-management-console/added/launch/kogito-management-console.sh b/modules/kogito-management-console/added/launch/kogito-management-console.sh
index 185ee85f0d2..d8b68ce3c39 100644
--- a/modules/kogito-management-console/added/launch/kogito-management-console.sh
+++ b/modules/kogito-management-console/added/launch/kogito-management-console.sh
@@ -26,5 +26,5 @@ function configure_data_index_url {
         log_info "Data index url not set, default will be used: http://localhost:8180"
         dataIndexURL="http://localhost:8180"
     fi
-    KOGITO_MANAGEMENT_CONSOLE_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
+    KOGITO_MANAGEMENT_CONSOLE_PROPS="${KOGITO_MANAGEMENT_CONSOLE_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
 }
diff --git a/modules/kogito-task-console/added/launch/kogito-task-console.sh b/modules/kogito-task-console/added/launch/kogito-task-console.sh
index 8abd0785dd0..c88f8474a70 100644
--- a/modules/kogito-task-console/added/launch/kogito-task-console.sh
+++ b/modules/kogito-task-console/added/launch/kogito-task-console.sh
@@ -26,6 +26,6 @@ function configure_data_index_url {
         log_info "Data index url not set, default will be used: http://localhost:8180"
         dataIndexURL="http://localhost:8180"
     fi
-    KOGITO_TASK_CONSOLE_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
+    KOGITO_TASK_CONSOLE_PROPS="${KOGITO_TASK_CONSOLE_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
 }
 

From 3d960e3ffd0354c319e2e3bc93e1f7660265febf Mon Sep 17 00:00:00 2001
From: Kevin Mok <kmok@redhat.com>
Date: Fri, 15 Jan 2021 12:14:35 -0500
Subject: [PATCH 228/709] [KOGITO-1031] Add flag to ignore self-signed SSL
 certificate (#311)

---
 Jenkinsfile.deploy                | 5 ++++-
 scripts/update-maven-artifacts.py | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 64056bc6a3e..440e5d9f3d9 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -101,6 +101,9 @@ pipeline {
             }
         }
         stage('Prepare for PR') {
+            when {
+                expression { return isRelease() || isCreateChangesPR() }
+            }
             steps {
                 script {
                     githubscm.forkRepo(getBotAuthorCredsID())
@@ -133,7 +136,7 @@ pipeline {
                     // Update artifacts
                     updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
                     if (getMavenArtifactRepository() != '') {
-                        updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()}"
+                        updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()} --ignore-self-signed-cert"
                     }
                     sh updateArtifactCmd
 
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index c86e0207c1f..26f979f4915 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -50,7 +50,7 @@ def getMetadataRoot(service):
     :return: root object
     '''
     metadataURL=service["repo_url"]+"maven-metadata.xml"
-    mavenMetadata=requests.get(metadataURL)
+    mavenMetadata=requests.get(metadataURL, verify=service["ignore_self_signed_cert"])
     with open('maven-metadata.xml', 'wb') as f:
         f.write(mavenMetadata.content)
     tree = ET.parse('maven-metadata.xml')
@@ -121,6 +121,7 @@ def update_artifacts(service,modulePath):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Update Maven information in repo from the given maven repository')
     parser.add_argument('--repo-url', dest='repo_url', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
+    parser.add_argument('--ignore-self-signed-cert', action='store_false', help='If set, will relax the SSL for user-generated self-signed certificates')
     args = parser.parse_args()
     
     artifactsVersion = common.retrieve_artifacts_version()
@@ -131,7 +132,8 @@ def update_artifacts(service,modulePath):
         service = {
             "repo_url" : args.repo_url + "{}/{}/{}/".format(KOGITO_ARTIFACT_PATH, serviceName, artifactsVersion),
             "name" : serviceName,
-            "version" : artifactsVersion
+            "version" : artifactsVersion,
+            "ignore_self_signed_cert": args.ignore_self_signed_cert
         }
         moduleYamlFile = "modules/{}/module.yaml".format(modulePath)
         

From 5ce6de5ba49a0c275d7d4a21beaa02a586cc99c1 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Sun, 17 Jan 2021 18:06:50 -0300
Subject: [PATCH 229/709] Updated Maven artifacts (#322)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index cad85075c7f..764f87f464b 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210113.034244-56-runner.jar
-    md5: 7d98a12660810cd0b371eda363b11dde
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210117.031228-58-runner.jar
+    md5: 6dd95d03f729dfdcfe9c6934d08fdce6
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 595b69f4876..f365cdd7fc0 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210113.034326-56-runner.jar
-    md5: fa22f0a79cfc3c14c83f629d21402832
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210117.031320-58-runner.jar
+    md5: 3ba9e9363603adf2e26c4f68ef07b2a9
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 72f44d3cd60..98730f2bd88 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210113.034940-56-runner.jar
-    md5: 6dac9002323db3737c7521aca8e3bcd7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210117.032147-58-runner.jar
+    md5: 44346c3408424351e08fddf8bd8eefcd
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210113.034912-53-runner.jar
-    md5: aa0ae9d833419e659fc3aaef82555049
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210117.032116-55-runner.jar
+    md5: a3100e6b65f7319012613513d977d035
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 835eeb350ed..ae96274eb96 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210113.034144-54-runner.jar
-    md5: d04061e4c3b7df1296695c44124704c5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210117.031112-56-runner.jar
+    md5: 60dd39a64cc2ae2a3d1e863bf39ecb34
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index ce28ff69d0d..6ff6360c2b8 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210113.034655-56-runner.jar
-    md5: 5f796a9c4306faa7c9d2f287a98916fc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210117.031844-58-runner.jar
+    md5: 8c4d1a3ca633cab711cbcecf19dfe4ed
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 215364ac8d5..27a8fe687a5 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210113.034753-56-runner.jar
-    md5: f22ac056d616a4799333b24dc9bb6d5c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210117.031947-58-runner.jar
+    md5: 9d20e96175c74a2864492e8158fc8d71
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index d6da1e9f7a6..bac5c1096ad 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210113.034723-56-runner.jar
-    md5: cc432261d7139b1bb73a650d12ef1e2c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210117.031915-58-runner.jar
+    md5: 6b70eff96fc90a1995e1a3095dbd015f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 0bc01a55dfa..3038357e03b 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210113.035043-53-runner.jar
-    md5: 48355d3b31eba72299ef6b179aa1bdbb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210117.032308-55-runner.jar
+    md5: e9d30168dea82edc2c70047cac08cfce
 
 execute:
   - script: configure

From 9562b8e4b959b2f2be370b542e3a4d6455a26c0a Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 19 Jan 2021 10:07:36 -0300
Subject: [PATCH 230/709] Updated Maven artifacts (#323)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 764f87f464b..23e70c77b78 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210117.031228-58-runner.jar
-    md5: 6dd95d03f729dfdcfe9c6934d08fdce6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210119.024339-59-runner.jar
+    md5: 5af57e8a7c83559311db21b7733abcf8
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index f365cdd7fc0..408836f711e 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210117.031320-58-runner.jar
-    md5: 3ba9e9363603adf2e26c4f68ef07b2a9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210119.024431-59-runner.jar
+    md5: 57be0ff93b87b67995deb8b53919e0cc
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 98730f2bd88..2abb2e2dc6e 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210117.032147-58-runner.jar
-    md5: 44346c3408424351e08fddf8bd8eefcd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210119.025230-59-runner.jar
+    md5: 3932f54c9e9ba729e253b95d2f936984
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210117.032116-55-runner.jar
-    md5: a3100e6b65f7319012613513d977d035
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210119.025204-56-runner.jar
+    md5: 1e98619a85405e02eccfacd9ddbbd52b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index ae96274eb96..831c55e4a50 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210117.031112-56-runner.jar
-    md5: 60dd39a64cc2ae2a3d1e863bf39ecb34
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210119.024228-57-runner.jar
+    md5: a33ccfa6ac900d8f3c2c547c352f8cca
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 6ff6360c2b8..8b54384af12 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210117.031844-58-runner.jar
-    md5: 8c4d1a3ca633cab711cbcecf19dfe4ed
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210119.024948-59-runner.jar
+    md5: f9100c9a521d18f2115cab3f6feea71c
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 27a8fe687a5..5824185a7c1 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210117.031947-58-runner.jar
-    md5: 9d20e96175c74a2864492e8158fc8d71
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210119.025050-59-runner.jar
+    md5: de18491facb53347b474ab849323bd13
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index bac5c1096ad..e1109f2eb97 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210117.031915-58-runner.jar
-    md5: 6b70eff96fc90a1995e1a3095dbd015f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210119.025018-59-runner.jar
+    md5: 202c3e83bf5dd2d8ea469194bde89f9d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 3038357e03b..06b3053b2d6 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210117.032308-55-runner.jar
-    md5: e9d30168dea82edc2c70047cac08cfce
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210119.025328-56-runner.jar
+    md5: f14867d1356648153ca3553fbffb99e0
 
 execute:
   - script: configure

From b6f40f044427e1f3920a2533aa5b1ee2db0b8a81 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 20 Jan 2021 11:51:04 -0300
Subject: [PATCH 231/709] Updated Maven artifacts (#325)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 23e70c77b78..1db86336791 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210119.024339-59-runner.jar
-    md5: 5af57e8a7c83559311db21b7733abcf8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210120.101902-61-runner.jar
+    md5: ca2851db8d41ed6204a261e3d8baaba4
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 408836f711e..511cd07fade 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210119.024431-59-runner.jar
-    md5: 57be0ff93b87b67995deb8b53919e0cc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210120.101950-61-runner.jar
+    md5: 42b727481e81840cdfa49e43eeccc12f
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 2abb2e2dc6e..ab972a88054 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210119.025230-59-runner.jar
-    md5: 3932f54c9e9ba729e253b95d2f936984
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210120.102642-61-runner.jar
+    md5: cb84d29ad1c65dfa9282730d3ff767cb
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210119.025204-56-runner.jar
-    md5: 1e98619a85405e02eccfacd9ddbbd52b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210120.102614-58-runner.jar
+    md5: d4db770a74d2675c4201b1465a1eec9e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 831c55e4a50..4d1d709fa77 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210119.024228-57-runner.jar
-    md5: a33ccfa6ac900d8f3c2c547c352f8cca
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210120.101750-59-runner.jar
+    md5: a72d10f62761c700bd7081c50a160301
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 8b54384af12..377f49d66ee 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210119.024948-59-runner.jar
-    md5: f9100c9a521d18f2115cab3f6feea71c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210120.102336-61-runner.jar
+    md5: 6101dd9b861fe6d316e10bec68d38a63
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 5824185a7c1..d75f9d7ce10 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210119.025050-59-runner.jar
-    md5: de18491facb53347b474ab849323bd13
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210120.102448-61-runner.jar
+    md5: 719f16d6b6af28aeffc81b0675b735c0
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index e1109f2eb97..5c45db0ba1d 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210119.025018-59-runner.jar
-    md5: 202c3e83bf5dd2d8ea469194bde89f9d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210120.102410-61-runner.jar
+    md5: e7e58eb1519f4c157bc057c6929c0d86
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 06b3053b2d6..deb24290b6d 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210119.025328-56-runner.jar
-    md5: f14867d1356648153ca3553fbffb99e0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210120.102745-58-runner.jar
+    md5: cd11d6c79435f651ac32e1404d6205e7
 
 execute:
   - script: configure

From b4a35e1d552644f8d1c89b7a2e332561bf33bf83 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Wed, 20 Jan 2021 20:26:00 +0530
Subject: [PATCH 232/709] Delete paths.yml (#326)

Deleting the file, since not required right now as we run pipeline for every PR and now it is optional to have this file from bots perspective
---
 .github/bot-files/paths.yml | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 .github/bot-files/paths.yml

diff --git a/.github/bot-files/paths.yml b/.github/bot-files/paths.yml
deleted file mode 100644
index 582ae026c36..00000000000
--- a/.github/bot-files/paths.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# In this repository we trigger the CI for every PR
-# After https://issues.redhat.com/browse/KOGITO-3027 this file creation will be optional.
-files:
-  - Jenkinsfile*
\ No newline at end of file

From 8bcbfb179461cccc3616d6c8a2de1d8aac23ccdf Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 22 Jan 2021 11:56:46 -0300
Subject: [PATCH 233/709] Updated Maven artifacts (#329)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 1db86336791..adf0b63d280 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210120.101902-61-runner.jar
-    md5: ca2851db8d41ed6204a261e3d8baaba4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210122.032858-63-runner.jar
+    md5: 4201d64eb67b88ff7b4dd7572d0a8974
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 511cd07fade..5bb5492f96e 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210120.101950-61-runner.jar
-    md5: 42b727481e81840cdfa49e43eeccc12f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210122.032948-63-runner.jar
+    md5: 8fc72a99b53ca6eca4427ca4c9c4dd99
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index ab972a88054..aeb1ea65e80 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210120.102642-61-runner.jar
-    md5: cb84d29ad1c65dfa9282730d3ff767cb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210122.033652-63-runner.jar
+    md5: f733eb2ea7ecb9355ac941d2d5ad6fff
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210120.102614-58-runner.jar
-    md5: d4db770a74d2675c4201b1465a1eec9e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210122.033624-60-runner.jar
+    md5: 6406ebfac9485b8448e393cee3fd19cc
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 4d1d709fa77..aeec5059901 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210120.101750-59-runner.jar
-    md5: a72d10f62761c700bd7081c50a160301
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210122.032747-61-runner.jar
+    md5: a953cf9d8c425718bbe82866105878b8
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 377f49d66ee..e142add3ec7 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210120.102336-61-runner.jar
-    md5: 6101dd9b861fe6d316e10bec68d38a63
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210122.033351-63-runner.jar
+    md5: bdf2f6b8eacb3e91540023abc9b8395b
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d75f9d7ce10..83b71d2723e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210120.102448-61-runner.jar
-    md5: 719f16d6b6af28aeffc81b0675b735c0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210122.033500-63-runner.jar
+    md5: a10128a24fdfff329ac44a297922855e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 5c45db0ba1d..551556d0ad2 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210120.102410-61-runner.jar
-    md5: e7e58eb1519f4c157bc057c6929c0d86
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210122.033425-63-runner.jar
+    md5: 1dadbb3351d8400545e7039b3d8b391b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index deb24290b6d..fe378cfb17a 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210120.102745-58-runner.jar
-    md5: cd11d6c79435f651ac32e1404d6205e7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210122.033754-60-runner.jar
+    md5: b7bf888da2b2c39b823a618e3f10a55b
 
 execute:
   - script: configure

From 01ea04b56bf93820b79c64c38639dc53557d6c35 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 26 Jan 2021 10:25:00 -0300
Subject: [PATCH 234/709] Updated Maven artifacts (#332)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index adf0b63d280..e8ca4d42211 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210122.032858-63-runner.jar
-    md5: 4201d64eb67b88ff7b4dd7572d0a8974
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210126.031915-65-runner.jar
+    md5: 67167830f7a2b9593ce3955e40c452dd
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 5bb5492f96e..6db2564ec7b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210122.032948-63-runner.jar
-    md5: 8fc72a99b53ca6eca4427ca4c9c4dd99
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210126.031956-65-runner.jar
+    md5: d7c3c0902937dfb84b1d7aaf0488eddc
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index aeb1ea65e80..6c8dc651f48 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210122.033652-63-runner.jar
-    md5: f733eb2ea7ecb9355ac941d2d5ad6fff
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210126.032614-65-runner.jar
+    md5: a2c169737f9c9a1cc25a8760ab3202a1
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210122.033624-60-runner.jar
-    md5: 6406ebfac9485b8448e393cee3fd19cc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210126.032550-62-runner.jar
+    md5: acbada50faaaa649c64a4427e6dea3f7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index aeec5059901..d8f2e385934 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210122.032747-61-runner.jar
-    md5: a953cf9d8c425718bbe82866105878b8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210126.031813-63-runner.jar
+    md5: 6882c3b69837f341b40805d6da1fcf5e
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e142add3ec7..c8bae4d0c60 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210122.033351-63-runner.jar
-    md5: bdf2f6b8eacb3e91540023abc9b8395b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210126.032338-65-runner.jar
+    md5: d1d92afd5b00aae560afa0f3f0b6dc27
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 83b71d2723e..06c1891eed9 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210122.033500-63-runner.jar
-    md5: a10128a24fdfff329ac44a297922855e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210126.032437-65-runner.jar
+    md5: 206ec45ea738af781e6f5d10ae2e2703
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 551556d0ad2..bb10158ccd2 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210122.033425-63-runner.jar
-    md5: 1dadbb3351d8400545e7039b3d8b391b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210126.032406-65-runner.jar
+    md5: 02d6db8ba9ce6ca6c8446dd4986c9fcf
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index fe378cfb17a..51181bd6cb9 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210122.033754-60-runner.jar
-    md5: b7bf888da2b2c39b823a618e3f10a55b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210126.032711-62-runner.jar
+    md5: d48bba6dd6a6f621f85128a2b98dbb75
 
 execute:
   - script: configure

From 0c4b51b77bb636e9a2508f4a7684da46859adedc Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Wed, 27 Jan 2021 19:21:45 +0100
Subject: [PATCH 235/709] KOGITO-4175 - Kogito Image for the new JIT DMN
 service in Kogito Apps (#317)

* add jit dmn kogito image


Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 Jenkinsfile.deploy                            |  1 +
 Jenkinsfile.promote                           |  1 +
 README.md                                     | 24 ++++++++++++
 kogito-imagestream.yaml                       | 21 ++++++++++
 kogito-jit-runner-overrides.yaml              | 38 +++++++++++++++++++
 .../kogito-jit-dmn/added/kogito-app-launch.sh | 26 +++++++++++++
 modules/kogito-jit-dmn/configure              | 15 ++++++++
 modules/kogito-jit-dmn/module.yaml            | 12 ++++++
 scripts/README.md                             |  1 +
 scripts/common.py                             |  3 +-
 scripts/update-maven-artifacts.py             |  3 +-
 tests/features/kogito-jit-dmn.feature         | 36 ++++++++++++++++++
 12 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 kogito-jit-runner-overrides.yaml
 create mode 100644 modules/kogito-jit-dmn/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-jit-dmn/configure
 create mode 100644 modules/kogito-jit-dmn/module.yaml
 create mode 100644 tests/features/kogito-jit-dmn.feature

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 440e5d9f3d9..f2907df5457 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -149,6 +149,7 @@ pipeline {
                     sh 'cat modules/kogito-management-console/module.yaml'
                     sh 'cat modules/kogito-task-console/module.yaml'
                     sh 'cat modules/kogito-trusty-ui/module.yaml'
+                    sh 'cat modules/kogito-jit-runner/module.yaml'
 
                     if (isThereAnyChanges()) {
                         commitChanges('Updated Maven artifacts')
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 92700b8e2f5..f1bff1e0c0d 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -125,6 +125,7 @@ pipeline {
                         sh 'cat modules/kogito-management-console/module.yaml'
                         sh 'cat modules/kogito-task-console/module.yaml'
                         sh 'cat modules/kogito-trusty-ui/module.yaml'
+                        sh 'cat modules/kogito-jit-runner/module.yaml'
 
                         try {
                             githubscm.commitChanges('Setup Maven artifacts to released ones')
diff --git a/README.md b/README.md
index ccd8f1054bc..af85eb5c68e 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ Table of Contents
     - [Kogito Management Console Component Image](#kogito-management-console-component-image)
     - [Kogito Task Console Component Image](#kogito-task-console-component-image)
     - [Kogito Trusty UI Component Image](#kogito-trusty-ui-component-image)
+    - [Kogito JIT Runner Component Image](#kogito-jit-runner-component-image)
   - [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift)
     - [Using released images](#using-released-images)
     - [Pushing the built images to a local OCP registry:](#pushing-the-built-images-to-a-local-ocp-registry)
@@ -568,6 +569,7 @@ Today we have 3 Kogito Component Images:
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
 * [quay.io/kiegroup/kogito-task-console](https://quay.io/kiegroup/kogito-task-console)
 * [quay.io/kiegroup/kogito-trusty-ui](https://quay.io/kiegroup/kogito-trusty-ui)
+* [quay.io/kiegroup/kogito-jit-runner](https://quay.io/kiegroup/kogito-jit-runner)
 
 
 ### Kogito Data Index Component Images
@@ -754,6 +756,25 @@ To know what configurations this image accepts please take a look [here](kogito-
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty UI 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
+### Kogito JIT Runner Component Image
+
+The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/kiegroup/kogito-apps/tree/master/jitexecutor).
+
+Basic usage:
+
+```bash
+$ docker run -it quay.io/kiegroup/kogito-jit-runner:latest
+```
+
+To enable debug just use this env while running this image:
+
+```bash
+docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jit-runner:latest
+```
+You should notice a few debug messages being printed in the system output. You can then visit `localhost:8080/index.html` to test the service.
+
+To know what configurations this image accepts please take a look [here](kogito-jit-runner-overrides.yaml) on the **envs** section.
+
 ## Using Kogito Images to Deploy Apps on OpenShift
 
 Once the images are built and imported into a registry (quay.io or any other registry), new applications can be built and deployed within a few steps.
@@ -981,6 +1002,7 @@ With this Makefile you can:
      $ make build-image image_name=kogito-jobs-service 
      $ make build-image image_name=kogito-management-console
      $ make build-image image_name=kogito-trusty-ui
+     $ make build-image image_name=kogito-jit-runner
      ```
   
      We can ignore the build or the tests while interacting with a specific image as well, to build only:
@@ -1051,6 +1073,7 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-logging](modules/kogito-logging): Provides common logging functions.
 - [kogito-management-console](modules/kogito-management-console): Installs and Configure the management-console jar inside the image
 - [kogito-trusty-ui](modules/kogito-trusty-ui): Installs and Configure the trusty-ui jar inside the image
+- [kogito-jit-runner](modules/kogito-jit-runner): Installs and Configure the jit-runner jar inside the image
 - [kogito-maven](modules/kogito-maven): Installs and configure Maven on the S2I images, also provides custom configuration script.
 - [kogito-openjdk](modules/kogito-openjdk): Provides OpenJDK and JRE.
 - [kogito-persistence](modules/kogito-persistence): Provides the needed configuration scripts to properly configure the Kogito Services in the target image.
@@ -1072,6 +1095,7 @@ Please inspect the images overrides files to learn which modules are installed o
 - [quay.io/kiegroup/kogito-jobs-service](kogito-jobs-service-overrides.yaml)
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-overrides.yaml)
+- [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-overrides.yaml)
 - [quay.io/kiegroup/kogito-quarkus-jvm-ubi8](kogito-quarkus-jvm-overrides.yaml)
 - [quay.io/kiegroup/kogito-quarkus-ubi8](kogito-quarkus-overrides.yaml)
 - [quay.io/kiegroup/kogito-quarkus-ubi8-s2i](kogito-quarkus-s2i-overrides.yaml)
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index c18a7d04e8a..005f9109edc 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -195,6 +195,27 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-trusty-ui:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-jit-runner
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito JIT Runner
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Runtime image for the Kogito JIT Runner
+            iconClass: icon-jbpm
+            tags: kogito,jit-runner
+            supports: JIT Runner
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-jit-runner:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-jit-runner-overrides.yaml b/kogito-jit-runner-overrides.yaml
new file mode 100644
index 00000000000..f32eb7079b5
--- /dev/null
+++ b/kogito-jit-runner-overrides.yaml
@@ -0,0 +1,38 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-jit-runner"
+description: "Runtime image for Kogito JIT Runner"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito JIT Runner"
+- name: "io.k8s.display-name"
+  value: "Kogito JIT Runner"
+- name: "io.openshift.tags"
+  value: "kogito,jit-runner"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.jit-runner
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
diff --git a/modules/kogito-jit-dmn/added/kogito-app-launch.sh b/modules/kogito-jit-dmn/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..7670ff67b65
--- /dev/null
+++ b/modules/kogito-jit-dmn/added/kogito-app-launch.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JIT_RUNNER_PROPS} \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
+        -jar "${KOGITO_HOME}"/bin/kogito-jit-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-jit-dmn/configure b/modules/kogito-jit-dmn/configure
new file mode 100644
index 00000000000..83918216ca7
--- /dev/null
+++ b/modules/kogito-jit-dmn/configure
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v ${SOURCES_DIR}/kogito-jit-runner.jar "${KOGITO_HOME}"/bin/
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
+
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
+
diff --git a/modules/kogito-jit-dmn/module.yaml b/modules/kogito-jit-dmn/module.yaml
new file mode 100644
index 00000000000..803cd841312
--- /dev/null
+++ b/modules/kogito-jit-dmn/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.jit-runner
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: kogito-jit-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210119.025408-1-runner.jar
+    md5: b9b6091850d6be57920a01ae8671c82f
+
+execute:
+  - script: configure
+
diff --git a/scripts/README.md b/scripts/README.md
index 8af1f61fafd..e1f97c34ae5 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -140,6 +140,7 @@ The command will update the needed files with the new URL:
 - kogito-jobs-service/module.yaml
 - kogito-management-console/module.yaml
 - kogito-trusty-ui/module.yaml
+- kogito-jit-runner/module.yaml
 - kogito-trusty/module.yaml
 - kogito-explainability/module.yaml
 
diff --git a/scripts/common.py b/scripts/common.py
index 89cbeeb3ce8..c539d441921 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -18,7 +18,8 @@
            "kogito-persistence", "kogito-quarkus",
            "kogito-quarkus-jvm", "kogito-quarkus-s2i",
            "kogito-s2i-core", "kogito-springboot",
-           "kogito-springboot-s2i", "kogito-system-user"}
+           "kogito-springboot-s2i", "kogito-system-user",
+           "kogito-jit-dmn"}
 MODULE_FILENAME = "module.yaml"
 MODULES_DIR = "modules"
 
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 26f979f4915..4337f10a42a 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -32,7 +32,8 @@
     "jobs-service": "kogito-jobs-service",
     "management-console": "kogito-management-console",
     "task-console": "kogito-task-console",
-    "trusty-ui": "kogito-trusty-ui"
+    "trusty-ui": "kogito-trusty-ui",
+    "jit-runner": "kogito-jit-runner"
 }
 
 def isSnapshotVersion(version):
diff --git a/tests/features/kogito-jit-dmn.feature b/tests/features/kogito-jit-dmn.feature
new file mode 100644
index 00000000000..f40ddc03292
--- /dev/null
+++ b/tests/features/kogito-jit-dmn.feature
@@ -0,0 +1,36 @@
+@quay.io/kiegroup/kogito-jit-runner
+Feature: Kogito-jit-runner feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito JIT Runner
+    And the image should contain label io.k8s.display-name with value Kogito JIT Runner
+    And the image should contain label io.openshift.tags with value kogito,jit-runner
+
+  Scenario: verify if the binary index is available on /home/kogito
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/kogito-jit-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-jit-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled and test default http port
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-jit-runner.jar
+
+  Scenario: Verify that jit runner can evaluate a DMN model with a context
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /jitdmn                                                                                          |
+      | wait            | 80                                                                                               |
+      | expected_phrase | {"sum":3,"m":2,"n":1}                                                                            |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"context": {"n" : 1, "m" : 2}, "model": "<dmn:definitions xmlns:dmn=\"http://www.omg.org/spec/DMN/20180521/MODEL/\" xmlns=\"https://kiegroup.org/dmn/_35091C3B-6022-4D40-8982-D528940CD5F9\" xmlns:feel=\"http://www.omg.org/spec/DMN/20180521/FEEL/\" xmlns:kie=\"http://www.drools.org/kie/dmn/1.2\" xmlns:dmndi=\"http://www.omg.org/spec/DMN/20180521/DMNDI/\" xmlns:di=\"http://www.omg.org/spec/DMN/20180521/DI/\" xmlns:dc=\"http://www.omg.org/spec/DMN/20180521/DC/\" id=\"_81A31B42-A686-4ED2-81FB-C1F91A95D685\" name=\"new-file\" typeLanguage=\"http://www.omg.org/spec/DMN/20180521/FEEL/\" namespace=\"https://kiegroup.org/dmn/_35091C3B-6022-4D40-8982-D528940CD5F9\">\n  <dmn:extensionElements/>\n  <dmn:inputData id=\"_6FFA48B5-FB55-4962-9E64-F08418BBFF9E\" name=\"n\">\n    <dmn:extensionElements/>\n    <dmn:variable id=\"_EC4D123A-D6D4-4E5D-B369-6E99F57D9C22\" name=\"n\" typeRef=\"number\"/>\n  </dmn:inputData>\n  <dmn:decision id=\"_1D69C44E-D782-492A-A50D-740B444F1993\" name=\"sum\">\n    <dmn:extensionElements/>\n    <dmn:variable id=\"_3AF7A705-8304-4B5E-8EC7-05D9934E6C06\" name=\"sum\" typeRef=\"number\"/>\n    <dmn:informationRequirement id=\"_E0FE5C90-5EAF-45DB-ABFD-10D27FA97AB4\">\n      <dmn:requiredInput href=\"#_6FFA48B5-FB55-4962-9E64-F08418BBFF9E\"/>\n    </dmn:informationRequirement>\n    <dmn:informationRequirement id=\"_C52CB29E-3236-4661-8856-7276AE8ED01F\">\n      <dmn:requiredInput href=\"#_B8221A07-DFB5-40BC-95A9-7926A6EC55C4\"/>\n    </dmn:informationRequirement>\n    <dmn:literalExpression id=\"_3DB33034-AC21-45DE-A5B7-D6B09B01ED1E\">\n      <dmn:text>n + m</dmn:text>\n    </dmn:literalExpression>\n  </dmn:decision>\n  <dmn:inputData id=\"_B8221A07-DFB5-40BC-95A9-7926A6EC55C4\" name=\"m\">\n    <dmn:extensionElements/>\n    <dmn:variable id=\"_455CD571-BBD9-4762-B496-832E7EBCD07F\" name=\"m\" typeRef=\"number\"/>\n  </dmn:inputData>\n  <dmndi:DMNDI>\n    <dmndi:DMNDiagram id=\"_7FC1E997-A627-409E-A6D5-9A30F2F30AB4\" name=\"DRG\">\n      <di:extension>\n        <kie:ComponentsWidthsExtension>\n          <kie:ComponentWidths dmnElementRef=\"_3DB33034-AC21-45DE-A5B7-D6B09B01ED1E\">\n            <kie:width>300</kie:width>\n          </kie:ComponentWidths>\n        </kie:ComponentsWidthsExtension>\n      </di:extension>\n      <dmndi:DMNShape id=\"dmnshape-drg-_6FFA48B5-FB55-4962-9E64-F08418BBFF9E\" dmnElementRef=\"_6FFA48B5-FB55-4962-9E64-F08418BBFF9E\" isCollapsed=\"false\">\n        <dmndi:DMNStyle>\n          <dmndi:FillColor red=\"255\" green=\"255\" blue=\"255\"/>\n          <dmndi:StrokeColor red=\"0\" green=\"0\" blue=\"0\"/>\n          <dmndi:FontColor red=\"0\" green=\"0\" blue=\"0\"/>\n        </dmndi:DMNStyle>\n        <dc:Bounds x=\"704\" y=\"364\" width=\"100\" height=\"50\"/>\n        <dmndi:DMNLabel/>\n      </dmndi:DMNShape>\n      <dmndi:DMNShape id=\"dmnshape-drg-_1D69C44E-D782-492A-A50D-740B444F1993\" dmnElementRef=\"_1D69C44E-D782-492A-A50D-740B444F1993\" isCollapsed=\"false\">\n        <dmndi:DMNStyle>\n          <dmndi:FillColor red=\"255\" green=\"255\" blue=\"255\"/>\n          <dmndi:StrokeColor red=\"0\" green=\"0\" blue=\"0\"/>\n          <dmndi:FontColor red=\"0\" green=\"0\" blue=\"0\"/>\n        </dmndi:DMNStyle>\n        <dc:Bounds x=\"756\" y=\"283\" width=\"100\" height=\"50\"/>\n        <dmndi:DMNLabel/>\n      </dmndi:DMNShape>\n      <dmndi:DMNShape id=\"dmnshape-drg-_B8221A07-DFB5-40BC-95A9-7926A6EC55C4\" dmnElementRef=\"_B8221A07-DFB5-40BC-95A9-7926A6EC55C4\" isCollapsed=\"false\">\n        <dmndi:DMNStyle>\n          <dmndi:FillColor red=\"255\" green=\"255\" blue=\"255\"/>\n          <dmndi:StrokeColor red=\"0\" green=\"0\" blue=\"0\"/>\n          <dmndi:FontColor red=\"0\" green=\"0\" blue=\"0\"/>\n        </dmndi:DMNStyle>\n        <dc:Bounds x=\"822\" y=\"364\" width=\"100\" height=\"50\"/>\n        <dmndi:DMNLabel/>\n      </dmndi:DMNShape>\n      <dmndi:DMNEdge id=\"dmnedge-drg-_E0FE5C90-5EAF-45DB-ABFD-10D27FA97AB4\" dmnElementRef=\"_E0FE5C90-5EAF-45DB-ABFD-10D27FA97AB4\">\n        <di:waypoint x=\"754\" y=\"389\"/>\n        <di:waypoint x=\"806\" y=\"333\"/>\n      </dmndi:DMNEdge>\n      <dmndi:DMNEdge id=\"dmnedge-drg-_C52CB29E-3236-4661-8856-7276AE8ED01F\" dmnElementRef=\"_C52CB29E-3236-4661-8856-7276AE8ED01F\">\n        <di:waypoint x=\"872\" y=\"389\"/>\n        <di:waypoint x=\"806\" y=\"333\"/>\n      </dmndi:DMNEdge>\n    </dmndi:DMNDiagram>\n  </dmndi:DMNDI>\n</dmn:definitions>"} |

From 48f6162082d0e50dc1eab873cd300b64f9321f0b Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Thu, 28 Jan 2021 12:47:12 +0100
Subject: [PATCH 236/709] KOGITO-4306 - Fix update-maven-artifacts for jit
 runner (#336)

* rename jit folder

* fix update-maven-artifacts

* update common.py

* rename kogito-jit-runner.feature
---
 .../added/kogito-app-launch.sh                                  | 0
 modules/{kogito-jit-dmn => kogito-jit-runner}/configure         | 0
 modules/{kogito-jit-dmn => kogito-jit-runner}/module.yaml       | 0
 scripts/common.py                                               | 2 +-
 scripts/update-maven-artifacts.py                               | 2 +-
 .../{kogito-jit-dmn.feature => kogito-jit-runner.feature}       | 0
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename modules/{kogito-jit-dmn => kogito-jit-runner}/added/kogito-app-launch.sh (100%)
 rename modules/{kogito-jit-dmn => kogito-jit-runner}/configure (100%)
 rename modules/{kogito-jit-dmn => kogito-jit-runner}/module.yaml (100%)
 rename tests/features/{kogito-jit-dmn.feature => kogito-jit-runner.feature} (100%)

diff --git a/modules/kogito-jit-dmn/added/kogito-app-launch.sh b/modules/kogito-jit-runner/added/kogito-app-launch.sh
similarity index 100%
rename from modules/kogito-jit-dmn/added/kogito-app-launch.sh
rename to modules/kogito-jit-runner/added/kogito-app-launch.sh
diff --git a/modules/kogito-jit-dmn/configure b/modules/kogito-jit-runner/configure
similarity index 100%
rename from modules/kogito-jit-dmn/configure
rename to modules/kogito-jit-runner/configure
diff --git a/modules/kogito-jit-dmn/module.yaml b/modules/kogito-jit-runner/module.yaml
similarity index 100%
rename from modules/kogito-jit-dmn/module.yaml
rename to modules/kogito-jit-runner/module.yaml
diff --git a/scripts/common.py b/scripts/common.py
index c539d441921..de5e4c61c28 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -19,7 +19,7 @@
            "kogito-quarkus-jvm", "kogito-quarkus-s2i",
            "kogito-s2i-core", "kogito-springboot",
            "kogito-springboot-s2i", "kogito-system-user",
-           "kogito-jit-dmn"}
+           "kogito-jit-runner"}
 MODULE_FILENAME = "module.yaml"
 MODULES_DIR = "modules"
 
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 4337f10a42a..87b7726556e 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -33,7 +33,7 @@
     "management-console": "kogito-management-console",
     "task-console": "kogito-task-console",
     "trusty-ui": "kogito-trusty-ui",
-    "jit-runner": "kogito-jit-runner"
+    "jitexecutor-runner": "kogito-jit-runner"
 }
 
 def isSnapshotVersion(version):
diff --git a/tests/features/kogito-jit-dmn.feature b/tests/features/kogito-jit-runner.feature
similarity index 100%
rename from tests/features/kogito-jit-dmn.feature
rename to tests/features/kogito-jit-runner.feature

From b9696448dfb4ba8b35a1739ae3247c0821f8227a Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 29 Jan 2021 10:56:26 -0300
Subject: [PATCH 237/709] Updated Maven artifacts (#340)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index e8ca4d42211..41cccda54f6 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210126.031915-65-runner.jar
-    md5: 67167830f7a2b9593ce3955e40c452dd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210128.033550-67-runner.jar
+    md5: eee51226e0bf219c160ec72b13068470
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 6db2564ec7b..ff6a7ce0597 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210126.031956-65-runner.jar
-    md5: d7c3c0902937dfb84b1d7aaf0488eddc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210128.033639-67-runner.jar
+    md5: 1ce283f293a1500e92c5de0278ef999f
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 6c8dc651f48..b401bf0d3a7 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210126.032614-65-runner.jar
-    md5: a2c169737f9c9a1cc25a8760ab3202a1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210128.034314-67-runner.jar
+    md5: 7923d27bd865f156fdede0781d7a690f
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210126.032550-62-runner.jar
-    md5: acbada50faaaa649c64a4427e6dea3f7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210128.034249-64-runner.jar
+    md5: 1fa3b9fe5040266e1d8e57f13568a033
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 803cd841312..b280274e5b2 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210119.025408-1-runner.jar
-    md5: b9b6091850d6be57920a01ae8671c82f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210128.034456-9-runner.jar
+    md5: 7f3131d06f52abccebcf2f246d9ebc5b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index d8f2e385934..01809a05988 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210126.031813-63-runner.jar
-    md5: 6882c3b69837f341b40805d6da1fcf5e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210128.033440-65-runner.jar
+    md5: c2cf6267119f7d5b6393fd9cc15119c0
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index c8bae4d0c60..bcab3a2430b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210126.032338-65-runner.jar
-    md5: d1d92afd5b00aae560afa0f3f0b6dc27
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210128.034036-67-runner.jar
+    md5: 5704b10b29c30ecb7d835a3cd84d1fdf
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 06c1891eed9..4e6f49c1cb0 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210126.032437-65-runner.jar
-    md5: 206ec45ea738af781e6f5d10ae2e2703
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210128.034135-67-runner.jar
+    md5: e5b01e468ede6cd898be570711a2f01b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index bb10158ccd2..fb62b42755a 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210126.032406-65-runner.jar
-    md5: 02d6db8ba9ce6ca6c8446dd4986c9fcf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210128.034104-67-runner.jar
+    md5: 7745dfa2d21717df240c9541f9812af0
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 51181bd6cb9..8f508f1c42b 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210126.032711-62-runner.jar
-    md5: d48bba6dd6a6f621f85128a2b98dbb75
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210128.034412-64-runner.jar
+    md5: fa105c7b7bd20a710a03b454a3d17083
 
 execute:
   - script: configure

From 315e4b4c201fe69555f4ee9f3142851577942424 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 1 Feb 2021 12:06:07 -0300
Subject: [PATCH 238/709] Updated Maven artifacts (#347)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 41cccda54f6..8d42aa3eed6 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210128.033550-67-runner.jar
-    md5: eee51226e0bf219c160ec72b13068470
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210201.034406-70-runner.jar
+    md5: d87ad3a13a35449f4c53a0f46488d980
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index ff6a7ce0597..6d5c5d462ab 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210128.033639-67-runner.jar
-    md5: 1ce283f293a1500e92c5de0278ef999f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210201.034458-70-runner.jar
+    md5: 365d1e450ed70b4b54c18c2080b71c4f
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index b401bf0d3a7..c39443dd147 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210128.034314-67-runner.jar
-    md5: 7923d27bd865f156fdede0781d7a690f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210201.035457-70-runner.jar
+    md5: 2f1cd2573216d7cf01f21fa5e7ec06cb
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210128.034249-64-runner.jar
-    md5: 1fa3b9fe5040266e1d8e57f13568a033
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210201.035422-67-runner.jar
+    md5: 9e4268a1afb8005c552ba517cbf8a221
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index b280274e5b2..5ddc92c0a06 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210128.034456-9-runner.jar
-    md5: 7f3131d06f52abccebcf2f246d9ebc5b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210201.035709-12-runner.jar
+    md5: 2c11e46993e049a089d0ad7e7f445ba5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 01809a05988..ae296596fb7 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210128.033440-65-runner.jar
-    md5: c2cf6267119f7d5b6393fd9cc15119c0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210201.034238-68-runner.jar
+    md5: 00c3986f4a0c009c5baf1ce7b6cfbbb3
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index bcab3a2430b..6f3de9f027c 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210128.034036-67-runner.jar
-    md5: 5704b10b29c30ecb7d835a3cd84d1fdf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210201.035124-70-runner.jar
+    md5: 13c19cdac5a0d1fb33ca9c7b9e4a53de
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 4e6f49c1cb0..526a205fc51 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210128.034135-67-runner.jar
-    md5: e5b01e468ede6cd898be570711a2f01b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210201.035237-70-runner.jar
+    md5: e39894ff0080408219f369cb8861320e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index fb62b42755a..ca110360734 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210128.034104-67-runner.jar
-    md5: 7745dfa2d21717df240c9541f9812af0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210201.035200-70-runner.jar
+    md5: 98447b5fd663afb25b7cfbb497fbdbfe
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 8f508f1c42b..9724c530ceb 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210128.034412-64-runner.jar
-    md5: fa105c7b7bd20a710a03b454a3d17083
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210201.035618-67-runner.jar
+    md5: c38506e107c5c7413137a0ca66a85870
 
 execute:
   - script: configure

From c424d4ddb4aabfc5d5a46f8a68dc7354ae3f5595 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 2 Feb 2021 09:44:53 -0300
Subject: [PATCH 239/709] Updated Maven artifacts (#350)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 8d42aa3eed6..0fc19f6aa81 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210201.034406-70-runner.jar
-    md5: d87ad3a13a35449f4c53a0f46488d980
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210202.031145-71-runner.jar
+    md5: bf4965a801d14dc7f793b2da4f2f4370
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 6d5c5d462ab..5a41cc22b81 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210201.034458-70-runner.jar
-    md5: 365d1e450ed70b4b54c18c2080b71c4f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210202.031226-71-runner.jar
+    md5: 108acc404366e43e22a4ff3e4156a6e4
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index c39443dd147..e882c90e500 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210201.035457-70-runner.jar
-    md5: 2f1cd2573216d7cf01f21fa5e7ec06cb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210202.031810-71-runner.jar
+    md5: 844d2d5738824ed284608ffee2eeec3c
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210201.035422-67-runner.jar
-    md5: 9e4268a1afb8005c552ba517cbf8a221
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210202.031744-68-runner.jar
+    md5: b70c7bdd6cb90448729ce43a30c44718
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 5ddc92c0a06..430105169dd 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210201.035709-12-runner.jar
-    md5: 2c11e46993e049a089d0ad7e7f445ba5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210202.031948-13-runner.jar
+    md5: 028249994fc70ee992a279a8af80401c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index ae296596fb7..04c8684174e 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210201.034238-68-runner.jar
-    md5: 00c3986f4a0c009c5baf1ce7b6cfbbb3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210202.031043-69-runner.jar
+    md5: f7f9256d3163cf2af5671e05020a71f0
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 6f3de9f027c..d713672e9c1 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210201.035124-70-runner.jar
-    md5: 13c19cdac5a0d1fb33ca9c7b9e4a53de
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210202.031534-71-runner.jar
+    md5: 30b6b83524b952bd2fb0bae71ca2a660
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 526a205fc51..13410d5cc82 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210201.035237-70-runner.jar
-    md5: e39894ff0080408219f369cb8861320e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210202.031632-71-runner.jar
+    md5: 1b60f7a61075669a3f7c31c825687074
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index ca110360734..4ddc825531c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210201.035200-70-runner.jar
-    md5: 98447b5fd663afb25b7cfbb497fbdbfe
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210202.031602-71-runner.jar
+    md5: 85a0c369bf03517c3792290b0863f8f4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 9724c530ceb..1adbe31ec29 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210201.035618-67-runner.jar
-    md5: c38506e107c5c7413137a0ca66a85870
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210202.031903-68-runner.jar
+    md5: 80eefe10d95b04f8bced3a6d29db7be0
 
 execute:
   - script: configure

From 53f7264b00f8505b63d234a7bf5f1c629543e0ae Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 3 Feb 2021 10:00:02 -0300
Subject: [PATCH 240/709] Updated Maven artifacts (#352)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 0fc19f6aa81..1773696d66a 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210202.031145-71-runner.jar
-    md5: bf4965a801d14dc7f793b2da4f2f4370
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210203.034522-72-runner.jar
+    md5: 6d6e5922828df21f342f3b167772f846
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 5a41cc22b81..be46d2e0670 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210202.031226-71-runner.jar
-    md5: 108acc404366e43e22a4ff3e4156a6e4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210203.034613-72-runner.jar
+    md5: d523b7f0115b428a3010efead35239c7
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index e882c90e500..21cc253d132 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210202.031810-71-runner.jar
-    md5: 844d2d5738824ed284608ffee2eeec3c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210203.035607-72-runner.jar
+    md5: c5b4ff14f15da3054f635210bfe558d6
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210202.031744-68-runner.jar
-    md5: b70c7bdd6cb90448729ce43a30c44718
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210203.035534-69-runner.jar
+    md5: c5f3ecf46fa389974057bbd1a36e0e7f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 430105169dd..b28a3959541 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210202.031948-13-runner.jar
-    md5: 028249994fc70ee992a279a8af80401c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210203.035817-14-runner.jar
+    md5: 4cce138e5e3c1f32f0d68f689a286e31
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 04c8684174e..0ef36fb618a 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210202.031043-69-runner.jar
-    md5: f7f9256d3163cf2af5671e05020a71f0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210203.034402-70-runner.jar
+    md5: 7c910a543524e11d0ed2b3835b96ce85
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index d713672e9c1..41caae25c65 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210202.031534-71-runner.jar
-    md5: 30b6b83524b952bd2fb0bae71ca2a660
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210203.035305-72-runner.jar
+    md5: e45d7279300ef8de34b37cf57bf92712
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 13410d5cc82..9f5a5b40e22 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210202.031632-71-runner.jar
-    md5: 1b60f7a61075669a3f7c31c825687074
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210203.035405-72-runner.jar
+    md5: 4611e71fce0fd3352653853bcb220b34
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 4ddc825531c..a6f50c7eefa 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210202.031602-71-runner.jar
-    md5: 85a0c369bf03517c3792290b0863f8f4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210203.035335-72-runner.jar
+    md5: 5309ac6fd68560420664605bf23cee89
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 1adbe31ec29..ce623ff9646 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210202.031903-68-runner.jar
-    md5: 80eefe10d95b04f8bced3a6d29db7be0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210203.035723-69-runner.jar
+    md5: b7398ea6fac14a74f6f8fba59d9d577c
 
 execute:
   - script: configure

From 1d7f75df7bac2faf2416577dc7acbe6fb36683c6 Mon Sep 17 00:00:00 2001
From: Tarun Khandelwal <tarkhand@redhat.com>
Date: Thu, 4 Feb 2021 17:49:45 +0530
Subject: [PATCH 241/709] [KOGITO-2317] - Unify Kogito Quarkus and Spring
 Images (#348)

* [KOGITO-2317] - Unify Kogito Quarkus and Spring Images
See: https://issues.redhat.com/browse/KOGITO-2317

Signed-off-by: Tarun Khandelwal <tarkhand@redhat.com>
---
 Jenkinsfile.deploy                            |   3 +-
 README.md                                     | 233 +++++++-----------
 ...ides.yaml => kogito-builder-overrides.yaml |  19 +-
 kogito-imagestream.yaml                       |  66 +----
 ....yaml => kogito-runtime-jvm-overrides.yaml |  18 +-
 ...ml => kogito-runtime-native-overrides.yaml |   6 +-
 kogito-springboot-ubi8-overrides.yaml         |  44 ----
 kogito-springboot-ubi8-s2i-overrides.yaml     |  39 ---
 .../kogito-builder/added/kogito-app-launch.sh |  46 ++++
 .../configure                                 |   0
 .../module.yaml                               |   3 +-
 .../s2i/bin/assemble                          |  32 ++-
 modules/kogito-builder/s2i/bin/usage          |  37 +++
 .../added/kogito-app-launch.sh                |  27 --
 .../added/kogito-app-launch.sh                |  31 ---
 modules/kogito-quarkus-s2i/module.yaml        |   6 -
 modules/kogito-quarkus-s2i/s2i/bin/usage      |  39 ---
 .../added/kogito-app-launch.sh                |  42 ++++
 .../configure                                 |   0
 .../module.yaml                               |   2 +-
 .../s2i/bin/assemble                          |   0
 .../s2i/bin/usage                             |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 .../configure                                 |   0
 .../module.yaml                               |   2 +-
 .../s2i/bin/assemble                          |   0
 .../s2i/bin/usage                             |   6 +-
 modules/kogito-s2i-core/added/s2i-core        |  13 +-
 .../kogito-s2i-core/s2i/bin/assemble-runtime  |   2 +-
 .../added/kogito-app-launch.sh                |  25 --
 modules/kogito-springboot-s2i/configure       |  15 --
 modules/kogito-springboot-s2i/module.yaml     |   6 -
 .../kogito-springboot-s2i/s2i/bin/assemble    |  34 ---
 modules/kogito-springboot-s2i/s2i/bin/usage   |  20 --
 .../added/kogito-app-launch.sh                |  24 --
 modules/kogito-springboot/configure           |  16 --
 modules/kogito-springboot/s2i/bin/assemble    |   7 -
 modules/kogito-springboot/s2i/bin/usage       |  12 -
 scripts/common.py                             |  10 +-
 tests/features/common-build-runtime.feature   |   2 +-
 tests/features/common.feature                 |   2 +-
 ...bi8-s2i.feature => kogito-builder.feature} | 223 ++++++++++++++---
 .../features/kogito-quarkus-jvm-ubi8.feature  |  52 ----
 ...bi8.feature => kogito-runtime-jvm.feature} |  47 +++-
 ....feature => kogito-runtime-native.feature} |   5 +-
 .../kogito-springboot-ubi8-s2i.feature        | 126 ----------
 46 files changed, 543 insertions(+), 808 deletions(-)
 rename kogito-quarkus-ubi8-s2i-overrides.yaml => kogito-builder-overrides.yaml (66%)
 rename kogito-quarkus-jvm-ubi8-overrides.yaml => kogito-runtime-jvm-overrides.yaml (58%)
 rename kogito-quarkus-ubi8-overrides.yaml => kogito-runtime-native-overrides.yaml (84%)
 delete mode 100644 kogito-springboot-ubi8-overrides.yaml
 delete mode 100644 kogito-springboot-ubi8-s2i-overrides.yaml
 create mode 100644 modules/kogito-builder/added/kogito-app-launch.sh
 rename modules/{kogito-quarkus-s2i => kogito-builder}/configure (100%)
 rename modules/{kogito-quarkus => kogito-builder}/module.yaml (71%)
 rename modules/{kogito-quarkus-s2i => kogito-builder}/s2i/bin/assemble (54%)
 create mode 100644 modules/kogito-builder/s2i/bin/usage
 delete mode 100644 modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-quarkus-s2i/module.yaml
 delete mode 100644 modules/kogito-quarkus-s2i/s2i/bin/usage
 create mode 100644 modules/kogito-runtime-jvm/added/kogito-app-launch.sh
 rename modules/{kogito-quarkus-jvm => kogito-runtime-jvm}/configure (100%)
 rename modules/{kogito-quarkus-jvm => kogito-runtime-jvm}/module.yaml (70%)
 rename modules/{kogito-quarkus-jvm => kogito-runtime-jvm}/s2i/bin/assemble (100%)
 rename modules/{kogito-quarkus-jvm => kogito-runtime-jvm}/s2i/bin/usage (60%)
 rename modules/{kogito-quarkus => kogito-runtime-native}/added/kogito-app-launch.sh (93%)
 rename modules/{kogito-quarkus => kogito-runtime-native}/configure (100%)
 rename modules/{kogito-springboot => kogito-runtime-native}/module.yaml (68%)
 rename modules/{kogito-quarkus => kogito-runtime-native}/s2i/bin/assemble (100%)
 rename modules/{kogito-quarkus => kogito-runtime-native}/s2i/bin/usage (59%)
 delete mode 100644 modules/kogito-springboot-s2i/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-springboot-s2i/configure
 delete mode 100644 modules/kogito-springboot-s2i/module.yaml
 delete mode 100755 modules/kogito-springboot-s2i/s2i/bin/assemble
 delete mode 100755 modules/kogito-springboot-s2i/s2i/bin/usage
 delete mode 100644 modules/kogito-springboot/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-springboot/configure
 delete mode 100755 modules/kogito-springboot/s2i/bin/assemble
 delete mode 100755 modules/kogito-springboot/s2i/bin/usage
 rename tests/features/{kogito-quarkus-ubi8-s2i.feature => kogito-builder.feature} (57%)
 delete mode 100644 tests/features/kogito-quarkus-jvm-ubi8.feature
 rename tests/features/{kogito-springboot-ubi8.feature => kogito-runtime-jvm.feature} (64%)
 rename tests/features/{kogito-quarkus-ubi8.feature => kogito-runtime-native.feature} (93%)
 delete mode 100644 tests/features/kogito-springboot-ubi8-s2i.feature

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index f2907df5457..9f6f23e536e 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -207,8 +207,7 @@ pipeline {
 
                     // Debug purpose in case of issue
                     sh 'cat tests/test-apps/clone-repo.sh'
-                    sh 'cat tests/features/kogito-quarkus-ubi8-s2i.feature'
-                    sh 'cat tests/features/kogito-springboot-ubi8-s2i.feature'
+                    sh 'cat tests/features/kogito-builder.feature'
 
                     // Prepare local examples
                     sh 'make clone-repos'
diff --git a/README.md b/README.md
index af85eb5c68e..fcef9bfd966 100644
--- a/README.md
+++ b/README.md
@@ -28,12 +28,10 @@ Table of Contents
   - [Kogito Images Requirements](#kogito-images-requirements)
   - [Kogito Runtime and Builder Images](#kogito-runtime-and-builder-images)
     - [Kogito Builder Images](#kogito-builder-images)
-      - [Kogito Quarkus Builder Image](#kogito-quarkus-builder-image)
-        - [Kogito Quarkus Builder Image usage](#kogito-quarkus-builder-image-usage)
-        - [Kogito Quarkus Builder Image example](#kogito-quarkus-builder-image-example)
-      - [Kogito Spring Boot Builder Image](#kogito-spring-boot-builder-image)
-        - [Kogito Spring Boot Builder Image usage](#kogito-spring-boot-builder-image-usage)
-        - [Kogito Spring Boot Builder Image example](#kogito-spring-boot-builder-image-example)
+      - [Kogito Builder Image usage](#kogito-builder-image-usage)
+      - [Kogito Builder Image example](#kogito-builder-image-example)
+        - [Builder Image Examples with Quarkus](#builder-image-example-with-quarkus)
+        - [Builder Image Examples with Springboot](#builder-image-example-with-springboot)
       - [Improving Build Time](#improving-build-time)
         - [Using incremental builds](#using-incremental-builds)
         - [Using a Maven mirror](#using-a-maven-mirror)
@@ -41,15 +39,12 @@ Table of Contents
       - [Binary Builds](#binary-builds)
         - [KJAR Maven Project](#kjar-maven-project)
         - [Assets only](#assets-only)
-      - [Kogito Quarkus JVM Runtime Image](#kogito-quarkus-jvm-runtime-image)
-        - [Kogito Quarkus JVM Runtime Image usage](#kogito-quarkus-jvm-runtime-image-usage)
-        - [Kogito Quarkus JVM Runtime Image examples](#kogito-quarkus-jvm-runtime-image-examples)
-      - [Kogito Quarkus Native Runtime Image](#kogito-quarkus-native-runtime-image)
-        - [Kogito Quarkus Native Runtime Image usage](#kogito-quarkus-native-runtime-image-usage)
-        - [Kogito Quarkus Native Runtime Image example](#kogito-quarkus-native-runtime-image-example)
-      - [Kogito Spring Boot Runtime Image](#kogito-spring-boot-runtime-image)
-        - [Kogito Spring Boot Runtime Image usage](#kogito-spring-boot-runtime-image-usage)
-        - [Kogito Spring Boot Runtime Image example](#kogito-spring-boot-runtime-image-example)
+      - [Kogito Runtime JVM Image](#kogito-runtime-jvm-image)
+        - [Kogito Runtime JVM Image usage](#kogito-runtime-jvm-image-usage)
+        - [Kogito Runtime JVM Image examples](#kogito-runtime-jvm-image-examples)
+      - [Kogito Runtime Native Image](#kogito-runtime-native-image)
+        - [Kogito Runtime Native Image usage](#kogito-runtime-native-image-usage)
+        - [Kogito Runtime Native Image example](#kogito-runtime-native-image-example)
   - [Kogito Component Images](#kogito-component-images)
     - [Kogito Data Index Component Images](#kogito-data-index-component-images)
     - [Kogito Trusty Component Image](#kogito-trusty-component-image)
@@ -121,51 +116,49 @@ Those are described bellow.
 The Kogito Builder Images are responsible for building the project with Apache Maven and generate the binary that will 
 be used by the Kogito Runtime images to run the Kogito application.
 
-The current available Kogito Builder images are:
+The current available Kogito Builder image is:
 
-* [quay.io/kiegroup/kogito-quarkus-ubi8-s2i](https://quay.io/kiegroup/kogito-quarkus-ubi8-s2i)
-* [quay.io/kiegroup/kogito-springboot-ubi8-s2i](https://quay.io/kiegroup/kogito-springboot-ubi8-s2i)
+* [quay.io/kiegroup/kogito-builder](https://quay.io/kiegroup/kogito-builder)
 
-The Kogito Quarkus Builder Image allows you to create native image using GraalVM which allows you to have
-lightweight and fast applications ready to run in the Cloud.
+The builder image supports building applications based on Spring Boot and Quarkus. To define your runtime, specify the `RUNTIME_TYPE` environment variable. If var is not defined, it defaults to `quarkus`.
+When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a native image using GraalVM, which allows you to have lightweight and fast applications ready to run in the Cloud.
 
 
-#### Kogito Quarkus Builder Image
-
-The Kogito Quarkus Builder Image is equipped with the following components:
+The Kogito Builder Image is equipped with the following components:
 
  * GraalVM 20.2.0-java11
  * OpenJDK 11.0.6
  * Maven 3.6.2
  
-For more information about what is installed on this image take a look [here](kogito-quarkus-s2i-overrides.yaml) in the
+For more information about what is installed on this image, take a look [here](kogito-builder-overrides.yaml) in the
 **modules.install** section. 
 
-##### Kogito Quarkus Builder Image usage
+#### Kogito Builder Image usage
 
 This image contains a helper option to better understand how to it:
 
 ```bash
-$ docker run -it quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest /home/kogito/kogito-app-launch.sh -h
+$ docker run -it quay.io/kiegroup/kogito-builder:latest /home/kogito/kogito-app-launch.sh -h
 ```
 
-By default, a normal java build will be performed. To perform a native build just set the **NATIVE**
-build environment variable to **true**.
+By default, quarkus is selected as runtime, and a normal java build will be performed. To perform a native build, just set the **NATIVE** build environment variable to **true**.
 
 See the next topic for an example.
  
 
-##### Kogito Quarkus Builder Image example
+#### Kogito Builder Image example
 
-In this example, let's use a simple application available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
+##### Builder Image Example with Quarkus
+In this example, let's use a simple application based on Quarkus that is available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
 repository: the *rules-quarkus-helloworld* example, with native compilation disabled.
 
 
 ```bash
 $ s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref master \
+    -e RUNTIME_TYPE=quarkus \
     --context-dir rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest \
+    quay.io/kiegroup/kogito-builder:latest \
     rules-example:1.0
 ...
 [INFO] BUILD SUCCESS
@@ -202,35 +195,18 @@ $ curl -H "Content-Type: application/json" -X POST -d '{"strings":["hello"]}' ht
 ```
 
 
-#### Kogito Spring Boot Builder Image
-
-The Kogito Spring Boot Builder Image is equipped with the following components:
-
- * OpenJDK 11.0.6
- * Maven 3.6.2
- 
-For more information about what is installed on this image take a look [here](kogito-springboot-s2i-overrides.yaml) 
-in the **modules.install** section. 
-
-##### Kogito Spring Boot Builder Image usage
-
-This image contains a helper option to better understand how to it:
-
-```bash
-$ docker run -it quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest /home/kogito/kogito-app-launch.sh -h
-```
 
-##### Kogito Spring Boot Builder Image example
-
-In this example, let's use a simple application available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
+##### Builder Image Example with Springboot
+In this example, let's use a simple application based on Spring Boot that is available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
 repository: the *process-springboot-example*.
 
 ```bash
 $ s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref master \
     --context-dir \
+    -e RUNTIME_TYPE=springboot \
     process-springboot-example \
-    quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest \
+    quay.io/kiegroup/kogito-builder:latest \
     springboot-example:1.0
 ```
 
@@ -265,8 +241,9 @@ Let's start 2 builds with the incremental option enabled and compare the time sp
 # First incremental build
 $ time s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref master \
+    -e RUNTIME_TYPE=quarkus
     --context-dir rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest \
+    quay.io/kiegroup/kogito-builder:latest \
     rules-example-incremental:1.0 \
     --incremental \    
     --env NATIVE=false
@@ -282,8 +259,9 @@ And now, let's run it again.
 # Second incremental build
 $ time s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref master \
+    -e RUNTIME_TYPE=quarkus
     --context-dir rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest \
+    quay.io/kiegroup/kogito-builder:latest \
     rules-example-incremental:1.0 \
     --incremental \
     --env NATIVE=false
@@ -309,8 +287,9 @@ To turn it possible we just need to set the **MAVEN_MIRROR_URL** environment var
 # Third incremental build, with Maven mirror option
 $ time s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref master \
+    -e RUNTIME_TYPE=quarkus
     --context-dir rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest \
+    quay.io/kiegroup/kogito-builder:latest \
     rules-example-incremental-1 \
     --incremental \
     --env NATIVE=false \
@@ -350,9 +329,8 @@ With this approach, we can have smaller and more compact images that do not incl
 
 Today we have the following Kogito Runtime Images:
 
-* [quay.io/kiegroup/kogito-quarkus-jvm-ubi8](https://quay.io/kiegroup/kogito-quarkus-jvm-ubi8)
-* [quay.io/kiegroup/kogito-quarkus-ubi8](http://quay.io/kiegroup/kogito-quarkus-ubi8)
-* [quay.io/kiegroup/kogito-springboot-ubi8](http://quay.io/kiegroup/kogito-springboot-ubi8)
+* [quay.io/kiegroup/kogito-runtime-jvm](https://quay.io/kiegroup/kogito-runtime-jvm)
+* [quay.io/kiegroup/kogito-runtime-native](http://quay.io/kiegroup/kogito-runtime-native)
 
 #### Binary Builds
 
@@ -396,21 +374,22 @@ Types of Business assets can be:
 
 Upon build, these assets will be copied to a generated maven project and built with Maven to produce a runnable binary. Default value of group id is "com.company", artifact id is "project" and version is "1.0-SNAPSHOT". To provide custom value we need to set the **PROJECT_GROUP_ID**, **PROJECT_ARTIFACT_ID** and **PROJECT_VERSION**.
 
-#### Kogito Quarkus JVM Runtime Image
+#### Kogito Runtime JVM Image
 
 This Kogito Runtime Image contains only the needed files to execute a pre built Kogito application and a JRE.
+The Image can run an application based on Quarkus or Springboot. Users can define `RUNTIME_TYPE` environment variable to switch between the two.
 
 
-##### Kogito Quarkus JVM Runtime Image usage
+##### Kogito Runtime JVM Image usage
 
 This image contains a helper option to better understand how to it:
 
 ```bash
-docker run -it quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest /home/kogito/kogito-app-launch.sh -h
+docker run -it quay.io/kiegroup/kogito-runtime-jvm:latest /home/kogito/kogito-app-launch.sh -h
 ```
 
 
-##### Kogito Quarkus JVM Runtime Image examples
+##### Kogito Runtime JVM Image examples
 
 In the next few lines let's take a look on how this image can be used to receive an already built UberJAR. 
 To configure Quarkus to generate a UberJAR please follow the instructions described [here](https://quarkus.io/guides/maven-tooling#configuration-reference)
@@ -426,7 +405,7 @@ $ mvn clean package -Dquarkus.package.uber-jar
 $ java -jar target/jbpm-quarkus-example-runner.jar 
 
 # performing a source to image build to copy the artifacts to the runtime image
-$ s2i build target/ quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest process-quarkus-example
+$ s2i build target/ -e RUNTIME_TYPE=quarkus quay.io/kiegroup/kogito-runtime-jvm:latest process-quarkus-example
 
 # run the generated image
 $ docker run -p 8080:8080 -it process-quarkus-example
@@ -449,7 +428,7 @@ Note that this time there is a *lib* folder into the **target** directory. The s
 Just perform a build:
 
 ```bash
-$ s2i build target/ quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest process-quarkus-example-non-uberjar
+$ s2i build target/ quay.io/kiegroup/kogito-runtime-jvm:latest process-quarkus-example-non-uberjar
 $ docker run -p 8080:8080 -it process-quarkus-example-non-uberjar
 
 # On another shell do a simple post request 
@@ -458,46 +437,31 @@ $ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" :
 #repare the container logs the following message:
 Order has been created Order[12345] with assigned approver JOHN
 ```
-
-
-#### Kogito Quarkus Native Runtime Image
-
-This Kogito Runtime Image contains only the needed files to execute a pre built Kogito application.
-
-
-##### Kogito Quarkus Native Runtime Image usage
-
-This image contains a helper option to better understand how to it:
-
-```bash
-docker run -it quay.io/kiegroup/kogito-quarkus-ubi8:latest /home/kogito/kogito-app-launch.sh -h
-```
-
-##### Kogito Quarkus Native Runtime Image example
-
-For this example let's use the same than the previous one (process-quarkus-example). 
-But this time, let's perform a native build:
+**Runtime Image example with springboot**
+Let's try, here, the *process-springboot-example*: 
 
 ```bash
-$ mvn clean package -Pnative
+$ mvn clean package
 ```
 
-A binary has been generated into the **target directory**.
-Let's use this binary to perform the source-to-image build:
+An uberjar file has been generated into the **target directory**. 
+Let's use this uberjar to perform the build:
 
 ```bash
-s2i build target/ quay.io/kiegroup/kogito-quarkus-ubi8:latest binary-test-example
+$ s2i build target/ -e RUNTIME_TYPE=springboot quay.io/kiegroup/kogito-runtime-jvm:latest spring-binary-example
 -----> [s2i-core] Running runtime assemble script
 -----> Binary build enabled, artifacts were uploaded directly to the image build
------> Found binary file, native build.
 -----> Cleaning up unneeded jar files
-...
+removed 'process-springboot-example-tests.jar'
+removed 'process-springboot-example-sources.jar'
+removed 'process-springboot-example-test-sources.jar'
+-----> Copying uploaded files to /home/kogito
 ---> Installing application binaries
-'./process-quarkus-example-runner' -> '/home/kogito/bin/process-quarkus-example-runner'
+'./process-springboot-example.jar' -> '/home/kogito/bin/process-springboot-example.jar'
 ...
 
 # run the output image
-$ docker run -it -p 8080:8080 binary-test-example
+$ docker run -it -p 8080:8080 spring-binary-example
 
 # on another terminal, interact with the kogito service
 $ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
@@ -506,46 +470,44 @@ $ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" :
 Order has been created Order[12345] with assigned approver JOHN
 ```
 
+#### Kogito Runtime Native Image
 
-#### Kogito Spring Boot Runtime Image
-
-This Kogito Runtime Image contains only the needed files to execute a pre built Kogito application and a JRE.
+This Kogito Runtime Image contains only the needed files to execute a pre built Kogito application.
 
 
-##### Kogito Spring Boot Runtime Image usage
+##### Kogito Runtime Native Image Usage
 
 This image contains a helper option to better understand how to it:
 
 ```bash
-docker run -it quay.io/kiegroup/kogito-springboot-ubi8:latest /home/kogito/kogito-app-launch.sh -h
+docker run -it quay.io/kiegroup/kogito-runtime-native:latest /home/kogito/kogito-app-launch.sh -h
 ```
 
-##### Kogito Spring Boot Runtime Image example
+##### Kogito Runtime Native Image Example
 
-Let's try, here, the *process-springboot-example*: 
+For this example, let's use the same as the previous one (process-quarkus-example). 
+But this time, let's perform a native build:
 
 ```bash
-$ mvn clean package
+$ mvn clean package -Pnative
 ```
 
-A uberjar file has been generated into the **target directory**. 
-Let's use this uberjar to perform the build:
+A binary has been generated into the **target directory**.
+Let's use this binary to perform the source-to-image build:
 
 ```bash
-$ s2i build target/ quay.io/kiegroup/kogito-springboot-ubi8:latest spring-binary-example
+s2i build target/ -e RUNTIME_TYPE=quarkus quay.io/kiegroup/kogito-runtime-native:latest binary-test-example
 -----> [s2i-core] Running runtime assemble script
 -----> Binary build enabled, artifacts were uploaded directly to the image build
+-----> Found binary file, native build.
 -----> Cleaning up unneeded jar files
-removed 'process-springboot-example-tests.jar'
-removed 'process-springboot-example-sources.jar'
-removed 'process-springboot-example-test-sources.jar'
------> Copying uploaded files to /home/kogito
+...
 ---> Installing application binaries
-'./process-springboot-example.jar' -> '/home/kogito/bin/process-springboot-example.jar'
+'./process-quarkus-example-runner' -> '/home/kogito/bin/process-quarkus-example-runner'
 ...
 
 # run the output image
-$ docker run -it -p 8080:8080 spring-binary-example
+$ docker run -it -p 8080:8080 binary-test-example
 
 # on another terminal, interact with the kogito service
 $ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
@@ -554,7 +516,6 @@ $ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" :
 Order has been created Order[12345] with assigned approver JOHN
 ```
 
-
 ## Kogito Component Images
 
 The Kogito Component Images can be considered as lightweight images that will complement the Kogito core engine 
@@ -784,7 +745,7 @@ Once the images are built and imported into a registry (quay.io or any other reg
 
 As a first step, we need to make the Kogito Images available as Image Streams in OpenShift. If you have `cluster-admin` 
 rights you can deploy it into the **openshift** namespace, otherwise, deploy it into the namespace where you have permissions. 
-To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/kiegroup/kogito-images/0.9.0/kogito-imagestream.yaml).
+To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/kiegroup/kogito-images/master/kogito-imagestream.yaml).
 It points to the latest released version.
 
 Let's use the *rules-quarkus-helloworld* from [Kogito Examples](https://github.com/kiegroup/kogito-examples).
@@ -802,11 +763,9 @@ to build a new example application in Ruby.
 
 # installing the imagestream on the current namespace
 $ oc create -f https://raw.githubusercontent.com/kiegroup/kogito-images/0.16.0/kogito-imagestream.yaml
-imagestream.image.openshift.io/kogito-quarkus-ubi8 created
-imagestream.image.openshift.io/kogito-quarkus-jvm-ubi8 created
-imagestream.image.openshift.io/kogito-quarkus-ubi8-s2i created
-imagestream.image.openshift.io/kogito-springboot-ubi8 created
-imagestream.image.openshift.io/kogito-springboot-ubi8-s2i created
+imagestream.image.openshift.io/kogito-runtime-native created
+imagestream.image.openshift.io/kogito-runtime-jvm created
+imagestream.image.openshift.io/kogito-builder created
 imagestream.image.openshift.io/kogito-data-index-infinispan created
 imagestream.image.openshift.io/kogito-data-index-mongodb created
 imagestream.image.openshift.io/kogito-trusty created
@@ -814,10 +773,10 @@ imagestream.image.openshift.io/kogito-jobs-service created
 imagestream.image.openshift.io/kogito-management-console created
 
 # performing a new build
-$ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-quarkus-ubi8-s2i:0.9.0 \ 
+$ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-builder:latest \ 
     https://github.com/kiegroup/kogito-examples.git#master --context-dir=rules-quarkus-helloworld \
     --strategy=source --env NATIVE=false 
---> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-quarkus-ubi8-s2i" under tag "0.9.0" for "kogito-quarkus-ubi8-s2i:0.9.0"
+--> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-builder" under tag "latest" for "kogito-builder:latest"
 
     Kogito based on Quarkus 
     ----------------------- 
@@ -847,8 +806,8 @@ to the Kogito Runtime Image. To do this, execute the following command:
 
 ```bash
 $ oc new-build --name=rules-quarkus-helloworld-service --source-image=rules-quarkus-helloworld-builder \
-  --source-image-path=/home/kogito/bin:. --image-stream=kogito-quarkus-jvm-ubi8:0.9.0
---> Found image 1608e71 (6 days old) in image stream "rules-quarkus-helloworld/kogito-quarkus-jvm-ubi8" under tag "0.9.0" for "kogito-quarkus-jvm-ubi8:0.9.0"
+  --source-image-path=/home/kogito/bin:. --image-stream=kogito-runtime-jvm:latest
+--> Found image 1608e71 (6 days old) in image stream "rules-quarkus-helloworld/kogito-runtime-jvm" under tag "latest" for "kogito-runtime-jvm:latest"
 
     Kogito based on Quarkus JVM image 
     --------------------------------- 
@@ -933,24 +892,24 @@ For more complex deployment, please use the [Kogito Cloud Operator](https://gith
 
 To be able to build the image it should be installed and available on OpenShift before it can be used.
 
-Suppose we have built the Quarkus s2i Image with the following command:
+Suppose we have built the kogito-builder with the following command:
 
 ```bash
-$ make kogito-quarkus-ubi8-s2i 
+$ make build-image image_name=kogito-builder
 ```
 
 We'll have as output the following image:
 
 ```bash
-quay.io/kiegroup/kogito-quarkus-ubi8-s2i:X.X.X
+quay.io/kiegroup/kogito-builder:X.X.X
 ```
 
 Then we need to tag the image properly. 
 Suppose your local registry is openshift.local.registry:8443, you should do:
 
 ```bash
-$ docker tag quay.io/kiegroup/kogito-quarkus-ubi8-s2i:X.X.X \
-    openshift.local.registry:8443/{NAMESPACE}/kogito-quarkus-ubi8-s2i:X.X.X
+$ docker tag quay.io/kiegroup/kogito-builder:X.X.X \
+    openshift.local.registry:8443/{NAMESPACE}/kogito-builder:X.X.X
 ```
 
 Where the namespace is the place where you want the image to be available for usage. 
@@ -958,7 +917,7 @@ Once the image is properly tagged, log in to the registry and push the new image
 
 ```bash
 $ docker login -u <USERNAME> -p <PASSWORD>  openshift.local.registry:8443
-$ docker push  openshift.local.registry:8443/{NAMESPACE}/kogito-quarkus-ubi8-s2i:X.X.X
+$ docker push  openshift.local.registry:8443/{NAMESPACE}/kogito-builder:X.X.X
 ```
 
 To deploy and test the new image, follow the same steps as described [here](#using-released-images)
@@ -990,11 +949,9 @@ With this Makefile you can:
  
 - Build images individually, by default it will build and test each image
      ```bash
-     $ make build-image image_name=kogito-quarkus-ubi8
-     $ make build-image image_name=kogito-quarkus-jvm-ubi8
-     $ make build-image image_name=kogito-quarkus-ubi8-s2i
-     $ make build-image image_name=kogito-springboot-ubi8 
-     $ make build-image image_name=kogito-springboot-ubi8-s2i
+     $ make build-image image_name=kogito-builder
+     $ make build-image image_name=kogito-runtime-jvm-ubi8
+     $ make build-image image_name=kogito-runtime-native
      $ make build-image image_name=kogito-data-index-infinispan
      $ make build-image image_name=kogito-data-index-mongodb
      $ make build-image image_name=kogito-trusty
@@ -1077,12 +1034,10 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-maven](modules/kogito-maven): Installs and configure Maven on the S2I images, also provides custom configuration script.
 - [kogito-openjdk](modules/kogito-openjdk): Provides OpenJDK and JRE.
 - [kogito-persistence](modules/kogito-persistence): Provides the needed configuration scripts to properly configure the Kogito Services in the target image.
-- [kogito-quarkus](modules/kogito-quarkus): Main module for the quay.io/kiegroup/kogito-quarkus-ubi8 image.
-- [kogito-quarkus-jvm](modules/kogito-quarkus-jvm): Main module for the quay.io/kiegroup/kogito-quarkus-jvm-ubi8 image.
-- [kogito-quarkus-s2i](modules/kogito-quarkus-s2i): Main module for the quay.io/kiegroup/kogito-quarkus-ubi8-s2i image.
+- [kogito-runtime-native](modules/kogito-runtime-native): Main module for the quay.io/kiegroup/kogito-runtime-native image.
+- [kogito-runtime-jvm](modules/kogito-runtime-jvm): Main module for the quay.io/kiegroup/kogito-runtime-jvm image.
+- [kogito-builder](modules/kogito-builder): Main module for the quay.io/kiegroup/kogito-builder image.
 - [kogito-s2i-core](modules/kogito-s2i-core): Provides the source-to-image needed scripts and configurations.
-- [kogito-springboot](modules/kogito-springboot): Main module for the quay.io/kiegroup/kogito-springboot-ubi8 image.
-- [kogito-springboot-s2i](modules/kogito-springbot-s2i): Main module for the quay.io/kiegroup/kogito-springboot-ubi8-s2i image.
 
 
 For each image, we use a specific *-overrides.yaml file which will specific the modules needed.
@@ -1096,11 +1051,9 @@ Please inspect the images overrides files to learn which modules are installed o
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-overrides.yaml)
 - [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-overrides.yaml)
-- [quay.io/kiegroup/kogito-quarkus-jvm-ubi8](kogito-quarkus-jvm-overrides.yaml)
-- [quay.io/kiegroup/kogito-quarkus-ubi8](kogito-quarkus-overrides.yaml)
-- [quay.io/kiegroup/kogito-quarkus-ubi8-s2i](kogito-quarkus-s2i-overrides.yaml)
-- [quay.io/kiegroup/kogito-springboot-ubi8](kogito-springboot-overrides.yaml)
-- [quay.io/kiegroup/kogito-springboot-ubi8-s2i](kogito-springboot-s2i-overrides.yaml)
+- [quay.io/kiegroup/kogito-runtime-jvm](kogito-runtime-jvm-overrides.yaml)
+- [quay.io/kiegroup/kogito-runtime-native](kogito-runtime-native-overrides.yaml)
+- [quay.io/kiegroup/kogito-builder](kogito-builder-overrides.yaml)
 
 
 ### Testing Images
diff --git a/kogito-quarkus-ubi8-s2i-overrides.yaml b/kogito-builder-overrides.yaml
similarity index 66%
rename from kogito-quarkus-ubi8-s2i-overrides.yaml
rename to kogito-builder-overrides.yaml
index 7a421770c28..f3fd0927cbf 100644
--- a/kogito-quarkus-ubi8-s2i-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -1,23 +1,26 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-quarkus-ubi8-s2i"
-description: "Platform for building Kogito based on Quarkus"
+name: "quay.io/kiegroup/kogito-builder"
+description: "Platform for building Kogito based on Quarkus or Springboot"
 
 labels:
 - name: "io.k8s.description"
-  value: "Platform for building Kogito based on Quarkus"
+  value: "Platform for building Kogito based on Quarkus or Spring Boot"
 - name: "io.k8s.display-name"
-  value: "Kogito based on Quarkus"
+  value: "Kogito based on Quarkus or Spring Boot"
 - name: "io.openshift.tags"
-  value: "builder,kogito,quarkus"
+  value: "builder,kogito,quarkus,springboot"
 
 envs:
 - name: "SCRIPT_DEBUG"
   example: "true"
   description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+- name: "RUNTIME_TYPE"
+  example: "springboot"
+  description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
 - name: NATIVE
   example: true
-  description: If set to true, perform a native build.
+  description: If set to true, perform a native build. Only supported for RUNTIME_TYPE is 'quarkus'.
 - name: JAVA_OPTIONS
   example: "-Dquarkus.log.level=DEBUG"
   description: JVM options passed to the Java command.
@@ -42,7 +45,7 @@ modules:
   - name: org.kie.kogito.maven
     version: "3.6.2"
   - name: org.kie.kogito.s2i.core
-  - name: org.kie.kogito.quarkus.s2i
+  - name: org.kie.kogito.builder
 
 packages:
   install:
@@ -53,4 +56,4 @@ packages:
   - zlib-devel
 
 run:
-  workdir: "/home/kogito"
\ No newline at end of file
+  workdir: "/home/kogito"
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 005f9109edc..44ba20c35ea 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -9,7 +9,7 @@ items:
   - kind: ImageStream
     apiVersion: v1
     metadata:
-      name: kogito-quarkus-ubi8
+      name: kogito-runtime-native
       annotations:
         openshift.io/display-name: Runtime image for Kogito based on Quarkus native image
         openshift.io/provider-display-name: Kie Group.
@@ -26,91 +26,49 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-runtime-native:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
-      name: kogito-quarkus-jvm-ubi8
+      name: kogito-runtime-jvm
       annotations:
-        openshift.io/display-name: Runtime image for Kogito based on Quarkus JVM image
+        openshift.io/display-name: Runtime image for Kogito based on Quarkus or Springboot JVM image
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
         - name: '2.0.0-snapshot'
           annotations:
-            description: Runtime image for Kogito based on Quarkus JVM image
+            description: Runtime image for Kogito based on Quarkus or Springboot JVM image
             iconClass: icon-jbpm
-            tags: runtime,kogito,quarkus,jvm
+            tags: runtime,kogito,quarkus,springboot,jvm
             supports: quarkus
             version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-runtime-jvm:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
-      name: kogito-quarkus-ubi8-s2i
+      name: kogito-builder
       annotations:
-        openshift.io/display-name: Platform for building Kogito based on Quarkus
+        openshift.io/display-name: Platform for building Kogito based on Quarkus or Springboot
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
         - name: '2.0.0-snapshot'
           annotations:
-            description: Platform for building Kogito based on Quarkus
+            description: Platform for building Kogito based on Quarkus or Springboot
             iconClass: icon-jbpm
-            tags: builder,kogito,quarkus
+            tags: builder,kogito,quarkus,springboot
             supports: quarkus
             version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:2.0.0-snapshot
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-springboot-ubi8
-      annotations:
-        openshift.io/display-name: Runtime image for Kogito based on SpringBoot
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '2.0.0-snapshot'
-          annotations:
-            description: Runtime image for Kogito based on SpringBoot
-            iconClass: icon-jbpm
-            tags: runtime,kogito,springboot
-            supports: springboot
-            version: '2.0.0-snapshot'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8:2.0.0-snapshot
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-springboot-ubi8-s2i
-      annotations:
-        openshift.io/display-name: Platform for building Kogito based on SpringBoot
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '2.0.0-snapshot'
-          annotations:
-            description: Platform for building Kogito based on Quarkus
-            iconClass: icon-jbpm
-            tags: builder,kogito,springboot
-            supports: springboot
-            version: '2.0.0-snapshot'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-builder:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-quarkus-jvm-ubi8-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
similarity index 58%
rename from kogito-quarkus-jvm-ubi8-overrides.yaml
rename to kogito-runtime-jvm-overrides.yaml
index 1a522bf2848..0c79489a428 100644
--- a/kogito-quarkus-jvm-ubi8-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -1,15 +1,15 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-quarkus-jvm-ubi8"
-description: "Runtime image for Kogito based on Quarkus JVM image"
+name: "quay.io/kiegroup/kogito-runtime-jvm"
+description: "Runtime image for Kogito based on Quarkus or Springboot JVM image"
 
 labels:
 - name: "io.k8s.description"
-  value: "Runtime image for Kogito based on Quarkus JVM image"
+  value: "Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
 - name: "io.k8s.display-name"
-  value: "Kogito based on Quarkus JVM image"
+  value: "Kogito based on Quarkus or Spring Boot JVM image"
 - name: "io.openshift.tags"
-  value: "builder,runtime,kogito,quarkus,jvm"
+  value: "builder,runtime,kogito,quarkus,springboot,jvm"
 - name: "io.openshift.s2i.assemble-input-files"
   value: "/home/kogito/bin"
 
@@ -17,6 +17,9 @@ envs:
 - name: "SCRIPT_DEBUG"
   example: "true"
   description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+- name: "RUNTIME_TYPE"
+  example: "springboot"
+  description: "Defines the runtime type of your Kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
 - name: JAVA_OPTIONS
   example: "-Dquarkus.log.level=DEBUG"
   description: JVM options passed to the Java command.
@@ -33,11 +36,10 @@ modules:
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.s2i.core
-  - name: org.kie.kogito.quarkus.jvm
+  - name: org.kie.kogito.runtime.jvm
 
 
-## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
+## s2i build . quay.io/kiegroup/kogito-builder:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
-
diff --git a/kogito-quarkus-ubi8-overrides.yaml b/kogito-runtime-native-overrides.yaml
similarity index 84%
rename from kogito-quarkus-ubi8-overrides.yaml
rename to kogito-runtime-native-overrides.yaml
index cee65a29c7c..b8d99a55d55 100644
--- a/kogito-quarkus-ubi8-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-quarkus-ubi8"
+name: "quay.io/kiegroup/kogito-runtime-native"
 description: "Runtime image for Kogito based on Quarkus native image"
 
 labels:
@@ -36,10 +36,10 @@ modules:
   - name: org.kie.kogito.graalvm.installer
     version: "20.2.0-java-11"
   - name: org.kie.kogito.s2i.core
-  - name: org.kie.kogito.quarkus
+  - name: org.kie.kogito.runtime.native
 
 
-## s2i build . quay.io/kiegroup/kogito-quarkus-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
+## s2i build . quay.io/kiegroup/kogito-builder:latest kogitotest:10.0 -e RUNTIME_TYPE=quarkus -e NATIVE=true --runtime-image quay.io/kiegroup/kogito-runtime-native:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
diff --git a/kogito-springboot-ubi8-overrides.yaml b/kogito-springboot-ubi8-overrides.yaml
deleted file mode 100644
index 0eec685bea8..00000000000
--- a/kogito-springboot-ubi8-overrides.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-springboot-ubi8"
-description: "Runtime image for Kogito based on SpringBoot native image"
-
-labels:
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito based on SpringBoot native image"
-- name: "io.k8s.display-name"
-  value: "Kogito based on SpringBoot native image"
-- name: "io.openshift.tags"
-  value: "builder,runtime,kogito,springboot"
-- name: "io.openshift.s2i.assemble-input-files"
-  value: "/home/kogito/bin"
-
-envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: JAVA_OPTIONS
-  example: "-Ddebug=true"
-  description: JVM options passed to the Java command.
-- name: BINARY_BUILD
-  example: "true"
-  description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
-
-ports:
-- value: 8080
-
-modules:
-  install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.s2i.core
-  - name: org.kie.kogito.springboot
-
-# s2i build . quay.io/kiegroup/kogito-springboot-ubi8-s2i:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-run:
-  workdir: "/home/kogito"
-
diff --git a/kogito-springboot-ubi8-s2i-overrides.yaml b/kogito-springboot-ubi8-s2i-overrides.yaml
deleted file mode 100644
index c399f1c3354..00000000000
--- a/kogito-springboot-ubi8-s2i-overrides.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-springboot-ubi8-s2i"
-description: "Platform for building Kogito based on SpringBoot"
-
-labels:
-- name: "io.k8s.description"
-  value: "Platform for building Kogito based on SpringBoot"
-- name: "io.k8s.display-name"
-  value: "Kogito based on SpringBoot"
-- name: "io.openshift.tags"
-  value: "builder,kogito,springboot"
-
-envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: JAVA_OPTIONS
-  example: "-Ddebug=true"
-  description: JVM options passed to the Java command.
-- name: MAVEN_ARGS_APPEND
-  example: "-pl mymodule -am"
-  description: Additional Maven arguments
-- name: ARTIFACT_DIR
-  example: mymodule/target
-  description:  Path to target/ where the jar files are created for multi-module builds
-
-modules:
-  install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.maven
-    version: "3.6.2"
-  - name: org.kie.kogito.openjdk
-    version: "11"
-  - name: org.kie.kogito.s2i.core
-  - name: org.kie.kogito.springboot.s2i
diff --git a/modules/kogito-builder/added/kogito-app-launch.sh b/modules/kogito-builder/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..187f985e4ab
--- /dev/null
+++ b/modules/kogito-builder/added/kogito-app-launch.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+#
+# S2I run script for the 'kogito-builder' image.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+# Image help.
+if [[ "$1" == "-h" ]]; then
+    exec /usr/local/s2i/usage
+    exit 0
+fi
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+
+)
+
+source ${S2I_MODULE_LOCATION}/s2i-core
+source "${KOGITO_HOME}"/launch/configure.sh
+
+runtime_type=$(get_runtime_type)
+
+#############################################
+
+case ${runtime_type} in 
+    "quarkus")  
+                if [ "${NATIVE^^}" == "TRUE" ]; then
+                    # shellcheck disable=SC2086
+                    exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
+                    -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
+                    -Dquarkus.http.port=8080 \
+                    -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
+                else
+        # shellcheck disable=SC2086
+                    exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar "${KOGITO_HOME}"/bin/*runner.jar
+                fi
+    ;;
+    "springboot") # shellcheck disable=SC2086
+                exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
+    ;;
+    *)
+                log_error "${runtime_type} is not supported."
+                exit 1
+esac
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/configure b/modules/kogito-builder/configure
similarity index 100%
rename from modules/kogito-quarkus-s2i/configure
rename to modules/kogito-builder/configure
diff --git a/modules/kogito-quarkus/module.yaml b/modules/kogito-builder/module.yaml
similarity index 71%
rename from modules/kogito-quarkus/module.yaml
rename to modules/kogito-builder/module.yaml
index 8744127a6b4..10f47ecc756 100644
--- a/modules/kogito-quarkus/module.yaml
+++ b/modules/kogito-builder/module.yaml
@@ -1,7 +1,6 @@
 schema_version: 1
-name: org.kie.kogito.quarkus
+name: org.kie.kogito.builder
 version: "2.0.0-snapshot"
 
 execute:
   - script: configure
-
diff --git a/modules/kogito-quarkus-s2i/s2i/bin/assemble b/modules/kogito-builder/s2i/bin/assemble
similarity index 54%
rename from modules/kogito-quarkus-s2i/s2i/bin/assemble
rename to modules/kogito-builder/s2i/bin/assemble
index dd1fc8775ca..dc683b5cc72 100644
--- a/modules/kogito-quarkus-s2i/s2i/bin/assemble
+++ b/modules/kogito-builder/s2i/bin/assemble
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# S2I assemble script for the 'kogito-quarkus-ubi8-s2i' image.
+# S2I assemble script for the 'kogito-builder' image.
 # The 'assemble' script builds your application source so that it is ready to run.
 #
 # For more information refer to the documentation:
@@ -11,15 +11,35 @@ set -e
 
 source ${S2I_MODULE_LOCATION}/s2i-core
 
+
+runtime_type=$(get_runtime_type)
+
+log_info "----> RUNTIME_TYPE has been set to $runtime_type"
+
 #############################################
 # Configure maven - for a complete list of
 # supported values, please refer the module.yaml
 # file.
 # Configure GraalVM memory limits
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/configure-maven.sh
-  "${KOGITO_HOME}"/launch/memory-limit.sh
-)
+
+case ${runtime_type} in 
+    "quarkus") 
+              CONFIGURE_SCRIPTS=(
+                "${KOGITO_HOME}"/launch/configure-maven.sh
+                "${KOGITO_HOME}"/launch/memory-limit.sh
+              )
+    ;;
+    "springboot") 
+              CONFIGURE_SCRIPTS=(
+                "${KOGITO_HOME}"/launch/configure-maven.sh
+              )
+    ;;
+    *)
+              log_error "${runtime_type} is not supported."
+              exit 1
+esac
+
+
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
@@ -28,7 +48,7 @@ source "${KOGITO_HOME}"/launch/configure.sh
 manage_incremental_build
 
 # kogito app build
-build_kogito_app $QUARKUS_RUNTIME_TYPE
+build_kogito_app "${runtime_type}"
 
 # copy kogito app to "${KOGITO_HOME}"/bin dir
 copy_kogito_app
diff --git a/modules/kogito-builder/s2i/bin/usage b/modules/kogito-builder/s2i/bin/usage
new file mode 100644
index 00000000000..ae93fdc416e
--- /dev/null
+++ b/modules/kogito-builder/s2i/bin/usage
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+cat <<EOF
+This is the quay.io/kiegroup/kogito-builder S2I image:
+
+Build native image based on project source either complete maven project or just set of business assets
+such as processes (BPMN), rules (DRL), decisions (DMN).
+
+To use it, install S2I: https://github.com/openshift/source-to-image.
+
+This image is intended only to build application binaries copied to runtime image when the build is finished.
+
+
+S2I command syntax:
+
+s2i build -c <source code path/URL> quay.io/kiegroup/kogito-builder <application image> --runtime-image <image name>
+
+
+Sample invocation:
+
+$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-builder <application image> --env RUNTIME_TYPE=quarkus --runtime-image quay.io/kiegroup/kogito-runtime-jvm
+
+By default, it generates a non-native build. Use the quay.io/kiegroup/kogito-runtime-jvm image as runtime-image,
+in that way, a *runner.jar will be produced and copied to the runtime image.
+
+Example:
+
+$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-builder <application image> --env RUNTIME_TYPE=quarkus --runtime-image quay.io/kiegroup/kogito-runtime-jvm
+
+For the native build, just set the NATIVE environment variable to "true" and use the quay.io/kiegroup/kogito-runtime-native image as runtime-image. In that way, a native build will be produced and copied to the runtime image.
+
+Example:
+
+$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-builder <application image> --env RUNTIME_TYPE=quarkus --runtime-image quay.io/kiegroup/kogito-runtime-native --env NATIVE=true
+
+You can then run the resulting image via:
+docker run <application image>
+EOF
diff --git a/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh b/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
deleted file mode 100644
index 1f9d8a7c2cd..00000000000
--- a/modules/kogito-quarkus-jvm/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-#
-# S2I run script for the 'kogito-quarkus-jvm' images.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# Image help.
-if [[ "$1" == "-h" ]]; then
-    exec /usr/local/s2i/usage
-    exit 0
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-# shellcheck disable=SC2086
-exec java ${JAVA_OPTIONS}  ${KOGITO_QUARKUS_JVM_PROPS} \
-      -Dquarkus.http.host=0.0.0.0 \
-      -Dquarkus.http.port=8080 \
-      -jar "${KOGITO_HOME}"/bin/*runner.jar
diff --git a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh b/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
deleted file mode 100644
index e63c11aa13a..00000000000
--- a/modules/kogito-quarkus-s2i/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# S2I run script for the 'kogito-quarkus-s2i' images.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# Image help.
-if [[ "$1" == "-h" ]]; then
-    exec /usr/local/s2i/usage
-    exit 0
-fi
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-if [ "${NATIVE^^}" == "TRUE" ]; then
-    # shellcheck disable=SC2086
-    exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
-         -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
-         -Dquarkus.http.port=8080 \
-         -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
-else
-    # shellcheck disable=SC2086
-    exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar "${KOGITO_HOME}"/bin/*runner.jar
-fi
\ No newline at end of file
diff --git a/modules/kogito-quarkus-s2i/module.yaml b/modules/kogito-quarkus-s2i/module.yaml
deleted file mode 100644
index dd6cb3cdf0b..00000000000
--- a/modules/kogito-quarkus-s2i/module.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.quarkus.s2i
-version: "2.0.0-snapshot"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-quarkus-s2i/s2i/bin/usage b/modules/kogito-quarkus-s2i/s2i/bin/usage
deleted file mode 100644
index 29de88f87e0..00000000000
--- a/modules/kogito-quarkus-s2i/s2i/bin/usage
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-cat <<EOF
-This is the quay.io/kiegroup/kogito-quarkus-ubi8 S2I image:
-
-Build native image based on project source either complete maven project or just set of business assets
-such as processes, rules, decisions.
-
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-This image is intended only to build application binaries that will be copied to runtime image when the build is finished.
-
-
-S2I command syntax:
-
-s2i build -c <source code path/URL> quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image <image name>
-
-
-Sample invocation:
-
-$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8
-
-
-By default it generates non native build. Use the quay.io/kiegroup/kogito-quarkus-jvm-ubi8 image as runtime-image,
-in that way a *runner.jar will be produced and copied to the runtime image.
-
-Example:
-
-$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8
-
-For native build, just set the NATIVE environment variable to true and use the quay.io/kiegroup/kogito-quarkus-ubi8 image as runtime-image,
-in that way a native build will be produced and copied to the runtime image.
-
-Example:
-
-$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-quarkus-ubi8-s2i <application image> --runtime-image quay.io/kiegroup/kogito-quarkus-ubi8 --env NATIVE=true
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..b3a7f9f2b91
--- /dev/null
+++ b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+#
+# S2I run script for the 'kogito-runtime-jvm' images.
+# The run script executes the server that runs your application.
+#
+# For more information see the documentation:
+#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
+#
+# Image help.
+if [[ "$1" == "-h" ]]; then
+    exec /usr/local/s2i/usage
+    exit 0
+fi
+set -e
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+
+)
+source ${S2I_MODULE_LOCATION}/s2i-core
+source "${KOGITO_HOME}"/launch/configure.sh
+
+runtime_type=$(get_runtime_type)
+
+#############################################
+
+# shellcheck disable=SC2086
+case ${runtime_type} in 
+    "quarkus") 
+            exec java ${JAVA_OPTIONS}  ${KOGITO_QUARKUS_JVM_PROPS} \
+                -Dquarkus.http.host=0.0.0.0 \
+                -Dquarkus.http.port=8080 \
+                -jar "${KOGITO_HOME}"/bin/*runner.jar
+    ;;
+    "springboot") 
+            exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
+    ;;
+    *)
+            log_error "${runtime_type} is not supported."
+            exit 1
+esac
\ No newline at end of file
diff --git a/modules/kogito-quarkus-jvm/configure b/modules/kogito-runtime-jvm/configure
similarity index 100%
rename from modules/kogito-quarkus-jvm/configure
rename to modules/kogito-runtime-jvm/configure
diff --git a/modules/kogito-quarkus-jvm/module.yaml b/modules/kogito-runtime-jvm/module.yaml
similarity index 70%
rename from modules/kogito-quarkus-jvm/module.yaml
rename to modules/kogito-runtime-jvm/module.yaml
index c6925d498ca..836d073c5e2 100644
--- a/modules/kogito-quarkus-jvm/module.yaml
+++ b/modules/kogito-runtime-jvm/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: org.kie.kogito.quarkus.jvm
+name: org.kie.kogito.runtime.jvm
 version: "2.0.0-snapshot"
 
 execute:
diff --git a/modules/kogito-quarkus-jvm/s2i/bin/assemble b/modules/kogito-runtime-jvm/s2i/bin/assemble
similarity index 100%
rename from modules/kogito-quarkus-jvm/s2i/bin/assemble
rename to modules/kogito-runtime-jvm/s2i/bin/assemble
diff --git a/modules/kogito-quarkus-jvm/s2i/bin/usage b/modules/kogito-runtime-jvm/s2i/bin/usage
similarity index 60%
rename from modules/kogito-quarkus-jvm/s2i/bin/usage
rename to modules/kogito-runtime-jvm/s2i/bin/usage
index 046e5139fc2..c166c57abd3 100644
--- a/modules/kogito-quarkus-jvm/s2i/bin/usage
+++ b/modules/kogito-runtime-jvm/s2i/bin/usage
@@ -1,16 +1,17 @@
 #!/bin/bash -e
 cat <<EOF
-This is the quay.io/kiegroup/kogito-quarkus-jvm-ubi8 S2I image:
+This is the quay.io/kiegroup/kogito-runtime-jvm S2I image:
 To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build <binary path/URL> quay.io/kiegroup/kogito-quarkus-jvm-ubi8 <application image>
+s2i build <binary path/URL> -e RUNTIME_TYPE=<quarkus|springboot> quay.io/kiegroup/kogito-runtime-jvm <application image>
 
 Where the binary path/URL is the built artifact that you want to copy to your image.
+RUNTIME_TYPE is the runtime your application is based on. Default value is 'quarkus'.
 Note that, for quarkus non Uberjar builds, you also must add the target/lib on the current directory
 so the s2i build can copy it into the image.
 
 You can then run the resulting image via:
 docker run <application image>
-EOF
\ No newline at end of file
+EOF
diff --git a/modules/kogito-quarkus/added/kogito-app-launch.sh b/modules/kogito-runtime-native/added/kogito-app-launch.sh
similarity index 93%
rename from modules/kogito-quarkus/added/kogito-app-launch.sh
rename to modules/kogito-runtime-native/added/kogito-app-launch.sh
index 5ed0bfe5fca..97c761449b3 100644
--- a/modules/kogito-quarkus/added/kogito-app-launch.sh
+++ b/modules/kogito-runtime-native/added/kogito-app-launch.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# S2I run script for the 'kogito-quarkus' images.
+# S2I run script for the 'kogito-runtime-native' images.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
diff --git a/modules/kogito-quarkus/configure b/modules/kogito-runtime-native/configure
similarity index 100%
rename from modules/kogito-quarkus/configure
rename to modules/kogito-runtime-native/configure
diff --git a/modules/kogito-springboot/module.yaml b/modules/kogito-runtime-native/module.yaml
similarity index 68%
rename from modules/kogito-springboot/module.yaml
rename to modules/kogito-runtime-native/module.yaml
index 00fb77759cf..6e26ba2bc4f 100644
--- a/modules/kogito-springboot/module.yaml
+++ b/modules/kogito-runtime-native/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: org.kie.kogito.springboot
+name: org.kie.kogito.runtime.native
 version: "2.0.0-snapshot"
 
 execute:
diff --git a/modules/kogito-quarkus/s2i/bin/assemble b/modules/kogito-runtime-native/s2i/bin/assemble
similarity index 100%
rename from modules/kogito-quarkus/s2i/bin/assemble
rename to modules/kogito-runtime-native/s2i/bin/assemble
diff --git a/modules/kogito-quarkus/s2i/bin/usage b/modules/kogito-runtime-native/s2i/bin/usage
similarity index 59%
rename from modules/kogito-quarkus/s2i/bin/usage
rename to modules/kogito-runtime-native/s2i/bin/usage
index a13844bacb7..f4152e57e77 100644
--- a/modules/kogito-quarkus/s2i/bin/usage
+++ b/modules/kogito-runtime-native/s2i/bin/usage
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 cat <<EOF
-This is the quay.io/kiegroup/kogito-quarkus-ubi8 S2I image:
+This is the quay.io/kiegroup/kogito-runtime-native S2I image:
 To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build <binary path/URL> quay.io/kiegroup/kogito-quarkus-ubi8 <application image>
+s2i build <binary path/URL> -e RUNTIME_TYPE=<quarkus|springboot> quay.io/kiegroup/kogito-runtime-native <application image>
 
 Where the binary path/URL is the built artifact that you want to copy to your image.
 
 You can then run the resulting image via:
 docker run <application image>
-EOF
\ No newline at end of file
+EOF
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 0cc44e3f39b..2f2c46ae48a 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -161,4 +161,15 @@ function copy_kogito_app() {
         log_info "---> Installing application binaries"
         cp -v $artifactDir/*.jar "${KOGITO_HOME}"/bin
     fi
-}
\ No newline at end of file
+}
+
+function get_runtime_type() {
+    allowed_runtime_values=("$QUARKUS_RUNTIME_TYPE" "$SPRINGBOOT_RUNTIME_TYPE")
+    local runtime_type="${RUNTIME_TYPE:-$QUARKUS_RUNTIME_TYPE}"
+
+    if [[ ! "${allowed_runtime_values[*]}" =~ ${RUNTIME_TYPE} ]]; then
+        log_warning "RUNTIME_TYPE ${RUNTIME_TYPE} is not allowed, the allowed types are [${allowed_runtime_values[*]}]. Application might fail"
+    fi
+    log_info "---> Setting RUNTIME_TYPE to ${runtime_type}"
+    echo "${runtime_type}"
+}
diff --git a/modules/kogito-s2i-core/s2i/bin/assemble-runtime b/modules/kogito-s2i-core/s2i/bin/assemble-runtime
index a980be8d43f..8beb2d20a5f 100644
--- a/modules/kogito-s2i-core/s2i/bin/assemble-runtime
+++ b/modules/kogito-s2i-core/s2i/bin/assemble-runtime
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# S2I assemble-runtime script for the 'kogito-quarkus-ubi8' image.
+# S2I assemble-runtime script for the 'kogito-runtime-native' image.
 # The assemble-runtime script executes preparation for running the container on runtime image.
 #
 # For more information see the documentation:
diff --git a/modules/kogito-springboot-s2i/added/kogito-app-launch.sh b/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
deleted file mode 100644
index 6528257da23..00000000000
--- a/modules/kogito-springboot-s2i/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-#
-# S2I run script for the 'kogito-springboot-ubi8-s2i' image.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# Image help.
-if [[ "$1" == "-h" ]]; then
-    exec /usr/local/s2i/usage
-    exit 0
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-# shellcheck disable=SC2086
-exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
-
diff --git a/modules/kogito-springboot-s2i/configure b/modules/kogito-springboot-s2i/configure
deleted file mode 100644
index 359001e4bc9..00000000000
--- a/modules/kogito-springboot-s2i/configure
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -e
-
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-# kogito-launch
-cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
-chmod +x "${KOGITO_HOME}"/kogito-app-launch.sh
-
-cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
-
-chmod 755 /usr/local/s2i/*
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-springboot-s2i/module.yaml b/modules/kogito-springboot-s2i/module.yaml
deleted file mode 100644
index 7a7dcefd635..00000000000
--- a/modules/kogito-springboot-s2i/module.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.springboot.s2i
-version: "2.0.0-snapshot"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-springboot-s2i/s2i/bin/assemble b/modules/kogito-springboot-s2i/s2i/bin/assemble
deleted file mode 100755
index 5287bd1e007..00000000000
--- a/modules/kogito-springboot-s2i/s2i/bin/assemble
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-#
-# S2I assemble script for the '/kogito-springboot-ubi8-s2i' image.
-# The 'assemble' script builds your application source so that it is ready to run.
-#
-# For more information refer to the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-
-source ${S2I_MODULE_LOCATION}/s2i-core
-
-#############################################
-# Configure maven - for a complete list of
-# supported values, please refer the module.yaml
-# file.
-CONFIGURE_SCRIPTS=(
-    "${KOGITO_HOME}"/launch/configure-maven.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-
-# incremental builds
-manage_incremental_build
-
-# kogito app build
-build_kogito_app $SPRINGBOOT_RUNTIME_TYPE
-
-# copy kogito app to "${KOGITO_HOME}"/bin dir
-copy_kogito_app
-
-# handle persistence files
-copy_persistence_files
\ No newline at end of file
diff --git a/modules/kogito-springboot-s2i/s2i/bin/usage b/modules/kogito-springboot-s2i/s2i/bin/usage
deleted file mode 100755
index 42088233655..00000000000
--- a/modules/kogito-springboot-s2i/s2i/bin/usage
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -e
-cat <<EOF
-This is the quay.io/kiegroup/kogito-springboot-ubi8 S2I image:
-
-Build executable jar based on project source either complete maven project or just set of business assets 
-such as processes, rules, decisions.
-
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-This image is intended to build application binaries only that are later on transferred to runtime image.
-
-s2i build -c <source code path/URL> quay.io/kiegroup/kogito-springboot-ubi8-s2i <application image name> --runtime-image <image name>
-
-Sample invocation:
-
-s2i build -c /Development/project/ quay.io/kiegroup/kogito-springboot-ubi8-s2i application --runtime-image kogito-springboot-ubi8
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/modules/kogito-springboot/added/kogito-app-launch.sh b/modules/kogito-springboot/added/kogito-app-launch.sh
deleted file mode 100644
index dd41b723ec2..00000000000
--- a/modules/kogito-springboot/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-#
-# S2I run script for the 'kogito-springboot' images.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# Image help.
-if [[ "$1" == "-h" ]]; then
-    exec /usr/local/s2i/usage
-    exit 0
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-# shellcheck disable=SC2086
-exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
diff --git a/modules/kogito-springboot/configure b/modules/kogito-springboot/configure
deleted file mode 100644
index 1c3bdf62ce2..00000000000
--- a/modules/kogito-springboot/configure
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-# kogito-launch
-cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
-cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
-
-chmod 755 /usr/local/s2i/*
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
diff --git a/modules/kogito-springboot/s2i/bin/assemble b/modules/kogito-springboot/s2i/bin/assemble
deleted file mode 100755
index 1a2513dea5c..00000000000
--- a/modules/kogito-springboot/s2i/bin/assemble
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-# this script is used by OpenShift with chained builds
-# to transfer data from builder image into the runtime image
-
-source ${S2I_MODULE_LOCATION}/s2i-core
-runtime_assemble
-
diff --git a/modules/kogito-springboot/s2i/bin/usage b/modules/kogito-springboot/s2i/bin/usage
deleted file mode 100755
index e6d6ff8e0e8..00000000000
--- a/modules/kogito-springboot/s2i/bin/usage
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-cat <<EOF
-This is the quay.io/kiegroup/kogito-springboot-ubi8 Runtime image:
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-Sample invocation:
-
-s2i build <source code path/URL> quay.io/kiegroup/kogito-springboot-ubi8 <application image>
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/scripts/common.py b/scripts/common.py
index de5e4c61c28..e68c93bc9b2 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -15,10 +15,9 @@
            "kogito-jq", "kogito-kubernetes-client",
            "kogito-launch-scripts", "kogito-logging",
            "kogito-management-console", "kogito-task-console",
-           "kogito-persistence", "kogito-quarkus",
-           "kogito-quarkus-jvm", "kogito-quarkus-s2i",
-           "kogito-s2i-core", "kogito-springboot",
-           "kogito-springboot-s2i", "kogito-system-user",
+           "kogito-persistence", "kogito-runtime-native",
+           "kogito-runtime-jvm", "kogito-builder",
+           "kogito-s2i-core", "kogito-system-user",
            "kogito-jit-runner"}
 MODULE_FILENAME = "module.yaml"
 MODULES_DIR = "modules"
@@ -31,8 +30,7 @@
 
 # behave tests that needs to be update
 BEHAVE_BASE_DIR = 'tests/features'
-BEHAVE_TESTS = {"kogito-quarkus-ubi8-s2i.feature", "kogito-springboot-ubi8-s2i.feature",
-                "kogito-quarkus-jvm-ubi8.feature", "kogito-springboot-ubi8.feature"}
+BEHAVE_TESTS = {"kogito-builder.feature", "kogito-runtime-jvm.feature", "kogito-runtime-native.feature"}
 
 CLONE_REPO_SCRIPT='tests/test-apps/clone-repo.sh'
 
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
index d9948f944ca..004b680cb88 100644
--- a/tests/features/common-build-runtime.feature
+++ b/tests/features/common-build-runtime.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8
+@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-runtime-jvm
 Feature: Common tests for Kogito builder and runtime images
 
   Scenario: Verify if usage help is correctly called
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 561ac3a0296..0ef97ebc409 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-springboot-ubi8-s2i @quay.io/kiegroup/kogito-springboot-ubi8 @quay.io/kiegroup/kogito-quarkus-ubi8-s2i @quay.io/kiegroup/kogito-quarkus-ubi8 @quay.io/kiegroup/kogito-quarkus-jvm-ubi8 @quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-trusty
+@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-jvm @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-trusty
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/kogito-quarkus-ubi8-s2i.feature b/tests/features/kogito-builder.feature
similarity index 57%
rename from tests/features/kogito-quarkus-ubi8-s2i.feature
rename to tests/features/kogito-builder.feature
index bec0a576267..287f0a88986 100644
--- a/tests/features/kogito-quarkus-ubi8-s2i.feature
+++ b/tests/features/kogito-builder.feature
@@ -1,10 +1,11 @@
-@quay.io/kiegroup/kogito-quarkus-ubi8-s2i
-Feature: kogito-quarkus-ubi8-s2i image tests
+@quay.io/kiegroup/kogito-builder
+Feature: kogito-builder image tests
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable | value |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+      | variable     | value      |
       | NATIVE       | true       |
+      | RUNTIME_TYPE | quarkus    |
       | LIMIT_MEMORY | 3221225472 |
     Then check that page is served
       | property        | value                 |
@@ -22,8 +23,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
-      | variable | value |
+      | variable | value          |
       | NATIVE       | true       |
+      | RUNTIME_TYPE | quarkus    |
       | LIMIT_MEMORY | 3221225472 |
     Then check that page is served
       | property        | value                 |
@@ -41,8 +43,26 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
-      | variable | value |
-      | NATIVE   | false |
+      | variable     | value   |
+      | NATIVE       | false   |
+      | RUNTIME_TYPE | quarkus |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+
+  Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+      | variable     | value   |
+      | NATIVE       | false   |
     Then check that page is served
       | property        | value                 |
       | port            | 8080                  |
@@ -57,9 +77,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable | value |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable     | value                     |
       | NATIVE       | false                     |
+      | RUNTIME_TYPE | quarkus                   |
       | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG |
     Then check that page is served
       | property        | value                 |
@@ -75,9 +96,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable | value |
-      | NATIVE   | false |
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable     | value   |
+      | RUNTIME_TYPE | quarkus |
+      | NATIVE       | false   |
     Then check that page is served
       | property        | value                 |
       | port            | 8080                  |
@@ -90,9 +112,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable | value |
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+      | variable     | value      |
       | NATIVE       | true       |
+      | RUNTIME_TYPE | quarkus    |
       | LIMIT_MEMORY | 6442450944 |
     Then check that page is served
       | property        | value                 |
@@ -106,9 +129,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable | value |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value         |
       | NATIVE            | false         |
+      | RUNTIME_TYPE      | quarkus       |
       | MAVEN_ARGS_APPEND | -Ppersistence |
     Then file /home/kogito/bin/process-quarkus-example-runner.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
@@ -117,8 +141,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
   #ignore until https://issues.redhat.com/browse/KOGITO-3638 is resolved
   @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable | value |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+      | variable          | value         |
+      | RUNTIME_TYPE      | quarkus       |
       | NATIVE            | true          |
       | LIMIT_MEMORY      | 6442450944    |
       | MAVEN_ARGS_APPEND | -Ppersistence |
@@ -127,8 +152,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable | value |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value                            |
+      | RUNTIME_TYPE      | quarkus                          |
       | NATIVE            | false                            |
       | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
       | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am |
@@ -144,8 +170,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable | value |
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+      | variable          | value                            |
+      | RUNTIME_TYPE      | quarkus                          |
       | NATIVE            | true                             |
       | LIMIT_MEMORY      | 6442450944                       |
       | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
@@ -163,8 +190,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Perform a incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
-      | variable | value |
-      | NATIVE   | false |
+      | variable     | value   |
+      | RUNTIME_TYPE | quarkus |
+      | NATIVE       | false   |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
     And check that page is served
@@ -180,8 +208,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
-      | variable | value |
-      | NATIVE   | false |
+      | variable     | value   |
+      | RUNTIME_TYPE | quarkus |
+      | NATIVE       | false   |
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
     And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
@@ -197,7 +226,8 @@ Feature: kogito-quarkus-ubi8-s2i image tests
 
   Scenario: Perform a third incremental s2i build, this time, with native enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
-      | variable | value |
+      | variable     | value      |
+      | RUNTIME_TYPE | quarkus    |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
     Then s2i build log should contain Expanding artifacts from incremental build...
@@ -219,9 +249,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Platform for building Kogito based on Quarkus
-    And the image should contain label io.k8s.display-name with value Kogito based on Quarkus
-    And the image should contain label io.openshift.tags with value builder,kogito,quarkus
+    And the image should contain label io.k8s.description with value Platform for building Kogito based on Quarkus or Spring Boot
+    And the image should contain label io.k8s.display-name with value Kogito based on Quarkus or Spring Boot
+    And the image should contain label io.openshift.tags with value builder,kogito,quarkus,springboot
 
   Scenario: verify java cacerts and libsunec are available in the given container.
     When container is started with command bash
@@ -237,8 +267,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 20.2.0
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable | value |
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable       | value          |
+      | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
@@ -253,8 +284,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest
-      | variable | value |
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+      | variable       | value          |
+      | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
@@ -270,8 +302,9 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest
-      | variable | value |
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable            | value          |
+      | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
       | KOGITO_VERSION      | 2.0.0-SNAPSHOT |  
       | PROJECT_GROUP_ID    | com.mycompany  |
@@ -287,3 +320,121 @@ Feature: kogito-quarkus-ubi8-s2i image tests
       | request_method  | POST                                                                                             |
       | content_type    | application/json                                                                                 |
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+
+#### SpringBoot Scenarios
+
+  Scenario: Verify if the s2i build is finished as expected with debug enabled
+      Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+        | variable     | value        |
+        | RUNTIME_TYPE | springboot   |
+        | JAVA_OPTIONS | -Ddebug=true |
+      Then check that page is served
+        | property             | value                                                                         |
+        | port                 | 8080                                                                          |
+        | path                 | /orders                                                                       |
+        | wait                 | 80                                                                            |
+        | request_method       | POST                                                                          |
+        | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+        | content_type         | application/json                                                              |
+        | expected_status_code | 201                                                                           |
+      And file /home/kogito/bin/process-springboot-example.jar should exist
+      And container log should contain main] .c.l.ClasspathLoggingApplicationListener
+      And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+  
+  Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
+      | variable            | value        |
+      | JAVA_OPTIONS        | -Ddebug=true |
+      | RUNTIME_TYPE        | springboot   |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+  
+  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
+    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable     | value      |
+      | RUNTIME_TYPE | springboot |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain Tomcat initialized with port(s): 8080 (http)
+
+  Scenario: Verify if the s2i build is finished as expected with persistence enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value         |
+      | MAVEN_ARGS_APPEND | -Ppersistence |
+      | RUNTIME_TYPE      | springboot    |
+    Then file /home/kogito/bin/process-springboot-example.jar should exist
+    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+  
+  Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value |
+      | JAVA_OPTIONS      | -Ddebug=true                       |
+      | RUNTIME_TYPE      | springboot                         |
+      | ARTIFACT_DIR      | process-springboot-example/target  |
+      | MAVEN_ARGS_APPEND | -pl process-springboot-example -am |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+
+  Scenario: Perform a incremental s2i build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable     | value      |
+      | RUNTIME_TYPE | springboot |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+
+  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
+  Scenario: Perform a second incremental s2i build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable     | value      |
+      | RUNTIME_TYPE | springboot |
+    Then s2i build log should contain Expanding artifacts from incremental build...
+    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable       | value          |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | RUNTIME_TYPE   | springboot     |  
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
+
+
diff --git a/tests/features/kogito-quarkus-jvm-ubi8.feature b/tests/features/kogito-quarkus-jvm-ubi8.feature
deleted file mode 100644
index 0760ed483fb..00000000000
--- a/tests/features/kogito-quarkus-jvm-ubi8.feature
+++ /dev/null
@@ -1,52 +0,0 @@
-@quay.io/kiegroup/kogito-quarkus-jvm-ubi8
-Feature: Kogito-quarkus-ubi8 feature.
-
-  Scenario: verify if all labels are correctly set.
-    Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
-     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-     And the image should contain label io.openshift.s2i.destination with value /tmp
-     And the image should contain label io.openshift.expose-services with value 8080:http
-     And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus JVM image
-     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus JVM image
-     And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,jvm
-     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
-
-  Scenario: verify if the java installation is correct
-    When container is started with command bash
-    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
-    And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
-    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
-
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
-      | variable            | value                     |
-      | NATIVE              | false                     |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
-
-  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
-      | variable            | value                     |
-      | NATIVE              | false                     |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-      | BINARY_BUILD        | true                      |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
diff --git a/tests/features/kogito-springboot-ubi8.feature b/tests/features/kogito-runtime-jvm.feature
similarity index 64%
rename from tests/features/kogito-springboot-ubi8.feature
rename to tests/features/kogito-runtime-jvm.feature
index ca0b3250dfe..85c7b0cd4bc 100644
--- a/tests/features/kogito-springboot-ubi8.feature
+++ b/tests/features/kogito-runtime-jvm.feature
@@ -1,5 +1,5 @@
-@quay.io/kiegroup/kogito-springboot-ubi8
-Feature: springboot-quarkus-ubi8 feature.
+@quay.io/kiegroup/kogito-runtime-jvm
+Feature: kogito-runtime-jvm feature.
 
   Scenario: verify if all labels are correctly set.
     Given image is built
@@ -7,9 +7,9 @@ Feature: springboot-quarkus-ubi8 feature.
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito based on SpringBoot native image
-    And the image should contain label io.k8s.display-name with value Kogito based on SpringBoot native image
-    And the image should contain label io.openshift.tags with value builder,runtime,kogito,springboot
+    And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus or Spring Boot JVM image
+    And the image should contain label io.k8s.display-name with value Kogito based on Quarkus or Spring Boot JVM image
+    And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,springboot,jvm
     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
 
   Scenario: verify if the java installation is correct
@@ -18,10 +18,46 @@ Feature: springboot-quarkus-ubi8 feature.
     And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
     And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
 
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
+      | variable            | value                     |
+      | RUNTIME_TYPE        | quarkus                   |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
+      | wait            | 80                       |
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+
+  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
+      | variable            | value                     |
+      | RUNTIME_TYPE        | quarkus                   |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+      | BINARY_BUILD        | true                      |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
+      | wait            | 80                       |
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples/process-springboot-example from target
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
+      | RUNTIME_TYPE        | springboot   |
     Then check that page is served
       | property             | value                                                                         |
       | port                 | 8080                                                                          |
@@ -40,6 +76,7 @@ Feature: springboot-quarkus-ubi8 feature.
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | BINARY_BUILD        | true         |
+      | RUNTIME_TYPE        | springboot   |
     Then check that page is served
       | property             | value                                                                         |
       | port                 | 8080                                                                          |
diff --git a/tests/features/kogito-quarkus-ubi8.feature b/tests/features/kogito-runtime-native.feature
similarity index 93%
rename from tests/features/kogito-quarkus-ubi8.feature
rename to tests/features/kogito-runtime-native.feature
index 4131b7a1612..fe7419f388d 100644
--- a/tests/features/kogito-quarkus-ubi8.feature
+++ b/tests/features/kogito-runtime-native.feature
@@ -1,5 +1,5 @@
-@quay.io/kiegroup/kogito-quarkus-ubi8
-Feature: Kogito-quarkus-ubi8 feature.
+@quay.io/kiegroup/kogito-runtime-native
+Feature: Kogito-runtime-native feature.
 
   Scenario: verify if all labels are correctly set.
     Given image is built
@@ -21,6 +21,7 @@ Feature: Kogito-quarkus-ubi8 feature.
     Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld-native/ from target
       | variable            | value                     |
       | NATIVE              | false                     |
+      | RUNTIME_TYPE        | quarkus                   |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
     Then check that page is served
       | property        | value                    |
diff --git a/tests/features/kogito-springboot-ubi8-s2i.feature b/tests/features/kogito-springboot-ubi8-s2i.feature
deleted file mode 100644
index 5149d80407e..00000000000
--- a/tests/features/kogito-springboot-ubi8-s2i.feature
+++ /dev/null
@@ -1,126 +0,0 @@
-@quay.io/kiegroup/kogito-springboot-ubi8-s2i
-Feature: kogito-springboot-ubi8-s2i image tests
-
-  Scenario: Verify if the s2i build is finished as expected with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable | value |
-      | JAVA_OPTIONS | -Ddebug=true |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
-  Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
-      | variable | value |
-      | JAVA_OPTIONS        | -Ddebug=true |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
-  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable | value |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain Tomcat initialized with port(s): 8080 (http)
-
-  Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable | value |
-      | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/process-springboot-example.jar should exist
-    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-
-  Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable | value |
-      | JAVA_OPTIONS      | -Ddebug=true                       |
-      | ARTIFACT_DIR      | process-springboot-example/target  |
-      | MAVEN_ARGS_APPEND | -pl process-springboot-example -am |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
-  Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable | value |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-
-  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
-  Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable | value |
-    Then s2i build log should contain Expanding artifacts from incremental build...
-    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-
-  Scenario: verify if all labels are correctly set.
-    Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Platform for building Kogito based on SpringBoot
-    And the image should contain label io.k8s.display-name with value Kogito based on SpringBoot
-    And the image should contain label io.openshift.tags with value builder,kogito,springboot
-
-  Scenario: verify if the maven and java installation is correct
-    When container is started with command bash
-    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
-    And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
-    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
-    And run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
-
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest
-      | variable | value |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist

From e48ad521a2378dcdcf4b86142b70cbc76a510f3b Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 4 Feb 2021 19:36:03 +0100
Subject: [PATCH 242/709] KOGITO-4222 Set images public on quay after push
 (#327)

---
 Jenkinsfile.deploy  | 41 ++++++++++++++++++++++++++++++++++-------
 Jenkinsfile.promote | 45 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 9f6f23e536e..0d094bcd738 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -34,6 +34,7 @@ pipeline {
 
         // Deploy information
         booleanParam(name: 'IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
+        string(name: 'QUAY_TOKEN_CREDENTIALS', defaultValue: '', description: 'quay.io access token credentials to use to push/pull images and set images\' visibility. Will be ignored if IMAGE_REGISTRY is different from quay.io. Else IMAGE_REGISTRY_CREDENTIALS is ignored if that one is set.')
         string(name: 'IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
         string(name: 'IMAGE_REGISTRY', defaultValue: '', description: 'Image registry to use to deploy images')
         string(name: 'IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Image namespace to use to deploy images')
@@ -263,10 +264,14 @@ pipeline {
                 script {
                     if (isDeployImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
-                    } else if (getDeployImageRegistryCredentials() != '') {
+                    } else if (getDeployImageRegistryCredentials()) {
                         loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials())
                     }
                     pushImages()
+
+                    if (isQuayRegistry() && getDeployQuayTokenCredentials()) {
+                        makeQuayImagesPublic()
+                    }
                 }
             }
             post {
@@ -390,12 +395,26 @@ void pushImages() {
     }
 }
 
-String buildImageName(String imageName) {
-    String finalImageName = imageName
-    if (getDeployImageNameSuffix() != '') {
-        finalImageName += '-' + getDeployImageNameSuffix()
+// Set images public on quay. Useful when new images are introduced.
+void makeQuayImagesPublic() {
+    String namespace = getDeployImageNamespace()
+    for (String imageName : getImages()) {
+        String repository = getFinalImageName(imageName)
+        echo "Check and set public if needed Quay repository ${namespace}/${repository}"
+        try {
+            cloud.makeQuayImagePublic(namespace, repository, getDeployQuayTokenCredentials())
+        } catch (err) {
+            echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
+        }
     }
-    return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${finalImageName}:${getDeployImageTag()}"
+}
+
+String buildImageName(String imageName) {
+    return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName(imageName)}:${getDeployImageTag()}"
+}
+
+String getFinalImageName(String imageName) {
+    return getDeployImageNameSuffix() ? "${imageName}-${getDeployImageNameSuffix()}" : imageName
 }
 
 void loginOpenshift() {
@@ -430,8 +449,12 @@ boolean isDeployImageInOpenshiftRegistry() {
     return params.IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
+String getDeployQuayTokenCredentials() {
+    return params.QUAY_TOKEN_CREDENTIALS
+}
+
 String getDeployImageRegistryCredentials() {
-    return isDeployImageInOpenshiftRegistry() ? '' : params.IMAGE_REGISTRY_CREDENTIALS
+    return params.IMAGE_REGISTRY_CREDENTIALS
 }
 
 String getDeployImageRegistry() {
@@ -454,6 +477,10 @@ String getDeployImageTag() {
     }
 }
 
+boolean isQuayRegistry() {
+    return getDeployImageRegistry() == 'quay.io'
+}
+
 ////////////////////////////////////////////////////////////////////////
 // Workspaces
 ////////////////////////////////////////////////////////////////////////
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index f1bff1e0c0d..0ee32907d97 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -33,6 +33,7 @@ pipeline {
 
         // Promote images information
         booleanParam(name: 'PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
+        string(name: 'PROMOTE_QUAY_TOKEN_CREDENTIALS', defaultValue: '', description: 'quay.io access token credentials to use to set images\' visibility. Will be ignored if PROMOTE_IMAGE_REGISTRY is different from quay.io.')
         string(name: 'PROMOTE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
         string(name: 'PROMOTE_IMAGE_REGISTRY', defaultValue: '', description: 'Promote image registry')
         string(name: 'PROMOTE_IMAGE_NAMESPACE', defaultValue: '', description: 'Promote image namespace')
@@ -164,7 +165,7 @@ pipeline {
                 }
             }
         }
-        stage('Pushing') {
+        stage('Pushing "new" images') {
             steps {
                 script {
                     if (isNewImageInOpenshiftRegistry()) {
@@ -174,6 +175,10 @@ pipeline {
                     }
                     dir('kogito-images') {
                         pushImages()
+
+                        if (isQuayRegistry(getNewImageRegistry()) && getNewImageQuayTokenCredentials()) {
+                            makeQuayNewImagesPublic()
+                        }
                     }
                 }
             }
@@ -304,20 +309,30 @@ void pushImages() {
     }
 }
 
+// Set images public on quay. Useful when new images are introduced.
+void makeQuayNewImagesPublic() {
+    String namespace = getNewImageNamespace()
+    for (String imageName : getImages()) {
+        String repository = getFinalImageName(imageName, getNewImageNameSuffix())
+        echo "Check and set public if needed Quay repository ${namespace}/${repository}"
+        try {
+            cloud.makeQuayImagePublic(namespace, repository, getNewImageQuayTokenCredentials())
+        } catch (err) {
+            echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
+        }
+    }
+}
+
 String getOldImageFullTag(String imageName) {
-    return "${getOldImageRegistry()}/${getOldImageNamespace()}/${buildImageNameWithSuffix(imageName, getOldImageNameSuffix())}:${getOldImageTag()}"
+    return "${getOldImageRegistry()}/${getOldImageNamespace()}/${getFinalImageName(imageName, getOldImageNameSuffix())}:${getOldImageTag()}"
 }
 
 String getNewImageFullTag(String imageName, String tag) {
-    return "${getNewImageRegistry()}/${getNewImageNamespace()}/${buildImageNameWithSuffix(imageName, getNewImageNameSuffix())}:${tag}"
+    return "${getNewImageRegistry()}/${getNewImageNamespace()}/${getFinalImageName(imageName, getNewImageNameSuffix())}:${tag}"
 }
 
-String buildImageNameWithSuffix(String imageName, String suffix) {
-    String finalImageName = imageName
-    if (suffix != null && suffix != '') {
-        finalImageName += '-' + suffix
-    }
-    return finalImageName
+String getFinalImageName(String imageName, String suffix) {
+    return suffix ? "${imageName}-${suffix}" : imageName
 }
 
 boolean isDeployLatestTag() {
@@ -437,6 +452,10 @@ String getSnapshotBranch() {
     return "${getNextVersion()}-${env.BOT_BRANCH_HASH}"
 }
 
+boolean isQuayRegistry(String registry) {
+    return registry == 'quay.io'
+}
+
 ////////////////////////////////////////////////////////////////////////
 // Old image information
 ////////////////////////////////////////////////////////////////////////
@@ -450,7 +469,7 @@ boolean isOldImageInOpenshiftRegistry() {
 }
 
 String getOldImageRegistryCredentials() {
-    return isOldImageInOpenshiftRegistry() ? '' : params.BASE_IMAGE_REGISTRY_CREDENTIALS
+    return params.BASE_IMAGE_REGISTRY_CREDENTIALS
 }
 
 String getOldImageRegistry() {
@@ -477,8 +496,12 @@ boolean isNewImageInOpenshiftRegistry() {
     return params.PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
+String getNewImageQuayTokenCredentials() {
+    return params.PROMOTE_QUAY_TOKEN_CREDENTIALS
+}
+
 String getNewImageRegistryCredentials() {
-    return isNewImageInOpenshiftRegistry() ? '' : params.PROMOTE_IMAGE_REGISTRY_CREDENTIALS
+    return params.PROMOTE_IMAGE_REGISTRY_CREDENTIALS
 }
 
 String getNewImageRegistry() {

From cd3f73a17dd2295f20d5c7fd601d8d02d9c5a883 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 5 Feb 2021 12:22:11 -0300
Subject: [PATCH 243/709] Updated Maven artifacts (#356)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 1773696d66a..67e357d4666 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210203.034522-72-runner.jar
-    md5: 6d6e5922828df21f342f3b167772f846
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210204.031049-73-runner.jar
+    md5: bcb1a1aadd3be3834599db5a43d645ae
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index be46d2e0670..5ef9729db07 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210203.034613-72-runner.jar
-    md5: d523b7f0115b428a3010efead35239c7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210204.031130-73-runner.jar
+    md5: f12e42114ce402bfdaa1abf83ed87e22
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 21cc253d132..ec645507559 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210203.035607-72-runner.jar
-    md5: c5b4ff14f15da3054f635210bfe558d6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210204.031714-73-runner.jar
+    md5: 4124ca7881460a25d6c8545f0c57839e
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210203.035534-69-runner.jar
-    md5: c5f3ecf46fa389974057bbd1a36e0e7f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210204.031649-70-runner.jar
+    md5: b735121c0db259592da64de639761017
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index b28a3959541..798ac47076f 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210203.035817-14-runner.jar
-    md5: 4cce138e5e3c1f32f0d68f689a286e31
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210204.031856-15-runner.jar
+    md5: 554901611b41db61320f313276151a50
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 0ef36fb618a..e8920f85ccd 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210203.034402-70-runner.jar
-    md5: 7c910a543524e11d0ed2b3835b96ce85
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210204.030946-71-runner.jar
+    md5: bc26c1c280b2ea64cce18e3730f8a1fd
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 41caae25c65..537fc850122 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210203.035305-72-runner.jar
-    md5: e45d7279300ef8de34b37cf57bf92712
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210204.031451-73-runner.jar
+    md5: fb0093718a5c556184a46ad234e5086c
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 9f5a5b40e22..c0186706914 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210203.035405-72-runner.jar
-    md5: 4611e71fce0fd3352653853bcb220b34
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210204.031538-73-runner.jar
+    md5: c4ec1df3817db6bed4a92514f153aeea
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index a6f50c7eefa..e6280c6fe27 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210203.035335-72-runner.jar
-    md5: 5309ac6fd68560420664605bf23cee89
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210204.031515-73-runner.jar
+    md5: b20ee1c668859b8725154dcad9023158
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index ce623ff9646..d1ededf47ca 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210203.035723-69-runner.jar
-    md5: b7398ea6fac14a74f6f8fba59d9d577c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210204.031811-70-runner.jar
+    md5: 116e0eaf9764e23eb7ca1c4c7e8206ea
 
 execute:
   - script: configure

From c9691154305232fd05975442d571b7f467f56ca4 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 8 Feb 2021 12:26:41 -0300
Subject: [PATCH 244/709] Updated Maven artifacts (#360)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 67e357d4666..5502d922522 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210204.031049-73-runner.jar
-    md5: bcb1a1aadd3be3834599db5a43d645ae
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210208.032403-77-runner.jar
+    md5: d32f77d25104aa93a0382febf4237119
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 5ef9729db07..0cb569eb1a9 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210204.031130-73-runner.jar
-    md5: f12e42114ce402bfdaa1abf83ed87e22
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210208.032454-77-runner.jar
+    md5: f29cb0c51d64a2db28152f00b5e038f0
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index ec645507559..60c8fcdc23f 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210204.031714-73-runner.jar
-    md5: 4124ca7881460a25d6c8545f0c57839e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210208.033508-77-runner.jar
+    md5: 1392e85a85b3372658dce8d2c8a5f2fd
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210204.031649-70-runner.jar
-    md5: b735121c0db259592da64de639761017
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210208.033432-74-runner.jar
+    md5: 443447b65d7a78e769b372af36a8c633
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 798ac47076f..f43c1514d72 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210204.031856-15-runner.jar
-    md5: 554901611b41db61320f313276151a50
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210208.033734-19-runner.jar
+    md5: fffe48d0faaa900c8b125b054f2f3c9f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index e8920f85ccd..466b8dbea25 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210204.030946-71-runner.jar
-    md5: bc26c1c280b2ea64cce18e3730f8a1fd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210208.032244-75-runner.jar
+    md5: 23602dc8904653c1af9a0a46d7086e3e
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 537fc850122..7d2378f0163 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210204.031451-73-runner.jar
-    md5: fb0093718a5c556184a46ad234e5086c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210208.033145-77-runner.jar
+    md5: 9597d1208d2a9dc92b0b937748a23333
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index c0186706914..74cfb1407b9 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210204.031538-73-runner.jar
-    md5: c4ec1df3817db6bed4a92514f153aeea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210208.033250-77-runner.jar
+    md5: ffe063d0d93a1d6b8b0754b4721be884
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index e6280c6fe27..931db9d23b7 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210204.031515-73-runner.jar
-    md5: b20ee1c668859b8725154dcad9023158
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210208.033218-77-runner.jar
+    md5: 7d65328c83976dfaa14201656fec33d1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index d1ededf47ca..126aae0a9fb 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210204.031811-70-runner.jar
-    md5: 116e0eaf9764e23eb7ca1c4c7e8206ea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210208.033635-74-runner.jar
+    md5: bb3fd60e3d0a164def07d891e05fea54
 
 execute:
   - script: configure

From c13a4f4332bf0205630bdb779f55f0977e4e3f10 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 9 Feb 2021 10:16:15 -0300
Subject: [PATCH 245/709] Updated Maven artifacts (#364)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 5502d922522..fee7abfd3fc 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210208.032403-77-runner.jar
-    md5: d32f77d25104aa93a0382febf4237119
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210209.032006-78-runner.jar
+    md5: 5dd7c564206487fcb35ecba11ac4a741
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 0cb569eb1a9..568f8347b2b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210208.032454-77-runner.jar
-    md5: f29cb0c51d64a2db28152f00b5e038f0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210209.032053-78-runner.jar
+    md5: 9e014c82b1b57fdc70995669c83a7476
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 60c8fcdc23f..25214878d20 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210208.033508-77-runner.jar
-    md5: 1392e85a85b3372658dce8d2c8a5f2fd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210209.032637-78-runner.jar
+    md5: c268253b09cd3122e618be2495c693c0
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210208.033432-74-runner.jar
-    md5: 443447b65d7a78e769b372af36a8c633
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210209.032611-75-runner.jar
+    md5: 0e66a2493a82ca3efe309a4cefe0b2db
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index f43c1514d72..cef45a0341a 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210208.033734-19-runner.jar
-    md5: fffe48d0faaa900c8b125b054f2f3c9f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210209.032819-20-runner.jar
+    md5: 626e9573ddfa584e1f41a3637fe83303
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 466b8dbea25..2c4c2bdb626 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210208.032244-75-runner.jar
-    md5: 23602dc8904653c1af9a0a46d7086e3e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210209.031853-76-runner.jar
+    md5: 1eb6885d41da5135c96d81524654dc1a
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 7d2378f0163..f97974b66df 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210208.033145-77-runner.jar
-    md5: 9597d1208d2a9dc92b0b937748a23333
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210209.032411-78-runner.jar
+    md5: c79fd12adbc1c7fcbd1d5eb2cb435a5a
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 74cfb1407b9..21836374aff 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210208.033250-77-runner.jar
-    md5: ffe063d0d93a1d6b8b0754b4721be884
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210209.032459-78-runner.jar
+    md5: 86d5daf42b43d2ed9d3db49711065fd5
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 931db9d23b7..bf7ec43f88c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210208.033218-77-runner.jar
-    md5: 7d65328c83976dfaa14201656fec33d1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210209.032435-78-runner.jar
+    md5: b81689d57c57e89e76f1b0c9edfed787
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index 126aae0a9fb..d9483ccbed5 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210208.033635-74-runner.jar
-    md5: bb3fd60e3d0a164def07d891e05fea54
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210209.032732-75-runner.jar
+    md5: d4ada165f93a00627b2cb719003ae383
 
 execute:
   - script: configure

From 0b2e876808bda42b620419552379f8778f051cac Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 11 Feb 2021 12:13:32 +0100
Subject: [PATCH 246/709] Setup DSL scripts (#307)

---
 .github/workflows/jenkins-tests-PR.yml        |  27 +++
 .gitignore                                    |   1 +
 .jenkins/dsl/jobs.groovy                      | 192 ++++++++++++++++++
 .jenkins/dsl/test.sh                          |  20 ++
 Jenkinsfile.deploy                            |  89 +++-----
 Jenkinsfile.promote                           | 104 ++++------
 .../3.6.x/added/configure-maven.sh            |   2 +-
 .../tests/bats/maven-settings.bats            |   2 +-
 scripts/common.py                             |   9 +
 scripts/update-tests.py                       |   3 +-
 tests/test-apps/clone-repo.sh                 |  16 +-
 11 files changed, 331 insertions(+), 134 deletions(-)
 create mode 100644 .github/workflows/jenkins-tests-PR.yml
 create mode 100644 .jenkins/dsl/jobs.groovy
 create mode 100755 .jenkins/dsl/test.sh

diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
new file mode 100644
index 00000000000..a1e0d855732
--- /dev/null
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -0,0 +1,27 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Jenkins Tests
+
+on:
+  pull_request:
+    paths: 
+    - '.jenkins/**'
+    - 'Jenkinsfile*'
+
+jobs:
+  dsl-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout 
+      uses: actions/checkout@v2
+
+    - name: Set up JDK 1.11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+      
+    - name: Test DSL
+    # TODO to change back to kiegroup/master
+      run: cd .jenkins/dsl && ./test.sh setup_dsl radtriste
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 04a78e23e5d..b424604e915 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ bats/*
 /.*
 !.gitignore
 !.github
+!.jenkins
 /nbproject
 /*.ipr
 /*.iws
diff --git a/.jenkins/dsl/jobs.groovy b/.jenkins/dsl/jobs.groovy
new file mode 100644
index 00000000000..c73f53a9370
--- /dev/null
+++ b/.jenkins/dsl/jobs.groovy
@@ -0,0 +1,192 @@
+import org.kie.jenkins.jobdsl.templates.KogitoJobTemplate
+import org.kie.jenkins.jobdsl.KogitoConstants
+import org.kie.jenkins.jobdsl.Utils
+import org.kie.jenkins.jobdsl.KogitoJobType
+
+boolean isMainBranch() {
+    return "${GIT_BRANCH}" == "${GIT_MAIN_BRANCH}"
+}
+
+def getDefaultJobParams() {
+    return [
+        job: [
+            name: 'kogito-images'
+        ],
+        git: [
+            author: "${GIT_AUTHOR_NAME}",
+            branch: "${GIT_BRANCH}",
+            repository: 'kogito-images',
+            credentials: "${GIT_AUTHOR_CREDENTIALS_ID}",
+            token_credentials: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}"
+        ]
+    ]
+}
+
+def getJobParams(String jobName, String jobFolder, String jenkinsfileName, String jobDescription = '') {
+    def jobParams = getDefaultJobParams()
+    jobParams.job.name = jobName
+    jobParams.job.folder = jobFolder
+    jobParams.jenkinsfile = jenkinsfileName
+    if (jobDescription) {
+        jobParams.job.description = jobDescription
+    }
+    return jobParams
+}
+
+def bddRuntimesPrFolder = "${KogitoConstants.KOGITO_DSL_PULLREQUEST_FOLDER}/${KogitoConstants.KOGITO_DSL_RUNTIMES_BDD_FOLDER}"
+def nightlyBranchFolder = "${KogitoConstants.KOGITO_DSL_NIGHTLY_FOLDER}/${JOB_BRANCH_FOLDER}"
+def releaseBranchFolder = "${KogitoConstants.KOGITO_DSL_RELEASE_FOLDER}/${JOB_BRANCH_FOLDER}"
+
+if (isMainBranch()) {
+    folder(KogitoConstants.KOGITO_DSL_PULLREQUEST_FOLDER)
+
+    setupPrJob(KogitoConstants.KOGITO_DSL_PULLREQUEST_FOLDER)
+
+    // For BDD runtimes PR job
+    folder(bddRuntimesPrFolder)
+
+    setupDeployJob(bddRuntimesPrFolder, KogitoJobType.PR)
+}
+
+// Branch jobs
+folder(KogitoConstants.KOGITO_DSL_NIGHTLY_FOLDER)
+folder(nightlyBranchFolder)
+setupDeployJob(nightlyBranchFolder, KogitoJobType.NIGHTLY)
+setupPromoteJob(nightlyBranchFolder, KogitoJobType.NIGHTLY)
+
+// No release directly on main branch
+if (!isMainBranch()) {
+    folder(KogitoConstants.KOGITO_DSL_RELEASE_FOLDER)
+    folder(releaseBranchFolder)
+    setupDeployJob(releaseBranchFolder, KogitoJobType.RELEASE)
+    setupPromoteJob(releaseBranchFolder, KogitoJobType.RELEASE)
+}
+
+/////////////////////////////////////////////////////////////////
+// Methods
+/////////////////////////////////////////////////////////////////
+
+void setupPrJob(String jobFolder) {
+    def jobParams = getDefaultJobParams()
+    jobParams.job.folder = jobFolder
+    KogitoJobTemplate.createPRJob(this, jobParams)
+}
+
+void setupDeployJob(String jobFolder, KogitoJobType jobType) {
+    def jobParams = getJobParams('kogito-images-deploy', jobFolder, 'Jenkinsfile.deploy', 'Kogito Images Deploy')
+    if (jobType == KogitoJobType.PR) {
+        jobParams.git.branch = '${GIT_BRANCH_NAME}'
+        jobParams.git.author = '${GIT_AUTHOR}'
+        jobParams.git.project_url = Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository)
+    }
+    KogitoJobTemplate.createPipelineJob(this, jobParams).with {
+        parameters {
+            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
+
+            stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
+            if (jobType == KogitoJobType.PR) {
+                // author can be changed as param only for PR behavior, due to source branch/target, else it is considered as an env
+                stringParam('GIT_AUTHOR', "${GIT_AUTHOR_NAME}", 'Set the Git author to checkout')
+            }
+
+            // Build&Test information
+            booleanParam('SKIP_TESTS', false, 'Skip tests')
+            stringParam('EXAMPLES_URI', '', 'Git uri to the kogito-examples repository to use for tests.')
+            stringParam('EXAMPLES_REF', '', 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
+
+            // Deploy information
+            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('QUAY_TOKEN_CREDENTIALS', '', 'quay.io access token credentials to use to push/pull images and set images\' visibility. Will be ignored if IMAGE_REGISTRY is different from quay.io. Else IMAGE_REGISTRY_CREDENTIALS is ignored if that one is set.')
+            stringParam('IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
+            stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
+            stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
+            stringParam('IMAGE_TAG', '', 'Image tag to use to deploy images')
+
+            // Release information
+            stringParam('PROJECT_VERSION', '', 'Optional if not RELEASE. If RELEASE, cannot be empty.')
+            stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
+
+            booleanParam('CREATE_PR', false, 'In case of not releasing, you can ask to create a PR with the changes')
+        }
+
+        environmentVariables {
+            env('CI', true)
+            env('REPO_NAME', 'kogito-images')
+            env('PROPERTIES_FILE_NAME', 'deployment.properties')
+
+            env('RELEASE', jobType == KogitoJobType.RELEASE)
+            env('JENKINS_EMAIL_CREDS_ID', "${JENKINS_EMAIL_CREDS_ID}")
+
+            if (jobType == KogitoJobType.PR) {
+                env('MAVEN_ARTIFACT_REPOSITORY', "${MAVEN_PR_CHECKS_REPOSITORY_URL}")
+            } else {
+                env('GIT_AUTHOR', "${GIT_AUTHOR_NAME}")
+
+                env('AUTHOR_CREDS_ID', "${GIT_AUTHOR_CREDENTIALS_ID}")
+                env('GITHUB_TOKEN_CREDS_ID', "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}")
+                env('GIT_AUTHOR_BOT', "${GIT_BOT_AUTHOR_NAME}")
+                env('BOT_CREDENTIALS_ID', "${GIT_BOT_AUTHOR_CREDENTIALS_ID}")
+
+                env('MAVEN_ARTIFACT_REPOSITORY', "${MAVEN_ARTIFACTS_REPOSITORY}")
+                env('DEFAULT_STAGING_REPOSITORY', "${MAVEN_NEXUS_STAGING_PROFILE_URL}")
+            }
+        }
+    }
+}
+
+void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
+    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-promote', jobFolder, 'Jenkinsfile.promote', 'Kogito Images Promote')).with {
+        parameters {
+            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
+
+            stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
+
+            // Deploy job url to retrieve deployment.properties
+            stringParam('DEPLOY_BUILD_URL', '', 'URL to jenkins deploy build to retrieve the `deployment.properties` file. If base parameters are defined, they will override the `deployment.properties` information')
+
+            // Base images information which can override `deployment.properties`
+            booleanParam('BASE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Override `deployment.properties`. Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Override `deployment.properties`. Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
+            stringParam('BASE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Override `deployment.properties`. Base image registry')
+            stringParam('BASE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Override `deployment.properties`. Base image namespace')
+            stringParam('BASE_IMAGE_NAME_SUFFIX', '', 'Override `deployment.properties`. Base image name suffix')
+            stringParam('BASE_IMAGE_TAG', '', 'Override `deployment.properties`. Base image tag')
+
+            // Promote images information
+            booleanParam('PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('PROMOTE_QUAY_TOKEN_CREDENTIALS', '', 'quay.io access token credentials to use to set images\' visibility. Will be ignored if PROMOTE_IMAGE_REGISTRY is different from quay.io.')
+            stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
+            stringParam('PROMOTE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Promote image registry')
+            stringParam('PROMOTE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Promote image namespace')
+            stringParam('PROMOTE_IMAGE_NAME_SUFFIX', '', 'Promote image name suffix')
+            stringParam('PROMOTE_IMAGE_TAG', '', 'Promote image tag')
+            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
+
+            // Release information which can override `deployment.properties`
+            stringParam('PROJECT_VERSION', '', 'Override `deployment.properties`. Optional if not RELEASE. If RELEASE, cannot be empty.')
+            stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
+            stringParam('GIT_TAG', '', 'Git tag to set, if different from PROJECT_VERSION')
+            stringParam('RELEASE_NOTES', '', 'Release notes to be added. If none provided, a default one will be given.')
+        }
+
+        environmentVariables {
+            env('CI', true)
+            env('REPO_NAME', 'kogito-images')
+            env('PROPERTIES_FILE_NAME', 'deployment.properties')
+
+            env('RELEASE', jobType == KogitoJobType.RELEASE)
+            env('JENKINS_EMAIL_CREDS_ID', "${JENKINS_EMAIL_CREDS_ID}")
+
+            env('GIT_AUTHOR', "${GIT_AUTHOR_NAME}")
+
+            env('AUTHOR_CREDS_ID', "${GIT_AUTHOR_CREDENTIALS_ID}")
+            env('GITHUB_TOKEN_CREDS_ID', "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}")
+            env('GIT_AUTHOR_BOT', "${GIT_BOT_AUTHOR_NAME}")
+            env('BOT_CREDENTIALS_ID', "${GIT_BOT_AUTHOR_CREDENTIALS_ID}")
+
+            env('DEFAULT_STAGING_REPOSITORY', "${MAVEN_NEXUS_STAGING_PROFILE_URL}")
+            env('MAVEN_ARTIFACT_REPOSITORY', "${MAVEN_ARTIFACTS_REPOSITORY}")
+        }
+    }
+}
diff --git a/.jenkins/dsl/test.sh b/.jenkins/dsl/test.sh
new file mode 100755
index 00000000000..b696d53ce78
--- /dev/null
+++ b/.jenkins/dsl/test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+TEMP_DIR=`mktemp -d`
+
+branch=$1
+author=$2
+
+if [ -z $branch ]; then
+  branch='master'
+fi
+
+if [ -z $author ]; then
+  author='kiegroup'
+fi
+
+echo '----- Cloning main dsl pipelines repo'
+git clone --single-branch --branch $branch https://github.com/${author}/kogito-pipelines.git $TEMP_DIR
+
+echo '----- Launching seed tests'
+${TEMP_DIR}/dsl/seed/scripts/seed_test.sh ${TEMP_DIR}
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 0d094bcd738..c01ba8d8ebe 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -15,48 +15,18 @@ pipeline {
     }
 
     options {
-        buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
         timeout(time: 120, unit: 'MINUTES')
     }
 
-    parameters {
-        string(name: 'DISPLAY_NAME', defaultValue: '', description: 'Setup a specific build display name')
-
-        // Git information
-        string(name: 'BUILD_BRANCH_NAME', defaultValue: 'master', description: 'Which branch to build ? Set if you are not on a multibranch pipeline.')
-        string(name: 'GIT_AUTHOR', defaultValue: 'kiegroup', description: 'Which Git author repository ?')
-
-        // Build&Test information
-        booleanParam(name: 'SKIP_TESTS', defaultValue: false, description: 'Skip tests')
-        string(name: 'MAVEN_ARTIFACT_REPOSITORY', defaultValue: '', description: 'Maven repository where the build artifacts are present')
-        string(name: 'EXAMPLES_URI', defaultValue: '', description: 'Git uri to the kogito-examples repository to use for tests.')
-        string(name: 'EXAMPLES_REF', defaultValue: '', description: 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
-
-        // Deploy information
-        booleanParam(name: 'IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-        string(name: 'QUAY_TOKEN_CREDENTIALS', defaultValue: '', description: 'quay.io access token credentials to use to push/pull images and set images\' visibility. Will be ignored if IMAGE_REGISTRY is different from quay.io. Else IMAGE_REGISTRY_CREDENTIALS is ignored if that one is set.')
-        string(name: 'IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-        string(name: 'IMAGE_REGISTRY', defaultValue: '', description: 'Image registry to use to deploy images')
-        string(name: 'IMAGE_NAMESPACE', defaultValue: 'kiegroup', description: 'Image namespace to use to deploy images')
-        string(name: 'IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
-        string(name: 'IMAGE_TAG', defaultValue: '', description: 'Image tag to use to deploy images')
-
-        // Release information
-        booleanParam(name: 'RELEASE', defaultValue: false, description: 'Is this build for a release?')
-        string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Optional if not RELEASE. If RELEASE, cannot be empty.')
-        string(name: 'KOGITO_ARTIFACTS_VERSION', defaultValue: '', description: 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
-
-        booleanParam(name: 'CREATE_CHANGES_PR', defaultValue: false, description: 'In case of not releasing, you can ask to create a PR with the changes')
-
-        // Bot author information. Set as params for easy testing.
-        string(name: 'GIT_AUTHOR_BOT', defaultValue: 'bsig-gh-bot', description: 'From which author should the PR be created ?')
-        string(name: 'BOT_CREDENTIALS_ID', defaultValue: 'bsig-gh-bot', description: 'Credentials for PR creation')
-    }
+    // parameters {
+    // For parameters, check into .jenkins/dsl/jobs.groovy file
+    // }
 
     environment {
-        KOGITO_CI_EMAIL_TO = credentials('KOGITO_CI_EMAIL_TO')
+        // Static env is defined into .jenkins/dsl/jobs.groovy file
+
+        KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
-        CI = true
         JAVA_HOME = "${GRAALVM_HOME}"
 
         OPENSHIFT_API = credentials('OPENSHIFT_API')
@@ -72,7 +42,7 @@ pipeline {
                 script {
                     clean()
 
-                    if (params.DISPLAY_NAME != '') {
+                    if (params.DISPLAY_NAME) {
                         currentBuild.displayName = params.DISPLAY_NAME
                     }
 
@@ -85,7 +55,9 @@ pipeline {
                     checkoutRepo()
 
                     if (isRelease()) {
-                        assert getProjectVersion() != ''
+                        // Verify version is set and if on right release branch
+                        assert getProjectVersion()
+                        assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())
                     }
                 }
             }
@@ -278,7 +250,7 @@ pipeline {
                 success {
                     script {
                         // Store image deployment information
-                        String imgPrefix = 'kogito-images.image'
+                        String imgPrefix = "${getRepoName()}.image"
                         setDeployPropertyIfNeeded("${imgPrefix}.registry", getDeployImageRegistry())
                         setDeployPropertyIfNeeded("${imgPrefix}.namespace", getDeployImageNamespace())
                         setDeployPropertyIfNeeded("${imgPrefix}.name-suffix", getDeployImageNameSuffix())
@@ -300,25 +272,26 @@ pipeline {
                     def commitMsg = "[${getBuildBranch()}] Update Maven artifacts"
                     def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}."
                     if (isRelease()) {
-                        commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()} for release"
-                        prBody += '\nPlease do not merge, it will be merged automatically after testing.'
+                        commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()}"
+                        prBody += '\nPlease do not merge, it should be merged automatically.'
                     }
                     String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
-                    deployProperties['kogito-images.pr.link'] = prLink
+                    deployProperties["${getRepoName()}.pr.link"] = prLink
 
                     if (isCreateChangesPR()) {
                         String bodyMsg = "PR has been created with update Maven artifacts.\nPlease review it here: ${prLink}"
 
-                        emailext body: bodyMsg, subject: "[${getBuildBranch()}][d] Kogito Images pipeline", to: env.KOGITO_CI_EMAIL_TO }
+                        emailext body: bodyMsg, subject: "[${getBuildBranch()}][d] Kogito Images pipeline", to: env.KOGITO_CI_EMAIL_TO 
+                    }
                 }
             }
             post {
                 success {
                     script {
-                        setDeployPropertyIfNeeded('kogito-images.pr.source.uri', "https://github.com/${getBotAuthor()}/kogito-images")
-                        setDeployPropertyIfNeeded('kogito-images.pr.source.ref', getBotBranch())
-                        setDeployPropertyIfNeeded('kogito-images.pr.target.uri', "https://github.com/${getGitAuthor()}/kogito-images")
-                        setDeployPropertyIfNeeded('kogito-images.pr.target.ref', getBuildBranch())
+                        setDeployPropertyIfNeeded("${getRepoName()}.pr.source.uri", "https://github.com/${getBotAuthor()}/${getRepoName()}")
+                        setDeployPropertyIfNeeded("${getRepoName()}.pr.source.ref", getBotBranch())
+                        setDeployPropertyIfNeeded("${getRepoName()}.pr.target.uri", "https://github.com/${getGitAuthor()}/${getRepoName()}")
+                        setDeployPropertyIfNeeded("${getRepoName()}.pr.target.ref", getBuildBranch())
                     }
                 }
             }
@@ -328,8 +301,8 @@ pipeline {
         always {
             script {
                 def propertiesStr = deployProperties.collect { entry -> "${entry.key}=${entry.value}" }.join('\n')
-                writeFile( file : 'deployment.properties' , text : propertiesStr)
-                archiveArtifacts artifacts: 'deployment.properties', allowEmptyArchive:true
+                writeFile( file : env.PROPERTIES_FILE_NAME , text : propertiesStr)
+                archiveArtifacts artifacts: env.PROPERTIES_FILE_NAME, allowEmptyArchive:true
                 clean()
             }
         }
@@ -338,7 +311,7 @@ pipeline {
 
 void checkoutRepo() {
     deleteDir()
-    checkout(githubscm.resolveRepository('kogito-images', getGitAuthor(), getBuildBranch(), false))
+    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
 }
 
 void commitChanges(String commitMsg) {
@@ -507,11 +480,15 @@ String getWorkspacePath(String image) {
 ////////////////////////////////////////////////////////////////////////
 
 boolean isRelease() {
-    return params.RELEASE
+    return env.RELEASE.toBoolean()
+}
+
+String getRepoName() {
+    return env.REPO_NAME
 }
 
 boolean isCreateChangesPR() {
-    return params.CREATE_CHANGES_PR
+    return params.CREATE_PR
 }
 
 String getBuildBranch() {
@@ -519,7 +496,7 @@ String getBuildBranch() {
 }
 
 String getGitAuthor() {
-    return params.GIT_AUTHOR
+    return "${GIT_AUTHOR}"
 }
 
 String getBotBranch() {
@@ -527,11 +504,11 @@ String getBotBranch() {
 }
 
 String getBotAuthor() {
-    return params.GIT_AUTHOR_BOT
+    return env.GIT_AUTHOR_BOT
 }
 
 String getBotAuthorCredsID() {
-    return params.BOT_CREDENTIALS_ID
+    return env.BOT_CREDENTIALS_ID
 }
 
 String getProjectVersion() {
@@ -543,7 +520,7 @@ String getKogitoArtifactsVersion() {
 }
 
 String getMavenArtifactRepository() {
-    return params.MAVEN_ARTIFACT_REPOSITORY
+    return env.MAVEN_ARTIFACT_REPOSITORY ?: (isRelease() ? env.DEFAULT_STAGING_REPOSITORY : '')
 }
 
 boolean shouldSkipTests() {
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 0ee32907d97..65bbc122e05 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -9,58 +9,16 @@ pipeline {
     }
 
     options {
-        buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
         timeout(time: 120, unit: 'MINUTES')
     }
-
-    parameters {
-        string(name: 'DISPLAY_NAME', defaultValue: '', description: 'Setup a specific build display name')
-
-        // Deploy job url to retrieve deployment.properties
-        string(name: 'DEPLOY_BUILD_URL', defaultValue: '', description: 'URL to jenkins deploy build to retrieve the `deployment.properties` file. If base parameters are defined, they will override the `deployment.properties` information')
-
-        // Git information which can override `deployment.properties`
-        string(name: 'BUILD_BRANCH_NAME', defaultValue: '', description: 'Override `deployment.properties`. Which branch to build? Set if you are not on a multibranch pipeline.')
-        string(name: 'GIT_AUTHOR', defaultValue: '', description: 'Override `deployment.properties`. Which Git author repository ?')
-
-        // Base images information which can override `deployment.properties`
-        booleanParam(name: 'BASE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Override `deployment.properties`. Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
-        string(name: 'BASE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Override `deployment.properties`. Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
-        string(name: 'BASE_IMAGE_REGISTRY', defaultValue: '', description: 'Override `deployment.properties`. Base image registry')
-        string(name: 'BASE_IMAGE_NAMESPACE', defaultValue: '', description: 'Override `deployment.properties`. Base image namespace')
-        string(name: 'BASE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Override `deployment.properties`. Base image name suffix')
-        string(name: 'BASE_IMAGE_TAG', defaultValue: '', description: 'Override `deployment.properties`. Base image tag')
-
-        // Promote images information
-        booleanParam(name: 'PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', defaultValue: false, description: 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
-        string(name: 'PROMOTE_QUAY_TOKEN_CREDENTIALS', defaultValue: '', description: 'quay.io access token credentials to use to set images\' visibility. Will be ignored if PROMOTE_IMAGE_REGISTRY is different from quay.io.')
-        string(name: 'PROMOTE_IMAGE_REGISTRY_CREDENTIALS', defaultValue: '', description: 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
-        string(name: 'PROMOTE_IMAGE_REGISTRY', defaultValue: '', description: 'Promote image registry')
-        string(name: 'PROMOTE_IMAGE_NAMESPACE', defaultValue: '', description: 'Promote image namespace')
-        string(name: 'PROMOTE_IMAGE_NAME_SUFFIX', defaultValue: '', description: 'Promote image name suffix')
-        string(name: 'PROMOTE_IMAGE_TAG', defaultValue: '', description: 'Promote image tag')
-        booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', defaultValue: false, description: 'Set to true if you want the deployed images to also be with the `latest` tag')
-
-        // Release information which can override `deployment.properties`
-        booleanParam(name: 'RELEASE', defaultValue: false, description: 'Override `deployment.properties`. Is this build for a release?')
-        string(name: 'PROJECT_VERSION', defaultValue: '', description: 'Override `deployment.properties`. Optional if not RELEASE. If RELEASE, cannot be empty.')
-        string(name: 'KOGITO_ARTIFACTS_VERSION', defaultValue: '', description: 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
-        string(name: 'GIT_TAG', defaultValue: '', description: 'Git tag to set, if different from PROJECT_VERSION')
-        string(name: 'MAVEN_ARTIFACT_REPOSITORY', defaultValue: '', description: 'Maven repository where the released jar artifacts are present. To be set if git author is not `kiegroup` and repository is different from JBoss repository.')
-        string(name: 'RELEASE_NOTES', defaultValue: '', description: 'Release notes to be added. If none provided, a default one will be given.')
-
-        // Bot author information. Set as params for easy testing.
-        string(name: 'BOT_CREDENTIALS_ID', defaultValue: 'bsig-gh-bot', description: 'Credentials for PR creation')
-
-        // Main author creds
-        string(name: 'AUTHOR_CREDS_ID', defaultValue: 'kie-ci', description: 'Credentials for PR merge')
-        string(name: 'GITHUB_TOKEN_CREDS_ID', defaultValue: 'kie-ci2-token', description: 'GH token to be used with GH CLI')
-    }
+    // parameters {
+    // For parameters, check into .jenkins/dsl/jobs.groovy file
+    // }
 
     environment {
-        KOGITO_CI_EMAIL_TO = credentials('KOGITO_CI_EMAIL_TO')
-
-        CI = true // Used by scripts
+        // Static env is defined into .jenkins/dsl/jobs.groovy file
+        
+        KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
@@ -68,7 +26,7 @@ pipeline {
 
         BOT_BRANCH_HASH = "${util.generateHash(10)}"
 
-        GITHUB_REPO = 'kogito-images' // for github-release cli
+        GITHUB_REPO = "${REPO_NAME}" // for github-release cli
     }
 
     stages {
@@ -77,17 +35,19 @@ pipeline {
                 script {
                     clean()
 
-                    if (params.DISPLAY_NAME != '') {
+                    if (params.DISPLAY_NAME) {
                         currentBuild.displayName = params.DISPLAY_NAME
                     }
 
                     readDeployProperties()
 
                     if (isRelease()) {
-                        assert getProjectVersion() != ''
+                        // Verify version is set and if on right release branch
+                        assert getProjectVersion()
+                        assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())
                     }
 
-                    dir('kogito-images') {
+                    dir(getRepoName()) {
                         checkoutRepo()
                     }
 
@@ -102,7 +62,7 @@ pipeline {
             steps {
                 script {
                     // Update maven information with new artifacts from Maven central in the PR
-                    dir('kogito-images-update') {
+                    dir("artifacts-update") {
                         checkoutRepo()
                         githubscm.forkRepo(getBotAuthorCredsID())
 
@@ -150,7 +110,7 @@ pipeline {
                     } else if (getOldImageRegistryCredentials() != '') {
                         loginContainerRegistry(getOldImageRegistry(), getOldImageRegistryCredentials())
                     }
-                    dir('kogito-images') {
+                    dir(getRepoName()) {
                         pullImages()
                     }
                 }
@@ -159,7 +119,7 @@ pipeline {
         stage('Tag images') {
             steps {
                 script {
-                    dir('kogito-images') {
+                    dir(getRepoName()) {
                         tagImages()
                     }
                 }
@@ -173,7 +133,7 @@ pipeline {
                     } else if (getNewImageRegistryCredentials() != '') {
                         loginContainerRegistry(getNewImageRegistry(), getNewImageRegistryCredentials())
                     }
-                    dir('kogito-images') {
+                    dir(getRepoName()) {
                         pushImages()
 
                         if (isQuayRegistry(getNewImageRegistry()) && getNewImageQuayTokenCredentials()) {
@@ -189,9 +149,9 @@ pipeline {
             }
             steps {
                 script {
-                    dir('kogito-images') {
+                    dir(getRepoName()) {
                         // Merge PR
-                        String prLink = getDeployProperty('kogito-images.pr.link')
+                        String prLink = getDeployProperty("${getRepoName()}.pr.link")
                         if (prLink != '') {
                             githubscm.mergePR(prLink, getGitAuthorCredsID())
                             githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
@@ -200,7 +160,7 @@ pipeline {
                         if (getGitTag() != '') {
                             def releaseName = "Kogito Images Version ${getProjectVersion()}"
                             def description = params.RELEASE_NOTES != '' ? params.RELEASE_NOTES : "We are glad to announce that the Kogito ${getProjectVersion()} release is now available!"
-                            withCredentials([string(credentialsId: params.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
+                            withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
                                 sh """
                                     export GITHUB_USER=${getGitAuthor()}
                                     github-release release --tag ${getGitTag()} --target '${getBuildBranch()}' --name '${releaseName}' --description '${description}' --pre-release
@@ -220,7 +180,7 @@ pipeline {
                 script {
                     String prLink = ''
                     String nextVersion = getNextVersion()
-                    dir('kogito-images-snapshot') { // Use different folder from `Update PR with released Maven artifacts` to avoid conflicts
+                    dir('bot') { // Use different folder from `Update PR with released Maven artifacts` to avoid conflicts
                         // Prepare PR
                         checkoutRepo()
                         githubscm.forkRepo(getBotAuthorCredsID())
@@ -239,7 +199,7 @@ pipeline {
                         githubscm.pushObject('origin', getSnapshotBranch(), getBotAuthorCredsID())
                         prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
                     }
-                    dir('kogito-images') {
+                    dir(getRepoName()) {
                         if (prLink != '') {
                             githubscm.mergePR(prLink, getGitAuthorCredsID())
                             githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
@@ -262,7 +222,7 @@ void installGitHubReleaseCLI() {
 
 void checkoutRepo() {
     deleteDir()
-    checkout(githubscm.resolveRepository('kogito-images', getGitAuthor(), getBuildBranch(), false))
+    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
     // need to manually checkout branch since on a detached branch after checkout command
     sh "git checkout ${getBuildBranch()}"
 }
@@ -399,7 +359,11 @@ String getParamOrDeployProperty(String paramKey, String deployPropertyKey) {
 ////////////////////////////////////////////////////////////////////////
 
 boolean isRelease() {
-    return params.RELEASE || (getDeployProperty('release') == 'true')
+    return env.RELEASE.toBoolean()
+}
+
+String getRepoName() {
+    return env.REPO_NAME
 }
 
 String getProjectVersion() {
@@ -416,27 +380,27 @@ String getGitTag() {
 }
 
 String getBuildBranch() {
-    return getParamOrDeployProperty('BUILD_BRANCH_NAME', 'git.branch')
+    return params.BUILD_BRANCH_NAME
 }
 
 String getPRSourceBranch() {
-    return getDeployProperty('kogito-images.pr.source.ref')
+    return getDeployProperty("${getRepoName()}.pr.source.ref")
 }
 
 String getGitAuthor() {
-    return getParamOrDeployProperty('GIT_AUTHOR', 'git.author')
+    return env.GIT_AUTHOR
 }
 
 String getGitAuthorCredsID() {
-    return params.AUTHOR_CREDS_ID
+    return env.AUTHOR_CREDS_ID
 }
 
 String getBotAuthorCredsID() {
-    return params.BOT_CREDENTIALS_ID
+    return env.BOT_CREDENTIALS_ID
 }
 
 String getMavenArtifactRepository() {
-    return params.MAVEN_ARTIFACT_REPOSITORY
+    return env.MAVEN_ARTIFACT_REPOSITORY ?: ''
 }
 
 String getNextVersion() {
@@ -461,7 +425,7 @@ boolean isQuayRegistry(String registry) {
 ////////////////////////////////////////////////////////////////////////
 
 String getOldImagePrefix() {
-    return 'kogito-images.image'
+    return "${getRepoName()}.image"
 }
 
 boolean isOldImageInOpenshiftRegistry() {
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index f5731bd6e7b..7a19bf4e183 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -97,7 +97,7 @@ function configure_maven_download_output() {
 
 function ignore_maven_self_signed_certificates() {
     if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
     fi
 }
 
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index b6cf58789c6..3daade8a709 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -168,7 +168,7 @@ function _generate_random_id() {
     prepareEnv
     MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE="true"
     ignore_maven_self_signed_certificates
-    expected=" -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
+    expected=" -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
     result="${MAVEN_ARGS_APPEND}"
     echo "expected=${expected}"
     echo "result=${result}"
diff --git a/scripts/common.py b/scripts/common.py
index e68c93bc9b2..560352beb54 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -307,6 +307,15 @@ def update_maven_repo_in_clone_repo(repo_url, replaceJbossRepository):
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
+def ignore_maven_self_signed_certificate_in_clone_repo():
+    """
+    Sets the environment variable to ignore the self-signed certificates in maven
+    """
+    print("Setting MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE env in clone repo")
+    pattern = re.compile(r'(# MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=.*)')
+    replacement = "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true"
+    update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
+
 
 def update_in_file(file, pattern, replacement):
     """
diff --git a/scripts/update-tests.py b/scripts/update-tests.py
index c1d1e0132c2..416fb49640e 100644
--- a/scripts/update-tests.py
+++ b/scripts/update-tests.py
@@ -36,4 +36,5 @@
         common.update_artifacts_version_in_behave_tests(args.artifacts_version)
     
     if args.ignore_self_signed_cert:
-        common.ignore_maven_self_signed_certificate_in_behave_tests()
\ No newline at end of file
+        common.ignore_maven_self_signed_certificate_in_behave_tests()
+        common.ignore_maven_self_signed_certificate_in_clone_repo()
\ No newline at end of file
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index b3057604b33..ce8cdf0d7bb 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -5,13 +5,15 @@
 SCRIPT_DIR=`pwd`
 MVN_MODULE="${SCRIPT_DIR}/../../modules/kogito-maven/3.6.x"
 CONTAINER_ENGINE="docker"
+MAVEN_OPTIONS="-DskipTests -U"
 MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS="-Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=${CONTAINER_ENGINE}"
+# MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true
 
 # exit when any command fails
 set -e
-#Setup maven configuration only on CI
+# Setup maven configuration only on CI
 if [ "${CI}" ]; then
-# setup maven env
+    # setup maven env
     export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
     # export MAVEN_REPO_URL=
     cp "${MVN_MODULE}"/maven/settings.xml "${HOME}"/.m2/settings.xml
@@ -21,6 +23,10 @@ if [ "${CI}" ]; then
     cat "${HOME}"/.m2/settings.xml
 fi
 
+if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" = "true" ]; then
+    MAVEN_OPTIONS="${MAVEN_OPTIONS} -Denforcer.skip"
+fi
+
 # Clone examples
 cd /tmp
 rm -rf kogito-examples/
@@ -33,9 +39,9 @@ git checkout master
 cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/
 
 # generating the app binaries to test the binary build
-mvn -f rules-quarkus-helloworld clean package -DskipTests -U
-mvn -f process-springboot-example clean package -DskipTests -U
-mvn -f rules-quarkus-helloworld-native -Pnative clean package -DskipTests -U ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
+mvn -f rules-quarkus-helloworld clean package ${MAVEN_OPTIONS}
+mvn -f process-springboot-example clean package ${MAVEN_OPTIONS}
+mvn -f rules-quarkus-helloworld-native -Pnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
 
 # preparing directory to run kogito maven archetypes tests
 mkdir -pv /tmp/kogito-examples/dmn-example

From 0102f342d829c424b16a859ac6ade789820f367f Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 11 Feb 2021 10:51:52 -0300
Subject: [PATCH 247/709] Updated Maven artifacts (#368)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 modules/kogito-trusty/module.yaml                | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index fee7abfd3fc..acf55cc419c 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210209.032006-78-runner.jar
-    md5: 5dd7c564206487fcb35ecba11ac4a741
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210210.034055-79-runner.jar
+    md5: 81b529d95f43b03b3499de899dac3b9a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 568f8347b2b..40895948507 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210209.032053-78-runner.jar
-    md5: 9e014c82b1b57fdc70995669c83a7476
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210210.034141-79-runner.jar
+    md5: 0c178908fc68a604dc66b33ea5a1f92e
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 25214878d20..fad4e7555e0 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210209.032637-78-runner.jar
-    md5: c268253b09cd3122e618be2495c693c0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210210.035005-79-runner.jar
+    md5: 75f2e9ee0a2822ca56b42c6dfb0a10e9
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210209.032611-75-runner.jar
-    md5: 0e66a2493a82ca3efe309a4cefe0b2db
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210210.034933-76-runner.jar
+    md5: 067074ee196f8aa7babbe0bb2fc1c996
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index cef45a0341a..c817750a834 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210209.032819-20-runner.jar
-    md5: 626e9573ddfa584e1f41a3637fe83303
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210210.035216-21-runner.jar
+    md5: cc2f2f038fbcb036508f261488cadd09
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 2c4c2bdb626..ded14e71def 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210209.031853-76-runner.jar
-    md5: 1eb6885d41da5135c96d81524654dc1a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210210.033948-77-runner.jar
+    md5: 1c3859d68d908b7c0ce8b952465d7a75
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index f97974b66df..71ca71158ea 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210209.032411-78-runner.jar
-    md5: c79fd12adbc1c7fcbd1d5eb2cb435a5a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210210.034704-79-runner.jar
+    md5: f09afab2d48fd02ae2aed2037a9e00c5
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 21836374aff..c0d6c2cb662 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210209.032459-78-runner.jar
-    md5: 86d5daf42b43d2ed9d3db49711065fd5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210210.034803-79-runner.jar
+    md5: d4fbffaf866f7ef23602aac488359c57
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index bf7ec43f88c..367dad758b4 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210209.032435-78-runner.jar
-    md5: b81689d57c57e89e76f1b0c9edfed787
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210210.034733-79-runner.jar
+    md5: 9369d2f69084bf5ca5c6a21a12c6d92b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
index d9483ccbed5..46b66bdf33e 100644
--- a/modules/kogito-trusty/module.yaml
+++ b/modules/kogito-trusty/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210209.032732-75-runner.jar
-    md5: d4ada165f93a00627b2cb719003ae383
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210210.035118-76-runner.jar
+    md5: 0e6856c034583851a7fe64d37a4758d8
 
 execute:
   - script: configure

From 12e1cbc15ed64690d72912aebc32ae1782e6abe0 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 11 Feb 2021 10:54:40 -0300
Subject: [PATCH 248/709] Updated Maven artifacts (#369)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>

From 3ba8691a15a13b8bc7560c503dc578e20477b79d Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 11 Feb 2021 19:24:31 +0100
Subject: [PATCH 249/709] corrected DSL check (#375)

---
 .github/workflows/jenkins-tests-PR.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index a1e0d855732..c369aaec50c 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -23,5 +23,4 @@ jobs:
         java-version: 11
       
     - name: Test DSL
-    # TODO to change back to kiegroup/master
-      run: cd .jenkins/dsl && ./test.sh setup_dsl radtriste
\ No newline at end of file
+      run: cd .jenkins/dsl && ./test.sh

From 57b68496d6dece722bcd1104fa3b82b4e1a1f145 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 12 Feb 2021 15:35:40 +0100
Subject: [PATCH 250/709] [KOGITO-4222] Use registry creds for img visibility
 (#366)

* KOGITO-4222 Use registry creds for img visibility

* Setup container engine/options as env var

* Moved env to DSL
---
 .jenkins/dsl/jobs.groovy | 10 ++++++--
 Jenkinsfile.deploy       | 26 +++++++++++----------
 Jenkinsfile.promote      | 50 +++++++++++++++++++++++++---------------
 3 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/.jenkins/dsl/jobs.groovy b/.jenkins/dsl/jobs.groovy
index c73f53a9370..ff6c2ad6c63 100644
--- a/.jenkins/dsl/jobs.groovy
+++ b/.jenkins/dsl/jobs.groovy
@@ -96,7 +96,6 @@ void setupDeployJob(String jobFolder, KogitoJobType jobType) {
 
             // Deploy information
             booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('QUAY_TOKEN_CREDENTIALS', '', 'quay.io access token credentials to use to push/pull images and set images\' visibility. Will be ignored if IMAGE_REGISTRY is different from quay.io. Else IMAGE_REGISTRY_CREDENTIALS is ignored if that one is set.')
             stringParam('IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
             stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
             stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
@@ -115,6 +114,10 @@ void setupDeployJob(String jobFolder, KogitoJobType jobType) {
             env('REPO_NAME', 'kogito-images')
             env('PROPERTIES_FILE_NAME', 'deployment.properties')
 
+            env('CONTAINER_ENGINE', 'docker')
+            env('CONTAINER_TLS_OPTIONS', '')
+            env('MAX_REGISTRY_RETRIES', 3)
+
             env('RELEASE', jobType == KogitoJobType.RELEASE)
             env('JENKINS_EMAIL_CREDS_ID', "${JENKINS_EMAIL_CREDS_ID}")
 
@@ -155,7 +158,6 @@ void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
 
             // Promote images information
             booleanParam('PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('PROMOTE_QUAY_TOKEN_CREDENTIALS', '', 'quay.io access token credentials to use to set images\' visibility. Will be ignored if PROMOTE_IMAGE_REGISTRY is different from quay.io.')
             stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
             stringParam('PROMOTE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Promote image registry')
             stringParam('PROMOTE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Promote image namespace')
@@ -175,6 +177,10 @@ void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
             env('REPO_NAME', 'kogito-images')
             env('PROPERTIES_FILE_NAME', 'deployment.properties')
 
+            env('CONTAINER_ENGINE', 'podman')
+            env('CONTAINER_TLS_OPTIONS', '--tls-verify=false')
+            env('MAX_REGISTRY_RETRIES', 3)
+
             env('RELEASE', jobType == KogitoJobType.RELEASE)
             env('JENKINS_EMAIL_CREDS_ID', "${JENKINS_EMAIL_CREDS_ID}")
 
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index c01ba8d8ebe..f4ec1e46259 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -241,7 +241,7 @@ pipeline {
                     }
                     pushImages()
 
-                    if (isQuayRegistry() && getDeployQuayTokenCredentials()) {
+                    if (isQuayRegistry()) {
                         makeQuayImagesPublic()
                     }
                 }
@@ -328,8 +328,8 @@ void clean() {
 }
 
 void cleanImages() {
-    sh 'docker rm -f \$(docker ps -a -q) || date'
-    sh 'docker rmi -f \$(docker images -q) || date'
+    sh "${env.CONTAINER_ENGINE} rm -f \$(${env.CONTAINER_ENGINE} ps -a -q) || date"
+    sh "${env.CONTAINER_ENGINE} rmi -f \$(${env.CONTAINER_ENGINE} images -q) || date"
 }
 
 void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
@@ -358,13 +358,19 @@ void testImage(image) {
 
 void tagImages() {
     for (String imageName : getImages()) {
-        sh "docker tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"
+        sh "${env.CONTAINER_ENGINE} tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"
     }
 }
 
 void pushImages() {
     for (String imageName : getImages()) {
-        sh "docker push ${buildImageName(imageName)}"
+        pushImage(buildImageName(imageName))
+    }
+}
+
+void pushImage(String fullImageName) {
+    retry(env.MAX_REGISTRY_RETRIES) {
+        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_TLS_OPTIONS} ${fullImageName}"
     }
 }
 
@@ -375,7 +381,7 @@ void makeQuayImagesPublic() {
         String repository = getFinalImageName(imageName)
         echo "Check and set public if needed Quay repository ${namespace}/${repository}"
         try {
-            cloud.makeQuayImagePublic(namespace, repository, getDeployQuayTokenCredentials())
+            cloud.makeQuayImagePublic(namespace, repository, [ usernamePassword: getDeployImageRegistryCredentials()])
         } catch (err) {
             echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
         }
@@ -399,12 +405,12 @@ void loginOpenshift() {
 void loginOpenshiftRegistry() {
     loginOpenshift()
     // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
-    sh "set +x && docker login -u anything -p \$(oc whoami -t) ${env.OPENSHIFT_REGISTRY}"
+    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_TLS_OPTIONS} ${env.OPENSHIFT_REGISTRY}"
 }
 
 void loginContainerRegistry(String registry, String credsId) {
     withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
-        sh "docker login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${registry}"
+        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_TLS_OPTIONS} ${registry}"
     }
 }
 
@@ -422,10 +428,6 @@ boolean isDeployImageInOpenshiftRegistry() {
     return params.IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getDeployQuayTokenCredentials() {
-    return params.QUAY_TOKEN_CREDENTIALS
-}
-
 String getDeployImageRegistryCredentials() {
     return params.IMAGE_REGISTRY_CREDENTIALS
 }
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 65bbc122e05..bc260afe970 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -136,7 +136,7 @@ pipeline {
                     dir(getRepoName()) {
                         pushImages()
 
-                        if (isQuayRegistry(getNewImageRegistry()) && getNewImageQuayTokenCredentials()) {
+                        if (isQuayRegistry(getNewImageRegistry())) {
                             makeQuayNewImagesPublic()
                         }
                     }
@@ -233,42 +233,58 @@ void clean() {
 }
 
 void cleanImages() {
-    sh 'podman rm -f \$(podman ps -a -q) || date'
-    sh 'podman rmi -f \$(podman images -q) || date'
+    sh "${env.CONTAINER_ENGINE} rm -f \$(${env.CONTAINER_ENGINE} ps -a -q) || date"
+    sh "${env.CONTAINER_ENGINE} rmi -f \$(${env.CONTAINER_ENGINE} images -q) || date"
 }
 
 void pullImages() {
     for (String imageName : getImages()) {
-        sh "podman pull ${getOldImageFullTag(imageName)}"
+        pullImage(getOldImageFullTag(imageName))
+    }
+}
+
+void pullImage(String fullImageName) {
+    retry(env.MAX_REGISTRY_RETRIES) {
+        sh "${env.CONTAINER_ENGINE} pull ${env.CONTAINER_TLS_OPTIONS} ${fullImageName}"
     }
 }
 
 void tagImages() {
     for (String imageName : getImages()) {
-        sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, getNewImageTag())}"
+        tagImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, getNewImageTag()))
         if (isDeployLatestTag()) {
-            sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, 'latest')}"
+            tagImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, 'latest'))
         }
         String reducedTag = getReducedTag()
-        if (reducedTag != '') {
-            sh "podman tag ${getOldImageFullTag(imageName)} ${getNewImageFullTag(imageName, reducedTag)}"
+        if (reducedTag) {
+            tagImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, reducedTag))
         }
     }
 }
 
+void tagImage(String oldImageName, String newImageName) {
+    sh "${env.CONTAINER_ENGINE} tag ${oldImageName} ${newImageName}"
+}
+
 void pushImages() {
     for (String imageName : getImages()) {
-        sh "podman push ${getNewImageFullTag(imageName, getNewImageTag())}"
+        pushImage(getNewImageFullTag(imageName, getNewImageTag()))
         if (isDeployLatestTag()) {
-            sh "podman push ${getNewImageFullTag(imageName, 'latest')}"
+            pushImage(getNewImageFullTag(imageName, 'latest'))
         }
         String reducedTag = getReducedTag()
-        if (reducedTag != '') {
-            sh "podman push ${getNewImageFullTag(imageName, reducedTag)}"
+        if (reducedTag) {
+            pushImage(getNewImageFullTag(imageName, reducedTag))
         }
     }
 }
 
+void pushImage(String fullImageName) {
+    retry(env.MAX_REGISTRY_RETRIES) {
+        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_TLS_OPTIONS} ${fullImageName}"
+    }
+}
+
 // Set images public on quay. Useful when new images are introduced.
 void makeQuayNewImagesPublic() {
     String namespace = getNewImageNamespace()
@@ -276,7 +292,7 @@ void makeQuayNewImagesPublic() {
         String repository = getFinalImageName(imageName, getNewImageNameSuffix())
         echo "Check and set public if needed Quay repository ${namespace}/${repository}"
         try {
-            cloud.makeQuayImagePublic(namespace, repository, getNewImageQuayTokenCredentials())
+            cloud.makeQuayImagePublic(namespace, repository, [ usernamePassword: getNewImageRegistryCredentials()])
         } catch (err) {
             echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
         }
@@ -319,12 +335,12 @@ void loginOpenshift() {
 void loginOpenshiftRegistry() {
     loginOpenshift()
     // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
-    sh "set +x && podman login -u anything -p \$(oc whoami -t) --tls-verify=false ${env.OPENSHIFT_REGISTRY}"
+    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_TLS_OPTIONS} ${env.OPENSHIFT_REGISTRY}"
 }
 
 void loginContainerRegistry(String registry, String credsId) {
     withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
-        sh "podman login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} --tls-verify=false ${registry}"
+        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_TLS_OPTIONS} ${registry}"
     }
 }
 void readDeployProperties() {
@@ -460,10 +476,6 @@ boolean isNewImageInOpenshiftRegistry() {
     return params.PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getNewImageQuayTokenCredentials() {
-    return params.PROMOTE_QUAY_TOKEN_CREDENTIALS
-}
-
 String getNewImageRegistryCredentials() {
     return params.PROMOTE_IMAGE_REGISTRY_CREDENTIALS
 }

From 35ec42b12e15b1ebff8a5f06a2d26848560ed244 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 9 Mar 2021 19:52:41 -0300
Subject: [PATCH 251/709] [KOGITO-4503] - Update to Quarkus 1.12 on artifacts
 broke the images (#378)

* [KOGITO-4503] - Update to Quarkus 1.12 on artifacts broke the images

Signed-off-by: spolti <fspolti@redhat.com>

* Update tests/features/kogito-builder.feature

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* [KOGITO-4503] - Update to Quarkus 1.12 on artifacts broke the images

Signed-off-by: spolti <fspolti@redhat.com>

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 .../kogito-builder/added/kogito-app-launch.sh | 24 +++---
 .../added/kogito-app-launch.sh                | 14 ++--
 modules/kogito-s2i-core/added/s2i-core        | 47 +++++++----
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 79 +++++++++++++++++--
 tests/features/kogito-builder.feature         | 24 +++---
 tests/features/kogito-runtime-jvm.feature     |  5 +-
 6 files changed, 142 insertions(+), 51 deletions(-)

diff --git a/modules/kogito-builder/added/kogito-app-launch.sh b/modules/kogito-builder/added/kogito-app-launch.sh
index 187f985e4ab..198076f3471 100644
--- a/modules/kogito-builder/added/kogito-app-launch.sh
+++ b/modules/kogito-builder/added/kogito-app-launch.sh
@@ -26,21 +26,21 @@ runtime_type=$(get_runtime_type)
 
 case ${runtime_type} in 
     "quarkus")  
-                if [ "${NATIVE^^}" == "TRUE" ]; then
-                    # shellcheck disable=SC2086
-                    exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
-                    -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
-                    -Dquarkus.http.port=8080 \
-                    -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
-                else
+        if [ "${NATIVE^^}" == "TRUE" ]; then
+            # shellcheck disable=SC2086
+            exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
+                -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
+                -Dquarkus.http.port=8080 \
+                -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
+        else
         # shellcheck disable=SC2086
-                    exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar "${KOGITO_HOME}"/bin/*runner.jar
-                fi
+            exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
+        fi
     ;;
     "springboot") # shellcheck disable=SC2086
-                exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
+        exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
     ;;
     *)
-                log_error "${runtime_type} is not supported."
-                exit 1
+        log_error "${runtime_type} is not supported."
+        exit 1
 esac
\ No newline at end of file
diff --git a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
index b3a7f9f2b91..c28c38ef77f 100644
--- a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
+++ b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
@@ -28,15 +28,15 @@ runtime_type=$(get_runtime_type)
 # shellcheck disable=SC2086
 case ${runtime_type} in 
     "quarkus") 
-            exec java ${JAVA_OPTIONS}  ${KOGITO_QUARKUS_JVM_PROPS} \
-                -Dquarkus.http.host=0.0.0.0 \
-                -Dquarkus.http.port=8080 \
-                -jar "${KOGITO_HOME}"/bin/*runner.jar
+        exec java ${JAVA_OPTIONS}  ${KOGITO_QUARKUS_JVM_PROPS} \
+            -Dquarkus.http.host=0.0.0.0 \
+            -Dquarkus.http.port=8080 \
+            -jar "${KOGITO_HOME}"/bin/*.jar
     ;;
     "springboot") 
-            exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
+        exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
     ;;
     *)
-            log_error "${runtime_type} is not supported."
-            exit 1
+        log_error "${runtime_type} is not supported."
+        exit 1
 esac
\ No newline at end of file
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 2f2c46ae48a..3d3bbe87adc 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -42,10 +42,10 @@ function assemble_runtime() {
 function runtime_assemble() {
     log_info "-----> [s2i-core] Running runtime assemble script"
     cd ${S2I_DESTINATION_DIR}/src
-    if [ "${BINARY_BUILD^^}" == "TRUE" ] || ls | grep -E '*.jar|classes|maven*|*-runner|target' 1> /dev/null 2>&1; then
+    if [ "${BINARY_BUILD^^}" == "TRUE" ] || ls | grep -E '*.jar|classes|maven*|*-runner|target|quarkus-app' 1> /dev/null 2>&1; then
         log_info "-----> Binary build enabled, artifacts were uploaded directly to the image build"
         if ls target 1> /dev/null 2>&1; then
-            log_info "-----> Entire target dir uploaded"
+            log_info "-----> Entire target dir uploaded."
             cd "target"    
         fi
 
@@ -53,12 +53,18 @@ function runtime_assemble() {
         if [ "$result" == "application/x-executable" ]; then
             log_info "-----> Found binary file, native build."
             NATIVE="TRUE"
+
         else
             if ls | grep -E '*-runner.jar' 1> /dev/null 2>&1;then
-                log_info "-----> Found jar file, not native build."
+                log_info "-----> Found Quarkus runner.jar file, not native build."
+                NATIVE="FALSE"
+
+            elif ls | grep -E 'quarkus-app/*-run.jar' 1> /dev/null 2>&1;then
+                log_info "-----> Found Quarkus app.jar file, not native build."
                 NATIVE="FALSE"
             fi
         fi
+
         log_info "-----> Cleaning up unneeded jar files"
         rm -rfv *-tests.jar
         rm -rfv *-sources.jar
@@ -90,19 +96,19 @@ function build_kogito_app() {
     fi
 
     if [ -f "pom.xml" ]; then
-
         log_info "---> Building application from source..."
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \
             -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
             -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 
     else
-
         local ARCHETYPE_ARTIFACT_ID
         if [ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]; then
             ARCHETYPE_ARTIFACT_ID='kogito-quarkus-archetype'
+
         elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
             ARCHETYPE_ARTIFACT_ID="kogito-springboot-archetype"
+
         else
             log_error "---> Invalid RUNTIME_TYPE(${RUNTIME_TYPE}) provided, failing build..."
             exit 1
@@ -110,8 +116,8 @@ function build_kogito_app() {
 
         log_info "---> Generating $RUNTIME_TYPE project structure..."
         $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=$ARCHETYPE_ARTIFACT_ID \
-        -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
-        ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml
+            -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
+            ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml
 
         # remove resources generated by the archetype
         log_info "--> Remove archetype generated resources"
@@ -142,23 +148,31 @@ function build_kogito_app() {
 function copy_kogito_app() {
 
     if [ "${NATIVE^^}" == "TRUE" ]; then
-      if ls $artifactDir/*-runner 1> /dev/null 2>&1; then
-        # quarkus native builds
-        log_info "---> Installing application binaries"
-        cp -v $artifactDir/*-runner "${KOGITO_HOME}"/bin/
-        chmod +x "${KOGITO_HOME}"/bin/*-runner
-      fi
+        if ls $artifactDir/*-runner 1> /dev/null 2>&1; then
+            # quarkus native build binary
+            log_info "---> Installing native application binaries"
+            cp -v $artifactDir/*-runner "${KOGITO_HOME}"/bin/
+            chmod +x "${KOGITO_HOME}"/bin/*-runner
+        fi
+
     elif ls $artifactDir/*-runner.jar 1> /dev/null 2>&1; then
-      # handle quarkus java build
-        log_info "---> Installing jar file"
+        # handle quarkus build files
+        log_info "---> Installing runner jar file"
         cp -v $artifactDir/*-runner.jar "${KOGITO_HOME}"/bin
         if [ -d "${artifactDir}/lib" ]; then
             log_info "---> Copying application libraries"
             cp -r $artifactDir/lib/ "${KOGITO_HOME}"/bin
         fi
+
+    elif ls $artifactDir/quarkus-app/*-run.jar 1> /dev/null 2>&1; then
+        # handle quarkus 1.12+ build files
+        log_info "---> Installing Quarkus 1.12+ Application files"
+        # copy everything that resides on quarkus-app directory
+        cp -rv $artifactDir/quarkus-app/* "${KOGITO_HOME}"/bin
+
     else
         # handle normal java builds
-        log_info "---> Installing application binaries"
+        log_info "---> Installing common application binaries"
         cp -v $artifactDir/*.jar "${KOGITO_HOME}"/bin
     fi
 }
@@ -170,6 +184,7 @@ function get_runtime_type() {
     if [[ ! "${allowed_runtime_values[*]}" =~ ${RUNTIME_TYPE} ]]; then
         log_warning "RUNTIME_TYPE ${RUNTIME_TYPE} is not allowed, the allowed types are [${allowed_runtime_values[*]}]. Application might fail"
     fi
+
     log_info "---> Setting RUNTIME_TYPE to ${runtime_type}"
     echo "${runtime_type}"
 }
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 8866d649dd0..9adc3d30b9e 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -88,6 +88,40 @@ teardown() {
     [ "${lines[5]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
 }
 
+
+@test "test runtime_assemble with binary builds with new Quarkus 1.12+ default builds" {
+    mkdir -p "${KOGITO_HOME}"/bin
+    # emulating an upload
+    mkdir -p /tmp/src/quarkus-app/{app,quarkus}
+    mkdir -p /tmp/src/quarkus-app/lib/{boot,main}
+
+    touch /tmp/src/quarkus-app/my-app-run.jar
+
+    touch /tmp/src/quarkus-app/lib/boot/my-boot-dependency-1.0.jar
+    touch /tmp/src/quarkus-app/lib/main/my-main-dependency-1.0.jar
+
+    touch /tmp/src/quarkus-app/quarkus/{generated-bytecode.jar,quarkus-application.dat}
+
+    touch /tmp/src/quarkus-app/app/my-1.0.jar
+
+    run runtime_assemble
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[5]}" = "'./quarkus-app/app' -> '/tmp/kogito_home/bin/app'" ]
+    [ "${lines[6]}" = "'./quarkus-app/app/my-1.0.jar' -> '/tmp/kogito_home/bin/app/my-1.0.jar'" ]
+    [ "${lines[7]}" = "'./quarkus-app/lib' -> '/tmp/kogito_home/bin/lib'" ]
+    [ "${lines[8]}" = "'./quarkus-app/lib/boot' -> '/tmp/kogito_home/bin/lib/boot'" ]
+    [ "${lines[9]}" = "'./quarkus-app/lib/boot/my-boot-dependency-1.0.jar' -> '/tmp/kogito_home/bin/lib/boot/my-boot-dependency-1.0.jar'" ]
+    [ "${lines[10]}" = "'./quarkus-app/lib/main' -> '/tmp/kogito_home/bin/lib/main'" ]
+    [ "${lines[11]}" = "'./quarkus-app/lib/main/my-main-dependency-1.0.jar' -> '/tmp/kogito_home/bin/lib/main/my-main-dependency-1.0.jar'" ]
+    [ "${lines[12]}" = "'./quarkus-app/my-app-run.jar' -> '/tmp/kogito_home/bin/my-app-run.jar'" ]
+    [ "${lines[13]}" = "'./quarkus-app/quarkus' -> '/tmp/kogito_home/bin/quarkus'" ]
+    [ "${lines[14]}" = "'./quarkus-app/quarkus/generated-bytecode.jar' -> '/tmp/kogito_home/bin/quarkus/generated-bytecode.jar'" ]
+    [ "${lines[15]}" = "'./quarkus-app/quarkus/quarkus-application.dat' -> '/tmp/kogito_home/bin/quarkus/quarkus-application.dat'" ]
+}
+
+
 @test "test runtime_assemble with binary builds native binary" {
     mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
@@ -121,6 +155,41 @@ teardown() {
     [ "${lines[7]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
 }
 
+
+@test "test runtime_assemble with binary builds entire target with new Quarkus 1.12+ default builds" {
+    mkdir -p "${KOGITO_HOME}"/bin
+    # emulating an upload
+    mkdir -p /tmp/src/target/quarkus-app/{app,quarkus}
+    mkdir -p /tmp/src/target/quarkus-app/lib/{boot,main}
+
+    touch /tmp/src/target/quarkus-app/my-app-run.jar
+
+    touch /tmp/src/target/quarkus-app/lib/boot/my-boot-dependency-1.0.jar
+    touch /tmp/src/target/quarkus-app/lib/main/my-main-dependency-1.0.jar
+
+    touch /tmp/src/target/quarkus-app/quarkus/{generated-bytecode.jar,quarkus-application.dat}
+
+    touch /tmp/src/target/quarkus-app/app/my-1.0.jar
+
+    run runtime_assemble
+
+    echo "result= ${lines[@]}"
+    [ "$status" -eq 0 ]
+    [ "${lines[6]}" = "'./quarkus-app/app' -> '/tmp/kogito_home/bin/app'" ]
+    [ "${lines[7]}" = "'./quarkus-app/app/my-1.0.jar' -> '/tmp/kogito_home/bin/app/my-1.0.jar'" ]
+    [ "${lines[8]}" = "'./quarkus-app/lib' -> '/tmp/kogito_home/bin/lib'" ]
+    [ "${lines[9]}" = "'./quarkus-app/lib/boot' -> '/tmp/kogito_home/bin/lib/boot'" ]
+    [ "${lines[10]}" = "'./quarkus-app/lib/boot/my-boot-dependency-1.0.jar' -> '/tmp/kogito_home/bin/lib/boot/my-boot-dependency-1.0.jar'" ]
+    [ "${lines[11]}" = "'./quarkus-app/lib/main' -> '/tmp/kogito_home/bin/lib/main'" ]
+    [ "${lines[12]}" = "'./quarkus-app/lib/main/my-main-dependency-1.0.jar' -> '/tmp/kogito_home/bin/lib/main/my-main-dependency-1.0.jar'" ]
+    [ "${lines[13]}" = "'./quarkus-app/my-app-run.jar' -> '/tmp/kogito_home/bin/my-app-run.jar'" ]
+    [ "${lines[14]}" = "'./quarkus-app/quarkus' -> '/tmp/kogito_home/bin/quarkus'" ]
+    [ "${lines[15]}" = "'./quarkus-app/quarkus/generated-bytecode.jar' -> '/tmp/kogito_home/bin/quarkus/generated-bytecode.jar'" ]
+    [ "${lines[16]}" = "'./quarkus-app/quarkus/quarkus-application.dat' -> '/tmp/kogito_home/bin/quarkus/quarkus-application.dat'" ]
+}
+
+
+
 # Check that the irrelevant binaries are excluded
 @test "test runtime_assemble with binary builds entire target SpringBoot build" {
     mkdir -p "${KOGITO_HOME}"/bin
@@ -222,7 +291,7 @@ teardown() {
     echo "result= ${lines[@]}"
     echo "status= $status"
     [ "$status" -eq 1 ]
-    [ "${lines[0]}" = "---> Installing application binaries" ]
+    [ "${lines[0]}" = "---> Installing common application binaries" ]
     [ "${lines[1]}" = "cp: cannot stat 'target/*.jar': No such file or directory" ]
 }
 
@@ -235,7 +304,7 @@ teardown() {
     echo "result= ${lines[@]}"
     echo "status= $status"
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Installing application binaries" ]
+    [ "${lines[0]}" = "---> Installing common application binaries" ]
     [ "${lines[1]}" = "'target/app.jar' -> '"${KOGITO_HOME}"/bin'" ]
 }
 
@@ -254,7 +323,7 @@ teardown() {
     echo "status= $status"
 
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Installing jar file" ]
+    [ "${lines[0]}" = "---> Installing runner jar file" ]
     [ "${lines[1]}" = "'target/app-runner.jar' -> '"${KOGITO_HOME}"/bin/app-runner.jar'" ]
     [ "${lines[2]}" = "---> Copying application libraries" ]
 }
@@ -271,7 +340,7 @@ teardown() {
     echo "status= $status"
 
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Installing jar file" ]
+    [ "${lines[0]}" = "---> Installing runner jar file" ]
     [ "${lines[1]}" = "'target/app-runner.jar' -> '"${KOGITO_HOME}"/bin/app-runner.jar'" ]
 }
 
@@ -290,7 +359,7 @@ teardown() {
     echo "status= $status"
 
     [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Installing application binaries" ]
+    [ "${lines[0]}" = "---> Installing native application binaries" ]
     [ "${lines[1]}" = "'target/app-runner' -> '"${KOGITO_HOME}"/bin/app-runner'" ]
 }
 
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 287f0a88986..2037dca1b71 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -55,7 +55,7 @@ Feature: kogito-builder image tests
       | request_body    | {"strings":["hello"]} |
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/bin/quarkus-run.jar should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
 
@@ -72,7 +72,7 @@ Feature: kogito-builder image tests
       | request_body    | {"strings":["hello"]} |
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/bin/quarkus-run.jar should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
 
@@ -91,7 +91,7 @@ Feature: kogito-builder image tests
       | request_body    | {"strings":["hello"]} |
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/bin/quarkus-run.jar should exist
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
@@ -109,7 +109,7 @@ Feature: kogito-builder image tests
       | request_body    | {"strings":["hello"]} |
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
     Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
@@ -134,7 +134,7 @@ Feature: kogito-builder image tests
       | NATIVE            | false         |
       | RUNTIME_TYPE      | quarkus       |
       | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/process-quarkus-example-runner.jar should exist
+    Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
@@ -167,7 +167,7 @@ Feature: kogito-builder image tests
       | request_body    | {"strings":["hello"]} |
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
@@ -194,7 +194,7 @@ Feature: kogito-builder image tests
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
     Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/bin/quarkus-run.jar should exist
     And check that page is served
       | property        | value                 |
       | port            | 8080                  |
@@ -213,7 +213,7 @@ Feature: kogito-builder image tests
       | NATIVE       | false   |
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/bin/quarkus-run.jar should exist
     And check that page is served
       | property        | value                 |
       | port            | 8080                  |
@@ -434,7 +434,13 @@ Feature: kogito-builder image tests
     Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |
-      | RUNTIME_TYPE   | springboot     |  
+      | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
 
 
+  Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value                           |
+      | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
+      | RUNTIME_TYPE      | quarkus                         |
+    Then file /home/kogito/bin/process-quarkus-example-runner.jar should exist
diff --git a/tests/features/kogito-runtime-jvm.feature b/tests/features/kogito-runtime-jvm.feature
index 85c7b0cd4bc..7f22bf84dae 100644
--- a/tests/features/kogito-runtime-jvm.feature
+++ b/tests/features/kogito-runtime-jvm.feature
@@ -33,7 +33,7 @@ Feature: kogito-runtime-jvm feature.
       | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
       | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
@@ -51,7 +51,7 @@ Feature: kogito-runtime-jvm feature.
       | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
       | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner.jar should exist
+    And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
     Given s2i build /tmp/kogito-examples/process-springboot-example from target
@@ -89,3 +89,4 @@ Feature: kogito-runtime-jvm feature.
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+

From 7056d6185711d603e1a32cc326feaa163ba91d8e Mon Sep 17 00:00:00 2001
From: Jacopo Rota <jacopo.r00ta@gmail.com>
Date: Wed, 10 Mar 2021 14:55:41 +0100
Subject: [PATCH 252/709] KOGITO-4091 - Add trusty infinispan and redis images
 (#305)

* add trusty infinispan and redis images

* fix typo

* fix typo

* remove duplicated basic usage

* add redis env var

* update trusty infinispan/redis artifacts

* remove kogito-trusty-overrides

* update imagestream with new images and tests

* fix tests

* add env vars to infinispan images

* add bats tests

* fix bats
---
 Jenkinsfile.deploy                            |  3 +-
 Jenkinsfile.promote                           |  3 +-
 README.md                                     | 33 ++++++++---
 kogito-data-index-infinispan-overrides.yaml   | 18 ++++++
 kogito-imagestream.yaml                       | 31 ++++++++--
 kogito-trusty-infinispan-overrides.yaml       | 58 +++++++++++++++++++
 ...yaml => kogito-trusty-redis-overrides.yaml | 17 +++---
 .../added/launch/kogito-trusty.sh             |  0
 modules/kogito-trusty-common/configure        | 10 ++++
 modules/kogito-trusty-common/module.yaml      |  7 +++
 .../tests/bats/kogito-trusty-common.bats}     |  1 -
 .../added/kogito-app-launch.sh                | 27 +++++++++
 modules/kogito-trusty-infinispan/configure    | 11 ++++
 modules/kogito-trusty-infinispan/module.yaml  | 12 ++++
 .../added/kogito-app-launch.sh                |  2 +-
 modules/kogito-trusty-redis/configure         | 11 ++++
 modules/kogito-trusty-redis/module.yaml       | 12 ++++
 modules/kogito-trusty/configure               | 16 -----
 modules/kogito-trusty/module.yaml             | 12 ----
 scripts/README.md                             |  3 +-
 scripts/common.py                             |  3 +-
 scripts/run-bats.sh                           |  4 +-
 scripts/update-maven-artifacts.py             |  3 +-
 tests/features/common.feature                 |  2 +-
 .../trusty/kogito-trusty-common.feature       |  7 +++
 .../kogito-trusty-infinispan.feature}         | 20 +++----
 .../trusty/kogito-trusty-redis.feature        | 23 ++++++++
 27 files changed, 277 insertions(+), 72 deletions(-)
 create mode 100644 kogito-trusty-infinispan-overrides.yaml
 rename kogito-trusty-overrides.yaml => kogito-trusty-redis-overrides.yaml (60%)
 rename modules/{kogito-trusty => kogito-trusty-common}/added/launch/kogito-trusty.sh (100%)
 create mode 100644 modules/kogito-trusty-common/configure
 create mode 100644 modules/kogito-trusty-common/module.yaml
 rename modules/{kogito-trusty/tests/bats/kogito-trusty.bats => kogito-trusty-common/tests/bats/kogito-trusty-common.bats} (99%)
 create mode 100644 modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-trusty-infinispan/configure
 create mode 100644 modules/kogito-trusty-infinispan/module.yaml
 rename modules/{kogito-trusty => kogito-trusty-redis}/added/kogito-app-launch.sh (93%)
 create mode 100644 modules/kogito-trusty-redis/configure
 create mode 100644 modules/kogito-trusty-redis/module.yaml
 delete mode 100644 modules/kogito-trusty/configure
 delete mode 100644 modules/kogito-trusty/module.yaml
 create mode 100644 tests/features/trusty/kogito-trusty-common.feature
 rename tests/features/{kogito-trusty.feature => trusty/kogito-trusty-infinispan.feature} (75%)
 create mode 100644 tests/features/trusty/kogito-trusty-redis.feature

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index f4ec1e46259..1f874f5f9da 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -116,7 +116,8 @@ pipeline {
                     // Debug purpose in case of issue
                     sh 'cat modules/kogito-data-index-infinispan/module.yaml'
                     sh 'cat modules/kogito-data-index-mongodb/module.yaml'
-                    sh 'cat modules/kogito-trusty/module.yaml'
+                    sh 'cat modules/kogito-trusty-infinispan/module.yaml'
+                    sh 'cat modules/kogito-trusty-redis/module.yaml'
                     sh 'cat modules/kogito-explainability/module.yaml'
                     sh 'cat modules/kogito-jobs-service/module.yaml'
                     sh 'cat modules/kogito-management-console/module.yaml'
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index bc260afe970..db605859c17 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -80,7 +80,8 @@ pipeline {
                         // Debug purpose in case of issue
                         sh 'cat modules/kogito-data-index-infinispan/module.yaml'
                         sh 'cat modules/kogito-data-index-mongodb/module.yaml'
-                        sh 'cat modules/kogito-trusty/module.yaml'
+                        sh 'cat modules/kogito-trusty-infinispan/module.yaml'
+                        sh 'cat modules/kogito-trusty-redis/module.yaml'
                         sh 'cat modules/kogito-explainability/module.yaml'
                         sh 'cat modules/kogito-jobs-service/module.yaml'
                         sh 'cat modules/kogito-management-console/module.yaml'
diff --git a/README.md b/README.md
index fcef9bfd966..65d1005e36b 100644
--- a/README.md
+++ b/README.md
@@ -524,7 +524,8 @@ Today we have 3 Kogito Component Images:
 
 * [quay.io/kiegroup/kogito-data-index-infinispan](https://quay.io/kiegroup/kogito-data-index-infinispan)
 * [quay.io/kiegroup/kogito-data-index-mongodb](https://quay.io/kiegroup/kogito-data-index-mongodb)
-* [quay.io/kiegroup/kogito-trusty](https://quay.io/kiegroup/kogito-trusty)
+* [quay.io/kiegroup/kogito-trusty-infinispan](https://quay.io/kiegroup/kogito-trusty-infinispan)
+* [quay.io/kiegroup/kogito-trusty-redis](https://quay.io/kiegroup/kogito-trusty-redis)
 * [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
 * [quay.io/kiegroup/kogito-jobs-service](htps://quay.io/kiegroup/kogito-jobs-service)
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
@@ -591,12 +592,23 @@ to your Kogito infrastructure on a Kubernetes cluster and provide its capabiliti
 ### Kogito Trusty Component Image
 
 The Trusty Service aims at collecting tracing information by one or more Kogito runtime services and provides analytical capabilities on top of the collected data. 
-The Trusty Service depends on a running Infinispan Server.
+The Trusty Service depends on a running Infinispan or Redis Server.
+The Persistence service can be switched by using its corresponding image
 
+- Infinispan: quay.io/kiegroup/kogito-trusty-infinispan
+    [image.yaml](kogito-trusty-infinispan-overrides.yaml)
+- Redis: quay.io/kiegroup/kogito-trusty-redis
+    [image.yaml](kogito-trusty-redis-overrides.yaml)
 
-Basic usage
+
+Basic usage with Infinispan:
 ```bash
-$ docker run -it -e QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 -e KAFKA_BOOTSTRAP_SERVER=my-kafka:9092 quay.io/kiegroup/kogito-trusty:latest
+$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty-infinispan:latest
+```
+
+Basic usage with Redis:
+```bash
+$ docker run -it --env KOGITO_PERSISTENCE_REDIS_URL=redis://localhost:6379 quay.io/kiegroup/kogito-trusty-redis:latest
 ```
 
 To enable debug just use this env while running this image:
@@ -611,7 +623,6 @@ To know what configurations this image accepts please take a look [here](kogito-
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
-
 ### Kogito Jobs Service Component Image
 
 The Kogito Jobs Service is a dedicated lightweight service responsible for scheduling jobs that aim at firing at a given time. 
@@ -768,7 +779,8 @@ imagestream.image.openshift.io/kogito-runtime-jvm created
 imagestream.image.openshift.io/kogito-builder created
 imagestream.image.openshift.io/kogito-data-index-infinispan created
 imagestream.image.openshift.io/kogito-data-index-mongodb created
-imagestream.image.openshift.io/kogito-trusty created
+imagestream.image.openshift.io/kogito-trusty-infinispan created
+imagestream.image.openshift.io/kogito-trusty-redis created
 imagestream.image.openshift.io/kogito-jobs-service created
 imagestream.image.openshift.io/kogito-management-console created
 
@@ -954,7 +966,8 @@ With this Makefile you can:
      $ make build-image image_name=kogito-runtime-native
      $ make build-image image_name=kogito-data-index-infinispan
      $ make build-image image_name=kogito-data-index-mongodb
-     $ make build-image image_name=kogito-trusty
+     $ make build-image image_name=kogito-trusty-infinispan
+     $ make build-image image_name=kogito-trusty-redis
      $ make build-image image_name=kogito-explainability
      $ make build-image image_name=kogito-jobs-service 
      $ make build-image image_name=kogito-management-console
@@ -1017,7 +1030,8 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-data-index-common](modules/kogito-data-index-common): Data Index common module.
 - [kogito-data-index-infinispan](modules/kogito-data-index-infinispan): Installs and Configure the infinispan data-index jar inside the image.
 - [kogito-data-index-mongodb](modules/kogito-data-index-mongodb): Installs and Configure the mongodb data-index jar inside the image.
-- [kogito-trusty](modules/kogito-trusty): Installs and Configure the trusty jar inside the image.
+- [kogito-trusty-infinispan](modules/kogito-trusty-infinispan): Installs and Configure the infinispan trusty jar inside the image.
+- [kogito-trusty-redis](modules/kogito-trusty-redis): Installs and Configure the redis trusty jar inside the image.
 - [kogito-explainability](modules/kogito-explainability): Installs and Configure the explainability jar inside the image.
 - [kogito-epel](modules/kogito-epel): Configures the epel repository on the target image.
 - [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image.
@@ -1045,7 +1059,8 @@ Please inspect the images overrides files to learn which modules are installed o
 
 - [quay.io/kiegroup/kogito-data-index-infinispan](kogito-data-index-infinispan-overrides.yaml)
 - [quay.io/kiegroup/kogito-data-index-mongodb](kogito-data-index-mongodb-overrides.yaml)
-- [quay.io/kiegroup/kogito-trusty](kogito-trusty-overrides.yaml)
+- [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-overrides.yaml)
+- [quay.io/kiegroup/kogito-trusty-redis](kogito-trusty-redis-overrides.yaml)
 - [quay.io/kiegroup/kogito-explainability](kogito-explainability-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service](kogito-jobs-service-overrides.yaml)
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
diff --git a/kogito-data-index-infinispan-overrides.yaml b/kogito-data-index-infinispan-overrides.yaml
index 1773d301747..b8a18814447 100644
--- a/kogito-data-index-infinispan-overrides.yaml
+++ b/kogito-data-index-infinispan-overrides.yaml
@@ -17,6 +17,24 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "QUARKUS_INFINISPAN_CLIENT_SERVER_LIST"
+    example: "172.18.0.1:11222"
+    description: "Sets the host name/port to connect to. Each one is separated by a semicolon (eg. host1:11222;host2:11222)."
+  - name: "QUARKUS_INFINISPAN_CLIENT_USE_AUTH"
+    example: "true"
+    description: "Enables or disables authentication"
+  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME"
+    example: "myUsername"
+    description: "Sets user name used by authentication"
+  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD"
+    example: "hard2guess"
+    description: "Sets password used by authentication"
+  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_REALM"
+    example: "SecretRealm"
+    description: "Sets realm used by authentication"
+  - name: "QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM"
+    example: "COOLGSSAPI"
+    description: "Sets SASL mechanism used by authentication"
 
 ports:
 - value: 8080
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 44ba20c35ea..d06bbb2d1cf 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -114,24 +114,45 @@ items:
   - kind: ImageStream
     apiVersion: v1
     metadata:
-      name: kogito-trusty
+      name: kogito-trusty-infinispan
       annotations:
-        openshift.io/display-name: Runtime image for the Kogito Trusty Service
+        openshift.io/display-name: Runtime image for the Kogito Trusty Service for Infinispan persistence provider
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
         - name: '2.0.0-snapshot'
           annotations:
-            description: Runtime image for the Kogito Trusty Service
+            description: Runtime image for the Kogito Trusty Service with Infinispan
             iconClass: icon-jbpm
-            tags: kogito,trusty
+            tags: kogito,trusty,trusty-infinispan
             supports: persistence backed by Infinispan server
             version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-infinispan:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-trusty-redis
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Trusty Service for Redis persistence provider
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Runtime image for the Kogito Trusty Service with Redis
+            iconClass: icon-jbpm
+            tags: kogito,trusty,trusty-redis
+            supports: persistence backed by Redis server
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-trusty-redis:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-trusty-infinispan-overrides.yaml b/kogito-trusty-infinispan-overrides.yaml
new file mode 100644
index 00000000000..fc5b4a0c5f5
--- /dev/null
+++ b/kogito-trusty-infinispan-overrides.yaml
@@ -0,0 +1,58 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-trusty-infinispan"
+description: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
+
+labels:
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
+- name: "io.k8s.display-name"
+  value: "Kogito Trusty Service - Infinispan"
+- name: "io.openshift.tags"
+  value: "kogito,trusty,trusty-infinispan"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "QUARKUS_INFINISPAN_CLIENT_SERVER_LIST"
+    example: "172.18.0.1:11222"
+    description: "Sets the host name/port to connect to. Each one is separated by a semicolon (eg. host1:11222;host2:11222)."
+  - name: "QUARKUS_INFINISPAN_CLIENT_USE_AUTH"
+    example: "true"
+    description: "Enables or disables authentication"
+  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME"
+    example: "myUsername"
+    description: "Sets user name used by authentication"
+  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD"
+    example: "hard2guess"
+    description: "Sets password used by authentication"
+  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_REALM"
+    example: "SecretRealm"
+    description: "Sets realm used by authentication"
+  - name: "QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM"
+    example: "COOLGSSAPI"
+    description: "Sets SASL mechanism used by authentication"
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.trusty.infinispan
+  - name: org.kie.kogito.trusty.common
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/kogito-trusty-overrides.yaml b/kogito-trusty-redis-overrides.yaml
similarity index 60%
rename from kogito-trusty-overrides.yaml
rename to kogito-trusty-redis-overrides.yaml
index 6a2206755a0..172b6157134 100644
--- a/kogito-trusty-overrides.yaml
+++ b/kogito-trusty-redis-overrides.yaml
@@ -1,15 +1,15 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-trusty"
-description: "Runtime image for Kogito Trusty Service"
+name: "quay.io/kiegroup/kogito-trusty-redis"
+description: "Runtime image for Kogito Trusty Service for Redis persistence provider"
 
 labels:
 - name: "io.k8s.description"
-  value: "Runtime image for Kogito Trusty Service"
+  value: "Runtime image for Kogito Trusty Service for Redis persistence provider"
 - name: "io.k8s.display-name"
-  value: "Kogito Trusty Service"
+  value: "Kogito Trusty Service - Redis"
 - name: "io.openshift.tags"
-  value: "kogito,trusty"
+  value: "kogito,trusty,trusty-redis"
 - name: "io.openshift.expose-services"
   value: "8080:http"
 
@@ -17,7 +17,9 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-
+  - name: "KOGITO_PERSISTENCE_REDIS_URL"
+    example: "http://localhost:6379"
+    description: "The URL of the RediSearch cluster."
 ports:
 - value: 8080
 
@@ -29,7 +31,8 @@ modules:
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.trusty
+  - name: org.kie.kogito.trusty.redis
+  - name: org.kie.kogito.trusty.common
 
 run:
   workdir: "/home/kogito"
diff --git a/modules/kogito-trusty/added/launch/kogito-trusty.sh b/modules/kogito-trusty-common/added/launch/kogito-trusty.sh
similarity index 100%
rename from modules/kogito-trusty/added/launch/kogito-trusty.sh
rename to modules/kogito-trusty-common/added/launch/kogito-trusty.sh
diff --git a/modules/kogito-trusty-common/configure b/modules/kogito-trusty-common/configure
new file mode 100644
index 00000000000..01239faa1e4
--- /dev/null
+++ b/modules/kogito-trusty-common/configure
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
\ No newline at end of file
diff --git a/modules/kogito-trusty-common/module.yaml b/modules/kogito-trusty-common/module.yaml
new file mode 100644
index 00000000000..282ebc18185
--- /dev/null
+++ b/modules/kogito-trusty-common/module.yaml
@@ -0,0 +1,7 @@
+schema_version: 1
+name: org.kie.kogito.trusty.common
+version: "2.0.0-snapshot"
+description: "Common modules for trusty provider images, any addition that is common must be added in this module"
+
+execute:
+  - script: configure
diff --git a/modules/kogito-trusty/tests/bats/kogito-trusty.bats b/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats
similarity index 99%
rename from modules/kogito-trusty/tests/bats/kogito-trusty.bats
rename to modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats
index e66727f83a8..fc3ab97f23c 100644
--- a/modules/kogito-trusty/tests/bats/kogito-trusty.bats
+++ b/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats
@@ -12,7 +12,6 @@ teardown() {
     rm -rf "${KOGITO_HOME}"
 }
 
-
 @test "explainability is enabled by default" {
     enable_explainability
     expected=" -Dtrusty.explainability.enabled=true"
diff --git a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..07fde1c00ff
--- /dev/null
+++ b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  "${KOGITO_HOME}"/launch/kogito-trusty.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
+        -jar "${KOGITO_HOME}"/bin/trusty-service-infinispan.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/configure b/modules/kogito-trusty-infinispan/configure
new file mode 100644
index 00000000000..5dd0478c97a
--- /dev/null
+++ b/modules/kogito-trusty-infinispan/configure
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v "${SOURCES_DIR}"/trusty-service-infinispan.jar "${KOGITO_HOME}"/bin/
+
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
new file mode 100644
index 00000000000..27e62c9fc6a
--- /dev/null
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.trusty.infinispan
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: trusty-service-infinispan.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210222.153023-1-runner.jar
+    md5: a95c3ca2072a61f69878cd2284c5841e
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-trusty/added/kogito-app-launch.sh b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
similarity index 93%
rename from modules/kogito-trusty/added/kogito-app-launch.sh
rename to modules/kogito-trusty-redis/added/kogito-app-launch.sh
index 0876b7b6425..2a0a665d566 100644
--- a/modules/kogito-trusty/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
@@ -24,4 +24,4 @@ exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/kogito-trusty-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/trusty-service-redis.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-redis/configure b/modules/kogito-trusty-redis/configure
new file mode 100644
index 00000000000..004ec659b79
--- /dev/null
+++ b/modules/kogito-trusty-redis/configure
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v "${SOURCES_DIR}"/trusty-service-redis.jar "${KOGITO_HOME}"/bin/
+
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
new file mode 100644
index 00000000000..9f7eaf8e8cd
--- /dev/null
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.trusty.redis
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: trusty-service-redis.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210222.153055-1-runner.jar
+    md5: bd2ddeddf038774c02b0c99d0dd70604
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-trusty/configure b/modules/kogito-trusty/configure
deleted file mode 100644
index 7a940cb4f37..00000000000
--- a/modules/kogito-trusty/configure
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-cp -v ${SOURCES_DIR}/kogito-trusty-runner.jar "${KOGITO_HOME}"/bin/
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-trusty/module.yaml b/modules/kogito-trusty/module.yaml
deleted file mode 100644
index 46b66bdf33e..00000000000
--- a/modules/kogito-trusty/module.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.trusty
-version: "2.0.0-snapshot"
-
-artifacts:
-  - name: kogito-trusty-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service/2.0.0-SNAPSHOT/trusty-service-2.0.0-20210210.035118-76-runner.jar
-    md5: 0e6856c034583851a7fe64d37a4758d8
-
-execute:
-  - script: configure
-
diff --git a/scripts/README.md b/scripts/README.md
index e1f97c34ae5..8f94064b713 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -140,8 +140,9 @@ The command will update the needed files with the new URL:
 - kogito-jobs-service/module.yaml
 - kogito-management-console/module.yaml
 - kogito-trusty-ui/module.yaml
+- kogito-trusty-infinispan/module.yaml
+- kogito-trusty-redis/module.yaml
 - kogito-jit-runner/module.yaml
-- kogito-trusty/module.yaml
 - kogito-explainability/module.yaml
 
 ### Update tests script
diff --git a/scripts/common.py b/scripts/common.py
index 560352beb54..8f64fcb0719 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -9,7 +9,8 @@
 
 # All kogito-image modules that have the kogito version.
 MODULES = {"kogito-data-index-common", "kogito-data-index-mongodb",
-           "kogito-data-index-infinispan", "kogito-trusty",
+           "kogito-data-index-infinispan", "kogito-trusty-common",
+           "kogito-trusty-infinispan","kogito-trusty-redis",
            "kogito-explainability", "kogito-image-dependencies",
            "kogito-jobs-service", "kogito-trusty-ui",
            "kogito-jq", "kogito-kubernetes-client",
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 389d207a3ad..91af8c0157b 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -10,8 +10,8 @@ else
     rm -rf bats-core
 fi 
 
-echo  "----> running bats on kogito-trusty"
-./bats/bin/bats modules/kogito-trusty/tests/bats
+echo  "----> running bats on kogito-trusty-common"
+./bats/bin/bats modules/kogito-trusty-common/tests/bats
 
 echo "----> running bats on kogito-explainability"
 ./bats/bin/bats modules/kogito-explainability/tests/bats
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 87b7726556e..14a28a1ffcc 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -26,7 +26,8 @@
     #Note: Service name should be same as given in the repository
     "data-index-service-infinispan": "kogito-data-index-infinispan",
     "data-index-service-mongodb": "kogito-data-index-mongodb",
-    "trusty-service": "kogito-trusty",
+    "trusty-service-infinispan": "kogito-trusty-infinispan",
+    "trusty-service-redis": "kogito-trusty-redis",
     "explainability-service-rest": "kogito-explainability",
     "explainability-service-messaging": "kogito-explainability",
     "jobs-service": "kogito-jobs-service",
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 0ef97ebc409..6a573712371 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-jvm @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-trusty
+@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-jvm @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/trusty/kogito-trusty-common.feature b/tests/features/trusty/kogito-trusty-common.feature
new file mode 100644
index 00000000000..894631442c8
--- /dev/null
+++ b/tests/features/trusty/kogito-trusty-common.feature
@@ -0,0 +1,7 @@
+@quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis
+Feature: Kogito-trusty common feature.
+  Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
\ No newline at end of file
diff --git a/tests/features/kogito-trusty.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
similarity index 75%
rename from tests/features/kogito-trusty.feature
rename to tests/features/trusty/kogito-trusty-infinispan.feature
index 7221d081000..3e507b07bd8 100644
--- a/tests/features/kogito-trusty.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -1,5 +1,5 @@
-@quay.io/kiegroup/kogito-trusty
-Feature: Kogito-trusty feature.
+@quay.io/kiegroup/kogito-trusty-infinispan
+Feature: Kogito-trusty infinispan feature.
 
   Scenario: verify if all labels are correctly set.
     Given image is built
@@ -7,26 +7,20 @@ Feature: Kogito-trusty feature.
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service
-    And the image should contain label io.k8s.display-name with value Kogito Trusty Service
-    And the image should contain label io.openshift.tags with value kogito,trusty
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Infinispan persistence provider
+    And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Infinispan
+    And the image should contain label io.openshift.tags with value kogito,trusty,trusty-infinispan
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-trusty-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-trusty-runner.jar
-
-  Scenario: Verify if the debug is correctly enabled and test default http port
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-trusty-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/trusty-service-infinispan.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-infinispan.jar
 
   Scenario: Verify if the explainability messaging is disabled
     When container is started with env
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
       | EXPLAINABILITY_ENABLED     | false  |
-    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-trusty-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-service-infinispan.jar
 
   Scenario: verify if auth is correctly set
     When container is started with env
diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature
new file mode 100644
index 00000000000..6bcca7c1018
--- /dev/null
+++ b/tests/features/trusty/kogito-trusty-redis.feature
@@ -0,0 +1,23 @@
+@quay.io/kiegroup/kogito-trusty-redis
+Feature: Kogito-trusty redis feature.
+
+  Scenario: verify if all labels are correctly set.
+    Given image is built
+     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+      And the image should contain label io.openshift.s2i.destination with value /tmp
+      And the image should contain label io.openshift.expose-services with value 8080:http
+      And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Redis persistence provider
+      And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Redis
+      And the image should contain label io.openshift.tags with value kogito,trusty,trusty-redis
+
+  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/trusty-service-redis.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-redis.jar
+
+  Scenario: verify if all parameters are correctly set
+    When container is started with env
+      | variable                                   | value                       |
+      | SCRIPT_DEBUG                               | true                        |
+      | KOGITO_PERSISTENCE_REDIS_URL               | redis://127.0.0.1:6379      |
+    Then container log should contain KOGITO_PERSISTENCE_REDIS_URL=redis://127.0.0.1:6379
\ No newline at end of file

From 10140820322f3499aa9a41a3d065c8488b2d2f9d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 10 Mar 2021 13:49:43 -0300
Subject: [PATCH 253/709] Updated Maven artifacts (#382)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index acf55cc419c..e53df204ae8 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210210.034055-79-runner.jar
-    md5: 81b529d95f43b03b3499de899dac3b9a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210310.101152-101-runner.jar
+    md5: f0ecd3cbc41dfe5cebba11d8abe6f125
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 40895948507..9273e329f3e 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210210.034141-79-runner.jar
-    md5: 0c178908fc68a604dc66b33ea5a1f92e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210310.101237-101-runner.jar
+    md5: 284f62249866607efce25bd62baaa0a2
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index fad4e7555e0..9acc4e3f078 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210210.035005-79-runner.jar
-    md5: 75f2e9ee0a2822ca56b42c6dfb0a10e9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210310.102040-101-runner.jar
+    md5: 8a795dc728b82792dee213a2b7a891e5
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210210.034933-76-runner.jar
-    md5: 067074ee196f8aa7babbe0bb2fc1c996
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210310.102001-98-runner.jar
+    md5: e21461b8e1b061e638151bb118d560b5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index c817750a834..7b431d9639b 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210210.035216-21-runner.jar
-    md5: cc2f2f038fbcb036508f261488cadd09
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210310.102406-43-runner.jar
+    md5: 36e65f10032cb2c3e90d0d4d192162de
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index ded14e71def..5190dd95b60 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210210.033948-77-runner.jar
-    md5: 1c3859d68d908b7c0ce8b952465d7a75
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210310.101043-99-runner.jar
+    md5: 57051410edaf322a624e6f4bc79f7b67
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 71ca71158ea..2f2341079e2 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210210.034704-79-runner.jar
-    md5: f09afab2d48fd02ae2aed2037a9e00c5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210310.101709-101-runner.jar
+    md5: 7c06d58dce5e829ea5f9af5b61a6275c
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index c0d6c2cb662..15180a5b869 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210210.034803-79-runner.jar
-    md5: d4fbffaf866f7ef23602aac488359c57
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210310.101823-101-runner.jar
+    md5: ca0142ea2d0f8aa254fb4dc2a5cf8158
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 27e62c9fc6a..403dfe7e161 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210222.153023-1-runner.jar
-    md5: a95c3ca2072a61f69878cd2284c5841e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210310.102235-14-runner.jar
+    md5: 0d5d8f4889f138efcd7ad452196fccad
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 9f7eaf8e8cd..975ba5e437a 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210222.153055-1-runner.jar
-    md5: bd2ddeddf038774c02b0c99d0dd70604
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210310.102310-14-runner.jar
+    md5: f81c96dc58a5b4aa97b106f6734f2b23
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 367dad758b4..6095e6ec4a1 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210210.034733-79-runner.jar
-    md5: 9369d2f69084bf5ca5c6a21a12c6d92b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210310.101744-101-runner.jar
+    md5: cb02a6dfcb68351557bb152961ab5f9c
 
 execute:
   - script: configure

From 71cd50a787cecd56128626cfec5f84d566ee8ebc Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 11 Mar 2021 22:56:58 -0300
Subject: [PATCH 254/709] Updated Maven artifacts (#384)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index e53df204ae8..fec492c81ca 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210310.101152-101-runner.jar
-    md5: f0ecd3cbc41dfe5cebba11d8abe6f125
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210311.195214-103-runner.jar
+    md5: 1dc9a2fac36565e0ece255efb3c6aa4a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 9273e329f3e..799da99cdd6 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210310.101237-101-runner.jar
-    md5: 284f62249866607efce25bd62baaa0a2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210311.195302-103-runner.jar
+    md5: 6f7f732da92d7e417caca157e9fdcb08
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 9acc4e3f078..040a114012b 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210310.102040-101-runner.jar
-    md5: 8a795dc728b82792dee213a2b7a891e5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210311.200003-103-runner.jar
+    md5: 18a5fbf3ccdb4a36123f129ef834ad58
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210310.102001-98-runner.jar
-    md5: e21461b8e1b061e638151bb118d560b5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210311.195930-100-runner.jar
+    md5: 71bc74ad18950d65818c1d3f227ea121
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 7b431d9639b..1aa8cebc78a 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210310.102406-43-runner.jar
-    md5: 36e65f10032cb2c3e90d0d4d192162de
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210311.200306-45-runner.jar
+    md5: 94f530d274e0a0e879456b10873187ff
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 5190dd95b60..35ea313cd7b 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210310.101043-99-runner.jar
-    md5: 57051410edaf322a624e6f4bc79f7b67
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210311.195103-101-runner.jar
+    md5: 6e49b2268c57f85f7657c6448e9717e8
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 2f2341079e2..ab56973ad30 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210310.101709-101-runner.jar
-    md5: 7c06d58dce5e829ea5f9af5b61a6275c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210311.195701-103-runner.jar
+    md5: ede2af5ed6eff938a1e1230df5b74189
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 15180a5b869..159ac3cda01 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210310.101823-101-runner.jar
-    md5: ca0142ea2d0f8aa254fb4dc2a5cf8158
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210311.195805-103-runner.jar
+    md5: e96825665c3502276ff4b50b920ea374
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 403dfe7e161..b90e59dc5f5 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210310.102235-14-runner.jar
-    md5: 0d5d8f4889f138efcd7ad452196fccad
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210311.200141-16-runner.jar
+    md5: 306bbdd93bf0efe73e6258fa1fab0ab2
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 975ba5e437a..ad364fcc43a 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210310.102310-14-runner.jar
-    md5: f81c96dc58a5b4aa97b106f6734f2b23
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210311.200214-16-runner.jar
+    md5: 58b07fc7f81bd36904a5adf0ef9a8c59
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6095e6ec4a1..540e7fe2e24 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210310.101744-101-runner.jar
-    md5: cb02a6dfcb68351557bb152961ab5f9c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210311.195732-103-runner.jar
+    md5: e7db1befeba4b1fea410e17e5d813685
 
 execute:
   - script: configure

From f124e1163e60e5fd0cdac62563ffb61e2bc3d783 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 12 Mar 2021 14:50:28 -0300
Subject: [PATCH 255/709] Updated Maven artifacts (#385)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index fec492c81ca..88c779d30b3 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210311.195214-103-runner.jar
-    md5: 1dc9a2fac36565e0ece255efb3c6aa4a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210312.043916-104-runner.jar
+    md5: b0def6ffc5652cfc17d755b7ab30e354
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 799da99cdd6..135121d2cd7 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210311.195302-103-runner.jar
-    md5: 6f7f732da92d7e417caca157e9fdcb08
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210312.044010-104-runner.jar
+    md5: 448ef0cbe6298dab1adf4ff0b7e7d7ba
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 040a114012b..3e80ced1c0a 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210311.200003-103-runner.jar
-    md5: 18a5fbf3ccdb4a36123f129ef834ad58
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210312.044904-104-runner.jar
+    md5: 8062a194f778d8551969b3ef6f50687d
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210311.195930-100-runner.jar
-    md5: 71bc74ad18950d65818c1d3f227ea121
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210312.044828-101-runner.jar
+    md5: d2db7255230c07429a9b7d6959f5832a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 1aa8cebc78a..ef8efc91e88 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210311.200306-45-runner.jar
-    md5: 94f530d274e0a0e879456b10873187ff
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210312.045234-46-runner.jar
+    md5: 5d8578e13436ac55a35de4f2ea67fd49
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 35ea313cd7b..f670b4b2f9d 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210311.195103-101-runner.jar
-    md5: 6e49b2268c57f85f7657c6448e9717e8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210312.043755-102-runner.jar
+    md5: 34a821b917c0049f54d2b76e760b3149
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index ab56973ad30..8bf8eb84c9d 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210311.195701-103-runner.jar
-    md5: ede2af5ed6eff938a1e1230df5b74189
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210312.044539-104-runner.jar
+    md5: 1f921484a4abd91eee538a347616675c
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 159ac3cda01..b0f687b57df 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210311.195805-103-runner.jar
-    md5: e96825665c3502276ff4b50b920ea374
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210312.044651-104-runner.jar
+    md5: cef32bc7fc6a25a7c8998b138f51610c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index b90e59dc5f5..ea65a2a6be8 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210311.200141-16-runner.jar
-    md5: 306bbdd93bf0efe73e6258fa1fab0ab2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210312.045056-17-runner.jar
+    md5: 812639a05f8193648e6410938c113e03
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index ad364fcc43a..45d433b889b 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210311.200214-16-runner.jar
-    md5: 58b07fc7f81bd36904a5adf0ef9a8c59
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210312.045134-17-runner.jar
+    md5: 9e052ce50acd0e4d8955585c93a62969
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 540e7fe2e24..7885978f207 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210311.195732-103-runner.jar
-    md5: e7db1befeba4b1fea410e17e5d813685
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210312.044613-104-runner.jar
+    md5: bcf92dbddeb1a76c90b0010ee03bcc14
 
 execute:
   - script: configure

From 7aa55eae250bffa3ca4191d4cd65c0e354bf84c6 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 15 Mar 2021 11:30:43 -0300
Subject: [PATCH 256/709] Updated Maven artifacts (#390)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 88c779d30b3..a78bd1fcae8 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210312.043916-104-runner.jar
-    md5: b0def6ffc5652cfc17d755b7ab30e354
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210315.051109-109-runner.jar
+    md5: 555cfa4a609c0e29e344f9ecf5bc4e6b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 135121d2cd7..7bb31191eeb 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210312.044010-104-runner.jar
-    md5: 448ef0cbe6298dab1adf4ff0b7e7d7ba
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210315.051206-109-runner.jar
+    md5: daa871c1ac417b4362ab84b36754f6b6
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 3e80ced1c0a..1c374d66aec 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210312.044904-104-runner.jar
-    md5: 8062a194f778d8551969b3ef6f50687d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210315.052137-109-runner.jar
+    md5: 09f9f05bf3be6bfd21edbd94e7a3d309
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210312.044828-101-runner.jar
-    md5: d2db7255230c07429a9b7d6959f5832a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210315.052058-106-runner.jar
+    md5: e4b89882e9f1f114731af23408e738b4
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index ef8efc91e88..0dcaedc7d4d 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210312.045234-46-runner.jar
-    md5: 5d8578e13436ac55a35de4f2ea67fd49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210315.052539-51-runner.jar
+    md5: d9ccdaa93099ef525aebe961d0e496a3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index f670b4b2f9d..f96a602c9f9 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210312.043755-102-runner.jar
-    md5: 34a821b917c0049f54d2b76e760b3149
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210315.050943-107-runner.jar
+    md5: a7f7dadd00ebab4e26de830e6cd0a321
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 8bf8eb84c9d..0e443684e58 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210312.044539-104-runner.jar
-    md5: 1f921484a4abd91eee538a347616675c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210315.051802-109-runner.jar
+    md5: 1c068a74ad2747e1069ea5acee270b66
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index b0f687b57df..0a85a579eaa 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210312.044651-104-runner.jar
-    md5: cef32bc7fc6a25a7c8998b138f51610c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210315.051916-109-runner.jar
+    md5: d78abb1d0f2fb863fe6fb21ecfd76a62
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index ea65a2a6be8..c72e9e57925 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210312.045056-17-runner.jar
-    md5: 812639a05f8193648e6410938c113e03
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210315.052345-22-runner.jar
+    md5: f0746319e9425b73bb2899f1ed374566
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 45d433b889b..4fda0e38eb7 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210312.045134-17-runner.jar
-    md5: 9e052ce50acd0e4d8955585c93a62969
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210315.052428-22-runner.jar
+    md5: ac347638fdc53a222bede3ba21a1fcc1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 7885978f207..e98de76d34c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210312.044613-104-runner.jar
-    md5: bcf92dbddeb1a76c90b0010ee03bcc14
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210315.051837-109-runner.jar
+    md5: 23919df6fba3ee1185b9f3c810985498
 
 execute:
   - script: configure

From 7a398374c17c7c57f26026dadff1e3a53039f760 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:20:18 -0300
Subject: [PATCH 257/709] Updated Maven artifacts (#393)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index a78bd1fcae8..0e82e4c1a61 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210315.051109-109-runner.jar
-    md5: 555cfa4a609c0e29e344f9ecf5bc4e6b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210316.042447-110-runner.jar
+    md5: e54e67b67bf636d3c88cd615764ccdea
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 7bb31191eeb..f7659c13c07 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210315.051206-109-runner.jar
-    md5: daa871c1ac417b4362ab84b36754f6b6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210316.042537-110-runner.jar
+    md5: be7e8f8cfb11d23d167c282015e88bce
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 1c374d66aec..836736b4a43 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210315.052137-109-runner.jar
-    md5: 09f9f05bf3be6bfd21edbd94e7a3d309
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210316.043254-110-runner.jar
+    md5: e95c0a235a6bae14d285f8b55236dd54
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210315.052058-106-runner.jar
-    md5: e4b89882e9f1f114731af23408e738b4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210316.043221-107-runner.jar
+    md5: 784e7fab72a2bca2a57dca687b174817
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 0dcaedc7d4d..2dbd9724c97 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210315.052539-51-runner.jar
-    md5: d9ccdaa93099ef525aebe961d0e496a3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210316.043611-52-runner.jar
+    md5: 7a3e61694a16712d0b462bcb233b19f6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index f96a602c9f9..d3ae8d37c1b 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210315.050943-107-runner.jar
-    md5: a7f7dadd00ebab4e26de830e6cd0a321
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210316.042335-108-runner.jar
+    md5: 88454862a185091133c5a361012e1447
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 0e443684e58..3446ebc0273 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210315.051802-109-runner.jar
-    md5: 1c068a74ad2747e1069ea5acee270b66
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210316.042952-110-runner.jar
+    md5: c9fcf5c553d05e5eeccf684da5e86f9d
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 0a85a579eaa..862ff666519 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210315.051916-109-runner.jar
-    md5: d78abb1d0f2fb863fe6fb21ecfd76a62
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210316.043055-110-runner.jar
+    md5: 99960ef74b7be5f42d8b71f87b52e497
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index c72e9e57925..cb642e50a21 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210315.052345-22-runner.jar
-    md5: f0746319e9425b73bb2899f1ed374566
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210316.043433-23-runner.jar
+    md5: 7ba6c3c0429ce0e214e003155d97c93d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 4fda0e38eb7..326cc9a0b82 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210315.052428-22-runner.jar
-    md5: ac347638fdc53a222bede3ba21a1fcc1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210316.043511-23-runner.jar
+    md5: d42de4b08fd3e7f277059d5fe3abdc53
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index e98de76d34c..6d903a1b3ae 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210315.051837-109-runner.jar
-    md5: 23919df6fba3ee1185b9f3c810985498
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210316.043022-110-runner.jar
+    md5: b038f41be98a9757cd76b1e78a3a642d
 
 execute:
   - script: configure

From 666947d139be70c793ccec2e50e8ec8ef6a7c538 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 18 Mar 2021 15:03:22 +0100
Subject: [PATCH 258/709] KOGITO-4635 Allow to override the tag if exists
 (#398)

* KOGITO-4635 Allow to override the tag if exists

* correction

* update
---
 Jenkinsfile.promote | 55 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index db605859c17..7047574527e 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -153,20 +153,13 @@ pipeline {
                     dir(getRepoName()) {
                         // Merge PR
                         String prLink = getDeployProperty("${getRepoName()}.pr.link")
-                        if (prLink != '') {
+                        if (prLink) {
                             githubscm.mergePR(prLink, getGitAuthorCredsID())
                             githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
                         }
 
-                        if (getGitTag() != '') {
-                            def releaseName = "Kogito Images Version ${getProjectVersion()}"
-                            def description = params.RELEASE_NOTES != '' ? params.RELEASE_NOTES : "We are glad to announce that the Kogito ${getProjectVersion()} release is now available!"
-                            withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
-                                sh """
-                                    export GITHUB_USER=${getGitAuthor()}
-                                    github-release release --tag ${getGitTag()} --target '${getBuildBranch()}' --name '${releaseName}' --description '${description}' --pre-release
-                                """
-                            }
+                        if (getGitTag()) {
+                            createRelease()
                         }
                     }
                 }
@@ -201,7 +194,7 @@ pipeline {
                         prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
                     }
                     dir(getRepoName()) {
-                        if (prLink != '') {
+                        if (prLink) {
                             githubscm.mergePR(prLink, getGitAuthorCredsID())
                             githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
                         }
@@ -300,6 +293,46 @@ void makeQuayNewImagesPublic() {
     }
 }
 
+void createRelease() {
+    if (isReleaseExist()) {
+        deleteRelease()
+    }
+    
+    if (githubscm.isTagExist('origin', getGitTag())) {
+        githubscm.removeLocalTag(getGitTag())
+        githubscm.removeRemoteTag('origin', getGitTag(), getGitAuthorCredsID())
+    }
+    
+    def releaseName = "Kogito Images Version ${getProjectVersion()}"
+    def description = params.RELEASE_NOTES ?: "We are glad to announce that the Kogito ${getProjectVersion()} release is now available!"
+    withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
+        sh """
+            export GITHUB_USER=${getGitAuthor()}
+            github-release release --tag ${getGitTag()} --target '${getBuildBranch()}' --name '${releaseName}' --description '${description}' --pre-release
+        """
+    }
+}
+
+boolean isReleaseExist() {
+    releaseExistStatus = -1
+    withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
+        releaseExistStatus = sh(returnStatus: true, script: """
+            export GITHUB_USER=${getGitAuthor()}
+            github-release info --tag ${getGitTag()}
+        """)
+    }
+    return releaseExistStatus == 0
+}
+
+void deleteRelease() {
+    withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
+        sh """
+            export GITHUB_USER=${getGitAuthor()}
+            github-release delete --tag ${getGitTag()}
+        """
+    }
+}
+
 String getOldImageFullTag(String imageName) {
     return "${getOldImageRegistry()}/${getOldImageNamespace()}/${getFinalImageName(imageName, getOldImageNameSuffix())}:${getOldImageTag()}"
 }

From 4e1de0c858abf77cd886bccacafb0ffa097750e0 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 18 Mar 2021 12:31:43 -0300
Subject: [PATCH 259/709] Updated Maven artifacts (#400)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 0e82e4c1a61..78d5cccc855 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210316.042447-110-runner.jar
-    md5: e54e67b67bf636d3c88cd615764ccdea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210318.041146-111-runner.jar
+    md5: 8c958d84c5685ef1a5014537d8cb597a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index f7659c13c07..3c5ed3cc235 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210316.042537-110-runner.jar
-    md5: be7e8f8cfb11d23d167c282015e88bce
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210318.041230-111-runner.jar
+    md5: 4edbfdf7e8371c6ae51bb1a7dc7ed48d
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 836736b4a43..1e5671c8b87 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210316.043254-110-runner.jar
-    md5: e95c0a235a6bae14d285f8b55236dd54
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210318.042000-111-runner.jar
+    md5: 40fe4bbd9ab6e9266aca0560c3d49585
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210316.043221-107-runner.jar
-    md5: 784e7fab72a2bca2a57dca687b174817
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210318.041926-108-runner.jar
+    md5: 4f44fd0ca80b01941e00009b925514f7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 2dbd9724c97..09c3efbccbe 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210316.043611-52-runner.jar
-    md5: 7a3e61694a16712d0b462bcb233b19f6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210318.042319-53-runner.jar
+    md5: 80ef3579a5cf147d9f7836eacf5bb523
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index d3ae8d37c1b..b274dde9cff 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210316.042335-108-runner.jar
-    md5: 88454862a185091133c5a361012e1447
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210318.041041-109-runner.jar
+    md5: 89b2af6a2729e704634e6c7aaa117fe5
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 3446ebc0273..807c193f225 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210316.042952-110-runner.jar
-    md5: c9fcf5c553d05e5eeccf684da5e86f9d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210318.041655-111-runner.jar
+    md5: a37eab7609e04208f6697f4086d0298b
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 862ff666519..70ce3f6c45f 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210316.043055-110-runner.jar
-    md5: 99960ef74b7be5f42d8b71f87b52e497
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210318.041800-111-runner.jar
+    md5: 77092363714dae1bf1b91c973c0ff638
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index cb642e50a21..7e9552be435 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210316.043433-23-runner.jar
-    md5: 7ba6c3c0429ce0e214e003155d97c93d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210318.042140-24-runner.jar
+    md5: a3b49565bf81da6788ad307162abf434
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 326cc9a0b82..525d8300aef 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210316.043511-23-runner.jar
-    md5: d42de4b08fd3e7f277059d5fe3abdc53
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210318.042217-24-runner.jar
+    md5: 566e9f7fd40c965a7528f2cc58b74980
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6d903a1b3ae..d27a24451c8 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210316.043022-110-runner.jar
-    md5: b038f41be98a9757cd76b1e78a3a642d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210318.041726-111-runner.jar
+    md5: 4402eff369f864dc79f5941552fc7157
 
 execute:
   - script: configure

From 27b8e92732210e506391612c1287ce0e3b5a5d27 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 19 Mar 2021 14:18:49 -0300
Subject: [PATCH 260/709] [KOGITO-4619] - Prepare the kogito-images repository
 for productization (#383)

* [KOGITO-4619] - Prepare the kogito-images repository for productization

Signed-off-by: spolti <fspolti@redhat.com>

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
Co-authored-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
---
 .gitignore                                    |   3 +
 Makefile                                      |  23 +-
 container.yaml                                |   6 +
 content_sets.yaml                             |  16 +
 kogito-runtime-jvm-overrides.yaml             |   3 +-
 .../rhpam-kogito-builder-rhel8/gating.yaml    |   7 +
 .../gating.yaml                               |   7 +
 rhpam-kogito-builder-rhel8-overrides.yaml     |  25 +
 rhpam-kogito-imagestream.yaml                 |  50 ++
 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml |  25 +
 scripts/README.md                             |  60 ++-
 scripts/build-product-image.sh                |  40 ++
 scripts/common.py                             |  56 ++-
 scripts/list-images.py                        |  27 +-
 scripts/push-local-registry.sh                |   2 +-
 tests/features/common-build-runtime.feature   |   2 +-
 tests/features/common.feature                 |   3 +-
 .../kogito-data-index-infinispan.feature      |   2 +-
 .../kogito-data-index-mongodb.feature         |   2 +-
 tests/features/kogito-builder-native.feature  | 140 ++++++
 tests/features/kogito-builder.feature         | 435 +-----------------
 .../kogito-common-builder-jvm.feature         | 303 ++++++++++++
 .../kogito-common-runtime-jvm.feature         |  81 ++++
 tests/features/kogito-explainability.feature  |   2 +-
 tests/features/kogito-jit-runner.feature      |   2 +-
 tests/features/kogito-jobs-service.feature    |   2 +-
 .../kogito-management-console.feature         |   2 +-
 tests/features/kogito-runtime-jvm.feature     |  83 +---
 tests/features/kogito-runtime-native.feature  |   6 +-
 tests/features/kogito-task-console.feature    |   2 +-
 tests/features/kogito-trusty-ui.feature       |   2 +-
 .../features/rhpam-kogito-builder-jvm.feature |  13 +
 .../features/rhpam-kogito-runtime-jvm.feature |  16 +
 .../trusty/kogito-trusty-infinispan.feature   |   2 +-
 .../trusty/kogito-trusty-redis.feature        |   2 +-
 35 files changed, 883 insertions(+), 569 deletions(-)
 create mode 100644 container.yaml
 create mode 100644 content_sets.yaml
 create mode 100644 osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml
 create mode 100644 osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
 create mode 100644 rhpam-kogito-builder-rhel8-overrides.yaml
 create mode 100644 rhpam-kogito-imagestream.yaml
 create mode 100644 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
 create mode 100755 scripts/build-product-image.sh
 create mode 100644 tests/features/kogito-builder-native.feature
 create mode 100644 tests/features/kogito-common-builder-jvm.feature
 create mode 100644 tests/features/kogito-common-runtime-jvm.feature
 create mode 100644 tests/features/rhpam-kogito-builder-jvm.feature
 create mode 100644 tests/features/rhpam-kogito-runtime-jvm.feature

diff --git a/.gitignore b/.gitignore
index b424604e915..a4cd45c696d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@ bats/*
 *.db
 *.tlog
 
+# python
+scripts/__pycache__
+
diff --git a/Makefile b/Makefile
index 5d6efaa587a..bb8cdf8d124 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ endif
 
 .PHONY: list
 list:
-	@python3 scripts/list-images.py
+	@python3 scripts/list-images.py $(arg)
 
 # Build all images
 .PHONY: build
@@ -22,6 +22,7 @@ build: clone-repos _build
 _build:
 	@for f in $(shell make list); do make build-image image_name=$${f}; done
 
+
 .PHONY: build-image
 image_name=
 build-image:
@@ -36,6 +37,26 @@ ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
 endif
 
+
+# Build all images
+.PHONY: build-prod
+# start to build the images
+build-prod: clone-repos
+	@for iname in $(shell make list arg=--prod); do make build-prod-image image_name=$${iname} ; done
+
+
+.PHONY: build-prod-image
+image_name=
+build-prod-image:
+ifneq ($(ignore_build),true)
+	scripts/build-product-image.sh "build" $(image_name) ${BUILD_ENGINE}
+endif
+# if ignore_test is set to true, ignore the tests
+ifneq ($(ignore_test),true)
+	scripts/build-product-image.sh "test" $(image_name)
+endif
+
+
 # push images to quay.io, this requires permissions under kiegroup organization
 .PHONY: push
 push: build _push
diff --git a/container.yaml b/container.yaml
new file mode 100644
index 00000000000..2c58dce28ac
--- /dev/null
+++ b/container.yaml
@@ -0,0 +1,6 @@
+---
+platforms:
+  only:
+    - x86_64
+compose:
+  pulp_repos: true
diff --git a/content_sets.yaml b/content_sets.yaml
new file mode 100644
index 00000000000..7a619279b42
--- /dev/null
+++ b/content_sets.yaml
@@ -0,0 +1,16 @@
+# This is a file defining which content sets (yum repositories) are needed to
+# update content in this image. Data provided here helps determine which images
+# are vulnerable to specific CVEs. Generally you should only need to update this
+# file when:
+#    1. You start depending on a new product
+#    2. You are preparing new product release and your content sets will change
+#
+# See https://mojo.redhat.com/docs/DOC-1023066 for more information on
+# maintaining this file and the format and examples
+#
+# You should have one top level item for each architecture being built. Most
+# likely this will be x86_64 and ppc64le initially.
+---
+x86_64:
+  - rhel-8-for-x86_64-baseos-rpms
+  - rhel-8-for-x86_64-appstream-rpms
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index 0c79489a428..0b207c70c8f 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -9,7 +9,7 @@ labels:
 - name: "io.k8s.display-name"
   value: "Kogito based on Quarkus or Spring Boot JVM image"
 - name: "io.openshift.tags"
-  value: "builder,runtime,kogito,quarkus,springboot,jvm"
+  value: "runtime,kogito,quarkus,springboot,jvm"
 - name: "io.openshift.s2i.assemble-input-files"
   value: "/home/kogito/bin"
 
@@ -38,7 +38,6 @@ modules:
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.runtime.jvm
 
-
 ## s2i build . quay.io/kiegroup/kogito-builder:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
 run:
diff --git a/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml
new file mode 100644
index 00000000000..236bfdfb635
--- /dev/null
+++ b/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+id: "cvp-rhpam-kogito-builder"
+product_versions:
+  - cvp
+decision_context: cvp_default
+rules:
+  - !PassingTestCaseRule {test_case_name: rhpam-kogito-builder.openshift.external}
\ No newline at end of file
diff --git a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
new file mode 100644
index 00000000000..7f79b5ffb4d
--- /dev/null
+++ b/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+id: "cvp-rhpam-kogito-runtime-jvm"
+product_versions:
+  - cvp
+decision_context: cvp_default
+rules:
+  - !PassingTestCaseRule {test_case_name: rhpam-kieserver-kogito-runtime-jvm.openshift.external}
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
new file mode 100644
index 00000000000..42f11f3af7e
--- /dev/null
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -0,0 +1,25 @@
+schema_version: 1
+
+name: "rhpam-7/rhpam-kogito-builder-rhel8"
+version: "7.11.0"
+from: "registry.redhat.io/ubi8/ubi-minimal:latest"
+description: "RHPAM Platform for building Kogito based on Quarkus or SpringBoot"
+
+labels:
+  - name: "com.redhat.component"
+    value: "rhpam-7-kogito-runtime-jvm-rhel8-container"
+  - name: "io.k8s.display-name"
+    value: "Red Hat build of Kogito based on Quarkus or SpringBoot"
+  - name: "io.openshift.tags"
+    value: "rhpam-kogito,builder,kogito,quarkus,springboot"
+
+packages:
+  content_sets_file: content_sets.yaml
+
+osbs:
+  configuration:
+    container_file: container.yaml
+  extra_dir: osbs-extra/rhpam-kogito-builder-rhel8
+  repository:
+    name: containers/rhpam-7-kogito-builder
+    branch: rhba-7-rhel-8
diff --git a/rhpam-kogito-imagestream.yaml b/rhpam-kogito-imagestream.yaml
new file mode 100644
index 00000000000..1ce2e4b2e0a
--- /dev/null
+++ b/rhpam-kogito-imagestream.yaml
@@ -0,0 +1,50 @@
+kind: ImageStreamList
+apiVersion: v1
+metadata:
+  name: rhpam-kogito-image-streams
+  annotations:
+    description: ImageStream definitions for Red Hat build of Kogito images
+    openshift.io/provider-display-name: Kie Group.
+items:
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: rhpam-kogito-runtime-jvm-rhel8
+      annotations:
+        openshift.io/display-name: Runtime image for Kogito based on Quarkus or SpringBoot JVM image
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '7.11.0'
+          annotations:
+            description: Runtime image for Kogito based on Quarkus or SpringBoot JVM image
+            iconClass: icon-jbpm
+            tags: rhpam-kogito,runtime,kogito,quarkus,springboot,jvm
+            supports: quarkus
+            version: '7.11.0'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8:7.11.0
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: rhpam-kogito-builder-rhel8
+      annotations:
+        openshift.io/display-name: Platform for building Kogito based on Quarkus or SpringBoot
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '7.11.0'
+          annotations:
+            description: Platform for building Kogito based on Quarkus or SpringBoot
+            iconClass: icon-jbpm
+            tags: rhpam-kogito,builder,kogito,quarkus,springboot
+            supports: quarkus
+            version: '7.11.0'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: registry.redhat.io/rhpam-7/rhpam-kogito-builder-rhel8:7.11.0
diff --git a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
new file mode 100644
index 00000000000..0cf8c2a447e
--- /dev/null
+++ b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
@@ -0,0 +1,25 @@
+schema_version: 1
+
+name: "rhpam-7/rhpam-kogito-runtime-jvm-rhel8"
+version: "7.11.0"
+from: "registry.redhat.io/ubi8/ubi-minimal:latest"
+description: "RHPAM Runtime image for Kogito based on Quarkus or SpringBoot JVM image"
+
+labels:
+  - name: "com.redhat.component"
+    value: "rhpam-7-kogito-runtime-jvm-rhel8-container"
+  - name: "io.k8s.display-name"
+    value: "Red Hat build of Kogito based on Quarkus or SpringBoot JVM image"
+  - name: "io.openshift.tags"
+    value: "rhpam-kogito,runtime,kogito,quarkus,springboot,jvm"
+
+packages:
+  content_sets_file: content_sets.yaml
+
+osbs:
+  configuration:
+    container_file: container.yaml
+  extra_dir: osbs-extra/rhpam-kogito-runtime-jvm-rhel8
+  repository:
+    name: containers/rhpam-7-kogito-runtime-jvm
+    branch: rhba-7-rhel-8
diff --git a/scripts/README.md b/scripts/README.md
index 8f94064b713..de7b159aa7d 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -4,14 +4,68 @@ On this directory you can find some python scripts used to help with some repeti
 
 Today we have these scripts:
 
+- [build-product-image.sh](build-product-image.sh)
+- [common.py](common.py)
+- [list-images.py](list-images.py)
 - [manage-kogito-version.py](manage-kogito-version.py)
 - [push-local-registry.sh](push-local-registry.sh)
 - [push-staging.py](push-staging.py)
+- [run-bats.sh](run-bats.sh)
 - [update-maven-artifacts.py](update-maven-artifacts.py)
 - [update-tests.py](update-tests.py)
-- [common.py](common.py)
 
-### Managing Kogito images version
+
+
+### Build Product Image Script
+
+Script should not be used to build community images. Handled by `make build-prod` command.
+
+To switch the `build_engine` do the following:
+
+```bash
+make BUILD_ENGINE=osbs build-prod
+```
+
+
+It receives the Product image name to build the images.
+
+The build works in the follow CEKit build hierarchy:
+
+ - image.yaml -> kogito-community-image-name-overrides.yaml -> kogito-product-image-name-overrides.yaml
+
+Example: 
+
+```bash 
+cekit --verbose --redhat build --overrides-file kogito-runtime-jvm-overrides.yaml --overrides-file rhpam-kogito-runtime-jvm-rhel8-overrides.yaml docker
+```
+
+The product image name must respect the community image name:
+
+ - rhpam-$(kogito_image_name)-rhel8
+
+
+### Common script
+
+The `common.py` script defines some common functions for the scripts.
+
+
+### List Images Script
+
+Utilitary script used to retrieve all images that can be built on this repo, there is possible to retrieve
+the community image list:
+
+```bash
+$ python3 list-images.py
+```
+
+And the product image list by using the `--prod` flag:
+
+```bash
+$ python3 list-images.py --prod
+```
+
+
+### Managing Kogito images version script
 
 The manage-kogito-version script will help when we need to update the current version due a new release.
 
@@ -189,6 +243,4 @@ $ python update-tests.py --examples-uri https://github.com/<yournamespace>/kogit
 
 This will update the examples uri and/or the ref for the tests.
 
-### Common script
 
-The `common.py` script defines some common functions for the scripts.
diff --git a/scripts/build-product-image.sh b/scripts/build-product-image.sh
new file mode 100755
index 00000000000..709ae414126
--- /dev/null
+++ b/scripts/build-product-image.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Simple usage: /bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}
+
+ver=$(cekit --version )
+ver=$((${ver//./} + 0))
+if [ ${ver//./} -lt 379 ]; then
+    echo "Using CEKit version $ver, Please use CEKit version 3.8.0 or greater."
+    exit 10
+fi
+
+image="${2}"
+if [ "x${image}" == "x" ]; then
+    echo "image_name can't be empty.."
+    exit 8
+fi
+
+BUILD_ENGINE="${3:-docker}"
+CEKIT_CMD="cekit --verbose --redhat"
+
+# extract the community image name from its product relative.
+# $1 - prod image name
+function get_parent_image_overrides() {
+    echo "${1}" | awk -v FS="(rhpam-|-rhel8)" '{print $2}'
+}
+
+ACTION=${1}
+case ${ACTION} in
+    "build")
+        echo "Using ${BUILD_ENGINE} build engine"
+        ${CEKIT_CMD} build --overrides-file $(get_parent_image_overrides ${image})-overrides.yaml --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
+    ;;
+
+    "test")
+        ${CEKIT_CMD} test --overrides-file $(get_parent_image_overrides ${image})-overrides.yaml --overrides-file ${image_name}-overrides.yaml behave
+    ;;
+    *)
+        echo "Please use build or test actions."
+    ;;
+esac
+
diff --git a/scripts/common.py b/scripts/common.py
index 8f64fcb0719..97ea65b3673 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-#This script defines some common function that are used by manage-kogito-version.py and push-staging.py script
+# This script defines some common function that are used by manage-kogito-version.py and push-staging.py script
 
 
 import os
@@ -10,7 +10,7 @@
 # All kogito-image modules that have the kogito version.
 MODULES = {"kogito-data-index-common", "kogito-data-index-mongodb",
            "kogito-data-index-infinispan", "kogito-trusty-common",
-           "kogito-trusty-infinispan","kogito-trusty-redis",
+           "kogito-trusty-infinispan", "kogito-trusty-redis",
            "kogito-explainability", "kogito-image-dependencies",
            "kogito-jobs-service", "kogito-trusty-ui",
            "kogito-jq", "kogito-kubernetes-client",
@@ -27,13 +27,15 @@
 IMAGE_STREAM_FILENAME = "kogito-imagestream.yaml"
 # image.yaml file definition that needs to be updated
 IMAGE_FILENAME = "image.yaml"
-ARTIFACTS_VERSION_ENV_KEY="KOGITO_VERSION"
+ARTIFACTS_VERSION_ENV_KEY = "KOGITO_VERSION"
 
-# behave tests that needs to be update
+# behave tests that needs to be updated
 BEHAVE_BASE_DIR = 'tests/features'
-BEHAVE_TESTS = {"kogito-builder.feature", "kogito-runtime-jvm.feature", "kogito-runtime-native.feature"}
+BEHAVE_TESTS = {"kogito-builder-native.feature", "kogito-common-builder-jvm.feature",
+                "kogito-common-runtime-jvm.feature", "kogito-runtime-native.feature"}
+
+CLONE_REPO_SCRIPT = 'tests/test-apps/clone-repo.sh'
 
-CLONE_REPO_SCRIPT='tests/test-apps/clone-repo.sh'
 
 def yaml_loader():
     """
@@ -46,6 +48,7 @@ def yaml_loader():
     yaml.indent(mapping=2, sequence=4, offset=2)
     return yaml
 
+
 def update_image_version(target_version):
     """
     Update image.yaml version tag.
@@ -72,7 +75,8 @@ def update_image_stream(target_version):
     Update the imagestream file, it will update the tag name, version and image tag.
     :param target_version: version used to update the imagestream file;
     """
-    print("Updating ImageStream images version from file {0} to version {1}".format(IMAGE_STREAM_FILENAME, target_version))
+    print("Updating ImageStream images version from file {0} to version {1}".format(IMAGE_STREAM_FILENAME,
+                                                                                    target_version))
     try:
         with open(IMAGE_STREAM_FILENAME) as imagestream:
             data = yaml_loader().load(imagestream)
@@ -80,10 +84,10 @@ def update_image_stream(target_version):
                 for tag_index, tag in enumerate(item['spec']['tags'], start=0):
                     data['items'][item_index]['spec']['tags'][tag_index]['name'] = target_version
                     data['items'][item_index]['spec']['tags'][tag_index]['annotations']['version'] = target_version
-                    imageDict = str.split(data['items'][item_index]['spec']['tags'][tag_index]['from']['name'], ':')
+                    image_dict = str.split(data['items'][item_index]['spec']['tags'][tag_index]['from']['name'], ':')
                     # image name + new version
-                    updatedImageName = imageDict[0] + ':' + target_version
-                    data['items'][item_index]['spec']['tags'][tag_index]['from']['name'] = updatedImageName
+                    updated_image_name = image_dict[0] + ':' + target_version
+                    data['items'][item_index]['spec']['tags'][tag_index]['from']['name'] = updated_image_name
 
         with open(IMAGE_STREAM_FILENAME, 'w') as imagestream:
             yaml_loader().dump(data, imagestream)
@@ -91,6 +95,7 @@ def update_image_stream(target_version):
     except TypeError:
         raise
 
+
 def get_all_module_dirs():
     """
     Retrieve the module directories
@@ -105,6 +110,7 @@ def get_all_module_dirs():
 
     return modules
 
+
 def get_kogito_module_dirs():
     """
     Retrieve the Kogito module directories
@@ -141,20 +147,21 @@ def update_modules_version(target_version):
         update_module_version(module_dir, target_version)
 
 
-def update_module_version(moduleDir, target_version):
+def update_module_version(module_dir, target_version):
     """
     Set Kogito module.yaml to given version.
+    :param module_dir: directory where cekit modules are hold
     :param target_version: version to set into the module
     """
     try:
-        moduleFile = os.path.join(moduleDir, "module.yaml")
-        with open(moduleFile) as module:
+        module_file = os.path.join(module_dir, "module.yaml")
+        with open(module_file) as module:
             data = yaml_loader().load(module)
             print(
                 "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
             data['version'] = target_version
 
-        with open(moduleFile, 'w') as module:
+        with open(module_file, 'w') as module:
             yaml_loader().dump(data, module)
 
     except TypeError:
@@ -179,14 +186,15 @@ def retrieve_artifacts_version():
 def update_artifacts_version_env_in_image(artifacts_version):
     """
     Update `KOGITO_VERSION` env var in image.yaml.
-    :param target_version: kogito version used to update image.yaml which contains the `KOGITO_VERSION` env var
+    :param artifacts_version: kogito version used to update image.yaml which contains the `KOGITO_VERSION` env var
     """
     try:
         with open(IMAGE_FILENAME) as imageFile:
             data = yaml_loader().load(imageFile)
             for index, env in enumerate(data['envs'], start=0):
                 if env['name'] == ARTIFACTS_VERSION_ENV_KEY:
-                    print("Updating image.yaml env var {0} with value {1}".format(ARTIFACTS_VERSION_ENV_KEY, artifacts_version))
+                    print("Updating image.yaml env var {0} with value {1}".format(ARTIFACTS_VERSION_ENV_KEY,
+                                                                                  artifacts_version))
                     data['envs'][index]['value'] = artifacts_version
 
         with open(IMAGE_FILENAME, 'w') as imageFile:
@@ -240,10 +248,11 @@ def update_maven_repo_in_behave_tests(repo_url, replaceJbossRepository):
     """
     print("Set maven repo {} in behave tests".format(repo_url))
     pattern = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
-    envVarKey = "MAVEN_REPO_URL"
+    env_var_key = "MAVEN_REPO_URL"
     if replaceJbossRepository:
-        envVarKey = "JBOSS_MAVEN_REPO_URL"
-    replacement = "| variable | value |\n      | {} | {} |\n      | MAVEN_DOWNLOAD_OUTPUT | true |".format(envVarKey, repo_url)
+        env_var_key = "JBOSS_MAVEN_REPO_URL"
+    replacement = "| variable | value |\n      | {} | {} |\n      | MAVEN_DOWNLOAD_OUTPUT | true |".format(env_var_key,
+                                                                                                           repo_url)
     update_in_behave_tests(pattern, replacement)
 
 
@@ -291,23 +300,24 @@ def update_examples_uri_in_clone_repo(examples_uri):
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
 
-def update_maven_repo_in_clone_repo(repo_url, replaceJbossRepository):
+def update_maven_repo_in_clone_repo(repo_url, replace_jboss_repository):
     """
     Update maven repository into clone-repo.sh script
     :param repo_url: Maven repository url
-    :param replaceJbossRepository: Set to true if default Jboss repository needs to be overriden
+    :param replace_jboss_repository: Set to true if default Jboss repository needs to be overridden
     """
     print("Set maven repo {} in clone-repo script".format(repo_url))
     pattern = ""
     replacement = ""
-    if replaceJbossRepository:
+    if replace_jboss_repository:
         pattern = re.compile(r'(export JBOSS_MAVEN_REPO_URL=.*)')
         replacement = 'export JBOSS_MAVEN_REPO_URL="{}"'.format(repo_url)
-    else :
+    else:
         pattern = re.compile(r'(# export MAVEN_REPO_URL=.*)')
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
+
 def ignore_maven_self_signed_certificate_in_clone_repo():
     """
     Sets the environment variable to ignore the self-signed certificates in maven
diff --git a/scripts/list-images.py b/scripts/list-images.py
index b544e137d60..e3d79e3675b 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -1,15 +1,28 @@
 #!/usr/bin/python3
-#Script responsible to update the tests with 
-#Should be run from root directory of the repository
-#Sample usage:  python3 scripts/update-tests.py
+# Script responsible to update the tests with
+# Should be run from root directory of the repository
+# Sample usage:  python3 scripts/update-tests.py
 
+import argparse
 import sys
-sys.dont_write_bytecode = True
 
 import common
 
+sys.dont_write_bytecode = True
+
+PRODUCT_PREFIX = "rhpam"
+
 if __name__ == "__main__":
-    images = sorted(common.get_all_images())
+    parser = argparse.ArgumentParser(
+        description='Kogito Version Manager - List Images by Community and Product version')
+    parser.add_argument('--prod', default=False, action='store_true', help='List product images')
+
+    args = parser.parse_args()
 
-    for img in images:
-        print(img)
+    for img in sorted(common.get_all_images()):
+        if args.prod:
+            if img.startswith(PRODUCT_PREFIX):
+                print(img)
+        else:
+            if not img.startswith(PRODUCT_PREFIX):
+                print(img)
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index 4c34c9df21c..157eb11ee7d 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Simple usage: /bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}
 
 BUILD_ENGINE="docker"
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
index 004b680cb88..dcf5912b696 100644
--- a/tests/features/common-build-runtime.feature
+++ b/tests/features/common-build-runtime.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-runtime-jvm
+@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-runtime-jvm @rhpam-7/rhpam-kogito-builder-rhel8 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: Common tests for Kogito builder and runtime images
 
   Scenario: Verify if usage help is correctly called
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 6a573712371..4f9ce9604ca 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-jvm @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis
+@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-jvm @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis @rhpam-7/rhpam-kogito-runtime-jvm-rhel8 @rhpam-7/rhpam-kogito-builder-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
@@ -6,4 +6,3 @@ Feature: Common tests for Kogito images
     Then run bash -c 'echo $USER' in container and check its output for kogito
      And run sh -c 'echo $HOME' in container and check its output for /home/kogito
      And run sh -c 'id' in container and check its output for uid=1001(kogito) gid=0(root) groups=0(root),1001(kogito)
-
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index d60e8afbd71..ad92d02bf69 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-data-index-infinispan
 Feature: Kogito-data-index infinispan feature.
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-data-index-infinispan image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
index 4def584ef1c..9ab3e5b9159 100644
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-data-index-mongodb
 Feature: Kogito-data-index mongodb feature.
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-data-index-mongodb image
     Given image is built
      Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
       And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
new file mode 100644
index 00000000000..7e1a170a8c3
--- /dev/null
+++ b/tests/features/kogito-builder-native.feature
@@ -0,0 +1,140 @@
+@quay.io/kiegroup/kogito-builder @rhpam-7/rhpam-kogito-builder-rhel8
+Feature: kogito-builder image native build tests
+
+  Scenario: verify java cacerts and libsunec are available in the given kogito builder container.
+    When container is started with command bash
+    Then  file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+
+  Scenario: verify if the maven and graal vm settings are correct on kogito-builder image for native
+    When container is started with command bash
+    Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
+    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
+    And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 20.2.0
+
+  Scenario: Verify if the s2i build is finished as expected using native build and runtime image
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+      | variable     | value      |
+      | NATIVE       | true       |
+      | RUNTIME_TYPE | quarkus    |
+      | LIMIT_MEMORY | 3221225472 |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+    And file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+    And s2i build log should contain -J-Xmx4g
+
+  Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+      | variable | value          |
+      | NATIVE       | true       |
+      | RUNTIME_TYPE | quarkus    |
+      | LIMIT_MEMORY | 3221225472 |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+    And file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+    And s2i build log should contain -J-Xmx4g
+
+  Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+      | variable     | value      |
+      | NATIVE       | true       |
+      | RUNTIME_TYPE | quarkus    |
+      | LIMIT_MEMORY | 6442450944 |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+
+  #ignore until https://issues.redhat.com/browse/KOGITO-3638 is resolved
+  @ignore
+  Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+      | variable          | value         |
+      | RUNTIME_TYPE      | quarkus       |
+      | NATIVE            | true          |
+      | LIMIT_MEMORY      | 6442450944    |
+      | MAVEN_ARGS_APPEND | -Ppersistence |
+    Then file /home/kogito/bin/process-quarkus-example-runner should exist
+    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+
+  Scenario: Perform a incremental s2i build for native test
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+      | variable     | value   |
+      | RUNTIME_TYPE | quarkus |
+      | NATIVE       | false   |
+    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And file /home/kogito/bin/quarkus-run.jar should exist
+    And check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+
+  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
+  Scenario:Perform a second incremental s2i build for native scenario, this time, with native enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+      | variable     | value      |
+      | RUNTIME_TYPE | quarkus    |
+      | NATIVE       | true       |
+      | LIMIT_MEMORY | 6442450944 |
+    Then s2i build log should contain Expanding artifacts from incremental build...
+    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+    And check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+      | variable       | value          |
+      | RUNTIME_TYPE   | quarkus        |
+      | NATIVE         | true           |
+      | LIMIT_MEMORY   | 6442450944     |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 2037dca1b71..6bce80c90c1 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -1,249 +1,7 @@
 @quay.io/kiegroup/kogito-builder
 Feature: kogito-builder image tests
 
-  Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-      | variable     | value      |
-      | NATIVE       | true       |
-      | RUNTIME_TYPE | quarkus    |
-      | LIMIT_MEMORY | 3221225472 |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
-    And s2i build log should contain -J-Xmx4g
-
-  Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
-      | variable | value          |
-      | NATIVE       | true       |
-      | RUNTIME_TYPE | quarkus    |
-      | LIMIT_MEMORY | 3221225472 |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
-    And s2i build log should contain -J-Xmx4g
-
-  Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
-      | variable     | value   |
-      | NATIVE       | false   |
-      | RUNTIME_TYPE | quarkus |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
-
-  Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
-      | variable     | value   |
-      | NATIVE       | false   |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
-
-  Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable     | value                     |
-      | NATIVE       | false                     |
-      | RUNTIME_TYPE | quarkus                   |
-      | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And container log should contain DEBUG [io.qua.
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
-
-  Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable     | value   |
-      | RUNTIME_TYPE | quarkus |
-      | NATIVE       | false   |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-
-  Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-      | variable     | value      |
-      | NATIVE       | true       |
-      | RUNTIME_TYPE | quarkus    |
-      | LIMIT_MEMORY | 6442450944 |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-
-  Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value         |
-      | NATIVE            | false         |
-      | RUNTIME_TYPE      | quarkus       |
-      | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-
-  #ignore until https://issues.redhat.com/browse/KOGITO-3638 is resolved
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-      | variable          | value         |
-      | RUNTIME_TYPE      | quarkus       |
-      | NATIVE            | true          |
-      | LIMIT_MEMORY      | 6442450944    |
-      | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/process-quarkus-example-runner should exist
-    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-
-  Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value                            |
-      | RUNTIME_TYPE      | quarkus                          |
-      | NATIVE            | false                            |
-      | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
-      | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-
-  Scenario: Verify if the multi-module s2i build is finished as expected performing a native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-      | variable          | value                            |
-      | RUNTIME_TYPE      | quarkus                          |
-      | NATIVE            | true                             |
-      | LIMIT_MEMORY      | 6442450944                       |
-      | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
-      | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-
-  Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
-      | variable     | value   |
-      | RUNTIME_TYPE | quarkus |
-      | NATIVE       | false   |
-    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-
-  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
-  Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
-      | variable     | value   |
-      | RUNTIME_TYPE | quarkus |
-      | NATIVE       | false   |
-    Then s2i build log should contain Expanding artifacts from incremental build...
-    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-
-  Scenario: Perform a third incremental s2i build, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
-      | variable     | value      |
-      | RUNTIME_TYPE | quarkus    |
-      | NATIVE       | true       |
-      | LIMIT_MEMORY | 6442450944 |
-    Then s2i build log should contain Expanding artifacts from incremental build...
-    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-builder image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
@@ -253,194 +11,3 @@ Feature: kogito-builder image tests
     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus or Spring Boot
     And the image should contain label io.openshift.tags with value builder,kogito,quarkus,springboot
 
-  Scenario: verify java cacerts and libsunec are available in the given container.
-    When container is started with command bash
-    Then  file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
-
-  Scenario: verify if the maven and graal vm settings are correct
-    When container is started with command bash
-    Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
-    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
-    And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 20.2.0
-
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable       | value          |
-      | RUNTIME_TYPE   | quarkus        |
-      | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-      | variable       | value          |
-      | RUNTIME_TYPE   | quarkus        |
-      | NATIVE         | true           |
-      | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable            | value          |
-      | RUNTIME_TYPE        | quarkus        |
-      | NATIVE              | false          |
-      | KOGITO_VERSION      | 2.0.0-SNAPSHOT |  
-      | PROJECT_GROUP_ID    | com.mycompany  |
-      | PROJECT_ARTIFACT_ID | myproject      |
-      | PROJECT_VERSION     | 2.0-SNAPSHOT   |
-    Then file /home/kogito/bin/myproject-2.0-SNAPSHOT-runner.jar should exist
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-
-#### SpringBoot Scenarios
-
-  Scenario: Verify if the s2i build is finished as expected with debug enabled
-      Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-        | variable     | value        |
-        | RUNTIME_TYPE | springboot   |
-        | JAVA_OPTIONS | -Ddebug=true |
-      Then check that page is served
-        | property             | value                                                                         |
-        | port                 | 8080                                                                          |
-        | path                 | /orders                                                                       |
-        | wait                 | 80                                                                            |
-        | request_method       | POST                                                                          |
-        | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-        | content_type         | application/json                                                              |
-        | expected_status_code | 201                                                                           |
-      And file /home/kogito/bin/process-springboot-example.jar should exist
-      And container log should contain main] .c.l.ClasspathLoggingApplicationListener
-      And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-  
-  Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
-      | variable            | value        |
-      | JAVA_OPTIONS        | -Ddebug=true |
-      | RUNTIME_TYPE        | springboot   |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-  
-  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable     | value      |
-      | RUNTIME_TYPE | springboot |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain Tomcat initialized with port(s): 8080 (http)
-
-  Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value         |
-      | MAVEN_ARGS_APPEND | -Ppersistence |
-      | RUNTIME_TYPE      | springboot    |
-    Then file /home/kogito/bin/process-springboot-example.jar should exist
-    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-  
-  Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value |
-      | JAVA_OPTIONS      | -Ddebug=true                       |
-      | RUNTIME_TYPE      | springboot                         |
-      | ARTIFACT_DIR      | process-springboot-example/target  |
-      | MAVEN_ARGS_APPEND | -pl process-springboot-example -am |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
-  Scenario: Perform a incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable     | value      |
-      | RUNTIME_TYPE | springboot |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-
-  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
-  Scenario: Perform a second incremental s2i build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable     | value      |
-      | RUNTIME_TYPE | springboot |
-    Then s2i build log should contain Expanding artifacts from incremental build...
-    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
-      | RUNTIME_TYPE   | springboot     |
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
-
-
-  Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value                           |
-      | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
-      | RUNTIME_TYPE      | quarkus                         |
-    Then file /home/kogito/bin/process-quarkus-example-runner.jar should exist
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
new file mode 100644
index 00000000000..3f92bcf9b63
--- /dev/null
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -0,0 +1,303 @@
+@quay.io/kiegroup/kogito-builder @rhpam-7/rhpam-kogito-builder-rhel8
+Feature: kogito-builder image JVM build tests
+
+  Scenario: verify if the maven and java installation are correct
+    When container is started with command bash
+    Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
+    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
+
+  Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+      | variable     | value   |
+      | NATIVE       | false   |
+      | RUNTIME_TYPE | quarkus |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/quarkus-run.jar should exist
+    And file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+
+  Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+      | variable     | value   |
+      | NATIVE       | false   |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/quarkus-run.jar should exist
+    And file /home/kogito/ssl-libs/libsunec.so should exist
+    And file /home/kogito/cacerts should exist
+
+  Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable     | value                     |
+      | NATIVE       | false                     |
+      | RUNTIME_TYPE | quarkus                   |
+      | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/quarkus-run.jar should exist
+    And container log should contain DEBUG [io.qua.
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
+
+  Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable     | value   |
+      | RUNTIME_TYPE | quarkus |
+      | NATIVE       | false   |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/quarkus-run.jar should exist
+
+  Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value         |
+      | NATIVE            | false         |
+      | RUNTIME_TYPE      | quarkus       |
+      | MAVEN_ARGS_APPEND | -Ppersistence |
+    Then file /home/kogito/bin/quarkus-run.jar should exist
+    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+
+  Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value                            |
+      | RUNTIME_TYPE      | quarkus                          |
+      | NATIVE            | false                            |
+      | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
+      | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am |
+    Then check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+    And file /home/kogito/bin/quarkus-run.jar should exist
+
+  Scenario: Perform a incremental s2i build using quarkus runtime type
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+      | variable     | value   |
+      | RUNTIME_TYPE | quarkus |
+      | NATIVE       | false   |
+    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And file /home/kogito/bin/quarkus-run.jar should exist
+    And check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+
+  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
+  Scenario: Perform a second incremental s2i build using quarkus runtime type
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+      | variable     | value   |
+      | RUNTIME_TYPE | quarkus |
+      | NATIVE       | false   |
+    Then s2i build log should contain Expanding artifacts from incremental build...
+    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And file /home/kogito/bin/quarkus-run.jar should exist
+    And check that page is served
+      | property        | value                 |
+      | port            | 8080                  |
+      | path            | /hello                |
+      | request_method  | POST                  |
+      | content_type    | application/json      |
+      | request_body    | {"strings":["hello"]} |
+      | wait            | 80                    |
+      | expected_phrase | ["hello","world"]     |
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable       | value          |
+      | RUNTIME_TYPE   | quarkus        |
+      | NATIVE         | false          |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable            | value          |
+      | RUNTIME_TYPE        | quarkus        |
+      | NATIVE              | false          |
+      | KOGITO_VERSION      | 2.0.0-SNAPSHOT |  
+      | PROJECT_GROUP_ID    | com.mycompany  |
+      | PROJECT_ARTIFACT_ID | myproject      |
+      | PROJECT_VERSION     | 2.0-SNAPSHOT   |
+    Then file /home/kogito/bin/myproject-2.0-SNAPSHOT-runner.jar should exist
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+
+#### SpringBoot Scenarios
+
+  Scenario: Verify if the s2i build is finished as expected with debug enabled
+      Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+        | variable     | value        |
+        | RUNTIME_TYPE | springboot   |
+        | JAVA_OPTIONS | -Ddebug=true |
+      Then check that page is served
+        | property             | value                                                                         |
+        | port                 | 8080                                                                          |
+        | path                 | /orders                                                                       |
+        | wait                 | 80                                                                            |
+        | request_method       | POST                                                                          |
+        | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+        | content_type         | application/json                                                              |
+        | expected_status_code | 201                                                                           |
+      And file /home/kogito/bin/process-springboot-example.jar should exist
+      And container log should contain main] .c.l.ClasspathLoggingApplicationListener
+      And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+  
+  Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
+      | variable            | value        |
+      | JAVA_OPTIONS        | -Ddebug=true |
+      | RUNTIME_TYPE        | springboot   |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+  
+  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
+    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable     | value      |
+      | RUNTIME_TYPE | springboot |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain Tomcat initialized with port(s): 8080 (http)
+
+  Scenario: Verify if the s2i build is finished as expected with persistence enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value         |
+      | MAVEN_ARGS_APPEND | -Ppersistence |
+      | RUNTIME_TYPE      | springboot    |
+    Then file /home/kogito/bin/process-springboot-example.jar should exist
+    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+  
+  Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value |
+      | JAVA_OPTIONS      | -Ddebug=true                       |
+      | RUNTIME_TYPE      | springboot                         |
+      | ARTIFACT_DIR      | process-springboot-example/target  |
+      | MAVEN_ARGS_APPEND | -pl process-springboot-example -am |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+
+  Scenario: Perform a incremental s2i build using springboot runtime type
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable     | value      |
+      | RUNTIME_TYPE | springboot |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+
+  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
+  Scenario: Perform a second incremental s2i build using springboot runtime type
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable     | value      |
+      | RUNTIME_TYPE | springboot |
+    Then s2i build log should contain Expanding artifacts from incremental build...
+    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable       | value          |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | RUNTIME_TYPE   | springboot     |
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
+
+
+  Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value                           |
+      | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
+      | RUNTIME_TYPE      | quarkus                         |
+    Then file /home/kogito/bin/process-quarkus-example-runner.jar should exist
diff --git a/tests/features/kogito-common-runtime-jvm.feature b/tests/features/kogito-common-runtime-jvm.feature
new file mode 100644
index 00000000000..c9569b3c24c
--- /dev/null
+++ b/tests/features/kogito-common-runtime-jvm.feature
@@ -0,0 +1,81 @@
+@quay.io/kiegroup/kogito-runtime-jvm @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
+Feature: kogito-runtime-jvm feature.
+
+  Scenario: verify if the java installation is correct
+    When container is started with command bash
+    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
+    And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
+    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
+
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
+      | variable            | value                     |
+      | RUNTIME_TYPE        | quarkus                   |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
+      | wait            | 80                       |
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/quarkus-run.jar should exist
+
+  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
+      | variable            | value                     |
+      | RUNTIME_TYPE        | quarkus                   |
+      | NATIVE              | false                     |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+      | BINARY_BUILD        | true                      |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | request_method  | POST                     | 
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
+      | wait            | 80                       |
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/quarkus-run.jar should exist
+
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with springboot
+    Given s2i build /tmp/kogito-examples/process-springboot-example from target
+      | variable            | value        |
+      | JAVA_OPTIONS        | -Ddebug=true |
+      | RUNTIME_TYPE        | springboot   |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+
+  Scenario: Verify if the (forcing) binary build is finished as expected and if it is listening on the expected port
+    Given s2i build /tmp/kogito-examples/process-springboot-example from target
+      | variable            | value        |
+      | JAVA_OPTIONS        | -Ddebug=true |
+      | BINARY_BUILD        | true         |
+      | RUNTIME_TYPE        | springboot   |
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /orders                                                                       |
+      | wait                 | 80                                                                            |
+      | request_method       | POST                                                                          |
+      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
+      | content_type         | application/json                                                              |
+      | expected_status_code | 201                                                                           |
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
+    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
+
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index 0809b3a34da..d78298db77d 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-explainability
 Feature: Kogito-explainability feature.
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-explainability image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index f40ddc03292..3ac2f656141 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-jit-runner
 Feature: Kogito-jit-runner feature.
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-jit-runner image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 3245685009c..9d7b5863798 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-jobs-service
 Feature: Kogito-jobs-service feature.
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index e197bef0631..ba17a81e5c3 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-management-console
 Feature: kogito-management-console feature
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set kogito-management-console image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/kogito-runtime-jvm.feature b/tests/features/kogito-runtime-jvm.feature
index 7f22bf84dae..bfcd6a16a5c 100644
--- a/tests/features/kogito-runtime-jvm.feature
+++ b/tests/features/kogito-runtime-jvm.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-runtime-jvm
 Feature: kogito-runtime-jvm feature.
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-runtime-jvm image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
@@ -9,84 +9,5 @@ Feature: kogito-runtime-jvm feature.
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus or Spring Boot JVM image
     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus or Spring Boot JVM image
-    And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,springboot,jvm
+    And the image should contain label io.openshift.tags with value runtime,kogito,quarkus,springboot,jvm
     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
-
-  Scenario: verify if the java installation is correct
-    When container is started with command bash
-    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
-    And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
-    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
-
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
-      | variable            | value                     |
-      | RUNTIME_TYPE        | quarkus                   |
-      | NATIVE              | false                     |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-
-  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
-      | variable            | value                     |
-      | RUNTIME_TYPE        | quarkus                   |
-      | NATIVE              | false                     |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-      | BINARY_BUILD        | true                      |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/process-springboot-example from target
-      | variable            | value        |
-      | JAVA_OPTIONS        | -Ddebug=true |
-      | RUNTIME_TYPE        | springboot   |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
-  Scenario: Verify if the (forcing) binary build is finished as expected and if it is listening on the expected port
-    Given s2i build /tmp/kogito-examples/process-springboot-example from target
-      | variable            | value        |
-      | JAVA_OPTIONS        | -Ddebug=true |
-      | BINARY_BUILD        | true         |
-      | RUNTIME_TYPE        | springboot   |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
diff --git a/tests/features/kogito-runtime-native.feature b/tests/features/kogito-runtime-native.feature
index fe7419f388d..d7c18f863b2 100644
--- a/tests/features/kogito-runtime-native.feature
+++ b/tests/features/kogito-runtime-native.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-runtime-native
 Feature: Kogito-runtime-native feature.
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-runtime-native image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
@@ -12,12 +12,12 @@ Feature: Kogito-runtime-native feature.
      And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,native
      And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
 
-  Scenario: verify java cacerts and libsunec are available in the given container.
+  Scenario: verify java cacerts and libsunec are available in the given kogito runtime container.
     When container is started with command bash
     Then  file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
 
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus native
     Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld-native/ from target
       | variable            | value                     |
       | NATIVE              | false                     |
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index 5e4948c2fa8..c0eafb47615 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-task-console
 Feature: kogito-task-console feature
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-task-console image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/kogito-trusty-ui.feature b/tests/features/kogito-trusty-ui.feature
index c4024da0e9c..dd437a4c113 100644
--- a/tests/features/kogito-trusty-ui.feature
+++ b/tests/features/kogito-trusty-ui.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-trusty-ui
 Feature: kogito-trusty-ui feature
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-trusty-ui image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
new file mode 100644
index 00000000000..28c453b7755
--- /dev/null
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -0,0 +1,13 @@
+@rhpam-7/rhpam-kogito-builder-rhel8
+Feature: rhpam-kogito-runtime-jvm feature.
+
+  Scenario: verify if all labels are correctly set on rhpam-kogito-builder-rhel8 image
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Platform for building Kogito based on Quarkus or Spring Boot
+    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito based on Quarkus or Spring Boot
+    And the image should contain label io.openshift.tags with value rhpam-kogito,builder,kogito,quarkus,springboot
+    And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-jvm-rhel8-container
diff --git a/tests/features/rhpam-kogito-runtime-jvm.feature b/tests/features/rhpam-kogito-runtime-jvm.feature
new file mode 100644
index 00000000000..165b5494c8a
--- /dev/null
+++ b/tests/features/rhpam-kogito-runtime-jvm.feature
@@ -0,0 +1,16 @@
+@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
+Feature: rhpam-kogito-runtime-jvm feature.
+
+  Scenario: verify if all labels are correctly set onrhpam-kogito-runtime-jvm-rhel8 image
+    Given image is built
+    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus or Spring Boot JVM image
+    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito based on Quarkus or Spring Boot JVM image
+    And the image should contain label io.openshift.tags with value rhpam-kogito,runtime,kogito,quarkus,springboot,jvm
+    And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
+    And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-jvm-rhel8-container
+
+
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
index 3e507b07bd8..75e845988dc 100644
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-trusty-infinispan
 Feature: Kogito-trusty infinispan feature.
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-trusty-infinispan image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature
index 6bcca7c1018..76d37991913 100644
--- a/tests/features/trusty/kogito-trusty-redis.feature
+++ b/tests/features/trusty/kogito-trusty-redis.feature
@@ -1,7 +1,7 @@
 @quay.io/kiegroup/kogito-trusty-redis
 Feature: Kogito-trusty redis feature.
 
-  Scenario: verify if all labels are correctly set.
+  Scenario: verify if all labels are correctly set on kogito-trusty-redis image
     Given image is built
      Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
       And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i

From 19bb3b34e5376e1f905a5d724de81ef9334f0e78 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 22 Mar 2021 10:26:09 -0300
Subject: [PATCH 261/709] Updated Maven artifacts (#407)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 78d5cccc855..b5204d15632 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210318.041146-111-runner.jar
-    md5: 8c958d84c5685ef1a5014537d8cb597a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210322.041021-115-runner.jar
+    md5: cbb364e7612713cd63afb044abd1a536
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 3c5ed3cc235..4a1e56d5f12 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210318.041230-111-runner.jar
-    md5: 4edbfdf7e8371c6ae51bb1a7dc7ed48d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210322.041109-115-runner.jar
+    md5: 4d9cdc533628c970fff3e8c77378a910
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 1e5671c8b87..8f0ce05c319 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210318.042000-111-runner.jar
-    md5: 40fe4bbd9ab6e9266aca0560c3d49585
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210322.042026-115-runner.jar
+    md5: 0b09eb99bb3d4c49deaba7f5e3a5c4cc
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210318.041926-108-runner.jar
-    md5: 4f44fd0ca80b01941e00009b925514f7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210322.041945-112-runner.jar
+    md5: 2a9ea103314f02641740ec72dc8f01de
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 09c3efbccbe..a6e5a5046ee 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210318.042319-53-runner.jar
-    md5: 80ef3579a5cf147d9f7836eacf5bb523
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210322.042417-57-runner.jar
+    md5: c730337256085243a56a0a7bfe3e1d52
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index b274dde9cff..d57233802cc 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210318.041041-109-runner.jar
-    md5: 89b2af6a2729e704634e6c7aaa117fe5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210322.040905-113-runner.jar
+    md5: a724b51b9e44031a9a34a301408212fe
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 807c193f225..e99c5a28d45 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210318.041655-111-runner.jar
-    md5: a37eab7609e04208f6697f4086d0298b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210322.041639-115-runner.jar
+    md5: a520dfc64d4e901451ee684edce58e2a
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 70ce3f6c45f..2de62852b8e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210318.041800-111-runner.jar
-    md5: 77092363714dae1bf1b91c973c0ff638
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210322.041800-115-runner.jar
+    md5: 34eb797113736733e425679a04e892cb
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 7e9552be435..12f7aff910a 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210318.042140-24-runner.jar
-    md5: a3b49565bf81da6788ad307162abf434
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210322.042230-28-runner.jar
+    md5: ace359fdcc10ccf35187a9232f57f94f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 525d8300aef..bba69173dec 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210318.042217-24-runner.jar
-    md5: 566e9f7fd40c965a7528f2cc58b74980
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210322.042310-28-runner.jar
+    md5: ff02a6cbb65cf0615f06e368342f248a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index d27a24451c8..71658ac585c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210318.041726-111-runner.jar
-    md5: 4402eff369f864dc79f5941552fc7157
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210322.041718-115-runner.jar
+    md5: 3bda44459b9e637615ecd8a9a0996794
 
 execute:
   - script: configure

From ee94b39a93fbb866b899f5f406b901bb23c780c0 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 24 Mar 2021 09:51:33 -0300
Subject: [PATCH 262/709] Updated Maven artifacts (#408)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index b5204d15632..ed39bd89c1c 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210322.041021-115-runner.jar
-    md5: cbb364e7612713cd63afb044abd1a536
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210324.043758-116-runner.jar
+    md5: f12c8c2f5b2caa4fb83857b2e305dd57
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 4a1e56d5f12..70b37187963 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210322.041109-115-runner.jar
-    md5: 4d9cdc533628c970fff3e8c77378a910
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210324.043911-116-runner.jar
+    md5: cd391719f192a080ca71168dfe74f3d4
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 8f0ce05c319..b7d1ed3573c 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210322.042026-115-runner.jar
-    md5: 0b09eb99bb3d4c49deaba7f5e3a5c4cc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210324.044626-116-runner.jar
+    md5: f06ec8c646ea55897f7b681d3a76483c
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210322.041945-112-runner.jar
-    md5: 2a9ea103314f02641740ec72dc8f01de
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210324.044552-113-runner.jar
+    md5: f647a40f4d9f124e1972ef23a8158954
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index a6e5a5046ee..b057ee53887 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210322.042417-57-runner.jar
-    md5: c730337256085243a56a0a7bfe3e1d52
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210324.044932-58-runner.jar
+    md5: d8040b1d7410953489261df383e0d15c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index d57233802cc..2543bb64003 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210322.040905-113-runner.jar
-    md5: a724b51b9e44031a9a34a301408212fe
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210324.043622-114-runner.jar
+    md5: 33be767ef1fa75d8f02172ca3d653620
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e99c5a28d45..ae0cdc19bb0 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210322.041639-115-runner.jar
-    md5: a520dfc64d4e901451ee684edce58e2a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210324.044324-116-runner.jar
+    md5: e1dbb700dfbc8ed7d006480150e59319
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 2de62852b8e..c032e818371 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210322.041800-115-runner.jar
-    md5: 34eb797113736733e425679a04e892cb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210324.044429-116-runner.jar
+    md5: 3b79e7bd3e4224ef0ce6aa2353dc4cd1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 12f7aff910a..76523ce139d 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210322.042230-28-runner.jar
-    md5: ace359fdcc10ccf35187a9232f57f94f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210324.044803-29-runner.jar
+    md5: 400e7368dca285e260739c738a41caaa
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index bba69173dec..ce80f8ee005 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210322.042310-28-runner.jar
-    md5: ff02a6cbb65cf0615f06e368342f248a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210324.044837-29-runner.jar
+    md5: 71f2db257ea54772190671db75f40714
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 71658ac585c..6050dd6a91a 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210322.041718-115-runner.jar
-    md5: 3bda44459b9e637615ecd8a9a0996794
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210324.044355-116-runner.jar
+    md5: 30b9fc3ba6df29b0cab1821c9ad8488f
 
 execute:
   - script: configure

From 4f333e9cc33036089a16a47eedbf24efcdb0816d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 25 Mar 2021 15:34:23 -0300
Subject: [PATCH 263/709] Updated Maven artifacts (#410)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index ed39bd89c1c..88b1323cb4f 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210324.043758-116-runner.jar
-    md5: f12c8c2f5b2caa4fb83857b2e305dd57
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210325.043315-117-runner.jar
+    md5: 536ca324c36bf22e994fa49d0d91863a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 70b37187963..57b2cd53845 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210324.043911-116-runner.jar
-    md5: cd391719f192a080ca71168dfe74f3d4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210325.043423-117-runner.jar
+    md5: 782482c4308ae78e4e342a4a0fccb5c9
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index b7d1ed3573c..6d5476f18f5 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210324.044626-116-runner.jar
-    md5: f06ec8c646ea55897f7b681d3a76483c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210325.044119-117-runner.jar
+    md5: 1f79aa5a9ff242119e85448d070da191
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210324.044552-113-runner.jar
-    md5: f647a40f4d9f124e1972ef23a8158954
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210325.044046-114-runner.jar
+    md5: 3ab17a2f502c69e15a216c8439c50fbb
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index b057ee53887..4ee36bbf237 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210324.044932-58-runner.jar
-    md5: d8040b1d7410953489261df383e0d15c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210325.044423-59-runner.jar
+    md5: 3caff5529f80bb06cf50f846d8365e69
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 2543bb64003..5c949224a6a 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210324.043622-114-runner.jar
-    md5: 33be767ef1fa75d8f02172ca3d653620
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210325.043148-115-runner.jar
+    md5: 070145d86a7707bf1e99a23a0ce99701
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index ae0cdc19bb0..478592a0a3b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210324.044324-116-runner.jar
-    md5: e1dbb700dfbc8ed7d006480150e59319
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210325.043821-117-runner.jar
+    md5: c59a0b3ad91e409682fd95066c643514
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index c032e818371..0488e2987b5 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210324.044429-116-runner.jar
-    md5: 3b79e7bd3e4224ef0ce6aa2353dc4cd1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210325.043923-117-runner.jar
+    md5: 535b29d970a1e8906b1dfd014a61d6df
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 76523ce139d..f70af238eee 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210324.044803-29-runner.jar
-    md5: 400e7368dca285e260739c738a41caaa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210325.044257-30-runner.jar
+    md5: 85f061046de8d353301c90553871f9dc
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index ce80f8ee005..e18732e9410 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210324.044837-29-runner.jar
-    md5: 71f2db257ea54772190671db75f40714
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210325.044330-30-runner.jar
+    md5: ee7693d584875a5fc956109b6d01dcf9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6050dd6a91a..fd1586c64a3 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210324.044355-116-runner.jar
-    md5: 30b9fc3ba6df29b0cab1821c9ad8488f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210325.043850-117-runner.jar
+    md5: d423911464d67ed9ac4716deeb4d300e
 
 execute:
   - script: configure

From 25134a6f0830f06ae040d9cf0e991812ecb49f8b Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 26 Mar 2021 15:08:47 -0300
Subject: [PATCH 264/709] =?UTF-8?q?[KOGITO-3507]=20Introducing=20new=20mod?=
 =?UTF-8?q?ule=20for=20custom=20Java=20Truststore=20confi=E2=80=A6=20(#404?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kogito-data-index-infinispan-overrides.yaml   |  1 +
 kogito-data-index-mongodb-overrides.yaml      |  1 +
 kogito-explainability-overrides.yaml          |  1 +
 kogito-jit-runner-overrides.yaml              |  1 +
 kogito-jobs-service-overrides.yaml            |  1 +
 kogito-management-console-overrides.yaml      |  1 +
 kogito-runtime-jvm-overrides.yaml             |  1 +
 kogito-task-console-overrides.yaml            |  1 +
 kogito-trusty-infinispan-overrides.yaml       |  1 +
 kogito-trusty-redis-overrides.yaml            |  1 +
 kogito-trusty-ui-overrides.yaml               |  3 +-
 modules/kogito-custom-truststore/README.md    | 52 +++++++++++++++++
 .../added/configure-custom-truststore.sh      | 35 ++++++++++++
 modules/kogito-custom-truststore/configure    |  8 +++
 modules/kogito-custom-truststore/module.yaml  | 15 +++++
 .../tests/bats/kogito-custom-truststore.bats  | 57 +++++++++++++++++++
 .../added/kogito-app-launch.sh                |  3 +-
 .../added/kogito-app-launch.sh                |  3 +-
 .../added/kogito-app-launch.sh                |  3 +-
 .../added/kogito-app-launch.sh                |  3 +-
 modules/kogito-jit-runner/module.yaml         |  1 -
 .../added/kogito-app-launch.sh                |  3 +-
 modules/kogito-jobs-service/module.yaml       |  1 -
 .../added/kogito-app-launch.sh                |  3 +-
 modules/kogito-management-console/module.yaml |  1 -
 .../added/kogito-app-launch.sh                |  6 +-
 modules/kogito-runtime-jvm/module.yaml        |  1 -
 .../added/kogito-app-launch.sh                |  8 ++-
 modules/kogito-runtime-native/module.yaml     |  1 -
 .../added/kogito-app-launch.sh                |  3 +-
 modules/kogito-task-console/module.yaml       |  1 -
 .../added/kogito-app-launch.sh                |  3 +-
 .../added/kogito-app-launch.sh                |  3 +-
 .../added/kogito-app-launch.sh                |  3 +-
 scripts/common.py                             |  2 +-
 .../features/common-custom-truststore.feature | 17 ++++++
 .../kogito-common-runtime-jvm.feature         |  1 -
 .../kogito-management-console.feature         |  1 -
 tests/features/kogito-runtime-native.feature  |  2 +-
 tests/features/kogito-task-console.feature    |  1 -
 .../trusty/kogito-trusty-common.feature       | 10 +++-
 41 files changed, 236 insertions(+), 28 deletions(-)
 create mode 100644 modules/kogito-custom-truststore/README.md
 create mode 100755 modules/kogito-custom-truststore/added/configure-custom-truststore.sh
 create mode 100644 modules/kogito-custom-truststore/configure
 create mode 100644 modules/kogito-custom-truststore/module.yaml
 create mode 100644 modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
 create mode 100644 tests/features/common-custom-truststore.feature

diff --git a/kogito-data-index-infinispan-overrides.yaml b/kogito-data-index-infinispan-overrides.yaml
index b8a18814447..973fe8f1be5 100644
--- a/kogito-data-index-infinispan-overrides.yaml
+++ b/kogito-data-index-infinispan-overrides.yaml
@@ -49,6 +49,7 @@ modules:
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.infinispan
   - name: org.kie.kogito.dataindex.common
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-data-index-mongodb-overrides.yaml b/kogito-data-index-mongodb-overrides.yaml
index bba983bf241..2f4c195ea98 100644
--- a/kogito-data-index-mongodb-overrides.yaml
+++ b/kogito-data-index-mongodb-overrides.yaml
@@ -30,6 +30,7 @@ modules:
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.mongodb
   - name: org.kie.kogito.dataindex.common
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-explainability-overrides.yaml b/kogito-explainability-overrides.yaml
index caeff6be0c6..3e61d942aaf 100644
--- a/kogito-explainability-overrides.yaml
+++ b/kogito-explainability-overrides.yaml
@@ -32,6 +32,7 @@ modules:
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.explainability
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jit-runner-overrides.yaml b/kogito-jit-runner-overrides.yaml
index f32eb7079b5..f7c0d052265 100644
--- a/kogito-jit-runner-overrides.yaml
+++ b/kogito-jit-runner-overrides.yaml
@@ -30,6 +30,7 @@ modules:
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.jit-runner
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index fbbfb0591a6..4501a332bc3 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -36,6 +36,7 @@ modules:
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.jobs.service
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index 02e1cf3d0d9..d3a42a2ea50 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -33,6 +33,7 @@ modules:
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.management.console
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index 0b207c70c8f..8e0b5bd232b 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -37,6 +37,7 @@ modules:
     version: "11-headless"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.runtime.jvm
+  - name: org.kie.kogito.security.custom.truststores
 
 ## s2i build . quay.io/kiegroup/kogito-builder:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
diff --git a/kogito-task-console-overrides.yaml b/kogito-task-console-overrides.yaml
index a1878079899..01fb808fbc3 100644
--- a/kogito-task-console-overrides.yaml
+++ b/kogito-task-console-overrides.yaml
@@ -33,6 +33,7 @@ modules:
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.task.console
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-trusty-infinispan-overrides.yaml b/kogito-trusty-infinispan-overrides.yaml
index fc5b4a0c5f5..314a9a74307 100644
--- a/kogito-trusty-infinispan-overrides.yaml
+++ b/kogito-trusty-infinispan-overrides.yaml
@@ -49,6 +49,7 @@ modules:
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.trusty.infinispan
   - name: org.kie.kogito.trusty.common
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-trusty-redis-overrides.yaml b/kogito-trusty-redis-overrides.yaml
index 172b6157134..d9206006e5c 100644
--- a/kogito-trusty-redis-overrides.yaml
+++ b/kogito-trusty-redis-overrides.yaml
@@ -33,6 +33,7 @@ modules:
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.trusty.redis
   - name: org.kie.kogito.trusty.common
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-trusty-ui-overrides.yaml b/kogito-trusty-ui-overrides.yaml
index 066fa3460c3..c78afa29ecf 100644
--- a/kogito-trusty-ui-overrides.yaml
+++ b/kogito-trusty-ui-overrides.yaml
@@ -25,7 +25,7 @@ ports:
 - value: 8080
 
 modules:
-  install:
+  install: 
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.logging
@@ -33,6 +33,7 @@ modules:
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.trusty.ui
+  - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/modules/kogito-custom-truststore/README.md b/modules/kogito-custom-truststore/README.md
new file mode 100644
index 00000000000..bdb7c0bff16
--- /dev/null
+++ b/modules/kogito-custom-truststore/README.md
@@ -0,0 +1,52 @@
+# Kogito Custom TrustStore Module
+
+This module adds the possibility to override the default Java TrustStore in the JVM process for any Kogito Service.
+
+## How to Use
+
+1. Add the self-signed certificates or your in-house certificates to the default JKS `cacerts` (or you can start a new one from scratch).
+[Keystore Explorer](https://keystore-explorer.org/) is a great tool to manipulate JKS
+
+2. Mount your file anywhere in your system using `docker volume`:
+
+```shell
+$ docker volume inspect truststores
+[
+    {
+        "CreatedAt": "2021-03-23T12:53:18-03:00",
+        "Driver": "local",
+        "Labels": null,
+        "Mountpoint": "/var/lib/docker/volumes/truststores/_data",
+        "Name": "truststores",
+        "Options": null,
+        "Scope": "local"
+    }
+]
+```
+
+Make sure to move the `cacerts` file to `/var/lib/docker/volumes/truststores/_data` directory.
+
+3. Mount this volume when running your Kogito service:
+
+```shell
+$ docker run --rm -it \
+    -e CUSTOM_TRUSTSTORE=cacerts \
+    -e CUSTOM_TRUSTSTORE_PASSWORD=changeit \
+    -p 8080:8080  \
+    --mount source=truststores,target=/home/kogito/certs \
+    custom-truststore <imagename>
+```
+
+You should see the following message in the console if everything went fine:
+
+```log
+INFO ---> Configuring custom Java Truststore 'cacerts' in the path /home/kogito/certs/custom-truststore
+```
+
+## Key Takeaways
+
+1. Make sure that the path is `/home/kogito/certs/custom-truststore`. The image **WON'T** read the certificate from anywhere else
+
+2. The environment variable `CUSTOM_TRUSTSTORE` will tell the image the name of the desired file to read
+
+3. `CUSTOM_TRUSTSTORE_PASSWORD` is an optional parameter, but it's a good practice to always have it set. The default password for `cacerts` store is `changeit`
diff --git a/modules/kogito-custom-truststore/added/configure-custom-truststore.sh b/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
new file mode 100755
index 00000000000..ceb13d1f80a
--- /dev/null
+++ b/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+set -e
+
+# imports
+source "${KOGITO_HOME}"/launch/logging.sh
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset CUSTOM_TRUSTSTORE
+    unset CUSTOM_TRUSTSTORE_PASSWORD
+}
+
+function configure() {
+    configure_custom_truststore
+}
+
+# Exit codes
+# 1 - General error
+function configure_custom_truststore() {
+    local defaultCustomTruststorePath="${KOGITO_HOME}/certs/custom-truststore"
+
+    if [ ! -z "${CUSTOM_TRUSTSTORE}" ]; then
+        CUSTOM_TRUSTSTORE_PATH="${defaultCustomTruststorePath}/${CUSTOM_TRUSTSTORE}"
+        log_info "---> Configuring custom Java Truststore '${CUSTOM_TRUSTSTORE}' in the path ${defaultCustomTruststorePath}"
+        if [ ! -f "${CUSTOM_TRUSTSTORE_PATH}" ]; then
+            log_error "---> A custom truststore was specified ('${CUSTOM_TRUSTSTORE}'), but wasn't found in the path ${defaultCustomTruststorePath}. \
+Make sure that the path is mounted and accessible in your container"
+            exit 1
+        fi
+        CUSTOM_TRUSTSTORE_ARGS="-Djavax.net.ssl.trustStore=${CUSTOM_TRUSTSTORE_PATH}"
+        if [ ! -z "${CUSTOM_TRUSTSTORE_PASSWORD}" ]; then
+            CUSTOM_TRUSTSTORE_ARGS="${CUSTOM_TRUSTSTORE_ARGS} -Djavax.net.ssl.trustStorePassword=${CUSTOM_TRUSTSTORE_PASSWORD}"
+        fi
+    fi
+}
diff --git a/modules/kogito-custom-truststore/configure b/modules/kogito-custom-truststore/configure
new file mode 100644
index 00000000000..30150e5be02
--- /dev/null
+++ b/modules/kogito-custom-truststore/configure
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+SCRIPT_DIR=$(dirname "${0}")
+
+# custom truststore configuration
+mkdir -p "${KOGITO_HOME}"/launch/
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
+chmod +x-w "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
\ No newline at end of file
diff --git a/modules/kogito-custom-truststore/module.yaml b/modules/kogito-custom-truststore/module.yaml
new file mode 100644
index 00000000000..32868cb5c6f
--- /dev/null
+++ b/modules/kogito-custom-truststore/module.yaml
@@ -0,0 +1,15 @@
+schema_version: 1
+name: org.kie.kogito.security.custom.truststores
+version: "2.0.0-snapshot"
+description: "Adds the capability of configuring a custom Java Truststore to replace the original cacerts"
+
+envs:
+  - name: "CUSTOM_TRUSTORE"
+    description: ^ Custom JVM Truststore certificate (JKS format) that will replace the original cacerts file when executing the JVM process within the image. 
+    example: "my-own-cacerts.jks"
+  - name: "CUSTOM_TRUSTSTORE_PASSWORD"
+    description: ^ Password to for the custom JKS Truststore certificate. Ideally defined on containers platforms using Secrets.
+    example: "changeit"
+
+execute:
+  - script: configure
diff --git a/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats b/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
new file mode 100644
index 00000000000..0924abaeb6e
--- /dev/null
+++ b/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
@@ -0,0 +1,57 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME="${KOGITO_HOME}"
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+
+load $BATS_TEST_DIRNAME/../../added/configure-custom-truststore.sh
+
+teardown() {
+    rm -rf "${KOGITO_HOME}"
+}
+
+@test "fail case when the custom certificate is not present in the expected path" {
+    local expected=1
+    export CUSTOM_TRUSTSTORE=my-cert.jks
+
+    prepareEnv
+    preConfigure
+    run configure
+
+    echo "Result is [$status] and expected is [${expected}]" >&2
+    [ "$status" = "${expected}" ]
+    echo "Output is: ${lines[@]}"
+    [[ "${lines[1]}" == *"ERROR ---> A custom truststore was specified"* ]]
+}
+
+@test "success case when the custom certificate is present in the expected path" {
+    local expected=0
+    local pathExpected="${KOGITO_HOME}/certs/custom-truststore/my-cert.jks"
+
+    mkdir -p ${KOGITO_HOME}/certs/custom-truststore
+    touch ${KOGITO_HOME}/certs/custom-truststore/my-cert.jks
+    CUSTOM_TRUSTSTORE=my-cert.jks
+
+    prepareEnv
+    preConfigure
+    run configure
+
+    echo "Result is [$status] and expected is [${expected}]" >&2
+    [ "$status" = "${expected}" ]
+    echo "Output is: ${lines[@]}"
+    [ "${lines[0]}" = "INFO ---> Configuring custom Java Truststore 'my-cert.jks' in the path /tmp/kogito/certs/custom-truststore" ]
+}
+
+@test "success case when no custom certificate is given" {
+    local expected=0
+
+    prepareEnv
+    preConfigure
+    run configure
+
+    echo "Result is [$status] and expected is [${expected}]" >&2
+    [ "$status" = "${expected}" ]
+    echo "Truststore Args should be empty, but was ${CUSTOM_TRUSTSTORE_ARGS}" >&2
+    [ "${CUSTOM_TRUSTSTORE_ARGS}" = "" ]
+}
diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
index 0f8d20964ee..5a79672441b 100644
--- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
@@ -14,12 +14,13 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index eaa8c856f7a..0d8d8f99b82 100644
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -14,12 +14,13 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
index 49b928b9318..ac4288e4675 100644
--- a/modules/kogito-explainability/added/kogito-app-launch.sh
+++ b/modules/kogito-explainability/added/kogito-app-launch.sh
@@ -16,12 +16,13 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
   "${KOGITO_HOME}"/launch/kogito-explainability.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-jit-runner/added/kogito-app-launch.sh b/modules/kogito-jit-runner/added/kogito-app-launch.sh
index 7670ff67b65..d69f91dfcb3 100644
--- a/modules/kogito-jit-runner/added/kogito-app-launch.sh
+++ b/modules/kogito-jit-runner/added/kogito-app-launch.sh
@@ -14,12 +14,13 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JIT_RUNNER_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JIT_RUNNER_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 4ee36bbf237..7ca5f8076b6 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -9,4 +9,3 @@ artifacts:
 
 execute:
   - script: configure
-
diff --git a/modules/kogito-jobs-service/added/kogito-app-launch.sh b/modules/kogito-jobs-service/added/kogito-app-launch.sh
index 92b558eb8db..98b2989ed7e 100644
--- a/modules/kogito-jobs-service/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service/added/kogito-app-launch.sh
@@ -15,12 +15,13 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
   "${KOGITO_HOME}"/launch/kogito-jobs-service.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
     -Dquarkus.http.host=0.0.0.0 \
     -Dquarkus.http.port=8080 \
     -jar "${KOGITO_HOME}"/bin/kogito-jobs-service-runner.jar
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 5c949224a6a..941752488ef 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -9,4 +9,3 @@ artifacts:
 
 execute:
   - script: configure
-
diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
index 0a22fa3a29a..e21eaea4112 100644
--- a/modules/kogito-management-console/added/kogito-app-launch.sh
+++ b/modules/kogito-management-console/added/kogito-app-launch.sh
@@ -15,12 +15,13 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
   "${KOGITO_HOME}"/launch/kogito-management-console.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
         -jar "${KOGITO_HOME}"/bin/kogito-management-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 478592a0a3b..3b1c160f560 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -9,4 +9,3 @@ artifacts:
 
 execute:
   - script: configure
-
diff --git a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
index c28c38ef77f..5d339738a78 100644
--- a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
+++ b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
@@ -16,7 +16,7 @@ set -e
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-
+    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source ${S2I_MODULE_LOCATION}/s2i-core
 source "${KOGITO_HOME}"/launch/configure.sh
@@ -28,13 +28,13 @@ runtime_type=$(get_runtime_type)
 # shellcheck disable=SC2086
 case ${runtime_type} in 
     "quarkus") 
-        exec java ${JAVA_OPTIONS}  ${KOGITO_QUARKUS_JVM_PROPS} \
+        exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_JVM_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
             -Dquarkus.http.host=0.0.0.0 \
             -Dquarkus.http.port=8080 \
             -jar "${KOGITO_HOME}"/bin/*.jar
     ;;
     "springboot") 
-        exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
+        exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
     ;;
     *)
         log_error "${runtime_type} is not supported."
diff --git a/modules/kogito-runtime-jvm/module.yaml b/modules/kogito-runtime-jvm/module.yaml
index 836d073c5e2..c639277d2ce 100644
--- a/modules/kogito-runtime-jvm/module.yaml
+++ b/modules/kogito-runtime-jvm/module.yaml
@@ -4,4 +4,3 @@ version: "2.0.0-snapshot"
 
 execute:
   - script: configure
-
diff --git a/modules/kogito-runtime-native/added/kogito-app-launch.sh b/modules/kogito-runtime-native/added/kogito-app-launch.sh
index 97c761449b3..fb2b6a6c8bf 100644
--- a/modules/kogito-runtime-native/added/kogito-app-launch.sh
+++ b/modules/kogito-runtime-native/added/kogito-app-launch.sh
@@ -15,13 +15,17 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-
+    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+if [ -z "${CUSTOM_TRUSTSTORE_ARGS}" ]; then
+    CUSTOM_TRUSTSTORE_ARGS="-Djavax.net.ssl.trustStore=${KOGITO_HOME}/cacerts"
+fi
+
 # shellcheck disable=SC2086
 exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_NATIVE_PROPS} \
     -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
     -Dquarkus.http.port=8080 \
-    -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
+    ${CUSTOM_TRUSTSTORE_ARGS} 
diff --git a/modules/kogito-runtime-native/module.yaml b/modules/kogito-runtime-native/module.yaml
index 6e26ba2bc4f..edac72546f6 100644
--- a/modules/kogito-runtime-native/module.yaml
+++ b/modules/kogito-runtime-native/module.yaml
@@ -4,4 +4,3 @@ version: "2.0.0-snapshot"
 
 execute:
   - script: configure
-
diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh
index 56661d7fa40..fba166248e3 100644
--- a/modules/kogito-task-console/added/kogito-app-launch.sh
+++ b/modules/kogito-task-console/added/kogito-app-launch.sh
@@ -15,12 +15,13 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
   "${KOGITO_HOME}"/launch/kogito-task-console.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
         -jar "${KOGITO_HOME}"/bin/kogito-task-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 0488e2987b5..322086a395a 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -9,4 +9,3 @@ artifacts:
 
 execute:
   - script: configure
-
diff --git a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
index 07fde1c00ff..e412b09b424 100644
--- a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
@@ -15,12 +15,13 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
   "${KOGITO_HOME}"/launch/kogito-trusty.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-trusty-redis/added/kogito-app-launch.sh b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
index 2a0a665d566..6a9c57d0dd0 100644
--- a/modules/kogito-trusty-redis/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
@@ -15,12 +15,13 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
   "${KOGITO_HOME}"/launch/kogito-trusty.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
index ca2b28d6524..b7c91b9678f 100644
--- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
@@ -16,12 +16,13 @@ fi
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
   "${KOGITO_HOME}"/launch/kogito-trusty-ui.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} \
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
         -jar "${KOGITO_HOME}"/bin/kogito-trusty-ui-runner.jar
\ No newline at end of file
diff --git a/scripts/common.py b/scripts/common.py
index 97ea65b3673..6528a735ee5 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -19,7 +19,7 @@
            "kogito-persistence", "kogito-runtime-native",
            "kogito-runtime-jvm", "kogito-builder",
            "kogito-s2i-core", "kogito-system-user",
-           "kogito-jit-runner"}
+           "kogito-jit-runner", "kogito-custom-truststore"}
 MODULE_FILENAME = "module.yaml"
 MODULES_DIR = "modules"
 
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
new file mode 100644
index 00000000000..258688d81d2
--- /dev/null
+++ b/tests/features/common-custom-truststore.feature
@@ -0,0 +1,17 @@
+@quay.io/kiegroup/kogito-runtime-jvm 
+@quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb 
+@quay.io/kiegroup/kogito-task-console 
+@quay.io/kiegroup/kogito-management-console 
+@quay.io/kiegroup/kogito-explainability 
+@quay.io/kiegroup/kogito-jit-runner 
+@quay.io/kiegroup/kogito-jobs-service 
+@quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis 
+@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
+Feature: Common tests for Custom TrustStore configuration
+  Scenario: Verify if a custom certificate is correctly handled
+    When container is started with command /home/kogito/kogito-app-launch.sh
+      | variable            | value              |
+      | CUSTOM_TRUSTSTORE   | my-truststore.jks  |
+      | RUNTIME_TYPE        | quarkus            |
+    Then container log should contain INFO ---> Configuring custom Java Truststore 'my-truststore.jks' in the path /home/kogito/certs/custom-truststore
+    Then container log should contain ERROR ---> A custom truststore was specified ('my-truststore.jks'), but wasn't found in the path /home/kogito/certs/custom-truststore
diff --git a/tests/features/kogito-common-runtime-jvm.feature b/tests/features/kogito-common-runtime-jvm.feature
index c9569b3c24c..6e52d0965f0 100644
--- a/tests/features/kogito-common-runtime-jvm.feature
+++ b/tests/features/kogito-common-runtime-jvm.feature
@@ -78,4 +78,3 @@ Feature: kogito-runtime-jvm feature.
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index ba17a81e5c3..73fb675a8bd 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -33,4 +33,3 @@ Feature: kogito-management-console feature
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
-
diff --git a/tests/features/kogito-runtime-native.feature b/tests/features/kogito-runtime-native.feature
index d7c18f863b2..c81d530024c 100644
--- a/tests/features/kogito-runtime-native.feature
+++ b/tests/features/kogito-runtime-native.feature
@@ -32,4 +32,4 @@ Feature: Kogito-runtime-native feature.
       | request_body    | {"strings":["hello"]}    |
       | wait            | 80                       |
       | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
\ No newline at end of file
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index c0eafb47615..fa6332b8082 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -33,4 +33,3 @@ Feature: kogito-task-console feature
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
-
diff --git a/tests/features/trusty/kogito-trusty-common.feature b/tests/features/trusty/kogito-trusty-common.feature
index 894631442c8..00c76257dbb 100644
--- a/tests/features/trusty/kogito-trusty-common.feature
+++ b/tests/features/trusty/kogito-trusty-common.feature
@@ -4,4 +4,12 @@ Feature: Kogito-trusty common feature.
     When container is started with env
       | variable               | value   |
       | SCRIPT_DEBUG           | true    |
-    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
\ No newline at end of file
+    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
+
+  Scenario: Verify if a custom certificate is correctly handled
+    When container is started with command /home/kogito/kogito-app-launch.sh
+      | variable            | value              |
+      | CUSTOM_TRUSTSTORE   | my-truststore.jks  |
+      | RUNTIME_TYPE        | quarkus            |
+    Then container log should contain INFO ---> Configuring custom Java Truststore
+    Then container log should contain ERROR ---> A custom truststore was specified
\ No newline at end of file

From 25846003d3576a30a85a5f35ae09f3439ad7e13a Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 26 Mar 2021 16:35:59 -0300
Subject: [PATCH 265/709] [KOGITO-4782] - [OSBS] Update Kogito images to use
 internal rhel repo to get JQ package (#409)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Jenkinsfile                                   |  2 +-
 Jenkinsfile.deploy                            |  2 +-
 content_sets.yaml                             |  1 +
 kogito-builder-overrides.yaml                 |  4 ++
 kogito-runtime-jvm-overrides.yaml             |  1 +
 kogito-runtime-native-overrides.yaml          |  2 +-
 .../kogito-epel/7/{configure => configure.sh} |  0
 modules/kogito-epel/7/module.yaml             |  2 +-
 modules/kogito-jq/module.yaml                 |  2 +-
 modules/kogito-kubernetes-client/module.yaml  |  4 --
 rhpam-kogito-builder-rhel8-overrides.yaml     | 55 ++++++++++++++++++-
 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml | 37 ++++++++++++-
 scripts/build-product-image.sh                | 10 +---
 .../features/rhpam-kogito-builder-jvm.feature |  7 ++-
 .../features/rhpam-kogito-runtime-jvm.feature |  6 +-
 15 files changed, 110 insertions(+), 25 deletions(-)
 rename modules/kogito-epel/7/{configure => configure.sh} (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index b2717084436..d75381c1401 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,7 +40,7 @@ pipeline{
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 1f874f5f9da..49deb7e5a98 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -137,7 +137,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/1.0-SNAPSHOT/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/content_sets.yaml b/content_sets.yaml
index 7a619279b42..c7f2caabe15 100644
--- a/content_sets.yaml
+++ b/content_sets.yaml
@@ -14,3 +14,4 @@
 x86_64:
   - rhel-8-for-x86_64-baseos-rpms
   - rhel-8-for-x86_64-appstream-rpms
+  - rhocp-4.7-for-rhel-8-x86_64-rpms
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index f3fd0927cbf..f7d35ddca2e 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -31,10 +31,14 @@ envs:
   example: mymodule/target
   description:  Path to target/ where the jar files are created for multi-module builds
 
+ports:
+  - value: 8080
+
 modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.jq
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index 8e0b5bd232b..2d4ccbb143d 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -31,6 +31,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.jq
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.openjdk
diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-overrides.yaml
index b8d99a55d55..90b11beb701 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -31,6 +31,7 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.jq
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
@@ -38,7 +39,6 @@ modules:
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.runtime.native
 
-
 ## s2i build . quay.io/kiegroup/kogito-builder:latest kogitotest:10.0 -e RUNTIME_TYPE=quarkus -e NATIVE=true --runtime-image quay.io/kiegroup/kogito-runtime-native:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
 run:
diff --git a/modules/kogito-epel/7/configure b/modules/kogito-epel/7/configure.sh
similarity index 100%
rename from modules/kogito-epel/7/configure
rename to modules/kogito-epel/7/configure.sh
diff --git a/modules/kogito-epel/7/module.yaml b/modules/kogito-epel/7/module.yaml
index 778eadfd090..30be99b5314 100644
--- a/modules/kogito-epel/7/module.yaml
+++ b/modules/kogito-epel/7/module.yaml
@@ -3,4 +3,4 @@ name: org.kie.kogito.epel
 version: "7"
 
 execute:
-  - script: configure
+  - script: configure.sh
\ No newline at end of file
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
index 7fd53f5ddc8..bc3a40321bb 100644
--- a/modules/kogito-jq/module.yaml
+++ b/modules/kogito-jq/module.yaml
@@ -12,4 +12,4 @@ execute:
 
 packages:
   install:
-    - jq
+    - jq
\ No newline at end of file
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 74312456230..2a4de0e6c12 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -4,7 +4,3 @@ version: "2.0.0-snapshot"
 
 execute:
   - script: configure
-
-modules:
-  install:
-    - name: org.kie.kogito.jq
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 42f11f3af7e..64616192b51 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -8,13 +8,63 @@ description: "RHPAM Platform for building Kogito based on Quarkus or SpringBoot"
 labels:
   - name: "com.redhat.component"
     value: "rhpam-7-kogito-runtime-jvm-rhel8-container"
+  - name: "io.k8s.description"
+    value: "RHPAM Platform for building Kogito based on Quarkus or Spring Boot"
   - name: "io.k8s.display-name"
-    value: "Red Hat build of Kogito based on Quarkus or SpringBoot"
+    value: "Red Hat build of Kogito builder based on Quarkus or SpringBoot"
   - name: "io.openshift.tags"
     value: "rhpam-kogito,builder,kogito,quarkus,springboot"
+  - name: "io.openshift.s2i.assemble-input-files"
+    value: "/home/kogito/bin"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "RUNTIME_TYPE"
+    example: "springboot"
+    description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
+  - name: NATIVE
+    example: true
+    description: If set to true, perform a native build. Only supported for RUNTIME_TYPE is 'quarkus'.
+  - name: JAVA_OPTIONS
+    example: "-Dquarkus.log.level=DEBUG"
+    description: JVM options passed to the Java command.
+  - name: MAVEN_ARGS_APPEND
+    example: "-pl mymodule -am"
+    description: Additional Maven arguments
+  - name: ARTIFACT_DIR
+    example: mymodule/target
+    description: Path to target/ where the jar files are created for multi-module builds
+
+ports:
+  - value: 8080
+
+modules:
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.graalvm.installer
+      version: "20.2.0-java-11"
+    - name: org.kie.kogito.graalvm.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11"
+    - name: org.kie.kogito.maven
+      version: "3.6.2"
+    - name: org.kie.kogito.s2i.core
+    - name: org.kie.kogito.builder
 
 packages:
   content_sets_file: content_sets.yaml
+  install:
+    - bc
+    - jq
+    - gcc
+    - gcc-c++
+    - glibc-devel
+    - zlib-devel
 
 osbs:
   configuration:
@@ -23,3 +73,6 @@ osbs:
   repository:
     name: containers/rhpam-7-kogito-builder
     branch: rhba-7-rhel-8
+
+run:
+  workdir: "/home/kogito"
\ No newline at end of file
diff --git a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
index 0cf8c2a447e..6d917f89503 100644
--- a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
@@ -8,13 +8,45 @@ description: "RHPAM Runtime image for Kogito based on Quarkus or SpringBoot JVM
 labels:
   - name: "com.redhat.component"
     value: "rhpam-7-kogito-runtime-jvm-rhel8-container"
+  - name: "io.k8s.description"
+    value: "RHPAM Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
   - name: "io.k8s.display-name"
-    value: "Red Hat build of Kogito based on Quarkus or SpringBoot JVM image"
+    value: "Red Hat build of Kogito runtime based on Quarkus or SpringBoot JVM image"
   - name: "io.openshift.tags"
     value: "rhpam-kogito,runtime,kogito,quarkus,springboot,jvm"
+  - name: "io.openshift.s2i.assemble-input-files"
+    value: "/home/kogito/bin"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "RUNTIME_TYPE"
+    example: "springboot"
+    description: "Defines the runtime type of your Kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
+  - name: JAVA_OPTIONS
+    example: "-Dquarkus.log.level=DEBUG"
+    description: JVM options passed to the Java command.
+
+ports:
+  - value: 8080
+
+modules:
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.s2i.core
+    - name: org.kie.kogito.runtime.jvm
+    - name: org.kie.kogito.security.custom.truststores
 
 packages:
   content_sets_file: content_sets.yaml
+  install:
+    - jq
 
 osbs:
   configuration:
@@ -23,3 +55,6 @@ osbs:
   repository:
     name: containers/rhpam-7-kogito-runtime-jvm
     branch: rhba-7-rhel-8
+
+run:
+  workdir: "/home/kogito"
\ No newline at end of file
diff --git a/scripts/build-product-image.sh b/scripts/build-product-image.sh
index 709ae414126..c177c2c6473 100755
--- a/scripts/build-product-image.sh
+++ b/scripts/build-product-image.sh
@@ -17,21 +17,15 @@ fi
 BUILD_ENGINE="${3:-docker}"
 CEKIT_CMD="cekit --verbose --redhat"
 
-# extract the community image name from its product relative.
-# $1 - prod image name
-function get_parent_image_overrides() {
-    echo "${1}" | awk -v FS="(rhpam-|-rhel8)" '{print $2}'
-}
-
 ACTION=${1}
 case ${ACTION} in
     "build")
         echo "Using ${BUILD_ENGINE} build engine"
-        ${CEKIT_CMD} build --overrides-file $(get_parent_image_overrides ${image})-overrides.yaml --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
+        ${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
     ;;
 
     "test")
-        ${CEKIT_CMD} test --overrides-file $(get_parent_image_overrides ${image})-overrides.yaml --overrides-file ${image_name}-overrides.yaml behave
+        ${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave
     ;;
     *)
         echo "Please use build or test actions."
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 28c453b7755..dc9dcc3ba4a 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -1,5 +1,5 @@
 @rhpam-7/rhpam-kogito-builder-rhel8
-Feature: rhpam-kogito-runtime-jvm feature.
+Feature: rhpam-kogito-builder-rhel8 feature.
 
   Scenario: verify if all labels are correctly set on rhpam-kogito-builder-rhel8 image
     Given image is built
@@ -7,7 +7,8 @@ Feature: rhpam-kogito-runtime-jvm feature.
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Platform for building Kogito based on Quarkus or Spring Boot
-    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito based on Quarkus or Spring Boot
+    And the image should contain label io.k8s.description with value RHPAM Platform for building Kogito based on Quarkus or Spring Boot
+    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito builder based on Quarkus or SpringBoot
     And the image should contain label io.openshift.tags with value rhpam-kogito,builder,kogito,quarkus,springboot
+    And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
     And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-jvm-rhel8-container
diff --git a/tests/features/rhpam-kogito-runtime-jvm.feature b/tests/features/rhpam-kogito-runtime-jvm.feature
index 165b5494c8a..95b63632902 100644
--- a/tests/features/rhpam-kogito-runtime-jvm.feature
+++ b/tests/features/rhpam-kogito-runtime-jvm.feature
@@ -1,14 +1,14 @@
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: rhpam-kogito-runtime-jvm feature.
 
-  Scenario: verify if all labels are correctly set onrhpam-kogito-runtime-jvm-rhel8 image
+  Scenario: verify if all labels are correctly set on rhpam-kogito-runtime-jvm-rhel8 image
     Given image is built
     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus or Spring Boot JVM image
-    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito based on Quarkus or Spring Boot JVM image
+    And the image should contain label io.k8s.description with value RHPAM Runtime image for Kogito based on Quarkus or Spring Boot JVM image
+    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito runtime based on Quarkus or SpringBoot JVM image
     And the image should contain label io.openshift.tags with value rhpam-kogito,runtime,kogito,quarkus,springboot,jvm
     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
     And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-jvm-rhel8-container

From ee7a0c3d4095043bd78fa3c5820612fccde0ffa8 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 26 Mar 2021 18:08:23 -0300
Subject: [PATCH 266/709] Updated Maven artifacts (#411)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 88b1323cb4f..c4e6bbf8920 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210325.043315-117-runner.jar
-    md5: 536ca324c36bf22e994fa49d0d91863a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210326.041447-118-runner.jar
+    md5: cbd768565c0017e35cb105239a842bb4
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 57b2cd53845..ace113e4788 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210325.043423-117-runner.jar
-    md5: 782482c4308ae78e4e342a4a0fccb5c9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210326.041600-118-runner.jar
+    md5: 1679499f933e33912af16b95fe1d6a5a
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 6d5476f18f5..0ec587563fa 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210325.044119-117-runner.jar
-    md5: 1f79aa5a9ff242119e85448d070da191
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210326.042333-118-runner.jar
+    md5: 1072fd3f052df64ab07ed882e8d2f4f6
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210325.044046-114-runner.jar
-    md5: 3ab17a2f502c69e15a216c8439c50fbb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210326.042254-115-runner.jar
+    md5: 4daa67f29eefcfef5c4dab7d2b1ba1e1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 7ca5f8076b6..b13643b553a 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210325.044423-59-runner.jar
-    md5: 3caff5529f80bb06cf50f846d8365e69
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210326.042650-60-runner.jar
+    md5: e71dcde23f6351f3dfe80858589907d3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 941752488ef..8db27cbc18e 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210325.043148-115-runner.jar
-    md5: 070145d86a7707bf1e99a23a0ce99701
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210326.041318-116-runner.jar
+    md5: e5e769491256be044e8400bbac0df09d
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 3b1c160f560..384021a94c4 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210325.043821-117-runner.jar
-    md5: c59a0b3ad91e409682fd95066c643514
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210326.042006-118-runner.jar
+    md5: 3abb5a25c920606ce34d20d5ded879f2
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 322086a395a..3826c52af1d 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210325.043923-117-runner.jar
-    md5: 535b29d970a1e8906b1dfd014a61d6df
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210326.042120-118-runner.jar
+    md5: e5ce173afce579cc2646e3d7e0404eb8
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index f70af238eee..97246e39aef 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210325.044257-30-runner.jar
-    md5: 85f061046de8d353301c90553871f9dc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210326.042522-31-runner.jar
+    md5: 275f10f66d43aebd0b2b510036b89a7c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index e18732e9410..bb9ec6528d2 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210325.044330-30-runner.jar
-    md5: ee7693d584875a5fc956109b6d01dcf9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210326.042556-31-runner.jar
+    md5: 338d934af89f84043c5d9670cd3d5cb2
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index fd1586c64a3..6a77cfd7991 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210325.043850-117-runner.jar
-    md5: d423911464d67ed9ac4716deeb4d300e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210326.042042-118-runner.jar
+    md5: 8af685b58351df44773181c86db4a60c
 
 execute:
   - script: configure

From 3f0100f0bf1a595b36d493a55ddb6dcf27d4b94d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 29 Mar 2021 10:48:52 -0300
Subject: [PATCH 267/709] Updated Maven artifacts (#414)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index c4e6bbf8920..b99a524c8bf 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210326.041447-118-runner.jar
-    md5: cbd768565c0017e35cb105239a842bb4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210329.033043-121-runner.jar
+    md5: 7162e39ec8b827a8749233f713abef1a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index ace113e4788..bf9f331f845 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210326.041600-118-runner.jar
-    md5: 1679499f933e33912af16b95fe1d6a5a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210329.033159-121-runner.jar
+    md5: bcb0620ca61018547ea4ca263330c6b9
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 0ec587563fa..26033027fcd 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210326.042333-118-runner.jar
-    md5: 1072fd3f052df64ab07ed882e8d2f4f6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210329.033904-121-runner.jar
+    md5: 4693fd9ef1c9dd95981f43c1a44005e1
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210326.042254-115-runner.jar
-    md5: 4daa67f29eefcfef5c4dab7d2b1ba1e1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210329.033831-118-runner.jar
+    md5: fda27d6d1c432745b8b0a3435545148e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index b13643b553a..926846f4629 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210326.042650-60-runner.jar
-    md5: e71dcde23f6351f3dfe80858589907d3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210329.034217-63-runner.jar
+    md5: 430824ad85e7bd72ce3d49caac9c725e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 8db27cbc18e..27d3e5e30ed 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210326.041318-116-runner.jar
-    md5: e5e769491256be044e8400bbac0df09d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210329.032859-119-runner.jar
+    md5: f936bc840803d1abdd2b6ecf2127e115
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 384021a94c4..b62cc9607a3 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210326.042006-118-runner.jar
-    md5: 3abb5a25c920606ce34d20d5ded879f2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210329.033557-121-runner.jar
+    md5: b5c090370e64926627b60f9a2424e8df
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 3826c52af1d..4a682d6df3f 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210326.042120-118-runner.jar
-    md5: e5ce173afce579cc2646e3d7e0404eb8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210329.033702-121-runner.jar
+    md5: 69b0c6cecc700ff65af057a81ea32252
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 97246e39aef..b299176d4c4 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210326.042522-31-runner.jar
-    md5: 275f10f66d43aebd0b2b510036b89a7c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210329.034047-34-runner.jar
+    md5: 839defcbbcb8d317c970a230d6ef15dc
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index bb9ec6528d2..066091b6305 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210326.042556-31-runner.jar
-    md5: 338d934af89f84043c5d9670cd3d5cb2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210329.034121-34-runner.jar
+    md5: 4523789a187b906c4089799faa1c2523
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6a77cfd7991..bb2a21aaabe 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210326.042042-118-runner.jar
-    md5: 8af685b58351df44773181c86db4a60c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210329.033628-121-runner.jar
+    md5: c2a490b742c2a5eac7b5b082be3bcbfc
 
 execute:
   - script: configure

From ff1ca465f827ab586044aa666e74f2b0b4ca92c6 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 30 Mar 2021 09:46:50 -0300
Subject: [PATCH 268/709] Updated Maven artifacts (#415)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index b99a524c8bf..a24976c84d9 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210329.033043-121-runner.jar
-    md5: 7162e39ec8b827a8749233f713abef1a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210330.034543-122-runner.jar
+    md5: 428920154524e8da8a3e748c0fd69bb3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index bf9f331f845..acff124c83a 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210329.033159-121-runner.jar
-    md5: bcb0620ca61018547ea4ca263330c6b9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210330.034657-122-runner.jar
+    md5: 603626b329effc21f02f56a29e3ec5e7
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 26033027fcd..31dc18f3db7 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210329.033904-121-runner.jar
-    md5: 4693fd9ef1c9dd95981f43c1a44005e1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210330.035420-122-runner.jar
+    md5: eaca717e57204cc741dddb5d7d4b8f75
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210329.033831-118-runner.jar
-    md5: fda27d6d1c432745b8b0a3435545148e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210330.035342-119-runner.jar
+    md5: 7a5e49364da324599ae904db129f5197
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 926846f4629..1f3df4790de 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210329.034217-63-runner.jar
-    md5: 430824ad85e7bd72ce3d49caac9c725e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210330.035737-64-runner.jar
+    md5: 36ba540be954db5629eca3d3666841ca
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 27d3e5e30ed..099f66d7f7e 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210329.032859-119-runner.jar
-    md5: f936bc840803d1abdd2b6ecf2127e115
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210330.034406-120-runner.jar
+    md5: 727d6328c50db9e1e1393906bb221e43
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index b62cc9607a3..e7ec12b5560 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210329.033557-121-runner.jar
-    md5: b5c090370e64926627b60f9a2424e8df
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210330.035100-122-runner.jar
+    md5: f20a2eac228196fba794522ed0d4973c
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 4a682d6df3f..36778e7ebd3 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210329.033702-121-runner.jar
-    md5: 69b0c6cecc700ff65af057a81ea32252
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210330.035211-122-runner.jar
+    md5: 1c657cde440625328d9c398a39d781c5
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index b299176d4c4..0655752e213 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210329.034047-34-runner.jar
-    md5: 839defcbbcb8d317c970a230d6ef15dc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210330.035611-35-runner.jar
+    md5: 12089069bf8f51cdb6eda9c20438ec7f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 066091b6305..ceeeba2eb67 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210329.034121-34-runner.jar
-    md5: 4523789a187b906c4089799faa1c2523
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210330.035644-35-runner.jar
+    md5: e93c385cc6ffafed89e391bd93d99625
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index bb2a21aaabe..921840eb4cb 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210329.033628-121-runner.jar
-    md5: c2a490b742c2a5eac7b5b082be3bcbfc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210330.035133-122-runner.jar
+    md5: 4b5c277c62eae1d8e9fa0e6fea031d6e
 
 execute:
   - script: configure

From a321abc61f39bd38ddfc9053bfebb9e6cee807d6 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 1 Apr 2021 16:17:43 +0200
Subject: [PATCH 269/709] Updated reviewers bot file (#418)

---
 .github/bot-files/reviewers.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/bot-files/reviewers.yml b/.github/bot-files/reviewers.yml
index bf733b7098a..0d8cfd8aaac 100644
--- a/.github/bot-files/reviewers.yml
+++ b/.github/bot-files/reviewers.yml
@@ -3,9 +3,12 @@
 
 review:
   - paths:
-      - anything/**
+      - Jenkinsfile*
+      - .jenkins
+      - .github
     reviewers:
-      - Kaitou786
+      - radtriste
+      - msmagnanijr
 default:
-  - Kaitou786
-  - spolti
\ No newline at end of file
+  - spolti
+  - vaibhavjainwiz
\ No newline at end of file

From abfe149de6859d9726de2486407d80e894c2b7d7 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:33:05 -0300
Subject: [PATCH 270/709] Updated Maven artifacts (#422)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index a24976c84d9..cc71501a2d9 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210330.034543-122-runner.jar
-    md5: 428920154524e8da8a3e748c0fd69bb3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210401.081805-124-runner.jar
+    md5: 04364563167baa919c0b0164387ca03f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index acff124c83a..4677ff6a99b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210330.034657-122-runner.jar
-    md5: 603626b329effc21f02f56a29e3ec5e7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210401.081929-124-runner.jar
+    md5: 3b963235d2641911c90bdf2d1ec5c67d
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 31dc18f3db7..80907c1ce13 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210330.035420-122-runner.jar
-    md5: eaca717e57204cc741dddb5d7d4b8f75
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210401.082834-124-runner.jar
+    md5: 227b73ca081320ef7307e34eb0c4ec8e
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210330.035342-119-runner.jar
-    md5: 7a5e49364da324599ae904db129f5197
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210401.082753-121-runner.jar
+    md5: b2e813c0b5d14cc34857e5ad56552704
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 1f3df4790de..4cd3d99c782 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210330.035737-64-runner.jar
-    md5: 36ba540be954db5629eca3d3666841ca
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210401.083228-66-runner.jar
+    md5: b682b827af9b7b58daa151e5e2896d1a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 099f66d7f7e..aa9b8078cee 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210330.034406-120-runner.jar
-    md5: 727d6328c50db9e1e1393906bb221e43
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210401.081618-122-runner.jar
+    md5: e97efaa40f56427eca276c023214194b
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e7ec12b5560..307f51fbd81 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210330.035100-122-runner.jar
-    md5: f20a2eac228196fba794522ed0d4973c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210401.082451-124-runner.jar
+    md5: 3d5a1dcb01b9e342ab53c64f75c1c23f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 36778e7ebd3..e44f3fe5a23 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210330.035211-122-runner.jar
-    md5: 1c657cde440625328d9c398a39d781c5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210401.082607-124-runner.jar
+    md5: 807e736f7fd4545ef5ef92e79613c208
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 0655752e213..98ccb3a4570 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210330.035611-35-runner.jar
-    md5: 12089069bf8f51cdb6eda9c20438ec7f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210401.083042-37-runner.jar
+    md5: d12f7f21b22902eeb9d2ab0094af960a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index ceeeba2eb67..3d154dedac7 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210330.035644-35-runner.jar
-    md5: e93c385cc6ffafed89e391bd93d99625
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210401.083121-37-runner.jar
+    md5: 168d5399a1891db86ca449b5afc397f3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 921840eb4cb..c500d9d7fae 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210330.035133-122-runner.jar
-    md5: 4b5c277c62eae1d8e9fa0e6fea031d6e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210401.082527-124-runner.jar
+    md5: 890f812a84837ad39e21264642de5f08
 
 execute:
   - script: configure

From a6ec8d44c6aea89754a6d461792c27abfb0ac022 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:42:41 -0300
Subject: [PATCH 271/709] Updated Maven artifacts (#425)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>

From 8e19e6c041c97df0e538b9662cd4015ec4e60cb9 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:44:12 -0300
Subject: [PATCH 272/709] Updated Maven artifacts (#419)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>

From 040e79a8d4662886cc52b7055749f2339b7c2386 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 16 Apr 2021 14:32:59 -0300
Subject: [PATCH 273/709] Updated Maven artifacts (#431)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index cc71501a2d9..50de58a8538 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210401.081805-124-runner.jar
-    md5: 04364563167baa919c0b0164387ca03f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210416.045408-125-runner.jar
+    md5: c5f013268b712311e1b521c1dfd38fd9
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 4677ff6a99b..28af05d83a5 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210401.081929-124-runner.jar
-    md5: 3b963235d2641911c90bdf2d1ec5c67d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210416.045522-125-runner.jar
+    md5: 4679560b555d16b996fcfcbe6f059660
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 80907c1ce13..e8347ff921e 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210401.082834-124-runner.jar
-    md5: 227b73ca081320ef7307e34eb0c4ec8e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210416.050314-125-runner.jar
+    md5: 940dd8f21714c20adb3df8e7312ce99f
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210401.082753-121-runner.jar
-    md5: b2e813c0b5d14cc34857e5ad56552704
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210416.050237-122-runner.jar
+    md5: 3e5db3c65f769a05e040ec2a61fed543
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 4cd3d99c782..e5b91d48e52 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210401.083228-66-runner.jar
-    md5: b682b827af9b7b58daa151e5e2896d1a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210416.050648-67-runner.jar
+    md5: b17dff704e3d0c43243c94cacbec3098
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index aa9b8078cee..e44387ba447 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210401.081618-122-runner.jar
-    md5: e97efaa40f56427eca276c023214194b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210416.045233-123-runner.jar
+    md5: 5e47df7c2d65cfc4f20e4b432c814403
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 307f51fbd81..b962a806507 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210401.082451-124-runner.jar
-    md5: 3d5a1dcb01b9e342ab53c64f75c1c23f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210416.045952-125-runner.jar
+    md5: 109b38cac7eeb1731af67f710241ef3b
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index e44f3fe5a23..2048b1974d7 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210401.082607-124-runner.jar
-    md5: 807e736f7fd4545ef5ef92e79613c208
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210416.050104-125-runner.jar
+    md5: f6fc2b69b91eabf0711d4b2257dc9619
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 98ccb3a4570..c710e1d476b 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210401.083042-37-runner.jar
-    md5: d12f7f21b22902eeb9d2ab0094af960a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210416.050503-38-runner.jar
+    md5: aff48aace7c99098d4842b1b5d14d618
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 3d154dedac7..9bc03a42346 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210401.083121-37-runner.jar
-    md5: 168d5399a1891db86ca449b5afc397f3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210416.050540-38-runner.jar
+    md5: c0efa0b6c7fc74065921115f90f8071c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index c500d9d7fae..fc1a7590c98 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210401.082527-124-runner.jar
-    md5: 890f812a84837ad39e21264642de5f08
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210416.050026-125-runner.jar
+    md5: 9175968a5d3044ca17f70e9197d68020
 
 execute:
   - script: configure

From 5ffcfee2a3e755a1e8cd255018c0d6f454d9d371 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 19 Apr 2021 12:31:12 -0300
Subject: [PATCH 274/709] Updated Maven artifacts (#435)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 4 ++--
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 50de58a8538..4856fc7b667 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210416.045408-125-runner.jar
-    md5: c5f013268b712311e1b521c1dfd38fd9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210419.053248-127-runner.jar
+    md5: 5685589e4376aa4175970959981b3663
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 28af05d83a5..71ae892a0b8 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210416.045522-125-runner.jar
-    md5: 4679560b555d16b996fcfcbe6f059660
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210419.053356-127-runner.jar
+    md5: 22901793d137b210843fb5f4dc624ebf
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index e8347ff921e..15da3a12b2f 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210416.050314-125-runner.jar
-    md5: 940dd8f21714c20adb3df8e7312ce99f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210419.054220-127-runner.jar
+    md5: 73b4787bd24dbe1d61872d8e84173ae0
   - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210416.050237-122-runner.jar
-    md5: 3e5db3c65f769a05e040ec2a61fed543
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210419.054142-124-runner.jar
+    md5: 92f9b860ab47340427ed0684c26516a8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index e5b91d48e52..0062735b8a2 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210416.050648-67-runner.jar
-    md5: b17dff704e3d0c43243c94cacbec3098
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210419.054557-69-runner.jar
+    md5: bfde90f15cb95fbf9d644f0546569ee6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index e44387ba447..1dd487b9c5b 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210416.045233-123-runner.jar
-    md5: 5e47df7c2d65cfc4f20e4b432c814403
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210419.053115-125-runner.jar
+    md5: 546b78495b5800b55ae75ce52cee0355
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index b962a806507..41527474cf5 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210416.045952-125-runner.jar
-    md5: 109b38cac7eeb1731af67f710241ef3b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210419.053852-127-runner.jar
+    md5: 0d9016c48b795d0ed90ce4f9ef774610
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 2048b1974d7..b032f60102f 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210416.050104-125-runner.jar
-    md5: f6fc2b69b91eabf0711d4b2257dc9619
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210419.054005-127-runner.jar
+    md5: 93c5da451e309bc3a48c001616c28b4e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index c710e1d476b..5cd101467e8 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210416.050503-38-runner.jar
-    md5: aff48aace7c99098d4842b1b5d14d618
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210419.054417-40-runner.jar
+    md5: 4ec0f885d9e423e7434f466752a66218
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 9bc03a42346..769c8605891 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210416.050540-38-runner.jar
-    md5: c0efa0b6c7fc74065921115f90f8071c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210419.054451-40-runner.jar
+    md5: c37b77d5ca2e302c80b556e6be58c93f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index fc1a7590c98..8eb98d9d6a0 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210416.050026-125-runner.jar
-    md5: 9175968a5d3044ca17f70e9197d68020
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210419.053927-127-runner.jar
+    md5: 8207f6571c2185a8c1c3241b3f5495fe
 
 execute:
   - script: configure

From d2dee70ce303bf3110b4625b0a6af8666cbacf6c Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 28 Apr 2021 14:10:21 +0200
Subject: [PATCH 275/709] KOGITO-5009 Updated jobs-service jar name (#439)

---
 .../added/kogito-app-launch.sh                 |  2 +-
 modules/kogito-data-index-infinispan/configure |  2 +-
 .../kogito-data-index-infinispan/module.yaml   |  6 +++---
 .../added/kogito-app-launch.sh                 |  2 +-
 modules/kogito-data-index-mongodb/configure    |  2 +-
 modules/kogito-data-index-mongodb/module.yaml  |  6 +++---
 .../added/launch/kogito-explainability.sh      |  2 +-
 modules/kogito-explainability/configure        |  4 ++--
 modules/kogito-explainability/module.yaml      | 12 ++++++------
 .../tests/bats/kogito-explainability.bats      |  6 +++---
 .../added/kogito-app-launch.sh                 |  2 +-
 modules/kogito-jit-runner/configure            |  2 +-
 modules/kogito-jit-runner/module.yaml          |  6 +++---
 .../added/kogito-app-launch.sh                 |  2 +-
 .../added/launch/kogito-jobs-service.sh        |  5 ++++-
 modules/kogito-jobs-service/configure          |  3 ++-
 modules/kogito-jobs-service/module.yaml        |  9 ++++++---
 .../tests/bats/kogito-jobs-service.bats        | 18 ++++++++++++++----
 .../added/kogito-app-launch.sh                 |  2 +-
 modules/kogito-management-console/configure    |  2 +-
 modules/kogito-management-console/module.yaml  |  6 +++---
 .../added/kogito-app-launch.sh                 |  2 +-
 modules/kogito-task-console/configure          |  2 +-
 modules/kogito-task-console/module.yaml        |  6 +++---
 .../added/kogito-app-launch.sh                 |  2 +-
 modules/kogito-trusty-infinispan/configure     |  2 +-
 modules/kogito-trusty-infinispan/module.yaml   |  6 +++---
 .../added/kogito-app-launch.sh                 |  2 +-
 modules/kogito-trusty-redis/configure          |  2 +-
 modules/kogito-trusty-redis/module.yaml        |  6 +++---
 .../added/kogito-app-launch.sh                 |  2 +-
 modules/kogito-trusty-ui/configure             |  2 +-
 modules/kogito-trusty-ui/module.yaml           |  6 +++---
 scripts/update-maven-artifacts.py              |  7 ++++---
 .../kogito-data-index-infinispan.feature       |  2 +-
 .../kogito-data-index-mongodb.feature          |  2 +-
 tests/features/kogito-explainability.feature   | 10 ++++------
 tests/features/kogito-jit-runner.feature       |  4 ++--
 tests/features/kogito-jobs-service.feature     | 12 ++++++++----
 .../features/kogito-management-console.feature |  6 +++---
 tests/features/kogito-task-console.feature     |  6 +++---
 tests/features/kogito-trusty-ui.feature        |  6 +++---
 .../trusty/kogito-trusty-infinispan.feature    |  4 ++--
 .../trusty/kogito-trusty-redis.feature         |  2 +-
 44 files changed, 111 insertions(+), 91 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
index 5a79672441b..97ea54c7129 100644
--- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
@@ -24,4 +24,4 @@ exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUST
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/data-index-service-infinispan.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/data-index-service-infinispan-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-infinispan/configure b/modules/kogito-data-index-infinispan/configure
index ef5c9643efb..7a15744634b 100644
--- a/modules/kogito-data-index-infinispan/configure
+++ b/modules/kogito-data-index-infinispan/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/data-index-service-infinispan.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/data-index-service-infinispan-runner.jar "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 4856fc7b667..31f9c04ce98 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.dataindex.infinispan
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: data-index-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210419.053248-127-runner.jar
-    md5: 5685589e4376aa4175970959981b3663
+  - name: data-index-service-infinispan-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210427.034917-132-runner.jar
+    md5: 9262bdca4fd6979f4f56ab79885165fd
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index 0d8d8f99b82..36f053c2b1c 100644
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -24,4 +24,4 @@ exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUST
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/data-index-service-mongodb.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/data-index-service-mongodb-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-mongodb/configure b/modules/kogito-data-index-mongodb/configure
index 22738004df2..00fbaf97492 100644
--- a/modules/kogito-data-index-mongodb/configure
+++ b/modules/kogito-data-index-mongodb/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/data-index-service-mongodb.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/data-index-service-mongodb-runner.jar "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 71ae892a0b8..c6a35fec4dd 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.dataindex.mongodb
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: data-index-service-mongodb.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210419.053356-127-runner.jar
-    md5: 22901793d137b210843fb5f4dc624ebf
+  - name: data-index-service-mongodb-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210427.035034-131-runner.jar
+    md5: 9c0c958000bb062ee403050997398bfe
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/added/launch/kogito-explainability.sh b/modules/kogito-explainability/added/launch/kogito-explainability.sh
index bbeccfafdee..5cb2c7f94a5 100644
--- a/modules/kogito-explainability/added/launch/kogito-explainability.sh
+++ b/modules/kogito-explainability/added/launch/kogito-explainability.sh
@@ -22,5 +22,5 @@ function configure_explainability_jar {
     fi
 
     log_info "Explainability communication is set to ${communication}"
-    EXPLAINABILITY_SERVICE_JAR="kogito-explainability-${communication,,}-runner.jar"
+    EXPLAINABILITY_SERVICE_JAR="explainability-service-${communication,,}-runner.jar"
 }
diff --git a/modules/kogito-explainability/configure b/modules/kogito-explainability/configure
index 8a1832dcdeb..d2542b11cae 100644
--- a/modules/kogito-explainability/configure
+++ b/modules/kogito-explainability/configure
@@ -5,8 +5,8 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/kogito-explainability-rest-runner.jar "${KOGITO_HOME}"/bin/
-cp -v "${SOURCES_DIR}"/kogito-explainability-messaging-runner.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/explainability-service-rest-runner.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/explainability-service-messaging-runner.jar "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 15da3a12b2f..c8bf9d3479c 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -3,12 +3,12 @@ name: org.kie.kogito.explainability
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: kogito-explainability-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210419.054220-127-runner.jar
-    md5: 73b4787bd24dbe1d61872d8e84173ae0
-  - name: kogito-explainability-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210419.054142-124-runner.jar
-    md5: 92f9b860ab47340427ed0684c26516a8
+  - name: explainability-service-rest-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210427.035903-132-runner.jar
+    md5: 0418139ad7b9101b0db29873417d6d7b
+  - name: explainability-service-messaging-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210427.035829-129-runner.jar
+    md5: 4f6f169c94b571168a5b422d9308ef17
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/tests/bats/kogito-explainability.bats b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
index ef7cab617db..733158339bb 100644
--- a/modules/kogito-explainability/tests/bats/kogito-explainability.bats
+++ b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
@@ -15,7 +15,7 @@ teardown() {
 
 @test "test if the default explainability communication type is correctly set" {
     configure_explainability_jar
-    expected="kogito-explainability-messaging-runner.jar"
+    expected="explainability-service-messaging-runner.jar"
     echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
     [ "${EXPLAINABILITY_SERVICE_JAR}" = "${expected}" ]
 }
@@ -23,7 +23,7 @@ teardown() {
 @test "test if explainability communication service default value is correctly set if a nonsense type is set" {
     EXPLAINABILITY_COMMUNICATION="nonsense"
     configure_explainability_jar
-    expected="kogito-explainability-messaging-runner.jar"
+    expected="explainability-service-messaging-runner.jar"
     echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
     [ "${EXPLAINABILITY_SERVICE_JAR}" = "${expected}" ]
 }
@@ -31,7 +31,7 @@ teardown() {
 @test "test if explainability communication service default value s correctly set if set to rest" {
     EXPLAINABILITY_COMMUNICATION="rest"
     configure_explainability_jar
-    expected="kogito-explainability-rest-runner.jar"
+    expected="explainability-service-rest-runner.jar"
     echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
     [ "${EXPLAINABILITY_SERVICE_JAR}" = "${expected}" ]
 }
\ No newline at end of file
diff --git a/modules/kogito-jit-runner/added/kogito-app-launch.sh b/modules/kogito-jit-runner/added/kogito-app-launch.sh
index d69f91dfcb3..ddfe15db199 100644
--- a/modules/kogito-jit-runner/added/kogito-app-launch.sh
+++ b/modules/kogito-jit-runner/added/kogito-app-launch.sh
@@ -24,4 +24,4 @@ exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JIT_RUNNER_PROPS} ${CUST
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/kogito-jit-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/jitexecutor-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-jit-runner/configure b/modules/kogito-jit-runner/configure
index 83918216ca7..ef97f8daf42 100644
--- a/modules/kogito-jit-runner/configure
+++ b/modules/kogito-jit-runner/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/kogito-jit-runner.jar "${KOGITO_HOME}"/bin/
+cp -v ${SOURCES_DIR}/jitexecutor-runner.jar "${KOGITO_HOME}"/bin/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 0062735b8a2..cb045d1bfa2 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.jit-runner
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: kogito-jit-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210419.054557-69-runner.jar
-    md5: bfde90f15cb95fbf9d644f0546569ee6
+  - name: jitexecutor-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210427.040245-74-runner.jar
+    md5: 7b78828ef2709d55e2c5244d284d2f84
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/added/kogito-app-launch.sh b/modules/kogito-jobs-service/added/kogito-app-launch.sh
index 98b2989ed7e..9e1e4971e14 100644
--- a/modules/kogito-jobs-service/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service/added/kogito-app-launch.sh
@@ -24,4 +24,4 @@ source "${KOGITO_HOME}"/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
     -Dquarkus.http.host=0.0.0.0 \
     -Dquarkus.http.port=8080 \
-    -jar "${KOGITO_HOME}"/bin/kogito-jobs-service-runner.jar
+    -jar "${KOGITO_HOME}"/bin/"${JOBS_SERVICE_JAR}"
diff --git a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
index cccf844d0e2..5db385b3d6e 100644
--- a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
+++ b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
@@ -11,11 +11,14 @@ function configure() {
 
 
 function configure_jobs_service() {
+    local persistence='common'
     if [ "${ENABLE_PERSISTENCE^^}" == "TRUE" ]; then
-       KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dkogito.jobs-service.persistence=infinispan"
+        persistence='infinispan'
     fi
 
     if [ "${ENABLE_EVENTS^^}" == "TRUE" ]; then
         KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.profile=events-support"
     fi
+
+    JOBS_SERVICE_JAR="jobs-service-${persistence}-runner.jar"
 }
diff --git a/modules/kogito-jobs-service/configure b/modules/kogito-jobs-service/configure
index 956d07b97f8..db98e6eade1 100644
--- a/modules/kogito-jobs-service/configure
+++ b/modules/kogito-jobs-service/configure
@@ -5,7 +5,8 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/kogito-jobs-service-runner.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/jobs-service-infinispan-runner.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/jobs-service-common-runner.jar "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 1dd487b9c5b..df1adb52b93 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -3,9 +3,12 @@ name: org.kie.kogito.jobs.service
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: kogito-jobs-service-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service/2.0.0-SNAPSHOT/jobs-service-2.0.0-20210419.053115-125-runner.jar
-    md5: 546b78495b5800b55ae75ce52cee0355
+  - name: jobs-service-common-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210427.034550-5-runner.jar
+    md5: f49fc37c8fa07d1f774bd54380c0a71b
+  - name: jobs-service-infinispan-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210427.034646-5-runner.jar
+    md5: dcb82580ba7d867b9416a12633dafbc4
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
index df0f9b6a742..b7173b0bb4a 100644
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
@@ -13,18 +13,28 @@ teardown() {
     rm -rf "${KOGITO_HOME}"
 }
 
-@test "check if the persistence is correctly configured with auth" {
+@test "check default jobs service" {
+    configure_jobs_service
+
+    result="${JOBS_SERVICE_JAR}"
+    expected="jobs-service-common-runner.jar"
+
+    echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
+
+@test "check if the persistence is correctly configured on jobs service" {
     export ENABLE_PERSISTENCE="true"
     configure_jobs_service
 
-    result="${KOGITO_JOBS_PROPS}"
-    expected=" -Dkogito.jobs-service.persistence=infinispan"
+    result="${JOBS_SERVICE_JAR}"
+    expected="jobs-service-infinispan-runner.jar"
 
     echo "Result is ${result} and expected is ${expected}"
     [ "${result}" = "${expected}" ]
 }
 
-@test "check if the event is correctly set" {
+@test "check if the event is correctly set on jobs service" {
     export ENABLE_EVENTS="true"
     configure_jobs_service
 
diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
index e21eaea4112..551612fdd15 100644
--- a/modules/kogito-management-console/added/kogito-app-launch.sh
+++ b/modules/kogito-management-console/added/kogito-app-launch.sh
@@ -24,4 +24,4 @@ source "${KOGITO_HOME}"/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/kogito-management-console-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/management-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-management-console/configure b/modules/kogito-management-console/configure
index dce541167fd..098a0655efe 100644
--- a/modules/kogito-management-console/configure
+++ b/modules/kogito-management-console/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/kogito-management-console-runner.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/management-console-runner.jar "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 41527474cf5..c3796d19d02 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.management.console
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: kogito-management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210419.053852-127-runner.jar
-    md5: 0d9016c48b795d0ed90ce4f9ef774610
+  - name: management-console-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210427.035600-132-runner.jar
+    md5: bb48f15c1a95b558513246ae85629138
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh
index fba166248e3..2436ed1e110 100644
--- a/modules/kogito-task-console/added/kogito-app-launch.sh
+++ b/modules/kogito-task-console/added/kogito-app-launch.sh
@@ -24,4 +24,4 @@ source "${KOGITO_HOME}"/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/kogito-task-console-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/task-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-task-console/configure b/modules/kogito-task-console/configure
index 30283ddb0e5..4e28e7122f7 100644
--- a/modules/kogito-task-console/configure
+++ b/modules/kogito-task-console/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/kogito-task-console-runner.jar "${KOGITO_HOME}"/bin/
+cp -v ${SOURCES_DIR}/task-console-runner.jar "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index b032f60102f..a49650a7a3d 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.task.console
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: kogito-task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210419.054005-127-runner.jar
-    md5: 93c5da451e309bc3a48c001616c28b4e
+  - name: task-console-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210427.035705-132-runner.jar
+    md5: 974ac5701c8208644cfc379fd792827d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
index e412b09b424..46f01bce0d7 100644
--- a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
@@ -25,4 +25,4 @@ exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_T
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/trusty-service-infinispan.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/trusty-service-infinispan-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/configure b/modules/kogito-trusty-infinispan/configure
index 5dd0478c97a..9516a7f88f3 100644
--- a/modules/kogito-trusty-infinispan/configure
+++ b/modules/kogito-trusty-infinispan/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/trusty-service-infinispan.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/trusty-service-infinispan-runner.jar "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 5cd101467e8..f51b585897a 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.trusty.infinispan
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: trusty-service-infinispan.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210419.054417-40-runner.jar
-    md5: 4ec0f885d9e423e7434f466752a66218
+  - name: trusty-service-infinispan-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210427.040102-45-runner.jar
+    md5: 7ea7f025ddec1979dd89107f1d06deb6
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/added/kogito-app-launch.sh b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
index 6a9c57d0dd0..ea4df0a4ffc 100644
--- a/modules/kogito-trusty-redis/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
@@ -25,4 +25,4 @@ exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_T
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/trusty-service-redis.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/trusty-service-redis-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-redis/configure b/modules/kogito-trusty-redis/configure
index 004ec659b79..2dfd8d9465f 100644
--- a/modules/kogito-trusty-redis/configure
+++ b/modules/kogito-trusty-redis/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/trusty-service-redis.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/trusty-service-redis-runner.jar "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 769c8605891..1c315cb08c7 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.trusty.redis
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: trusty-service-redis.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210419.054451-40-runner.jar
-    md5: c37b77d5ca2e302c80b556e6be58c93f
+  - name: trusty-service-redis-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210427.040138-45-runner.jar
+    md5: 25eca4cd20d7881f32f68a13ee41d3a1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
index b7c91b9678f..20b604651a6 100644
--- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
@@ -25,4 +25,4 @@ source "${KOGITO_HOME}"/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/kogito-trusty-ui-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/trusty-ui-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-ui/configure b/modules/kogito-trusty-ui/configure
index d6694aacc99..195e7cd5797 100644
--- a/modules/kogito-trusty-ui/configure
+++ b/modules/kogito-trusty-ui/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/kogito-trusty-ui-runner.jar "${KOGITO_HOME}"/bin/
+cp -v ${SOURCES_DIR}/trusty-ui-runner.jar "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 8eb98d9d6a0..6da8dc5aa2e 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.trusty.ui
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: kogito-trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210419.053927-127-runner.jar
-    md5: 8207f6571c2185a8c1c3241b3f5495fe
+  - name: trusty-ui-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210427.035631-132-runner.jar
+    md5: be6c08d41eab17c2af5ca09e0f468bda
 
 execute:
   - script: configure
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 14a28a1ffcc..64ba544eb60 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -30,7 +30,8 @@
     "trusty-service-redis": "kogito-trusty-redis",
     "explainability-service-rest": "kogito-explainability",
     "explainability-service-messaging": "kogito-explainability",
-    "jobs-service": "kogito-jobs-service",
+    "jobs-service-infinispan": "kogito-jobs-service",
+    "jobs-service-common": "kogito-jobs-service",
     "management-console": "kogito-management-console",
     "task-console": "kogito-task-console",
     "trusty-ui": "kogito-trusty-ui",
@@ -107,14 +108,14 @@ def checkUrl(url):
 def update_artifacts(service,modulePath):
     '''
     Updates the module.yaml file of services with latest artifacts. When an image contains more than one jar, the correct one is selected by
-    checking if the name of the service is contained in the url of the artifact. 
+    checking if the name of the service is contained in the name of the artifact. 
     :param service: Service information (repo_url, version, name)
     :param modulePath: relative file location of the module.yaml for the kogito service
     '''
 
     with open(modulePath) as module:
         data=common.yaml_loader().load(module)
-        artifact = next(filter(lambda x: service['name'] in x['url'], data['artifacts']))
+        artifact = next(filter(lambda x: service['name'] in x['name'], data['artifacts']))
         artifact['url']=getRunnerURL(service)
         artifact['md5']=getMD5(service)
     with open(modulePath, 'w') as module:
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index ad92d02bf69..b261013f725 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -13,7 +13,7 @@ Feature: Kogito-data-index infinispan feature.
 
   Scenario: verify if the indexing service binaries are available on /home/kogito/bin
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-infinispan.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-infinispan.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-infinispan-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-infinispan-runner.jar
 
   Scenario: verify if all parameters are correctly set
     When container is started with env
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
index 9ab3e5b9159..503ec506b70 100644
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -13,7 +13,7 @@ Feature: Kogito-data-index mongodb feature.
 
   Scenario: verify if the indexing service binaries are available on /home/kogito/bin
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-mongodb.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-mongodb.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-mongodb-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-mongodb-runner.jar
 
   Scenario: verify if all parameters are correctly set
     When container is started with env
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index d78298db77d..59d509ed72f 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -13,26 +13,24 @@ Feature: Kogito-explainability feature.
 
   Scenario: verify if the messaging binary is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-explainability-messaging-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-explainability-messaging-runner.jar
-    And run sh -c 'ls /home/kogito/bin/kogito-explainability-rest-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-explainability-rest-runner.jar
-
+    Then run sh -c 'ls /home/kogito/bin/explainability-service-messaging-runner.jar' in container and immediately check its output for /home/kogito/bin/explainability-service-messaging-runner.jar
 
   Scenario: verify if the rest binary is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-explainability-rest-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-explainability-rest-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/explainability-service-rest-runner.jar' in container and immediately check its output for /home/kogito/bin/explainability-service-rest-runner.jar
 
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-explainability-messaging-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/explainability-service-messaging-runner.jar
 
   Scenario: Verify if the explainability rest binary is selected by the enviroment variable EXPLAINABILITY_COMMUNICATION
     When container is started with env
       | variable      | value |
       | EXPLAINABILITY_COMMUNICATION  | rest |
       | SCRIPT_DEBUG  | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-explainability-rest-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/explainability-service-rest-runner.jar
 
   Scenario: Verify if the communication is correctly set to its default value if a wrong communication type is set
     When container is started with env
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index 3ac2f656141..662ca0935a7 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -13,13 +13,13 @@ Feature: Kogito-jit-runner feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-jit-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-jit-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/jitexecutor-runner.jar' in container and immediately check its output for /home/kogito/bin/jitexecutor-runner.jar
 
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-jit-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jitexecutor-runner.jar
 
   Scenario: Verify that jit runner can evaluate a DMN model with a context
     When container is started with env
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 9d7b5863798..3603522f0ef 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -11,15 +11,19 @@ Feature: Kogito-jobs-service feature.
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service
     And the image should contain label io.openshift.tags with value kogito,jobs-service
 
-  Scenario: verify if the jobs service binary is available on /home/kogito/bin
+  Scenario: verify if the jobs service common binary is available on /home/kogito/bin
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-jobs-service-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-jobs-service-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/jobs-service-common-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-common-runner.jar
+  
+  Scenario: verify if the jobs service infinispan binary is available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/jobs-service-infinispan-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-infinispan-runner.jar
 
   Scenario: Verify if the debug is correctly enabled
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-jobs-service-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-common-runner.jar
     And container log should contain started in
     And container log should not contain Application failed to start
 
@@ -44,7 +48,7 @@ Feature: Kogito-jobs-service feature.
       | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain kogito.jobs-service.persistence=infinispan
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-infinispan-runner.jar
     Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
     Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index 73fb675a8bd..0553bea5183 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -13,13 +13,13 @@ Feature: kogito-management-console feature
 
   Scenario: verify if the management console jar is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-management-console-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-management-console-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/management-console-runner.jar' in container and immediately check its output for /home/kogito/bin/management-console-runner.jar
 
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-management-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/management-console-runner.jar
     And container log should contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
@@ -29,7 +29,7 @@ Feature: kogito-management-console feature
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-management-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/management-console-runner.jar
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index fa6332b8082..5cf37d9fd1c 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -13,13 +13,13 @@ Feature: kogito-task-console feature
 
   Scenario: verify if the task console jar is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-task-console-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-task-console-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/task-console-runner.jar' in container and immediately check its output for /home/kogito/bin/task-console-runner.jar
 
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-task-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/task-console-runner.jar
     And container log should contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
@@ -29,7 +29,7 @@ Feature: kogito-task-console feature
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-task-console-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/task-console-runner.jar
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/kogito-trusty-ui.feature b/tests/features/kogito-trusty-ui.feature
index dd437a4c113..0f522ef9cc1 100644
--- a/tests/features/kogito-trusty-ui.feature
+++ b/tests/features/kogito-trusty-ui.feature
@@ -13,13 +13,13 @@ Feature: kogito-trusty-ui feature
 
   Scenario: verify if the trusty ui jar is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/kogito-trusty-ui-runner.jar' in container and immediately check its output for /home/kogito/bin/kogito-trusty-ui-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/trusty-ui-runner.jar' in container and immediately check its output for /home/kogito/bin/trusty-ui-runner.jar
 
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-ui-runner.jar
     And container log should contain Trusty url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
@@ -29,7 +29,7 @@ Feature: kogito-trusty-ui feature
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_TRUSTY_ENDPOINT | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/kogito-trusty-ui-runner.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-ui-runner.jar
     And container log should not contain Trusty url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
index 75e845988dc..2d596b0e85b 100644
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -13,14 +13,14 @@ Feature: Kogito-trusty infinispan feature.
 
   Scenario: verify if the binary index is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/trusty-service-infinispan.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-infinispan.jar
+    Then run sh -c 'ls /home/kogito/bin/trusty-service-infinispan-runner.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-infinispan-runner.jar
 
   Scenario: Verify if the explainability messaging is disabled
     When container is started with env
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
       | EXPLAINABILITY_ENABLED     | false  |
-    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-service-infinispan.jar
+    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-service-infinispan-runner.jar
 
   Scenario: verify if auth is correctly set
     When container is started with env
diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature
index 76d37991913..489a788d750 100644
--- a/tests/features/trusty/kogito-trusty-redis.feature
+++ b/tests/features/trusty/kogito-trusty-redis.feature
@@ -13,7 +13,7 @@ Feature: Kogito-trusty redis feature.
 
   Scenario: verify if the indexing service binaries are available on /home/kogito/bin
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/trusty-service-redis.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-redis.jar
+    Then run sh -c 'ls /home/kogito/bin/trusty-service-redis-runner.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-redis-runner.jar
 
   Scenario: verify if all parameters are correctly set
     When container is started with env

From e6c63d666d650ce62ea249fa54e16d83c42d8b42 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 29 Apr 2021 10:38:45 -0300
Subject: [PATCH 276/709] Updated Maven artifacts (#442)

Co-authored-by: Jenkins CI <jenkins@rhba-jenkins.rhev-ci-vms.eng.rdu2.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 8 ++++----
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 31f9c04ce98..8dbab4d6044 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210427.034917-132-runner.jar
-    md5: 9262bdca4fd6979f4f56ab79885165fd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210429.061620-134-runner.jar
+    md5: 66205155c4b1099d49aab7ee6a980133
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index c6a35fec4dd..8721c5bee2d 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210427.035034-131-runner.jar
-    md5: 9c0c958000bb062ee403050997398bfe
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210429.061732-133-runner.jar
+    md5: b1985346727119620d8a97fcde289ac0
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index c8bf9d3479c..f1fa96376f9 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210427.035903-132-runner.jar
-    md5: 0418139ad7b9101b0db29873417d6d7b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210429.062507-134-runner.jar
+    md5: 731adf53a7317162df110a1538bb497e
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210427.035829-129-runner.jar
-    md5: 4f6f169c94b571168a5b422d9308ef17
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210429.062435-131-runner.jar
+    md5: 04870eeccbd30cc515532f83706910f1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index cb045d1bfa2..e7821f08a44 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210427.040245-74-runner.jar
-    md5: 7b78828ef2709d55e2c5244d284d2f84
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210429.062829-76-runner.jar
+    md5: 262e326fccc2c136ff8321d9bc41696f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index df1adb52b93..03b1a12f996 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210427.034550-5-runner.jar
-    md5: f49fc37c8fa07d1f774bd54380c0a71b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210429.061304-7-runner.jar
+    md5: 9811739d77d96bd4a6767f406c810f78
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210427.034646-5-runner.jar
-    md5: dcb82580ba7d867b9416a12633dafbc4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210429.061355-7-runner.jar
+    md5: 8f9dc481f8579e91d1caa73c298f2422
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index c3796d19d02..58875eb7c7e 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210427.035600-132-runner.jar
-    md5: bb48f15c1a95b558513246ae85629138
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210429.062209-134-runner.jar
+    md5: 24133ce555e09e7614447c042eeb4136
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index a49650a7a3d..fd86c332e43 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210427.035705-132-runner.jar
-    md5: 974ac5701c8208644cfc379fd792827d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210429.062313-134-runner.jar
+    md5: f6516a0d03019cbf01eef38fb07c8299
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index f51b585897a..29f5a9fb023 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210427.040102-45-runner.jar
-    md5: 7ea7f025ddec1979dd89107f1d06deb6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210429.062645-47-runner.jar
+    md5: 9a3b76e528481d03995e162f12b513d9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 1c315cb08c7..bfa15c6ec2f 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210427.040138-45-runner.jar
-    md5: 25eca4cd20d7881f32f68a13ee41d3a1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210429.062719-47-runner.jar
+    md5: 7f85d5b1573981a1e06625dd66d1dc6f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6da8dc5aa2e..29ad4440ae9 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210427.035631-132-runner.jar
-    md5: be6c08d41eab17c2af5ca09e0f468bda
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210429.062240-134-runner.jar
+    md5: 9866e8ab0de7aaf24a0842f2c3f20c16
 
 execute:
   - script: configure

From b18231f79e0e8f83f6f05c2c0188c014c82d61f0 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 7 May 2021 14:53:04 -0300
Subject: [PATCH 277/709] [KOGITO-5088] - Upgrade GraalVM to 21.x on Kogito
 Images (#458)

Signed-off-by: spolti <fspolti@redhat.com>
---
 README.md                                     |  4 +--
 kogito-builder-overrides.yaml                 |  2 +-
 kogito-runtime-native-overrides.yaml          |  2 +-
 .../21.x-java-11/configure                    | 14 +++++++++++
 .../21.x-java-11/module.yaml                  | 25 +++++++++++++++++++
 modules/kogito-graalvm-scripts/module.yaml    |  2 +-
 rhpam-kogito-builder-rhel8-overrides.yaml     |  2 +-
 tests/features/kogito-builder-native.feature  |  2 +-
 .../kogito-common-builder-jvm.feature         |  4 +--
 9 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 modules/kogito-graalvm-installer/21.x-java-11/configure
 create mode 100644 modules/kogito-graalvm-installer/21.x-java-11/module.yaml

diff --git a/README.md b/README.md
index 65d1005e36b..591d7ef6549 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ To interact with Kogito images, you would need to install the needed dependencie
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
         * used to perform local s2i images using some of the [builder images](#builder-images)
-    * [GraalVM 20.2.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-20.2.0) Java 11 or higher
+    * [GraalVM 21.1.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-21.1.0) Java 11 or higher
         * Useful to test Kogito apps on native mode before create a Container image with it.
     * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
         
@@ -126,7 +126,7 @@ When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a
 
 The Kogito Builder Image is equipped with the following components:
 
- * GraalVM 20.2.0-java11
+ * GraalVM 21.1.0-java11
  * OpenJDK 11.0.6
  * Maven 3.6.2
  
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index f7d35ddca2e..993e127dc02 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -42,7 +42,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "20.2.0-java-11"
+    version: "21.1.0-java-11"
   - name: org.kie.kogito.graalvm.scripts
   - name: org.kie.kogito.openjdk
     version: "11"
diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-overrides.yaml
index 90b11beb701..5b1b274ceb4 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -35,7 +35,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "20.2.0-java-11"
+    version: "21.1.0-java-11"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.runtime.native
 
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/configure b/modules/kogito-graalvm-installer/21.x-java-11/configure
new file mode 100644
index 00000000000..939cb569277
--- /dev/null
+++ b/modules/kogito-graalvm-installer/21.x-java-11/configure
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+
+tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr/share/graalvm
+
+#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
+mkdir -p "${KOGITO_HOME}"/ssl-libs
+cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
+cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
+
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
new file mode 100644
index 00000000000..2ecd7a6f788
--- /dev/null
+++ b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
@@ -0,0 +1,25 @@
+schema_version: 1
+name: org.kie.kogito.graalvm.installer
+version: "21.1.0-java-11"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/usr/share/graalvm"
+  #version without prefix ce
+  - name: "GRAALVM_VERSION"
+    value: "21.1.0"
+  - name: "GRAALVM_JAVA_VERSION"
+    value: "11"
+
+artifacts:
+- name: graalvm-ce-java11-linux-amd64-21.1.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.1.0/graalvm-ce-java11-linux-amd64-21.1.0.tar.gz
+  md5: eac80a467219fc9f3496a7393c2863d2
+- name: native-image-installable-svm-java11-linux-amd64-21.1.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.1.0/native-image-installable-svm-java11-linux-amd64-21.1.0.jar
+  md5: 2e7d52eb8f2066594ada7b6a1f52be96
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml
index 706fb8148d8..4fa11507c50 100644
--- a/modules/kogito-graalvm-scripts/module.yaml
+++ b/modules/kogito-graalvm-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
-version: "20.2.0"
+version: "21.1.0"
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 64616192b51..463d77dd1e1 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -47,7 +47,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.graalvm.installer
-      version: "20.2.0-java-11"
+      version: "21.1.0-java-11"
     - name: org.kie.kogito.graalvm.scripts
     - name: org.kie.kogito.openjdk
       version: "11"
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index 7e1a170a8c3..2969f6029f5 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -12,7 +12,7 @@ Feature: kogito-builder image native build tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 20.2.0
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.1.0
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index 3f92bcf9b63..517bbf18e59 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -147,7 +147,7 @@ Feature: kogito-builder image JVM build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner.jar should exist
+    Then file /home/kogito/bin/quarkus-run.jar should exist
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |
@@ -167,7 +167,7 @@ Feature: kogito-builder image JVM build tests
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
-    Then file /home/kogito/bin/myproject-2.0-SNAPSHOT-runner.jar should exist
+    Then file /home/kogito/bin/quarkus-run.jar should exist
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |

From ae96fcc6b9c7109fc0ba9eccba6571f75a35a8f5 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 7 May 2021 15:43:41 -0300
Subject: [PATCH 278/709] [KOGITO-5056] - rhpam-kogito-builder-rhel8 image is
 using a wrong label (#449)

Signed-off-by: spolti <fspolti@redhat.com>
---
 rhpam-kogito-builder-rhel8-overrides.yaml       | 2 +-
 tests/features/rhpam-kogito-builder-jvm.feature | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 463d77dd1e1..9177ae269f2 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -7,7 +7,7 @@ description: "RHPAM Platform for building Kogito based on Quarkus or SpringBoot"
 
 labels:
   - name: "com.redhat.component"
-    value: "rhpam-7-kogito-runtime-jvm-rhel8-container"
+    value: "rhpam-7-kogito-builder-rhel8-container"
   - name: "io.k8s.description"
     value: "RHPAM Platform for building Kogito based on Quarkus or Spring Boot"
   - name: "io.k8s.display-name"
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index dc9dcc3ba4a..6f7fdfbd544 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -11,4 +11,4 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And the image should contain label io.k8s.display-name with value Red Hat build of Kogito builder based on Quarkus or SpringBoot
     And the image should contain label io.openshift.tags with value rhpam-kogito,builder,kogito,quarkus,springboot
     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
-    And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-jvm-rhel8-container
+    And the image should contain label com.redhat.component with value rhpam-7-kogito-builder-rhel8-container

From 4cd1762267b0b457f7ec703c01c5d730bcea311a Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 10 May 2021 16:08:05 +0200
Subject: [PATCH 279/709] Correct tests for productized artifacts (#457) (#463)

---
 Makefile                                      |  3 ++-
 scripts/common.py                             | 21 ++++++++++++++++---
 scripts/update-tests.py                       | 11 +++++++++-
 tests/features/kogito-builder-native.feature  |  2 +-
 tests/features/kogito-builder.feature         | 18 ++++++++++++++++
 .../kogito-common-builder-jvm.feature         | 19 -----------------
 .../kogito-common-runtime-jvm.feature         |  4 ++--
 tests/test-apps/clone-repo.sh                 | 10 ++++++++-
 8 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index bb8cdf8d124..2ebd602702a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,12 @@ SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"
 BUILD_ENGINE := docker
 .DEFAULT_GOAL := build
 CEKIT_CMD := cekit -v ${cekit_option}
+NATIVE := true
 
 clone-repos:
 # if the NO_TEST env defined, proceed with the tests, as first step prepare the repo to be used
 ifneq ($(ignore_test),true)
-	cd tests/test-apps && sh clone-repo.sh
+	cd tests/test-apps && sh clone-repo.sh $(NATIVE)
 endif
 
 .PHONY: list
diff --git a/scripts/common.py b/scripts/common.py
index 6528a735ee5..71344ff917f 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -31,8 +31,11 @@
 
 # behave tests that needs to be updated
 BEHAVE_BASE_DIR = 'tests/features'
-BEHAVE_TESTS = {"kogito-builder-native.feature", "kogito-common-builder-jvm.feature",
-                "kogito-common-runtime-jvm.feature", "kogito-runtime-native.feature"}
+BEHAVE_TESTS = {"kogito-builder.feature",
+                "kogito-builder-native.feature", 
+                "kogito-common-builder-jvm.feature",
+                "kogito-common-runtime-jvm.feature", 
+                "kogito-runtime-native.feature"}
 
 CLONE_REPO_SCRIPT = 'tests/test-apps/clone-repo.sh'
 
@@ -235,10 +238,22 @@ def update_artifacts_version_in_behave_tests(artifacts_version):
     """
     print("Set artifacts_version {} in behave tests".format(artifacts_version))
     # pattern to change the KOGITO_VERSION
-    pattern = re.compile('\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT))[\s]*\|')
+    pattern = re.compile('\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT)|([\d.]+.Final))[\s]*\|')
     replacement = '| KOGITO_VERSION | {} | '.format(artifacts_version)
     update_in_behave_tests(pattern, replacement)
 
+def update_runtime_image_in_behave_tests(runtime_image_name, image_suffix):
+    """
+    Update a runtime image into behave tests
+    :param runtime_image_name: new full tag name of the runtime image
+    :param image_suffix: suffix of the runtime image to update
+    """
+    print("Set {0} runtime image to {1} in behave tests".format(image_suffix, runtime_image_name))
+    # pattern to change the KOGITO_VERSION
+    pattern = re.compile(r'(runtime-image quay.io/kiegroup/kogito-runtime-{}:latest)'.format(image_suffix))
+    replacement = 'runtime-image {}'.format(runtime_image_name)
+    update_in_behave_tests(pattern, replacement)
+
 
 def update_maven_repo_in_behave_tests(repo_url, replaceJbossRepository):
     """
diff --git a/scripts/update-tests.py b/scripts/update-tests.py
index 416fb49640e..ca6d839bce4 100644
--- a/scripts/update-tests.py
+++ b/scripts/update-tests.py
@@ -18,6 +18,8 @@
     parser.add_argument('--examples-ref', dest='examples_ref', help='To update the examples ref for testing')
     parser.add_argument('--artifacts-version', dest='artifacts_version', help='To update the artifacts version for testing')
     parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False, action='store_true', help='If set to true will relax the SSL for user-generated self-signed certificates')
+    parser.add_argument('--runtime-image-jvm', dest='runtime_image_jvm', help='To update the runtime jvm image name in behave tests\'s steps')
+    parser.add_argument('--runtime-image-native', dest='runtime_image_native', help='To update the runtime native image name in behave tests\'s steps')
     args = parser.parse_args()
 
     if args.repo_url:
@@ -37,4 +39,11 @@
     
     if args.ignore_self_signed_cert:
         common.ignore_maven_self_signed_certificate_in_behave_tests()
-        common.ignore_maven_self_signed_certificate_in_clone_repo()
\ No newline at end of file
+        common.ignore_maven_self_signed_certificate_in_clone_repo()
+    
+    if args.runtime_image_jvm:
+        common.update_runtime_image_in_behave_tests(args.runtime_image_jvm, 'jvm')
+    
+    if args.runtime_image_native:
+        common.update_runtime_image_in_behave_tests(args.runtime_image_native, 'native')
+        
\ No newline at end of file
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index 2969f6029f5..aad572c4978 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-builder @rhpam-7/rhpam-kogito-builder-rhel8
+@quay.io/kiegroup/kogito-builder
 Feature: kogito-builder image native build tests
 
   Scenario: verify java cacerts and libsunec are available in the given kogito builder container.
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 6bce80c90c1..6fdde6bc234 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -11,3 +11,21 @@ Feature: kogito-builder image tests
     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus or Spring Boot
     And the image should contain label io.openshift.tags with value builder,kogito,quarkus,springboot
 
+  Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value         |
+      | NATIVE            | false         |
+      | RUNTIME_TYPE      | quarkus       |
+      | MAVEN_ARGS_APPEND | -Ppersistence |
+    Then file /home/kogito/bin/quarkus-run.jar should exist
+    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+
+    Scenario: Verify if the s2i build is finished as expected with persistence enabled
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable          | value         |
+      | MAVEN_ARGS_APPEND | -Ppersistence |
+      | RUNTIME_TYPE      | springboot    |
+    Then file /home/kogito/bin/process-springboot-example.jar should exist
+    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
\ No newline at end of file
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index 517bbf18e59..ba5a6fba638 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -77,16 +77,6 @@ Feature: kogito-builder image JVM build tests
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/quarkus-run.jar should exist
 
-  Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value         |
-      | NATIVE            | false         |
-      | RUNTIME_TYPE      | quarkus       |
-      | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                            |
@@ -232,15 +222,6 @@ Feature: kogito-builder image JVM build tests
       | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain Tomcat initialized with port(s): 8080 (http)
-
-  Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value         |
-      | MAVEN_ARGS_APPEND | -Ppersistence |
-      | RUNTIME_TYPE      | springboot    |
-    Then file /home/kogito/bin/process-springboot-example.jar should exist
-    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
   
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
diff --git a/tests/features/kogito-common-runtime-jvm.feature b/tests/features/kogito-common-runtime-jvm.feature
index 6e52d0965f0..d8778530e0e 100644
--- a/tests/features/kogito-common-runtime-jvm.feature
+++ b/tests/features/kogito-common-runtime-jvm.feature
@@ -24,7 +24,7 @@ Feature: kogito-runtime-jvm feature.
       | expected_phrase | ["hello","world"]        |
     And file /home/kogito/bin/quarkus-run.jar should exist
 
-  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port
+  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port with quarkus
     Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
       | variable            | value                     |
       | RUNTIME_TYPE        | quarkus                   |
@@ -60,7 +60,7 @@ Feature: kogito-runtime-jvm feature.
     And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
-  Scenario: Verify if the (forcing) binary build is finished as expected and if it is listening on the expected port
+  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port with springboot
     Given s2i build /tmp/kogito-examples/process-springboot-example from target
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index ce8cdf0d7bb..25fd1ff975f 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -9,6 +9,11 @@ MAVEN_OPTIONS="-DskipTests -U"
 MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS="-Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=${CONTAINER_ENGINE}"
 # MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true
 
+NATIVE_BUILD=$1
+if [ -z $NATIVE_BUILD ]; then
+    NATIVE_BUILD=true
+fi
+
 # exit when any command fails
 set -e
 # Setup maven configuration only on CI
@@ -41,7 +46,10 @@ cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rule
 # generating the app binaries to test the binary build
 mvn -f rules-quarkus-helloworld clean package ${MAVEN_OPTIONS}
 mvn -f process-springboot-example clean package ${MAVEN_OPTIONS}
-mvn -f rules-quarkus-helloworld-native -Pnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
+
+if [ "$NATIVE_BUILD" = 'true' ]; then
+    mvn -f rules-quarkus-helloworld-native -Pnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
+fi
 
 # preparing directory to run kogito maven archetypes tests
 mkdir -pv /tmp/kogito-examples/dmn-example

From 5f0e41e14cf40aa4324ea02500680913f4fdf096 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 11 May 2021 11:07:47 -0300
Subject: [PATCH 280/709] [RHPAM-3664] - Kogito images  label is still pointing
 to (#464)

* [RHPAM-3664] - Kogito images  label is still pointing to

* update the maintener email

Signed-off-by: spolti <fspolti@redhat.com>
---
 image.yaml                                                    | 2 --
 kogito-builder-overrides.yaml                                 | 2 ++
 kogito-data-index-infinispan-overrides.yaml                   | 2 ++
 kogito-data-index-mongodb-overrides.yaml                      | 2 ++
 kogito-explainability-overrides.yaml                          | 2 ++
 kogito-jit-runner-overrides.yaml                              | 2 ++
 kogito-jobs-service-overrides.yaml                            | 2 ++
 kogito-management-console-overrides.yaml                      | 2 ++
 kogito-runtime-jvm-overrides.yaml                             | 2 ++
 kogito-runtime-native-overrides.yaml                          | 2 ++
 kogito-task-console-overrides.yaml                            | 2 ++
 kogito-trusty-infinispan-overrides.yaml                       | 2 ++
 kogito-trusty-redis-overrides.yaml                            | 2 ++
 kogito-trusty-ui-overrides.yaml                               | 2 ++
 .../features/data-index/kogito-data-index-infinispan.feature  | 2 +-
 tests/features/data-index/kogito-data-index-mongodb.feature   | 2 +-
 tests/features/kogito-builder.feature                         | 2 +-
 tests/features/kogito-explainability.feature                  | 2 +-
 tests/features/kogito-jit-runner.feature                      | 2 +-
 tests/features/kogito-jobs-service.feature                    | 2 +-
 tests/features/kogito-management-console.feature              | 2 +-
 tests/features/kogito-runtime-jvm.feature                     | 2 +-
 tests/features/kogito-runtime-native.feature                  | 2 +-
 tests/features/kogito-task-console.feature                    | 2 +-
 tests/features/rhpam-kogito-builder-jvm.feature               | 4 ++--
 tests/features/rhpam-kogito-runtime-jvm.feature               | 4 ++--
 tests/features/trusty/kogito-trusty-infinispan.feature        | 2 +-
 tests/features/trusty/kogito-trusty-redis.feature             | 2 +-
 tests/features/{ => trusty}/kogito-trusty-ui.feature          | 2 +-
 29 files changed, 43 insertions(+), 19 deletions(-)
 rename tests/features/{ => trusty}/kogito-trusty-ui.feature (98%)

diff --git a/image.yaml b/image.yaml
index aad7bc9408e..9d7eff56b83 100644
--- a/image.yaml
+++ b/image.yaml
@@ -8,8 +8,6 @@ version: "2.0.0-snapshot"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:8.0"
 
 labels:
-  - name: "maintainer"
-    value: "kogito <kogito@kiegroup.com>"
   - name: "io.openshift.s2i.scripts-url"
     value: "image:///usr/local/s2i"
   - name: "io.openshift.s2i.destination"
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index 993e127dc02..839abc2d5fa 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-builder"
 description: "Platform for building Kogito based on Quarkus or Springboot"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Platform for building Kogito based on Quarkus or Spring Boot"
 - name: "io.k8s.display-name"
diff --git a/kogito-data-index-infinispan-overrides.yaml b/kogito-data-index-infinispan-overrides.yaml
index 973fe8f1be5..d6c57cc6eb7 100644
--- a/kogito-data-index-infinispan-overrides.yaml
+++ b/kogito-data-index-infinispan-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-data-index-infinispan"
 description: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
 - name: "io.k8s.display-name"
diff --git a/kogito-data-index-mongodb-overrides.yaml b/kogito-data-index-mongodb-overrides.yaml
index 2f4c195ea98..eada7ae0ee7 100644
--- a/kogito-data-index-mongodb-overrides.yaml
+++ b/kogito-data-index-mongodb-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-data-index-mongodb"
 description: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
 - name: "io.k8s.display-name"
diff --git a/kogito-explainability-overrides.yaml b/kogito-explainability-overrides.yaml
index 3e61d942aaf..d44fd49cde1 100644
--- a/kogito-explainability-overrides.yaml
+++ b/kogito-explainability-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-explainability"
 description: "Runtime image for Kogito Explainability Service"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito Explainability Service"
 - name: "io.k8s.display-name"
diff --git a/kogito-jit-runner-overrides.yaml b/kogito-jit-runner-overrides.yaml
index f7c0d052265..a48a32a5887 100644
--- a/kogito-jit-runner-overrides.yaml
+++ b/kogito-jit-runner-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-jit-runner"
 description: "Runtime image for Kogito JIT Runner"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito JIT Runner"
 - name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-overrides.yaml
index 4501a332bc3..f98de6d3ba8 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-jobs-service"
 description: "Runtime image for Kogito Jobs Service"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito Jobs Service"
 - name: "io.k8s.display-name"
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index d3a42a2ea50..e15516c6073 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-management-console"
 description: "Runtime image for Kogito Management Console"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito Management Console, manage your Business Process easily."
 - name: "io.k8s.display-name"
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index 2d4ccbb143d..a79c192d831 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-runtime-jvm"
 description: "Runtime image for Kogito based on Quarkus or Springboot JVM image"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
 - name: "io.k8s.display-name"
diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-overrides.yaml
index 5b1b274ceb4..d26fe48e806 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-runtime-native"
 description: "Runtime image for Kogito based on Quarkus native image"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito based on Quarkus native image"
 - name: "io.k8s.display-name"
diff --git a/kogito-task-console-overrides.yaml b/kogito-task-console-overrides.yaml
index 01fb808fbc3..035cede7ce2 100644
--- a/kogito-task-console-overrides.yaml
+++ b/kogito-task-console-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-task-console"
 description: "Runtime image for Kogito Task Console"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito Task Console, manage your Business Process easily."
 - name: "io.k8s.display-name"
diff --git a/kogito-trusty-infinispan-overrides.yaml b/kogito-trusty-infinispan-overrides.yaml
index 314a9a74307..c55a22288f1 100644
--- a/kogito-trusty-infinispan-overrides.yaml
+++ b/kogito-trusty-infinispan-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-trusty-infinispan"
 description: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
 - name: "io.k8s.display-name"
diff --git a/kogito-trusty-redis-overrides.yaml b/kogito-trusty-redis-overrides.yaml
index d9206006e5c..d1ae764669c 100644
--- a/kogito-trusty-redis-overrides.yaml
+++ b/kogito-trusty-redis-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-trusty-redis"
 description: "Runtime image for Kogito Trusty Service for Redis persistence provider"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito Trusty Service for Redis persistence provider"
 - name: "io.k8s.display-name"
diff --git a/kogito-trusty-ui-overrides.yaml b/kogito-trusty-ui-overrides.yaml
index c78afa29ecf..19079ac5ea5 100644
--- a/kogito-trusty-ui-overrides.yaml
+++ b/kogito-trusty-ui-overrides.yaml
@@ -4,6 +4,8 @@ name: "quay.io/kiegroup/kogito-trusty-ui"
 description: "Runtime image for Kogito Trusty UI"
 
 labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Runtime image for Kogito Trusty UI, manage your Business Process easily."
 - name: "io.k8s.display-name"
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index b261013f725..32c7f31d1fc 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index infinispan feature.
 
   Scenario: verify if all labels are correctly set on kogito-data-index-infinispan image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
      And the image should contain label io.openshift.s2i.destination with value /tmp
      And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
index 503ec506b70..e28d11a632f 100644
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index mongodb feature.
 
   Scenario: verify if all labels are correctly set on kogito-data-index-mongodb image
     Given image is built
-     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
       And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
       And the image should contain label io.openshift.s2i.destination with value /tmp
       And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 6fdde6bc234..5ed6f5f32b0 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -3,7 +3,7 @@ Feature: kogito-builder image tests
 
   Scenario: verify if all labels are correctly set on kogito-builder image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index 59d509ed72f..be623ae120c 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -3,7 +3,7 @@ Feature: Kogito-explainability feature.
 
   Scenario: verify if all labels are correctly set on kogito-explainability image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index 662ca0935a7..b0b7447c284 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jit-runner feature.
 
   Scenario: verify if all labels are correctly set on kogito-jit-runner image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/kogito-jobs-service.feature
index 3603522f0ef..e768da18f9c 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/kogito-jobs-service.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index 0553bea5183..e6c439113de 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -3,7 +3,7 @@ Feature: kogito-management-console feature
 
   Scenario: verify if all labels are correctly set kogito-management-console image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-runtime-jvm.feature b/tests/features/kogito-runtime-jvm.feature
index bfcd6a16a5c..ed1302388f3 100644
--- a/tests/features/kogito-runtime-jvm.feature
+++ b/tests/features/kogito-runtime-jvm.feature
@@ -3,7 +3,7 @@ Feature: kogito-runtime-jvm feature.
 
   Scenario: verify if all labels are correctly set on kogito-runtime-jvm image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-runtime-native.feature b/tests/features/kogito-runtime-native.feature
index c81d530024c..83bb4e859a1 100644
--- a/tests/features/kogito-runtime-native.feature
+++ b/tests/features/kogito-runtime-native.feature
@@ -3,7 +3,7 @@ Feature: Kogito-runtime-native feature.
 
   Scenario: verify if all labels are correctly set on kogito-runtime-native image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
      And the image should contain label io.openshift.s2i.destination with value /tmp
      And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index 5cf37d9fd1c..e79278e7f34 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -3,7 +3,7 @@ Feature: kogito-task-console feature
 
   Scenario: verify if all labels are correctly set on kogito-task-console image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 6f7fdfbd544..bd0ce7a4da4 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -3,8 +3,8 @@ Feature: rhpam-kogito-builder-rhel8 feature.
 
   Scenario: verify if all labels are correctly set on rhpam-kogito-builder-rhel8 image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    # Then the image should not contain label maintainer TODO add support to this sentence on cekit behave steps
+    Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value RHPAM Platform for building Kogito based on Quarkus or Spring Boot
diff --git a/tests/features/rhpam-kogito-runtime-jvm.feature b/tests/features/rhpam-kogito-runtime-jvm.feature
index 95b63632902..e077dffafaa 100644
--- a/tests/features/rhpam-kogito-runtime-jvm.feature
+++ b/tests/features/rhpam-kogito-runtime-jvm.feature
@@ -3,8 +3,8 @@ Feature: rhpam-kogito-runtime-jvm feature.
 
   Scenario: verify if all labels are correctly set on rhpam-kogito-runtime-jvm-rhel8 image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    # Then the image should not contain label maintainer TODO add support to this sentence on cekit behave steps
+    Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value RHPAM Runtime image for Kogito based on Quarkus or Spring Boot JVM image
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
index 2d596b0e85b..9905f312725 100644
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -3,7 +3,7 @@ Feature: Kogito-trusty infinispan feature.
 
   Scenario: verify if all labels are correctly set on kogito-trusty-infinispan image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature
index 489a788d750..9b0607472a6 100644
--- a/tests/features/trusty/kogito-trusty-redis.feature
+++ b/tests/features/trusty/kogito-trusty-redis.feature
@@ -3,7 +3,7 @@ Feature: Kogito-trusty redis feature.
 
   Scenario: verify if all labels are correctly set on kogito-trusty-redis image
     Given image is built
-     Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
       And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
       And the image should contain label io.openshift.s2i.destination with value /tmp
       And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-trusty-ui.feature b/tests/features/trusty/kogito-trusty-ui.feature
similarity index 98%
rename from tests/features/kogito-trusty-ui.feature
rename to tests/features/trusty/kogito-trusty-ui.feature
index 0f522ef9cc1..868f67bf552 100644
--- a/tests/features/kogito-trusty-ui.feature
+++ b/tests/features/trusty/kogito-trusty-ui.feature
@@ -3,7 +3,7 @@ Feature: kogito-trusty-ui feature
 
   Scenario: verify if all labels are correctly set on kogito-trusty-ui image
     Given image is built
-    Then the image should contain label maintainer with value kogito <kogito@kiegroup.com>
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http

From 49fb110c6ed934c288d2353468ba232ab5f7829b Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 13 May 2021 11:18:11 -0300
Subject: [PATCH 281/709] =?UTF-8?q?[RHPAM-3656]=20-=20Red=20Hat=20Maven=20?=
 =?UTF-8?q?GA=20repository=20not=20available=20in=20Kogito=20S2=E2=80=A6?=
 =?UTF-8?q?=20(#467)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [RHPAM-3656] - Red Hat Maven GA repository not available in Kogito S2I image

Signed-off-by: spolti <fspolti@redhat.com>

* apply review

Signed-off-by: spolti <fspolti@redhat.com>
---
 Makefile                                      |  4 +-
 README.md                                     | 12 ++-
 modules/kogito-maven/3.6.x/configure          | 82 ++++++++++++++-
 modules/kogito-maven/3.6.x/maven/settings.xml | 99 ++++++++++---------
 modules/rhpam-kogito-prod-profile/module.yaml |  9 ++
 rhpam-kogito-builder-rhel8-overrides.yaml     |  1 +
 scripts/build-product-image.sh                |  2 +-
 tests/features/kogito-builder.feature         | 11 +++
 .../features/rhpam-kogito-builder-jvm.feature | 12 +++
 9 files changed, 179 insertions(+), 53 deletions(-)
 create mode 100644 modules/rhpam-kogito-prod-profile/module.yaml

diff --git a/Makefile b/Makefile
index 2ebd602702a..c1ca09b5422 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ ifneq ($(ignore_build),true)
 endif
 # if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave
+	${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave ${test_options}
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
@@ -54,7 +54,7 @@ ifneq ($(ignore_build),true)
 endif
 # if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
-	scripts/build-product-image.sh "test" $(image_name)
+	scripts/build-product-image.sh "test" $(image_name) ${test_options}
 endif
 
 
diff --git a/README.md b/README.md
index 591d7ef6549..58000fa8ed9 100644
--- a/README.md
+++ b/README.md
@@ -1087,11 +1087,21 @@ To run all behave tests:
 make test
 ```
 
+
 CeKit also allows you to run a specific test.
 See [Writing Behave Tests](#writing-behave-tests).
 
-You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
+Example:
+```bash
+make build-image image_name=kogito-builder test_options=--wip
+```
 
+Or by name:
+```bash
+make build-image image_name=kogito-builder test_options=--name <Test Scenario Name>
+```
+
+You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
 
 ##### Writing Behave tests
 
diff --git a/modules/kogito-maven/3.6.x/configure b/modules/kogito-maven/3.6.x/configure
index aed8260a9ba..10a615f0b24 100644
--- a/modules/kogito-maven/3.6.x/configure
+++ b/modules/kogito-maven/3.6.x/configure
@@ -9,4 +9,84 @@ mv /usr/share/apache-maven-"${MAVEN_VERSION}" /usr/share/maven
 
 mkdir "${KOGITO_HOME}"/.m2
 cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
\ No newline at end of file
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
+
+# configure Red Hat repositories on the maven settings.xml for product builds
+if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
+    echo "enabling red hat repositories"
+    rh_repos="    <!-- JBoss EAP Maven repository -->\
+<profile>\
+  <id>redhat-maven-repositories</id>\
+  <repositories>\
+    <repository>\
+      <id>redhat-ga-repository</id>\
+      <url>https://maven.repository.redhat.com/ga/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+    <repository>\
+      <id>redhat-ea-repository</id>\
+      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+    <repository>\
+      <id>jboss-eap-repository</id>\
+      <url>https://maven.repository.redhat.com/techpreview/all</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+  </repositories>\
+  <pluginRepositories>\
+    <pluginRepository>\
+      <id>redhat-ga-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/ga/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+    <pluginRepository>\
+      <id>redhat-ea-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+    <pluginRepository>\
+      <id>jboss-eap-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/techpreview/all</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+  </pluginRepositories>\
+</profile>\
+"
+    sed -i "s|<!-- ### redhat maven repositories ### -->|$rh_repos|" "${KOGITO_HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### redhat maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
+
+    mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp
+    #format and write the new file
+    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${KOGITO_HOME}"/.m2/settings.xml
+fi
\ No newline at end of file
diff --git a/modules/kogito-maven/3.6.x/maven/settings.xml b/modules/kogito-maven/3.6.x/maven/settings.xml
index 257f694e114..13ea10d6509 100644
--- a/modules/kogito-maven/3.6.x/maven/settings.xml
+++ b/modules/kogito-maven/3.6.x/maven/settings.xml
@@ -3,55 +3,58 @@
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
                       https://maven.apache.org/xsd/settings-1.0.0.xsd">
 
-    <mirrors>
-        <!-- ### configured mirrors ### -->
-    </mirrors>
+  <mirrors>
+    <!-- ### configured mirrors ### -->
+  </mirrors>
 
-    <proxies>
-        <!-- ### configured http proxy ### -->
-    </proxies>
+  <proxies>
+    <!-- ### configured http proxy ### -->
+  </proxies>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <repositories>
-                <repository>
-                    <id>jboss-public-repository-group</id>
-                    <name>JBoss Public Repository Group</name>
-                    <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>always</updatePolicy>
-                    </snapshots>
-                </repository>
-                <!-- ### configured repositories ### -->
-            </repositories>
+  <profiles>
+    <!-- ### redhat maven repositories ### -->
 
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>jboss-public-repository-group</id>
-                    <name>JBoss Public Repository Group</name>
-                    <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-                    <layout>default</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>always</updatePolicy>
-                    </snapshots>
-                </pluginRepository>
-                <!-- ### configured plugin repositories ### -->
-            </pluginRepositories>
-        </profile>
-    </profiles>
-    <activeProfiles>
-        <activeProfile>default</activeProfile>
-    </activeProfiles>
+    <profile>
+      <id>default</id>
+      <repositories>
+        <repository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Repository Group</name>
+          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </repository>
+        <!-- ### configured repositories ### -->
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Repository Group</name>
+          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </pluginRepository>
+        <!-- ### configured plugin repositories ### -->
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <!-- ### redhat maven profile ### -->
+    <activeProfile>default</activeProfile>
+  </activeProfiles>
 </settings>
diff --git a/modules/rhpam-kogito-prod-profile/module.yaml b/modules/rhpam-kogito-prod-profile/module.yaml
new file mode 100644
index 00000000000..9ad849a3c80
--- /dev/null
+++ b/modules/rhpam-kogito-prod-profile/module.yaml
@@ -0,0 +1,9 @@
+schema_version: 1
+name: org.kie.kogito.rhpam.prod.profile
+version: '7.11.0'
+description: Holds custom configurations for productized Kogito images. Add as first module to be installed.
+
+envs:
+  - name: "ENABLE_RH_MAVEN_REPO"
+    value: "true"
+    description: "If set, will enable the usage of the Red Hat Maven repositories to resolve Java dependencies. Enabled by default on productized images."
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 9177ae269f2..ffce87effca 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -42,6 +42,7 @@ ports:
 
 modules:
   install:
+    - name: org.kie.kogito.rhpam.prod.profile
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
diff --git a/scripts/build-product-image.sh b/scripts/build-product-image.sh
index c177c2c6473..8a92b2fcd26 100755
--- a/scripts/build-product-image.sh
+++ b/scripts/build-product-image.sh
@@ -25,7 +25,7 @@ case ${ACTION} in
     ;;
 
     "test")
-        ${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave
+        ${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave $3
     ;;
     *)
         echo "Please use build or test actions."
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 5ed6f5f32b0..8a6416225d2 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -11,6 +11,17 @@ Feature: kogito-builder image tests
     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus or Spring Boot
     And the image should contain label io.openshift.tags with value builder,kogito,quarkus,springboot
 
+  Scenario: verify if community builder image does not contain the red hat maven repositories
+    When container is started with command bash
+    Then file /home/kogito/.m2/settings.xml should not contain <id>redhat-maven-repositories</id>
+    And file /home/kogito/.m2/settings.xml should not contain <activeProfile>redhat-maven-repositories</activeProfile>
+    And file /home/kogito/.m2/settings.xml should not contain <id>redhat-ga-repository</id>
+    And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/ga/</url>
+    And file /home/kogito/.m2/settings.xml should not contain <id>redhat-ea-repository</id>
+    And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/earlyaccess/all/</url>
+    And file /home/kogito/.m2/settings.xml should not contain <id>redhat-techpreview-repository</id>
+    And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
+
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index bd0ce7a4da4..2322891c803 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -12,3 +12,15 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And the image should contain label io.openshift.tags with value rhpam-kogito,builder,kogito,quarkus,springboot
     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
     And the image should contain label com.redhat.component with value rhpam-7-kogito-builder-rhel8-container
+
+
+  Scenario: verify if prod builder image contains the red hat maven repositories
+    When container is started with command bash
+    Then file /home/kogito/.m2/settings.xml should contain <id>redhat-maven-repositories</id>
+    And file /home/kogito/.m2/settings.xml should contain <activeProfile>redhat-maven-repositories</activeProfile>
+    And file /home/kogito/.m2/settings.xml should contain <id>redhat-ga-repository</id>
+    And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/ga/</url>
+    And file /home/kogito/.m2/settings.xml should contain <id>redhat-ea-repository</id>
+    And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/earlyaccess/all/</url>
+    And file /home/kogito/.m2/settings.xml should contain <id>redhat-techpreview-repository</id>
+    And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
\ No newline at end of file

From 6d48ab1bbd88324cbf828e3a47ab4115926bd8af Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 17 May 2021 10:27:29 -0300
Subject: [PATCH 282/709] [RHPAM-3654] - Wrong archetype used to generate
 project from provided asset (#470)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Makefile                                      |  2 +-
 README.md                                     |  2 +-
 .../kogito-builder/added/kogito-app-launch.sh |  1 +
 modules/kogito-builder/s2i/bin/assemble       |  3 --
 modules/kogito-s2i-core/added/s2i-core        |  9 ++--
 .../kogito-s2i-core/tests/bats/s2i-core.bats  |  4 +-
 tests/features/kogito-builder.feature         | 43 ++++++++++++++++++-
 .../kogito-common-builder-jvm.feature         | 36 ----------------
 .../features/rhpam-kogito-builder-jvm.feature | 41 +++++++++++++++++-
 9 files changed, 92 insertions(+), 49 deletions(-)

diff --git a/Makefile b/Makefile
index c1ca09b5422..f4eb3a29dcc 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ build-prod: clone-repos
 
 .PHONY: build-prod-image
 image_name=
-build-prod-image:
+build-prod-image: clone-repos
 ifneq ($(ignore_build),true)
 	scripts/build-product-image.sh "build" $(image_name) ${BUILD_ENGINE}
 endif
diff --git a/README.md b/README.md
index 58000fa8ed9..8325bd56181 100644
--- a/README.md
+++ b/README.md
@@ -349,7 +349,7 @@ Both methods are described below.
 that contains Business Process or Rules and all needed dependencies and files to execute it on the target runtime, 
 either Quarkus or Spring Boot.
 
-If you don't have a already existing project, the best way to create a new one is to use Kogito Maven Archetypes 
+If you don't have an already existing project, the best way to create a new one is to use Kogito Maven Archetypes 
 to generate project structure. 
 The available archetypes are:
 
diff --git a/modules/kogito-builder/added/kogito-app-launch.sh b/modules/kogito-builder/added/kogito-app-launch.sh
index 198076f3471..a4611348aed 100644
--- a/modules/kogito-builder/added/kogito-app-launch.sh
+++ b/modules/kogito-builder/added/kogito-app-launch.sh
@@ -11,6 +11,7 @@ if [[ "$1" == "-h" ]]; then
     exec /usr/local/s2i/usage
     exit 0
 fi
+
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
diff --git a/modules/kogito-builder/s2i/bin/assemble b/modules/kogito-builder/s2i/bin/assemble
index dc683b5cc72..dba36e2be05 100644
--- a/modules/kogito-builder/s2i/bin/assemble
+++ b/modules/kogito-builder/s2i/bin/assemble
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 #
 # S2I assemble script for the 'kogito-builder' image.
 # The 'assemble' script builds your application source so that it is ready to run.
@@ -11,9 +10,7 @@ set -e
 
 source ${S2I_MODULE_LOCATION}/s2i-core
 
-
 runtime_type=$(get_runtime_type)
-
 log_info "----> RUNTIME_TYPE has been set to $runtime_type"
 
 #############################################
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 3d3bbe87adc..bad6f56605b 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -104,8 +104,11 @@ function build_kogito_app() {
     else
         local ARCHETYPE_ARTIFACT_ID
         if [ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]; then
-            ARCHETYPE_ARTIFACT_ID='kogito-quarkus-archetype'
-
+             if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+                ARCHETYPE_ARTIFACT_ID='kogito-quarkus-dm-archetype'
+            else
+                ARCHETYPE_ARTIFACT_ID='kogito-quarkus-archetype'
+            fi
         elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
             ARCHETYPE_ARTIFACT_ID="kogito-springboot-archetype"
 
@@ -114,7 +117,7 @@ function build_kogito_app() {
             exit 1
         fi
 
-        log_info "---> Generating $RUNTIME_TYPE project structure..."
+        log_info "---> Generating $RUNTIME_TYPE project structure using the $ARCHETYPE_ARTIFACT_ID archetype..."
         $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=$ARCHETYPE_ARTIFACT_ID \
             -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
             ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 9adc3d30b9e..548234c2276 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -370,7 +370,7 @@ teardown() {
     rm -rf target/*
 
     echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating $QUARKUS_RUNTIME_TYPE project structure..." ]
+    [ "${lines[0]}" = "---> Generating $QUARKUS_RUNTIME_TYPE project structure using the kogito-quarkus-archetype archetype..." ]
 }
 
 @test "build_kogito_app only checks if it will generate the springboot project in case there's no pom.xml" {
@@ -380,7 +380,7 @@ teardown() {
     rm -rf target/*
 
     echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating $SPRINGBOOT_RUNTIME_TYPE project structure..." ]
+    [ "${lines[0]}" = "---> Generating $SPRINGBOOT_RUNTIME_TYPE project structure using the kogito-springboot-archetype archetype..." ]
 }
 
 @test "build_kogito_app only checks if it will a build will be triggered if a pom is found" {
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 8a6416225d2..3a0ca056616 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -32,11 +32,50 @@ Feature: kogito-builder image tests
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
-    Scenario: Verify if the s2i build is finished as expected with persistence enabled
+  Scenario: Verify if the s2i build is finished as expected with persistence enabled
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
       | RUNTIME_TYPE      | springboot    |
     Then file /home/kogito/bin/process-springboot-example.jar should exist
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
\ No newline at end of file
+    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable       | value          |
+      | RUNTIME_TYPE   | quarkus        |
+      | NATIVE         | false          |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+    Then file /home/kogito/bin/quarkus-run.jar should exist
+    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-archetype archetype...
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable            | value          |
+      | RUNTIME_TYPE        | quarkus        |
+      | NATIVE              | false          |
+      | KOGITO_VERSION      | 2.0.0-SNAPSHOT |
+      | PROJECT_GROUP_ID    | com.mycompany  |
+      | PROJECT_ARTIFACT_ID | myproject      |
+      | PROJECT_VERSION     | 2.0-SNAPSHOT   |
+    Then file /home/kogito/bin/quarkus-run.jar should exist
+    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-archetype archetype...
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
\ No newline at end of file
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index ba5a6fba638..3e3342dcca9 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -131,42 +131,6 @@ Feature: kogito-builder image JVM build tests
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
 
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable       | value          |
-      | RUNTIME_TYPE   | quarkus        |
-      | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable            | value          |
-      | RUNTIME_TYPE        | quarkus        |
-      | NATIVE              | false          |
-      | KOGITO_VERSION      | 2.0.0-SNAPSHOT |  
-      | PROJECT_GROUP_ID    | com.mycompany  |
-      | PROJECT_ARTIFACT_ID | myproject      |
-      | PROJECT_VERSION     | 2.0-SNAPSHOT   |
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
 #### SpringBoot Scenarios
 
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 2322891c803..f8aab129409 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -23,4 +23,43 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And file /home/kogito/.m2/settings.xml should contain <id>redhat-ea-repository</id>
     And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/earlyaccess/all/</url>
     And file /home/kogito/.m2/settings.xml should contain <id>redhat-techpreview-repository</id>
-    And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
\ No newline at end of file
+    And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+      | variable       | value          |
+      | RUNTIME_TYPE   | quarkus        |
+      | NATIVE         | false          |
+      | KOGITO_VERSION | 1.5.0.redhat-00001 |
+    Then file /home/kogito/bin/quarkus-run.jar should exist
+    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-dm-archetype archetype...
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
+    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+      | variable            | value          |
+      | RUNTIME_TYPE        | quarkus        |
+      | NATIVE              | false          |
+      | KOGITO_VERSION      | 1.5.0.redhat-00001 |
+      | PROJECT_GROUP_ID    | com.mycompany  |
+      | PROJECT_ARTIFACT_ID | myproject      |
+      | PROJECT_VERSION     | 2.0-SNAPSHOT   |
+    Then file /home/kogito/bin/quarkus-run.jar should exist
+    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-dm-archetype archetype...
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
\ No newline at end of file

From 860a3124382db5773ede25fc2be7e60d4bdad467 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Thu, 20 May 2021 08:50:48 -0300
Subject: [PATCH 283/709] [KOGITO-5138] - Using latest ubi8 image for all
 Kogito images (#474)

* [KOGITO-5138] - Using latest ubi8 image for all Kogito images

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Updating to latest snapshots

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 image.yaml                                       | 5 +----
 modules/kogito-data-index-infinispan/module.yaml | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml    | 4 ++--
 modules/kogito-explainability/module.yaml        | 8 ++++----
 modules/kogito-jit-runner/module.yaml            | 4 ++--
 modules/kogito-jobs-service/module.yaml          | 8 ++++----
 modules/kogito-management-console/module.yaml    | 4 ++--
 modules/kogito-task-console/module.yaml          | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml     | 4 ++--
 modules/kogito-trusty-redis/module.yaml          | 4 ++--
 modules/kogito-trusty-ui/module.yaml             | 4 ++--
 11 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/image.yaml b/image.yaml
index 9d7eff56b83..f72a5272677 100644
--- a/image.yaml
+++ b/image.yaml
@@ -2,10 +2,7 @@ schema_version: 1
 
 name: "kogito-image-real-name-on-overrides-file"
 version: "2.0.0-snapshot"
-# until this issue is not fixed use 8.0 tag.
-# https://github.com/rpm-software-management/microdnf/issues/50
-# https://bugzilla.redhat.com/show_bug.cgi?id=1769831
-from: "registry.access.redhat.com/ubi8/ubi-minimal:8.0"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 
 labels:
   - name: "io.openshift.s2i.scripts-url"
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 8dbab4d6044..5315780a3b5 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210429.061620-134-runner.jar
-    md5: 66205155c4b1099d49aab7ee6a980133
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210512.051044-146-runner.jar
+    md5: d0bcea3b96be8288339c235c06609163
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 8721c5bee2d..50552e6511c 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210429.061732-133-runner.jar
-    md5: b1985346727119620d8a97fcde289ac0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210512.051201-145-runner.jar
+    md5: efd2171fec71bf245097f921e4b77290
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index f1fa96376f9..968459966fa 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210429.062507-134-runner.jar
-    md5: 731adf53a7317162df110a1538bb497e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210512.052038-146-runner.jar
+    md5: 4f82fc443c72c7901980797105e7c4b4
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210429.062435-131-runner.jar
-    md5: 04870eeccbd30cc515532f83706910f1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210512.052005-143-runner.jar
+    md5: e0df3aae09d8ff61738560fa79521ac9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index e7821f08a44..f89b6752a42 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210429.062829-76-runner.jar
-    md5: 262e326fccc2c136ff8321d9bc41696f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210512.052335-88-runner.jar
+    md5: ff9082119f8c46dfc37618910a44886a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service/module.yaml
index 03b1a12f996..f9795fbadb4 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210429.061304-7-runner.jar
-    md5: 9811739d77d96bd4a6767f406c810f78
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210512.050629-19-runner.jar
+    md5: f91515c2735619e2d7c6b13155e7b24a
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210429.061355-7-runner.jar
-    md5: 8f9dc481f8579e91d1caa73c298f2422
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210512.050722-19-runner.jar
+    md5: a4a4566cae479144c8afb0ee6db32d81
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 58875eb7c7e..3cea6cbb3e6 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210429.062209-134-runner.jar
-    md5: 24133ce555e09e7614447c042eeb4136
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210512.051738-146-runner.jar
+    md5: be66b1ae462cb15140c792201d654eae
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index fd86c332e43..6d482d4797e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210429.062313-134-runner.jar
-    md5: f6516a0d03019cbf01eef38fb07c8299
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210512.051838-146-runner.jar
+    md5: 6423de520d2be89876a4aedac2e3e8c3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 29f5a9fb023..a8b648e23b4 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210429.062645-47-runner.jar
-    md5: 9a3b76e528481d03995e162f12b513d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210512.052155-59-runner.jar
+    md5: ce1bd8641595fa360951a4a25cd551c7
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index bfa15c6ec2f..dc9b776bd0b 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210429.062719-47-runner.jar
-    md5: 7f85d5b1573981a1e06625dd66d1dc6f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210512.052228-59-runner.jar
+    md5: 0961e7f866c49603de10df51cf0525ce
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 29ad4440ae9..cfbd4ec39a7 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210429.062240-134-runner.jar
-    md5: 9866e8ab0de7aaf24a0842f2c3f20c16
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210512.051807-146-runner.jar
+    md5: ae4233edc30f753f5081a8346a14ce9a
 
 execute:
   - script: configure

From cc724f6c8c3b7654e7840bafb37dd3af337a6039 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 20 May 2021 10:33:01 -0300
Subject: [PATCH 284/709] [KOGITO-4721] - Create Image distribution for Job
 Service MongoDB (#472)

* [KOGITO-4721] - Create Image distribution for Job Service MongoDB

Signed-off-by: spolti <fspolti@redhat.com>

* review changes plus artifacts update

Signed-off-by: spolti <fspolti@redhat.com>
---
 README.md                                     | 27 ++++--
 ...gito-jobs-service-ephemeral-overrides.yaml | 15 ++-
 kogito-jobs-service-infinispan-overrides.yaml | 44 +++++++++
 kogito-jobs-service-mongodb-overrides.yaml    | 44 +++++++++
 .../launch/kogito-jobs-service-common.sh      | 18 ++++
 modules/kogito-jobs-service-common/configure  | 12 +++
 .../kogito-jobs-service-common/module.yaml    |  6 ++
 .../bats/kogito-jobs-service-common.bats      | 27 ++++++
 .../added/kogito-app-launch.sh                |  4 +-
 .../kogito-jobs-service-ephemeral/configure   | 15 +++
 .../kogito-jobs-service-ephemeral/module.yaml | 15 +++
 .../added/kogito-app-launch.sh                | 27 ++++++
 .../configure                                 |  2 -
 .../module.yaml                               |  9 +-
 .../added/kogito-app-launch.sh                | 27 ++++++
 modules/kogito-jobs-service-mongodb/configure | 14 +++
 .../kogito-jobs-service-mongodb/module.yaml   | 15 +++
 .../added/launch/kogito-jobs-service.sh       | 24 -----
 .../tests/bats/kogito-jobs-service.bats       | 48 ----------
 scripts/common.py                             | 18 ++--
 scripts/run-bats.sh                           |  4 +-
 scripts/update-maven-artifacts.py             | 94 +++++++++++--------
 scripts/update-tests.py                       |  1 -
 .../kogito-jobs-service-common.feature        | 10 ++
 .../kogito-jobs-service-ehpemeral.feature     | 25 +++++
 .../kogito-jobs-service-infinispan.feature}   | 37 ++------
 .../kogito-jobs-service-mongodb.feature       | 25 +++++
 27 files changed, 428 insertions(+), 179 deletions(-)
 rename kogito-jobs-service-overrides.yaml => kogito-jobs-service-ephemeral-overrides.yaml (69%)
 create mode 100644 kogito-jobs-service-infinispan-overrides.yaml
 create mode 100644 kogito-jobs-service-mongodb-overrides.yaml
 create mode 100644 modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh
 create mode 100644 modules/kogito-jobs-service-common/configure
 create mode 100644 modules/kogito-jobs-service-common/module.yaml
 create mode 100644 modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats
 rename modules/{kogito-jobs-service => kogito-jobs-service-ephemeral}/added/kogito-app-launch.sh (87%)
 create mode 100644 modules/kogito-jobs-service-ephemeral/configure
 create mode 100644 modules/kogito-jobs-service-ephemeral/module.yaml
 create mode 100644 modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
 rename modules/{kogito-jobs-service => kogito-jobs-service-infinispan}/configure (73%)
 rename modules/{kogito-jobs-service => kogito-jobs-service-infinispan}/module.yaml (55%)
 create mode 100644 modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-jobs-service-mongodb/configure
 create mode 100644 modules/kogito-jobs-service-mongodb/module.yaml
 delete mode 100644 modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
 delete mode 100644 modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
 create mode 100644 tests/features/jobs-service/kogito-jobs-service-common.feature
 create mode 100644 tests/features/jobs-service/kogito-jobs-service-ehpemeral.feature
 rename tests/features/{kogito-jobs-service.feature => jobs-service/kogito-jobs-service-infinispan.feature} (55%)
 create mode 100644 tests/features/jobs-service/kogito-jobs-service-mongodb.feature

diff --git a/README.md b/README.md
index 8325bd56181..245dd33cda1 100644
--- a/README.md
+++ b/README.md
@@ -527,7 +527,9 @@ Today we have 3 Kogito Component Images:
 * [quay.io/kiegroup/kogito-trusty-infinispan](https://quay.io/kiegroup/kogito-trusty-infinispan)
 * [quay.io/kiegroup/kogito-trusty-redis](https://quay.io/kiegroup/kogito-trusty-redis)
 * [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
-* [quay.io/kiegroup/kogito-jobs-service](htps://quay.io/kiegroup/kogito-jobs-service)
+* [quay.io/kiegroup/kogito-jobs-service-ephemeral](https://quay.io/kiegroup/kogito-jobs-service-ephemeral) 
+* [quay.io/kiegroup/kogito-jobs-service-infinispan](https://quay.io/kiegroup/kogito-jobs-service-infinispan)
+* [quay.io/kiegroup/kogito-jobs-service-mongodb](https://quay.io/kiegroup/kogito-jobs-service-mongodb)
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
 * [quay.io/kiegroup/kogito-task-console](https://quay.io/kiegroup/kogito-task-console)
 * [quay.io/kiegroup/kogito-trusty-ui](https://quay.io/kiegroup/kogito-trusty-ui)
@@ -623,28 +625,37 @@ To know what configurations this image accepts please take a look [here](kogito-
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
-### Kogito Jobs Service Component Image
+### Kogito Jobs Service Component Images
 
 The Kogito Jobs Service is a dedicated lightweight service responsible for scheduling jobs that aim at firing at a given time. 
-It does not execute the job itself but it triggers a callback that could be an HTTP request on a given endpoint specified 
+It does not execute the job itself, but it triggers a callback that could be an HTTP request on a given endpoint specified 
 on the job request, or any other callback that could be supported by the service. 
-For more information please visit this (link)[https://github.com/kiegroup/kogito-runtimes/wiki/Job-Service]
+For more information please visit this [link](https://github.com/kiegroup/kogito-runtimes/wiki/Job-Service).
 
+Today, the Jobs service contains two images:
+
+- [ephemeral](kogito-jobs-service-ephemeral-overrides.yaml)
+- [infinispan](kogito-jobs-service-infinispan-overrides.yaml)
+- [mongodb](kogito-jobs-service-mongodb-overrides.yaml)
 
 Basic usage:
 
 ```bash
-$ docker run -it quay.io/kiegroup/kogito-jobs-service:latest
+$ docker run -it quay.io/kiegroup/kogito-jobs-service-ephemeral:latest
 ```
 
-To enable debug just use this env while running this image:
+To enable debug on the Jobs Service images, set the ` SCRIPT_DEBUG` to `true`, example: 
 
 ```bash
-docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service:latest
+docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-infinispan:latest
 ```
+
 You should notice a few debug messages being printed in the system output.
 
-To know what configurations this image accepts please take a look [here](kogito-jobs-service-overrides.yaml) on the **envs** section.
+The ephemeral image does not have external dependencies like a backend persistence provider, it uses in-memory persistence
+while working with Jobs Services `infinispan` and `mongodb` variants, it will need to have an Infinispan and MongoDB server,
+respectively, previously running.
+
 
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Jobs Service
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications
diff --git a/kogito-jobs-service-overrides.yaml b/kogito-jobs-service-ephemeral-overrides.yaml
similarity index 69%
rename from kogito-jobs-service-overrides.yaml
rename to kogito-jobs-service-ephemeral-overrides.yaml
index f98de6d3ba8..eb744f6b267 100644
--- a/kogito-jobs-service-overrides.yaml
+++ b/kogito-jobs-service-ephemeral-overrides.yaml
@@ -1,17 +1,17 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-jobs-service"
-description: "Runtime image for Kogito Jobs Service"
+name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
+description: "Runtime image for Kogito in memory Jobs Service"
 
 labels:
 - name: "maintainer"
   value: "kogito <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
-  value: "Runtime image for Kogito Jobs Service"
+  value: "Runtime image for Kogito in memory Jobs Service"
 - name: "io.k8s.display-name"
-  value: "Kogito Jobs Service"
+  value: "Kogito in memory Jobs Service"
 - name: "io.openshift.tags"
-  value: "kogito,jobs-service"
+  value: "kogito,jobs-service-ephemeral"
 - name: "io.openshift.expose-services"
   value: "8080:http"
 
@@ -19,9 +19,6 @@ envs:
 - name: "SCRIPT_DEBUG"
   example: "true"
   description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: "ENABLE_PERSISTENCE"
-  example: "true"
-  description: "By default the Jobs services runs on memory only, if persistence is needed then set it to true. (Sets the property kogito.jobs-service.persistence to infinispan)."
 - name: "ENABLE_EVENTS"
   example: "true"
   description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
@@ -37,7 +34,7 @@ modules:
   - name: org.kie.kogito.openjdk
     version: "11-headless"
   - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.jobs.service
+  - name: org.kie.kogito.jobs.service.ephemeral
   - name: org.kie.kogito.security.custom.truststores
 
 run:
diff --git a/kogito-jobs-service-infinispan-overrides.yaml b/kogito-jobs-service-infinispan-overrides.yaml
new file mode 100644
index 00000000000..05fd71f8ee7
--- /dev/null
+++ b/kogito-jobs-service-infinispan-overrides.yaml
@@ -0,0 +1,44 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-jobs-service-infinispan"
+description: "Runtime image for Kogito Jobs Service based on Infinispan"
+
+labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Jobs Service based on Infinispan"
+- name: "io.k8s.display-name"
+  value: "Kogito Jobs Service based on Infinispan"
+- name: "io.openshift.tags"
+  value: "kogito,jobs-service-infinispan"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+- name: "ENABLE_EVENTS"
+  example: "true"
+  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.jobs.service.infinispan
+  - name: org.kie.kogito.security.custom.truststores
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
diff --git a/kogito-jobs-service-mongodb-overrides.yaml b/kogito-jobs-service-mongodb-overrides.yaml
new file mode 100644
index 00000000000..d70e6487dcf
--- /dev/null
+++ b/kogito-jobs-service-mongodb-overrides.yaml
@@ -0,0 +1,44 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-jobs-service-mongodb"
+description: "Runtime image for Kogito Jobs Service based on MongoDB"
+
+labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Jobs Service based on MongoDB"
+- name: "io.k8s.display-name"
+  value: "Kogito Jobs Service based on MongoDB"
+- name: "io.openshift.tags"
+  value: "kogito,jobs-service-mongodb"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+- name: "ENABLE_EVENTS"
+  example: "true"
+  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.jobs.service.mongodb
+  - name: org.kie.kogito.security.custom.truststores
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
diff --git a/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh b/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh
new file mode 100644
index 00000000000..589ed1fa32b
--- /dev/null
+++ b/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+source "${KOGITO_HOME}"/launch/logging.sh
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset ENABLE_EVENTS
+}
+
+function configure() {
+    configure_jobs_service_events
+}
+
+function configure_jobs_service_events() {
+    if [ "${ENABLE_EVENTS^^}" == "TRUE" ]; then
+        KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.profile=events-support"
+    fi
+}
\ No newline at end of file
diff --git a/modules/kogito-jobs-service-common/configure b/modules/kogito-jobs-service-common/configure
new file mode 100644
index 00000000000..4ad232ed090
--- /dev/null
+++ b/modules/kogito-jobs-service-common/configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
+
diff --git a/modules/kogito-jobs-service-common/module.yaml b/modules/kogito-jobs-service-common/module.yaml
new file mode 100644
index 00000000000..ed510d77527
--- /dev/null
+++ b/modules/kogito-jobs-service-common/module.yaml
@@ -0,0 +1,6 @@
+schema_version: 1
+name: org.kie.kogito.jobs.service.common
+version: "2.0.0-snapshot"
+
+execute:
+  - script: configure
diff --git a/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats b/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats
new file mode 100644
index 00000000000..66b86ba1a72
--- /dev/null
+++ b/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats
@@ -0,0 +1,27 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME="${KOGITO_HOME}"
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-jobs-service-common.sh
+
+
+teardown() {
+    rm -rf "${KOGITO_HOME}"
+}
+
+@test "check if the event is correctly set on jobs service" {
+    export ENABLE_EVENTS="true"
+    configure_jobs_service_events
+
+    result="${KOGITO_JOBS_PROPS}"
+    expected=" -Dquarkus.profile=events-support"
+
+    echo "Result is ${result} and expected is ${expected}"
+    [ "${result}" = "${expected}" ]
+}
+
+
diff --git a/modules/kogito-jobs-service/added/kogito-app-launch.sh b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
similarity index 87%
rename from modules/kogito-jobs-service/added/kogito-app-launch.sh
rename to modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
index 9e1e4971e14..6f4c71b3e58 100644
--- a/modules/kogito-jobs-service/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
@@ -14,7 +14,7 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-jobs-service.sh
+  "${KOGITO_HOME}"/launch/kogito-jobs-service-common.sh
   "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
@@ -24,4 +24,4 @@ source "${KOGITO_HOME}"/launch/configure.sh
 exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
     -Dquarkus.http.host=0.0.0.0 \
     -Dquarkus.http.port=8080 \
-    -jar "${KOGITO_HOME}"/bin/"${JOBS_SERVICE_JAR}"
+    -jar "${KOGITO_HOME}"/bin/jobs-service-common-runner.jar
diff --git a/modules/kogito-jobs-service-ephemeral/configure b/modules/kogito-jobs-service-ephemeral/configure
new file mode 100644
index 00000000000..5421fc450e2
--- /dev/null
+++ b/modules/kogito-jobs-service-ephemeral/configure
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v "${SOURCES_DIR}"/jobs-service-common-runner.jar "${KOGITO_HOME}"/bin/
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
+
+cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
+
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
new file mode 100644
index 00000000000..cf3f663025c
--- /dev/null
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -0,0 +1,15 @@
+schema_version: 1
+name: org.kie.kogito.jobs.service.ephemeral
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: jobs-service-common-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210512.050629-19-runner.jar
+    md5: f91515c2735619e2d7c6b13155e7b24a
+
+execute:
+  - script: configure
+
+modules:
+  install:
+    - name: org.kie.kogito.jobs.service.common
diff --git a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..29847efd554
--- /dev/null
+++ b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  "${KOGITO_HOME}"/launch/kogito-jobs-service-common.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+    -Dquarkus.http.host=0.0.0.0 \
+    -Dquarkus.http.port=8080 \
+    -jar "${KOGITO_HOME}"/bin/jobs-service-infinispan-runner.jar
diff --git a/modules/kogito-jobs-service/configure b/modules/kogito-jobs-service-infinispan/configure
similarity index 73%
rename from modules/kogito-jobs-service/configure
rename to modules/kogito-jobs-service-infinispan/configure
index db98e6eade1..b07797c497f 100644
--- a/modules/kogito-jobs-service/configure
+++ b/modules/kogito-jobs-service-infinispan/configure
@@ -6,8 +6,6 @@ SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
 cp -v "${SOURCES_DIR}"/jobs-service-infinispan-runner.jar "${KOGITO_HOME}"/bin/
-cp -v "${SOURCES_DIR}"/jobs-service-common-runner.jar "${KOGITO_HOME}"/bin/
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
similarity index 55%
rename from modules/kogito-jobs-service/module.yaml
rename to modules/kogito-jobs-service-infinispan/module.yaml
index f9795fbadb4..aa16e040f3b 100644
--- a/modules/kogito-jobs-service/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -1,14 +1,15 @@
 schema_version: 1
-name: org.kie.kogito.jobs.service
+name: org.kie.kogito.jobs.service.infinispan
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210512.050629-19-runner.jar
-    md5: f91515c2735619e2d7c6b13155e7b24a
   - name: jobs-service-infinispan-runner.jar
     url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210512.050722-19-runner.jar
     md5: a4a4566cae479144c8afb0ee6db32d81
 
 execute:
   - script: configure
+
+modules:
+  install:
+    - name: org.kie.kogito.jobs.service.common
diff --git a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..23c1ead6860
--- /dev/null
+++ b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  "${KOGITO_HOME}"/launch/kogito-jobs-service-common.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+    -Dquarkus.http.host=0.0.0.0 \
+    -Dquarkus.http.port=8080 \
+    -jar "${KOGITO_HOME}"/bin/jobs-service-mongodb-runner.jar
diff --git a/modules/kogito-jobs-service-mongodb/configure b/modules/kogito-jobs-service-mongodb/configure
new file mode 100644
index 00000000000..a5b3aa79026
--- /dev/null
+++ b/modules/kogito-jobs-service-mongodb/configure
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v "${SOURCES_DIR}"/jobs-service-mongodb-runner.jar "${KOGITO_HOME}"/bin/
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
+
+cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
new file mode 100644
index 00000000000..27873df4193
--- /dev/null
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -0,0 +1,15 @@
+schema_version: 1
+name: org.kie.kogito.jobs.service.mongodb
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: jobs-service-mongodb-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210512.050908-1-runner.jar
+    md5: 23edd8d75049d372af50f44b94802460
+
+execute:
+  - script: configure
+
+modules:
+  install:
+    - name: org.kie.kogito.jobs.service.common
diff --git a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh b/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
deleted file mode 100644
index 5db385b3d6e..00000000000
--- a/modules/kogito-jobs-service/added/launch/kogito-jobs-service.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset ENABLE_PERSISTENCE
-}
-
-function configure() {
-    configure_jobs_service
-}
-
-
-function configure_jobs_service() {
-    local persistence='common'
-    if [ "${ENABLE_PERSISTENCE^^}" == "TRUE" ]; then
-        persistence='infinispan'
-    fi
-
-    if [ "${ENABLE_EVENTS^^}" == "TRUE" ]; then
-        KOGITO_JOBS_PROPS="${KOGITO_JOBS_PROPS} -Dquarkus.profile=events-support"
-    fi
-
-    JOBS_SERVICE_JAR="jobs-service-${persistence}-runner.jar"
-}
diff --git a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats b/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
deleted file mode 100644
index b7173b0bb4a..00000000000
--- a/modules/kogito-jobs-service/tests/bats/kogito-jobs-service.bats
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bats
-
-export KOGITO_HOME=/tmp/kogito
-export HOME="${KOGITO_HOME}"
-mkdir -p "${KOGITO_HOME}"/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-jobs-service.sh
-
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"
-}
-
-@test "check default jobs service" {
-    configure_jobs_service
-
-    result="${JOBS_SERVICE_JAR}"
-    expected="jobs-service-common-runner.jar"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
-
-@test "check if the persistence is correctly configured on jobs service" {
-    export ENABLE_PERSISTENCE="true"
-    configure_jobs_service
-
-    result="${JOBS_SERVICE_JAR}"
-    expected="jobs-service-infinispan-runner.jar"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
-
-@test "check if the event is correctly set on jobs service" {
-    export ENABLE_EVENTS="true"
-    configure_jobs_service
-
-    result="${KOGITO_JOBS_PROPS}"
-    expected=" -Dquarkus.profile=events-support"
-
-    echo "Result is ${result} and expected is ${expected}"
-    [ "${result}" = "${expected}" ]
-}
-
-
diff --git a/scripts/common.py b/scripts/common.py
index 71344ff917f..d9106139979 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -12,14 +12,16 @@
            "kogito-data-index-infinispan", "kogito-trusty-common",
            "kogito-trusty-infinispan", "kogito-trusty-redis",
            "kogito-explainability", "kogito-image-dependencies",
-           "kogito-jobs-service", "kogito-trusty-ui",
-           "kogito-jq", "kogito-kubernetes-client",
-           "kogito-launch-scripts", "kogito-logging",
-           "kogito-management-console", "kogito-task-console",
-           "kogito-persistence", "kogito-runtime-native",
-           "kogito-runtime-jvm", "kogito-builder",
-           "kogito-s2i-core", "kogito-system-user",
-           "kogito-jit-runner", "kogito-custom-truststore"}
+           "kogito-jobs-service-common", "kogito-jobs-service-ephemeral",
+           "kogito-jobs-service-infinispan", "kogito-jobs-service-mongodb",
+           "kogito-trusty-ui", "kogito-jq",
+           "kogito-kubernetes-client", "kogito-launch-scripts",
+           "kogito-logging", "kogito-management-console",
+           "kogito-task-console", "kogito-persistence",
+           "kogito-runtime-native", "kogito-runtime-jvm",
+           "kogito-builder", "kogito-s2i-core",
+           "kogito-system-user", "kogito-jit-runner",
+           "kogito-custom-truststore"}
 MODULE_FILENAME = "module.yaml"
 MODULES_DIR = "modules"
 
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 91af8c0157b..1b9bf8eb416 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -19,8 +19,8 @@ echo "----> running bats on kogito-explainability"
 echo "----> running bats on kogito-graalvm-scripts"
 ./bats/bin/bats modules/kogito-graalvm-scripts/tests/bats
 
-echo "----> running bats on kogito-jobs-service"
-./bats/bin/bats modules/kogito-jobs-service/tests/bats
+echo "----> running bats on kogito-jobs-service-common"
+./bats/bin/bats modules/kogito-jobs-service-common/tests/bats
 
 echo "----> running bats on kogito-kubernetes-client"
 ./bats/bin/bats modules/kogito-kubernetes-client/tests/bats/
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 64ba544eb60..26264d799ba 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -1,11 +1,11 @@
 #!/usr/bin/python3
-#Script responsible for fetching the latest artifacts of kogito services and updating their module.yaml files as well as updating Maven version
-#Should be run from root directory of the repository
-#Sample usage:  python3 scripts/update-maven-artifacts.py
+# Script responsible for fetching the latest artifacts of kogito services and updating their module.yaml files as well
+# as updating Maven version Should be run from root directory of the repository
+# Sample usage:  python3 scripts/update-maven-artifacts.py
 #
-#Dependencies
-# ruamel.yaml
-# elementpath 
+# Dependencies
+#   ruamel.yaml
+#   elementpath
 
 import sys
 sys.dont_write_bytecode = True
@@ -30,8 +30,9 @@
     "trusty-service-redis": "kogito-trusty-redis",
     "explainability-service-rest": "kogito-explainability",
     "explainability-service-messaging": "kogito-explainability",
-    "jobs-service-infinispan": "kogito-jobs-service",
-    "jobs-service-common": "kogito-jobs-service",
+    "jobs-service-infinispan": "kogito-jobs-service-infinispan",
+    "jobs-service-mongodb": "kogito-jobs-service-mongodb",
+    "jobs-service-common": "kogito-jobs-service-ephemeral",
     "management-console": "kogito-management-console",
     "task-console": "kogito-task-console",
     "trusty-ui": "kogito-trusty-ui",
@@ -39,106 +40,117 @@
 }
 
 def isSnapshotVersion(version):
-    '''
+    """
     Check whether the given version is a snapshot version
     :param version: The version to check
     :return: whether the given version is a snapshot version
-    '''
+    """
     return version.endswith("-SNAPSHOT")
 
+
 def getMetadataRoot(service):
-    '''
+    """
     Get the root element from the maven-metadata
     :param service: Service information (repo_url, version, name)
     :return: root object
-    '''
+    """
     metadataURL=service["repo_url"]+"maven-metadata.xml"
     mavenMetadata=requests.get(metadataURL, verify=service["ignore_self_signed_cert"])
     with open('maven-metadata.xml', 'wb') as f:
         f.write(mavenMetadata.content)
     tree = ET.parse('maven-metadata.xml')
-    root=tree.getroot()
+    root = tree.getroot()
     os.remove("maven-metadata.xml")
     return root
 
+
 def getSnapshotVersion(service):
-    '''
+    """
     parse the xml and finds the snapshotVersion
     :param service: Service information (repo_url, version, name)
     :return: snapshotVersion string
-    '''
-    root=getMetadataRoot(service)
-    snapshotVersion=root.find("./versioning/snapshotVersions/snapshotVersion/value").text
+    """
+    root = getMetadataRoot(service)
+    snapshotVersion = root.find("./versioning/snapshotVersions/snapshotVersion/value").text
     return snapshotVersion
 
+
 def getRunnerURL(service):
-    ''' 
+    """
     Creates the updated URL for runner.jar
     :param service: Service information (repo_url, version, name)
     :return: url string
-    '''
+    """
     finalVersion = service["version"]
     if isSnapshotVersion(finalVersion):
-        finalVersion=getSnapshotVersion(service)
+        finalVersion = getSnapshotVersion(service)
     url = service["repo_url"] + "{0}-{1}-runner.jar".format(service["name"], finalVersion)
     checkUrl(url)
     return url
 
+
 def getMD5(service):
-    '''
+    """
     Fetches the md5 code for the latest runner.jar
     :param service: Service information (repo_url, version, name)
     :return: runnerMD5 string
-    '''
-    runnerURL=getRunnerURL(service)
-    runnerMD5URL=runnerURL+".md5"
+    """
+    runnerURL = getRunnerURL(service)
+    runnerMD5URL = runnerURL+".md5"
     checkUrl(runnerMD5URL)
-    runnerMD5=sp.getoutput("curl -s  {}".format(runnerMD5URL))
+    runnerMD5 = sp.getoutput("curl -s  {}".format(runnerMD5URL))
     return runnerMD5
 
+
 def checkUrl(url):
-    '''
-    Check url returns 2xx code. 
+    """
+    Check url returns 2xx code.
     :param url
-    '''
-    resultCode=int(sp.getoutput('curl -I -s -o /dev/null -w "%{0}" {1}'.format('{http_code}', url)))
+    """
+    resultCode = int(sp.getoutput('curl -I -s -o /dev/null -w "%{0}" {1}'.format('{http_code}', url)))
     if resultCode < 200 or resultCode >= 300:
         raise ValueError('Got http code {0} for url {1}'.format(resultCode, url))
 
-def update_artifacts(service,modulePath):
-    '''
+
+def update_artifacts(service, modulePath):
+    """
     Updates the module.yaml file of services with latest artifacts. When an image contains more than one jar, the correct one is selected by
-    checking if the name of the service is contained in the name of the artifact. 
+    checking if the name of the service is contained in the name of the artifact.
     :param service: Service information (repo_url, version, name)
     :param modulePath: relative file location of the module.yaml for the kogito service
-    '''
+    """
 
     with open(modulePath) as module:
-        data=common.yaml_loader().load(module)
+        data = common.yaml_loader().load(module)
+        print(service)
+        print(data['artifacts'])
+        # print(filter(lambda x: service['name'] in x['name']))
         artifact = next(filter(lambda x: service['name'] in x['name'], data['artifacts']))
-        artifact['url']=getRunnerURL(service)
-        artifact['md5']=getMD5(service)
+        artifact['url'] = getRunnerURL(service)
+        artifact['md5'] = getMD5(service)
     with open(modulePath, 'w') as module:
         common.yaml_loader().dump(data, module)
 
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Update Maven information in repo from the given maven repository')
     parser.add_argument('--repo-url', dest='repo_url', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
     parser.add_argument('--ignore-self-signed-cert', action='store_false', help='If set, will relax the SSL for user-generated self-signed certificates')
     args = parser.parse_args()
-    
+
     artifactsVersion = common.retrieve_artifacts_version()
     print("Retrieve artifacts version: ", artifactsVersion)
 
     # Update Kogito Service modules
     for serviceName, modulePath in Modules.items():
         service = {
-            "repo_url" : args.repo_url + "{}/{}/{}/".format(KOGITO_ARTIFACT_PATH, serviceName, artifactsVersion),
-            "name" : serviceName,
-            "version" : artifactsVersion,
+            "repo_url": args.repo_url + "{}/{}/{}/".format(KOGITO_ARTIFACT_PATH, serviceName, artifactsVersion),
+            "name": serviceName,
+            "version": artifactsVersion,
             "ignore_self_signed_cert": args.ignore_self_signed_cert
         }
         moduleYamlFile = "modules/{}/module.yaml".format(modulePath)
-        
+
         update_artifacts(service, moduleYamlFile)
         print("Successfully updated the artifacts for: ", serviceName)
+
diff --git a/scripts/update-tests.py b/scripts/update-tests.py
index ca6d839bce4..1283b9aa960 100644
--- a/scripts/update-tests.py
+++ b/scripts/update-tests.py
@@ -46,4 +46,3 @@
     
     if args.runtime_image_native:
         common.update_runtime_image_in_behave_tests(args.runtime_image_native, 'native')
-        
\ No newline at end of file
diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature
new file mode 100644
index 00000000000..87cbeffe702
--- /dev/null
+++ b/tests/features/jobs-service/kogito-jobs-service-common.feature
@@ -0,0 +1,10 @@
+@quay.io/kiegroup/kogito-jobs-service-infinispan @quay.io/kiegroup/kogito-jobs-service-mongodb @quay.io/kiegroup/kogito-jobs-service-ephemeral
+Feature: Kogito-jobs-service common feature.
+
+  Scenario: verify if the events is correctly enabled
+    When container is started with env
+      | variable                | value                                     |
+      | SCRIPT_DEBUG            | true                                      |
+      | ENABLE_EVENTS           | true                                      |
+      | KOGITO_JOBS_PROPS       | -Dkafka.bootstrap.servers=localhost:11111 |
+    Then container log should contain + exec java -XshowSettings:properties -Dkafka.bootstrap.servers=localhost:11111 -Dquarkus.profile=events-support -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar
diff --git a/tests/features/jobs-service/kogito-jobs-service-ehpemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ehpemeral.feature
new file mode 100644
index 00000000000..4fb9d055b62
--- /dev/null
+++ b/tests/features/jobs-service/kogito-jobs-service-ehpemeral.feature
@@ -0,0 +1,25 @@
+@quay.io/kiegroup/kogito-jobs-service-ephemeral
+Feature: Kogito-jobs-service-ephemeral feature.
+
+  Scenario: verify if all labels are correctly set kogito-jobs-service image image
+    Given image is built
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito in memory Jobs Service
+    And the image should contain label io.k8s.display-name with value Kogito in memory Jobs Service
+    And the image should contain label io.openshift.tags with value kogito,jobs-service-ephemeral
+
+  Scenario: verify if the jobs service common binary is available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/jobs-service-common-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-common-runner.jar
+
+  Scenario: Verify if the debug is correctly enabled with the common jar
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-common-runner.jar
+    And container log should contain started in
+    And container log should not contain Application failed to start
+
diff --git a/tests/features/kogito-jobs-service.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
similarity index 55%
rename from tests/features/kogito-jobs-service.feature
rename to tests/features/jobs-service/kogito-jobs-service-infinispan.feature
index e768da18f9c..0ed0803557e 100644
--- a/tests/features/kogito-jobs-service.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
@@ -1,5 +1,5 @@
-@quay.io/kiegroup/kogito-jobs-service
-Feature: Kogito-jobs-service feature.
+@quay.io/kiegroup/kogito-jobs-service-infinispan
+Feature: Kogito-jobs-service-infinispan feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
@@ -7,41 +7,18 @@ Feature: Kogito-jobs-service feature.
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service
-    And the image should contain label io.k8s.display-name with value Kogito Jobs Service
-    And the image should contain label io.openshift.tags with value kogito,jobs-service
-
-  Scenario: verify if the jobs service common binary is available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/jobs-service-common-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-common-runner.jar
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Infinispan
+    And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Infinispan
+    And the image should contain label io.openshift.tags with value kogito,jobs-service-infinispan
   
   Scenario: verify if the jobs service infinispan binary is available on /home/kogito/bin
     When container is started with command bash
     Then run sh -c 'ls /home/kogito/bin/jobs-service-infinispan-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-infinispan-runner.jar
 
-  Scenario: Verify if the debug is correctly enabled
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-common-runner.jar
-    And container log should contain started in
-    And container log should not contain Application failed to start
-
-  Scenario: verify if the events is correctly enabled
-    When container is started with env
-      | variable                | value                                     |
-      | SCRIPT_DEBUG            | true                                      |
-      | ENABLE_EVENTS           | true                                      |
-      | KOGITO_JOBS_PROPS       | -Dkafka.bootstrap.servers=localhost:11111 |
-    Then container log should contain bootstrap.servers = [localhost:11111]
-    And container log should contain started in
-    And container log should contain Connection to node -1 (localhost/127.0.0.1:11111) could not be established.
-
   Scenario: verify if auth is correctly set
     When container is started with env
       | variable                      | value           |
       | SCRIPT_DEBUG                  | true            |
-      | ENABLE_PERSISTENCE            | true            |
       | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
       | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
@@ -49,8 +26,8 @@ Feature: Kogito-jobs-service feature.
       | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
     Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-infinispan-runner.jar
-    Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
-    Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
new file mode 100644
index 00000000000..4332fe73ce6
--- /dev/null
+++ b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
@@ -0,0 +1,25 @@
+@quay.io/kiegroup/kogito-jobs-service-mongodb
+Feature: Kogito-jobs-service-mongodb feature.
+
+  Scenario: verify if all labels are correctly set kogito-jobs-service image image
+    Given image is built
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on MongoDB
+    And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on MongoDB
+    And the image should contain label io.openshift.tags with value kogito,jobs-service-mongodb
+  
+  Scenario: verify if the jobs service mongodb binary is available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/jobs-service-mongodb-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-mongodb-runner.jar
+
+  Scenario: verify if of container is correctly started with mongo parameters
+    When container is started with env
+      | variable                          | value                                          |
+      | SCRIPT_DEBUG                      | true                                           |
+      | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://user:password@localhost:27017/admin  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-mongodb-runner.jar
+    And container log should contain Cluster created with settings {hosts=[localhost:27017], mode=SINGLE
+    And container log should not contain Application failed to start

From 316c05e0c6f3ee05141c871802f9cea454bc7e00 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 21 May 2021 11:40:59 +0200
Subject: [PATCH 285/709] KOGITO-5179 Update jobs-service references (#477)

---
 Jenkinsfile.deploy                            | 12 -----
 Jenkinsfile.promote                           | 12 -----
 README.md                                     | 19 +++++--
 kogito-imagestream.yaml                       | 50 +++++++++++++++++--
 scripts/README.md                             | 11 ++--
 .../features/common-custom-truststore.feature |  2 +-
 ... => kogito-jobs-service-ephemeral.feature} |  0
 7 files changed, 68 insertions(+), 38 deletions(-)
 rename tests/features/jobs-service/{kogito-jobs-service-ehpemeral.feature => kogito-jobs-service-ephemeral.feature} (100%)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 49deb7e5a98..b0425fb60d0 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -113,18 +113,6 @@ pipeline {
                     }
                     sh updateArtifactCmd
 
-                    // Debug purpose in case of issue
-                    sh 'cat modules/kogito-data-index-infinispan/module.yaml'
-                    sh 'cat modules/kogito-data-index-mongodb/module.yaml'
-                    sh 'cat modules/kogito-trusty-infinispan/module.yaml'
-                    sh 'cat modules/kogito-trusty-redis/module.yaml'
-                    sh 'cat modules/kogito-explainability/module.yaml'
-                    sh 'cat modules/kogito-jobs-service/module.yaml'
-                    sh 'cat modules/kogito-management-console/module.yaml'
-                    sh 'cat modules/kogito-task-console/module.yaml'
-                    sh 'cat modules/kogito-trusty-ui/module.yaml'
-                    sh 'cat modules/kogito-jit-runner/module.yaml'
-
                     if (isThereAnyChanges()) {
                         commitChanges('Updated Maven artifacts')
                     } else {
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 7047574527e..0050d927cf9 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -77,18 +77,6 @@ pipeline {
                         }
                         sh updateArtifactCmd
 
-                        // Debug purpose in case of issue
-                        sh 'cat modules/kogito-data-index-infinispan/module.yaml'
-                        sh 'cat modules/kogito-data-index-mongodb/module.yaml'
-                        sh 'cat modules/kogito-trusty-infinispan/module.yaml'
-                        sh 'cat modules/kogito-trusty-redis/module.yaml'
-                        sh 'cat modules/kogito-explainability/module.yaml'
-                        sh 'cat modules/kogito-jobs-service/module.yaml'
-                        sh 'cat modules/kogito-management-console/module.yaml'
-                        sh 'cat modules/kogito-task-console/module.yaml'
-                        sh 'cat modules/kogito-trusty-ui/module.yaml'
-                        sh 'cat modules/kogito-jit-runner/module.yaml'
-
                         try {
                             githubscm.commitChanges('Setup Maven artifacts to released ones')
                             githubscm.pushObject('origin', getPRSourceBranch(), getBotAuthorCredsID())
diff --git a/README.md b/README.md
index 245dd33cda1..7f4bd0373f3 100644
--- a/README.md
+++ b/README.md
@@ -792,7 +792,9 @@ imagestream.image.openshift.io/kogito-data-index-infinispan created
 imagestream.image.openshift.io/kogito-data-index-mongodb created
 imagestream.image.openshift.io/kogito-trusty-infinispan created
 imagestream.image.openshift.io/kogito-trusty-redis created
-imagestream.image.openshift.io/kogito-jobs-service created
+imagestream.image.openshift.io/kogito-jobs-service-ephemeral created
+imagestream.image.openshift.io/kogito-jobs-service-infinispan created
+imagestream.image.openshift.io/kogito-jobs-service-mongodb created
 imagestream.image.openshift.io/kogito-management-console created
 
 # performing a new build
@@ -980,7 +982,9 @@ With this Makefile you can:
      $ make build-image image_name=kogito-trusty-infinispan
      $ make build-image image_name=kogito-trusty-redis
      $ make build-image image_name=kogito-explainability
-     $ make build-image image_name=kogito-jobs-service 
+     $ make build-image image_name=kogito-jobs-service-ephemeral
+     $ make build-image image_name=kogito-jobs-service-infinispan
+     $ make build-image image_name=kogito-jobs-service-mongodb
      $ make build-image image_name=kogito-management-console
      $ make build-image image_name=kogito-trusty-ui
      $ make build-image image_name=kogito-jit-runner
@@ -1048,7 +1052,10 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image.
 - [kogito-graalvm-scripts](modules/kogito-graalvm-scripts): Configures the GraalVM on the target image and provides custom configuration script. 
 - [kogito-image-dependencies](modules/kogito-image-dependencies): Installs rpm packages on the target image. Contains common dependencies for Kogito Images.
-- [kogito-jobs-service](modules/kogito-jobs-service): Installs and Configure the jobs-service jar inside the image
+- [kogito-jobs-service-common](modules/kogito-jobs-service-common): Job service common module
+- [kogito-jobs-service-ephemeral](modules/kogito-jobs-service-ephemeral): Installs and Configure the in-memory jobs-service jar inside the image
+- [kogito-jobs-service-infinispan](modules/kogito-jobs-service-infinispan): Installs and Configure the infinispan jobs-service jar inside the image
+- [kogito-jobs-service-mongodb](modules/kogito-jobs-service-mongodb): Installs and Configure the mongodb jobs-service jar inside the image
 - [kogito-jq](modules/kogito-jq): Provides jq binary.
 - [kogito-kubernetes-client](modules/kogito-kubernetes-client): Provides a simple wrapper to interact with Kubernetes API.
 - [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
@@ -1073,7 +1080,9 @@ Please inspect the images overrides files to learn which modules are installed o
 - [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-redis](kogito-trusty-redis-overrides.yaml)
 - [quay.io/kiegroup/kogito-explainability](kogito-explainability-overrides.yaml)
-- [quay.io/kiegroup/kogito-jobs-service](kogito-jobs-service-overrides.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-overrides.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-infinispan](kogito-jobs-service-infinispan-overrides.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-mongodb](kogito-jobs-service-mongodb-overrides.yaml)
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-overrides.yaml)
 - [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-overrides.yaml)
@@ -1224,7 +1233,7 @@ As an example, let's execute the tests from the [kogito-s2i-core](modules/kogito
 The best way to start to interact with Bats tests is take a look on its [documentation](https://github.com/sstephenson/bats) 
 and after use the existing ones as example.
 
-[Here](modules/kogito-jobs-service/tests/bats) you can find a basic example about how our Bats tests
+[Here](modules/kogito-jobs-service-common/tests/bats) you can find a basic example about how our Bats tests
 are structured.
 
 
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index d06bbb2d1cf..b571e6a3acc 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -219,15 +219,15 @@ items:
   - kind: ImageStream
     apiVersion: v1
     metadata:
-      name: kogito-jobs-service
+      name: kogito-jobs-service-ephemeral
       annotations:
-        openshift.io/display-name: Runtime image for the Kogito Jobs Service
+        openshift.io/display-name: Runtime image for Kogito in memory Jobs Service
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
         - name: '2.0.0-snapshot'
           annotations:
-            description: Runtime image for the Kogito Jobs Service
+            description: Runtime image for Kogito in memory Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
@@ -236,7 +236,49 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-ephemeral:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-jobs-service-infinispan
+      annotations:
+        openshift.io/display-name: Runtime image for Kogito Jobs Service based on Infinispan
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Runtime image for Kogito Jobs Service based on Infinispan
+            iconClass: icon-jbpm
+            tags: kogito,jobs-service
+            supports: out-of-box process timers
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-jobs-service-infinispan:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-jobs-service-mongodb
+      annotations:
+        openshift.io/display-name: Runtime image for Kogito Jobs Service based on Mongodb
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Runtime image for Kogito Jobs Service based on Mongodb
+            iconClass: icon-jbpm
+            tags: kogito,jobs-service
+            supports: out-of-box process timers
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-jobs-service-mongodb:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/scripts/README.md b/scripts/README.md
index de7b159aa7d..1ca046c6161 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -110,7 +110,7 @@ This script will help you while building images and test in a local OpenShift Cl
 images built in your local registry with the tag following the patter: X.Z, e.g. 0.10:
 
 ```text
-quay.io/kiegroup/kogito-jobs-service:0.10
+quay.io/kiegroup/kogito-jobs-service-ephemeral:0.10
 ```
 
 The [Makefile](../Makefile) has an option to do it, it can be invoked as the following sample:
@@ -191,13 +191,16 @@ The command will update the needed files with the new URL:
 
 - kogito-data-index-infinispan/module.yaml
 - kogito-data-index-mongodb/module.yaml
-- kogito-jobs-service/module.yaml
+- kogito-explainability/module.yaml
+- kogito-jit-runner/module.yaml
+- kogito-jobs-service-ephemeral/module.yaml
+- kogito-jobs-service-infinispan/module.yaml
+- kogito-jobs-service-mongodb/module.yaml
 - kogito-management-console/module.yaml
+- kogito-task-console/module.yaml
 - kogito-trusty-ui/module.yaml
 - kogito-trusty-infinispan/module.yaml
 - kogito-trusty-redis/module.yaml
-- kogito-jit-runner/module.yaml
-- kogito-explainability/module.yaml
 
 ### Update tests script
 
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 258688d81d2..843713c9040 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -4,7 +4,7 @@
 @quay.io/kiegroup/kogito-management-console 
 @quay.io/kiegroup/kogito-explainability 
 @quay.io/kiegroup/kogito-jit-runner 
-@quay.io/kiegroup/kogito-jobs-service 
+@quay.io/kiegroup/kogito-jobs-service-ephemeral @quay.io/kiegroup/kogito-jobs-service-infinispan @quay.io/kiegroup/kogito-jobs-service-mongodb
 @quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis 
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: Common tests for Custom TrustStore configuration
diff --git a/tests/features/jobs-service/kogito-jobs-service-ehpemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
similarity index 100%
rename from tests/features/jobs-service/kogito-jobs-service-ehpemeral.feature
rename to tests/features/jobs-service/kogito-jobs-service-ephemeral.feature

From 8c0e44cc66b4aa2f304ae209b3a8170abe267bb2 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 21 May 2021 09:08:44 -0300
Subject: [PATCH 286/709] Updated Maven artifacts (#479)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 5315780a3b5..8b124ab6e0c 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210512.051044-146-runner.jar
-    md5: d0bcea3b96be8288339c235c06609163
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210521.043506-147-runner.jar
+    md5: 7fab7c06c99f82b5a1b7e46c4da35886
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 50552e6511c..7d65a35c14a 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210512.051201-145-runner.jar
-    md5: efd2171fec71bf245097f921e4b77290
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210521.043620-146-runner.jar
+    md5: e10db999a379be84d2c23d9cc3807e64
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 968459966fa..1fb8096f175 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210512.052038-146-runner.jar
-    md5: 4f82fc443c72c7901980797105e7c4b4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210521.044413-147-runner.jar
+    md5: 53c35e91ae4ad242b56eaf989415c809
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210512.052005-143-runner.jar
-    md5: e0df3aae09d8ff61738560fa79521ac9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210521.044341-144-runner.jar
+    md5: b3fd1aeec805540d77c5f28d698e8b53
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index f89b6752a42..a61a9835f15 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210512.052335-88-runner.jar
-    md5: ff9082119f8c46dfc37618910a44886a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210521.044707-89-runner.jar
+    md5: 2414a1835736e647c89b248661462385
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index cf3f663025c..1abcb6d4162 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210512.050629-19-runner.jar
-    md5: f91515c2735619e2d7c6b13155e7b24a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210521.043051-20-runner.jar
+    md5: 332b4fd8d77671ed93e627f24c1d570e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index aa16e040f3b..fac0ecb2a78 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210512.050722-19-runner.jar
-    md5: a4a4566cae479144c8afb0ee6db32d81
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210521.043144-20-runner.jar
+    md5: 2220aebb40669866de688dded5d3a933
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 27873df4193..93aaf8ae4f3 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210512.050908-1-runner.jar
-    md5: 23edd8d75049d372af50f44b94802460
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210521.043333-2-runner.jar
+    md5: 3b6d690db3352f0b2f24f4109b75d8f1
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 3cea6cbb3e6..46d963fdce2 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210512.051738-146-runner.jar
-    md5: be66b1ae462cb15140c792201d654eae
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210521.044122-147-runner.jar
+    md5: f442ffaa55a0277badd24d79142e57f0
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 6d482d4797e..bbd4d8c6ac4 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210512.051838-146-runner.jar
-    md5: 6423de520d2be89876a4aedac2e3e8c3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210521.044220-147-runner.jar
+    md5: ddc8dcdd2497c4b28b4af39d58b7df07
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index a8b648e23b4..71ac63b4ae0 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210512.052155-59-runner.jar
-    md5: ce1bd8641595fa360951a4a25cd551c7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210521.044525-60-runner.jar
+    md5: b0cc0fc51018413a200428292161c69c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index dc9b776bd0b..39923ccf2b8 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210512.052228-59-runner.jar
-    md5: 0961e7f866c49603de10df51cf0525ce
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210521.044558-60-runner.jar
+    md5: 438ea1abe4c0fc2550ea299799002608
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index cfbd4ec39a7..217215e6819 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210512.051807-146-runner.jar
-    md5: ae4233edc30f753f5081a8346a14ce9a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210521.044150-147-runner.jar
+    md5: 37a6795d3036d7526955ef7f986094a1
 
 execute:
   - script: configure

From 1f0c4437fb9fd7a0f093d1603812c75e5709f2af Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 25 May 2021 05:22:24 -0300
Subject: [PATCH 287/709] Updated Maven artifacts (#482)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 8b124ab6e0c..0134df95797 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210521.043506-147-runner.jar
-    md5: 7fab7c06c99f82b5a1b7e46c4da35886
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210522.100709-148-runner.jar
+    md5: 041c01d706d74d24f8eddde36b624b48
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 7d65a35c14a..7feff2f7258 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210521.043620-146-runner.jar
-    md5: e10db999a379be84d2c23d9cc3807e64
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210522.100823-147-runner.jar
+    md5: 5ebb663ddc171c7c8ddec990285e435a
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 1fb8096f175..549c92aecab 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210521.044413-147-runner.jar
-    md5: 53c35e91ae4ad242b56eaf989415c809
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210522.101745-148-runner.jar
+    md5: d02bd2f6148c1b052bbbc84e2bfac3c3
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210521.044341-144-runner.jar
-    md5: b3fd1aeec805540d77c5f28d698e8b53
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210522.101706-145-runner.jar
+    md5: 64a918d1dc1a77403d1a3cafe4c0a3ea
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index a61a9835f15..0e153fe5bf0 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210521.044707-89-runner.jar
-    md5: 2414a1835736e647c89b248661462385
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210522.102108-90-runner.jar
+    md5: 66e238ccff104a6ead9f8a633f4fae89
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 1abcb6d4162..bef7491b5ff 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210521.043051-20-runner.jar
-    md5: 332b4fd8d77671ed93e627f24c1d570e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210522.100231-21-runner.jar
+    md5: 4da7d6a40c44e5769a78f4d03227fd65
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index fac0ecb2a78..0779f78d98d 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210521.043144-20-runner.jar
-    md5: 2220aebb40669866de688dded5d3a933
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210522.100331-21-runner.jar
+    md5: 47512d2e5195517691692de9bc9d0f0d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 93aaf8ae4f3..612b3106bf7 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210521.043333-2-runner.jar
-    md5: 3b6d690db3352f0b2f24f4109b75d8f1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210522.100529-3-runner.jar
+    md5: 9e4c42f81af1ce9fa1532b88ed12ddf3
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 46d963fdce2..e0a6d5db23a 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210521.044122-147-runner.jar
-    md5: f442ffaa55a0277badd24d79142e57f0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210522.101420-148-runner.jar
+    md5: 12fba9360f8e04d26ab1ef89755ede3f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index bbd4d8c6ac4..f1b08c3555d 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210521.044220-147-runner.jar
-    md5: ddc8dcdd2497c4b28b4af39d58b7df07
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210522.101529-148-runner.jar
+    md5: 133067580484e8d356ebd279e41d8433
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 71ac63b4ae0..5517b21ef8a 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210521.044525-60-runner.jar
-    md5: b0cc0fc51018413a200428292161c69c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210522.101913-61-runner.jar
+    md5: d135b3c39c6725a68cfad4cfbeead20b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 39923ccf2b8..e63a6b92ac3 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210521.044558-60-runner.jar
-    md5: 438ea1abe4c0fc2550ea299799002608
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210522.101952-61-runner.jar
+    md5: 78c2cbca1b83c8c8bb946638dbaf28ff
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 217215e6819..2bad9b8ee30 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210521.044150-147-runner.jar
-    md5: 37a6795d3036d7526955ef7f986094a1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210522.101453-148-runner.jar
+    md5: fd2f039fdac8c732ae92beffd7243260
 
 execute:
   - script: configure

From e64177cd1f8e21d4e651d6eee68bf6145934e818 Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Tue, 25 May 2021 17:21:29 +0530
Subject: [PATCH 288/709] [KOGITO-5178] - Create Image distribution for Job
 Service Postgresql (#476)

* [KOGITO-5178] - Create Image distribution for Job Service Postgresql

* Incorporate review comments
---
 README.md                                     | 13 +++++-
 kogito-imagestream.yaml                       | 21 +++++++++
 kogito-jobs-service-postgresql-overrides.yaml | 44 +++++++++++++++++++
 .../added/kogito-app-launch.sh                | 27 ++++++++++++
 .../kogito-jobs-service-postgresql/configure  | 14 ++++++
 .../module.yaml                               | 15 +++++++
 scripts/README.md                             |  1 +
 scripts/common.py                             |  1 +
 scripts/update-maven-artifacts.py             |  1 +
 .../features/common-custom-truststore.feature |  2 +-
 .../kogito-jobs-service-common.feature        |  2 +-
 .../kogito-jobs-service-postgresql.feature    | 25 +++++++++++
 12 files changed, 163 insertions(+), 3 deletions(-)
 create mode 100644 kogito-jobs-service-postgresql-overrides.yaml
 create mode 100644 modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-jobs-service-postgresql/configure
 create mode 100644 modules/kogito-jobs-service-postgresql/module.yaml
 create mode 100644 tests/features/jobs-service/kogito-jobs-service-postgresql.feature

diff --git a/README.md b/README.md
index 7f4bd0373f3..dfc98917285 100644
--- a/README.md
+++ b/README.md
@@ -530,6 +530,7 @@ Today we have 3 Kogito Component Images:
 * [quay.io/kiegroup/kogito-jobs-service-ephemeral](https://quay.io/kiegroup/kogito-jobs-service-ephemeral) 
 * [quay.io/kiegroup/kogito-jobs-service-infinispan](https://quay.io/kiegroup/kogito-jobs-service-infinispan)
 * [quay.io/kiegroup/kogito-jobs-service-mongodb](https://quay.io/kiegroup/kogito-jobs-service-mongodb)
+* [quay.io/kiegroup/kogito-jobs-service-postgresql](https://quay.io/kiegroup/kogito-jobs-service-postgresql)
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
 * [quay.io/kiegroup/kogito-task-console](https://quay.io/kiegroup/kogito-task-console)
 * [quay.io/kiegroup/kogito-trusty-ui](https://quay.io/kiegroup/kogito-trusty-ui)
@@ -559,6 +560,11 @@ Basic usage with Mongodb:
 $ docker run -it --env QUARKUS_MONGODB_CONNECTION_STRING=mongodb://localhost:27017 quay.io/kiegroup/kogito-data-index-mongodb:latest
 ```
 
+Basic usage with Postgresql:
+```bash
+$ docker run -it --env QUARKUS_POSTGRESQL_CONNECTION_STRING=postgresql://localhost:5432 quay.io/kiegroup/kogito-data-index-postgresql:latest
+```
+
 To enable debug just use this env while running this image:
 
 ```bash
@@ -637,6 +643,7 @@ Today, the Jobs service contains two images:
 - [ephemeral](kogito-jobs-service-ephemeral-overrides.yaml)
 - [infinispan](kogito-jobs-service-infinispan-overrides.yaml)
 - [mongodb](kogito-jobs-service-mongodb-overrides.yaml)
+- [postgresql](kogito-jobs-service-postgresql-overrides.yaml)
 
 Basic usage:
 
@@ -653,7 +660,7 @@ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-infi
 You should notice a few debug messages being printed in the system output.
 
 The ephemeral image does not have external dependencies like a backend persistence provider, it uses in-memory persistence
-while working with Jobs Services `infinispan` and `mongodb` variants, it will need to have an Infinispan and MongoDB server,
+while working with Jobs Services `infinispan`, `mongodb` and `postgresql` variants, it will need to have an Infinispan, MongoDB and Postgresql server,
 respectively, previously running.
 
 
@@ -795,6 +802,7 @@ imagestream.image.openshift.io/kogito-trusty-redis created
 imagestream.image.openshift.io/kogito-jobs-service-ephemeral created
 imagestream.image.openshift.io/kogito-jobs-service-infinispan created
 imagestream.image.openshift.io/kogito-jobs-service-mongodb created
+imagestream.image.openshift.io/kogito-jobs-service-postgresql created
 imagestream.image.openshift.io/kogito-management-console created
 
 # performing a new build
@@ -985,6 +993,7 @@ With this Makefile you can:
      $ make build-image image_name=kogito-jobs-service-ephemeral
      $ make build-image image_name=kogito-jobs-service-infinispan
      $ make build-image image_name=kogito-jobs-service-mongodb
+     $ make build-image image_name=kogito-jobs-service-postgresql
      $ make build-image image_name=kogito-management-console
      $ make build-image image_name=kogito-trusty-ui
      $ make build-image image_name=kogito-jit-runner
@@ -1056,6 +1065,7 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-jobs-service-ephemeral](modules/kogito-jobs-service-ephemeral): Installs and Configure the in-memory jobs-service jar inside the image
 - [kogito-jobs-service-infinispan](modules/kogito-jobs-service-infinispan): Installs and Configure the infinispan jobs-service jar inside the image
 - [kogito-jobs-service-mongodb](modules/kogito-jobs-service-mongodb): Installs and Configure the mongodb jobs-service jar inside the image
+- [kogito-jobs-service-postgresql](modules/kogito-jobs-service-postgresql): Installs and Configure the postgresql jobs-service jar inside the image  
 - [kogito-jq](modules/kogito-jq): Provides jq binary.
 - [kogito-kubernetes-client](modules/kogito-kubernetes-client): Provides a simple wrapper to interact with Kubernetes API.
 - [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
@@ -1083,6 +1093,7 @@ Please inspect the images overrides files to learn which modules are installed o
 - [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-infinispan](kogito-jobs-service-infinispan-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-mongodb](kogito-jobs-service-mongodb-overrides.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-overrides.yaml)  
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-overrides.yaml)
 - [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-overrides.yaml)
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index b571e6a3acc..f7d068a44ee 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -279,6 +279,27 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-jobs-service-mongodb:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-jobs-service-postgresql
+      annotations:
+        openshift.io/display-name: Runtime image for Kogito Jobs Service based on Postgresql
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Runtime image for Kogito Jobs Service based on Postgresql
+            iconClass: icon-jbpm
+            tags: kogito,jobs-service
+            supports: out-of-box process timers
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-jobs-service-postgresql:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-jobs-service-postgresql-overrides.yaml b/kogito-jobs-service-postgresql-overrides.yaml
new file mode 100644
index 00000000000..77b2ca07fd5
--- /dev/null
+++ b/kogito-jobs-service-postgresql-overrides.yaml
@@ -0,0 +1,44 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
+description: "Runtime image for Kogito Jobs Service based on Postgresql"
+
+labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Jobs Service based on Postgresql"
+- name: "io.k8s.display-name"
+  value: "Kogito Jobs Service based on Postgresql"
+- name: "io.openshift.tags"
+  value: "kogito,jobs-service-postgresql"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+- name: "ENABLE_EVENTS"
+  example: "true"
+  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.jobs.service.postgresql
+  - name: org.kie.kogito.security.custom.truststores
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
diff --git a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..2c9ed73aa3a
--- /dev/null
+++ b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  "${KOGITO_HOME}"/launch/kogito-jobs-service-common.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+    -Dquarkus.http.host=0.0.0.0 \
+    -Dquarkus.http.port=8080 \
+    -jar "${KOGITO_HOME}"/bin/jobs-service-postgresql-runner.jar
diff --git a/modules/kogito-jobs-service-postgresql/configure b/modules/kogito-jobs-service-postgresql/configure
new file mode 100644
index 00000000000..82daedf5e94
--- /dev/null
+++ b/modules/kogito-jobs-service-postgresql/configure
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v "${SOURCES_DIR}"/jobs-service-postgresql-runner.jar "${KOGITO_HOME}"/bin/
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
+
+cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
new file mode 100644
index 00000000000..d7d4e1289e6
--- /dev/null
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -0,0 +1,15 @@
+schema_version: 1
+name: org.kie.kogito.jobs.service.postgresql
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: jobs-service-postgresql-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210509.043002-14-runner.jar
+    md5: 095f81ed902423325d70169774bead61
+
+execute:
+  - script: configure
+
+modules:
+  install:
+    - name: org.kie.kogito.jobs.service.common
diff --git a/scripts/README.md b/scripts/README.md
index 1ca046c6161..6156276e070 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -196,6 +196,7 @@ The command will update the needed files with the new URL:
 - kogito-jobs-service-ephemeral/module.yaml
 - kogito-jobs-service-infinispan/module.yaml
 - kogito-jobs-service-mongodb/module.yaml
+- kogito-jobs-service-postgresql/module.yaml  
 - kogito-management-console/module.yaml
 - kogito-task-console/module.yaml
 - kogito-trusty-ui/module.yaml
diff --git a/scripts/common.py b/scripts/common.py
index d9106139979..ea784668812 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -14,6 +14,7 @@
            "kogito-explainability", "kogito-image-dependencies",
            "kogito-jobs-service-common", "kogito-jobs-service-ephemeral",
            "kogito-jobs-service-infinispan", "kogito-jobs-service-mongodb",
+           "kogito-jobs-service-postgresql",
            "kogito-trusty-ui", "kogito-jq",
            "kogito-kubernetes-client", "kogito-launch-scripts",
            "kogito-logging", "kogito-management-console",
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 26264d799ba..075c1708481 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -33,6 +33,7 @@
     "jobs-service-infinispan": "kogito-jobs-service-infinispan",
     "jobs-service-mongodb": "kogito-jobs-service-mongodb",
     "jobs-service-common": "kogito-jobs-service-ephemeral",
+    "jobs-service-postgresql": "kogito-jobs-service-postgresql",
     "management-console": "kogito-management-console",
     "task-console": "kogito-task-console",
     "trusty-ui": "kogito-trusty-ui",
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 843713c9040..ea9cfeedd2b 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -4,7 +4,7 @@
 @quay.io/kiegroup/kogito-management-console 
 @quay.io/kiegroup/kogito-explainability 
 @quay.io/kiegroup/kogito-jit-runner 
-@quay.io/kiegroup/kogito-jobs-service-ephemeral @quay.io/kiegroup/kogito-jobs-service-infinispan @quay.io/kiegroup/kogito-jobs-service-mongodb
+@quay.io/kiegroup/kogito-jobs-service-ephemeral @quay.io/kiegroup/kogito-jobs-service-infinispan @quay.io/kiegroup/kogito-jobs-service-mongodb @quay.io/kiegroup/kogito-jobs-service-postgresql
 @quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis 
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: Common tests for Custom TrustStore configuration
diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature
index 87cbeffe702..56997e71f6b 100644
--- a/tests/features/jobs-service/kogito-jobs-service-common.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-common.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-jobs-service-infinispan @quay.io/kiegroup/kogito-jobs-service-mongodb @quay.io/kiegroup/kogito-jobs-service-ephemeral
+@quay.io/kiegroup/kogito-jobs-service-infinispan @quay.io/kiegroup/kogito-jobs-service-mongodb @quay.io/kiegroup/kogito-jobs-service-ephemeral @quay.io/kiegroup/kogito-jobs-service-postgresql
 Feature: Kogito-jobs-service common feature.
 
   Scenario: verify if the events is correctly enabled
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
new file mode 100644
index 00000000000..fb7fe462db2
--- /dev/null
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -0,0 +1,25 @@
+@quay.io/kiegroup/kogito-jobs-service-postgresql
+Feature: Kogito-jobs-service-postgresql feature.
+
+  Scenario: verify if all labels are correctly set kogito-jobs-service image image
+    Given image is built
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Postgresql
+    And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Postgresql
+    And the image should contain label io.openshift.tags with value kogito,jobs-service-postgresql
+  
+  Scenario: verify if the jobs service postgresql binary is available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/jobs-service-postgresql-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-postgresql-runner.jar
+
+  Scenario: verify if of container is correctly started with postgresql parameters
+    When container is started with env
+      | variable                          | value                                          |
+      | SCRIPT_DEBUG                      | true                                           |
+      | QUARKUS_POSTGRES_CONNECTION_STRING | postgres://user:password@localhost:5432/admin  |
+    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-postgresql-runner.jar
+    And container log should contain localhost/127.0.0.1:5432
+    And container log should not contain Application failed to start

From b4ec9d89121187f4420ee3a88898a94f81476d4d Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 27 May 2021 14:56:57 +0200
Subject: [PATCH 289/709] KOGITO-4487 Update to nightly branch for testing
 (#487)

---
 Jenkinsfile.deploy                            |  2 +-
 tests/features/kogito-builder-native.feature  | 14 ++++-----
 tests/features/kogito-builder.feature         |  8 ++---
 .../kogito-common-builder-jvm.feature         | 30 +++++++++----------
 tests/test-apps/clone-repo.sh                 |  2 +-
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index b0425fb60d0..5825588ada2 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -92,7 +92,7 @@ pipeline {
                 script {
                     versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
                     if (getBuildBranch() != 'master') {
-                        versionCmd += " --examples-ref ${getBuildBranch()}"
+                        versionCmd += " --examples-ref ${!isRelease() ? 'nightly-' : ''}${getBuildBranch()}"
                     }
                     if (getKogitoArtifactsVersion()) {
                         versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index aad572c4978..6d29a225dcd 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -15,7 +15,7 @@ Feature: kogito-builder image native build tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.1.0
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -35,7 +35,7 @@ Feature: kogito-builder image native build tests
     And s2i build log should contain -J-Xmx4g
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master
       | variable | value          |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -55,7 +55,7 @@ Feature: kogito-builder image native build tests
     And s2i build log should contain -J-Xmx4g
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -74,7 +74,7 @@ Feature: kogito-builder image native build tests
   #ignore until https://issues.redhat.com/browse/KOGITO-3638 is resolved
   @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable          | value         |
       | RUNTIME_TYPE      | quarkus       |
       | NATIVE            | true          |
@@ -85,7 +85,7 @@ Feature: kogito-builder image native build tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Perform a incremental s2i build for native test
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-master
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -103,7 +103,7 @@ Feature: kogito-builder image native build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario:Perform a second incremental s2i build for native scenario, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-master
       | variable     | value      |
       | RUNTIME_TYPE | quarkus    |
       | NATIVE       | true       |
@@ -122,7 +122,7 @@ Feature: kogito-builder image native build tests
       | expected_phrase | ["hello","world"]     |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 3a0ca056616..5d98eb5da93 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -23,7 +23,7 @@ Feature: kogito-builder image tests
     And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | NATIVE            | false         |
       | RUNTIME_TYPE      | quarkus       |
@@ -33,7 +33,7 @@ Feature: kogito-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
       | RUNTIME_TYPE      | springboot    |
@@ -42,7 +42,7 @@ Feature: kogito-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
@@ -60,7 +60,7 @@ Feature: kogito-builder image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index 3e3342dcca9..ab918962fab 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -8,7 +8,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master
       | variable     | value   |
       | NATIVE       | false   |
       | RUNTIME_TYPE | quarkus |
@@ -26,7 +26,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master
       | variable     | value   |
       | NATIVE       | false   |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value                     |
       | NATIVE       | false                     |
       | RUNTIME_TYPE | quarkus                   |
@@ -62,7 +62,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -78,7 +78,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                            |
       | RUNTIME_TYPE      | quarkus                          |
       | NATIVE            | false                            |
@@ -96,7 +96,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Perform a incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-master
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -114,7 +114,7 @@ Feature: kogito-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-master
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -135,7 +135,7 @@ Feature: kogito-builder image JVM build tests
 #### SpringBoot Scenarios
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-      Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
         | variable     | value        |
         | RUNTIME_TYPE | springboot   |
         | JAVA_OPTIONS | -Ddebug=true |
@@ -153,7 +153,7 @@ Feature: kogito-builder image JVM build tests
       And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-master
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | RUNTIME_TYPE        | springboot   |
@@ -171,7 +171,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from process-springboot-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -188,7 +188,7 @@ Feature: kogito-builder image JVM build tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
   
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | RUNTIME_TYPE      | springboot                         |
@@ -208,7 +208,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Perform a incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using nightly-master
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -225,7 +225,7 @@ Feature: kogito-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using nightly-master
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -233,7 +233,7 @@ Feature: kogito-builder image JVM build tests
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |
       | RUNTIME_TYPE   | springboot     |
@@ -241,7 +241,7 @@ Feature: kogito-builder image JVM build tests
 
 
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                           |
       | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
       | RUNTIME_TYPE      | quarkus                         |
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 25fd1ff975f..cb14d637b3f 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -38,7 +38,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
 git fetch origin --tags
-git checkout master
+git checkout nightly-master
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/

From 05040a49409802e4a8d571c3b1049b5aa190775e Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 31 May 2021 10:11:29 +0200
Subject: [PATCH 290/709] KOGITO-5184 Allow to promote only certain images
 (#486)

---
 .jenkins/dsl/jobs.groovy |  1 +
 Jenkinsfile.deploy       | 45 ++++++++++++++++++++++++++++++++--------
 Jenkinsfile.promote      |  7 ++++++-
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/.jenkins/dsl/jobs.groovy b/.jenkins/dsl/jobs.groovy
index ff6c2ad6c63..f0f65370cd0 100644
--- a/.jenkins/dsl/jobs.groovy
+++ b/.jenkins/dsl/jobs.groovy
@@ -153,6 +153,7 @@ void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
             stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Override `deployment.properties`. Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
             stringParam('BASE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Override `deployment.properties`. Base image registry')
             stringParam('BASE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Override `deployment.properties`. Base image namespace')
+            stringParam('BASE_IMAGE_NAMES', '', 'Override `deployment.properties`. Comma separated list of images')
             stringParam('BASE_IMAGE_NAME_SUFFIX', '', 'Override `deployment.properties`. Base image name suffix')
             stringParam('BASE_IMAGE_TAG', '', 'Override `deployment.properties`. Base image tag')
 
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 5825588ada2..ec4d9db76c2 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -4,6 +4,8 @@ deployProperties = [ : ]
 
 commitDone = false
 
+BUILT_IMAGES = []
+
 pipeline {
     agent {
         label 'kogito-image-slave && !master'
@@ -62,7 +64,7 @@ pipeline {
                 }
             }
             post {
-                success {
+                always {
                     script {
                         setDeployPropertyIfNeeded('git.branch', getBuildBranch())
                         setDeployPropertyIfNeeded('git.author', getGitAuthor())
@@ -236,12 +238,13 @@ pipeline {
                 }
             }
             post {
-                success {
+                always {
                     script {
                         // Store image deployment information
                         String imgPrefix = "${getRepoName()}.image"
                         setDeployPropertyIfNeeded("${imgPrefix}.registry", getDeployImageRegistry())
                         setDeployPropertyIfNeeded("${imgPrefix}.namespace", getDeployImageNamespace())
+                        setDeployPropertyIfNeeded("${imgPrefix}.names", getBuiltImages().join(','))
                         setDeployPropertyIfNeeded("${imgPrefix}.name-suffix", getDeployImageNameSuffix())
                         setDeployPropertyIfNeeded("${imgPrefix}.tag", getDeployImageTag())
                     }
@@ -270,12 +273,12 @@ pipeline {
                     if (isCreateChangesPR()) {
                         String bodyMsg = "PR has been created with update Maven artifacts.\nPlease review it here: ${prLink}"
 
-                        emailext body: bodyMsg, subject: "[${getBuildBranch()}][d] Kogito Images pipeline", to: env.KOGITO_CI_EMAIL_TO 
+                        emailext body: bodyMsg, subject: "[${getBuildBranch()}][d] Kogito Images pipeline", to: env.KOGITO_CI_EMAIL_TO
                     }
                 }
             }
             post {
-                success {
+                always {
                     script {
                         setDeployPropertyIfNeeded("${getRepoName()}.pr.source.uri", "https://github.com/${getBotAuthor()}/${getRepoName()}")
                         setDeployPropertyIfNeeded("${getRepoName()}.pr.source.ref", getBotBranch())
@@ -334,25 +337,49 @@ void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
 }
 
 void buildImage(image) {
-    sh "make build-image image_name=${image} ignore_test=true cekit_option='--work-dir .'"
+    try {
+        sh "make build-image image_name=${image} ignore_test=true cekit_option='--work-dir .'"
+        registerBuiltImage (image)
+    } catch (err) {
+        unstable("${image} build failed")
+    }
 }
 
 void testImage(image) {
     try {
         sh "make build-image image_name=${image} ignore_build=true cekit_option='--work-dir .'"
+    } catch (err) {
+        removeBuiltImage (image)
+        unstable("${image} testing failed")
     } finally {
         junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
     }
 }
 
+void registerBuiltImage (String imageName) {
+    lock("${BUILD_URL}") {
+        BUILT_IMAGES.add(imageName)
+    }
+}
+
+void removeBuiltImage (String imageName) {
+    lock("${BUILD_URL}") {
+        BUILT_IMAGES = BUILT_IMAGES.findAll { it != imageName }
+    }
+}
+
+List getBuiltImages() {
+    return BUILT_IMAGES
+}
+
 void tagImages() {
-    for (String imageName : getImages()) {
+    for (String imageName : getBuiltImages()) {
         sh "${env.CONTAINER_ENGINE} tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"
     }
 }
 
 void pushImages() {
-    for (String imageName : getImages()) {
+    for (String imageName : getBuiltImages()) {
         pushImage(buildImageName(imageName))
     }
 }
@@ -366,7 +393,7 @@ void pushImage(String fullImageName) {
 // Set images public on quay. Useful when new images are introduced.
 void makeQuayImagesPublic() {
     String namespace = getDeployImageNamespace()
-    for (String imageName : getImages()) {
+    for (String imageName : getBuiltImages()) {
         String repository = getFinalImageName(imageName)
         echo "Check and set public if needed Quay repository ${namespace}/${repository}"
         try {
@@ -519,7 +546,7 @@ boolean shouldSkipTests() {
 }
 
 void setDeployPropertyIfNeeded(String key, def value) {
-    if (value != null && value != '') {
+    if (value) {
         deployProperties[key] = value
     }
 }
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 0050d927cf9..98cd11c5ecd 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -482,6 +482,10 @@ String getOldImageNamespace() {
     return isOldImageInOpenshiftRegistry() ? 'openshift' : getParamOrDeployProperty('BASE_IMAGE_NAMESPACE' , "${getOldImagePrefix()}.namespace")
 }
 
+String getOldImageNames() {
+    return getParamOrDeployProperty('BASE_IMAGE_NAMES' , "${getOldImagePrefix()}.names")
+}
+
 String getOldImageNameSuffix() {
     return getParamOrDeployProperty('BASE_IMAGE_NAME_SUFFIX' , "${getOldImagePrefix()}.name-suffix")
 }
@@ -519,5 +523,6 @@ String getNewImageTag() {
 }
 
 String[] getImages() {
-    return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
+    String oldImageNames = getOldImageNames()
+    return oldImageNames ? oldImageNames.split(',') : sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
 }

From c1c8659f07918a633ac68f48ef8f00718be9bb85 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Mon, 31 May 2021 11:07:52 -0300
Subject: [PATCH 291/709] [KOGITO-4455] [KOGITO-4455] Adding Kogito Quarkus
 Workflows extension to generated Quarkus Projects (#399)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 modules/kogito-maven/3.6.x/configure          |  2 +-
 modules/kogito-s2i-core/added/s2i-core        | 30 +++++++++++++++++--
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 28 ++++++++++++-----
 scripts/common.py                             |  1 -
 tests/features/kogito-builder.feature         | 25 +++++++++++++++-
 5 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/modules/kogito-maven/3.6.x/configure b/modules/kogito-maven/3.6.x/configure
index 10a615f0b24..22b27b09064 100644
--- a/modules/kogito-maven/3.6.x/configure
+++ b/modules/kogito-maven/3.6.x/configure
@@ -89,4 +89,4 @@ if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
     mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp
     #format and write the new file
     xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${KOGITO_HOME}"/.m2/settings.xml
-fi
\ No newline at end of file
+fi
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index bad6f56605b..7258978592c 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -118,7 +118,7 @@ function build_kogito_app() {
         fi
 
         log_info "---> Generating $RUNTIME_TYPE project structure using the $ARCHETYPE_ARTIFACT_ID archetype..."
-        $MAVEN_HOME/bin/mvn archetype:generate -B -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=$ARCHETYPE_ARTIFACT_ID \
+        $MAVEN_HOME/bin/mvn archetype:generate -U -B -DinteractiveMode=false -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=$ARCHETYPE_ARTIFACT_ID \
             -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
             ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml
 
@@ -126,20 +126,46 @@ function build_kogito_app() {
         log_info "--> Remove archetype generated resources"
         rm -rfv $PROJECT_ARTIFACT_ID/src/main/resources/*.{bpm,bpmn2,dmn,drl}
 
+        local require_sw
         # copy resources into the generated project
         for item in *
         do
             if [ -d "${item}" ] && [ "${item}" == "$PROJECT_ARTIFACT_ID" ]; then
                 log_info "--> Skipping generated project ..."
             else
-                log_info "--> Coping resource ${item}"
+                log_info "--> Copying resource ${item}"
                 cp -Rv "${item}" $PROJECT_ARTIFACT_ID/src/main/resources
+
+                if [[ ${item} =~ .*\.sw\.(yaml|yml|json) ]]; then
+                    if [[ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]]; then
+                        log_info "--> Found Serverless Workflow file. Will add Kogito Quarkus Workflows extension to the project."
+                        require_sw=true
+                    else
+                        log_warning "--> Builds from Serverless Workflow files are not supported for SpringBoot. Please build your project locally or use Quarkus."
+                        break
+                    fi
+                fi
             fi
         done
 
         # move all project content into the current directory
         mv -v $PROJECT_ARTIFACT_ID/* .
 
+        # add extension if needed
+        if [ ${require_sw} = true ]; then
+            log_info "--> Adding Kogito Quarkus Workflows extension to the generated project."
+            # we must set the evaluate version since forceStdout is not available in previous versions
+            quarkus_version=$($MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml help:evaluate -q -DforceStdout -Dexpression=quarkus.version)
+            if [[ ! "$quarkus_version" =~ [0-9]{0,2}\.[0-9]{0,3} ]]; then
+                log_error "--> Impossible to get Quarkus version from the generated Maven project (output: '$quarkus_version'), failing build"
+                exit 1
+            fi
+
+            log_info "--> Quarkus version is '$quarkus_version'"
+
+            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml io.quarkus:quarkus-maven-plugin:$quarkus_version:add-extension -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow"
+        fi
+
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \
             -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
             -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 548234c2276..b11d710245c 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -54,7 +54,6 @@ teardown() {
 
 }
 
-
 @test "test assemble_runtime no binaries" {
     run assemble_runtime
     [ "$status" -eq 0 ]
@@ -88,7 +87,6 @@ teardown() {
     [ "${lines[5]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
 }
 
-
 @test "test runtime_assemble with binary builds with new Quarkus 1.12+ default builds" {
     mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
@@ -121,7 +119,6 @@ teardown() {
     [ "${lines[15]}" = "'./quarkus-app/quarkus/quarkus-application.dat' -> '/tmp/kogito_home/bin/quarkus/quarkus-application.dat'" ]
 }
 
-
 @test "test runtime_assemble with binary builds native binary" {
     mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
@@ -155,7 +152,6 @@ teardown() {
     [ "${lines[7]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
 }
 
-
 @test "test runtime_assemble with binary builds entire target with new Quarkus 1.12+ default builds" {
     mkdir -p "${KOGITO_HOME}"/bin
     # emulating an upload
@@ -188,8 +184,6 @@ teardown() {
     [ "${lines[16]}" = "'./quarkus-app/quarkus/quarkus-application.dat' -> '/tmp/kogito_home/bin/quarkus/quarkus-application.dat'" ]
 }
 
-
-
 # Check that the irrelevant binaries are excluded
 @test "test runtime_assemble with binary builds entire target SpringBoot build" {
     mkdir -p "${KOGITO_HOME}"/bin
@@ -308,7 +302,6 @@ teardown() {
     [ "${lines[1]}" = "'target/app.jar' -> '"${KOGITO_HOME}"/bin'" ]
 }
 
-
 @test "test copy_kogito_app default quarkus java build no jar file present" {
     NATIVE="false"
     mkdir "${KOGITO_HOME}"/bin
@@ -393,3 +386,24 @@ teardown() {
     echo "result= ${lines[@]}"
     [ "${lines[0]}" = "---> Building application from source..." ]
 }
+
+@test "build_kogito_app build a project from a JSON Serverless Workflow file" {
+    mkdir /tmp/src
+    touch /tmp/src/workflow.sw.json
+
+    run build_kogito_app
+    rm -rf target/*
+    echo "result= ${lines[@]}"
+    [ "${lines[0]}" = "---> Generating quarkus project structure using the kogito-quarkus-archetype archetype..." ]
+}
+
+@test "build_kogito_app build a project from a YAML Serverless Workflow file" {
+    mkdir /tmp/src
+    touch /tmp/src/workflow.sw.yaml
+
+    run build_kogito_app
+    rm -rf target/*
+
+    echo "result= ${lines[@]}"
+    [ "${lines[0]}" = "---> Generating quarkus project structure using the kogito-quarkus-archetype archetype..." ]
+}
diff --git a/scripts/common.py b/scripts/common.py
index ea784668812..ebba1e1b1ca 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -335,7 +335,6 @@ def update_maven_repo_in_clone_repo(repo_url, replace_jboss_repository):
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
-
 def ignore_maven_self_signed_certificate_in_clone_repo():
     """
     Sets the environment variable to ignore the self-signed certificates in maven
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 5d98eb5da93..34b3ea833d9 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -78,4 +78,27 @@ Feature: kogito-builder image tests
       | expected_phrase | Should the driver be suspended?                                                                  |
       | request_method  | POST                                                                                             |
       | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
\ No newline at end of file
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+
+  Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
+    Given s2i build /tmp/kogito-examples from serverless-workflow-order-processing/src/main/resources using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable            | value                 |
+      | RUNTIME_TYPE        | quarkus               |
+      | NATIVE              | false                 |
+      | KOGITO_VERSION      | 2.0.0-SNAPSHOT        |
+      | PROJECT_GROUP_ID    | com.mycompany         |
+      | PROJECT_ARTIFACT_ID | myproject             |
+      | PROJECT_VERSION     | 2.0-SNAPSHOT          |
+      | K_SINK              | http://localhost:8181 |
+    Then file /home/kogito/bin/quarkus-run.jar should exist
+    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-archetype archetype...
+    And s2i build log should contain Adding Kogito Quarkus Workflows extension to the generated project.
+    And check that page is served
+      | property              | value                         |
+      | port                  | 8080                          |
+      | path                  | /                             |
+      | wait                  | 80                            |
+      | expected_status_code  | 200                           |
+      | request_method        | POST                          |
+      | content_type          | application/cloudevents+json  |
+      | request_body          | {"specversion": "1.0", "source": "behave", "type": "orderEvent", "id": "12345", "data": {"id":"f0643c68-609c-48aa-a820-5df423fa4fe0","country":"Brazil","total":10000,"description":"iPhone 12"}}|

From 5704335d4fd0ffc78a60bc7b081dc4b59ca810bb Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 9 Jun 2021 07:26:42 -0300
Subject: [PATCH 292/709] Updated Maven artifacts (#508)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 0134df95797..d220a1e73ae 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210522.100709-148-runner.jar
-    md5: 041c01d706d74d24f8eddde36b624b48
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210607.044111-155-runner.jar
+    md5: 1507ce4cc88b9823cbad0647fe315d18
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 7feff2f7258..a6f41d5cecc 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210522.100823-147-runner.jar
-    md5: 5ebb663ddc171c7c8ddec990285e435a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210607.044222-154-runner.jar
+    md5: f27d4dcf79eaa372d4a367a3d01cb719
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 549c92aecab..a5cf9f84cbe 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210522.101745-148-runner.jar
-    md5: d02bd2f6148c1b052bbbc84e2bfac3c3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210607.045003-155-runner.jar
+    md5: 33b4737904e8378f22c97bd11b3a5c11
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210522.101706-145-runner.jar
-    md5: 64a918d1dc1a77403d1a3cafe4c0a3ea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210607.044928-152-runner.jar
+    md5: 253449ea7e92ff57bacc2fecf45e5eb2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 0e153fe5bf0..09dc4a7fab6 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210522.102108-90-runner.jar
-    md5: 66e238ccff104a6ead9f8a633f4fae89
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210607.045320-97-runner.jar
+    md5: 10a1eee6a08774304db4d5ce323d9f25
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index bef7491b5ff..9e4409ce547 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210522.100231-21-runner.jar
-    md5: 4da7d6a40c44e5769a78f4d03227fd65
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210607.043628-28-runner.jar
+    md5: 0b085c3282633d66edd69c70dd073918
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 0779f78d98d..6c7ebe3da21 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210522.100331-21-runner.jar
-    md5: 47512d2e5195517691692de9bc9d0f0d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210607.043728-28-runner.jar
+    md5: 8c0920f0aa3f2a5e81bd638d38ea1b13
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 612b3106bf7..588e0ac34c0 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210522.100529-3-runner.jar
-    md5: 9e4c42f81af1ce9fa1532b88ed12ddf3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210607.043923-10-runner.jar
+    md5: 3f00253a314d9f2f89cfea645df02e5d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index d7d4e1289e6..0cfc19db54d 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210509.043002-14-runner.jar
-    md5: 095f81ed902423325d70169774bead61
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210607.043826-28-runner.jar
+    md5: 304d0e13ffbde76b1ef46ccb38e56010
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e0a6d5db23a..5a980afc9bc 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210522.101420-148-runner.jar
-    md5: 12fba9360f8e04d26ab1ef89755ede3f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210604.052108-154-runner.jar
+    md5: 072651406659722ebf9e69bc2c5724ab
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index f1b08c3555d..f2424cb0ccf 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210522.101529-148-runner.jar
-    md5: 133067580484e8d356ebd279e41d8433
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210604.052229-154-runner.jar
+    md5: b14e73054162f8c19fe6d296fe0199da
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 5517b21ef8a..8298c3b194c 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210522.101913-61-runner.jar
-    md5: d135b3c39c6725a68cfad4cfbeead20b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210607.045128-68-runner.jar
+    md5: 2a56ac0e722c3bc1fe03024c4b296d6d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index e63a6b92ac3..79dcb03ffbb 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210522.101952-61-runner.jar
-    md5: 78c2cbca1b83c8c8bb946638dbaf28ff
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210607.045204-68-runner.jar
+    md5: 7c2051ecb4f84ee52abaddf319959814
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 2bad9b8ee30..3f05aeef3ee 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210522.101453-148-runner.jar
-    md5: fd2f039fdac8c732ae92beffd7243260
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210604.052152-154-runner.jar
+    md5: 4e9dc355794e653ec9f34786358aa93e
 
 execute:
   - script: configure

From bbdbf3094fa1d10c2d6e28bcbef1f1d224d0747b Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 10 Jun 2021 16:11:05 +0200
Subject: [PATCH 293/709] Update test script to dynamically update behave tests
 (#507)

* Update behave test features more generic

* correction

* corrections

* correction

* fallback
---
 scripts/common.py                               | 16 ++++++++--------
 tests/features/kogito-builder.feature           |  2 +-
 tests/features/rhpam-kogito-builder-jvm.feature |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/common.py b/scripts/common.py
index ebba1e1b1ca..a69103b80e1 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -34,11 +34,6 @@
 
 # behave tests that needs to be updated
 BEHAVE_BASE_DIR = 'tests/features'
-BEHAVE_TESTS = {"kogito-builder.feature",
-                "kogito-builder-native.feature", 
-                "kogito-common-builder-jvm.feature",
-                "kogito-common-runtime-jvm.feature", 
-                "kogito-runtime-native.feature"}
 
 CLONE_REPO_SCRIPT = 'tests/test-apps/clone-repo.sh'
 
@@ -217,7 +212,7 @@ def update_examples_ref_in_behave_tests(examples_ref):
     """
     print("Set examples_ref {} in behave tests".format(examples_ref))
     # this pattern will look for any occurrences of using master or using x.x.x
-    pattern = re.compile(r'(using master)|(using \s*([\d.]+.x))|(using \s*([\d.]+))')
+    pattern = re.compile(r'(using nightly-master)|(using nightly-\s*([\d.]+.x))|(using \s*([\d.]+))')
     replacement = 'using {}'.format(examples_ref)
     update_in_behave_tests(pattern, replacement)
 
@@ -257,6 +252,10 @@ def update_runtime_image_in_behave_tests(runtime_image_name, image_suffix):
     replacement = 'runtime-image {}'.format(runtime_image_name)
     update_in_behave_tests(pattern, replacement)
 
+    pattern = re.compile(r'(runtime-image rhpam-7/rhpam-kogito-runtime-{}-rhel8:latest)'.format(image_suffix))
+    replacement = 'runtime-image {}'.format(runtime_image_name)
+    update_in_behave_tests(pattern, replacement)
+
 
 def update_maven_repo_in_behave_tests(repo_url, replaceJbossRepository):
     """
@@ -290,8 +289,9 @@ def update_in_behave_tests(pattern, replacement):
     :param pattern: Pattern to look for into file
     :param replacement: What to put instead if pattern found
     """
-    for feature in BEHAVE_TESTS:
-        update_in_file(os.path.join(BEHAVE_BASE_DIR, feature), pattern, replacement)
+    for f in os.listdir(BEHAVE_BASE_DIR):
+        if f.endswith('.feature'):
+            update_in_file(os.path.join(BEHAVE_BASE_DIR, f), pattern, replacement)
 
 
 def update_examples_ref_in_clone_repo(examples_ref):
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 34b3ea833d9..bb4d1e77e86 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -81,7 +81,7 @@ Feature: kogito-builder image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
-    Given s2i build /tmp/kogito-examples from serverless-workflow-order-processing/src/main/resources using master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from serverless-workflow-order-processing/src/main/resources using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value                 |
       | RUNTIME_TYPE        | quarkus               |
       | NATIVE              | false                 |
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index f8aab129409..9dd70568bbd 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -26,7 +26,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
@@ -44,7 +44,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |

From 054665ae1f709d676bc7494bed663bdc3749def3 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 10 Jun 2021 12:17:43 -0300
Subject: [PATCH 294/709] =?UTF-8?q?[RHPAM-3654]=20-=20Wrong=20archetype=20?=
 =?UTF-8?q?used=20to=20generate=20project=20from=20provided=E2=80=A6=20(#5?=
 =?UTF-8?q?10)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [RHPAM-3654] - Wrong archetype used to generate project from provided asset

Signed-off-by: spolti <fspolti@redhat.com>

* Update tests/features/kogito-builder.feature

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* Update tests/features/rhpam-kogito-builder-jvm.feature

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 modules/kogito-s2i-core/added/s2i-core        | 14 ++++++-------
 tests/features/kogito-builder.feature         | 19 +++++++++++++++++
 .../kogito-common-builder-jvm.feature         |  8 -------
 .../features/rhpam-kogito-builder-jvm.feature | 21 ++++++++++++++++++-
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 7258978592c..fc2935f3beb 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -103,15 +103,15 @@ function build_kogito_app() {
 
     else
         local ARCHETYPE_ARTIFACT_ID
+        # for product builds, the "dm" identifier will be used
+        local BUILD_IDENTIFIER="-"
+        if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+            BUILD_IDENTIFIER="-dm-"
+        fi
         if [ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]; then
-             if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-                ARCHETYPE_ARTIFACT_ID='kogito-quarkus-dm-archetype'
-            else
-                ARCHETYPE_ARTIFACT_ID='kogito-quarkus-archetype'
-            fi
+            ARCHETYPE_ARTIFACT_ID="kogito-quarkus${BUILD_IDENTIFIER}archetype"
         elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
-            ARCHETYPE_ARTIFACT_ID="kogito-springboot-archetype"
-
+            ARCHETYPE_ARTIFACT_ID="kogito-springboot${BUILD_IDENTIFIER}archetype"
         else
             log_error "---> Invalid RUNTIME_TYPE(${RUNTIME_TYPE}) provided, failing build..."
             exit 1
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index bb4d1e77e86..d6bc626725c 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -102,3 +102,22 @@ Feature: kogito-builder image tests
       | request_method        | POST                          |
       | content_type          | application/cloudevents+json  |
       | request_body          | {"specversion": "1.0", "source": "behave", "type": "orderEvent", "id": "12345", "data": {"id":"f0643c68-609c-48aa-a820-5df423fa4fe0","country":"Brazil","total":10000,"description":"iPhone 12"}}|
+
+#### SpringBoot Scenarios
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      | variable       | value          |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | RUNTIME_TYPE   | springboot     |
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
+    And s2i build log should contain Generating springboot project structure using the kogito-springboot-archetype archetype...
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index ab918962fab..7069fdccc79 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -232,14 +232,6 @@ Feature: kogito-builder image JVM build tests
     Then s2i build log should contain Expanding artifacts from incremental build...
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
-      | RUNTIME_TYPE   | springboot     |
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
-
-
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                           |
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 9dd70568bbd..225acb656a7 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -62,4 +62,23 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | expected_phrase | Should the driver be suspended?                                                                  |
       | request_method  | POST                                                                                             |
       | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
\ No newline at end of file
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+
+#### SpringBoot Scenarios
+
+  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+      | variable       | value          |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | RUNTIME_TYPE   | springboot     |
+    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
+    And s2i build log should contain Generating quarkus project structure using the kogito-springboot-dm-archetype archetype...
+    And check that page is served
+      | property        | value                                                                                            |
+      | port            | 8080                                                                                             |
+      | path            | /Traffic%20Violation                                                                             |
+      | wait            | 80                                                                                               |
+      | expected_phrase | Should the driver be suspended?                                                                  |
+      | request_method  | POST                                                                                             |
+      | content_type    | application/json                                                                                 |
+      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |

From ad230c8bdc037de50f1f9d2802c3eee60e52351f Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 11 Jun 2021 10:36:38 +0200
Subject: [PATCH 295/709] Conscious Language: Get dep from `main` branch (#514)

---
 .github/workflows/kogito-images-pr-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
index da68a90f022..6747e3620eb 100644
--- a/.github/workflows/kogito-images-pr-check.yml
+++ b/.github/workflows/kogito-images-pr-check.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Download openshift-validator-tool
         run: |
-          wget https://github.com/jboss-container-images/jboss-kie-modules/raw/master/tools/openshift-template-validator/openshift-template-validator-linux-amd64
+          wget https://github.com/jboss-container-images/jboss-kie-modules/raw/main/tools/openshift-template-validator/openshift-template-validator-linux-amd64
       - name: Add execution permission to openshift-validator-tool
         run: |
           chmod +x openshift-template-validator-linux-amd64

From 45ac33331d8a7de8492029ef22fc1eba3ed7f7c7 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:51:35 -0300
Subject: [PATCH 296/709] Updated Maven artifacts (#518)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index d220a1e73ae..251895d79ae 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210607.044111-155-runner.jar
-    md5: 1507ce4cc88b9823cbad0647fe315d18
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210612.051127-156-runner.jar
+    md5: 3baa70e70900f8135eff8fc501118971
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index a6f41d5cecc..327fc3ea8ef 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210607.044222-154-runner.jar
-    md5: f27d4dcf79eaa372d4a367a3d01cb719
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210612.051237-155-runner.jar
+    md5: daa5aabb4f7b58a15e41e620205dbe09
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index a5cf9f84cbe..869759e1a87 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210607.045003-155-runner.jar
-    md5: 33b4737904e8378f22c97bd11b3a5c11
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210612.052218-156-runner.jar
+    md5: a2a8c0db323f12ad3ac6d3a09ae319d8
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210607.044928-152-runner.jar
-    md5: 253449ea7e92ff57bacc2fecf45e5eb2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210612.052145-153-runner.jar
+    md5: a6a09bc9e360b43a83c2f4a6f424b889
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 09dc4a7fab6..efc2c67f7dc 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210607.045320-97-runner.jar
-    md5: 10a1eee6a08774304db4d5ce323d9f25
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210612.052512-98-runner.jar
+    md5: bc865d07cfa3f30aa6b54ef7040d54ae
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 9e4409ce547..cf75a406317 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210607.043628-28-runner.jar
-    md5: 0b085c3282633d66edd69c70dd073918
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210612.050724-29-runner.jar
+    md5: 689d1f05c6bc7f8d6b4aef4d0a5bbc78
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 6c7ebe3da21..850d53f2cd8 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210607.043728-28-runner.jar
-    md5: 8c0920f0aa3f2a5e81bd638d38ea1b13
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210612.050812-29-runner.jar
+    md5: d27a17f560104f59475e9a299612badf
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 588e0ac34c0..d8753773589 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210607.043923-10-runner.jar
-    md5: 3f00253a314d9f2f89cfea645df02e5d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210612.050951-11-runner.jar
+    md5: 9ffe7a96c691bf172695e61c39955916
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 0cfc19db54d..5295b6b77da 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210607.043826-28-runner.jar
-    md5: 304d0e13ffbde76b1ef46ccb38e56010
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210612.050901-29-runner.jar
+    md5: fdc36f836f8355fda4deb4fb1af0fdab
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 5a980afc9bc..85c89fcb187 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210604.052108-154-runner.jar
-    md5: 072651406659722ebf9e69bc2c5724ab
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210612.051913-155-runner.jar
+    md5: 0c1b3da1b3a32e63781fee7382c7f6b3
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index f2424cb0ccf..0a20795e29a 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210604.052229-154-runner.jar
-    md5: b14e73054162f8c19fe6d296fe0199da
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210612.052020-155-runner.jar
+    md5: 4261fe0817f4292aee70d8f9a55971ea
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 8298c3b194c..a03131f021a 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210607.045128-68-runner.jar
-    md5: 2a56ac0e722c3bc1fe03024c4b296d6d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210612.052333-69-runner.jar
+    md5: 60f577559c69d5152f59750f87a45e40
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 79dcb03ffbb..4acce549909 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210607.045204-68-runner.jar
-    md5: 7c2051ecb4f84ee52abaddf319959814
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210612.052405-69-runner.jar
+    md5: 7a6d775ae95b79e3bb739d7ce6976b3e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 3f05aeef3ee..5c062b2e1fc 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210604.052152-154-runner.jar
-    md5: 4e9dc355794e653ec9f34786358aa93e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210612.051949-155-runner.jar
+    md5: 9a1e3e91e73f9aa3df4fbcb4743a3b88
 
 execute:
   - script: configure

From 8ca55d80aaef093224486273d5217bd8f97ab184 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:08:14 -0300
Subject: [PATCH 297/709] Updated Maven artifacts (#521)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 251895d79ae..b516f2130dd 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210612.051127-156-runner.jar
-    md5: 3baa70e70900f8135eff8fc501118971
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210614.045148-157-runner.jar
+    md5: fcc269eed268b0e116e10673f8e54bcc
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 327fc3ea8ef..301519eceed 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210612.051237-155-runner.jar
-    md5: daa5aabb4f7b58a15e41e620205dbe09
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210614.045305-156-runner.jar
+    md5: 9b97dd655245a7645c4be7cb1d703d30
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 869759e1a87..d42bfb7bb8f 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210612.052218-156-runner.jar
-    md5: a2a8c0db323f12ad3ac6d3a09ae319d8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210614.050549-157-runner.jar
+    md5: 4c485b315b2acdd65cebbc693151982e
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210612.052145-153-runner.jar
-    md5: a6a09bc9e360b43a83c2f4a6f424b889
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210614.050508-154-runner.jar
+    md5: 54693c0c7535371417289f84c58e4f46
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index efc2c67f7dc..c4342c625e3 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210612.052512-98-runner.jar
-    md5: bc865d07cfa3f30aa6b54ef7040d54ae
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210614.050929-99-runner.jar
+    md5: 4177ea87293b3ac6445cc7d4cc8df8ce
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index cf75a406317..59f8dbffa57 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210612.050724-29-runner.jar
-    md5: 689d1f05c6bc7f8d6b4aef4d0a5bbc78
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210614.044651-30-runner.jar
+    md5: 13272a086b54104630b057095d9171b1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 850d53f2cd8..322570c7826 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210612.050812-29-runner.jar
-    md5: d27a17f560104f59475e9a299612badf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210614.044752-30-runner.jar
+    md5: 897a0a0a14cab9a2cf3767d1c6b17c35
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index d8753773589..80e8f1620c6 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210612.050951-11-runner.jar
-    md5: 9ffe7a96c691bf172695e61c39955916
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210614.044956-12-runner.jar
+    md5: fbd4b6bd2d690837dba3e6e20c8211c6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 5295b6b77da..d54f651e194 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210612.050901-29-runner.jar
-    md5: fdc36f836f8355fda4deb4fb1af0fdab
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210614.044855-30-runner.jar
+    md5: c88d605dc401768102b5d8ecdeb78f8e
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 85c89fcb187..6a584a1aff5 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210612.051913-155-runner.jar
-    md5: 0c1b3da1b3a32e63781fee7382c7f6b3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210614.050156-156-runner.jar
+    md5: 088af9aa81b3bc51d60df0b1a78d3cdd
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 0a20795e29a..8a0abfe231e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210612.052020-155-runner.jar
-    md5: 4261fe0817f4292aee70d8f9a55971ea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210614.050321-156-runner.jar
+    md5: 617ac0307fd37c63143f850d3750724a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index a03131f021a..3fa352d4cd0 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210612.052333-69-runner.jar
-    md5: 60f577559c69d5152f59750f87a45e40
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210614.050722-70-runner.jar
+    md5: 4a075f771636ffd1e2ad8ff8a6f9c5d6
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 4acce549909..c95bedf7a99 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210612.052405-69-runner.jar
-    md5: 7a6d775ae95b79e3bb739d7ce6976b3e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210614.050803-70-runner.jar
+    md5: 60f025d742c8afc0f591dac5dccbec6c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 5c062b2e1fc..07f7854c60e 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210612.051949-155-runner.jar
-    md5: 9a1e3e91e73f9aa3df4fbcb4743a3b88
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210614.050242-156-runner.jar
+    md5: b41c5cff32ffd735b63b2d58b907bc0f
 
 execute:
   - script: configure

From 579dd46fc3f71f0000b5a61acbac26630b40ad72 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 17 Jun 2021 14:40:52 +0200
Subject: [PATCH 298/709] KOGITO-5307 Handle missing app when updating (#519)

* KOGITO-5307 Handle missing app when updating
---
 Jenkinsfile.deploy                | 47 ++++++++++++++++++++++++++-----
 scripts/update-maven-artifacts.py | 19 +++++++++----
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index ec4d9db76c2..f1ae4a55fd9 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -5,6 +5,7 @@ deployProperties = [ : ]
 commitDone = false
 
 BUILT_IMAGES = []
+FAILED_IMAGES = []
 
 pipeline {
     agent {
@@ -113,12 +114,17 @@ pipeline {
                     if (getMavenArtifactRepository() != '') {
                         updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()} --ignore-self-signed-cert"
                     }
-                    sh updateArtifactCmd
 
-                    if (isThereAnyChanges()) {
-                        commitChanges('Updated Maven artifacts')
-                    } else {
-                        echo 'No changes to commit'
+                    try {
+                        sh updateArtifactCmd
+                    } catch (err) {
+                        unstable('Error while updating Maven artifacts. Please check logs.')
+                    } finally {
+                        if (isThereAnyChanges()) {
+                            commitChanges('Updated Maven artifacts')
+                        } else {
+                            echo 'No changes to commit'
+                        }
                     }
                 }
             }
@@ -266,6 +272,21 @@ pipeline {
                     if (isRelease()) {
                         commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()}"
                         prBody += '\nPlease do not merge, it should be merged automatically.'
+                    } else if (currentBuild.currentResult != 'SUCCESS') {
+                        commitMsg += " (${currentBuild.currentResult})"
+                        prBody += '\n\nSuccessful images:\n'
+                        getBuiltImages().each {
+                            prBody += "- ${it}\n"
+                        }
+                        if (getFailedImages()){
+                            prBody += '\nFailed images:\n'
+                            getFailedImages().each {
+                                prBody += "- ${it}\n"
+                            }
+                        } else {
+                            prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
+                        }
+                        prBody += '\nSee build url above for more information'
                     }
                     String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
                     deployProperties["${getRepoName()}.pr.link"] = prLink
@@ -339,8 +360,9 @@ void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
 void buildImage(image) {
     try {
         sh "make build-image image_name=${image} ignore_test=true cekit_option='--work-dir .'"
-        registerBuiltImage (image)
+        registerBuiltImage(image)
     } catch (err) {
+        registerFailedImage(image)
         unstable("${image} build failed")
     }
 }
@@ -350,18 +372,25 @@ void testImage(image) {
         sh "make build-image image_name=${image} ignore_build=true cekit_option='--work-dir .'"
     } catch (err) {
         removeBuiltImage (image)
+        registerFailedImage(image)
         unstable("${image} testing failed")
     } finally {
         junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
     }
 }
 
-void registerBuiltImage (String imageName) {
+void registerBuiltImage(String imageName) {
     lock("${BUILD_URL}") {
         BUILT_IMAGES.add(imageName)
     }
 }
 
+void registerFailedImage(String imageName) {
+    lock("${BUILD_URL}") {
+        FAILED_IMAGES.add(imageName)
+    }
+}
+
 void removeBuiltImage (String imageName) {
     lock("${BUILD_URL}") {
         BUILT_IMAGES = BUILT_IMAGES.findAll { it != imageName }
@@ -372,6 +401,10 @@ List getBuiltImages() {
     return BUILT_IMAGES
 }
 
+List getFailedImages() {
+    return FAILED_IMAGES
+}
+
 void tagImages() {
     for (String imageName : getBuiltImages()) {
         sh "${env.CONTAINER_ENGINE} tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 075c1708481..d880ccb5622 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -123,8 +123,8 @@ def update_artifacts(service, modulePath):
 
     with open(modulePath) as module:
         data = common.yaml_loader().load(module)
-        print(service)
-        print(data['artifacts'])
+        # print(service)
+        # print(data['artifacts'])
         # print(filter(lambda x: service['name'] in x['name']))
         artifact = next(filter(lambda x: service['name'] in x['name'], data['artifacts']))
         artifact['url'] = getRunnerURL(service)
@@ -143,6 +143,7 @@ def update_artifacts(service, modulePath):
     print("Retrieve artifacts version: ", artifactsVersion)
 
     # Update Kogito Service modules
+    moduleError = False
     for serviceName, modulePath in Modules.items():
         service = {
             "repo_url": args.repo_url + "{}/{}/{}/".format(KOGITO_ARTIFACT_PATH, serviceName, artifactsVersion),
@@ -152,6 +153,14 @@ def update_artifacts(service, modulePath):
         }
         moduleYamlFile = "modules/{}/module.yaml".format(modulePath)
 
-        update_artifacts(service, moduleYamlFile)
-        print("Successfully updated the artifacts for: ", serviceName)
-
+        print("Update artifact: ", serviceName)
+        try:
+            update_artifacts(service, moduleYamlFile)
+            print("Successfully updated the artifacts for: ", serviceName)
+        except Exception as e:
+            print("Error updating artifact ", serviceName)
+            print(e)
+            moduleError = True
+    
+    if moduleError:
+        raise RuntimeError('Script did not succeed successfully')

From 73dd8e933c582937204c1e82ba9f27ebe2c06a23 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 18 Jun 2021 11:25:44 -0300
Subject: [PATCH 299/709] [RHPAM-3735] - Red Hat Maven techpreview repository
 id is wrong in Kogito S2I image (#525)

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-maven/3.6.x/configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-maven/3.6.x/configure b/modules/kogito-maven/3.6.x/configure
index 22b27b09064..c9463de1519 100644
--- a/modules/kogito-maven/3.6.x/configure
+++ b/modules/kogito-maven/3.6.x/configure
@@ -39,7 +39,7 @@ if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
       </snapshots>\
     </repository>\
     <repository>\
-      <id>jboss-eap-repository</id>\
+      <id>redhat-techpreview-repository</id>\
       <url>https://maven.repository.redhat.com/techpreview/all</url>\
       <releases>\
         <enabled>true</enabled>\
@@ -71,7 +71,7 @@ if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
       </snapshots>\
     </pluginRepository>\
     <pluginRepository>\
-      <id>jboss-eap-plugin-repository</id>\
+      <id>redhat-techpreview-repository</id>\
       <url>https://maven.repository.redhat.com/techpreview/all</url>\
       <releases>\
         <enabled>true</enabled>\

From a065b539e3c61fc36fc115e0c2044d15de6a6128 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 21 Jun 2021 10:42:19 -0300
Subject: [PATCH 300/709] Updated Maven artifacts (#534)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index b516f2130dd..3ed733baf23 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210614.045148-157-runner.jar
-    md5: fcc269eed268b0e116e10673f8e54bcc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210621.041315-162-runner.jar
+    md5: 0c343d67413e1cf6636b022f9e4e91bd
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 301519eceed..cc52514c65e 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210614.045305-156-runner.jar
-    md5: 9b97dd655245a7645c4be7cb1d703d30
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210621.041620-160-runner.jar
+    md5: 5f49c441f88c693cef359cb6a692d2a4
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index d42bfb7bb8f..33ef846f1d2 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210614.050549-157-runner.jar
-    md5: 4c485b315b2acdd65cebbc693151982e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210621.044001-162-runner.jar
+    md5: eac9c3045bfc99a4cb47ee676ef56c7a
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210614.050508-154-runner.jar
-    md5: 54693c0c7535371417289f84c58e4f46
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210621.043833-159-runner.jar
+    md5: b240f944f84f5d6369ef0f0d6075caf8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index c4342c625e3..e071c8c384b 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210614.050929-99-runner.jar
-    md5: 4177ea87293b3ac6445cc7d4cc8df8ce
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210621.044846-104-runner.jar
+    md5: a27fbb64a1ba0ae5d17cd8b45e372751
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 59f8dbffa57..998fb6fdfb1 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210614.044651-30-runner.jar
-    md5: 13272a086b54104630b057095d9171b1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210621.035858-35-runner.jar
+    md5: 30fb08ce7e58ad73643e33248502c884
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 322570c7826..53ad9556079 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210614.044752-30-runner.jar
-    md5: 897a0a0a14cab9a2cf3767d1c6b17c35
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210621.040151-35-runner.jar
+    md5: eb24f5d85129b74e68ad686f8e0429b0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 80e8f1620c6..3b7a499f8a7 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210614.044956-12-runner.jar
-    md5: fbd4b6bd2d690837dba3e6e20c8211c6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210621.040743-17-runner.jar
+    md5: 6bd79f6c25fe16e8e1f4d65c4cf9fcfd
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index d54f651e194..51d36e9942c 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210614.044855-30-runner.jar
-    md5: c88d605dc401768102b5d8ecdeb78f8e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210621.040454-35-runner.jar
+    md5: fbcae1d85bce1992f6b29ef415bad4be
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 6a584a1aff5..923054c7d99 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210614.050156-156-runner.jar
-    md5: 088af9aa81b3bc51d60df0b1a78d3cdd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210621.043142-161-runner.jar
+    md5: a89664e77312e303ff319e13812235c0
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 8a0abfe231e..f4b77ac4824 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210614.050321-156-runner.jar
-    md5: 617ac0307fd37c63143f850d3750724a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210621.043420-161-runner.jar
+    md5: 98488134f1a77abe3e4504ee53ccfe41
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 3fa352d4cd0..40bf0bcac97 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210614.050722-70-runner.jar
-    md5: 4a075f771636ffd1e2ad8ff8a6f9c5d6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210621.044425-75-runner.jar
+    md5: 8e04b4dbc4093e87b14c9caca36fbb2a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index c95bedf7a99..c9e03bc6d66 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210614.050803-70-runner.jar
-    md5: 60f025d742c8afc0f591dac5dccbec6c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210621.044548-75-runner.jar
+    md5: a4fe89c57ae1dc66a6473bd19bac406e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 07f7854c60e..b542aaee614 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210614.050242-156-runner.jar
-    md5: b41c5cff32ffd735b63b2d58b907bc0f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210621.043335-161-runner.jar
+    md5: 9b7de18d8ee7294d496bb51ed8847a40
 
 execute:
   - script: configure

From 448b6ee3652fcc22403039b619d5a0d8c84cc5fb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 21 Jun 2021 15:48:47 +0200
Subject: [PATCH 301/709] [KOGITO-5363] Updated Maven version to 3.8.1 (#535)

* Updated Maven version to 3.8.1
---
 README.md                                     |   2 +-
 kogito-builder-overrides.yaml                 |   2 +-
 .../3.8.x/added/configure-maven.sh            | 229 ++++++++++++++++++
 modules/kogito-maven/3.8.x/configure          |  92 +++++++
 modules/kogito-maven/3.8.x/maven/settings.xml |  60 +++++
 modules/kogito-maven/3.8.x/module.yaml        |  75 ++++++
 rhpam-kogito-builder-rhel8-overrides.yaml     |   2 +-
 tests/features/kogito-builder-native.feature  |   2 +-
 .../kogito-common-builder-jvm.feature         |   2 +-
 9 files changed, 461 insertions(+), 5 deletions(-)
 create mode 100644 modules/kogito-maven/3.8.x/added/configure-maven.sh
 create mode 100644 modules/kogito-maven/3.8.x/configure
 create mode 100644 modules/kogito-maven/3.8.x/maven/settings.xml
 create mode 100644 modules/kogito-maven/3.8.x/module.yaml

diff --git a/README.md b/README.md
index dfc98917285..6e5d1c044b2 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ To interact with Kogito images, you would need to install the needed dependencie
             * if any dependency is missing CeKit will tell which one.
     * [Bats](https://github.com/sstephenson/bats) 
     * Java 11 or higher
-    * Maven 3.6.2 or higher
+    * Maven 3.8.1 or higher
             
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index 839abc2d5fa..5721732429d 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -49,7 +49,7 @@ modules:
   - name: org.kie.kogito.openjdk
     version: "11"
   - name: org.kie.kogito.maven
-    version: "3.6.2"
+    version: "3.8.1"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.builder
 
diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/3.8.x/added/configure-maven.sh
new file mode 100644
index 00000000000..7a19bf4e183
--- /dev/null
+++ b/modules/kogito-maven/3.8.x/added/configure-maven.sh
@@ -0,0 +1,229 @@
+#!/usr/bin/env bash
+
+#Please keep them in alphabatical order
+function prepareEnv() {
+    unset HTTP_PROXY_HOST
+    unset HTTP_PROXY_PORT
+    unset HTTP_PROXY_PASSWORD
+    unset HTTP_PROXY_USERNAME
+    unset HTTP_PROXY_NONPROXYHOSTS
+    unset HTTPS_PROXY
+    unset MAVEN_DOWNLOAD_OUTPUT
+    unset MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE
+    unset MAVEN_MIRROR_URL
+    unset MAVEN_REPO_ID
+    unset MAVEN_REPO_LAYOUT
+    unset MAVEN_REPO_RELEASES_ENABLED
+    unset MAVEN_REPO_RELEASES_UPDATE_POLICY
+    unset MAVEN_REPO_RELEASES_CHECKSUM_POLICY
+    unset MAVEN_REPO_SNAPSHOTS_ENABLED
+    unset MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY
+    unset MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY
+    unset MAVEN_REPO_URL
+    unset MAVEN_REPOS
+}
+
+function configure() {
+    configure_proxy
+    configure_mirrors
+    configure_maven_download_output
+    ignore_maven_self_signed_certificates
+    set_kogito_maven_repo
+    add_maven_repo
+}
+
+# insert settings for HTTP proxy into maven settings.xml if supplied
+function configure_proxy() {
+    # prefer old http_proxy_ format for username/password, but
+    # also allow proxy_ format.
+    HTTP_PROXY_USERNAME=${HTTP_PROXY_USERNAME:-$PROXY_USERNAME}
+    HTTP_PROXY_PASSWORD=${HTTP_PROXY_PASSWORD:-$PROXY_PASSWORD}
+
+    proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}}
+    # if http_proxy_host/port is set, prefer that (oldest mechanism)
+    # before looking at HTTP(S)_PROXY
+    proxyhost=${HTTP_PROXY_HOST:-$(echo "${proxy}" | cut -d : -f 1,2)}
+    proxyport=${HTTP_PROXY_PORT:-$(echo "${proxy}" | cut -d : -f 3)}
+
+    if [ -n "$proxyhost" ]; then
+        if echo "${proxyhost}" | grep -q -i https://; then
+          proxyport=${proxyport:-443}
+          proxyprotocol="https"
+        else
+          proxyport=${proxyport:-80}
+          proxyprotocol="http"
+        fi
+
+        xml="<proxy>\
+         <id>genproxy</id>\
+         <active>true</active>\
+         <protocol>$proxyprotocol</protocol>\
+         <host>$proxyhost</host>\
+         <port>$proxyport</port>"
+
+        if [ -n "$HTTP_PROXY_USERNAME" ] && [ -n "$HTTP_PROXY_PASSWORD" ]; then
+            xml="$xml\
+         <username>$HTTP_PROXY_USERNAME</username>\
+         <password>$HTTP_PROXY_PASSWORD</password>"
+        fi
+        if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then
+            nonproxyhosts="${HTTP_PROXY_NONPROXYHOSTS//|/\\|}"
+            xml="$xml\
+         <nonProxyHosts>$nonproxyhosts</nonProxyHosts>"
+        fi
+        xml="$xml\
+       </proxy>"
+        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${HOME}"/.m2/settings.xml
+    fi
+}
+
+# insert settings for mirrors/repository managers into settings.xml if supplied
+function configure_mirrors() {
+    if [ -n "$MAVEN_MIRROR_URL" ]; then
+        xml="    <mirror>\
+      <id>mirror.default</id>\
+      <url>$MAVEN_MIRROR_URL</url>\
+      <mirrorOf>external:*</mirrorOf>\
+    </mirror>"
+        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${HOME}"/.m2/settings.xml
+    fi
+}
+
+function configure_maven_download_output() {
+    if [ "${MAVEN_DOWNLOAD_OUTPUT}" != "true" ]; then
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --no-transfer-progress"
+    fi
+}
+
+function ignore_maven_self_signed_certificates() {
+    if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
+    fi
+}
+
+function set_kogito_maven_repo() {
+    local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
+    if [ -n "${kogito_maven_repo_url}" ]; then
+        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${HOME}"/.m2/settings.xml
+    fi
+}
+
+function add_maven_repo() {
+    # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service
+    local single_repo_url="${MAVEN_REPO_URL}"
+    if [ -n "$single_repo_url" ]; then
+        single_repo_id=$(_maven_find_env "MAVEN_REPO_ID" "repo-$(_generate_random_id)")
+        _add_maven_repo "$single_repo_url" "$single_repo_id" ""
+    fi
+
+    # multiple remote repositories scenario: respect fully qualified url(s) if specified, otherwise find and use service(s); can be used together with "single repo scenario" above
+    local multi_repo_counter=1
+    IFS=',' read -r -a multi_repo_prefixes <<<"${MAVEN_REPOS}"
+    for multi_repo_prefix in "${multi_repo_prefixes[@]}"; do
+        multi_repo_url=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_URL")
+        multi_repo_id=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_ID" "repo${multi_repo_counter}-$(_generate_random_id)")
+        _add_maven_repo "$multi_repo_url" "$multi_repo_id" "$multi_repo_prefix"
+        multi_repo_counter=$((multi_repo_counter + 1))
+    done
+}
+# add maven repositories
+# Parameters:
+#   $1 - repo url
+#   $2 - repo id
+#   $3 - repo prefix
+function _add_maven_repo() {
+    local repo_url=$1
+    local repo_id=$2
+    local prefix=$3
+
+    repo_name=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_NAME" "${repo_id}")
+    repo_layout=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_LAYOUT" "default")
+    releases_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_ENABLED" "true")
+    releases_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_UPDATE_POLICY" "always")
+    releases_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" "warn")
+    snapshots_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_ENABLED" "true")
+    snapshots_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" "always")
+    snapshots_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" "warn")
+
+    local repo="\n\
+                <repository>\n\
+                    <id>${repo_id}</id>\n\
+                    <name>${repo_name}</name>\n\
+                    <url>${repo_url}</url>\n\
+                    <layout>${repo_layout}</layout>\n\
+                    <releases>\n\
+                        <enabled>${releases_enabled}</enabled>\n\
+                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
+                    </releases>\n\
+                    <snapshots>\n\
+                        <enabled>${snapshots_enabled}</enabled>\n\
+                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
+                    </snapshots>\n\
+                </repository>\n\
+                <!-- ### configured repositories ### -->"
+    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${HOME}"/.m2/settings.xml
+
+    local pluginRepo="\n\
+                <pluginRepository>\n\
+                    <id>${repo_id}</id>\n\
+                    <name>${repo_name}</name>\n\
+                    <url>${repo_url}</url>\n\
+                    <layout>${repo_layout}</layout>\n\
+                    <releases>\n\
+                        <enabled>${releases_enabled}</enabled>\n\
+                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
+                    </releases>\n\
+                    <snapshots>\n\
+                        <enabled>${snapshots_enabled}</enabled>\n\
+                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
+                    </snapshots>\n\
+                </pluginRepository>\n\
+                <!-- ### configured plugin repositories ### -->"
+
+    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${HOME}"/.m2/settings.xml
+
+    # new repo should be skipped by mirror if exists
+    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${HOME}"/.m2/settings.xml
+}
+
+# Finds the environment variable  and returns its value if found.
+# Otherwise returns the default value if provided.
+#
+# Arguments:
+# $1 env variable name to check
+# $2 default value if environment variable was not set
+function _maven_find_env() {
+    local var=${!1}
+    echo "${var:-$2}"
+}
+
+# Finds the environment variable with the given prefix. If not found
+# the default value will be returned. If no prefix is provided will
+# rely on _maven_find_env
+#
+# Arguments
+#  - $1 prefix. Transformed to uppercase and replace - by _
+#  - $2 variable name. Prepended by "prefix_"
+#  - $3 default value if the variable is not defined
+function _maven_find_prefixed_env() {
+    local prefix=$1
+
+    if [[ -z $prefix ]]; then
+        _maven_find_env "${2}" "${3}"
+    else
+        prefix=${prefix^^} # uppercase
+        prefix=${prefix//-/_} #replace - by _
+
+        local var_name="${prefix}_${2}"
+        echo "${!var_name:-${3}}"
+      fi
+}
+
+# private
+function _generate_random_id() {
+    env LC_CTYPE=C < /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
+}
diff --git a/modules/kogito-maven/3.8.x/configure b/modules/kogito-maven/3.8.x/configure
new file mode 100644
index 00000000000..22b27b09064
--- /dev/null
+++ b/modules/kogito-maven/3.8.x/configure
@@ -0,0 +1,92 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+
+tar xzf "${SOURCES_DIR}"/apache-maven-"${MAVEN_VERSION}"-bin.tar.gz -C /usr/share
+mv /usr/share/apache-maven-"${MAVEN_VERSION}" /usr/share/maven
+
+mkdir "${KOGITO_HOME}"/.m2
+cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
+
+# configure Red Hat repositories on the maven settings.xml for product builds
+if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
+    echo "enabling red hat repositories"
+    rh_repos="    <!-- JBoss EAP Maven repository -->\
+<profile>\
+  <id>redhat-maven-repositories</id>\
+  <repositories>\
+    <repository>\
+      <id>redhat-ga-repository</id>\
+      <url>https://maven.repository.redhat.com/ga/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+    <repository>\
+      <id>redhat-ea-repository</id>\
+      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+    <repository>\
+      <id>jboss-eap-repository</id>\
+      <url>https://maven.repository.redhat.com/techpreview/all</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+  </repositories>\
+  <pluginRepositories>\
+    <pluginRepository>\
+      <id>redhat-ga-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/ga/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+    <pluginRepository>\
+      <id>redhat-ea-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+    <pluginRepository>\
+      <id>jboss-eap-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/techpreview/all</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+  </pluginRepositories>\
+</profile>\
+"
+    sed -i "s|<!-- ### redhat maven repositories ### -->|$rh_repos|" "${KOGITO_HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### redhat maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
+
+    mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp
+    #format and write the new file
+    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${KOGITO_HOME}"/.m2/settings.xml
+fi
diff --git a/modules/kogito-maven/3.8.x/maven/settings.xml b/modules/kogito-maven/3.8.x/maven/settings.xml
new file mode 100644
index 00000000000..13ea10d6509
--- /dev/null
+++ b/modules/kogito-maven/3.8.x/maven/settings.xml
@@ -0,0 +1,60 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+  <mirrors>
+    <!-- ### configured mirrors ### -->
+  </mirrors>
+
+  <proxies>
+    <!-- ### configured http proxy ### -->
+  </proxies>
+
+  <profiles>
+    <!-- ### redhat maven repositories ### -->
+
+    <profile>
+      <id>default</id>
+      <repositories>
+        <repository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Repository Group</name>
+          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </repository>
+        <!-- ### configured repositories ### -->
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Repository Group</name>
+          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </pluginRepository>
+        <!-- ### configured plugin repositories ### -->
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <!-- ### redhat maven profile ### -->
+    <activeProfile>default</activeProfile>
+  </activeProfiles>
+</settings>
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
new file mode 100644
index 00000000000..9ff4c310986
--- /dev/null
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -0,0 +1,75 @@
+schema_version: 1
+name: org.kie.kogito.maven
+version: "3.8.1"
+
+envs:
+  - name: "MAVEN_VERSION"
+    value: "3.8.1"
+  - name: " MAVEN_HOME"
+    value: "/usr/share/maven"
+  - name: "HTTP_PROXY"
+    description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
+    example: "http://127.0.0.1:8080"
+  - name: "HTTP_PROXY_HOST"
+    description: "Proxy Host, don't need to be set if HTTP_PROXY is used."
+    example: "127.0.0.1"
+  - name: "HTTP_PROXY_PORT"
+    description: "Proxy Port, don't need to be set if HTTP_PROXY is used."
+    example: "8181"
+  - name: "HTTP_PROXY_PASSWORD"
+    description: "Proxy Password"
+  - name: "HTTP_PROXY_USERNAME"
+    description: "Proxy Username"
+  - name: "HTTP_PROXY_NONPROXYHOSTS"
+    description: "Non proxy hosts, list of hosts that will ot be proxied."
+    example: "localhost"
+  - name: "MAVEN_MIRROR_URL"
+    description: "The base URL of a mirror used for retrieving artifacts."
+    example: "http://10.0.0.1:8080/repository/internal/"
+  - name: "MAVEN_DOWNLOAD_OUTPUT"
+    description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
+    example: "true"
+  - name: "JBOSS_MAVEN_REPO_URL"
+    value: "https://repository.jboss.org/nexus/content/groups/public/"
+    description: "Defines the Jboss Maven repository for Kogito artifacts."
+  - name: "MAVEN_REPO_URL"
+    description: "Defines an extra Maven repository."
+    example: "https://nexus.test.com/group/public"
+  - name: "MAVEN_REPO_ID"
+    description: "Defines the id of the new Repository"
+    example: "nexus-test"
+  - name: "MAVEN_REPO_LAYOUT"
+    description: "The type of layout this repository uses for locating and storing artifacts - can be 'legacy' or 'default'.Defaults to 'default'."
+    example: "legacy"
+  - name: "MAVEN_REPO_RELEASES_ENABLED"
+    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
+    example: "false"
+  - name: "MAVEN_REPO_RELEASES_UPDATE_POLICY"
+    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
+    example: "never"
+  - name: "MAVEN_REPO_RELEASES_CHECKSUM_POLICY"
+    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
+    example: "fail"
+  - name: "MAVEN_REPO_SNAPSHOTS_ENABLED"
+    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
+    example: "false"
+  - name: "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY"
+    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
+    example: "never"
+  - name: "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY"
+    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
+    example: "fail"
+  - name: "MAVEN_REPOS"
+    description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories."
+    example: "CENTRAL,INTERNAL"
+  - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
+    description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
+    example: "true"
+# unfortunately by now the version needs to be hardcoded.
+artifacts:
+  - name: apache-maven-3.8.1-bin.tar.gz
+    url: https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
+    md5: 90197f18ed9036a1709ff0e09558c083
+
+execute:
+  - script: configure
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index ffce87effca..0df1ba36117 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -53,7 +53,7 @@ modules:
     - name: org.kie.kogito.openjdk
       version: "11"
     - name: org.kie.kogito.maven
-      version: "3.6.2"
+      version: "3.8.1"
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.builder
 
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index 6d29a225dcd..3961831ea62 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -9,7 +9,7 @@ Feature: kogito-builder image native build tests
   Scenario: verify if the maven and graal vm settings are correct on kogito-builder image for native
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.1.0
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index 7069fdccc79..b6da85951f6 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -4,7 +4,7 @@ Feature: kogito-builder image JVM build tests
   Scenario: verify if the maven and java installation are correct
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.6.2
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image

From 15d9ebefd11a3a1e0208a875b9a1a7c6510f6526 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 23 Jun 2021 13:22:26 -0300
Subject: [PATCH 302/709] Updated Maven artifacts (#539)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 3ed733baf23..a91cf5abc48 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210621.041315-162-runner.jar
-    md5: 0c343d67413e1cf6636b022f9e4e91bd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210623.104347-166-runner.jar
+    md5: 8fb53647e5b2463591fa74979d903477
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index cc52514c65e..3332ad1f648 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210621.041620-160-runner.jar
-    md5: 5f49c441f88c693cef359cb6a692d2a4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210623.104716-164-runner.jar
+    md5: 48367fea6491fadedb4f6fa47940797f
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 33ef846f1d2..219f644b82f 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210621.044001-162-runner.jar
-    md5: eac9c3045bfc99a4cb47ee676ef56c7a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210623.111017-166-runner.jar
+    md5: 217e7558eef0738762afc5368faba377
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210621.043833-159-runner.jar
-    md5: b240f944f84f5d6369ef0f0d6075caf8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210623.110856-163-runner.jar
+    md5: 0ce3806f0cbe75d342311e36aff5048e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index e071c8c384b..d123437a1b5 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210621.044846-104-runner.jar
-    md5: a27fbb64a1ba0ae5d17cd8b45e372751
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210623.111822-107-runner.jar
+    md5: b0435ce0f4572527030f23ae23ba843b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 998fb6fdfb1..9e6cef70fea 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210621.035858-35-runner.jar
-    md5: 30fb08ce7e58ad73643e33248502c884
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210623.102740-39-runner.jar
+    md5: 57b323390b1b6e9934323d651b38761e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 53ad9556079..9d0f36700de 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210621.040151-35-runner.jar
-    md5: eb24f5d85129b74e68ad686f8e0429b0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210623.103101-39-runner.jar
+    md5: 1625fa10ba992cba6f55caf4a143fed6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 3b7a499f8a7..0d88bbfcff8 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210621.040743-17-runner.jar
-    md5: 6bd79f6c25fe16e8e1f4d65c4cf9fcfd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210623.103752-21-runner.jar
+    md5: 4a8328d8d2f7fa6d3041aa8ca99cc70c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 51d36e9942c..25f49497f74 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210621.040454-35-runner.jar
-    md5: fbcae1d85bce1992f6b29ef415bad4be
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210623.103423-39-runner.jar
+    md5: fae0e580f91ac7d9015c2b8d1a95402c
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 923054c7d99..6b7c0366217 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210621.043142-161-runner.jar
-    md5: a89664e77312e303ff319e13812235c0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210623.110218-165-runner.jar
+    md5: fba97c1ba73e8e87aa2b9329bef96930
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index f4b77ac4824..43be28d3b5a 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210621.043420-161-runner.jar
-    md5: 98488134f1a77abe3e4504ee53ccfe41
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210623.110455-165-runner.jar
+    md5: e6fe458f02f79fcaa2f22148380fce59
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 40bf0bcac97..d0fd4bfec9f 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210621.044425-75-runner.jar
-    md5: 8e04b4dbc4093e87b14c9caca36fbb2a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210623.111423-78-runner.jar
+    md5: c9343c953e222640924cd60b7271808f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index c9e03bc6d66..cdf5bd11e87 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210621.044548-75-runner.jar
-    md5: a4fe89c57ae1dc66a6473bd19bac406e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210623.111541-78-runner.jar
+    md5: c97f27ccc32c32dafac85f3d22c6a138
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index b542aaee614..135e51ef47f 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210621.043335-161-runner.jar
-    md5: 9b7de18d8ee7294d496bb51ed8847a40
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210623.110411-165-runner.jar
+    md5: 745c357642a29ee403aca06317f42593
 
 execute:
   - script: configure

From a1b992a6ceca859e4c878ab2b2cecc040bf06931 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 24 Jun 2021 08:16:28 -0300
Subject: [PATCH 303/709] Updated Maven artifacts (#541)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index a91cf5abc48..6490a1bef6a 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210623.104347-166-runner.jar
-    md5: 8fb53647e5b2463591fa74979d903477
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210624.042050-167-runner.jar
+    md5: 7c5d6c10a6092d20fb82547490b88fe4
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 3332ad1f648..0d272861598 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210623.104716-164-runner.jar
-    md5: 48367fea6491fadedb4f6fa47940797f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210624.042341-165-runner.jar
+    md5: 228f117b7b47de39fe4b4cfab132b5b9
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 219f644b82f..a00f169beba 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210623.111017-166-runner.jar
-    md5: 217e7558eef0738762afc5368faba377
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210624.044410-167-runner.jar
+    md5: a255426162ace1049c559440db28e821
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210623.110856-163-runner.jar
-    md5: 0ce3806f0cbe75d342311e36aff5048e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210624.044252-164-runner.jar
+    md5: 74f487703960ffa1473cb4f2a910e03f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index d123437a1b5..09c0c017147 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210623.111822-107-runner.jar
-    md5: b0435ce0f4572527030f23ae23ba843b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210624.045121-108-runner.jar
+    md5: cc7cfdf9d865be04cdae05b3a4902884
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 9e6cef70fea..63735e10883 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210623.102740-39-runner.jar
-    md5: 57b323390b1b6e9934323d651b38761e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210624.040922-40-runner.jar
+    md5: 99a55709bf6a5754369a46f01c82028a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 9d0f36700de..1376e3f3983 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210623.103101-39-runner.jar
-    md5: 1625fa10ba992cba6f55caf4a143fed6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210624.041147-40-runner.jar
+    md5: ba446e575d70fe15c724e262532cd730
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 0d88bbfcff8..ddcac4d1dff 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210623.103752-21-runner.jar
-    md5: 4a8328d8d2f7fa6d3041aa8ca99cc70c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210624.041628-22-runner.jar
+    md5: b94c5784df7ca5d297626b2feaa3de9a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 25f49497f74..31dce05ecc2 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210623.103423-39-runner.jar
-    md5: fae0e580f91ac7d9015c2b8d1a95402c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210624.041414-40-runner.jar
+    md5: 6b1fb2d7f4fdbca41b61fb8b53ce62d0
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 6b7c0366217..3ffd0910bc6 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210623.110218-165-runner.jar
-    md5: fba97c1ba73e8e87aa2b9329bef96930
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210624.043649-166-runner.jar
+    md5: 10ec1b14921942bef55b1da0c8f7fe8b
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 43be28d3b5a..7edde8ba259 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210623.110455-165-runner.jar
-    md5: e6fe458f02f79fcaa2f22148380fce59
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210624.043904-166-runner.jar
+    md5: cd635274c85bd443cfb57c76370f9e9b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index d0fd4bfec9f..6767e6dbce9 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210623.111423-78-runner.jar
-    md5: c9343c953e222640924cd60b7271808f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210624.044755-79-runner.jar
+    md5: d21838ad76a39a1175ea354263bc8898
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index cdf5bd11e87..004f214f3e0 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210623.111541-78-runner.jar
-    md5: c97f27ccc32c32dafac85f3d22c6a138
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210624.044903-79-runner.jar
+    md5: 833911445de03a2bf4fee1d5631d6eb3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 135e51ef47f..6070e81c12c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210623.110411-165-runner.jar
-    md5: 745c357642a29ee403aca06317f42593
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210624.043827-166-runner.jar
+    md5: 5433a54a8dc58690cd84e2c1a956274d
 
 execute:
   - script: configure

From bac664dd989ae6b16654e3013fd0e31066f0683e Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 25 Jun 2021 11:12:53 -0300
Subject: [PATCH 304/709] Updated Maven artifacts (#547)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 6490a1bef6a..2844f1987cc 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210624.042050-167-runner.jar
-    md5: 7c5d6c10a6092d20fb82547490b88fe4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210625.043150-168-runner.jar
+    md5: 40ddddc6d4e1908cc2f3490a41782744
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 0d272861598..05db873178b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210624.042341-165-runner.jar
-    md5: 228f117b7b47de39fe4b4cfab132b5b9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210625.043439-166-runner.jar
+    md5: e113ed290adc0954ea7646f701a25ce5
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index a00f169beba..64e438dbde9 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210624.044410-167-runner.jar
-    md5: a255426162ace1049c559440db28e821
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210625.045444-168-runner.jar
+    md5: f145191ab570095404f0d63bf7fcaa59
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210624.044252-164-runner.jar
-    md5: 74f487703960ffa1473cb4f2a910e03f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210625.045327-165-runner.jar
+    md5: 9ec742f7af4efdb0156a1f4dd7a517c0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 09c0c017147..61fcd1549ac 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210624.045121-108-runner.jar
-    md5: cc7cfdf9d865be04cdae05b3a4902884
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210625.050205-109-runner.jar
+    md5: 98fb1a3ec60d2b7c1ab4516c8894183f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 63735e10883..bbc3c06893e 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210624.040922-40-runner.jar
-    md5: 99a55709bf6a5754369a46f01c82028a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210625.042024-41-runner.jar
+    md5: 9207eecca17a9e5a065fdcde7fc0ac5b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 1376e3f3983..59ae69d225a 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210624.041147-40-runner.jar
-    md5: ba446e575d70fe15c724e262532cd730
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210625.042249-41-runner.jar
+    md5: 5d439cc8316a99375c21c165c2197862
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index ddcac4d1dff..a28ee179c82 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210624.041628-22-runner.jar
-    md5: b94c5784df7ca5d297626b2feaa3de9a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210625.042730-23-runner.jar
+    md5: 53a56e861888a7b7c54712453cc5880e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 31dce05ecc2..a246974d837 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210624.041414-40-runner.jar
-    md5: 6b1fb2d7f4fdbca41b61fb8b53ce62d0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210625.042515-41-runner.jar
+    md5: 9df66211523a2159fffc7e02056de330
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 3ffd0910bc6..6c31027e90a 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210624.043649-166-runner.jar
-    md5: 10ec1b14921942bef55b1da0c8f7fe8b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210625.044732-167-runner.jar
+    md5: 41a2167b3048be5a42970f8817797834
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 7edde8ba259..0b7bd27462f 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210624.043904-166-runner.jar
-    md5: cd635274c85bd443cfb57c76370f9e9b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210625.044949-167-runner.jar
+    md5: 7dde472931cd6fac348f7bbd59c04a35
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 6767e6dbce9..180679abcd2 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210624.044755-79-runner.jar
-    md5: d21838ad76a39a1175ea354263bc8898
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210625.045830-80-runner.jar
+    md5: 9ac0eeab8f1f33619e3962de761624b6
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 004f214f3e0..5be296d7bed 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210624.044903-79-runner.jar
-    md5: 833911445de03a2bf4fee1d5631d6eb3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210625.045942-80-runner.jar
+    md5: 62122e26462ccb3ff54a82e46fa0e244
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6070e81c12c..1524e8b92fd 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210624.043827-166-runner.jar
-    md5: 5433a54a8dc58690cd84e2c1a956274d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210625.044911-167-runner.jar
+    md5: 7c139699b2462bca55e1314f044bd6c5
 
 execute:
   - script: configure

From c234a7e9ce4bce17b8f0925d33cbc456e76b6f1a Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 28 Jun 2021 11:36:19 -0300
Subject: [PATCH 305/709] Updated Maven artifacts (#552)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 2844f1987cc..6a8c504f64c 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210625.043150-168-runner.jar
-    md5: 40ddddc6d4e1908cc2f3490a41782744
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210628.042401-170-runner.jar
+    md5: e6b74b47b755cd23c743f755dd9cccbc
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 05db873178b..55d5445f758 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210625.043439-166-runner.jar
-    md5: e113ed290adc0954ea7646f701a25ce5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210628.042811-168-runner.jar
+    md5: de5c1a6c078f58f938c8a6c9318f50ac
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 64e438dbde9..4d79e6f7b6d 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210625.045444-168-runner.jar
-    md5: f145191ab570095404f0d63bf7fcaa59
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210628.050151-170-runner.jar
+    md5: 88738118e1aeed0362653581ab378f81
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210625.045327-165-runner.jar
-    md5: 9ec742f7af4efdb0156a1f4dd7a517c0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210628.050010-167-runner.jar
+    md5: 4a483a21cafdd2bcce031cef2980cd4a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 61fcd1549ac..4ec38816131 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210625.050205-109-runner.jar
-    md5: 98fb1a3ec60d2b7c1ab4516c8894183f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210628.051132-111-runner.jar
+    md5: 09309df1f56c35e8a1dac12eccefb35b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index bbc3c06893e..58f25418100 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210625.042024-41-runner.jar
-    md5: 9207eecca17a9e5a065fdcde7fc0ac5b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210628.041031-43-runner.jar
+    md5: 2123cddcf6e1d643d931aaeaa277d937
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 59ae69d225a..00a5b046e0d 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210625.042249-41-runner.jar
-    md5: 5d439cc8316a99375c21c165c2197862
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210628.041320-43-runner.jar
+    md5: be09ead778f5f348cd51325feff0e488
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index a28ee179c82..7769da62eae 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210625.042730-23-runner.jar
-    md5: 53a56e861888a7b7c54712453cc5880e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210628.041850-25-runner.jar
+    md5: 25f5174ade3c3d5a55813f7f7325e697
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index a246974d837..d2c39b5de19 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210625.042515-41-runner.jar
-    md5: 9df66211523a2159fffc7e02056de330
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210628.041607-43-runner.jar
+    md5: 4b1a5d8e2d7c792b589e638ae7e04140
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 6c31027e90a..043826d55bc 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210625.044732-167-runner.jar
-    md5: 41a2167b3048be5a42970f8817797834
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210628.045048-168-runner.jar
+    md5: b78306998afba7fb653f530445fd4ccc
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 0b7bd27462f..b2b5f054d33 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210625.044949-167-runner.jar
-    md5: 7dde472931cd6fac348f7bbd59c04a35
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210628.045421-168-runner.jar
+    md5: 6c7f2d16b1dd46ccb62bc6f7cb9efd4d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 180679abcd2..96502352fbe 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210625.045830-80-runner.jar
-    md5: 9ac0eeab8f1f33619e3962de761624b6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210628.050707-82-runner.jar
+    md5: 4024e64e3d88c8ec5b2940f8b7ff2d45
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 5be296d7bed..f9f19196fac 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210625.045942-80-runner.jar
-    md5: 62122e26462ccb3ff54a82e46fa0e244
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210628.050834-82-runner.jar
+    md5: c7cc194859131346c51c8820c60f3e4d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 1524e8b92fd..4b44c516b0b 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210625.044911-167-runner.jar
-    md5: 7c139699b2462bca55e1314f044bd6c5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210628.045325-168-runner.jar
+    md5: 63166f6a6aa52bf131f998b80649b7d8
 
 execute:
   - script: configure

From 58188dbec82acf0ec9c0d9e06fec73a5a8e707e3 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 29 Jun 2021 11:45:40 -0300
Subject: [PATCH 306/709] Updated Maven artifacts (#555)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 6a8c504f64c..045e9f27c0d 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210628.042401-170-runner.jar
-    md5: e6b74b47b755cd23c743f755dd9cccbc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210629.050816-171-runner.jar
+    md5: d0d7fdbe5a730cab09331d2eb1717656
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 55d5445f758..aee5300f8c6 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210628.042811-168-runner.jar
-    md5: de5c1a6c078f58f938c8a6c9318f50ac
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210629.051129-169-runner.jar
+    md5: bd6df8bae9b3e677408fee095443e6f0
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 4d79e6f7b6d..a9c235b3520 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210628.050151-170-runner.jar
-    md5: 88738118e1aeed0362653581ab378f81
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210629.054425-171-runner.jar
+    md5: 537f0f80d4fd9ad439b30c9db57531b0
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210628.050010-167-runner.jar
-    md5: 4a483a21cafdd2bcce031cef2980cd4a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210629.054249-168-runner.jar
+    md5: 99369d76b0b5e3c4da92a957cabc1901
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 4ec38816131..886a622fb8e 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210628.051132-111-runner.jar
-    md5: 09309df1f56c35e8a1dac12eccefb35b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210629.055305-112-runner.jar
+    md5: 1e62d4c32b0f2c97541ce94c39a052a5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 58f25418100..07495e30519 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210628.041031-43-runner.jar
-    md5: 2123cddcf6e1d643d931aaeaa277d937
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210629.045404-44-runner.jar
+    md5: f45098849077af1b09834dcac85edf54
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 00a5b046e0d..a53580abb8e 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210628.041320-43-runner.jar
-    md5: be09ead778f5f348cd51325feff0e488
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210629.045705-44-runner.jar
+    md5: 100e186e54919382952050a5955f6544
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 7769da62eae..8a5f72c3043 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210628.041850-25-runner.jar
-    md5: 25f5174ade3c3d5a55813f7f7325e697
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210629.050302-26-runner.jar
+    md5: cd2e44261bf15be720ed9b5f940ebcc8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index d2c39b5de19..c38a3461c9b 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210628.041607-43-runner.jar
-    md5: 4b1a5d8e2d7c792b589e638ae7e04140
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210629.050012-44-runner.jar
+    md5: d0efe75f2597ab07d5a2ba475ceac007
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 043826d55bc..d8d8cf9bffd 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210628.045048-168-runner.jar
-    md5: b78306998afba7fb653f530445fd4ccc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210629.052830-169-runner.jar
+    md5: 6a0663dc07b8fd6a314964535dc1ed6c
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index b2b5f054d33..bdb23a0762a 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210628.045421-168-runner.jar
-    md5: 6c7f2d16b1dd46ccb62bc6f7cb9efd4d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210629.053125-169-runner.jar
+    md5: 3ecb2cc89dd1bff3b5463a7adbbb5768
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 96502352fbe..37086098b8a 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210628.050707-82-runner.jar
-    md5: 4024e64e3d88c8ec5b2940f8b7ff2d45
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210629.054902-83-runner.jar
+    md5: 6351055d9bcced8dc5b91540e3e1f89a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index f9f19196fac..74c7062a216 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210628.050834-82-runner.jar
-    md5: c7cc194859131346c51c8820c60f3e4d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210629.055020-83-runner.jar
+    md5: bc734cfbba2b96ebda863101239f45c0
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 4b44c516b0b..b1db93c569f 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210628.045325-168-runner.jar
-    md5: 63166f6a6aa52bf131f998b80649b7d8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210629.053040-169-runner.jar
+    md5: e34f00d994c3801ae0017460ea75bd94
 
 execute:
   - script: configure

From f17046c1f3960cbf0bfba9df8d99b9435ec2f8c9 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 30 Jun 2021 10:58:10 -0300
Subject: [PATCH 307/709] Updated Maven artifacts (#557)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index aee5300f8c6..75dbecc1416 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210629.051129-169-runner.jar
-    md5: bd6df8bae9b3e677408fee095443e6f0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210630.055702-170-runner.jar
+    md5: 6708e2e7a334b5e4f74dd4cce1271238
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index a9c235b3520..c4a4c4a3c79 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210629.054425-171-runner.jar
-    md5: 537f0f80d4fd9ad439b30c9db57531b0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210630.063644-172-runner.jar
+    md5: d2a25345311e6cf00760240c19755a57
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210629.054249-168-runner.jar
-    md5: 99369d76b0b5e3c4da92a957cabc1901
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210630.063403-169-runner.jar
+    md5: f14d4a061d79ccb3dfdef3d6f7757fd5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 886a622fb8e..81f42d45e8b 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210629.055305-112-runner.jar
-    md5: 1e62d4c32b0f2c97541ce94c39a052a5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210630.065033-113-runner.jar
+    md5: ca8b7dbab5ca4a5e246f847e82ebd27c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 07495e30519..74f97b4c8c6 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210629.045404-44-runner.jar
-    md5: f45098849077af1b09834dcac85edf54
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210630.053343-45-runner.jar
+    md5: 0dbe81921124be459b9daee09b8b24a6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index a53580abb8e..19fbb7f2f40 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210629.045705-44-runner.jar
-    md5: 100e186e54919382952050a5955f6544
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210630.053756-45-runner.jar
+    md5: daec5f7e90529bef7f3706c802cf249f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 8a5f72c3043..0a19b3101c7 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210629.050302-26-runner.jar
-    md5: cd2e44261bf15be720ed9b5f940ebcc8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210630.054548-27-runner.jar
+    md5: a2ea0356db6528825c662bb12551a587
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index c38a3461c9b..e08210ace1c 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210629.050012-44-runner.jar
-    md5: d0efe75f2597ab07d5a2ba475ceac007
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210630.054203-45-runner.jar
+    md5: 8cb8ef18494ad92d0bb1f71c6b647f33
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 37086098b8a..e1cdd807a8a 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210629.054902-83-runner.jar
-    md5: 6351055d9bcced8dc5b91540e3e1f89a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210630.064436-84-runner.jar
+    md5: ed5806999faf2f4dd8884c6c5ca5974d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 74c7062a216..e624470fb61 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210629.055020-83-runner.jar
-    md5: bc734cfbba2b96ebda863101239f45c0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210630.064636-84-runner.jar
+    md5: 5b30c97413584c728cafaafaae8399b0
 
 execute:
   - script: configure

From 4d64bbe345de29fd2538179558ece86b99c59c52 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 30 Jun 2021 12:31:31 -0300
Subject: [PATCH 308/709] [KOGITO-4535] - New data index image for Postgresql
 variation (#529)

* [KOGITO-4535] - New data index image for Postgresql variation

Signed-off-by: spolti <fspolti@redhat.com>
---
 README.md                                     | 29 +++++++++----
 kogito-data-index-postgresql-overrides.yaml   | 42 +++++++++++++++++++
 kogito-imagestream.yaml                       | 21 ++++++++++
 .../added/kogito-app-launch.sh                | 27 ++++++++++++
 .../kogito-data-index-postgresql/configure    | 12 ++++++
 .../kogito-data-index-postgresql/module.yaml  | 12 ++++++
 scripts/README.md                             |  1 +
 scripts/common.py                             | 12 +++---
 scripts/push-staging.py                       | 24 +++++------
 scripts/update-maven-artifacts.py             | 34 ++++++++-------
 .../features/common-custom-truststore.feature |  4 +-
 tests/features/common.feature                 | 20 ++++++++-
 .../kogito-data-index-common.feature          |  4 +-
 .../kogito-data-index-postgresql.feature      | 28 +++++++++++++
 .../kogito-jobs-service-postgresql.feature    | 12 +++---
 15 files changed, 231 insertions(+), 51 deletions(-)
 create mode 100644 kogito-data-index-postgresql-overrides.yaml
 create mode 100644 modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-data-index-postgresql/configure
 create mode 100644 modules/kogito-data-index-postgresql/module.yaml
 create mode 100644 tests/features/data-index/kogito-data-index-postgresql.feature

diff --git a/README.md b/README.md
index 6e5d1c044b2..30540c2765a 100644
--- a/README.md
+++ b/README.md
@@ -524,6 +524,7 @@ Today we have 3 Kogito Component Images:
 
 * [quay.io/kiegroup/kogito-data-index-infinispan](https://quay.io/kiegroup/kogito-data-index-infinispan)
 * [quay.io/kiegroup/kogito-data-index-mongodb](https://quay.io/kiegroup/kogito-data-index-mongodb)
+* [quay.io/kiegroup/kogito-data-index-postgresql](https://quay.io/kiegroup/kogito-data-index-postgresql)
 * [quay.io/kiegroup/kogito-trusty-infinispan](https://quay.io/kiegroup/kogito-trusty-infinispan)
 * [quay.io/kiegroup/kogito-trusty-redis](https://quay.io/kiegroup/kogito-trusty-redis)
 * [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
@@ -541,13 +542,15 @@ Today we have 3 Kogito Component Images:
 
 The Data Index Service aims at capturing and indexing data produced by one more Kogito runtime services. 
 For more information please visit this (link)(https://docs.jboss.org/kogito/release/latest/html_single/#proc-kogito-travel-agency-enable-data-index_kogito-deploying-on-openshift). 
-The Data Index Service depends on a running Infinispan or MongoDB Server.
+The Data Index Service depends on a running Infinispan, MongoDB or PostgreSQL.
 The Persistence service can be switched by using its corresponding image
 
 - Infinispan: quay.io/kiegroup/kogito-data-index-infinispan
     [image.yaml](kogito-data-index-infinispan-overrides.yaml)
 - Mongodb: quay.io/kiegroup/kogito-data-index-mongodb
     [image.yaml](kogito-data-index-mongodb-overrides.yaml)
+- PostgreSQL: quay.io/kiegroup/kogito-data-index-postgresql
+  [image.yaml](kogito-data-index-postgresql-overrides.yaml)
 
 
 Basic usage with Infinispan:
@@ -560,15 +563,18 @@ Basic usage with Mongodb:
 $ docker run -it --env QUARKUS_MONGODB_CONNECTION_STRING=mongodb://localhost:27017 quay.io/kiegroup/kogito-data-index-mongodb:latest
 ```
 
-Basic usage with Postgresql:
+Basic usage with PostgreSQL:
 ```bash
-$ docker run -it --env QUARKUS_POSTGRESQL_CONNECTION_STRING=postgresql://localhost:5432 quay.io/kiegroup/kogito-data-index-postgresql:latest
+$ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus"  \
+    --env QUARKUS_DATASOURCE_USERNAME="kogito" \
+    --env QUARKUS_DATASOURCE_PASSWORD="secret" \
+    quay.io/kiegroup/kogito-data-index-postgresql:latest
 ```
 
 To enable debug just use this env while running this image:
 
 ```bash
-docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
+$ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
 ```
 You should notice a few debug messages present in the system output.
 
@@ -597,6 +603,7 @@ To know what configurations this image accepts please take a look [here](kogito-
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Explainability Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
+
 ### Kogito Trusty Component Image
 
 The Trusty Service aims at collecting tracing information by one or more Kogito runtime services and provides analytical capabilities on top of the collected data. 
@@ -660,7 +667,7 @@ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-infi
 You should notice a few debug messages being printed in the system output.
 
 The ephemeral image does not have external dependencies like a backend persistence provider, it uses in-memory persistence
-while working with Jobs Services `infinispan`, `mongodb` and `postgresql` variants, it will need to have an Infinispan, MongoDB and Postgresql server,
+while working with Jobs Services `infinispan`, `mongodb` and `postgresql` variants, it will need to have an Infinispan, MongoDB and PostgreSQL server,
 respectively, previously running.
 
 
@@ -698,8 +705,8 @@ to your Kogito infrastructure on a Kubernetes cluster and provide its capabiliti
 
 ### Kogito Task Console Component Image
 
-The Kogito Task Console allows you to have a intuitive way to work with User Tasks in Kogito processes.
-It depends on the Kogito Data Index Service on which the Console will connect to so it can be able to manage it.
+The Kogito Task Console allows you to have an intuitive way to work with User Tasks in Kogito processes.
+It depends on the Kogito Data Index Service on which the Console will connect to, so it can be able to manage it.
 
 To work correctly, the Kogito Task Console needs the Kogito Data Index Service url. If not provided, it will try to connect to the default one (http://localhost:8180).
 
@@ -797,6 +804,7 @@ imagestream.image.openshift.io/kogito-runtime-jvm created
 imagestream.image.openshift.io/kogito-builder created
 imagestream.image.openshift.io/kogito-data-index-infinispan created
 imagestream.image.openshift.io/kogito-data-index-mongodb created
+imagestream.image.openshift.io/kogito-data-index-postgresql created
 imagestream.image.openshift.io/kogito-trusty-infinispan created
 imagestream.image.openshift.io/kogito-trusty-redis created
 imagestream.image.openshift.io/kogito-jobs-service-ephemeral created
@@ -910,7 +918,7 @@ $ curl -H "Content-Type: application/json" -X POST -d '{"strings":["hello"]}' \
      http://rules-quarkus-helloworld-service-rules-quarkus-helloworld.apps.lab.cloud/hello
 ```
 
-As output you should see the following response:
+As output, you should see the following response:
 
 ```json
 ["hello","world"]
@@ -987,6 +995,7 @@ With this Makefile you can:
      $ make build-image image_name=kogito-runtime-native
      $ make build-image image_name=kogito-data-index-infinispan
      $ make build-image image_name=kogito-data-index-mongodb
+     $ make build-image image_name=kogito-data-index-postgresql
      $ make build-image image_name=kogito-trusty-infinispan
      $ make build-image image_name=kogito-trusty-redis
      $ make build-image image_name=kogito-explainability
@@ -1054,6 +1063,7 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-data-index-common](modules/kogito-data-index-common): Data Index common module.
 - [kogito-data-index-infinispan](modules/kogito-data-index-infinispan): Installs and Configure the infinispan data-index jar inside the image.
 - [kogito-data-index-mongodb](modules/kogito-data-index-mongodb): Installs and Configure the mongodb data-index jar inside the image.
+- [kogito-data-index-postgresql](modules/kogito-data-index-postgresql): Installs and Configure the postgresql data-index jar inside the image.
 - [kogito-trusty-infinispan](modules/kogito-trusty-infinispan): Installs and Configure the infinispan trusty jar inside the image.
 - [kogito-trusty-redis](modules/kogito-trusty-redis): Installs and Configure the redis trusty jar inside the image.
 - [kogito-explainability](modules/kogito-explainability): Installs and Configure the explainability jar inside the image.
@@ -1083,10 +1093,11 @@ Below you can find all modules used to build the Kogito Images
 
 
 For each image, we use a specific *-overrides.yaml file which will specific the modules needed.
-Please inspect the images overrides files to learn which modules are installed on each image:
+Please inspect the images overrides files to learn which modules are being installed on each image:
 
 - [quay.io/kiegroup/kogito-data-index-infinispan](kogito-data-index-infinispan-overrides.yaml)
 - [quay.io/kiegroup/kogito-data-index-mongodb](kogito-data-index-mongodb-overrides.yaml)
+- [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-redis](kogito-trusty-redis-overrides.yaml)
 - [quay.io/kiegroup/kogito-explainability](kogito-explainability-overrides.yaml)
diff --git a/kogito-data-index-postgresql-overrides.yaml b/kogito-data-index-postgresql-overrides.yaml
new file mode 100644
index 00000000000..20e6a42662b
--- /dev/null
+++ b/kogito-data-index-postgresql-overrides.yaml
@@ -0,0 +1,42 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-data-index-postgresql"
+description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
+
+labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
+- name: "io.k8s.display-name"
+  value: "Kogito Data Index Service - PostgreSQL"
+- name: "io.openshift.tags"
+  value: "kogito,data-index,data-index-postgresql"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.dataindex.postgresql
+  - name: org.kie.kogito.dataindex.common
+  - name: org.kie.kogito.security.custom.truststores
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index f7d068a44ee..3521bf1a23d 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -111,6 +111,27 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-data-index-mongodb:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-data-index-postgresql
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Data Index Service for PostgreSQL persistence provider
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Runtime image for the Kogito Data Index Service with PostgreSQL
+            iconClass: icon-jbpm
+            tags: kogito,data-index,data-index-postgresql
+            supports: persistence backed by PostgreSQL server
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-data-index-postgresql:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..3b0ab3ecd5e
--- /dev/null
+++ b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
+        -jar "${KOGITO_HOME}"/bin/data-index-service-postgresql-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-postgresql/configure b/modules/kogito-data-index-postgresql/configure
new file mode 100644
index 00000000000..60a3afaef7f
--- /dev/null
+++ b/modules/kogito-data-index-postgresql/configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v "${SOURCES_DIR}"/data-index-service-postgresql-runner.jar "${KOGITO_HOME}"/bin/
+
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
+
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
new file mode 100644
index 00000000000..4ace0e10e16
--- /dev/null
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.dataindex.postgresql
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: data-index-service-postgresql-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210617.033050-3-runner.jar
+    md5: 30449836c188696b89f205d82bed84d8
+
+execute:
+  - script: configure
+
diff --git a/scripts/README.md b/scripts/README.md
index 6156276e070..6c61dac0b16 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -191,6 +191,7 @@ The command will update the needed files with the new URL:
 
 - kogito-data-index-infinispan/module.yaml
 - kogito-data-index-mongodb/module.yaml
+- kogito-data-index-postgresql/module.yaml
 - kogito-explainability/module.yaml
 - kogito-jit-runner/module.yaml
 - kogito-jobs-service-ephemeral/module.yaml
diff --git a/scripts/common.py b/scripts/common.py
index a69103b80e1..1e929bbe059 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -9,12 +9,12 @@
 
 # All kogito-image modules that have the kogito version.
 MODULES = {"kogito-data-index-common", "kogito-data-index-mongodb",
-           "kogito-data-index-infinispan", "kogito-trusty-common",
-           "kogito-trusty-infinispan", "kogito-trusty-redis",
-           "kogito-explainability", "kogito-image-dependencies",
-           "kogito-jobs-service-common", "kogito-jobs-service-ephemeral",
-           "kogito-jobs-service-infinispan", "kogito-jobs-service-mongodb",
-           "kogito-jobs-service-postgresql",
+           "kogito-data-index-infinispan", "kogito-data-index-postgresql",
+           "kogito-trusty-common", "kogito-trusty-infinispan",
+           "kogito-trusty-redis", "kogito-explainability",
+           "kogito-image-dependencies", "kogito-jobs-service-common",
+           "kogito-jobs-service-ephemeral", "kogito-jobs-service-infinispan",
+           "kogito-jobs-service-mongodb", "kogito-jobs-service-postgresql",
            "kogito-trusty-ui", "kogito-jq",
            "kogito-kubernetes-client", "kogito-launch-scripts",
            "kogito-logging", "kogito-management-console",
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index f6ae565382c..828f4583703 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -23,9 +23,9 @@
 
 
 def find_next_tag(override_tags):
-    '''
+    """
     Populate the IMAGES_NEXT_RC_TAGS with the next rc tag for each image.
-    '''
+    """
     global IMAGES_NEXT_RC_TAG
     for image in common.get_all_images():
         tag = fetch_tag(image, override_tags)
@@ -34,13 +34,13 @@ def find_next_tag(override_tags):
 
 
 def fetch_tag(image, override_tags):
-    '''
+    """
     fetch the rcX tag for the given image, keep increasing until no rc tag is found
     then return the next tag to be used.
     :param image: image to be verified
     :param override_tags: if true, does not increase the rc-X tag
     :return: the next rc tag if override_tags is false.
-    '''
+    """
     version = find_current_rc_version()
     while True:
         url = 'https://quay.io/api/v1/repository/kiegroup/{}/tag/{}/images'.format(image, version)
@@ -59,9 +59,9 @@ def fetch_tag(image, override_tags):
 
 
 def tag_and_push_images():
-    '''
+    """
     tag and push the images to quay.io
-    '''
+    """
     cli = docker.client.from_env()
     current_version = get_current_version()
     print("New rc tags %s" % IMAGES_NEXT_RC_TAG)
@@ -99,21 +99,21 @@ def tag_and_push_images():
 
 
 def get_current_version():
-    '''
+    """
     get the current image version from image.yaml. The version defined there will be considered
     the point of truth, update it carefully.
     :return: current image.yaml defined version
-    '''
+    """
     with open('image.yaml') as image_yaml:
         data = yaml.load(image_yaml, Loader=yaml.FullLoader)
         return data['version']
 
 
 def find_current_rc_version():
-    '''
+    """
     If the current version already includes the rc tag, keep it, otherwise add it -rc1 tag.
     :return: the current image tag version
-    '''
+    """
     version = get_current_version()
     if '-rc' in version:
         CURRENT_IMAGE_VERSION = version
@@ -123,12 +123,12 @@ def find_current_rc_version():
 
 
 def get_next_rc_version(current_rc_version, override_tags):
-    '''
+    """
     After finding the current rc tag of the image, adds one to it
     e.g: 0.10.0-rc1 will returned as 0.10.0-rc2
     :param current_rc_version: takes the current rc version of the image as input
     :return: returns the next rc version of the image
-    '''
+    """
     return current_rc_version if override_tags else (
                 current_rc_version.split("rc")[0] + "rc" + str(int(current_rc_version.split("rc")[1]) + 1))
 
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index d880ccb5622..ed31ef2f2d2 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -22,10 +22,11 @@
 KOGITO_ARTIFACT_PATH = "org/kie/kogito"
 
 Modules = {
-    #service-name: module-name(directory in which module's module.yaml file is present)
-    #Note: Service name should be same as given in the repository
+    # service-name: module-name(directory in which module's module.yaml file is present)
+    # Note: Service name should be same as given in the repository
     "data-index-service-infinispan": "kogito-data-index-infinispan",
     "data-index-service-mongodb": "kogito-data-index-mongodb",
+    "data-index-service-postgresql": "kogito-data-index-postgresql",
     "trusty-service-infinispan": "kogito-trusty-infinispan",
     "trusty-service-redis": "kogito-trusty-redis",
     "explainability-service-rest": "kogito-explainability",
@@ -40,7 +41,8 @@
     "jitexecutor-runner": "kogito-jit-runner"
 }
 
-def isSnapshotVersion(version):
+
+def is_snapshot_version(version):
     """
     Check whether the given version is a snapshot version
     :param version: The version to check
@@ -49,7 +51,7 @@ def isSnapshotVersion(version):
     return version.endswith("-SNAPSHOT")
 
 
-def getMetadataRoot(service):
+def get_metadata_root(service):
     """
     Get the root element from the maven-metadata
     :param service: Service information (repo_url, version, name)
@@ -65,45 +67,45 @@ def getMetadataRoot(service):
     return root
 
 
-def getSnapshotVersion(service):
+def get_snapshot_version(service):
     """
     parse the xml and finds the snapshotVersion
     :param service: Service information (repo_url, version, name)
     :return: snapshotVersion string
     """
-    root = getMetadataRoot(service)
+    root = get_metadata_root(service)
     snapshotVersion = root.find("./versioning/snapshotVersions/snapshotVersion/value").text
     return snapshotVersion
 
 
-def getRunnerURL(service):
+def get_runner_url(service):
     """
     Creates the updated URL for runner.jar
     :param service: Service information (repo_url, version, name)
     :return: url string
     """
     finalVersion = service["version"]
-    if isSnapshotVersion(finalVersion):
-        finalVersion = getSnapshotVersion(service)
+    if is_snapshot_version(finalVersion):
+        finalVersion = get_snapshot_version(service)
     url = service["repo_url"] + "{0}-{1}-runner.jar".format(service["name"], finalVersion)
-    checkUrl(url)
+    check_url(url)
     return url
 
 
-def getMD5(service):
+def get_md5(service):
     """
     Fetches the md5 code for the latest runner.jar
     :param service: Service information (repo_url, version, name)
     :return: runnerMD5 string
     """
-    runnerURL = getRunnerURL(service)
+    runnerURL = get_runner_url(service)
     runnerMD5URL = runnerURL+".md5"
-    checkUrl(runnerMD5URL)
+    check_url(runnerMD5URL)
     runnerMD5 = sp.getoutput("curl -s  {}".format(runnerMD5URL))
     return runnerMD5
 
 
-def checkUrl(url):
+def check_url(url):
     """
     Check url returns 2xx code.
     :param url
@@ -127,8 +129,8 @@ def update_artifacts(service, modulePath):
         # print(data['artifacts'])
         # print(filter(lambda x: service['name'] in x['name']))
         artifact = next(filter(lambda x: service['name'] in x['name'], data['artifacts']))
-        artifact['url'] = getRunnerURL(service)
-        artifact['md5'] = getMD5(service)
+        artifact['url'] = get_runner_url(service)
+        artifact['md5'] = get_md5(service)
     with open(modulePath, 'w') as module:
         common.yaml_loader().dump(data, module)
 
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index ea9cfeedd2b..5ba23268391 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -1,5 +1,7 @@
 @quay.io/kiegroup/kogito-runtime-jvm 
-@quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb 
+@quay.io/kiegroup/kogito-data-index-infinispan
+@quay.io/kiegroup/kogito-data-index-mongodb
+@quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-task-console 
 @quay.io/kiegroup/kogito-management-console 
 @quay.io/kiegroup/kogito-explainability 
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 4f9ce9604ca..795536e9da5 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,4 +1,22 @@
-@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-jvm @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis @rhpam-7/rhpam-kogito-runtime-jvm-rhel8 @rhpam-7/rhpam-kogito-builder-rhel8
+@quay.io/kiegroup/kogito-builder
+@quay.io/kiegroup/kogito-runtime-jvm
+@quay.io/kiegroup/kogito-runtime-native
+@quay.io/kiegroup/kogito-data-index-infinispan
+@quay.io/kiegroup/kogito-data-index-mongodb
+@quay.io/kiegroup/kogito-data-index-postgresql
+@quay.io/kiegroup/kogito-trusty-infinispan
+@quay.io/kiegroup/kogito-trusty-redis
+@quay.io/kiegroup/kogito-trusty-ui
+@quay.io/kiegroup/kogito-explainability
+@quay.io/kiegroup/kogito-jit-runner
+@quay.io/kiegroup/kogito-jobs-service-ephemeral
+@quay.io/kiegroup/kogito-jobs-service-infinispan
+@quay.io/kiegroup/kogito-jobs-service-mongodb
+@quay.io/kiegroup/kogito-jobs-service-postgresql
+@quay.io/kiegroup/kogito-management-console
+@quay.io/kiegroup/kogito-task-console
+@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
+@rhpam-7/rhpam-kogito-builder-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index 2c9079c1a1f..f4c5fd560ae 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -1,4 +1,6 @@
-@quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-mongodb
+@quay.io/kiegroup/kogito-data-index-infinispan
+@quay.io/kiegroup/kogito-data-index-mongodb
+@quay.io/kiegroup/kogito-data-index-postgresql
 Feature: Kogito-data-index common feature.
   Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
new file mode 100644
index 00000000000..dee5eb3be82
--- /dev/null
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -0,0 +1,28 @@
+@quay.io/kiegroup/kogito-data-index-postgresql
+Feature: Kogito-data-index postgresql feature.
+
+  Scenario: verify if all labels are correctly set on kogito-data-index-postgresql image
+    Given image is built
+     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+      And the image should contain label io.openshift.s2i.destination with value /tmp
+      And the image should contain label io.openshift.expose-services with value 8080:http
+      And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for PostgreSQL persistence provider
+      And the image should contain label io.k8s.display-name with value Kogito Data Index Service - PostgreSQL
+      And the image should contain label io.openshift.tags with value kogito,data-index,data-index-postgresql
+
+  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-postgresql-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-postgresql-runner.jar
+
+  Scenario: verify if of container is correctly started with postgresql parameters
+    When container is started with env
+      | variable                     | value                                    |
+      | SCRIPT_DEBUG                 | true                                     |
+      | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:postgresql://10.1.1.10:5432/quarkus |
+      | QUARKUS_DATASOURCE_USERNAME  | kogito                                   |
+      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
+    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-postgresql-runner.jar
+     And container log should contain org.postgresql.util.PSQLException: The connection attempt failed
+     And container log should not contain Application failed to start
+
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index fb7fe462db2..fa0c61070f2 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -17,9 +17,11 @@ Feature: Kogito-jobs-service-postgresql feature.
 
   Scenario: verify if of container is correctly started with postgresql parameters
     When container is started with env
-      | variable                          | value                                          |
-      | SCRIPT_DEBUG                      | true                                           |
-      | QUARKUS_POSTGRES_CONNECTION_STRING | postgres://user:password@localhost:5432/admin  |
+      | variable                     | value                                    |
+      | SCRIPT_DEBUG                 | true                                     |
+      | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:postgresql://10.1.1.10:5432/quarkus |
+      | QUARKUS_DATASOURCE_USERNAME  | kogito                                   |
+      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
     Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-postgresql-runner.jar
-    And container log should contain localhost/127.0.0.1:5432
-    And container log should not contain Application failed to start
+    And container log should contain The connection attempt failed
+    And container log should contain Failed to start application (with profile prod)

From a350f4fafef7d2936664fb8d35cbaab25463ef3b Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 1 Jul 2021 10:35:33 -0300
Subject: [PATCH 309/709] Updated Maven artifacts (#559)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 045e9f27c0d..ae883e8e48b 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210629.050816-171-runner.jar
-    md5: d0d7fdbe5a730cab09331d2eb1717656
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210701.041952-172-runner.jar
+    md5: 4a3acdb3d5e6a9cc732a90c58845fc8c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 75dbecc1416..a72f84c5edb 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210630.055702-170-runner.jar
-    md5: 6708e2e7a334b5e4f74dd4cce1271238
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210701.042349-171-runner.jar
+    md5: 36193305d483037859a87ea98005aa99
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 4ace0e10e16..ad04603aa0c 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210617.033050-3-runner.jar
-    md5: 30449836c188696b89f205d82bed84d8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210701.042832-16-runner.jar
+    md5: 21497bf405080212bc0daff424f368e9
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index c4a4c4a3c79..0c8191b106d 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210630.063644-172-runner.jar
-    md5: d2a25345311e6cf00760240c19755a57
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210701.050050-173-runner.jar
+    md5: 38ceed49bba89454a9e7ed475fa00f75
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210630.063403-169-runner.jar
-    md5: f14d4a061d79ccb3dfdef3d6f7757fd5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210701.045858-170-runner.jar
+    md5: 8805a5c3c1b5519aa8f1da2cda0589bf
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 81f42d45e8b..d4406daf796 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210630.065033-113-runner.jar
-    md5: ca8b7dbab5ca4a5e246f847e82ebd27c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210701.051030-114-runner.jar
+    md5: fc5d7c7d76f3dbdb9fe1146b71901609
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 74f97b4c8c6..f347f00fdcd 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210630.053343-45-runner.jar
-    md5: 0dbe81921124be459b9daee09b8b24a6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210701.040326-46-runner.jar
+    md5: a250833b4214ff1bb37867fdff4021db
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 19fbb7f2f40..ec4c7e18f62 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210630.053756-45-runner.jar
-    md5: daec5f7e90529bef7f3706c802cf249f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210701.040657-46-runner.jar
+    md5: 06f786c7ee10968d01c373922e0c40e2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 0a19b3101c7..7f0370d7a02 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210630.054548-27-runner.jar
-    md5: a2ea0356db6528825c662bb12551a587
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210701.041337-28-runner.jar
+    md5: 33014585ed01e5e1826eef7df3eb495a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index e08210ace1c..ddaf18fa12d 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210630.054203-45-runner.jar
-    md5: 8cb8ef18494ad92d0bb1f71c6b647f33
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210701.041024-46-runner.jar
+    md5: 9ce603a5a4c2e6f1195d03d3d5633a8a
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index d8d8cf9bffd..9b4ec0f643f 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210629.052830-169-runner.jar
-    md5: 6a0663dc07b8fd6a314964535dc1ed6c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210701.044400-170-runner.jar
+    md5: 0167e12ac8de93841c0dfde85ea31c46
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index bdb23a0762a..7d59d0cdc36 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210629.053125-169-runner.jar
-    md5: 3ecb2cc89dd1bff3b5463a7adbbb5768
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210701.044706-170-runner.jar
+    md5: 667998df834298f5fc080f63216e566a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index e1cdd807a8a..345734c6e1a 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210630.064436-84-runner.jar
-    md5: ed5806999faf2f4dd8884c6c5ca5974d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210701.050557-85-runner.jar
+    md5: 71ed0b3fa27e5bb06f7907c5fc3bf6bd
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index e624470fb61..f5198c83c23 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210630.064636-84-runner.jar
-    md5: 5b30c97413584c728cafaafaae8399b0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210701.050726-85-runner.jar
+    md5: 002f18530569a5fba13e35cfa42d2892
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index b1db93c569f..3053ebe263a 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210629.053040-169-runner.jar
-    md5: e34f00d994c3801ae0017460ea75bd94
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210701.044620-170-runner.jar
+    md5: 6d7524f4bcf758187b5264d711cfdae6
 
 execute:
   - script: configure

From 17360ea338c8a9ef819e44ed7abbfdfcbfa561d2 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 2 Jul 2021 15:04:42 -0300
Subject: [PATCH 310/709] Updated Maven artifacts (#560)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index a72f84c5edb..e647538986d 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210701.042349-171-runner.jar
-    md5: 36193305d483037859a87ea98005aa99
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210702.030617-172-runner.jar
+    md5: 4a9263b414272e9370f8242ec4515a3f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index ad04603aa0c..32e6d0afb0a 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210701.042832-16-runner.jar
-    md5: 21497bf405080212bc0daff424f368e9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210702.031022-17-runner.jar
+    md5: 4c3b5b096852b27ee4a131fc6549b272
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 0c8191b106d..95d53baf972 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210701.050050-173-runner.jar
-    md5: 38ceed49bba89454a9e7ed475fa00f75
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210702.034635-174-runner.jar
+    md5: 62d049df1592c8412b5306ddbe0301b4
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210701.045858-170-runner.jar
-    md5: 8805a5c3c1b5519aa8f1da2cda0589bf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210702.034438-171-runner.jar
+    md5: 503657f0e22f4acbffec665a25e065e8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index d4406daf796..95391a47d78 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210701.051030-114-runner.jar
-    md5: fc5d7c7d76f3dbdb9fe1146b71901609
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210702.035630-115-runner.jar
+    md5: 0401b679c56238a6232790a8371d6cc7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index f347f00fdcd..54c06997cf1 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210701.040326-46-runner.jar
-    md5: a250833b4214ff1bb37867fdff4021db
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210702.024445-47-runner.jar
+    md5: c3063cf0b65e5a1b6b90ecb2fedc2242
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index ec4c7e18f62..34cc6e8625f 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210701.040657-46-runner.jar
-    md5: 06f786c7ee10968d01c373922e0c40e2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210702.024820-47-runner.jar
+    md5: 2ae1bcac23c29f054a3f8845218aceee
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 7f0370d7a02..7c46fd05493 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210701.041337-28-runner.jar
-    md5: 33014585ed01e5e1826eef7df3eb495a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210702.025534-29-runner.jar
+    md5: e0ef09c2bb9b75c26edd9c0b962a4432
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index ddaf18fa12d..eacd06c10a9 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210701.041024-46-runner.jar
-    md5: 9ce603a5a4c2e6f1195d03d3d5633a8a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210702.025201-47-runner.jar
+    md5: 5174c184380b3db53489784fc5aff47e
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 9b4ec0f643f..ec6ecf3af1f 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210701.044400-170-runner.jar
-    md5: 0167e12ac8de93841c0dfde85ea31c46
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210702.032843-171-runner.jar
+    md5: 084486895a469f7614a3dd0ee2f18681
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 7d59d0cdc36..4e052175ccd 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210701.044706-170-runner.jar
-    md5: 667998df834298f5fc080f63216e566a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210702.033214-171-runner.jar
+    md5: 1b526ceb659c339a69b53d548184a99d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 345734c6e1a..8dff2bbfe81 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210701.050557-85-runner.jar
-    md5: 71ed0b3fa27e5bb06f7907c5fc3bf6bd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210702.035155-86-runner.jar
+    md5: 5ea505e53c96d8d155fcb09c37816cc3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index f5198c83c23..2c20024de34 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210701.050726-85-runner.jar
-    md5: 002f18530569a5fba13e35cfa42d2892
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210702.035324-86-runner.jar
+    md5: 000de25250c4bd9bcd187459ba9fc71f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 3053ebe263a..8e66ef88053 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210701.044620-170-runner.jar
-    md5: 6d7524f4bcf758187b5264d711cfdae6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210702.033124-171-runner.jar
+    md5: 7afded050b44c9d18d9ae1a501c344d9
 
 execute:
   - script: configure

From a814fe35e4a8c7bd32849bef934c7f6f57faf1b3 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 5 Jul 2021 09:59:09 -0300
Subject: [PATCH 311/709] Updated Maven artifacts (#563)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index ae883e8e48b..27fc8454136 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210701.041952-172-runner.jar
-    md5: 4a3acdb3d5e6a9cc732a90c58845fc8c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210704.045328-173-runner.jar
+    md5: 227a95591726ac2e8f204d8697a7ef0f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index e647538986d..432b0969166 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210702.030617-172-runner.jar
-    md5: 4a9263b414272e9370f8242ec4515a3f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210704.045603-173-runner.jar
+    md5: fd59dc19722fd3c6bb1150825335c4f5
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 32e6d0afb0a..4ba901012c4 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210702.031022-17-runner.jar
-    md5: 4c3b5b096852b27ee4a131fc6549b272
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210704.045848-18-runner.jar
+    md5: 07e9afa3a13d98e891bce83dbb3f94ea
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 95d53baf972..0be43d657fc 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210702.034635-174-runner.jar
-    md5: 62d049df1592c8412b5306ddbe0301b4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210704.052204-176-runner.jar
+    md5: 8309304393ff65e333cd6a5b61c35929
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210702.034438-171-runner.jar
-    md5: 503657f0e22f4acbffec665a25e065e8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210704.052048-173-runner.jar
+    md5: 7350a58b0d4474ccc30503548157963d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 95391a47d78..2c8922dab60 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210702.035630-115-runner.jar
-    md5: 0401b679c56238a6232790a8371d6cc7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210704.052942-117-runner.jar
+    md5: c838baedc0985e2d0ea067ba7e03bd3a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 54c06997cf1..9c6ef8c005f 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210702.024445-47-runner.jar
-    md5: c3063cf0b65e5a1b6b90ecb2fedc2242
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210704.044243-48-runner.jar
+    md5: 3146e1ae2a7f739355f0f212711f1100
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 34cc6e8625f..fb0fd8459a0 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210702.024820-47-runner.jar
-    md5: 2ae1bcac23c29f054a3f8845218aceee
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210704.044452-48-runner.jar
+    md5: caba10e0290bbdefcdfc4f7630467106
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 7c46fd05493..b9570e021c0 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210702.025534-29-runner.jar
-    md5: e0ef09c2bb9b75c26edd9c0b962a4432
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210704.044920-30-runner.jar
+    md5: 4338acd8407792bb3154619b52ddca3a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index eacd06c10a9..4dfaa201353 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210702.025201-47-runner.jar
-    md5: 5174c184380b3db53489784fc5aff47e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210704.044705-48-runner.jar
+    md5: fcba74420751c4f88acaf6e067f3f283
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index ec6ecf3af1f..5b64945157c 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210702.032843-171-runner.jar
-    md5: 084486895a469f7614a3dd0ee2f18681
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210704.050757-173-runner.jar
+    md5: 8295574d1837f9801eef4faa6c45d403
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 4e052175ccd..dd155a7f25d 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210702.033214-171-runner.jar
-    md5: 1b526ceb659c339a69b53d548184a99d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210704.051011-173-runner.jar
+    md5: 13ab8cad6b4222209f0da48802f65000
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 8dff2bbfe81..1fc2838a9ef 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210702.035155-86-runner.jar
-    md5: 5ea505e53c96d8d155fcb09c37816cc3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210704.052546-87-runner.jar
+    md5: aa5f499896954e26c382d12b4aaa7ece
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 2c20024de34..638ced43caa 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210702.035324-86-runner.jar
-    md5: 000de25250c4bd9bcd187459ba9fc71f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210704.052659-88-runner.jar
+    md5: 66abf49a4ad9a6cb4a72b8f93cbe2eba
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 8e66ef88053..27b07c2bf28 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210702.033124-171-runner.jar
-    md5: 7afded050b44c9d18d9ae1a501c344d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210704.050932-173-runner.jar
+    md5: 752f1d8ae9615811005a63720c857dff
 
 execute:
   - script: configure

From a0136721fceac4d4778bf8a47cb20dd110ac8226 Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vajain@redhat.com>
Date: Fri, 9 Jul 2021 21:15:25 +0530
Subject: [PATCH 312/709] =?UTF-8?q?[KOGITO-5472]=20-=20Debug=20enabled=20s?=
 =?UTF-8?q?cenarios=20are=20failing=20in=20kogito=20builder=E2=80=A6=20(#5?=
 =?UTF-8?q?65)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-5472] - Debug enabled scenarios are failing in kogito builder image

* Fix typo

* Update tests/features/kogito-common-builder-jvm.feature

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 tests/features/kogito-common-builder-jvm.feature | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index b6da85951f6..67b17a8f11f 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -149,7 +149,7 @@ Feature: kogito-builder image JVM build tests
         | content_type         | application/json                                                              |
         | expected_status_code | 201                                                                           |
       And file /home/kogito/bin/process-springboot-example.jar should exist
-      And container log should contain main] .c.l.ClasspathLoggingApplicationListener
+      And container log should contain Started DemoApplication
       And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
@@ -167,7 +167,7 @@ Feature: kogito-builder image JVM build tests
       | content_type         | application/json                                                              |
       | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
+    And container log should contain Started DemoApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
@@ -204,7 +204,7 @@ Feature: kogito-builder image JVM build tests
       | content_type         | application/json                                                              |
       | expected_status_code | 201                                                                           |
     And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain main] .c.l.ClasspathLoggingApplicationListener
+    And container log should contain Started DemoApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Perform a incremental s2i build using springboot runtime type

From 199e70ef65b10630c63d31d9de66e6b90e772683 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Sat, 10 Jul 2021 14:51:45 -0300
Subject: [PATCH 313/709] Updated Maven artifacts (#572)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 27fc8454136..c6137f4714f 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210704.045328-173-runner.jar
-    md5: 227a95591726ac2e8f204d8697a7ef0f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210710.051008-177-runner.jar
+    md5: fa9986c2f930d582542d56bcd7df57d1
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 432b0969166..3beb2f6964b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210704.045603-173-runner.jar
-    md5: fd59dc19722fd3c6bb1150825335c4f5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210710.051417-177-runner.jar
+    md5: b6ca0cc8e4cf8c12642ae8f249bfc667
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 4ba901012c4..eae199120cf 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210704.045848-18-runner.jar
-    md5: 07e9afa3a13d98e891bce83dbb3f94ea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210710.051825-22-runner.jar
+    md5: 04c05d02031b9ba5114bf62af847752b
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 0be43d657fc..1fd6fbe6da8 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210704.052204-176-runner.jar
-    md5: 8309304393ff65e333cd6a5b61c35929
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210710.055518-180-runner.jar
+    md5: 63106fdc6f1487ab9119111944e2e5a1
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210704.052048-173-runner.jar
-    md5: 7350a58b0d4474ccc30503548157963d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210710.055312-177-runner.jar
+    md5: 8b92806a68a33708359192e81732bed4
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 2c8922dab60..f6a4dbf6bf1 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210704.052942-117-runner.jar
-    md5: c838baedc0985e2d0ea067ba7e03bd3a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210710.060621-121-runner.jar
+    md5: 0b4f2337ca874bf9fe1d07aadbbb5279
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 9c6ef8c005f..a799dc706c9 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210704.044243-48-runner.jar
-    md5: 3146e1ae2a7f739355f0f212711f1100
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210710.045212-52-runner.jar
+    md5: 16fc6a4a55b306ffa06bbaa274c169bb
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index fb0fd8459a0..73963a33548 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210704.044452-48-runner.jar
-    md5: caba10e0290bbdefcdfc4f7630467106
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210710.045602-52-runner.jar
+    md5: 845adf62598888b4bd4a33802f83a33f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index b9570e021c0..0b801014432 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210704.044920-30-runner.jar
-    md5: 4338acd8407792bb3154619b52ddca3a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210710.050331-34-runner.jar
+    md5: 0d60e2813c06d036d452e8db0e1bbd96
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 4dfaa201353..647d5d58631 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210704.044705-48-runner.jar
-    md5: fcba74420751c4f88acaf6e067f3f283
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210710.045956-52-runner.jar
+    md5: 4843eff2f03e6a4da4a40cfd2ebaafd3
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 5b64945157c..3a0e1892237 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210704.050757-173-runner.jar
-    md5: 8295574d1837f9801eef4faa6c45d403
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210710.053630-177-runner.jar
+    md5: 320b8afad0cc6e7f1bcfad0115a21e2a
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index dd155a7f25d..4031b9b5ce7 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210704.051011-173-runner.jar
-    md5: 13ab8cad6b4222209f0da48802f65000
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210710.054016-177-runner.jar
+    md5: bb334415824f4ee92e8b85f489ec8a41
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 1fc2838a9ef..3eb3efedc4c 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210704.052546-87-runner.jar
-    md5: aa5f499896954e26c382d12b4aaa7ece
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210710.060108-91-runner.jar
+    md5: c99e11df2d73e493bccfb116b3bfb6d9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 638ced43caa..f8d4d0c5b2f 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210704.052659-88-runner.jar
-    md5: 66abf49a4ad9a6cb4a72b8f93cbe2eba
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210710.060252-92-runner.jar
+    md5: 4bfd28572c4f4fcbe5ecb4a41dcce4cf
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 27b07c2bf28..a884e5d3d07 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210704.050932-173-runner.jar
-    md5: 752f1d8ae9615811005a63720c857dff
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210710.053919-177-runner.jar
+    md5: 0ecde749dbd65bf3efbe50b76ed7690e
 
 execute:
   - script: configure

From 6d1d1eae3c892de8b77828bf9348461551a04f45 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 12 Jul 2021 00:37:44 -0300
Subject: [PATCH 314/709] Updated Maven artifacts (#574)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index c6137f4714f..9339ae919ab 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210710.051008-177-runner.jar
-    md5: fa9986c2f930d582542d56bcd7df57d1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210711.043838-178-runner.jar
+    md5: 14067a57a7dbde4ee81ab99330925e03
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 3beb2f6964b..71f09a59f72 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210710.051417-177-runner.jar
-    md5: b6ca0cc8e4cf8c12642ae8f249bfc667
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210711.044227-178-runner.jar
+    md5: 61b2459a336b1c9cc1940ce539c207d8
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index eae199120cf..1bdeb51d4d5 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210710.051825-22-runner.jar
-    md5: 04c05d02031b9ba5114bf62af847752b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210711.044615-23-runner.jar
+    md5: d66fe688fafd0c2afee65886d300bc35
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 1fd6fbe6da8..78d20394c44 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210710.055518-180-runner.jar
-    md5: 63106fdc6f1487ab9119111944e2e5a1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210711.051918-181-runner.jar
+    md5: d4be9082fc9bb708af4b8b4242b3c9ae
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210710.055312-177-runner.jar
-    md5: 8b92806a68a33708359192e81732bed4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210711.051726-178-runner.jar
+    md5: 67fe089cdbc3f07c7263ddeae553891f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index f6a4dbf6bf1..2f0085929ef 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210710.060621-121-runner.jar
-    md5: 0b4f2337ca874bf9fe1d07aadbbb5279
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210711.052853-122-runner.jar
+    md5: bc612a694581f18fb5266e2681c44f16
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index a799dc706c9..bec768aa0d2 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210710.045212-52-runner.jar
-    md5: 16fc6a4a55b306ffa06bbaa274c169bb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210711.042238-53-runner.jar
+    md5: 48590b56a50963983ffeb2bea5b08904
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 73963a33548..ef9c14210e9 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210710.045602-52-runner.jar
-    md5: 845adf62598888b4bd4a33802f83a33f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210711.042606-53-runner.jar
+    md5: dff5b0a0111799b82cc419e7a7293b79
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 0b801014432..976332fd7cf 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210710.050331-34-runner.jar
-    md5: 0d60e2813c06d036d452e8db0e1bbd96
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210711.043240-35-runner.jar
+    md5: 2c9015140135e3d663c1958e2a93e15a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 647d5d58631..5e57dc670a8 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210710.045956-52-runner.jar
-    md5: 4843eff2f03e6a4da4a40cfd2ebaafd3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210711.042932-53-runner.jar
+    md5: e86152d8edbee7d25799b2c66df12d64
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 3a0e1892237..12ff680db72 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210710.053630-177-runner.jar
-    md5: 320b8afad0cc6e7f1bcfad0115a21e2a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210711.050146-178-runner.jar
+    md5: 0237e46225d0346147fd30fe28628987
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 4031b9b5ce7..494b777a8d5 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210710.054016-177-runner.jar
-    md5: bb334415824f4ee92e8b85f489ec8a41
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210711.050501-178-runner.jar
+    md5: 234889fa58cf45781a30e6fb54868672
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 3eb3efedc4c..f2e6f28892b 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210710.060108-91-runner.jar
-    md5: c99e11df2d73e493bccfb116b3bfb6d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210711.052422-92-runner.jar
+    md5: 06ef7d601700c63c98b86498faf46680
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index f8d4d0c5b2f..807883a8b6f 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210710.060252-92-runner.jar
-    md5: 4bfd28572c4f4fcbe5ecb4a41dcce4cf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210711.052548-93-runner.jar
+    md5: d7af329de36197b89ad37d9805c2ceea
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index a884e5d3d07..9ab1e3946f0 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210710.053919-177-runner.jar
-    md5: 0ecde749dbd65bf3efbe50b76ed7690e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210711.050410-178-runner.jar
+    md5: 6947da46de8e5071ab06c6dd2f48c23e
 
 execute:
   - script: configure

From 852a25b722bff012803054b84a40f7bb8b347008 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 12 Jul 2021 11:10:12 -0300
Subject: [PATCH 315/709] Updated Maven artifacts (#578)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 9339ae919ab..6d27ebf7169 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210711.043838-178-runner.jar
-    md5: 14067a57a7dbde4ee81ab99330925e03
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210712.053237-179-runner.jar
+    md5: 5661d162f82dd7caccc119fff7c51a7f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 71f09a59f72..fe6767d6538 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210711.044227-178-runner.jar
-    md5: 61b2459a336b1c9cc1940ce539c207d8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210712.053616-179-runner.jar
+    md5: 80858f202d0046823c07078784633cd0
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 1bdeb51d4d5..b55a8ab8fba 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210711.044615-23-runner.jar
-    md5: d66fe688fafd0c2afee65886d300bc35
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210712.054015-24-runner.jar
+    md5: 489b8fb51bd508934675df9ed88db180
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 78d20394c44..ab429b6577b 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210711.051918-181-runner.jar
-    md5: d4be9082fc9bb708af4b8b4242b3c9ae
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210712.061251-182-runner.jar
+    md5: 6e2783822b057e9efa36618223fb00d9
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210711.051726-178-runner.jar
-    md5: 67fe089cdbc3f07c7263ddeae553891f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210712.061110-179-runner.jar
+    md5: eece135187fa210518eed0e96c0adb5e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 2f0085929ef..2b81afbf8d8 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210711.052853-122-runner.jar
-    md5: bc612a694581f18fb5266e2681c44f16
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210712.062159-123-runner.jar
+    md5: 831b46e28b39626c3d3391500d6eb599
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index bec768aa0d2..97b44f0709c 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210711.042238-53-runner.jar
-    md5: 48590b56a50963983ffeb2bea5b08904
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210712.051758-54-runner.jar
+    md5: 451208738958395a34021f2e0332143a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index ef9c14210e9..55f04168ba7 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210711.042606-53-runner.jar
-    md5: dff5b0a0111799b82cc419e7a7293b79
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210712.052100-54-runner.jar
+    md5: 94a01ba87cf5b745bd557d25581eb634
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 976332fd7cf..4a8e4ae66b1 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210711.043240-35-runner.jar
-    md5: 2c9015140135e3d663c1958e2a93e15a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210712.052705-36-runner.jar
+    md5: a4ec8c7464d6db0c8b17f65c9f14dd70
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 5e57dc670a8..181e9502e60 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210711.042932-53-runner.jar
-    md5: e86152d8edbee7d25799b2c66df12d64
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210712.052408-54-runner.jar
+    md5: 283f96332b67bad1ea96f131449059da
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 12ff680db72..38f36ea0827 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210711.050146-178-runner.jar
-    md5: 0237e46225d0346147fd30fe28628987
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210712.055557-179-runner.jar
+    md5: b47cba955b21d81b622c3ef8aa0f3fb6
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 494b777a8d5..16f86e38e50 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210711.050501-178-runner.jar
-    md5: 234889fa58cf45781a30e6fb54868672
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210712.055909-179-runner.jar
+    md5: c3bbe790aa5d7f63933d8131b430c850
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index f2e6f28892b..6c9acc8aa52 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210711.052422-92-runner.jar
-    md5: 06ef7d601700c63c98b86498faf46680
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210712.061743-93-runner.jar
+    md5: 4b2a21a2233fa8f0bc5421dccc1be80d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 807883a8b6f..9004747c701 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210711.052548-93-runner.jar
-    md5: d7af329de36197b89ad37d9805c2ceea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210712.061906-94-runner.jar
+    md5: 0a1e560f61803f150972f280ed1604f3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 9ab1e3946f0..2abb3eba984 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210711.050410-178-runner.jar
-    md5: 6947da46de8e5071ab06c6dd2f48c23e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210712.055820-179-runner.jar
+    md5: b7b14c4101bcdc3e37f255f5e1e1020a
 
 execute:
   - script: configure

From 49ee2f58d5d0ea299beb90b069bb24c2f2a44c2d Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 13 Jul 2021 09:23:17 +0200
Subject: [PATCH 316/709] KOGITO-5494 PR checks on each managed branch (#577)

---
 .jenkins/dsl/jobs.groovy | 43 +++++++++++++---------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/.jenkins/dsl/jobs.groovy b/.jenkins/dsl/jobs.groovy
index f0f65370cd0..226c017d5ff 100644
--- a/.jenkins/dsl/jobs.groovy
+++ b/.jenkins/dsl/jobs.groovy
@@ -3,23 +3,8 @@ import org.kie.jenkins.jobdsl.KogitoConstants
 import org.kie.jenkins.jobdsl.Utils
 import org.kie.jenkins.jobdsl.KogitoJobType
 
-boolean isMainBranch() {
-    return "${GIT_BRANCH}" == "${GIT_MAIN_BRANCH}"
-}
-
 def getDefaultJobParams() {
-    return [
-        job: [
-            name: 'kogito-images'
-        ],
-        git: [
-            author: "${GIT_AUTHOR_NAME}",
-            branch: "${GIT_BRANCH}",
-            repository: 'kogito-images',
-            credentials: "${GIT_AUTHOR_CREDENTIALS_ID}",
-            token_credentials: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}"
-        ]
-    ]
+    return KogitoJobTemplate.getDefaultJobParams(this, 'kogito-images')
 }
 
 def getJobParams(String jobName, String jobFolder, String jenkinsfileName, String jobDescription = '') {
@@ -37,27 +22,26 @@ def bddRuntimesPrFolder = "${KogitoConstants.KOGITO_DSL_PULLREQUEST_FOLDER}/${Ko
 def nightlyBranchFolder = "${KogitoConstants.KOGITO_DSL_NIGHTLY_FOLDER}/${JOB_BRANCH_FOLDER}"
 def releaseBranchFolder = "${KogitoConstants.KOGITO_DSL_RELEASE_FOLDER}/${JOB_BRANCH_FOLDER}"
 
-if (isMainBranch()) {
-    folder(KogitoConstants.KOGITO_DSL_PULLREQUEST_FOLDER)
-
-    setupPrJob(KogitoConstants.KOGITO_DSL_PULLREQUEST_FOLDER)
+if (Utils.isMainBranch(this)) {
+    // Old PR checks.
+    // To be removed once supported release branches (<= 1.9.x) are no more maintained.
+    setupPrJob('1.5.x')
+    setupPrJob('1.8.x')
+    setupPrJob('1.9.x')
+    // End of old PR checks
 
     // For BDD runtimes PR job
-    folder(bddRuntimesPrFolder)
-
     setupDeployJob(bddRuntimesPrFolder, KogitoJobType.PR)
 }
 
+setupPrJob()
+
 // Branch jobs
-folder(KogitoConstants.KOGITO_DSL_NIGHTLY_FOLDER)
-folder(nightlyBranchFolder)
 setupDeployJob(nightlyBranchFolder, KogitoJobType.NIGHTLY)
 setupPromoteJob(nightlyBranchFolder, KogitoJobType.NIGHTLY)
 
 // No release directly on main branch
-if (!isMainBranch()) {
-    folder(KogitoConstants.KOGITO_DSL_RELEASE_FOLDER)
-    folder(releaseBranchFolder)
+if (!Utils.isMainBranch(this)) {
     setupDeployJob(releaseBranchFolder, KogitoJobType.RELEASE)
     setupPromoteJob(releaseBranchFolder, KogitoJobType.RELEASE)
 }
@@ -66,9 +50,10 @@ if (!isMainBranch()) {
 // Methods
 /////////////////////////////////////////////////////////////////
 
-void setupPrJob(String jobFolder) {
+void setupPrJob(String branch = "${GIT_BRANCH}") {
     def jobParams = getDefaultJobParams()
-    jobParams.job.folder = jobFolder
+    jobParams.job.folder = "${KogitoConstants.KOGITO_DSL_PULLREQUEST_FOLDER}/${branch}"
+    jobParams.pr.run_only_for_branches = [ branch ]
     KogitoJobTemplate.createPRJob(this, jobParams)
 }
 

From 67453f30ffcb2cba1e2d951930e7e48c6c2a7adb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 13 Jul 2021 16:33:54 +0200
Subject: [PATCH 317/709] KOGITO-5480 Reorganized seed jobs & trigger
 automatically (#575)

---
 .jenkins/dsl/Jenkinsfile.seed | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .jenkins/dsl/Jenkinsfile.seed

diff --git a/.jenkins/dsl/Jenkinsfile.seed b/.jenkins/dsl/Jenkinsfile.seed
new file mode 100644
index 00000000000..e383f20e284
--- /dev/null
+++ b/.jenkins/dsl/Jenkinsfile.seed
@@ -0,0 +1,10 @@
+@Library('jenkins-pipeline-shared-libraries')_
+
+seed_generation = null
+node('master') {
+    dir("${SEED_REPO}") {
+        checkout(githubscm.resolveRepository("${SEED_REPO}", "${SEED_AUTHOR}", "${SEED_BRANCH}", false))
+        seed_generation = load "${SEED_SCRIPTS_FILEPATH}"
+    }
+}
+seed_generation.generate()

From 28797a21fa63c5425da881319bedad8d42208e0a Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 14 Jul 2021 08:00:28 -0300
Subject: [PATCH 318/709] Updated Maven artifacts (#588)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 6d27ebf7169..b1d5fc1538f 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210712.053237-179-runner.jar
-    md5: 5661d162f82dd7caccc119fff7c51a7f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210714.052349-183-runner.jar
+    md5: 006403df1a2b07e8117cf642c69acb88
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index fe6767d6538..0a0d9c0d90a 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210712.053616-179-runner.jar
-    md5: 80858f202d0046823c07078784633cd0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210714.052849-184-runner.jar
+    md5: 06eaa2a4466e289497ffe2ceac7bb875
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index b55a8ab8fba..0c3e76126db 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210712.054015-24-runner.jar
-    md5: 489b8fb51bd508934675df9ed88db180
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210714.044902-28-runner.jar
+    md5: 7da9439a3e16d9425a7ddfce5a9c70fa
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index ab429b6577b..c0b6b3c330d 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210712.061251-182-runner.jar
-    md5: 6e2783822b057e9efa36618223fb00d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210714.061504-187-runner.jar
+    md5: 85e651ad59c4c24019fef0c45b80bcfa
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210712.061110-179-runner.jar
-    md5: eece135187fa210518eed0e96c0adb5e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210714.061254-184-runner.jar
+    md5: 99238be4f5b67dd88c21ee7dea9f20f8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 2b81afbf8d8..9803b28d1d7 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210712.062159-123-runner.jar
-    md5: 831b46e28b39626c3d3391500d6eb599
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210714.062610-128-runner.jar
+    md5: ed7c0d5dc189667ee16633e6c2614cd5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 97b44f0709c..9c13508e8ea 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210712.051758-54-runner.jar
-    md5: 451208738958395a34021f2e0332143a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210714.050007-59-runner.jar
+    md5: 52b8e82a30b7e34dd1b15d674e321287
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 55f04168ba7..941e3ec43c1 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210712.052100-54-runner.jar
-    md5: 94a01ba87cf5b745bd557d25581eb634
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210714.050501-59-runner.jar
+    md5: 95ed168f9830004e0ee0246d52fc64a5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 4a8e4ae66b1..a39f25b30af 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210712.052705-36-runner.jar
-    md5: a4ec8c7464d6db0c8b17f65c9f14dd70
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210714.051524-41-runner.jar
+    md5: 645b256d02b3def9ce4b2dcf0c4342d1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 181e9502e60..a31de585138 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210712.052408-54-runner.jar
-    md5: 283f96332b67bad1ea96f131449059da
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210714.051015-59-runner.jar
+    md5: 5672537fa0c8913cebfa54ce59f16dd5
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 38f36ea0827..2a15de67ef3 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210712.055557-179-runner.jar
-    md5: b47cba955b21d81b622c3ef8aa0f3fb6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210714.055545-184-runner.jar
+    md5: 99d1925affe97e63a9e0c809a1955b79
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 16f86e38e50..79bd06ba98b 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210712.055909-179-runner.jar
-    md5: c3bbe790aa5d7f63933d8131b430c850
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210714.055935-184-runner.jar
+    md5: abcda63b8b87b711d4b583476162d3d1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 6c9acc8aa52..94dc784e2c0 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210712.061743-93-runner.jar
-    md5: 4b2a21a2233fa8f0bc5421dccc1be80d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210714.062055-98-runner.jar
+    md5: 95ac8d6966d02ab74fff3e72557fb4ac
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 9004747c701..0cbf8cc1b6c 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210712.061906-94-runner.jar
-    md5: 0a1e560f61803f150972f280ed1604f3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210714.062236-99-runner.jar
+    md5: eae59c64d2004f18e142b10267b8721c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 2abb3eba984..c4c0f816aa4 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210712.055820-179-runner.jar
-    md5: b7b14c4101bcdc3e37f255f5e1e1020a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210714.055838-184-runner.jar
+    md5: 9878c3e0511186ead97aded044ad84fc
 
 execute:
   - script: configure

From b1fa2ab9d6f4b4e3c0a4972a3cebe0d6e9c1f6c4 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 15 Jul 2021 14:13:04 -0300
Subject: [PATCH 319/709] Updated Maven artifacts (#591)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index b1d5fc1538f..46da1085187 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210714.052349-183-runner.jar
-    md5: 006403df1a2b07e8117cf642c69acb88
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210715.050920-184-runner.jar
+    md5: 63b76ab048c50ea110f02e1e27df2883
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 0a0d9c0d90a..21871a1436a 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210714.052849-184-runner.jar
-    md5: 06eaa2a4466e289497ffe2ceac7bb875
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210715.051336-185-runner.jar
+    md5: 331bfeb0171ebe20116c26f02703e5ae
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 0c3e76126db..08d9fd44cab 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210714.044902-28-runner.jar
-    md5: 7da9439a3e16d9425a7ddfce5a9c70fa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210715.051749-29-runner.jar
+    md5: cb6b5ce2621edb4e4e8573654b3f2939
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index c0b6b3c330d..7959df87a42 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210714.061504-187-runner.jar
-    md5: 85e651ad59c4c24019fef0c45b80bcfa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210715.060233-188-runner.jar
+    md5: 7480e33e042c7860ef3b1019253d9bda
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210714.061254-184-runner.jar
-    md5: 99238be4f5b67dd88c21ee7dea9f20f8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210715.060037-185-runner.jar
+    md5: 8aff5fd55ccb048bd16823b39e7bfaa0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 9803b28d1d7..080dc48fada 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210714.062610-128-runner.jar
-    md5: ed7c0d5dc189667ee16633e6c2614cd5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210715.061313-129-runner.jar
+    md5: e2ccd031077f3069228a87e753579362
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 9c13508e8ea..fceb3aaddd5 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210714.050007-59-runner.jar
-    md5: 52b8e82a30b7e34dd1b15d674e321287
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210715.045128-60-runner.jar
+    md5: edf955e8eff36e892dd0a270692f6eca
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 941e3ec43c1..c785ea60342 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210714.050501-59-runner.jar
-    md5: 95ed168f9830004e0ee0246d52fc64a5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210715.045510-60-runner.jar
+    md5: c142f55f10e93c309de84ae9a1e64c30
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index a39f25b30af..f338991dbc9 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210714.051524-41-runner.jar
-    md5: 645b256d02b3def9ce4b2dcf0c4342d1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210715.050226-42-runner.jar
+    md5: 35e94d1a9fbdec14b88c53da63aa5921
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index a31de585138..36511849dee 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210714.051015-59-runner.jar
-    md5: 5672537fa0c8913cebfa54ce59f16dd5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210715.045843-60-runner.jar
+    md5: f4f71de5dbfcafa727c5a759c08aa5ed
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 2a15de67ef3..785feeaf555 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210714.055545-184-runner.jar
-    md5: 99d1925affe97e63a9e0c809a1955b79
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210715.053629-185-runner.jar
+    md5: 94756e617e86af392ec334c5bde7c2be
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 79bd06ba98b..7ee20897d4f 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210714.055935-184-runner.jar
-    md5: abcda63b8b87b711d4b583476162d3d1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210715.054003-185-runner.jar
+    md5: 319f10b50d3ec7504d0232c4b2b35b08
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 94dc784e2c0..980d3fd6cfd 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210714.062055-98-runner.jar
-    md5: 95ac8d6966d02ab74fff3e72557fb4ac
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210715.060827-99-runner.jar
+    md5: dda4c469b579688c69c3be54612a4294
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 0cbf8cc1b6c..4df65af369a 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210714.062236-99-runner.jar
-    md5: eae59c64d2004f18e142b10267b8721c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210715.060954-100-runner.jar
+    md5: 96c59f9813a620712924ea365bfc6d1a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index c4c0f816aa4..2f67dd2fa8c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210714.055838-184-runner.jar
-    md5: 9878c3e0511186ead97aded044ad84fc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210715.053912-185-runner.jar
+    md5: ea4a6bed9dba54018d534c8a8a54445a
 
 execute:
   - script: configure

From 30105792ae1de1104169372d137219522a12b224 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 16 Jul 2021 12:32:05 -0300
Subject: [PATCH 320/709] Updated Maven artifacts (#595)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 46da1085187..4b386f43727 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210715.050920-184-runner.jar
-    md5: 63b76ab048c50ea110f02e1e27df2883
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210716.045150-185-runner.jar
+    md5: eed0b2ee8139465d3193155a6530a4f5
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 21871a1436a..7bfe5cd9e8e 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210715.051336-185-runner.jar
-    md5: 331bfeb0171ebe20116c26f02703e5ae
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210716.045553-186-runner.jar
+    md5: 0d48cf7022adafd6370bb45b8af71867
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 08d9fd44cab..2383e95c113 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210715.051749-29-runner.jar
-    md5: cb6b5ce2621edb4e4e8573654b3f2939
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210716.045959-30-runner.jar
+    md5: 16dc50630e31c07f13d38704d48b0521
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 7959df87a42..8ccbcdbe1dc 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210715.060233-188-runner.jar
-    md5: 7480e33e042c7860ef3b1019253d9bda
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210716.054826-189-runner.jar
+    md5: 247bf0f7f52ed7362c04c1c579a0081c
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210715.060037-185-runner.jar
-    md5: 8aff5fd55ccb048bd16823b39e7bfaa0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210716.054635-186-runner.jar
+    md5: 3d57529ab6bde47ccaf25398c57a4bf1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 080dc48fada..aea041598f5 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210715.061313-129-runner.jar
-    md5: e2ccd031077f3069228a87e753579362
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210716.055750-130-runner.jar
+    md5: cd2fbfa8c173bd7190c0948af8aff33d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index fceb3aaddd5..20d4a58e18e 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210715.045128-60-runner.jar
-    md5: edf955e8eff36e892dd0a270692f6eca
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210716.043425-61-runner.jar
+    md5: d6c8c518d44ad760644039539e8c0ac9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index c785ea60342..85bb5f4696d 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210715.045510-60-runner.jar
-    md5: c142f55f10e93c309de84ae9a1e64c30
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210716.043806-61-runner.jar
+    md5: 6722b27decf146cc4863cad3ce299e85
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index f338991dbc9..37536658dda 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210715.050226-42-runner.jar
-    md5: 35e94d1a9fbdec14b88c53da63aa5921
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210716.044524-43-runner.jar
+    md5: 17cb3fef5fb207a390039ffe3edf7b28
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 36511849dee..2c40795a9ed 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210715.045843-60-runner.jar
-    md5: f4f71de5dbfcafa727c5a759c08aa5ed
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210716.044154-61-runner.jar
+    md5: ea9f9ab7d1969251888a7f847361b0fd
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 980d3fd6cfd..8492d287f62 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210715.060827-99-runner.jar
-    md5: dda4c469b579688c69c3be54612a4294
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210716.055333-100-runner.jar
+    md5: aaa61dc7bad522ae7f0f900702775e6a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 4df65af369a..50a02351bb3 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210715.060954-100-runner.jar
-    md5: 96c59f9813a620712924ea365bfc6d1a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210716.055457-101-runner.jar
+    md5: 2c60acd4cf1c26dd8a39fa702e768e49
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 2f67dd2fa8c..bdf5af58842 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210715.053912-185-runner.jar
-    md5: ea4a6bed9dba54018d534c8a8a54445a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210716.052626-186-runner.jar
+    md5: b2e9e259b0fdc2ade5844e2c3f1582af
 
 execute:
   - script: configure

From 99d26b0cde4265af9e9e98b6430dd12da7cb19ec Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 16 Jul 2021 19:03:43 +0200
Subject: [PATCH 321/709] KOGITO-5532 Corrected PR check author handling (#597)

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d75381c1401..ae58edfb7be 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 @Library('jenkins-pipeline-shared-libraries')_
 
-def changeAuthor = env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR
+def changeAuthor = env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepoGitUrl) : (env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR)
 def changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
 def changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 

From ae0bcca5f529eb3c4e3902f6927ad0ab2594c14e Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 20 Jul 2021 15:40:58 -0300
Subject: [PATCH 322/709] Updated Maven artifacts (#605)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 4b386f43727..27801793f7c 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210716.045150-185-runner.jar
-    md5: eed0b2ee8139465d3193155a6530a4f5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210720.053126-187-runner.jar
+    md5: 8c64d6edcfe4bb97046302483153fc0d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 7bfe5cd9e8e..bbba4c57a30 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210716.045553-186-runner.jar
-    md5: 0d48cf7022adafd6370bb45b8af71867
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210720.053452-188-runner.jar
+    md5: 52f690ae8d33b826cd5eed4b7474825d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 2383e95c113..d8e280dd687 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210716.045959-30-runner.jar
-    md5: 16dc50630e31c07f13d38704d48b0521
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210720.053821-32-runner.jar
+    md5: 4eaa92e03777d02645585c4cdc935400
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 8ccbcdbe1dc..38e43c80773 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210716.054826-189-runner.jar
-    md5: 247bf0f7f52ed7362c04c1c579a0081c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210720.061438-192-runner.jar
+    md5: 78dc725967615964345633ebfd7c7024
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210716.054635-186-runner.jar
-    md5: 3d57529ab6bde47ccaf25398c57a4bf1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210720.061256-189-runner.jar
+    md5: 6d7dd9896aef4cf38c71b0ca3277baf3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index aea041598f5..f0cad840128 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210716.055750-130-runner.jar
-    md5: cd2fbfa8c173bd7190c0948af8aff33d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210720.062406-133-runner.jar
+    md5: fdf77a7f69f0d73ba12308227f272b4a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 20d4a58e18e..1a9015765d8 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210716.043425-61-runner.jar
-    md5: d6c8c518d44ad760644039539e8c0ac9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210720.051733-64-runner.jar
+    md5: f352f1e2d146d23c6c1df996eecf9e37
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 85bb5f4696d..d8fd383e85e 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210716.043806-61-runner.jar
-    md5: 6722b27decf146cc4863cad3ce299e85
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210720.052029-64-runner.jar
+    md5: 7e877a391839899f7bc05ce97c1c2e6f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 37536658dda..c2dcbc62b51 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210716.044524-43-runner.jar
-    md5: 17cb3fef5fb207a390039ffe3edf7b28
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210720.052609-46-runner.jar
+    md5: 8edf72eef211d0adc05efd93463348aa
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 2c40795a9ed..85f0afee9cc 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210716.044154-61-runner.jar
-    md5: ea9f9ab7d1969251888a7f847361b0fd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210720.052326-64-runner.jar
+    md5: 201d7252858be5d19e8de92f4ebef32f
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 785feeaf555..7c050b966ed 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210715.053629-185-runner.jar
-    md5: 94756e617e86af392ec334c5bde7c2be
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210720.055136-188-runner.jar
+    md5: 638ef54b4e18de43c43ee867d5a8c12b
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 7ee20897d4f..770de6ff51c 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210715.054003-185-runner.jar
-    md5: 319f10b50d3ec7504d0232c4b2b35b08
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210720.055429-188-runner.jar
+    md5: 72ba6aecfafb62779d0ebc40b627cedc
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 8492d287f62..4479f04b3e1 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210716.055333-100-runner.jar
-    md5: aaa61dc7bad522ae7f0f900702775e6a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210720.061925-103-runner.jar
+    md5: 12b7aacd1fcf417b1e3571ff1cfdd05e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 50a02351bb3..44b4d7c44b7 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210716.055457-101-runner.jar
-    md5: 2c60acd4cf1c26dd8a39fa702e768e49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210720.062044-104-runner.jar
+    md5: 242edffe4137cc6573c5e0debb81baf2
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index bdf5af58842..7b8499108a2 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210716.052626-186-runner.jar
-    md5: b2e9e259b0fdc2ade5844e2c3f1582af
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210720.055347-189-runner.jar
+    md5: 53e63eac9e3bf83d25e1ec18d46da040
 
 execute:
   - script: configure

From dbcdbb875f975642dd77ce0dfdc799331e3b492a Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 21 Jul 2021 16:06:06 +0200
Subject: [PATCH 323/709] Corrected RHPAM feature test with springboot (#603)

---
 tests/features/rhpam-kogito-builder-jvm.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 225acb656a7..a4c58efbe3b 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -72,7 +72,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
-    And s2i build log should contain Generating quarkus project structure using the kogito-springboot-dm-archetype archetype...
+    And s2i build log should contain Generating springboot project structure using the kogito-springboot-dm-archetype archetype...
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |

From c3f2ac066a53c181710163fc548271adf6168e6d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 21 Jul 2021 11:08:54 -0300
Subject: [PATCH 324/709] Updated Maven artifacts (#609)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 27801793f7c..680e199cc36 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210720.053126-187-runner.jar
-    md5: 8c64d6edcfe4bb97046302483153fc0d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210721.050509-188-runner.jar
+    md5: d50cb485989ace8eb06a2a77f42cbe6d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index bbba4c57a30..62d26b17c9b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210720.053452-188-runner.jar
-    md5: 52f690ae8d33b826cd5eed4b7474825d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210721.050801-189-runner.jar
+    md5: 44a59e8a525cc893770787623146d1d0
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index d8e280dd687..602f68393a9 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210720.053821-32-runner.jar
-    md5: 4eaa92e03777d02645585c4cdc935400
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210721.051052-33-runner.jar
+    md5: 47d535c207e00b14eca71ab3fe27115c
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 38e43c80773..e300138d789 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210720.061438-192-runner.jar
-    md5: 78dc725967615964345633ebfd7c7024
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210721.054937-193-runner.jar
+    md5: 2001bc7671455130c1ae2d535e4e52e8
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210720.061256-189-runner.jar
-    md5: 6d7dd9896aef4cf38c71b0ca3277baf3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210721.054813-190-runner.jar
+    md5: 71a4a7dc67827e448212a2c17dcc09aa
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index f0cad840128..c9a66984f5d 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210720.062406-133-runner.jar
-    md5: fdf77a7f69f0d73ba12308227f272b4a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210721.055731-134-runner.jar
+    md5: 164ff124db6fde143fa54bc070159015
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 1a9015765d8..53ecea4bfd4 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210720.051733-64-runner.jar
-    md5: f352f1e2d146d23c6c1df996eecf9e37
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210721.045253-65-runner.jar
+    md5: 96cfc322fb9236c7ce34e6d1b3c5a5da
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index d8fd383e85e..527e4ef0b2b 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210720.052029-64-runner.jar
-    md5: 7e877a391839899f7bc05ce97c1c2e6f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210721.045529-65-runner.jar
+    md5: 7dca9b5c57a97c9f2d88aa7b587f263a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index c2dcbc62b51..e5c1134cd5f 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210720.052609-46-runner.jar
-    md5: 8edf72eef211d0adc05efd93463348aa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210721.050038-47-runner.jar
+    md5: 7e4c441ba283843a8d4faf135c4de661
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 85f0afee9cc..21241fbf1d2 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210720.052326-64-runner.jar
-    md5: 201d7252858be5d19e8de92f4ebef32f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210721.045809-65-runner.jar
+    md5: 4c84f9fcea83657a08495c05c139df36
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 7c050b966ed..0fc80e2ec09 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210720.055136-188-runner.jar
-    md5: 638ef54b4e18de43c43ee867d5a8c12b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210721.052107-189-runner.jar
+    md5: 62f4643688069d6ec6ac4f07f37e5c9d
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 770de6ff51c..4275a285516 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210720.055429-188-runner.jar
-    md5: 72ba6aecfafb62779d0ebc40b627cedc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210721.052324-189-runner.jar
+    md5: 560ab64f64c056a40d1f5e22e54d97d0
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 4479f04b3e1..951a27ff2de 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210720.061925-103-runner.jar
-    md5: 12b7aacd1fcf417b1e3571ff1cfdd05e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210721.055339-104-runner.jar
+    md5: d171a4f62ef42314105e5fda343a1cc3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 44b4d7c44b7..51b670136a4 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210720.062044-104-runner.jar
-    md5: 242edffe4137cc6573c5e0debb81baf2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210721.055448-105-runner.jar
+    md5: 59187919f7ca916922b9db0f812c5716
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 7b8499108a2..240db6eeaeb 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210720.055347-189-runner.jar
-    md5: 53e63eac9e3bf83d25e1ec18d46da040
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210721.052249-190-runner.jar
+    md5: 4f6ec67ca09d9a7d65b80ec45afc21a5
 
 execute:
   - script: configure

From e75c380575fb7f9ca020ede19656cf9a178ce564 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 22 Jul 2021 12:32:44 -0300
Subject: [PATCH 325/709] Updated Maven artifacts (#611)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 680e199cc36..9f8a573f8ec 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210721.050509-188-runner.jar
-    md5: d50cb485989ace8eb06a2a77f42cbe6d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210722.050346-189-runner.jar
+    md5: 547e763fb2ff3942699d69e5df89de83
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 62d26b17c9b..1e1833223a1 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210721.050801-189-runner.jar
-    md5: 44a59e8a525cc893770787623146d1d0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210722.050749-190-runner.jar
+    md5: ff8c9cfa476fce7e7c1cec9f83524325
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 602f68393a9..d6e7015d30d 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210721.051052-33-runner.jar
-    md5: 47d535c207e00b14eca71ab3fe27115c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210722.051150-34-runner.jar
+    md5: 5ef8ccd1d03ac115af0c831a92e9c821
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index e300138d789..2ef57db08a5 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210721.054937-193-runner.jar
-    md5: 2001bc7671455130c1ae2d535e4e52e8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210722.060126-194-runner.jar
+    md5: cd5fbf048af9d9dcefe3ea9546f904b0
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210721.054813-190-runner.jar
-    md5: 71a4a7dc67827e448212a2c17dcc09aa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210722.055927-191-runner.jar
+    md5: 42085d0a0dc8da57f6afb036391517cc
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index c9a66984f5d..b6db5adbe57 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210721.055731-134-runner.jar
-    md5: 164ff124db6fde143fa54bc070159015
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210722.061212-135-runner.jar
+    md5: bda094bb633821a4ad6d592e27c2a770
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 53ecea4bfd4..540a14ec289 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210721.045253-65-runner.jar
-    md5: 96cfc322fb9236c7ce34e6d1b3c5a5da
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210722.044531-66-runner.jar
+    md5: ef82ec2255940286ad8c09090ff8a01e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 527e4ef0b2b..57f93d698aa 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210721.045529-65-runner.jar
-    md5: 7dca9b5c57a97c9f2d88aa7b587f263a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210722.044958-66-runner.jar
+    md5: 626b7ebf1902219be64269a2f9229c5f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index e5c1134cd5f..83d10cdbf7d 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210721.050038-47-runner.jar
-    md5: 7e4c441ba283843a8d4faf135c4de661
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210722.045718-48-runner.jar
+    md5: bdf34daca2cbbdbad73748844cb5a7e3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 21241fbf1d2..2349091b0b5 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210721.045809-65-runner.jar
-    md5: 4c84f9fcea83657a08495c05c139df36
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210722.045347-66-runner.jar
+    md5: ec2b890a32eca481dc04b6e23c0174d7
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 0fc80e2ec09..34d4c4b18db 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210721.052107-189-runner.jar
-    md5: 62f4643688069d6ec6ac4f07f37e5c9d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210722.052859-190-runner.jar
+    md5: dc8ba26af9d8996d398d883e502587e3
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 4275a285516..4fd69194862 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210721.052324-189-runner.jar
-    md5: 560ab64f64c056a40d1f5e22e54d97d0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210722.053226-190-runner.jar
+    md5: cfae33725306b62d2aa68edb002493df
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 951a27ff2de..ca3e4065f9f 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210721.055339-104-runner.jar
-    md5: d171a4f62ef42314105e5fda343a1cc3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210722.060658-105-runner.jar
+    md5: f4fdbc1d3dde0d0b4875ccc9801ddc8d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 51b670136a4..d22eb15ab45 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210721.055448-105-runner.jar
-    md5: 59187919f7ca916922b9db0f812c5716
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210722.060833-106-runner.jar
+    md5: 34f6e2c8e05edd1ef922e0c93605c3d8
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 240db6eeaeb..c9a68ff06f9 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210721.052249-190-runner.jar
-    md5: 4f6ec67ca09d9a7d65b80ec45afc21a5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210722.053137-191-runner.jar
+    md5: 743b051fda1afde99d38e62f90253b10
 
 execute:
   - script: configure

From 19e675d4a8d3fe7f9cbedcf4ba2cc41946ab9c14 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 23 Jul 2021 04:33:27 -0300
Subject: [PATCH 326/709] [KOGITO-5526] - Native Runtime img missing module
 (#607)

Kogito runtime native image is logging `/home/kogito/launch/configure.sh: line 68: /home/kogito/launch/configure-custom-truststore.sh: No such file or directory`

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-runtime-native/added/kogito-app-launch.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/kogito-runtime-native/added/kogito-app-launch.sh b/modules/kogito-runtime-native/added/kogito-app-launch.sh
index fb2b6a6c8bf..be0dee0fc53 100644
--- a/modules/kogito-runtime-native/added/kogito-app-launch.sh
+++ b/modules/kogito-runtime-native/added/kogito-app-launch.sh
@@ -15,17 +15,12 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
-    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+
 )
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
-if [ -z "${CUSTOM_TRUSTSTORE_ARGS}" ]; then
-    CUSTOM_TRUSTSTORE_ARGS="-Djavax.net.ssl.trustStore=${KOGITO_HOME}/cacerts"
-fi
-
 # shellcheck disable=SC2086
 exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_NATIVE_PROPS} \
     -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
-    -Dquarkus.http.port=8080 \
-    ${CUSTOM_TRUSTSTORE_ARGS} 
+    -Dquarkus.http.port=8080

From 1c5e3a0bd9c7c91bc738995b8a7f2cfa2bf6bbfb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 23 Jul 2021 15:19:51 +0200
Subject: [PATCH 327/709] KOGITO-5326 Setup deploy/promote notifications on
 demand (#602)

---
 .jenkins/dsl/jobs.groovy |  4 ++++
 Jenkinsfile.deploy       | 25 +++++++++++++++++++++----
 Jenkinsfile.promote      | 34 +++++++++++++++++++++++++---------
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/.jenkins/dsl/jobs.groovy b/.jenkins/dsl/jobs.groovy
index 226c017d5ff..fbd1c010a99 100644
--- a/.jenkins/dsl/jobs.groovy
+++ b/.jenkins/dsl/jobs.groovy
@@ -92,6 +92,8 @@ void setupDeployJob(String jobFolder, KogitoJobType jobType) {
             stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
 
             booleanParam('CREATE_PR', false, 'In case of not releasing, you can ask to create a PR with the changes')
+
+            booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
         }
 
         environmentVariables {
@@ -156,6 +158,8 @@ void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
             stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
             stringParam('GIT_TAG', '', 'Git tag to set, if different from PROJECT_VERSION')
             stringParam('RELEASE_NOTES', '', 'Release notes to be added. If none provided, a default one will be given.')
+
+            booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
         }
 
         environmentVariables {
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index f1ae4a55fd9..b24c9b93a48 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -292,9 +292,7 @@ pipeline {
                     deployProperties["${getRepoName()}.pr.link"] = prLink
 
                     if (isCreateChangesPR()) {
-                        String bodyMsg = "PR has been created with update Maven artifacts.\nPlease review it here: ${prLink}"
-
-                        emailext body: bodyMsg, subject: "[${getBuildBranch()}][d] Kogito Images pipeline", to: env.KOGITO_CI_EMAIL_TO
+                        sendNotification("PR has been created with update Maven artifacts.\nPlease review it here: ${prLink}")
                     }
                 }
             }
@@ -316,12 +314,31 @@ pipeline {
                 def propertiesStr = deployProperties.collect { entry -> "${entry.key}=${entry.value}" }.join('\n')
                 writeFile( file : env.PROPERTIES_FILE_NAME , text : propertiesStr)
                 archiveArtifacts artifacts: env.PROPERTIES_FILE_NAME, allowEmptyArchive:true
-                clean()
             }
         }
+        unsuccessful {
+            sendUnsuccessfulNotification()
+        }
+        cleanup {
+            clean()
+        }
     }
 }
 
+void sendUnsuccessfulNotification() {
+    if (params.SEND_NOTIFICATION) {
+        sendNotification("**Deploy job** #${BUILD_NUMBER} was: ${currentBuild.currentResult}\nPlease look here: ${BUILD_URL}")
+    } else {
+        echo 'No notification sent per configuration'
+    }
+}
+
+void sendNotification(String body) {
+    emailext body: body,
+        subject: "[${getBuildBranch()}] Kogito Images",
+        to: env.KOGITO_CI_EMAIL_TO
+}
+
 void checkoutRepo() {
     deleteDir()
     checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index 98cd11c5ecd..a2bde73296d 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -17,7 +17,7 @@ pipeline {
 
     environment {
         // Static env is defined into .jenkins/dsl/jobs.groovy file
-        
+
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
         OPENSHIFT_API = credentials('OPENSHIFT_API')
@@ -62,7 +62,7 @@ pipeline {
             steps {
                 script {
                     // Update maven information with new artifacts from Maven central in the PR
-                    dir("artifacts-update") {
+                    dir('artifacts-update') {
                         checkoutRepo()
                         githubscm.forkRepo(getBotAuthorCredsID())
 
@@ -81,10 +81,9 @@ pipeline {
                             githubscm.commitChanges('Setup Maven artifacts to released ones')
                             githubscm.pushObject('origin', getPRSourceBranch(), getBotAuthorCredsID())
                         } catch (err) {
-                            emailext body: "Seems like no change is to be committed.\nPlease review in ${env.BUILD_URL}console.\n" +
-                                    "And take your decision here: ${env.BUILD_URL}input",
-                                    subject: "[${getBuildBranch()}] Release Pipeline",
-                                    to: env.KOGITO_CI_EMAIL_TO
+                            String body = "Seems like no change is to be committed.\nPlease review in ${env.BUILD_URL}console.\n" +
+                                    "And take your decision here: ${env.BUILD_URL}input"
+                            sendNotification(body, 'Release Pipeline')
                             input message: 'Should the pipeline continue ?', ok: 'Yes'
                         }
                     }
@@ -192,12 +191,29 @@ pipeline {
         }
     }
     post {
-        always {
+        unsuccessful {
+            sendUnsuccessfulNotification()
+        }
+        cleanup {
             clean()
         }
     }
 }
 
+void sendUnsuccessfulNotification() {
+    if (params.SEND_NOTIFICATION) {
+        sendNotification("**Promote job** #${BUILD_NUMBER} was: ${currentBuild.currentResult}\nPlease look here: ${BUILD_URL}")
+    } else {
+        echo 'No notification sent per configuration'
+    }
+}
+
+void sendNotification(String body, String subjectProject = 'Kogito Images') {
+    emailext body: body,
+        subject: "[${getBuildBranch()}] ${subjectProject}",
+        to: env.KOGITO_CI_EMAIL_TO
+}
+
 void installGitHubReleaseCLI() {
     sh 'go get github.com/github-release/github-release'
 }
@@ -285,12 +301,12 @@ void createRelease() {
     if (isReleaseExist()) {
         deleteRelease()
     }
-    
+
     if (githubscm.isTagExist('origin', getGitTag())) {
         githubscm.removeLocalTag(getGitTag())
         githubscm.removeRemoteTag('origin', getGitTag(), getGitAuthorCredsID())
     }
-    
+
     def releaseName = "Kogito Images Version ${getProjectVersion()}"
     def description = params.RELEASE_NOTES ?: "We are glad to announce that the Kogito ${getProjectVersion()} release is now available!"
     withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {

From 014d50624b33ca6ee74d688e8cb1008f3079dc74 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 23 Jul 2021 23:48:36 +0200
Subject: [PATCH 328/709] Fix set examples ref in behave tests (#587) (#614)

---
 scripts/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/common.py b/scripts/common.py
index 1e929bbe059..b9c05b715cf 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -212,7 +212,7 @@ def update_examples_ref_in_behave_tests(examples_ref):
     """
     print("Set examples_ref {} in behave tests".format(examples_ref))
     # this pattern will look for any occurrences of using master or using x.x.x
-    pattern = re.compile(r'(using nightly-master)|(using nightly-\s*([\d.]+.x))|(using \s*([\d.]+))')
+    pattern = re.compile(r'(using nightly-master)|(using nightly-\s*([\d.]+.x))|(using \s*([\d.]+[.x]?))')
     replacement = 'using {}'.format(examples_ref)
     update_in_behave_tests(pattern, replacement)
 

From 1878c572a5c748d77a9958d8f7f9c3bfce49e8a1 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Sun, 25 Jul 2021 13:36:02 +0200
Subject: [PATCH 329/709] conscious lang: Setup main branch (#516)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michael Biarnés Kiefer <mbiarnes@redhat.com>
---
 .jenkins/dsl/test.sh                          |  2 +-
 Jenkinsfile.deploy                            |  2 +-
 Jenkinsfile.promote                           |  2 +-
 README.md                                     | 32 +++++++++----------
 scripts/common.py                             |  6 ++--
 scripts/manage-kogito-version.py              |  4 +--
 tests/features/kogito-builder-native.feature  | 14 ++++----
 tests/features/kogito-builder.feature         | 12 +++----
 .../kogito-common-builder-jvm.feature         | 28 ++++++++--------
 .../features/rhpam-kogito-builder-jvm.feature |  6 ++--
 tests/test-apps/clone-repo.sh                 |  2 +-
 11 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/.jenkins/dsl/test.sh b/.jenkins/dsl/test.sh
index b696d53ce78..9af49b284b8 100755
--- a/.jenkins/dsl/test.sh
+++ b/.jenkins/dsl/test.sh
@@ -6,7 +6,7 @@ branch=$1
 author=$2
 
 if [ -z $branch ]; then
-  branch='master'
+  branch='main'
 fi
 
 if [ -z $author ]; then
diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index b24c9b93a48..4dd3566b955 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -94,7 +94,7 @@ pipeline {
             steps {
                 script {
                     versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
-                    if (getBuildBranch() != 'master') {
+                    if (getBuildBranch() != 'main') {
                         versionCmd += " --examples-ref ${!isRelease() ? 'nightly-' : ''}${getBuildBranch()}"
                     }
                     if (getKogitoArtifactsVersion()) {
diff --git a/Jenkinsfile.promote b/Jenkinsfile.promote
index a2bde73296d..071eef60aaa 100644
--- a/Jenkinsfile.promote
+++ b/Jenkinsfile.promote
@@ -169,7 +169,7 @@ pipeline {
 
                         // Update version to next snapshot
                         versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${nextVersion} --artifacts-version ${getKogitoArtifactsNextVersion()} --confirm"
-                        if (getBuildBranch() != 'master') {
+                        if (getBuildBranch() != 'main') {
                             versionCmd += " --examples-ref ${getBuildBranch()}"
                         }
                         sh versionCmd
diff --git a/README.md b/README.md
index 30540c2765a..9dfddd5b643 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Kogito
 [![GitHub Forks](https://img.shields.io/github/forks/kiegroup/kogito-images.svg)](https://github.com/kiegroup/kogito-images/network/members)
 [![Pull Requests](https://img.shields.io/github/issues-pr/kiegroup/kogito-images.svg?style=flat-square)](https://github.com/kiegroup/kogito-images/pulls)
 [![Contributors](https://img.shields.io/github/contributors/kiegroup/kogito-images.svg?style=flat-square)](https://github.com/kiegroup/kogito-images/graphs/contributors)
-[![License](https://img.shields.io/github/license/kiegroup/kogito-images.svg)](https://github.com/kiegroup/kogito-images/blob/master/LICENSE)
+[![License](https://img.shields.io/github/license/kiegroup/kogito-images.svg)](https://github.com/kiegroup/kogito-images/blob/main/LICENSE)
 [![Twitter Follow](https://img.shields.io/twitter/follow/kogito_kie.svg?label=Follow&style=social)](https://twitter.com/kogito_kie?lang=en)
 
 
@@ -155,7 +155,7 @@ repository: the *rules-quarkus-helloworld* example, with native compilation disa
 
 ```bash
 $ s2i build https://github.com/kiegroup/kogito-examples.git \
-    --ref master \
+    --ref main \
     -e RUNTIME_TYPE=quarkus \
     --context-dir rules-quarkus-helloworld \
     quay.io/kiegroup/kogito-builder:latest \
@@ -202,7 +202,7 @@ repository: the *process-springboot-example*.
 
 ```bash
 $ s2i build https://github.com/kiegroup/kogito-examples.git \
-    --ref master \
+    --ref main \
     --context-dir \
     -e RUNTIME_TYPE=springboot \
     process-springboot-example \
@@ -240,7 +240,7 @@ Let's start 2 builds with the incremental option enabled and compare the time sp
 ```bash
 # First incremental build
 $ time s2i build https://github.com/kiegroup/kogito-examples.git \
-    --ref master \
+    --ref main \
     -e RUNTIME_TYPE=quarkus
     --context-dir rules-quarkus-helloworld \
     quay.io/kiegroup/kogito-builder:latest \
@@ -258,7 +258,7 @@ And now, let's run it again.
 ```bash
 # Second incremental build
 $ time s2i build https://github.com/kiegroup/kogito-examples.git \
-    --ref master \
+    --ref main \
     -e RUNTIME_TYPE=quarkus
     --context-dir rules-quarkus-helloworld \
     quay.io/kiegroup/kogito-builder:latest \
@@ -286,7 +286,7 @@ To turn it possible we just need to set the **MAVEN_MIRROR_URL** environment var
 ```bash
 # Third incremental build, with Maven mirror option
 $ time s2i build https://github.com/kiegroup/kogito-examples.git \
-    --ref master \
+    --ref main \
     -e RUNTIME_TYPE=quarkus
     --context-dir rules-quarkus-helloworld \
     quay.io/kiegroup/kogito-builder:latest \
@@ -353,8 +353,8 @@ If you don't have an already existing project, the best way to create a new one
 to generate project structure. 
 The available archetypes are:
 
-- [Kogito Quarkus Archetype](https://github.com/kiegroup/kogito-runtimes/tree/master/archetypes/kogito-quarkus-archetype)
-- [Kogito Spring Boot Archetype](https://github.com/kiegroup/kogito-runtimes/tree/master/archetypes/kogito-springboot-archetype)
+- [Kogito Quarkus Archetype](https://github.com/kiegroup/kogito-runtimes/tree/main/archetypes/kogito-quarkus-archetype)
+- [Kogito Spring Boot Archetype](https://github.com/kiegroup/kogito-runtimes/tree/main/archetypes/kogito-springboot-archetype)
 
 Note that, when building Quarkus based application that is **not** a *UberJAR* we also need to copy the **lib** directory 
 located inside the *target* directory.  
@@ -755,7 +755,7 @@ to your Kogito infrastructure on a Kubernetes cluster and provide its capabiliti
 
 ### Kogito JIT Runner Component Image
 
-The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/kiegroup/kogito-apps/tree/master/jitexecutor).
+The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/kiegroup/kogito-apps/tree/main/jitexecutor).
 
 Basic usage:
 
@@ -781,7 +781,7 @@ Once the images are built and imported into a registry (quay.io or any other reg
 
 As a first step, we need to make the Kogito Images available as Image Streams in OpenShift. If you have `cluster-admin` 
 rights you can deploy it into the **openshift** namespace, otherwise, deploy it into the namespace where you have permissions. 
-To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/kiegroup/kogito-images/master/kogito-imagestream.yaml).
+To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/kiegroup/kogito-images/main/kogito-imagestream.yaml).
 It points to the latest released version.
 
 Let's use the *rules-quarkus-helloworld* from [Kogito Examples](https://github.com/kiegroup/kogito-examples).
@@ -815,7 +815,7 @@ imagestream.image.openshift.io/kogito-management-console created
 
 # performing a new build
 $ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-builder:latest \ 
-    https://github.com/kiegroup/kogito-examples.git#master --context-dir=rules-quarkus-helloworld \
+    https://github.com/kiegroup/kogito-examples.git#main --context-dir=rules-quarkus-helloworld \
     --strategy=source --env NATIVE=false 
 --> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-builder" under tag "latest" for "kogito-builder:latest"
 
@@ -826,7 +826,7 @@ $ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-bui
     Tags: builder, kogito, quarkus
 
     * The source repository appears to match: jee
-    * A source build using source code from https://github.com/kiegroup/kogito-examples.git#master will be created
+    * A source build using source code from https://github.com/kiegroup/kogito-examples.git#main will be created
       * The resulting image will be pushed to image stream tag "rules-quarkus-helloworld-builder:latest"
       * Use 'start-build' to trigger a new build
 
@@ -1268,16 +1268,16 @@ should be added for any issue related to this repository.
 When submitting the Pull Request with the fix for the reported issue, and for a better readability, we use the following pattern:
 
 
-- Pull Requests targeting only master branch:  
+- Pull Requests targeting only main branch:  
 ```text
 [KOGITO-XXXX] - Description of the Issue
 ```
 
-- But if the Pull Request also needs to be part of a different branch/version and is cherry picked from master: 
+- But if the Pull Request also needs to be part of a different branch/version and is cherry picked from main: 
 ```text
 Master PR:
-[master][KOGITO-XXXX] - Description of the Issue
+[main][KOGITO-XXXX] - Description of the Issue
 
-0.9.x PR cherry picker from master:
+0.9.x PR cherry picker from main:
 [0.9.x][KOGITO-XXXX] - Description of the Issue
 ```
diff --git a/scripts/common.py b/scripts/common.py
index b9c05b715cf..9c8aa70e23a 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -212,7 +212,7 @@ def update_examples_ref_in_behave_tests(examples_ref):
     """
     print("Set examples_ref {} in behave tests".format(examples_ref))
     # this pattern will look for any occurrences of using master or using x.x.x
-    pattern = re.compile(r'(using nightly-master)|(using nightly-\s*([\d.]+.x))|(using \s*([\d.]+[.x]?))')
+    pattern = re.compile(r'(using nightly-main)|(using nightly-\s*([\d.]+.x))|(using \s*([\d.]+[.x]?))')
     replacement = 'using {}'.format(examples_ref)
     update_in_behave_tests(pattern, replacement)
 
@@ -301,8 +301,8 @@ def update_examples_ref_in_clone_repo(examples_ref):
     """
     print("Set examples_ref {} in clone-repo script".format(examples_ref))
     pattern = re.compile(r'(git checkout.*)')
-    replacement = "git checkout master"
-    if examples_ref != 'master':
+    replacement = "git checkout main"
+    if examples_ref != 'main':
         replacement = "git checkout -b {0} origin/{1}".format(examples_ref, examples_ref)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 9010d1b2a45..b368a64753e 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -5,7 +5,7 @@
 #   python scripts/manage-kogito-version.py --bump-to 0.99.0
 #
 #   # to set a custom kogito-examples branch for the behave tests different than the defaults (sam than the version
-#   # or master for rc) use --branch-apps parameters, e.g.:
+#   # or main for rc) use --branch-apps parameters, e.g.:
 #   python scripts/manage-kogito-version.py --bump-to 0.99.0 --apps-branch 0.10.x
 #
 # Dependencies:
@@ -40,7 +40,7 @@
             if args.examples_ref is not None:
                 examples_ref = args.examples_ref
             if 'rc' in args.bump_to:
-                examples_ref = 'master'
+                examples_ref = 'main'
             
             artifacts_version = args.bump_to
             if args.artifacts_version:
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index 3961831ea62..c5a73707255 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -15,7 +15,7 @@ Feature: kogito-builder image native build tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.1.0
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -35,7 +35,7 @@ Feature: kogito-builder image native build tests
     And s2i build log should contain -J-Xmx4g
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main
       | variable | value          |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -55,7 +55,7 @@ Feature: kogito-builder image native build tests
     And s2i build log should contain -J-Xmx4g
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -74,7 +74,7 @@ Feature: kogito-builder image native build tests
   #ignore until https://issues.redhat.com/browse/KOGITO-3638 is resolved
   @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable          | value         |
       | RUNTIME_TYPE      | quarkus       |
       | NATIVE            | true          |
@@ -85,7 +85,7 @@ Feature: kogito-builder image native build tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Perform a incremental s2i build for native test
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -103,7 +103,7 @@ Feature: kogito-builder image native build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario:Perform a second incremental s2i build for native scenario, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value      |
       | RUNTIME_TYPE | quarkus    |
       | NATIVE       | true       |
@@ -122,7 +122,7 @@ Feature: kogito-builder image native build tests
       | expected_phrase | ["hello","world"]     |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index d6bc626725c..e8c60a4a72c 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -23,7 +23,7 @@ Feature: kogito-builder image tests
     And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | NATIVE            | false         |
       | RUNTIME_TYPE      | quarkus       |
@@ -33,7 +33,7 @@ Feature: kogito-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
       | RUNTIME_TYPE      | springboot    |
@@ -42,7 +42,7 @@ Feature: kogito-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
@@ -60,7 +60,7 @@ Feature: kogito-builder image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
@@ -81,7 +81,7 @@ Feature: kogito-builder image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
-    Given s2i build /tmp/kogito-examples from serverless-workflow-order-processing/src/main/resources using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value                 |
       | RUNTIME_TYPE        | quarkus               |
       | NATIVE              | false                 |
@@ -106,7 +106,7 @@ Feature: kogito-builder image tests
 #### SpringBoot Scenarios
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |
       | RUNTIME_TYPE   | springboot     |
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index 67b17a8f11f..9321e0653f3 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -8,7 +8,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main
       | variable     | value   |
       | NATIVE       | false   |
       | RUNTIME_TYPE | quarkus |
@@ -26,7 +26,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main
       | variable     | value   |
       | NATIVE       | false   |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value                     |
       | NATIVE       | false                     |
       | RUNTIME_TYPE | quarkus                   |
@@ -62,7 +62,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -78,7 +78,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                            |
       | RUNTIME_TYPE      | quarkus                          |
       | NATIVE            | false                            |
@@ -96,7 +96,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Perform a incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -114,7 +114,7 @@ Feature: kogito-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -135,7 +135,7 @@ Feature: kogito-builder image JVM build tests
 #### SpringBoot Scenarios
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-      Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
         | variable     | value        |
         | RUNTIME_TYPE | springboot   |
         | JAVA_OPTIONS | -Ddebug=true |
@@ -153,7 +153,7 @@ Feature: kogito-builder image JVM build tests
       And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-main
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | RUNTIME_TYPE        | springboot   |
@@ -171,7 +171,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -188,7 +188,7 @@ Feature: kogito-builder image JVM build tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
   
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | RUNTIME_TYPE      | springboot                         |
@@ -208,7 +208,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Perform a incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using nightly-main
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -225,7 +225,7 @@ Feature: kogito-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using nightly-master
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using nightly-main
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -233,7 +233,7 @@ Feature: kogito-builder image JVM build tests
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-master and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                           |
       | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
       | RUNTIME_TYPE      | quarkus                         |
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index a4c58efbe3b..dbdad58f5b0 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -26,7 +26,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
@@ -44,7 +44,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
@@ -67,7 +67,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
 #### SpringBoot Scenarios
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-master and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |
       | RUNTIME_TYPE   | springboot     |
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index cb14d637b3f..a6d91028832 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -38,7 +38,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
 git fetch origin --tags
-git checkout nightly-master
+git checkout nightly-main
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/

From d39a13bbd85d16bd10c277d6582a3b7af74dd3dd Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 3 Aug 2021 16:30:06 +0200
Subject: [PATCH 330/709] RHPAM-3777 Allow to update prod version (#579)

* RHPAM-3777 Allow to update prod version

* added update prod version job

* update prod image version

* Added JIRA number

* Update .jenkins/dsl/jobs.groovy

* correct update of img stream
---
 .jenkins/dsl/jobs.groovy         |  22 ++++++
 Jenkinsfile.update-prod-version  | 108 ++++++++++++++++++++++++++++++
 scripts/common.py                | 111 ++++++++++++++++++++-----------
 scripts/list-images.py           |  17 +++--
 scripts/manage-kogito-version.py |  31 ++++++---
 scripts/push-staging.py          |   4 +-
 6 files changed, 231 insertions(+), 62 deletions(-)
 create mode 100644 Jenkinsfile.update-prod-version

diff --git a/.jenkins/dsl/jobs.groovy b/.jenkins/dsl/jobs.groovy
index fbd1c010a99..83ffc94fff7 100644
--- a/.jenkins/dsl/jobs.groovy
+++ b/.jenkins/dsl/jobs.groovy
@@ -46,6 +46,8 @@ if (!Utils.isMainBranch(this)) {
     setupPromoteJob(releaseBranchFolder, KogitoJobType.RELEASE)
 }
 
+setupProdUpdateVersionJob("${KogitoConstants.KOGITO_DSL_TOOLS_FOLDER}/${JOB_BRANCH_FOLDER}")
+
 /////////////////////////////////////////////////////////////////
 // Methods
 /////////////////////////////////////////////////////////////////
@@ -186,3 +188,23 @@ void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
         }
     }
 }
+
+void setupProdUpdateVersionJob(String jobFolder) {
+    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-update-prod-version', jobFolder, 'Jenkinsfile.update-prod-version', 'Update prod version for Kogito Images')).with {
+        parameters {
+            stringParam('JIRA_NUMBER', '', 'KIECLOUD-XXX or RHPAM-YYYY or else. This will be added to the commit and PR.')
+            stringParam('PROD_PROJECT_VERSION', '', 'Which version to set ?')
+        }
+
+        environmentVariables {
+            env('REPO_NAME', 'kogito-images')
+
+            env('BUILD_BRANCH_NAME', "${GIT_BRANCH}")
+            env('GIT_AUTHOR', "${GIT_AUTHOR_NAME}")
+            env('AUTHOR_CREDS_ID', "${GIT_AUTHOR_CREDENTIALS_ID}")
+            env('GITHUB_TOKEN_CREDS_ID', "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}")
+            env('GIT_AUTHOR_BOT', "${GIT_BOT_AUTHOR_NAME}")
+            env('BOT_CREDENTIALS_ID', "${GIT_BOT_AUTHOR_CREDENTIALS_ID}")
+        }
+    }
+}
diff --git a/Jenkinsfile.update-prod-version b/Jenkinsfile.update-prod-version
new file mode 100644
index 00000000000..326c0932838
--- /dev/null
+++ b/Jenkinsfile.update-prod-version
@@ -0,0 +1,108 @@
+@Library('jenkins-pipeline-shared-libraries')_
+
+pipeline {
+    agent {
+        label 'kie-rhel7 && !master'
+    }
+
+    options {
+        timeout(time: 30, unit: 'MINUTES')
+    }
+
+    // parameters {
+    // For parameters, check into .jenkins/dsl/jobs.groovy file
+    // }
+
+    environment {
+        // Static env is defined into .jenkins/dsl/jobs.groovy file
+
+        BOT_BRANCH_HASH = "${util.generateHash(10)}"
+    }
+
+    stages {
+        stage('Initialization') {
+            steps {
+                script {
+                    assert getProdProjectVersion()
+                    assert getJiraNumber()
+
+                    currentBuild.displayName = getProdProjectVersion()
+
+                    deleteDir()
+                    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
+                }
+            }
+        }
+        stage('Prepare for PR') {
+            steps {
+                script {
+                    githubscm.forkRepo(getBotAuthorCredsID())
+                    githubscm.createBranch(getBotBranch())
+                }
+            }
+        }
+        stage('Update prod version') {
+            when {
+                expression { return getProdProjectVersion() != '' }
+            }
+            steps {
+                script {
+                    sh "python3 scripts/manage-kogito-version.py --bump-to ${getProdProjectVersion()} --confirm --prod"
+                }
+            }
+        }
+        stage('Create PR') {
+            steps {
+                script {
+                    String commitMsg = "[${getJiraNumber()}] Update product version to ${getProdProjectVersion()}"
+                    if (githubscm.isThereAnyChanges()) {
+                        githubscm.commitChanges(commitMsg)
+                    } else {
+                        error 'No update version can be done'
+                    }
+                    githubscm.pushObject('origin', getBotBranch(), getBotAuthorCredsID())
+                    String prLink = githubscm.createPR(commitMsg, 'Please review and merge', getBuildBranch(), getBotAuthorCredsID())
+
+                    echo "Created PR ${prLink}"
+                }
+            }
+        }
+    }
+    post {
+        cleanup {
+            cleanWs()
+        }
+    }
+}
+
+String getRepoName() {
+    return "${REPO_NAME}"
+}
+
+String getBuildBranch() {
+    return "${BUILD_BRANCH_NAME}"
+}
+
+String getGitAuthor() {
+    return "${GIT_AUTHOR}"
+}
+
+String getBotBranch() {
+    return "${getProdProjectVersion() ?: getBuildBranch()}-${env.BOT_BRANCH_HASH}"
+}
+
+String getBotAuthor() {
+    return "${GIT_AUTHOR_BOT}"
+}
+
+String getBotAuthorCredsID() {
+    return "${BOT_CREDENTIALS_ID}"
+}
+
+String getProdProjectVersion() {
+    return "${PROD_PROJECT_VERSION}"
+}
+
+String getJiraNumber() {
+    return "${JIRA_NUMBER}"
+}
\ No newline at end of file
diff --git a/scripts/common.py b/scripts/common.py
index 9c8aa70e23a..48f63aa48bf 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -7,27 +7,15 @@
 
 from ruamel.yaml import YAML
 
-# All kogito-image modules that have the kogito version.
-MODULES = {"kogito-data-index-common", "kogito-data-index-mongodb",
-           "kogito-data-index-infinispan", "kogito-data-index-postgresql",
-           "kogito-trusty-common", "kogito-trusty-infinispan",
-           "kogito-trusty-redis", "kogito-explainability",
-           "kogito-image-dependencies", "kogito-jobs-service-common",
-           "kogito-jobs-service-ephemeral", "kogito-jobs-service-infinispan",
-           "kogito-jobs-service-mongodb", "kogito-jobs-service-postgresql",
-           "kogito-trusty-ui", "kogito-jq",
-           "kogito-kubernetes-client", "kogito-launch-scripts",
-           "kogito-logging", "kogito-management-console",
-           "kogito-task-console", "kogito-persistence",
-           "kogito-runtime-native", "kogito-runtime-jvm",
-           "kogito-builder", "kogito-s2i-core",
-           "kogito-system-user", "kogito-jit-runner",
-           "kogito-custom-truststore"}
 MODULE_FILENAME = "module.yaml"
 MODULES_DIR = "modules"
 
+COMMUNITY_PREFIX = 'kogito-'
+PRODUCT_PREFIX = 'rhpam-'
+
 # imagestream file that contains all images, this file aldo needs to be updated.
 IMAGE_STREAM_FILENAME = "kogito-imagestream.yaml"
+PROD_IMAGE_STREAM_FILENAME = "rhpam-kogito-imagestream.yaml"
 # image.yaml file definition that needs to be updated
 IMAGE_FILENAME = "image.yaml"
 ARTIFACTS_VERSION_ENV_KEY = "KOGITO_VERSION"
@@ -50,14 +38,31 @@ def yaml_loader():
     return yaml
 
 
-def update_image_version(target_version):
+def update_community_image_version(target_version):
     """
     Update image.yaml version tag.
     :param target_version: version used to update the image.yaml file
     """
-    print("Updating Image main file version from file {0} to version {1}".format(IMAGE_FILENAME, target_version))
+    update_image_version_tag_in_yaml_file(target_version, IMAGE_FILENAME)
+
+def update_prod_image_version(target_version):
+    """
+    Update rhpam-*-overrides.yaml files version tag.
+    :param target_version: version used to update the files
+    """
+    for img in sorted(get_prod_images()):
+        file = "{}-overrides.yaml".format(img)
+        update_image_version_tag_in_yaml_file(target_version, file)
+
+def update_image_version_tag_in_yaml_file(target_version, yaml_file):
+    """
+    Update root version tag in yaml file.
+    :param target_version: version to set
+    :param yaml_file: yaml file to update
+    """
+    print("Updating Image main file version from file {0} to version {1}".format(yaml_file, target_version))
     try:
-        with open(IMAGE_FILENAME) as image:
+        with open(yaml_file) as image:
             data = yaml_loader().load(image)
             if 'version' in data:
                 data['version'] = target_version
@@ -65,21 +70,23 @@ def update_image_version(target_version):
                 print("Field version not found, returning...")
                 return
 
-        with open(IMAGE_FILENAME, 'w') as image:
+        with open(yaml_file, 'w') as image:
             yaml_loader().dump(data, image)
     except TypeError as err:
         print("Unexpected error:", err)
 
-
-def update_image_stream(target_version):
+def update_image_stream(target_version, prod=False):
     """
     Update the imagestream file, it will update the tag name, version and image tag.
     :param target_version: version used to update the imagestream file;
     """
-    print("Updating ImageStream images version from file {0} to version {1}".format(IMAGE_STREAM_FILENAME,
+    imageStreamFilename = IMAGE_STREAM_FILENAME
+    if prod:
+        imageStreamFilename = PROD_IMAGE_STREAM_FILENAME
+    print("Updating ImageStream images version from file {0} to version {1}".format(imageStreamFilename,
                                                                                     target_version))
     try:
-        with open(IMAGE_STREAM_FILENAME) as imagestream:
+        with open(imageStreamFilename) as imagestream:
             data = yaml_loader().load(imagestream)
             for item_index, item in enumerate(data['items'], start=0):
                 for tag_index, tag in enumerate(item['spec']['tags'], start=0):
@@ -90,14 +97,14 @@ def update_image_stream(target_version):
                     updated_image_name = image_dict[0] + ':' + target_version
                     data['items'][item_index]['spec']['tags'][tag_index]['from']['name'] = updated_image_name
 
-        with open(IMAGE_STREAM_FILENAME, 'w') as imagestream:
+        with open(imageStreamFilename, 'w') as imagestream:
             yaml_loader().dump(data, imagestream)
 
     except TypeError:
         raise
 
 
-def get_all_module_dirs():
+def get_all_module_dirs(prefix):
     """
     Retrieve the module directories
     """
@@ -107,26 +114,28 @@ def get_all_module_dirs():
     for r, d, f in os.walk(MODULES_DIR):
         for item in f:
             if MODULE_FILENAME == item:
-                modules.append(os.path.dirname(os.path.join(r, item)))
+                path = os.path.dirname(os.path.join(r, item))
+                if os.path.basename(path).startswith(prefix):
+                    modules.append(path)
 
     return modules
 
 
-def get_kogito_module_dirs():
+def get_community_module_dirs():
     """
     Retrieve the Kogito module directories
     """
-    modules = []
-
-    for moduleName in MODULES:
-        modules.append(os.path.join(MODULES_DIR, moduleName))
-
-    return modules
+    return get_all_module_dirs(COMMUNITY_PREFIX)
 
+def get_prod_module_dirs():
+    """
+    Retrieve the RHPAM module directories
+    """
+    return get_all_module_dirs(PRODUCT_PREFIX)
 
-def get_all_images():
+def get_images(prefix):
     """
-    Retrieve the Kogito images' names
+    Retrieve the Kogito images' files
     """
     images = []
 
@@ -134,17 +143,35 @@ def get_all_images():
     for r, d, f in os.walk("."):
         for item in f:
             if re.compile(r'.*-overrides.yaml').match(item):
-                images.append(item.replace("-overrides.yaml", ''))
+                if item.startswith(prefix):
+                    images.append(item.replace("-overrides.yaml", ''))
 
     return images
 
+def get_community_images():
+    """
+    Retrieve the Community images' names
+    """
+    return get_images(COMMUNITY_PREFIX)
 
-def update_modules_version(target_version):
+def get_prod_images():
+    """
+    Retrieve the Prod images' names
+    """
+    return get_images(PRODUCT_PREFIX)
+
+def update_modules_version(target_version, prod=False):
     """
     Update every Kogito module.yaml to the given version.
     :param target_version: version used to update all Kogito module.yaml files
     """
-    for module_dir in get_kogito_module_dirs():
+    modules = []
+    if prod:
+        modules = get_prod_module_dirs()
+    else:
+        get_community_module_dirs()
+    
+    for module_dir in modules:
         update_module_version(module_dir, target_version)
 
 
@@ -359,5 +386,9 @@ def update_in_file(file, pattern, replacement):
 
 
 if __name__ == "__main__":
-    for m in get_kogito_module_dirs():
+    print("Community modules:")
+    for m in get_community_module_dirs():
+        print("module {}".format(m))
+    print("\nProd modules:")
+    for m in get_prod_module_dirs():
         print("module {}".format(m))
diff --git a/scripts/list-images.py b/scripts/list-images.py
index e3d79e3675b..afda2fdbd81 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -10,8 +10,6 @@
 
 sys.dont_write_bytecode = True
 
-PRODUCT_PREFIX = "rhpam"
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
         description='Kogito Version Manager - List Images by Community and Product version')
@@ -19,10 +17,11 @@
 
     args = parser.parse_args()
 
-    for img in sorted(common.get_all_images()):
-        if args.prod:
-            if img.startswith(PRODUCT_PREFIX):
-                print(img)
-        else:
-            if not img.startswith(PRODUCT_PREFIX):
-                print(img)
+    images = []
+    if args.prod:
+        images = common.get_prod_images()
+    else:
+        images = common.get_community_images()
+
+    for img in sorted(images):
+        print(img)
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index b368a64753e..cee58d58f54 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -25,6 +25,7 @@
     parser.add_argument('--examples-ref', dest='examples_ref',
                         help='Update Behave tests to use the desired branch for kogito-examples')
     parser.add_argument('--confirm', default=False, action='store_true', help='To confirm automatically the setup')
+    parser.add_argument('--prod', default=False, action='store_true', help='Update product modules/images')
 
     args = parser.parse_args()
 
@@ -46,23 +47,31 @@
             if args.artifacts_version:
                 artifacts_version = args.artifacts_version
 
-            print("Images version will be updated to {0}".format(args.bump_to))
-            print("Artifacts version will be updated to {0}".format(artifacts_version))
-            print("Examples ref will be updated to {}".format(examples_ref))
+            if args.prod:
+                print("Product images version will be updated to {0}".format(args.bump_to))
+            else:
+                print("Images version will be updated to {0}".format(args.bump_to))
+                print("Artifacts version will be updated to {0}".format(artifacts_version))
+                print("Examples ref will be updated to {}".format(examples_ref))
 
             if not args.confirm:
                 input("Is the information correct? If so press any key to continue...")
 
             # modules
-            common.update_image_version(args.bump_to)
-            common.update_image_stream(args.bump_to)
-            common.update_modules_version(args.bump_to)
-            common.update_artifacts_version_env_in_image(artifacts_version)
+            if args.prod:
+                common.update_prod_image_version(args.bump_to)
+                common.update_image_stream(args.bump_to, args.prod)
+                common.update_modules_version(args.bump_to, args.prod)
+            else:
+                common.update_community_image_version(args.bump_to)
+                common.update_image_stream(args.bump_to)
+                common.update_modules_version(args.bump_to)
+                common.update_artifacts_version_env_in_image(artifacts_version)
 
-            # tests default values
-            common.update_examples_ref_in_behave_tests(examples_ref)
-            common.update_examples_ref_in_clone_repo(examples_ref)
-            common.update_artifacts_version_in_behave_tests(artifacts_version)
+                # tests default values
+                common.update_examples_ref_in_behave_tests(examples_ref)
+                common.update_examples_ref_in_clone_repo(examples_ref)
+                common.update_artifacts_version_in_behave_tests(artifacts_version)
         else:
             print("Provided version {0} does not match the expected regex - {1}".format(args.bump_to, pattern))
     else:
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 828f4583703..888f6b542f1 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -27,7 +27,7 @@ def find_next_tag(override_tags):
     Populate the IMAGES_NEXT_RC_TAGS with the next rc tag for each image.
     """
     global IMAGES_NEXT_RC_TAG
-    for image in common.get_all_images():
+    for image in common.get_community_images():
         tag = fetch_tag(image, override_tags)
         print("Next tag for image %s is %s" % (image, tag))
         IMAGES_NEXT_RC_TAG.append('{}:{}'.format(image, tag))
@@ -144,7 +144,7 @@ def get_next_rc_version(current_rc_version, override_tags):
     args = parser.parse_args()
 
     version = get_next_rc_version(find_current_rc_version(), args.override_tags)
-    common.update_image_version(version)
+    common.update_community_image_version(version)
     common.update_image_stream(version)
     common.update_modules_version(version)
     common.update_artifacts_version_env_in_modules(version)

From 81651a7e843ee57c80438d22c6b050a0abc40005 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Sun, 8 Aug 2021 18:53:30 -0300
Subject: [PATCH 331/709] [KOGITO-5623] Fix Behave tests for SW builder (#631)

---
 modules/kogito-s2i-core/added/s2i-core | 3 ++-
 tests/features/kogito-builder.feature  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index fc2935f3beb..3c72a859d17 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -163,7 +163,8 @@ function build_kogito_app() {
 
             log_info "--> Quarkus version is '$quarkus_version'"
 
-            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml io.quarkus:quarkus-maven-plugin:$quarkus_version:add-extension -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow"
+            # `-DquarkusRegistryClient=false` is added until https://github.com/quarkusio/registry.quarkus.io/issues/22 is solved because of maven mirror
+            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml io.quarkus:quarkus-maven-plugin:$quarkus_version:add-extension -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow" -DquarkusRegistryClient=false
         fi
 
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index e8c60a4a72c..c1b029ea06f 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -101,7 +101,7 @@ Feature: kogito-builder image tests
       | expected_status_code  | 200                           |
       | request_method        | POST                          |
       | content_type          | application/cloudevents+json  |
-      | request_body          | {"specversion": "1.0", "source": "behave", "type": "orderEvent", "id": "12345", "data": {"id":"f0643c68-609c-48aa-a820-5df423fa4fe0","country":"Brazil","total":10000,"description":"iPhone 12"}}|
+      | request_body          | {"specversion": "1.0", "datacontenttype": "application/json", "source": "behave", "type": "orderEvent", "id": "12345", "data": {"id":"f0643c68-609c-48aa-a820-5df423fa4fe0","country":"Brazil","total":10000,"description":"iPhone 12"}}|
 
 #### SpringBoot Scenarios
 

From 8dfae008d7357bd7afe70a57a3a2ec0c5fdf5f68 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 9 Aug 2021 14:01:03 +0200
Subject: [PATCH 332/709] Fix MongoDB testing (#652)

---
 tests/features/jobs-service/kogito-jobs-service-mongodb.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
index 4332fe73ce6..beb5d97b2c1 100644
--- a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
@@ -20,6 +20,6 @@ Feature: Kogito-jobs-service-mongodb feature.
       | variable                          | value                                          |
       | SCRIPT_DEBUG                      | true                                           |
       | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://user:password@localhost:27017/admin  |
+      | QUARKUS_MONGODB_DATABASE          | kogito                                         |
     Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-mongodb-runner.jar
-    And container log should contain Cluster created with settings {hosts=[localhost:27017], mode=SINGLE
     And container log should not contain Application failed to start

From 1b9d46ebe5c601f7191e4bd3cc031925fbd9f5f0 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 10 Aug 2021 16:44:21 +0200
Subject: [PATCH 333/709] Updated Maven artifacts (#661)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 9f8a573f8ec..dfa98b8500d 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210722.050346-189-runner.jar
-    md5: 547e763fb2ff3942699d69e5df89de83
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210810.050416-209-runner.jar
+    md5: 8985fc865c7e42e276ff55d4ecf3def1
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 1e1833223a1..0e4565e5457 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210722.050749-190-runner.jar
-    md5: ff8c9cfa476fce7e7c1cec9f83524325
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210810.050820-210-runner.jar
+    md5: 36a5fb5be42da3be1a048377a0035d5c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index d6e7015d30d..481e2bf9b99 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210722.051150-34-runner.jar
-    md5: 5ef8ccd1d03ac115af0c831a92e9c821
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210810.051220-54-runner.jar
+    md5: 70b3a06888f195bc13bc49a64a749e55
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 2ef57db08a5..e040387a92c 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210722.060126-194-runner.jar
-    md5: cd5fbf048af9d9dcefe3ea9546f904b0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210810.060752-214-runner.jar
+    md5: 5e22e93310e27750c032bbcb22ec70a3
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210722.055927-191-runner.jar
-    md5: 42085d0a0dc8da57f6afb036391517cc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210810.060606-211-runner.jar
+    md5: c2c9549e5aaa9cec7e3394686171889d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index b6db5adbe57..17e8d728983 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210722.061212-135-runner.jar
-    md5: bda094bb633821a4ad6d592e27c2a770
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210810.061820-155-runner.jar
+    md5: 172be437915e5b4c2e8829ce399f2913
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 540a14ec289..81bec663c7a 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210722.044531-66-runner.jar
-    md5: ef82ec2255940286ad8c09090ff8a01e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210810.044400-86-runner.jar
+    md5: 69af4520a861d589f4347f7d7b826147
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 57f93d698aa..04e983d622a 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210722.044958-66-runner.jar
-    md5: 626b7ebf1902219be64269a2f9229c5f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210810.044745-85-runner.jar
+    md5: 177c59d7a99b4f8955ef5143939873a7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 83d10cdbf7d..840f0cb9a6e 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210722.045718-48-runner.jar
-    md5: bdf34daca2cbbdbad73748844cb5a7e3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210810.045457-68-runner.jar
+    md5: 90dff9b45de103bdb8691ba174a9d1dc
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 2349091b0b5..ccccfdb6823 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210722.045347-66-runner.jar
-    md5: ec2b890a32eca481dc04b6e23c0174d7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210810.045130-86-runner.jar
+    md5: bef5f9a967d518be706fbbf02400d44c
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 34d4c4b18db..ad5a2a5b682 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210722.052859-190-runner.jar
-    md5: dc8ba26af9d8996d398d883e502587e3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210810.053521-210-runner.jar
+    md5: de7628734ea369633110900d806257cf
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 4fd69194862..6be27bbf52a 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210722.053226-190-runner.jar
-    md5: cfae33725306b62d2aa68edb002493df
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210810.053906-210-runner.jar
+    md5: dc4b6601688e9c15df4b7e8ad0a445b4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index ca3e4065f9f..b65e4763ec9 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210722.060658-105-runner.jar
-    md5: f4fdbc1d3dde0d0b4875ccc9801ddc8d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210810.061316-125-runner.jar
+    md5: 4fc516616c4621a6e642d8cbd515e8cb
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index d22eb15ab45..7cc4846d323 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210722.060833-106-runner.jar
-    md5: 34f6e2c8e05edd1ef922e0c93605c3d8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210810.061439-126-runner.jar
+    md5: 2ab66b268cd9b35b9ea3cff39d57a03d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index c9a68ff06f9..456d694fa0d 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210722.053137-191-runner.jar
-    md5: 743b051fda1afde99d38e62f90253b10
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210810.053824-211-runner.jar
+    md5: 193baad854b792d00aefe660d2433c89
 
 execute:
   - script: configure

From fbdb68715a5a8e0e4b06ea6ff7727abd217076f3 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 11 Aug 2021 19:35:22 +0200
Subject: [PATCH 334/709] Updated Maven artifacts (#662)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index dfa98b8500d..5131e1b3b55 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210810.050416-209-runner.jar
-    md5: 8985fc865c7e42e276ff55d4ecf3def1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210811.041616-210-runner.jar
+    md5: ce9971295f78ef2d0802f940ff3cf576
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 0e4565e5457..3d81b347ba5 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210810.050820-210-runner.jar
-    md5: 36a5fb5be42da3be1a048377a0035d5c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210811.041901-211-runner.jar
+    md5: c73c87bb56c96839899b342836bd81b3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 481e2bf9b99..16adb6273af 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210810.051220-54-runner.jar
-    md5: 70b3a06888f195bc13bc49a64a749e55
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210811.042159-55-runner.jar
+    md5: ab2149e2ebe6551e9478797b52310b57
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index e040387a92c..7611524dcd2 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210810.060752-214-runner.jar
-    md5: 5e22e93310e27750c032bbcb22ec70a3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210811.050645-215-runner.jar
+    md5: 03004a2012a7b55e138bb291fa5fecf0
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210810.060606-211-runner.jar
-    md5: c2c9549e5aaa9cec7e3394686171889d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210811.050522-212-runner.jar
+    md5: 927aa398fa0235ce52b03a0a6dc8dec3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 17e8d728983..ee200d50ab4 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210810.061820-155-runner.jar
-    md5: 172be437915e5b4c2e8829ce399f2913
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210811.051431-156-runner.jar
+    md5: f7d044b83f0e7419228ceda60d84e537
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 81bec663c7a..6e0d733e47b 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210810.044400-86-runner.jar
-    md5: 69af4520a861d589f4347f7d7b826147
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210811.040217-87-runner.jar
+    md5: 5c10bafa7b2da033594e2acebbdec26b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 04e983d622a..821b6309c34 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210810.044745-85-runner.jar
-    md5: 177c59d7a99b4f8955ef5143939873a7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210811.040449-86-runner.jar
+    md5: d3c4c1357ad1c07f06693e55109616cc
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 840f0cb9a6e..e34020026a5 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210810.045457-68-runner.jar
-    md5: 90dff9b45de103bdb8691ba174a9d1dc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210811.040945-69-runner.jar
+    md5: 5861577c5e7c8349105d8b846a9be0f4
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index ccccfdb6823..2e15aff610b 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210810.045130-86-runner.jar
-    md5: bef5f9a967d518be706fbbf02400d44c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210811.040724-87-runner.jar
+    md5: a5dd2d28e155c4fe82fa9332847efaec
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index ad5a2a5b682..50eaa09ad53 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210810.053521-210-runner.jar
-    md5: de7628734ea369633110900d806257cf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210811.043749-211-runner.jar
+    md5: 9ef2296a0868d474ddb2bb41a4bbbc06
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 6be27bbf52a..73f8917f78e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210810.053906-210-runner.jar
-    md5: dc4b6601688e9c15df4b7e8ad0a445b4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210811.044030-211-runner.jar
+    md5: 809497b4e7bad94da41408f7c9ad83e4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index b65e4763ec9..e60d60a1ae4 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210810.061316-125-runner.jar
-    md5: 4fc516616c4621a6e642d8cbd515e8cb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210811.051039-126-runner.jar
+    md5: fdddd62f32d1e83d41bb0368bac9eec5
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 7cc4846d323..01468f6d396 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210810.061439-126-runner.jar
-    md5: 2ab66b268cd9b35b9ea3cff39d57a03d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210811.051143-127-runner.jar
+    md5: 934363465e1ad02f1783409ab7b2b128
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 456d694fa0d..6e867d50f84 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210810.053824-211-runner.jar
-    md5: 193baad854b792d00aefe660d2433c89
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210811.043955-212-runner.jar
+    md5: 2f1ae0740351b98df5d28f4d09ad1821
 
 execute:
   - script: configure

From 86bdc8d63010e4876322a3f295e635bef6270311 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 12 Aug 2021 15:30:36 +0200
Subject: [PATCH 335/709] Restored quarkus registry client (#665)

---
 modules/kogito-s2i-core/added/s2i-core | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 3c72a859d17..fc2935f3beb 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -163,8 +163,7 @@ function build_kogito_app() {
 
             log_info "--> Quarkus version is '$quarkus_version'"
 
-            # `-DquarkusRegistryClient=false` is added until https://github.com/quarkusio/registry.quarkus.io/issues/22 is solved because of maven mirror
-            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml io.quarkus:quarkus-maven-plugin:$quarkus_version:add-extension -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow" -DquarkusRegistryClient=false
+            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml io.quarkus:quarkus-maven-plugin:$quarkus_version:add-extension -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow"
         fi
 
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \

From 5d21354a425dd39205698448f70821b9193924b7 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 16 Aug 2021 15:21:08 +0200
Subject: [PATCH 336/709] Updated Maven artifacts (#668)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 5131e1b3b55..a539a2357a9 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210811.041616-210-runner.jar
-    md5: ce9971295f78ef2d0802f940ff3cf576
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210815.062346-214-runner.jar
+    md5: 7031f345fa62637874ec38297b21a7a4
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 3d81b347ba5..b3bdc306e27 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210811.041901-211-runner.jar
-    md5: c73c87bb56c96839899b342836bd81b3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210815.062819-215-runner.jar
+    md5: bc61dbebc9bebf810a279904bd8423f2
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 16adb6273af..b2c78e0ea01 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210811.042159-55-runner.jar
-    md5: ab2149e2ebe6551e9478797b52310b57
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210815.063237-59-runner.jar
+    md5: eda249ba3266204d44428eb1683c12c5
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 7611524dcd2..2ed505facf2 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210811.050645-215-runner.jar
-    md5: 03004a2012a7b55e138bb291fa5fecf0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210815.072859-219-runner.jar
+    md5: fe09342e5d72b421bcf7779ba583e7f5
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210811.050522-212-runner.jar
-    md5: 927aa398fa0235ce52b03a0a6dc8dec3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210815.072709-216-runner.jar
+    md5: db5e16699bd0428e7035a22f3e5b90c9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index ee200d50ab4..8a86b89123b 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210811.051431-156-runner.jar
-    md5: f7d044b83f0e7419228ceda60d84e537
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210815.073940-160-runner.jar
+    md5: 2bba92001e24a7ada00b8f6ef5506a0d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 6e0d733e47b..3e145e4ed0e 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210811.040217-87-runner.jar
-    md5: 5c10bafa7b2da033594e2acebbdec26b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210815.060234-91-runner.jar
+    md5: e8af3cf0693ae62edfd5d483792eee1e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 821b6309c34..d057cb03935 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210811.040449-86-runner.jar
-    md5: d3c4c1357ad1c07f06693e55109616cc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210815.060628-90-runner.jar
+    md5: a35ed55ae3b6a1753aceaca0d2c10cd9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index e34020026a5..d90e9e0557e 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210811.040945-69-runner.jar
-    md5: 5861577c5e7c8349105d8b846a9be0f4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210815.061347-73-runner.jar
+    md5: 9b0b52b1b9b65f93b07f77107cb036f7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 2e15aff610b..5ced87be702 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210811.040724-87-runner.jar
-    md5: a5dd2d28e155c4fe82fa9332847efaec
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210815.061012-91-runner.jar
+    md5: cf29f00af530ae83f14fb3eb04392cf5
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 50eaa09ad53..aca6f5ceda0 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210811.043749-211-runner.jar
-    md5: 9ef2296a0868d474ddb2bb41a4bbbc06
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210815.065630-215-runner.jar
+    md5: e33e89825fdbced23ea1593de17d814e
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 73f8917f78e..ee5b4871543 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210811.044030-211-runner.jar
-    md5: 809497b4e7bad94da41408f7c9ad83e4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210815.070013-215-runner.jar
+    md5: b70cf62d153616292bc3ad8ede7935bb
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index e60d60a1ae4..0e6e30edd78 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210811.051039-126-runner.jar
-    md5: fdddd62f32d1e83d41bb0368bac9eec5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210815.073437-130-runner.jar
+    md5: cdbd6e93d690544900618e78d1d67f97
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 01468f6d396..08a82a3dccb 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210811.051143-127-runner.jar
-    md5: 934363465e1ad02f1783409ab7b2b128
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210815.073559-131-runner.jar
+    md5: c018b0ce00eda5b5c644818425825d92
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6e867d50f84..45be3cd3796 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210811.043955-212-runner.jar
-    md5: 2f1ae0740351b98df5d28f4d09ad1821
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210815.065927-216-runner.jar
+    md5: 64bfd02950c8700c2458868b39f6398f
 
 execute:
   - script: configure

From ab8d5f3ca3ab38642a6fc57a1d4c005defce7eb9 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 19 Aug 2021 11:43:11 +0200
Subject: [PATCH 337/709] Updated Maven artifacts (#669)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>

From 823321ecec11cd0335af0a8817d38f78ea5e8e03 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 19 Aug 2021 13:20:45 -0300
Subject: [PATCH 338/709] [KOGITO-5720] - Native runtime image does not need
 the cacert and libsunec.so (#673)

Signed-off-by: spolti <fspolti@redhat.com>
---
 kogito-runtime-native-overrides.yaml         | 2 --
 modules/kogito-runtime-native/configure      | 5 -----
 tests/features/kogito-builder-native.feature | 2 --
 tests/features/kogito-runtime-native.feature | 5 -----
 4 files changed, 14 deletions(-)

diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-overrides.yaml
index d26fe48e806..2b8dd46acc0 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -36,8 +36,6 @@ modules:
   - name: org.kie.kogito.jq
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.graalvm.installer
-    version: "21.1.0-java-11"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.runtime.native
 
diff --git a/modules/kogito-runtime-native/configure b/modules/kogito-runtime-native/configure
index d6690bc28dd..79a6447b8d1 100644
--- a/modules/kogito-runtime-native/configure
+++ b/modules/kogito-runtime-native/configure
@@ -14,8 +14,3 @@ chmod 755 /usr/local/s2i/*
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
 
-rm -rf  "${KOGITO_HOME}"/launch/memory-limit.sh
-rm -rf /usr/share/graalvm
-
-unset JAVA_HOME
-unset GRAALVM_HOME
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index c5a73707255..fdd84860e03 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -30,8 +30,6 @@ Feature: kogito-builder image native build tests
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
     And s2i build log should contain -J-Xmx4g
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
diff --git a/tests/features/kogito-runtime-native.feature b/tests/features/kogito-runtime-native.feature
index 83bb4e859a1..1de6f6aa1ac 100644
--- a/tests/features/kogito-runtime-native.feature
+++ b/tests/features/kogito-runtime-native.feature
@@ -12,11 +12,6 @@ Feature: Kogito-runtime-native feature.
      And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,native
      And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
 
-  Scenario: verify java cacerts and libsunec are available in the given kogito runtime container.
-    When container is started with command bash
-    Then  file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
-
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus native
     Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld-native/ from target
       | variable            | value                     |

From cbdab6727f456d9693f2eb3e699066d32cbaa885 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 19 Aug 2021 22:08:12 +0200
Subject: [PATCH 339/709] Updated Maven artifacts (#672)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp4.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index a539a2357a9..166895d0270 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210815.062346-214-runner.jar
-    md5: 7031f345fa62637874ec38297b21a7a4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210819.050727-217-runner.jar
+    md5: 83ace00628f174b0f4d35b45142b55bf
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index b3bdc306e27..03e5a98900e 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210815.062819-215-runner.jar
-    md5: bc61dbebc9bebf810a279904bd8423f2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210819.051235-218-runner.jar
+    md5: b61f80f471d4646cbf33d8ff6640df1d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index b2c78e0ea01..cd129e4f425 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210815.063237-59-runner.jar
-    md5: eda249ba3266204d44428eb1683c12c5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210819.051740-62-runner.jar
+    md5: 4d325a479c5a98c0a5345c986178f375
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 2ed505facf2..5361ebb7e12 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210815.072859-219-runner.jar
-    md5: fe09342e5d72b421bcf7779ba583e7f5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210819.062317-222-runner.jar
+    md5: f60003b155d345c753dd1e8a294c6135
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210815.072709-216-runner.jar
-    md5: db5e16699bd0428e7035a22f3e5b90c9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210819.062056-219-runner.jar
+    md5: 2191e1136bc81bb7574bc640fa903b4f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 8a86b89123b..386cbd217d0 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210815.073940-160-runner.jar
-    md5: 2bba92001e24a7ada00b8f6ef5506a0d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210819.063705-163-runner.jar
+    md5: 1751127b9f6be56405f712d9cdbb0ee8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 3e145e4ed0e..b924ff16320 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210815.060234-91-runner.jar
-    md5: e8af3cf0693ae62edfd5d483792eee1e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210819.044221-94-runner.jar
+    md5: 1fd86dea1e80122779a83efa081e8c0f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index d057cb03935..92e3e684497 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210815.060628-90-runner.jar
-    md5: a35ed55ae3b6a1753aceaca0d2c10cd9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210819.044647-93-runner.jar
+    md5: 13f673cfd0a47f54cca8cf1a7b837a4c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index d90e9e0557e..ac00a63a9b3 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210815.061347-73-runner.jar
-    md5: 9b0b52b1b9b65f93b07f77107cb036f7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210819.045545-75-runner.jar
+    md5: 5c131c12daa99aa6d85ff98dea39f133
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 5ced87be702..fb92d84dd8d 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210815.061012-91-runner.jar
-    md5: cf29f00af530ae83f14fb3eb04392cf5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210819.045117-94-runner.jar
+    md5: 7e8a9ba54d2756728f859ce8285317f9
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index aca6f5ceda0..c1c17251b1f 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210815.065630-215-runner.jar
-    md5: e33e89825fdbced23ea1593de17d814e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210819.054733-218-runner.jar
+    md5: ea80b61bb14a027e9569e7eb4d2206fb
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index ee5b4871543..d5dfe19144e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210815.070013-215-runner.jar
-    md5: b70cf62d153616292bc3ad8ede7935bb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210819.055206-218-runner.jar
+    md5: a383cc37eef8cf261f7df8947ecf7b50
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 0e6e30edd78..83b5db4c74e 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210815.073437-130-runner.jar
-    md5: cdbd6e93d690544900618e78d1d67f97
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210819.063035-133-runner.jar
+    md5: f17ba580cded46bd3ce0768b44a38f1e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 08a82a3dccb..2608768fc5c 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210815.073559-131-runner.jar
-    md5: c018b0ce00eda5b5c644818425825d92
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210819.063224-134-runner.jar
+    md5: 5f50fda8eae5e332ae399ea47d22e2ed
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 45be3cd3796..8c2dd02a593 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210815.065927-216-runner.jar
-    md5: 64bfd02950c8700c2458868b39f6398f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210819.055112-219-runner.jar
+    md5: cbcaf7dd9ae2c4b1794744819fa779ba
 
 execute:
   - script: configure

From 2b1dde4e0a7cda83cf6b12bf509f6bd3a957e4cc Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 20 Aug 2021 14:29:50 -0300
Subject: [PATCH 340/709] [KOGITO-5736] - Update the s2i usage script to show
 the correct image name (#675)

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-builder/s2i/bin/usage        | 35 +++++++++++++++------
 modules/kogito-runtime-jvm/s2i/bin/usage    | 10 ++++--
 modules/kogito-runtime-native/s2i/bin/usage | 10 ++++--
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/modules/kogito-builder/s2i/bin/usage b/modules/kogito-builder/s2i/bin/usage
index ae93fdc416e..9e87cc0c05d 100644
--- a/modules/kogito-builder/s2i/bin/usage
+++ b/modules/kogito-builder/s2i/bin/usage
@@ -1,6 +1,25 @@
 #!/usr/bin/env bash
+
+IMAGE_NAME="quay.io/kiegroup/kogito-builder"
+RUNTIME_JVM_IMAGE_NAME="quay.io/kiegroup/kogito-runtime-jvm"
+
+NATIVE_COMMANDS="For the native build, just set the NATIVE environment variable to "true" and use
+the quay.io/kiegroup/kogito-runtime-native image as runtime-image.
+In that way, a native build will be produced and copied to the runtime image.
+
+Example:
+
+$ s2i build -c /Development/project/ ${IMAGE_NAME} <application image> --env RUNTIME_TYPE=quarkus --runtime-image quay.io/kiegroup/kogito-runtime-native --env NATIVE=true"
+
+if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+    IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-builder-rhel8"
+    RUNTIME_JVM_IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8"
+    NATIVE_COMMANDS=""
+fi
+
+
 cat <<EOF
-This is the quay.io/kiegroup/kogito-builder S2I image:
+This is the ${IMAGE_NAME} S2I image:
 
 Build native image based on project source either complete maven project or just set of business assets
 such as processes (BPMN), rules (DRL), decisions (DMN).
@@ -12,25 +31,21 @@ This image is intended only to build application binaries copied to runtime imag
 
 S2I command syntax:
 
-s2i build -c <source code path/URL> quay.io/kiegroup/kogito-builder <application image> --runtime-image <image name>
+$ s2i build -c <source code path/URL> ${IMAGE_NAME} <application image> --runtime-image <image name>
 
 
 Sample invocation:
 
-$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-builder <application image> --env RUNTIME_TYPE=quarkus --runtime-image quay.io/kiegroup/kogito-runtime-jvm
+$ s2i build -c /Development/project/ ${IMAGE_NAME} <application image> --env RUNTIME_TYPE=quarkus --runtime-image ${RUNTIME_JVM_IMAGE_NAME}
 
-By default, it generates a non-native build. Use the quay.io/kiegroup/kogito-runtime-jvm image as runtime-image,
+By default, it generates a non-native build. Use the ${RUNTIME_JVM_IMAGE_NAME} image as runtime-image,
 in that way, a *runner.jar will be produced and copied to the runtime image.
 
 Example:
 
-$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-builder <application image> --env RUNTIME_TYPE=quarkus --runtime-image quay.io/kiegroup/kogito-runtime-jvm
-
-For the native build, just set the NATIVE environment variable to "true" and use the quay.io/kiegroup/kogito-runtime-native image as runtime-image. In that way, a native build will be produced and copied to the runtime image.
-
-Example:
+$ s2i build -c /Development/project/ ${IMAGE_NAME} <application image> --env RUNTIME_TYPE=quarkus --runtime-image ${RUNTIME_JVM_IMAGE_NAME}
 
-$ s2i build -c /Development/project/ quay.io/kiegroup/kogito-builder <application image> --env RUNTIME_TYPE=quarkus --runtime-image quay.io/kiegroup/kogito-runtime-native --env NATIVE=true
+echo -n ${NATIVE_COMMANDS}
 
 You can then run the resulting image via:
 docker run <application image>
diff --git a/modules/kogito-runtime-jvm/s2i/bin/usage b/modules/kogito-runtime-jvm/s2i/bin/usage
index c166c57abd3..fe19a008b73 100644
--- a/modules/kogito-runtime-jvm/s2i/bin/usage
+++ b/modules/kogito-runtime-jvm/s2i/bin/usage
@@ -1,11 +1,17 @@
 #!/bin/bash -e
+
+IMAGE_NAME="quay.io/kiegroup/kogito-runtime-jvm"
+if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+    IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8"
+fi
+
 cat <<EOF
-This is the quay.io/kiegroup/kogito-runtime-jvm S2I image:
+This is the ${IMAGE_NAME} S2I runtime image:
 To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build <binary path/URL> -e RUNTIME_TYPE=<quarkus|springboot> quay.io/kiegroup/kogito-runtime-jvm <application image>
+s2i build <binary path/URL> -e RUNTIME_TYPE=<quarkus|springboot> ${IMAGE_NAME} <application image>
 
 Where the binary path/URL is the built artifact that you want to copy to your image.
 RUNTIME_TYPE is the runtime your application is based on. Default value is 'quarkus'.
diff --git a/modules/kogito-runtime-native/s2i/bin/usage b/modules/kogito-runtime-native/s2i/bin/usage
index f4152e57e77..d14e5c523a2 100644
--- a/modules/kogito-runtime-native/s2i/bin/usage
+++ b/modules/kogito-runtime-native/s2i/bin/usage
@@ -1,11 +1,17 @@
 #!/usr/bin/env bash
+
+IMAGE_NAME="quay.io/kiegroup/kogito-runtime-native"
+if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+    IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8"
+fi
+
 cat <<EOF
-This is the quay.io/kiegroup/kogito-runtime-native S2I image:
+This is the ${IMAGE_NAME} S2I image:
 To use it, install S2I: https://github.com/openshift/source-to-image
 
 Sample invocation:
 
-s2i build <binary path/URL> -e RUNTIME_TYPE=<quarkus|springboot> quay.io/kiegroup/kogito-runtime-native <application image>
+s2i build <binary path/URL> -e RUNTIME_TYPE=<quarkus|springboot> ${IMAGE_NAME} <application image>
 
 Where the binary path/URL is the built artifact that you want to copy to your image.
 

From c693be6672bca7bd1f87d4a86a2f6e09761aa1a4 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 23 Aug 2021 10:13:02 -0300
Subject: [PATCH 341/709] [KOGITO-5710] - Add support for Kogito Quarkus
 runtime native image (#671)

* [KOGITO-5710] - Add support for Kogito Quarkus runtime native image

Signed-off-by: spolti <fspolti@redhat.com>

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 .../gating.yaml                               |  2 +-
 .../gating.yaml                               |  7 +++
 rhpam-kogito-imagestream.yaml                 | 29 +++++++--
 ...kogito-runtime-native-rhel8-overrides.yaml | 61 +++++++++++++++++++
 tests/features/common.feature                 |  1 +
 .../kogito-common-runtime-native.feature      | 21 +++++++
 tests/features/kogito-runtime-native.feature  | 17 ------
 .../rhpam-kogito-runtime-native.feature       | 15 +++++
 8 files changed, 131 insertions(+), 22 deletions(-)
 create mode 100644 osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml
 create mode 100644 rhpam-kogito-runtime-native-rhel8-overrides.yaml
 create mode 100644 tests/features/kogito-common-runtime-native.feature
 create mode 100644 tests/features/rhpam-kogito-runtime-native.feature

diff --git a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
index 7f79b5ffb4d..e1769f0b5a2 100644
--- a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
+++ b/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
@@ -4,4 +4,4 @@ product_versions:
   - cvp
 decision_context: cvp_default
 rules:
-  - !PassingTestCaseRule {test_case_name: rhpam-kieserver-kogito-runtime-jvm.openshift.external}
\ No newline at end of file
+  - !PassingTestCaseRule {test_case_name: rhpam-kogito-runtime-jvm.openshift.external}
\ No newline at end of file
diff --git a/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml
new file mode 100644
index 00000000000..31dbaac8cc5
--- /dev/null
+++ b/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+id: "cvp-rhpam-kogito-runtime-native"
+product_versions:
+  - cvp
+decision_context: cvp_default
+rules:
+  - !PassingTestCaseRule {test_case_name: rhpam-kogito-runtime-native.openshift.external}
\ No newline at end of file
diff --git a/rhpam-kogito-imagestream.yaml b/rhpam-kogito-imagestream.yaml
index 1ce2e4b2e0a..f762fdace2e 100644
--- a/rhpam-kogito-imagestream.yaml
+++ b/rhpam-kogito-imagestream.yaml
@@ -11,13 +11,13 @@ items:
     metadata:
       name: rhpam-kogito-runtime-jvm-rhel8
       annotations:
-        openshift.io/display-name: Runtime image for Kogito based on Quarkus or SpringBoot JVM image
+        openshift.io/display-name: RHPAM Runtime image for Kogito based on Quarkus or SpringBoot JVM image
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
         - name: '7.11.0'
           annotations:
-            description: Runtime image for Kogito based on Quarkus or SpringBoot JVM image
+            description: RHPAM Runtime image for Kogito based on Quarkus or SpringBoot JVM image
             iconClass: icon-jbpm
             tags: rhpam-kogito,runtime,kogito,quarkus,springboot,jvm
             supports: quarkus
@@ -27,18 +27,39 @@ items:
           from:
             kind: DockerImage
             name: registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8:7.11.0
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: rhpam-kogito-runtime-native-rhel8
+      annotations:
+        openshift.io/display-name: RHPAM Runtime image for Kogito based on Quarkus native image
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '7.11.0'
+          annotations:
+            description: RHPAM Runtime image for Kogito based on Quarkus native image
+            iconClass: icon-jbpm
+            tags: rhpam-kogito,runtime,kogito,quarkus,native
+            supports: quarkus
+            version: '7.11.0'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8:7.11.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
       name: rhpam-kogito-builder-rhel8
       annotations:
-        openshift.io/display-name: Platform for building Kogito based on Quarkus or SpringBoot
+        openshift.io/display-name: RHPAM Platform for building Kogito based on Quarkus or SpringBoot
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
         - name: '7.11.0'
           annotations:
-            description: Platform for building Kogito based on Quarkus or SpringBoot
+            description: RHPAM Platform for building Kogito based on Quarkus or SpringBoot
             iconClass: icon-jbpm
             tags: rhpam-kogito,builder,kogito,quarkus,springboot
             supports: quarkus
diff --git a/rhpam-kogito-runtime-native-rhel8-overrides.yaml b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
new file mode 100644
index 00000000000..b1f8e43f07a
--- /dev/null
+++ b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
@@ -0,0 +1,61 @@
+schema_version: 1
+
+name: "rhpam-7/rhpam-kogito-runtime-native-rhel8"
+version: "7.11.0"
+from: "registry.redhat.io/ubi8/ubi-minimal:latest"
+description: "RHPAM Runtime image for Kogito based on Quarkus native image"
+
+labels:
+  - name: "com.redhat.component"
+    value: "rhpam-7-kogito-runtime-native-rhel8-container"
+  - name: "io.k8s.description"
+    value: "RHPAM Runtime image for Kogito based on Quarkus native image"
+  - name: "io.k8s.display-name"
+    value: "Red Hat build of Kogito runtime based on Quarkus native image"
+  - name: "io.openshift.tags"
+    value: "rhpam-kogito,runtime,kogito,quarkus,native"
+  - name: "io.openshift.s2i.assemble-input-files"
+    value: "/home/kogito/bin"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: JAVA_OPTIONS
+    example: "-Dquarkus.log.level=DEBUG"
+    description: JVM options passed to the Java command.
+  - name: BINARY_BUILD
+    value: "true"
+    description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
+
+ports:
+  - value: 8080
+
+modules:
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.s2i.core
+    - name: org.kie.kogito.runtime.native
+
+packages:
+  content_sets_file: content_sets.yaml
+  install:
+    - glibc
+    - jq
+
+osbs:
+  configuration:
+    container_file: container.yaml
+  extra_dir: osbs-extra/rhpam-kogito-runtime-native-rhel8
+  repository:
+    name: containers/rhpam-7-kogito-runtime-native
+    branch: rhba-7-rhel-8
+
+## s2i build . -e BINARY=true registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8:latest
+## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
+run:
+  workdir: "/home/kogito"
+
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 795536e9da5..b995b579288 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -17,6 +17,7 @@
 @quay.io/kiegroup/kogito-task-console
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 @rhpam-7/rhpam-kogito-builder-rhel8
+@rhpam-7/rhpam-kogito-runtime-native-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/kogito-common-runtime-native.feature b/tests/features/kogito-common-runtime-native.feature
new file mode 100644
index 00000000000..fc3880bc187
--- /dev/null
+++ b/tests/features/kogito-common-runtime-native.feature
@@ -0,0 +1,21 @@
+@quay.io/kiegroup/kogito-runtime-native
+@rhpam-7/rhpam-kogito-runtime-native-rhel8
+Feature: Kogito-runtime-native feature.
+
+  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus native
+    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld-native/ from target
+      | variable            | value                     |
+      | NATIVE              | true                      |
+      | BINARY              | true                      |
+      | RUNTIME_TYPE        | quarkus                   |
+      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
+    Then check that page is served
+      | property        | value                    |
+      | port            | 8080                     |
+      | path            | /hello                   |
+      | request_method  | POST                     |
+      | content_type    | application/json         |
+      | request_body    | {"strings":["hello"]}    |
+      | wait            | 80                       |
+      | expected_phrase | ["hello","world"]        |
+    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
diff --git a/tests/features/kogito-runtime-native.feature b/tests/features/kogito-runtime-native.feature
index 1de6f6aa1ac..dbdec925a78 100644
--- a/tests/features/kogito-runtime-native.feature
+++ b/tests/features/kogito-runtime-native.feature
@@ -11,20 +11,3 @@ Feature: Kogito-runtime-native feature.
      And the image should contain label io.k8s.display-name with value Kogito based on Quarkus native image
      And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,native
      And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
-
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus native
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld-native/ from target
-      | variable            | value                     |
-      | NATIVE              | false                     |
-      | RUNTIME_TYPE        | quarkus                   |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     |
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
diff --git a/tests/features/rhpam-kogito-runtime-native.feature b/tests/features/rhpam-kogito-runtime-native.feature
new file mode 100644
index 00000000000..40f9f567d72
--- /dev/null
+++ b/tests/features/rhpam-kogito-runtime-native.feature
@@ -0,0 +1,15 @@
+@rhpam-7/rhpam-kogito-runtime-native-rhel8
+Feature: rhpam-kogito-runtime-jvm feature.
+
+  Scenario: verify if all labels are correctly set on rhpam-kogito-runtime-jvm-rhel8 image
+    Given image is built
+    # Then the image should not contain label maintainer TODO add support to this sentence on cekit behave steps
+    Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value RHPAM Runtime image for Kogito based on Quarkus native image
+    And the image should contain label io.k8s.display-name with value RHPAM Kogito based on Quarkus native image
+    And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,native
+    And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
+    And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-native-rhel8-container
+

From 9220a321a13eddbc4373016e60fd000eb6d9e5f2 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 25 Aug 2021 08:32:17 +0200
Subject: [PATCH 342/709] KOGITO-4113 Move all jenkins files to .ci/jenkins
 (#610)

* KOGITO-4113 Move all jenkins files to .ci/jenkins

* update
---
 Jenkinsfile => .ci/jenkins/Jenkinsfile            |  0
 .../jenkins/Jenkinsfile.deploy                    |  4 ++--
 .../jenkins/Jenkinsfile.promote                   |  4 ++--
 .../jenkins/Jenkinsfile.update-prod-version       |  4 ++--
 {.jenkins => .ci/jenkins}/dsl/Jenkinsfile.seed    |  0
 {.jenkins => .ci/jenkins}/dsl/jobs.groovy         | 15 +++++----------
 {.jenkins => .ci/jenkins}/dsl/test.sh             |  0
 .github/bot-files/reviewers.yml                   |  2 +-
 .github/workflows/jenkins-tests-PR.yml            |  5 ++---
 .gitignore                                        |  2 +-
 10 files changed, 15 insertions(+), 21 deletions(-)
 rename Jenkinsfile => .ci/jenkins/Jenkinsfile (100%)
 rename Jenkinsfile.deploy => .ci/jenkins/Jenkinsfile.deploy (99%)
 rename Jenkinsfile.promote => .ci/jenkins/Jenkinsfile.promote (99%)
 rename Jenkinsfile.update-prod-version => .ci/jenkins/Jenkinsfile.update-prod-version (95%)
 rename {.jenkins => .ci/jenkins}/dsl/Jenkinsfile.seed (100%)
 rename {.jenkins => .ci/jenkins}/dsl/jobs.groovy (95%)
 rename {.jenkins => .ci/jenkins}/dsl/test.sh (100%)

diff --git a/Jenkinsfile b/.ci/jenkins/Jenkinsfile
similarity index 100%
rename from Jenkinsfile
rename to .ci/jenkins/Jenkinsfile
diff --git a/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
similarity index 99%
rename from Jenkinsfile.deploy
rename to .ci/jenkins/Jenkinsfile.deploy
index 4dd3566b955..47486ba6287 100644
--- a/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -22,11 +22,11 @@ pipeline {
     }
 
     // parameters {
-    // For parameters, check into .jenkins/dsl/jobs.groovy file
+    // For parameters, check into ./dsl/jobs.groovy file
     // }
 
     environment {
-        // Static env is defined into .jenkins/dsl/jobs.groovy file
+        // Static env is defined into ./dsl/jobs.groovy file
 
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
diff --git a/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
similarity index 99%
rename from Jenkinsfile.promote
rename to .ci/jenkins/Jenkinsfile.promote
index 071eef60aaa..2bea6cb2333 100644
--- a/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -12,11 +12,11 @@ pipeline {
         timeout(time: 120, unit: 'MINUTES')
     }
     // parameters {
-    // For parameters, check into .jenkins/dsl/jobs.groovy file
+    // For parameters, check into ./dsl/jobs.groovy file
     // }
 
     environment {
-        // Static env is defined into .jenkins/dsl/jobs.groovy file
+        // Static env is defined into ./dsl/jobs.groovy file
 
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
diff --git a/Jenkinsfile.update-prod-version b/.ci/jenkins/Jenkinsfile.update-prod-version
similarity index 95%
rename from Jenkinsfile.update-prod-version
rename to .ci/jenkins/Jenkinsfile.update-prod-version
index 326c0932838..8ae4e6650f6 100644
--- a/Jenkinsfile.update-prod-version
+++ b/.ci/jenkins/Jenkinsfile.update-prod-version
@@ -10,11 +10,11 @@ pipeline {
     }
 
     // parameters {
-    // For parameters, check into .jenkins/dsl/jobs.groovy file
+    // For parameters, check into ./dsl/jobs.groovy file
     // }
 
     environment {
-        // Static env is defined into .jenkins/dsl/jobs.groovy file
+        // Static env is defined into ./dsl/jobs.groovy file
 
         BOT_BRANCH_HASH = "${util.generateHash(10)}"
     }
diff --git a/.jenkins/dsl/Jenkinsfile.seed b/.ci/jenkins/dsl/Jenkinsfile.seed
similarity index 100%
rename from .jenkins/dsl/Jenkinsfile.seed
rename to .ci/jenkins/dsl/Jenkinsfile.seed
diff --git a/.jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
similarity index 95%
rename from .jenkins/dsl/jobs.groovy
rename to .ci/jenkins/dsl/jobs.groovy
index 83ffc94fff7..18b2bfe5177 100644
--- a/.jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -3,6 +3,8 @@ import org.kie.jenkins.jobdsl.KogitoConstants
 import org.kie.jenkins.jobdsl.Utils
 import org.kie.jenkins.jobdsl.KogitoJobType
 
+JENKINSFILE_PATH = '.ci/jenkins'
+
 def getDefaultJobParams() {
     return KogitoJobTemplate.getDefaultJobParams(this, 'kogito-images')
 }
@@ -23,13 +25,6 @@ def nightlyBranchFolder = "${KogitoConstants.KOGITO_DSL_NIGHTLY_FOLDER}/${JOB_BR
 def releaseBranchFolder = "${KogitoConstants.KOGITO_DSL_RELEASE_FOLDER}/${JOB_BRANCH_FOLDER}"
 
 if (Utils.isMainBranch(this)) {
-    // Old PR checks.
-    // To be removed once supported release branches (<= 1.9.x) are no more maintained.
-    setupPrJob('1.5.x')
-    setupPrJob('1.8.x')
-    setupPrJob('1.9.x')
-    // End of old PR checks
-
     // For BDD runtimes PR job
     setupDeployJob(bddRuntimesPrFolder, KogitoJobType.PR)
 }
@@ -60,7 +55,7 @@ void setupPrJob(String branch = "${GIT_BRANCH}") {
 }
 
 void setupDeployJob(String jobFolder, KogitoJobType jobType) {
-    def jobParams = getJobParams('kogito-images-deploy', jobFolder, 'Jenkinsfile.deploy', 'Kogito Images Deploy')
+    def jobParams = getJobParams('kogito-images-deploy', jobFolder, "${JENKINSFILE_PATH}/Jenkinsfile.deploy", 'Kogito Images Deploy')
     if (jobType == KogitoJobType.PR) {
         jobParams.git.branch = '${GIT_BRANCH_NAME}'
         jobParams.git.author = '${GIT_AUTHOR}'
@@ -128,7 +123,7 @@ void setupDeployJob(String jobFolder, KogitoJobType jobType) {
 }
 
 void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
-    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-promote', jobFolder, 'Jenkinsfile.promote', 'Kogito Images Promote')).with {
+    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-promote', jobFolder, "${JENKINSFILE_PATH}/Jenkinsfile.promote", 'Kogito Images Promote')).with {
         parameters {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
 
@@ -190,7 +185,7 @@ void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
 }
 
 void setupProdUpdateVersionJob(String jobFolder) {
-    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-update-prod-version', jobFolder, 'Jenkinsfile.update-prod-version', 'Update prod version for Kogito Images')).with {
+    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-update-prod-version', jobFolder, "${JENKINSFILE_PATH}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images')).with {
         parameters {
             stringParam('JIRA_NUMBER', '', 'KIECLOUD-XXX or RHPAM-YYYY or else. This will be added to the commit and PR.')
             stringParam('PROD_PROJECT_VERSION', '', 'Which version to set ?')
diff --git a/.jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
similarity index 100%
rename from .jenkins/dsl/test.sh
rename to .ci/jenkins/dsl/test.sh
diff --git a/.github/bot-files/reviewers.yml b/.github/bot-files/reviewers.yml
index 0d8cfd8aaac..60ddc278dc8 100644
--- a/.github/bot-files/reviewers.yml
+++ b/.github/bot-files/reviewers.yml
@@ -4,7 +4,7 @@
 review:
   - paths:
       - Jenkinsfile*
-      - .jenkins
+      - .ci
       - .github
     reviewers:
       - radtriste
diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index c369aaec50c..2c37b480902 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -6,8 +6,7 @@ name: Jenkins Tests
 on:
   pull_request:
     paths: 
-    - '.jenkins/**'
-    - 'Jenkinsfile*'
+    - '.ci/jenkins/**'
 
 jobs:
   dsl-tests:
@@ -23,4 +22,4 @@ jobs:
         java-version: 11
       
     - name: Test DSL
-      run: cd .jenkins/dsl && ./test.sh
+      run: cd .ci/jenkins/dsl && ./test.sh
diff --git a/.gitignore b/.gitignore
index a4cd45c696d..4c20af005d5 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ bats/*
 /.*
 !.gitignore
 !.github
-!.jenkins
+!.ci
 /nbproject
 /*.ipr
 /*.iws

From 5b338e9505d8aaf22876a9067ec86bd95485bf51 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 25 Aug 2021 17:43:57 +0200
Subject: [PATCH 343/709] Updated Maven artifacts (#682)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 166895d0270..c10abb3a600 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210819.050727-217-runner.jar
-    md5: 83ace00628f174b0f4d35b45142b55bf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210825.035834-222-runner.jar
+    md5: 415f246db47a3fd73f047db41b303d93
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 03e5a98900e..1b1c8725a37 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210819.051235-218-runner.jar
-    md5: b61f80f471d4646cbf33d8ff6640df1d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210825.040130-223-runner.jar
+    md5: 1e79c312f176b1b8e7887c970e3d0d12
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index cd129e4f425..9b0f47a5c5f 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210819.051740-62-runner.jar
-    md5: 4d325a479c5a98c0a5345c986178f375
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210825.040431-67-runner.jar
+    md5: d7855e211922c04c73c6ef7d95116e71
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 5361ebb7e12..14e56e57009 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210819.062317-222-runner.jar
-    md5: f60003b155d345c753dd1e8a294c6135
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210825.044940-228-runner.jar
+    md5: b0dbdec178f33fb9413027cb492a8182
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210819.062056-219-runner.jar
-    md5: 2191e1136bc81bb7574bc640fa903b4f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210825.044824-225-runner.jar
+    md5: eb969e3e9f952f89dc80608e82d1de10
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 386cbd217d0..18c68f3159c 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210819.063705-163-runner.jar
-    md5: 1751127b9f6be56405f712d9cdbb0ee8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210825.045720-169-runner.jar
+    md5: 4576044a7f965c1b2f6edca7ae1bfaa7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index b924ff16320..03c7b966e05 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210819.044221-94-runner.jar
-    md5: 1fd86dea1e80122779a83efa081e8c0f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210825.034402-100-runner.jar
+    md5: 46b6212364b58fe2eb85fc775f869994
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 92e3e684497..102bc353fad 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210819.044647-93-runner.jar
-    md5: 13f673cfd0a47f54cca8cf1a7b837a4c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210825.034634-98-runner.jar
+    md5: 368ea79effd6927bddcbb9acaef9a7f0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index ac00a63a9b3..5065d14caac 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210819.045545-75-runner.jar
-    md5: 5c131c12daa99aa6d85ff98dea39f133
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210825.035135-80-runner.jar
+    md5: 1552c4e2de67b40e0cad4b7115965e0c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index fb92d84dd8d..ca5e61d74b3 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210819.045117-94-runner.jar
-    md5: 7e8a9ba54d2756728f859ce8285317f9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210825.034906-100-runner.jar
+    md5: 75109bbd23a80e7c4cf1930d8be92ea6
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index c1c17251b1f..1af9c648fd1 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210819.054733-218-runner.jar
-    md5: ea80b61bb14a027e9569e7eb4d2206fb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210825.041945-224-runner.jar
+    md5: c20d2b6b8a9bda15abc38ae2c1d4bff3
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d5dfe19144e..ed86649f8e5 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210819.055206-218-runner.jar
-    md5: a383cc37eef8cf261f7df8947ecf7b50
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210825.042227-224-runner.jar
+    md5: 30cb754de1b8c34ef37a762887f5906e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 83b5db4c74e..d747c79c0af 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210819.063035-133-runner.jar
-    md5: f17ba580cded46bd3ce0768b44a38f1e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210825.045322-139-runner.jar
+    md5: aa956854625cce86b797656923debbcd
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 2608768fc5c..166f0dd977e 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210819.063224-134-runner.jar
-    md5: 5f50fda8eae5e332ae399ea47d22e2ed
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210825.045425-140-runner.jar
+    md5: fff3e92b7f882b14c8b760a89f766317
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 8c2dd02a593..72104a5fc7d 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210819.055112-219-runner.jar
-    md5: cbcaf7dd9ae2c4b1794744819fa779ba
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210825.042149-225-runner.jar
+    md5: e5cd0a35373de47522e098d322408baf
 
 execute:
   - script: configure

From 71cadb5d92742e54144a3bad507346d2cd215b53 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 27 Aug 2021 00:18:38 +0200
Subject: [PATCH 344/709] Updated Maven artifacts (#685)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index c10abb3a600..c9c404272f7 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210825.035834-222-runner.jar
-    md5: 415f246db47a3fd73f047db41b303d93
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210826.040241-224-runner.jar
+    md5: fedaa6ed0f902058670a0247dbd2aec3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 1b1c8725a37..0c5cb426eb2 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210825.040130-223-runner.jar
-    md5: 1e79c312f176b1b8e7887c970e3d0d12
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210826.040855-225-runner.jar
+    md5: e1bf2d88d6ff7235c46799b53125b05c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 9b0f47a5c5f..b45fc4ce3c3 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210825.040431-67-runner.jar
-    md5: d7855e211922c04c73c6ef7d95116e71
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210826.041528-69-runner.jar
+    md5: 78466acd7715472a2bbd6aefb05fa129
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 14e56e57009..bdd981bb10b 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210825.044940-228-runner.jar
-    md5: b0dbdec178f33fb9413027cb492a8182
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210826.053444-230-runner.jar
+    md5: ef8cdc56c171bb6590c5c5e59f53d288
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210825.044824-225-runner.jar
-    md5: eb969e3e9f952f89dc80608e82d1de10
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210826.053242-227-runner.jar
+    md5: e7d9201dc3f3e2e85d54cce6ee2af6aa
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 18c68f3159c..b288003e093 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210825.045720-169-runner.jar
-    md5: 4576044a7f965c1b2f6edca7ae1bfaa7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210826.054701-171-runner.jar
+    md5: 692c7b1d98edb083535fb48db1555094
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 03c7b966e05..02c190c5fc9 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210825.034402-100-runner.jar
-    md5: 46b6212364b58fe2eb85fc775f869994
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210826.033641-102-runner.jar
+    md5: ee43ea19cb712590340e818eee85bb15
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 102bc353fad..8866e3b4eb0 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210825.034634-98-runner.jar
-    md5: 368ea79effd6927bddcbb9acaef9a7f0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210826.034104-100-runner.jar
+    md5: 87e570b73f81bf92537f8ecbed266f99
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 5065d14caac..96601dfa261 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210825.035135-80-runner.jar
-    md5: 1552c4e2de67b40e0cad4b7115965e0c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210826.034946-82-runner.jar
+    md5: ff1d9d0775d0bd4bdd9f8d38b1620108
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index ca5e61d74b3..410897d5b13 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210825.034906-100-runner.jar
-    md5: 75109bbd23a80e7c4cf1930d8be92ea6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210826.034531-102-runner.jar
+    md5: 01d4fbedb4f18c062f4194ecfcbbffa4
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 1af9c648fd1..24eaa2aec17 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210825.041945-224-runner.jar
-    md5: c20d2b6b8a9bda15abc38ae2c1d4bff3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210826.045744-226-runner.jar
+    md5: 30c9a2aefdfc8ecb0287d8e6ac829f16
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index ed86649f8e5..85814cf78b4 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210825.042227-224-runner.jar
-    md5: 30cb754de1b8c34ef37a762887f5906e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210826.050358-226-runner.jar
+    md5: 53c435df5eebeac38624ba20586cab2b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index d747c79c0af..ff531add5e5 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210825.045322-139-runner.jar
-    md5: aa956854625cce86b797656923debbcd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210826.054110-141-runner.jar
+    md5: 158682c3a8c479cb039bb58139a3c5be
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 166f0dd977e..f5278a906a7 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210825.045425-140-runner.jar
-    md5: fff3e92b7f882b14c8b760a89f766317
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210826.054249-142-runner.jar
+    md5: b0dbccf23553d2cde1dcf3533f446218
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 72104a5fc7d..3240f7115c0 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210825.042149-225-runner.jar
-    md5: e5cd0a35373de47522e098d322408baf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210826.050302-227-runner.jar
+    md5: a6787868fa9863aaaa8fec86e0cd1479
 
 execute:
   - script: configure

From 84ec82c912551ee2e7b25c53cee7d93df71ae50d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 27 Aug 2021 15:09:16 +0200
Subject: [PATCH 345/709] Updated Maven artifacts (#689)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index c9c404272f7..46b021f148a 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210826.040241-224-runner.jar
-    md5: fedaa6ed0f902058670a0247dbd2aec3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210827.044658-225-runner.jar
+    md5: 3ae728b10874823b49cdac8af815d475
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 0c5cb426eb2..a772768653f 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210826.040855-225-runner.jar
-    md5: e1bf2d88d6ff7235c46799b53125b05c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210827.045111-226-runner.jar
+    md5: c5135676d1173594e7fc6e12c3effaec
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index b45fc4ce3c3..094e1a824bf 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210826.041528-69-runner.jar
-    md5: 78466acd7715472a2bbd6aefb05fa129
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210827.045517-70-runner.jar
+    md5: 8dcff37b8fc346f39e4860caa30bc04d
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index bdd981bb10b..93281d4a744 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210826.053444-230-runner.jar
-    md5: ef8cdc56c171bb6590c5c5e59f53d288
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210827.055045-231-runner.jar
+    md5: e665bd8dab0ebcb6cb5948b15b122554
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210826.053242-227-runner.jar
-    md5: e7d9201dc3f3e2e85d54cce6ee2af6aa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210827.054902-228-runner.jar
+    md5: afa17a956caf15a3c46605231d90a035
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index b288003e093..49bf3227039 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210826.054701-171-runner.jar
-    md5: 692c7b1d98edb083535fb48db1555094
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210827.055959-172-runner.jar
+    md5: fcf9fda7f6dffc6df30e8a89ca1e2448
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 02c190c5fc9..30c367a7a32 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210826.033641-102-runner.jar
-    md5: ee43ea19cb712590340e818eee85bb15
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210827.042618-103-runner.jar
+    md5: 4122c2fcc6e98cf488b4ec40e33680b5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 8866e3b4eb0..83f982e73b7 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210826.034104-100-runner.jar
-    md5: 87e570b73f81bf92537f8ecbed266f99
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210827.043002-101-runner.jar
+    md5: eb1395653e98c424bf29b6764ad326c2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 96601dfa261..7fb2ee1a96e 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210826.034946-82-runner.jar
-    md5: ff1d9d0775d0bd4bdd9f8d38b1620108
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210827.043716-83-runner.jar
+    md5: 0128638239dcff60e868ea09dab72e39
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 410897d5b13..7c5f21651b2 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210826.034531-102-runner.jar
-    md5: 01d4fbedb4f18c062f4194ecfcbbffa4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210827.043346-103-runner.jar
+    md5: aa02cf0683f6883837b3dceb62cc1c1c
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 24eaa2aec17..bf80087c6bf 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210826.045744-226-runner.jar
-    md5: 30c9a2aefdfc8ecb0287d8e6ac829f16
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210827.051824-227-runner.jar
+    md5: 9e6131a08e4099c9376d0d057ce37330
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 85814cf78b4..3262172d9a9 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210826.050358-226-runner.jar
-    md5: 53c435df5eebeac38624ba20586cab2b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210827.052214-227-runner.jar
+    md5: 3c84361781492331fa6de45c6095f7da
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index f5278a906a7..638b96396d9 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210826.054249-142-runner.jar
-    md5: b0dbccf23553d2cde1dcf3533f446218
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210827.055624-143-runner.jar
+    md5: 829d0963c5d97309b3171b4014dba05f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 3240f7115c0..ec92133f45a 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210826.050302-227-runner.jar
-    md5: a6787868fa9863aaaa8fec86e0cd1479
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210827.052126-228-runner.jar
+    md5: 3f1277caa6ea817fa3028543868beb54
 
 execute:
   - script: configure

From 7c2ace8def56ec0b9767b0d512b04e8bc9c0a578 Mon Sep 17 00:00:00 2001
From: Vincent Smith <vosmith08@gmail.com>
Date: Mon, 30 Aug 2021 08:34:54 -0400
Subject: [PATCH 346/709] Fix small grammar issues (#687)

* Fix small grammar issues

This make a few corrections to the README, mostly focused on verb tense and articles.

* Update remaining container log observations

Co-authored-by: Spolti <filippespolti@gmail.com>
---
 README.md | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 9dfddd5b643..f8645c9975c 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Kogito
 
 # Kogito Container Images
 
-To be able to efficiently execute Kogito services on the Cloud there's a need to have Container Images so it can played
+To be able to efficiently execute Kogito services on the Cloud there's a need to have Container Images so it can be played
 smoothly on any Kubernetes cluster. There are a few sets images which are divided in three different groups which are 
 the components, the builder images and the runtime images.
 
@@ -113,7 +113,7 @@ Those are described bellow.
 
 ### Kogito Builder Images
 
-The Kogito Builder Images are responsible for building the project with Apache Maven and generate the binary that will 
+The Kogito Builder Images are responsible for building the project with Apache Maven and generating the binary that will 
 be used by the Kogito Runtime images to run the Kogito application.
 
 The current available Kogito Builder image is:
@@ -135,7 +135,7 @@ For more information about what is installed on this image, take a look [here](k
 
 #### Kogito Builder Image usage
 
-This image contains a helper option to better understand how to it:
+This image contains a helper option to better understand how to use it:
 
 ```bash
 $ docker run -it quay.io/kiegroup/kogito-builder:latest /home/kogito/kogito-app-launch.sh -h
@@ -280,7 +280,7 @@ This can significantly improve the build time.
 
 Another option is to use a Maven Mirror.  
 This can be used together with incremental builds to speed up the build even more.  
-To turn it possible we just need to set the **MAVEN_MIRROR_URL** environment variable when starting a new build, see the example below:
+To make it possible we just need to set the **MAVEN_MIRROR_URL** environment variable when starting a new build, see the example below:
 
 
 ```bash
@@ -301,10 +301,10 @@ sys	0m0.539s
 ```
 
 Here you can see that the build time has again been reduced. 
-If the maven mirror already have all the dependencies there, the build time can be even faster.  
+If the maven mirror already has all the dependencies there, the build time can be even faster.  
 Also, Maven generates lots of transfer logs for downloading/uploading of maven dependencies. By default, these logs are disabled. To view these logs we need to set env variable **MAVEN_DOWNLOAD_OUTPUT** to true. 
 
-If a custom Maven Repository is required, the S2i images also supports it.  
+If a custom Maven Repository is required, the S2i images also support it.  
 In case the **MAVEN_REPO_URL** environment variable is provided a new Repository and Plugin Repository will be added to the internal `settings.xml` file.  
 If no repo-id is provided using the **MAVEN_REPO_ID** environment variable, a generated one will be used.  
 There is also the possibility to provide more than one custom Repository. In this case, we need to provide the repo **prefix** using the **MAVEN_REPOS** environment variable.  
@@ -356,7 +356,7 @@ The available archetypes are:
 - [Kogito Quarkus Archetype](https://github.com/kiegroup/kogito-runtimes/tree/main/archetypes/kogito-quarkus-archetype)
 - [Kogito Spring Boot Archetype](https://github.com/kiegroup/kogito-runtimes/tree/main/archetypes/kogito-springboot-archetype)
 
-Note that, when building Quarkus based application that is **not** a *UberJAR* we also need to copy the **lib** directory 
+Note that, when building Quarkus based application that is **not** an *UberJAR* we also need to copy the **lib** directory 
 located inside the *target* directory.  
 Examples on how to use this feature can be found in the next topics.
 
@@ -382,7 +382,7 @@ The Image can run an application based on Quarkus or Springboot. Users can defin
 
 ##### Kogito Runtime JVM Image usage
 
-This image contains a helper option to better understand how to it:
+This image contains a helper option to better understand how to use it:
 
 ```bash
 docker run -it quay.io/kiegroup/kogito-runtime-jvm:latest /home/kogito/kogito-app-launch.sh -h
@@ -392,7 +392,7 @@ docker run -it quay.io/kiegroup/kogito-runtime-jvm:latest /home/kogito/kogito-ap
 ##### Kogito Runtime JVM Image examples
 
 In the next few lines let's take a look on how this image can be used to receive an already built UberJAR. 
-To configure Quarkus to generate a UberJAR please follow the instructions described [here](https://quarkus.io/guides/maven-tooling#configuration-reference)
+To configure Quarkus to generate an UberJAR please follow the instructions described [here](https://quarkus.io/guides/maven-tooling#configuration-reference)
 
 For this example let's use the [process-quarkus-example](https://github.com/kiegroup/kogito-examples/tree/stable/process-quarkus-example).
 Once you have checked out the example on your local machine follow the steps below:
@@ -413,7 +413,7 @@ $ docker run -p 8080:8080 -it process-quarkus-example
 # On another shell do a simple post request 
 curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
 
-#repare the container logs the following message:
+# notice the container logs the following message:
 Order has been created Order[12345] with assigned approver JOHN
 ```
 
@@ -424,7 +424,7 @@ For non uberjar the process is the same, but you only need to remove the propert
 $ mvn clean package
 ```
 
-Note that this time there is a *lib* folder into the **target** directory. The s2i build will take care of copying it to the correct place. 
+Note that this time there is a *lib* folder in the **target** directory. The s2i build will take care of copying it to the correct place. 
 Just perform a build:
 
 ```bash
@@ -434,7 +434,7 @@ $ docker run -p 8080:8080 -it process-quarkus-example-non-uberjar
 # On another shell do a simple post request 
 $ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
 
-#repare the container logs the following message:
+# notice the container logs the following message:
 Order has been created Order[12345] with assigned approver JOHN
 ```
 **Runtime Image example with springboot**
@@ -466,7 +466,7 @@ $ docker run -it -p 8080:8080 spring-binary-example
 # on another terminal, interact with the kogito service
 $ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
 
-#repare the container logs the following message:
+# notice the container logs the following message:
 Order has been created Order[12345] with assigned approver JOHN
 ```
 
@@ -512,7 +512,7 @@ $ docker run -it -p 8080:8080 binary-test-example
 # on another terminal, interact with the kogito service
 $ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
 
-#repare the container logs the following message:
+# notice the container logs the following message:
 Order has been created Order[12345] with assigned approver JOHN
 ```
 
@@ -520,7 +520,7 @@ Order has been created Order[12345] with assigned approver JOHN
 
 The Kogito Component Images can be considered as lightweight images that will complement the Kogito core engine 
 by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications.
-Today we have 3 Kogito Component Images:
+Today we have 14 Kogito Component Images:
 
 * [quay.io/kiegroup/kogito-data-index-infinispan](https://quay.io/kiegroup/kogito-data-index-infinispan)
 * [quay.io/kiegroup/kogito-data-index-mongodb](https://quay.io/kiegroup/kogito-data-index-mongodb)
@@ -608,7 +608,7 @@ to your Kogito infrastructure on a Kubernetes cluster and provide its capabiliti
 
 The Trusty Service aims at collecting tracing information by one or more Kogito runtime services and provides analytical capabilities on top of the collected data. 
 The Trusty Service depends on a running Infinispan or Redis Server.
-The Persistence service can be switched by using its corresponding image
+The Trusty service can be switched by using its corresponding image
 
 - Infinispan: quay.io/kiegroup/kogito-trusty-infinispan
     [image.yaml](kogito-trusty-infinispan-overrides.yaml)
@@ -645,7 +645,7 @@ It does not execute the job itself, but it triggers a callback that could be an
 on the job request, or any other callback that could be supported by the service. 
 For more information please visit this [link](https://github.com/kiegroup/kogito-runtimes/wiki/Job-Service).
 
-Today, the Jobs service contains two images:
+Today, the Jobs service contains four images:
 
 - [ephemeral](kogito-jobs-service-ephemeral-overrides.yaml)
 - [infinispan](kogito-jobs-service-infinispan-overrides.yaml)
@@ -667,7 +667,7 @@ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-infi
 You should notice a few debug messages being printed in the system output.
 
 The ephemeral image does not have external dependencies like a backend persistence provider, it uses in-memory persistence
-while working with Jobs Services `infinispan`, `mongodb` and `postgresql` variants, it will need to have an Infinispan, MongoDB and PostgreSQL server,
+while working with Jobs Services `infinispan`, `mongodb` and `postgresql` variants, it will need to have an Infinispan, MongoDB or PostgreSQL server,
 respectively, previously running.
 
 
@@ -966,7 +966,7 @@ To deploy and test the new image, follow the same steps as described [here](#usi
 
 ## Contributing to Kogito Images repository
 
-Before proceed please make sure you have checked the [requirements](#kogito-images-requirements).
+Before proceeding please make sure you have checked the [requirements](#kogito-images-requirements).
 
 
 ### Building Images
@@ -1171,7 +1171,7 @@ But one Scenario can have one action defined by the keywords given or when, the
  In this test, we can specify any valid environment variable or a set of them.
  - **When container is started with args**: Most useful when you want to pass some docker argument, i.e. memory limit for the container.
 
-The **Then** clause is used to do your validations, test something, looking for a keyword in the logs, etc. 
+The **Then** clause is used to do your validations, test something, look for a keyword in the logs, etc. 
 If you need to validate more than one thing you can add a new line with the **And** keyword, like this example:
 
 ```bash
@@ -1197,7 +1197,7 @@ CeKit allow us to use tags, it is very useful to segregate tests, if we want to
 given image, we need to annotate the test specific or the entire feature with the image name, for example, 
 we have the common tests that needs to run against almost all images, instead to add the same tests for every 
 image feature, we create a common feature and annotate it with the images we want that
-specific test or feature to run, a example can be found on [this common test](tests/features/common.feature)
+specific test or feature to run, an example can be found on [this common test](tests/features/common.feature)
 For example, suppose you are working on a new feature and add tests to cover your changes. You don't want to run all existing tests, 
 this can be easily done by adding the **@wip** tag on the behave test that you are creating.
 
@@ -1205,7 +1205,7 @@ All images have already test feature files. If a new image is being created, a n
 and the very first line of this file would need to contain a tag with the image name.
 
 For example, if we are creating a new image called quay.io/kiegroup/kogito-moon-service, we would have a feature called
-**kogito-moon-service.feature** under the **tests/features** directory and this file will looks like with the following
+**kogito-moon-service.feature** under the **tests/features** directory and this file will look like with the following
 example:
 
 ```text
@@ -1252,7 +1252,7 @@ As an example, let's execute the tests from the [kogito-s2i-core](modules/kogito
 
 ##### Writing Bats tests
 
-The best way to start to interact with Bats tests is take a look on its [documentation](https://github.com/sstephenson/bats) 
+The best way to start to interact with Bats tests is to take a look on its [documentation](https://github.com/sstephenson/bats) 
 and after use the existing ones as example.
 
 [Here](modules/kogito-jobs-service-common/tests/bats) you can find a basic example about how our Bats tests

From 35924abdf400fc75a5d8e76e9952cf6270f6d9cb Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 2 Sep 2021 14:10:27 -0300
Subject: [PATCH 347/709] Updated Maven artifacts (#703)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 46b021f148a..1a28f0c630e 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210827.044658-225-runner.jar
-    md5: 3ae728b10874823b49cdac8af815d475
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210902.045015-231-runner.jar
+    md5: 33a71f4da94f99421c95d36342e29b57
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index a772768653f..f579668118f 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210827.045111-226-runner.jar
-    md5: c5135676d1173594e7fc6e12c3effaec
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210902.045420-232-runner.jar
+    md5: aa0e354eaf0228227361461de304283d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 094e1a824bf..7deacd451ae 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210827.045517-70-runner.jar
-    md5: 8dcff37b8fc346f39e4860caa30bc04d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210902.045819-76-runner.jar
+    md5: 95257b9f49044b9d6ad3cf843b6364ee
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 93281d4a744..b5f31112e43 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210827.055045-231-runner.jar
-    md5: e665bd8dab0ebcb6cb5948b15b122554
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210902.055128-237-runner.jar
+    md5: 2af3a755aa40c4b72f352eada4512354
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210827.054902-228-runner.jar
-    md5: afa17a956caf15a3c46605231d90a035
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210902.054944-234-runner.jar
+    md5: 83ffeb73a9eeeea02bec5e65d4dc23bd
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 49bf3227039..ca48944465c 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210827.055959-172-runner.jar
-    md5: fcf9fda7f6dffc6df30e8a89ca1e2448
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210902.060055-178-runner.jar
+    md5: 3ec7ec9eda30642aafd5c8505b114dff
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 30c367a7a32..6632fdc2a32 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210827.042618-103-runner.jar
-    md5: 4122c2fcc6e98cf488b4ec40e33680b5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210902.043126-108-runner.jar
+    md5: 72bee65a726e6fb3eed2718d4ed17192
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 83f982e73b7..2d9ca51d6ec 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210827.043002-101-runner.jar
-    md5: eb1395653e98c424bf29b6764ad326c2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210902.043448-106-runner.jar
+    md5: e5da93cdeb58a5565f54ecabc9d28ce3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 7fb2ee1a96e..01ae6042a96 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210827.043716-83-runner.jar
-    md5: 0128638239dcff60e868ea09dab72e39
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210902.044115-88-runner.jar
+    md5: a7d6a11e73a31527db49b66d69de5082
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 7c5f21651b2..ba59e637f2e 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210827.043346-103-runner.jar
-    md5: aa02cf0683f6883837b3dceb62cc1c1c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210902.043806-108-runner.jar
+    md5: 95a810d478200221b1471277ad6b8bfb
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index bf80087c6bf..f4146ee3e6a 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210827.051824-227-runner.jar
-    md5: 9e6131a08e4099c9376d0d057ce37330
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210902.051936-232-runner.jar
+    md5: ea4321bd2e2e0159d1ba092be55e8c96
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 3262172d9a9..c83c1566d20 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210827.052214-227-runner.jar
-    md5: 3c84361781492331fa6de45c6095f7da
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210902.052313-232-runner.jar
+    md5: d2336f2b0a436577908e228e170bf3b9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index ff531add5e5..02cfbc4ebaf 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210826.054110-141-runner.jar
-    md5: 158682c3a8c479cb039bb58139a3c5be
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210902.055628-146-runner.jar
+    md5: b2c05bb136f76db11eaccc2312179c28
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 638b96396d9..42dae79dc91 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210827.055624-143-runner.jar
-    md5: 829d0963c5d97309b3171b4014dba05f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210902.055741-148-runner.jar
+    md5: ba7e8cbd643b681a3ebf48a324b8441e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index ec92133f45a..7cceb0390a0 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210827.052126-228-runner.jar
-    md5: 3f1277caa6ea817fa3028543868beb54
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210902.052227-233-runner.jar
+    md5: 51d2e643f983017d3b13a15ae862d92f
 
 execute:
   - script: configure

From fb0deafa68b14fc29a4ddc402facfb93854d9e16 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 3 Sep 2021 04:30:02 -0300
Subject: [PATCH 348/709] [KOGITO-5779] - Images failing due to  no more
 existing (#696)

Signed-off-by: spolti <fspolti@redhat.com>
---
 README.md                                     |  3 +-
 modules/kogito-s2i-core/added/s2i-core        | 62 ++++++++++++-------
 modules/kogito-s2i-core/module.yaml           |  1 +
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 10 +--
 tests/features/kogito-builder.feature         |  8 +--
 5 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index f8645c9975c..c8d5ded4a68 100644
--- a/README.md
+++ b/README.md
@@ -302,7 +302,8 @@ sys	0m0.539s
 
 Here you can see that the build time has again been reduced. 
 If the maven mirror already has all the dependencies there, the build time can be even faster.  
-Also, Maven generates lots of transfer logs for downloading/uploading of maven dependencies. By default, these logs are disabled. To view these logs we need to set env variable **MAVEN_DOWNLOAD_OUTPUT** to true. 
+Also, Maven generates lots of transfer logs for downloading/uploading of maven dependencies. By default, these logs are 
+disabled. To view these logs we need to set env variable **MAVEN_DOWNLOAD_OUTPUT** to true. 
 
 If a custom Maven Repository is required, the S2i images also support it.  
 In case the **MAVEN_REPO_URL** environment variable is provided a new Repository and Plugin Repository will be added to the internal `settings.xml` file.  
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index fc2935f3beb..8ddc016bc56 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -102,26 +102,30 @@ function build_kogito_app() {
             -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 
     else
-        local ARCHETYPE_ARTIFACT_ID
-        # for product builds, the "dm" identifier will be used
-        local BUILD_IDENTIFIER="-"
-        if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-            BUILD_IDENTIFIER="-dm-"
-        fi
+        log_info "---> Generating $RUNTIME_TYPE project structure for $PROJECT_ARTIFACT_ID..."
         if [ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]; then
-            ARCHETYPE_ARTIFACT_ID="kogito-quarkus${BUILD_IDENTIFIER}archetype"
+            local quarkus_version
+            quarkus_version=$(get_quarkus_version) || exit 1
+            log_info "----> Using Quarkus version ${quarkus_version} to bootstrap the application."
+
+            $MAVEN_HOME/bin/mvn -U -B ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml \
+                io.quarkus:quarkus-maven-plugin:"${quarkus_version}":create  \
+                    -DprojectGroupId=$PROJECT_GROUP_ID \
+                    -DprojectArtifactId=$PROJECT_ARTIFACT_ID \
+                    -DprojectVersion=$PROJECT_VERSION \
+                    -Dextensions="kogito"
+
         elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
-            ARCHETYPE_ARTIFACT_ID="kogito-springboot${BUILD_IDENTIFIER}archetype"
+            log_info "----> Using Spring Boot to bootstrap the application."
+            $MAVEN_HOME/bin/mvn archetype:generate -U -B -DinteractiveMode=false -DarchetypeGroupId=org.kie.kogito \
+                -DarchetypeArtifactId=kogito-spring-boot-archetype -DarchetypeVersion=$KOGITO_VERSION \
+                -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
+                ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml
         else
             log_error "---> Invalid RUNTIME_TYPE(${RUNTIME_TYPE}) provided, failing build..."
             exit 1
         fi
 
-        log_info "---> Generating $RUNTIME_TYPE project structure using the $ARCHETYPE_ARTIFACT_ID archetype..."
-        $MAVEN_HOME/bin/mvn archetype:generate -U -B -DinteractiveMode=false -DarchetypeGroupId=org.kie.kogito -DarchetypeArtifactId=$ARCHETYPE_ARTIFACT_ID \
-            -DarchetypeVersion=$KOGITO_VERSION -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
-            ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml
-
         # remove resources generated by the archetype
         log_info "--> Remove archetype generated resources"
         rm -rfv $PROJECT_ARTIFACT_ID/src/main/resources/*.{bpm,bpmn2,dmn,drl}
@@ -139,7 +143,7 @@ function build_kogito_app() {
                 if [[ ${item} =~ .*\.sw\.(yaml|yml|json) ]]; then
                     if [[ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]]; then
                         log_info "--> Found Serverless Workflow file. Will add Kogito Quarkus Workflows extension to the project."
-                        require_sw=true
+                        require_sw="true"
                     else
                         log_warning "--> Builds from Serverless Workflow files are not supported for SpringBoot. Please build your project locally or use Quarkus."
                         break
@@ -152,18 +156,17 @@ function build_kogito_app() {
         mv -v $PROJECT_ARTIFACT_ID/* .
 
         # add extension if needed
-        if [ ${require_sw} = true ]; then
+        if [ "${require_sw}" == "true" ]; then
             log_info "--> Adding Kogito Quarkus Workflows extension to the generated project."
-            # we must set the evaluate version since forceStdout is not available in previous versions
-            quarkus_version=$($MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml help:evaluate -q -DforceStdout -Dexpression=quarkus.version)
-            if [[ ! "$quarkus_version" =~ [0-9]{0,2}\.[0-9]{0,3} ]]; then
-                log_error "--> Impossible to get Quarkus version from the generated Maven project (output: '$quarkus_version'), failing build"
-                exit 1
-            fi
 
+            # we must set the evaluate version since forceStdout is not available in previous versions
+            local quarkus_version
+            quarkus_version=$(get_quarkus_version) || exit 1
             log_info "--> Quarkus version is '$quarkus_version'"
 
-            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml io.quarkus:quarkus-maven-plugin:$quarkus_version:add-extension -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow"
+            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml \
+                io.quarkus:quarkus-maven-plugin:"${quarkus_version}":add-extension \
+                -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow"
         fi
 
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \
@@ -217,3 +220,18 @@ function get_runtime_type() {
     log_info "---> Setting RUNTIME_TYPE to ${runtime_type}"
     echo "${runtime_type}"
 }
+
+
+function get_quarkus_version() {
+    log_info "Trying to retrieve Quarkus version from org.kie.kogito:kogito-build-parent:${KOGITO_VERSION}"
+    local ver=$($MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml help:evaluate -q \
+        -Dartifact=org.kie.kogito:kogito-build-parent:"${KOGITO_VERSION}" \
+        -Dexpression=version.io.quarkus \
+        -DforceStdout)
+
+    if [[ ! "$ver" =~ [0-9]{0,2}\.[0-9]{0,3} ]]; then
+        log_error "--> Impossible to get Quarkus version from the generated Maven project (output: '$ver'), failing build"
+        exit 1
+    fi
+    echo $ver
+}
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 57391169fb6..27ef9de48a8 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -48,3 +48,4 @@ run:
 
 execute:
   - script: configure.sh
+
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index b11d710245c..13701b4b532 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -363,7 +363,7 @@ teardown() {
     rm -rf target/*
 
     echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating $QUARKUS_RUNTIME_TYPE project structure using the kogito-quarkus-archetype archetype..." ]
+    [ "${lines[0]}" = "---> Generating quarkus project structure for project..." ]
 }
 
 @test "build_kogito_app only checks if it will generate the springboot project in case there's no pom.xml" {
@@ -373,7 +373,8 @@ teardown() {
     rm -rf target/*
 
     echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating $SPRINGBOOT_RUNTIME_TYPE project structure using the kogito-springboot-archetype archetype..." ]
+    [ "${lines[0]}" = "---> Generating springboot project structure for project..." ]
+    [ "${lines[1]}" = "----> Using Spring Boot to bootstrap the application." ]
 }
 
 @test "build_kogito_app only checks if it will a build will be triggered if a pom is found" {
@@ -394,7 +395,7 @@ teardown() {
     run build_kogito_app
     rm -rf target/*
     echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating quarkus project structure using the kogito-quarkus-archetype archetype..." ]
+    [ "${lines[0]}" = "---> Generating quarkus project structure for project..." ]
 }
 
 @test "build_kogito_app build a project from a YAML Serverless Workflow file" {
@@ -405,5 +406,6 @@ teardown() {
     rm -rf target/*
 
     echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating quarkus project structure using the kogito-quarkus-archetype archetype..." ]
+    [ "${lines[0]}" = "---> Generating quarkus project structure for project..." ]
 }
+
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index c1b029ea06f..4671b93eb9c 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -48,7 +48,7 @@ Feature: kogito-builder image tests
       | NATIVE         | false          |
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |
     Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-archetype archetype...
+    And s2i build log should contain Generating quarkus project structure for project...
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |
@@ -69,7 +69,7 @@ Feature: kogito-builder image tests
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
     Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-archetype archetype...
+    And s2i build log should contain Generating quarkus project structure for myproject...
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |
@@ -91,7 +91,7 @@ Feature: kogito-builder image tests
       | PROJECT_VERSION     | 2.0-SNAPSHOT          |
       | K_SINK              | http://localhost:8181 |
     Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-archetype archetype...
+    And s2i build log should contain Generating quarkus project structure for myproject...
     And s2i build log should contain Adding Kogito Quarkus Workflows extension to the generated project.
     And check that page is served
       | property              | value                         |
@@ -111,7 +111,7 @@ Feature: kogito-builder image tests
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
-    And s2i build log should contain Generating springboot project structure using the kogito-springboot-archetype archetype...
+    And s2i build log should contain Generating springboot project structure for project...
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |

From a3cb766a02ad83d2afc9b7f31ba1cbd88cc1f7f0 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 3 Sep 2021 13:53:19 -0300
Subject: [PATCH 349/709] Updated Maven artifacts (#707)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 1a28f0c630e..94e46487fa6 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210902.045015-231-runner.jar
-    md5: 33a71f4da94f99421c95d36342e29b57
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210903.042444-232-runner.jar
+    md5: d507980b7e9b4993371b443df4633cc0
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index f579668118f..8149530c74f 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210902.045420-232-runner.jar
-    md5: aa0e354eaf0228227361461de304283d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210903.042818-233-runner.jar
+    md5: deb972a2c8db307df91d597ebb43d563
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 7deacd451ae..3f658b12806 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210902.045819-76-runner.jar
-    md5: 95257b9f49044b9d6ad3cf843b6364ee
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210903.043150-77-runner.jar
+    md5: 3484b6fef0ac4cd4ea2d418417770303
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index b5f31112e43..c9123002fd9 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210902.055128-237-runner.jar
-    md5: 2af3a755aa40c4b72f352eada4512354
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210903.051924-238-runner.jar
+    md5: dc862166c37e285d752b9b6c07e8596f
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210902.054944-234-runner.jar
-    md5: 83ffeb73a9eeeea02bec5e65d4dc23bd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210903.051757-235-runner.jar
+    md5: dd2dbf530e9ff3e8e5737f6c451b40f8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index ca48944465c..b3b5458c653 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210902.060055-178-runner.jar
-    md5: 3ec7ec9eda30642aafd5c8505b114dff
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210903.052737-179-runner.jar
+    md5: faa048d4de0be1875626ce1863bd68a7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 6632fdc2a32..6861f0ffa71 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210902.043126-108-runner.jar
-    md5: 72bee65a726e6fb3eed2718d4ed17192
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210903.040739-109-runner.jar
+    md5: 922af2305b67b731c1921f2830ede4ad
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 2d9ca51d6ec..f22572a84aa 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210902.043448-106-runner.jar
-    md5: e5da93cdeb58a5565f54ecabc9d28ce3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210903.041033-107-runner.jar
+    md5: 28a291b3747cfefc0c8d50b78f2aab95
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 01ae6042a96..831e2a4c6dd 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210902.044115-88-runner.jar
-    md5: a7d6a11e73a31527db49b66d69de5082
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210903.041622-89-runner.jar
+    md5: 12652f4b0ad648df0a9195d34e961687
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index ba59e637f2e..8b461a737b1 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210902.043806-108-runner.jar
-    md5: 95a810d478200221b1471277ad6b8bfb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210903.041327-109-runner.jar
+    md5: 0eb1e5751ed7afd5f4234c1196215ae9
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index f4146ee3e6a..30f67438d1e 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210902.051936-232-runner.jar
-    md5: ea4321bd2e2e0159d1ba092be55e8c96
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210903.044950-233-runner.jar
+    md5: 9b82c633a8360457412eef94255e437b
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index c83c1566d20..79922606a2b 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210902.052313-232-runner.jar
-    md5: d2336f2b0a436577908e228e170bf3b9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210903.045240-233-runner.jar
+    md5: 8c9d1026ddb08ae8884d3796a42d2564
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 02cfbc4ebaf..3575e64815f 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210902.055628-146-runner.jar
-    md5: b2c05bb136f76db11eaccc2312179c28
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210903.052344-147-runner.jar
+    md5: 78de1734f07e318275749c455d65175d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 42dae79dc91..505345a9162 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210902.055741-148-runner.jar
-    md5: ba7e8cbd643b681a3ebf48a324b8441e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210903.052448-149-runner.jar
+    md5: b883151182a2d59a851cda674b2c1de3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 7cceb0390a0..30ce8085f98 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210902.052227-233-runner.jar
-    md5: 51d2e643f983017d3b13a15ae862d92f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210903.045205-234-runner.jar
+    md5: 09cb82dc08630dd9ba2027816038a663
 
 execute:
   - script: configure

From 00ce90eca9404bf0ab673379e1fad31e02c73207 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 6 Sep 2021 09:29:12 +0200
Subject: [PATCH 350/709] KGOITO-5781 Push reduced tag in deploy (#686)

---
 .ci/jenkins/Jenkinsfile.deploy | 41 +++++++++++++++++++++++++++++++---
 .ci/jenkins/dsl/jobs.groovy    |  1 +
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 47486ba6287..a8da684505f 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -424,13 +424,32 @@ List getFailedImages() {
 
 void tagImages() {
     for (String imageName : getBuiltImages()) {
-        sh "${env.CONTAINER_ENGINE} tag quay.io/kiegroup/${imageName}:latest ${buildImageName(imageName)}"
+        String builtImageFullTag = "quay.io/kiegroup/${imageName}:latest"
+        tagImage(builtImageFullTag, buildImageName(imageName))
+        if (isDeployLatestTag()) {
+            tagImage(builtImageFullTag, buildImageName(imageName, 'latest'))
+        }
+        String reducedTag = getReducedTag()
+        if (reducedTag) {
+            tagImage(builtImageFullTag, buildImageName(imageName, reducedTag))
+        }
     }
 }
 
+void tagImage(String oldImageName, String newImageName) {
+    sh "${env.CONTAINER_ENGINE} tag ${oldImageName} ${newImageName}"
+}
+
 void pushImages() {
     for (String imageName : getBuiltImages()) {
         pushImage(buildImageName(imageName))
+        if (isDeployLatestTag()) {
+            pushImage(buildImageName(imageName, 'latest'))
+        }
+        String reducedTag = getReducedTag()
+        if (reducedTag) {
+            pushImage(buildImageName(imageName, reducedTag))
+        }
     }
 }
 
@@ -454,14 +473,25 @@ void makeQuayImagesPublic() {
     }
 }
 
-String buildImageName(String imageName) {
-    return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName(imageName)}:${getDeployImageTag()}"
+String buildImageName(String imageName, String imageTag = '') {
+    return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName(imageName)}:${imageTag ?: getDeployImageTag()}"
 }
 
 String getFinalImageName(String imageName) {
     return getDeployImageNameSuffix() ? "${imageName}-${getDeployImageNameSuffix()}" : imageName
 }
 
+String getReducedTag() {
+    try {
+        String version = getDeployImageTag()
+        String[] versionSplit = version.split("\\.")
+        return "${versionSplit[0]}.${versionSplit[1]}"
+    } catch (error) {
+        echo "${getDeployImageTag()} cannot be reduced to the format X.Y"
+    }
+    return ''
+}
+
 void loginOpenshift() {
     withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]) {
         sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
@@ -522,6 +552,11 @@ boolean isQuayRegistry() {
     return getDeployImageRegistry() == 'quay.io'
 }
 
+boolean isDeployLatestTag() {
+    return params.DEPLOY_WITH_LATEST_TAG
+}
+
+
 ////////////////////////////////////////////////////////////////////////
 // Workspaces
 ////////////////////////////////////////////////////////////////////////
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 18b2bfe5177..ac49c71f5fc 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -83,6 +83,7 @@ void setupDeployJob(String jobFolder, KogitoJobType jobType) {
             stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
             stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
             stringParam('IMAGE_TAG', '', 'Image tag to use to deploy images')
+            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
 
             // Release information
             stringParam('PROJECT_VERSION', '', 'Optional if not RELEASE. If RELEASE, cannot be empty.')

From 22ee5ed539cd32629aecfc44ef28b7292c83ce4d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 6 Sep 2021 09:52:12 -0300
Subject: [PATCH 351/709] Updated Maven artifacts (#714)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 94e46487fa6..ec7b5725d85 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210903.042444-232-runner.jar
-    md5: d507980b7e9b4993371b443df4633cc0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210906.051204-235-runner.jar
+    md5: 660b773935052393ff83bd6be2f0569b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 8149530c74f..7b5bc2287bf 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210903.042818-233-runner.jar
-    md5: deb972a2c8db307df91d597ebb43d563
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210906.051520-236-runner.jar
+    md5: 2c637106e9bfca738911c10ec77954e3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 3f658b12806..04e9ac116e5 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210903.043150-77-runner.jar
-    md5: 3484b6fef0ac4cd4ea2d418417770303
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210906.051827-80-runner.jar
+    md5: fca94e070f2e604df92c1ca230844d4a
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index c9123002fd9..d83d4132d97 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210903.051924-238-runner.jar
-    md5: dc862166c37e285d752b9b6c07e8596f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210906.060412-241-runner.jar
+    md5: 810478b66556f6d8eecac991c3423954
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210903.051757-235-runner.jar
-    md5: dd2dbf530e9ff3e8e5737f6c451b40f8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210906.060247-238-runner.jar
+    md5: 62d41dfd239800fd11fd020f37cec4c2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index b3b5458c653..77c0e62a591 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210903.052737-179-runner.jar
-    md5: faa048d4de0be1875626ce1863bd68a7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210906.061222-182-runner.jar
+    md5: 4fef1030f07a06ec6e30a673d718fef2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 6861f0ffa71..24ae90398fd 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210903.040739-109-runner.jar
-    md5: 922af2305b67b731c1921f2830ede4ad
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210906.045647-112-runner.jar
+    md5: 7af73ee6538d551591b89da5e9b7b155
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index f22572a84aa..ff98702ac0c 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210903.041033-107-runner.jar
-    md5: 28a291b3747cfefc0c8d50b78f2aab95
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210906.045933-110-runner.jar
+    md5: e411d90bffe601f9fef155ddc9fdd03e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 831e2a4c6dd..939518d14d5 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210903.041622-89-runner.jar
-    md5: 12652f4b0ad648df0a9195d34e961687
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210906.050449-92-runner.jar
+    md5: 174f160c89cff6af5449f7abf64177c3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 8b461a737b1..7bbad61b9db 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210903.041327-109-runner.jar
-    md5: 0eb1e5751ed7afd5f4234c1196215ae9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210906.050218-112-runner.jar
+    md5: 9e7321205594c720fd2b6f66643b2504
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 30f67438d1e..f3a037587a5 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210903.044950-233-runner.jar
-    md5: 9b82c633a8360457412eef94255e437b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210906.053456-236-runner.jar
+    md5: 4427b3e268456c437f1fc24ad97b2c4f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 79922606a2b..c1a014b536b 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210903.045240-233-runner.jar
-    md5: 8c9d1026ddb08ae8884d3796a42d2564
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210906.053740-236-runner.jar
+    md5: e135de974afc0ad00281993eed4fca12
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 3575e64815f..7af76e986df 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210903.052344-147-runner.jar
-    md5: 78de1734f07e318275749c455d65175d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210906.060824-149-runner.jar
+    md5: 0d2e2c708d131124af29090dcd72551b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 505345a9162..4dea4d39995 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210903.052448-149-runner.jar
-    md5: b883151182a2d59a851cda674b2c1de3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210906.060928-151-runner.jar
+    md5: 0463f4952e5be7c38c162496257b7e8b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 30ce8085f98..cff3c8b643c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210903.045205-234-runner.jar
-    md5: 09cb82dc08630dd9ba2027816038a663
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210906.053704-236-runner.jar
+    md5: a29e557049702d15aafab67ffc7ca164
 
 execute:
   - script: configure

From 7a095a3e8b39895f036b2c671ac278e2a5fe3edb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 7 Sep 2021 12:07:11 +0200
Subject: [PATCH 352/709] RHPAM-3895 Correct rhpam runtime native behave (#715)

---
 tests/features/rhpam-kogito-runtime-native.feature | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/features/rhpam-kogito-runtime-native.feature b/tests/features/rhpam-kogito-runtime-native.feature
index 40f9f567d72..9e3dc8fd159 100644
--- a/tests/features/rhpam-kogito-runtime-native.feature
+++ b/tests/features/rhpam-kogito-runtime-native.feature
@@ -8,8 +8,8 @@ Feature: rhpam-kogito-runtime-jvm feature.
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value RHPAM Runtime image for Kogito based on Quarkus native image
-    And the image should contain label io.k8s.display-name with value RHPAM Kogito based on Quarkus native image
-    And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,native
+    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito runtime based on Quarkus native image
+    And the image should contain label io.openshift.tags with value rhpam-kogito,runtime,kogito,quarkus,native
     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
     And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-native-rhel8-container
 

From 11d1148d8c44d721cf4692049606a24a87ffa090 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 8 Sep 2021 10:52:56 -0300
Subject: [PATCH 353/709] Updated Maven artifacts (#718)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index ec7b5725d85..db58c927de1 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210906.051204-235-runner.jar
-    md5: 660b773935052393ff83bd6be2f0569b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210908.060942-237-runner.jar
+    md5: 4980bce4216ea48f3f644009eca38699
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 7b5bc2287bf..0e0a76ee043 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210906.051520-236-runner.jar
-    md5: 2c637106e9bfca738911c10ec77954e3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210908.061241-238-runner.jar
+    md5: d2d6963b08f51bec89edc38c24a00fdc
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 04e9ac116e5..33d80a8d7d0 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210906.051827-80-runner.jar
-    md5: fca94e070f2e604df92c1ca230844d4a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210908.061545-82-runner.jar
+    md5: 7dbb362f648047475eb476e7de05128c
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index d83d4132d97..e8b9257ac66 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210906.060412-241-runner.jar
-    md5: 810478b66556f6d8eecac991c3423954
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210908.070038-243-runner.jar
+    md5: a3aa9e13d362a1db6631a86a85425f46
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210906.060247-238-runner.jar
-    md5: 62d41dfd239800fd11fd020f37cec4c2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210908.065902-240-runner.jar
+    md5: 35b0cdff48db4806ac8d20a9a6038a20
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 77c0e62a591..bbc9f839919 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210906.061222-182-runner.jar
-    md5: 4fef1030f07a06ec6e30a673d718fef2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210908.070912-184-runner.jar
+    md5: 8c964dda6b087707f2bd17fdcc959c66
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 24ae90398fd..e1119d085fe 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210906.045647-112-runner.jar
-    md5: 7af73ee6538d551591b89da5e9b7b155
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210908.055535-114-runner.jar
+    md5: 59aa34498078f229f6a3a9e7f0c7e55b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index ff98702ac0c..95f491d32e9 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210906.045933-110-runner.jar
-    md5: e411d90bffe601f9fef155ddc9fdd03e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210908.055808-112-runner.jar
+    md5: f70a939391a1c20e67425596b9340a39
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 939518d14d5..936fcdead22 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210906.050449-92-runner.jar
-    md5: 174f160c89cff6af5449f7abf64177c3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210908.060258-94-runner.jar
+    md5: 638fa2becc0a1bee754d7b6a02b54b69
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 7bbad61b9db..b786f873c03 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210906.050218-112-runner.jar
-    md5: 9e7321205594c720fd2b6f66643b2504
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210908.060033-114-runner.jar
+    md5: d405421214aa084e71a5fcbf8659b257
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index f3a037587a5..0ee7d726e33 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210906.053456-236-runner.jar
-    md5: 4427b3e268456c437f1fc24ad97b2c4f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210908.063114-238-runner.jar
+    md5: 89e75c9b05bb76d6402ee77ac811cfa5
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index c1a014b536b..a22ea9ca04e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210906.053740-236-runner.jar
-    md5: e135de974afc0ad00281993eed4fca12
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210908.063358-238-runner.jar
+    md5: b2de1f59fe4260c663c0a92b51867926
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 7af76e986df..9d924391baa 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210906.060824-149-runner.jar
-    md5: 0d2e2c708d131124af29090dcd72551b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210908.070453-151-runner.jar
+    md5: 5fd0eb4e4900e82dbfb0a30810882586
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 4dea4d39995..18258b8579d 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210906.060928-151-runner.jar
-    md5: 0463f4952e5be7c38c162496257b7e8b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210908.070554-153-runner.jar
+    md5: 1ac529c759e8bae4d88eaf0b58648e13
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index cff3c8b643c..596131f4271 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210906.053704-236-runner.jar
-    md5: a29e557049702d15aafab67ffc7ca164
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210908.063321-238-runner.jar
+    md5: 245189594a0eab9d7b6fe0ba574c31f8
 
 execute:
   - script: configure

From 9266208d5d6b19fd1dedd3aa513f4f9d3b5dd1b1 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 10 Sep 2021 04:16:30 -0300
Subject: [PATCH 354/709] [KOGITO-5851] - Build and deploy Quarkus from source
 files cannot be accessed once running on Openshift (#719)

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-s2i-core/added/s2i-core          |  2 +-
 tests/features/kogito-builder-native.feature    |  8 ++++++++
 tests/features/kogito-builder.feature           | 17 +++++++++++++++++
 tests/features/rhpam-kogito-builder-jvm.feature | 16 ++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 8ddc016bc56..4de5e69c4e4 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -113,7 +113,7 @@ function build_kogito_app() {
                     -DprojectGroupId=$PROJECT_GROUP_ID \
                     -DprojectArtifactId=$PROJECT_ARTIFACT_ID \
                     -DprojectVersion=$PROJECT_VERSION \
-                    -Dextensions="kogito"
+                    -Dextensions="kogito,quarkus-smallrye-health,quarkus-smallrye-openapi"
 
         elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
             log_info "----> Using Spring Boot to bootstrap the application."
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index fdd84860e03..64ba6dbf9ae 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -136,3 +136,11 @@ Feature: kogito-builder image native build tests
       | request_method  | POST                                                                                             |
       | content_type    | application/json                                                                                 |
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+    And check that page is served
+      | property        | value                           |
+      | port            | 8080                            |
+      | path            | /q/health/live                  |
+      | wait            | 80                              |
+      | request_method  | GET                             |
+      | content_type    | application/json                |
+      | request_body    | {"status": "UP", "checks": []}  |
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 4671b93eb9c..9baf7a5296d 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -58,6 +58,15 @@ Feature: kogito-builder image tests
       | request_method  | POST                                                                                             |
       | content_type    | application/json                                                                                 |
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+    And check that page is served
+      | property        | value                           |
+      | port            | 8080                            |
+      | path            | /q/health/live                  |
+      | wait            | 80                              |
+      | request_method  | GET                             |
+      | content_type    | application/json                |
+      | request_body    | {"status": "UP", "checks": []}  |
+
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
@@ -121,3 +130,11 @@ Feature: kogito-builder image tests
       | request_method  | POST                                                                                             |
       | content_type    | application/json                                                                                 |
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+    And check that page is served
+      | property        | value            |
+      | port            | 8080             |
+      | path            | /actuator/health |
+      | wait            | 80               |
+      | request_method  | GET              |
+      | content_type    | application/json |
+      | request_body    | {"status":"UP"}  |
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index dbdad58f5b0..5a377846784 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -42,6 +42,14 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | request_method  | POST                                                                                             |
       | content_type    | application/json                                                                                 |
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+    And check that page is served
+      | property        | value                           |
+      | port            | 8080                            |
+      | path            | /q/health/live                  |
+      | wait            | 80                              |
+      | request_method  | GET                             |
+      | content_type    | application/json                |
+      | request_body    | {"status": "UP", "checks": []}  |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
@@ -82,3 +90,11 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | request_method  | POST                                                                                             |
       | content_type    | application/json                                                                                 |
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
+    And check that page is served
+      | property        | value            |
+      | port            | 8080             |
+      | path            | /actuator/health |
+      | wait            | 80               |
+      | request_method  | GET              |
+      | content_type    | application/json |
+      | request_body    | {"status":"UP"}  |

From 01d2c31942878efbd8ec7d5e07fbd811eee36a81 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 10 Sep 2021 08:58:41 -0300
Subject: [PATCH 355/709] Updated Maven artifacts (#723)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index db58c927de1..8fe0ab9f62e 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210908.060942-237-runner.jar
-    md5: 4980bce4216ea48f3f644009eca38699
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210910.054443-239-runner.jar
+    md5: 0a14fcb6893cdd83e199e13a07bb5dcf
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 0e0a76ee043..fec74347d6d 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210908.061241-238-runner.jar
-    md5: d2d6963b08f51bec89edc38c24a00fdc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210910.054945-240-runner.jar
+    md5: 3a1191a29577c0a2aad6a9dc48fe4d8a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 33d80a8d7d0..30150c6eec0 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210908.061545-82-runner.jar
-    md5: 7dbb362f648047475eb476e7de05128c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210910.055455-84-runner.jar
+    md5: 56a9813db782e51d428df651fb82a209
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index e8b9257ac66..3cbad560fd5 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210908.070038-243-runner.jar
-    md5: a3aa9e13d362a1db6631a86a85425f46
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210910.070347-245-runner.jar
+    md5: 441370cb92cd22f8f2b42db62e6256ee
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210908.065902-240-runner.jar
-    md5: 35b0cdff48db4806ac8d20a9a6038a20
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210909.053349-241-runner.jar
+    md5: 637845ea506d559ab38081468e1ca0c1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index bbc9f839919..aad11993847 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210908.070912-184-runner.jar
-    md5: 8c964dda6b087707f2bd17fdcc959c66
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210910.071811-186-runner.jar
+    md5: 9d7c5cb9672bd6e231cfc2e6c34c5a74
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index e1119d085fe..18c5ce84855 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210908.055535-114-runner.jar
-    md5: 59aa34498078f229f6a3a9e7f0c7e55b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210910.052011-116-runner.jar
+    md5: cfaef50a7f119ad8d0fd825ca1fd845f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 95f491d32e9..175024f406a 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210908.055808-112-runner.jar
-    md5: f70a939391a1c20e67425596b9340a39
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210910.052438-114-runner.jar
+    md5: cc002f6ceb0256aa6532adc0b53beb03
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 936fcdead22..55f9c9b1082 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210908.060258-94-runner.jar
-    md5: 638fa2becc0a1bee754d7b6a02b54b69
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210910.053318-96-runner.jar
+    md5: 894d0e3a0f3b8dc88738f787c366468c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index b786f873c03..baeb1e7c5ab 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210908.060033-114-runner.jar
-    md5: d405421214aa084e71a5fcbf8659b257
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210910.052856-116-runner.jar
+    md5: 57023ea8ac43d9ba1befef349c44d073
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 0ee7d726e33..39c609d92e7 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210908.063114-238-runner.jar
-    md5: 89e75c9b05bb76d6402ee77ac811cfa5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210910.062703-240-runner.jar
+    md5: 517d2ff1fa9d16cc380e8eaf070982fb
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index a22ea9ca04e..e7446a95050 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210908.063358-238-runner.jar
-    md5: b2de1f59fe4260c663c0a92b51867926
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210910.063159-240-runner.jar
+    md5: afa061d769a9fcd24f567d87d138533d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 9d924391baa..7d779eb5bc5 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210908.070453-151-runner.jar
-    md5: 5fd0eb4e4900e82dbfb0a30810882586
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210910.071201-153-runner.jar
+    md5: 0823ea04b1d6e26670cb3b32f8d29456
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 18258b8579d..aeb79eca5e7 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210908.070554-153-runner.jar
-    md5: 1ac529c759e8bae4d88eaf0b58648e13
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210910.071344-155-runner.jar
+    md5: 26ef7d43138d10db396aa438f0225771
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 596131f4271..b28aba22992 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210908.063321-238-runner.jar
-    md5: 245189594a0eab9d7b6fe0ba574c31f8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210910.063108-240-runner.jar
+    md5: e09d5fd8b99fc71b7a44d9f94d830393
 
 execute:
   - script: configure

From a1a58652899c67c5ab03cf6761f96a8c5b804b99 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 15 Sep 2021 10:50:56 -0300
Subject: [PATCH 356/709] Updated Maven artifacts (#731)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 8fe0ab9f62e..8bbf315dea4 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210910.054443-239-runner.jar
-    md5: 0a14fcb6893cdd83e199e13a07bb5dcf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210915.062416-243-runner.jar
+    md5: 48613e0846f27d87bba51c8c3c79ee18
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index fec74347d6d..b84b682aed1 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210910.054945-240-runner.jar
-    md5: 3a1191a29577c0a2aad6a9dc48fe4d8a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210915.062905-244-runner.jar
+    md5: 1a94d8f2f19a2bb6d1c6da3fd900936e
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 30150c6eec0..b905d0a5a3a 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210910.055455-84-runner.jar
-    md5: 56a9813db782e51d428df651fb82a209
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210915.063346-88-runner.jar
+    md5: 16e075dee3000ebc2795ca7320766706
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 3cbad560fd5..74e9c6ec5d4 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210910.070347-245-runner.jar
-    md5: 441370cb92cd22f8f2b42db62e6256ee
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210915.073513-248-runner.jar
+    md5: 47ae01762155fc3c3574d3b92df689b7
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210909.053349-241-runner.jar
-    md5: 637845ea506d559ab38081468e1ca0c1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210915.073305-244-runner.jar
+    md5: df62b3250f7f8edf5077e24d74f94c3c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index aad11993847..da26afb6702 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210910.071811-186-runner.jar
-    md5: 9d7c5cb9672bd6e231cfc2e6c34c5a74
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210915.075035-189-runner.jar
+    md5: 50677b79b317ea7e091925ebc6097436
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 18c5ce84855..f0723d65dd9 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210910.052011-116-runner.jar
-    md5: cfaef50a7f119ad8d0fd825ca1fd845f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210915.060254-121-runner.jar
+    md5: c61611ffe7f6ab63c3f30ace168c8e20
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 175024f406a..bcb26b0caa7 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210910.052438-114-runner.jar
-    md5: cc002f6ceb0256aa6532adc0b53beb03
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210915.060629-119-runner.jar
+    md5: b1939b1ab819d835420f701214ece002
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 55f9c9b1082..79ef33b632b 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210910.053318-96-runner.jar
-    md5: 894d0e3a0f3b8dc88738f787c366468c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210915.061330-101-runner.jar
+    md5: d68cfb911f56f4dd53acded80ddc58e2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index baeb1e7c5ab..dbb86ea4835 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210910.052856-116-runner.jar
-    md5: 57023ea8ac43d9ba1befef349c44d073
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210915.060956-121-runner.jar
+    md5: 30a18a042ac1a26f96d00278c6ac9f6c
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 39c609d92e7..d0566111ac1 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210910.062703-240-runner.jar
-    md5: 517d2ff1fa9d16cc380e8eaf070982fb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210915.070014-243-runner.jar
+    md5: 5301c63633fcc9edf145ca7ea5f1f032
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index e7446a95050..602fefd31b3 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210910.063159-240-runner.jar
-    md5: afa061d769a9fcd24f567d87d138533d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210915.070502-243-runner.jar
+    md5: fd4567dbef645df30c162d804c30100a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 7d779eb5bc5..9336c21243f 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210910.071201-153-runner.jar
-    md5: 0823ea04b1d6e26670cb3b32f8d29456
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210915.074308-156-runner.jar
+    md5: 0b34be5b5a9187c5f7a0cb0b39588b0c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index aeb79eca5e7..1c90246b3ce 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210910.071344-155-runner.jar
-    md5: 26ef7d43138d10db396aa438f0225771
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210915.074509-158-runner.jar
+    md5: 59ad59ca0948c3bb3736b6dc88466462
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index b28aba22992..2fe2ac56e24 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210910.063108-240-runner.jar
-    md5: e09d5fd8b99fc71b7a44d9f94d830393
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210915.070411-243-runner.jar
+    md5: 7c6c8ccc54eb7c54d4d544b022c97c8b
 
 execute:
   - script: configure

From 15bd461d1442c5e3f38a1c22641848f786155604 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 20 Sep 2021 11:47:32 -0300
Subject: [PATCH 357/709] Updated Maven artifacts (#738)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 8bbf315dea4..65f2c053663 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210915.062416-243-runner.jar
-    md5: 48613e0846f27d87bba51c8c3c79ee18
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210920.044026-246-runner.jar
+    md5: 4d40c715f10b0b7dd1428cd7ce9194da
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index b84b682aed1..51673a288d0 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210915.062905-244-runner.jar
-    md5: 1a94d8f2f19a2bb6d1c6da3fd900936e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210920.044456-247-runner.jar
+    md5: 03fc7e846a41bebaf0154445db13e93d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index b905d0a5a3a..642fcb02a7f 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210915.063346-88-runner.jar
-    md5: 16e075dee3000ebc2795ca7320766706
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210920.044904-91-runner.jar
+    md5: 21e86ae3791bc786e1eb5f99b5b16d6c
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 74e9c6ec5d4..305eab7ede9 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210915.073513-248-runner.jar
-    md5: 47ae01762155fc3c3574d3b92df689b7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210920.054640-252-runner.jar
+    md5: 8c408658224968466d1383e464425256
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210915.073305-244-runner.jar
-    md5: df62b3250f7f8edf5077e24d74f94c3c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210920.054444-247-runner.jar
+    md5: b52a90cf54b6e0becb394625e72f5056
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index da26afb6702..f55c104d9ec 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210915.075035-189-runner.jar
-    md5: 50677b79b317ea7e091925ebc6097436
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210920.055717-193-runner.jar
+    md5: c16d1501dcbe4bf3a0b5bdeac5af53c1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index f0723d65dd9..b6e0a48b5e4 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210915.060254-121-runner.jar
-    md5: c61611ffe7f6ab63c3f30ace168c8e20
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210920.041830-124-runner.jar
+    md5: 85941ecf7ae8c67e35acf7375fbc9aa0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index bcb26b0caa7..161a459b602 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210915.060629-119-runner.jar
-    md5: b1939b1ab819d835420f701214ece002
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210920.042229-122-runner.jar
+    md5: adca4149142b8bbba223dea708de0b59
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 79ef33b632b..be653653963 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210915.061330-101-runner.jar
-    md5: d68cfb911f56f4dd53acded80ddc58e2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210920.043002-104-runner.jar
+    md5: 9f2e215c4685856d4b7693c20c21a7f2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index dbb86ea4835..7605ef98b9e 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210915.060956-121-runner.jar
-    md5: 30a18a042ac1a26f96d00278c6ac9f6c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210920.042618-124-runner.jar
+    md5: 48ffbc5ce6ee9426bd99b60c0e9a7ff2
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index d0566111ac1..369aa7ebd13 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210915.070014-243-runner.jar
-    md5: 5301c63633fcc9edf145ca7ea5f1f032
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210920.051344-247-runner.jar
+    md5: 11a73f539ef31b35aa3d4a54a12d8c61
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 602fefd31b3..cf78b17ded9 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210915.070502-243-runner.jar
-    md5: fd4567dbef645df30c162d804c30100a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210920.051736-247-runner.jar
+    md5: 25dd6b650b251063145f6e83ee2064d8
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 9336c21243f..21dc502efdd 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210915.074308-156-runner.jar
-    md5: 0b34be5b5a9187c5f7a0cb0b39588b0c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210920.055204-159-runner.jar
+    md5: 0f340dc82aae6f3b1a785600d329a5ea
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 1c90246b3ce..828b706b2fe 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210915.074509-158-runner.jar
-    md5: 59ad59ca0948c3bb3736b6dc88466462
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210920.055329-162-runner.jar
+    md5: a21460008cd142644d711abb7d5cd83e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 2fe2ac56e24..db5f6444d29 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210915.070411-243-runner.jar
-    md5: 7c6c8ccc54eb7c54d4d544b022c97c8b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210920.051653-246-runner.jar
+    md5: d7ac8550346b1a2c37bcb8ad71531727
 
 execute:
   - script: configure

From 1f559c48898a4f81c77c7c73ca5deb8359e996bb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 21 Sep 2021 16:16:50 +0200
Subject: [PATCH 358/709] KOGITO-5730 Restructure DSL folders (#678)

---
 .ci/jenkins/dsl/jobs.groovy | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index ac49c71f5fc..fa4639c505f 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -1,5 +1,5 @@
 import org.kie.jenkins.jobdsl.templates.KogitoJobTemplate
-import org.kie.jenkins.jobdsl.KogitoConstants
+import org.kie.jenkins.jobdsl.FolderUtils
 import org.kie.jenkins.jobdsl.Utils
 import org.kie.jenkins.jobdsl.KogitoJobType
 
@@ -20,28 +20,26 @@ def getJobParams(String jobName, String jobFolder, String jenkinsfileName, Strin
     return jobParams
 }
 
-def bddRuntimesPrFolder = "${KogitoConstants.KOGITO_DSL_PULLREQUEST_FOLDER}/${KogitoConstants.KOGITO_DSL_RUNTIMES_BDD_FOLDER}"
-def nightlyBranchFolder = "${KogitoConstants.KOGITO_DSL_NIGHTLY_FOLDER}/${JOB_BRANCH_FOLDER}"
-def releaseBranchFolder = "${KogitoConstants.KOGITO_DSL_RELEASE_FOLDER}/${JOB_BRANCH_FOLDER}"
-
 if (Utils.isMainBranch(this)) {
     // For BDD runtimes PR job
-    setupDeployJob(bddRuntimesPrFolder, KogitoJobType.PR)
+    setupDeployJob(FolderUtils.getPullRequestRuntimesBDDFolder(this), KogitoJobType.PR)
 }
 
 setupPrJob()
 
 // Branch jobs
-setupDeployJob(nightlyBranchFolder, KogitoJobType.NIGHTLY)
-setupPromoteJob(nightlyBranchFolder, KogitoJobType.NIGHTLY)
+setupDeployJob(FolderUtils.getNightlyFolder(this), KogitoJobType.NIGHTLY)
+setupPromoteJob(FolderUtils.getNightlyFolder(this), KogitoJobType.NIGHTLY)
 
 // No release directly on main branch
 if (!Utils.isMainBranch(this)) {
-    setupDeployJob(releaseBranchFolder, KogitoJobType.RELEASE)
-    setupPromoteJob(releaseBranchFolder, KogitoJobType.RELEASE)
+    setupDeployJob(FolderUtils.getReleaseFolder(this), KogitoJobType.RELEASE)
+    setupPromoteJob(FolderUtils.getReleaseFolder(this), KogitoJobType.RELEASE)
 }
 
-setupProdUpdateVersionJob("${KogitoConstants.KOGITO_DSL_TOOLS_FOLDER}/${JOB_BRANCH_FOLDER}")
+if (Utils.isLTSBranch(this)) {
+    setupProdUpdateVersionJob()
+}
 
 /////////////////////////////////////////////////////////////////
 // Methods
@@ -49,7 +47,6 @@ setupProdUpdateVersionJob("${KogitoConstants.KOGITO_DSL_TOOLS_FOLDER}/${JOB_BRAN
 
 void setupPrJob(String branch = "${GIT_BRANCH}") {
     def jobParams = getDefaultJobParams()
-    jobParams.job.folder = "${KogitoConstants.KOGITO_DSL_PULLREQUEST_FOLDER}/${branch}"
     jobParams.pr.run_only_for_branches = [ branch ]
     KogitoJobTemplate.createPRJob(this, jobParams)
 }
@@ -185,8 +182,8 @@ void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
     }
 }
 
-void setupProdUpdateVersionJob(String jobFolder) {
-    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-update-prod-version', jobFolder, "${JENKINSFILE_PATH}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images')).with {
+void setupProdUpdateVersionJob() {
+    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-update-prod-version', FolderUtils.getToolsFolder(this), "${JENKINSFILE_PATH}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images')).with {
         parameters {
             stringParam('JIRA_NUMBER', '', 'KIECLOUD-XXX or RHPAM-YYYY or else. This will be added to the commit and PR.')
             stringParam('PROD_PROJECT_VERSION', '', 'Which version to set ?')

From 539fa89e29aff35deb00aedd6d106f9831f38191 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 22 Sep 2021 11:10:47 -0300
Subject: [PATCH 359/709] Updated Maven artifacts (#743)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 65f2c053663..2cef5607219 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210920.044026-246-runner.jar
-    md5: 4d40c715f10b0b7dd1428cd7ce9194da
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210922.030554-248-runner.jar
+    md5: 04583a47fb1d5496d264945231463581
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 51673a288d0..e57f3041a5d 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210920.044456-247-runner.jar
-    md5: 03fc7e846a41bebaf0154445db13e93d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210922.030909-249-runner.jar
+    md5: 5fef3034bccda4007c31874c60145fc1
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 642fcb02a7f..6fa570cd9ea 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210920.044904-91-runner.jar
-    md5: 21e86ae3791bc786e1eb5f99b5b16d6c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210922.031212-93-runner.jar
+    md5: c74c0a1d1abd340c303bfa91f9509c11
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 305eab7ede9..260bdbd0db1 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210920.054640-252-runner.jar
-    md5: 8c408658224968466d1383e464425256
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210922.035756-254-runner.jar
+    md5: 33e42d4a6be26f1d1b0005f43034e518
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210920.054444-247-runner.jar
-    md5: b52a90cf54b6e0becb394625e72f5056
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210922.035633-249-runner.jar
+    md5: ef3b5550f2ed0fea090a6145042bebe1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index f55c104d9ec..11d8d96a635 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210920.055717-193-runner.jar
-    md5: c16d1501dcbe4bf3a0b5bdeac5af53c1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210922.040542-195-runner.jar
+    md5: b2b9c14ac58167f994db6f083be117f2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index b6e0a48b5e4..b7c53887c10 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210920.041830-124-runner.jar
-    md5: 85941ecf7ae8c67e35acf7375fbc9aa0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210922.025031-126-runner.jar
+    md5: 224bb77d5b20978b2a9102def58d30e9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 161a459b602..b5635f0211b 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210920.042229-122-runner.jar
-    md5: adca4149142b8bbba223dea708de0b59
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210922.025315-124-runner.jar
+    md5: 7e2710dc28c774b476d9b1f320e9fde6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index be653653963..3107d640e35 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210920.043002-104-runner.jar
-    md5: 9f2e215c4685856d4b7693c20c21a7f2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210922.025833-106-runner.jar
+    md5: 2c93765692a2c978b6f6f73b222f8124
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 7605ef98b9e..c03718d87e4 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210920.042618-124-runner.jar
-    md5: 48ffbc5ce6ee9426bd99b60c0e9a7ff2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210922.025558-126-runner.jar
+    md5: 639515021d1e81f7ad28cb8feb564e64
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 369aa7ebd13..eaa9081efd9 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210920.051344-247-runner.jar
-    md5: 11a73f539ef31b35aa3d4a54a12d8c61
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210922.032832-249-runner.jar
+    md5: e66c4aebd81db8962e41575ba82950b7
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index cf78b17ded9..f7947e122b6 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210920.051736-247-runner.jar
-    md5: 25dd6b650b251063145f6e83ee2064d8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210922.033120-249-runner.jar
+    md5: bc0b411233911f8e2a84cbb8a394cfa3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 21dc502efdd..f072468b2fa 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210920.055204-159-runner.jar
-    md5: 0f340dc82aae6f3b1a785600d329a5ea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210922.040157-161-runner.jar
+    md5: 9af892eb2d368f6427e832eba38b2fb7
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 828b706b2fe..22a7ddee2da 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210920.055329-162-runner.jar
-    md5: a21460008cd142644d711abb7d5cd83e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210922.040259-164-runner.jar
+    md5: 61677b645e2065cade6d5b6f9f90f585
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index db5f6444d29..2aa17cafef9 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210920.051653-246-runner.jar
-    md5: d7ac8550346b1a2c37bcb8ad71531727
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210922.033041-248-runner.jar
+    md5: fab3f38c5b89881f5fb963170c5d49fe
 
 execute:
   - script: configure

From abb6734f382b99158d31cbf92b62bc196331e38d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 23 Sep 2021 11:25:46 -0300
Subject: [PATCH 360/709] Updated Maven artifacts (#746)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 2cef5607219..07e431a0984 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210922.030554-248-runner.jar
-    md5: 04583a47fb1d5496d264945231463581
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210923.034118-249-runner.jar
+    md5: 4e3ebe37e7da8b465ad03c3f12f4c1e0
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index e57f3041a5d..4a1e8a587bd 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210922.030909-249-runner.jar
-    md5: 5fef3034bccda4007c31874c60145fc1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210923.034541-250-runner.jar
+    md5: 7c524e41f2cbf28a36b22e92002dcbdd
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 6fa570cd9ea..edff0249b2f 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210922.031212-93-runner.jar
-    md5: c74c0a1d1abd340c303bfa91f9509c11
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210923.035005-94-runner.jar
+    md5: 9ef2ddc0a1165835f5d32d4953bc51b9
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 260bdbd0db1..f52ca48972a 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210922.035756-254-runner.jar
-    md5: 33e42d4a6be26f1d1b0005f43034e518
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210923.044812-255-runner.jar
+    md5: 719ada4c89da1f04ba4ce62cf33e6002
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210922.035633-249-runner.jar
-    md5: ef3b5550f2ed0fea090a6145042bebe1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210923.044619-250-runner.jar
+    md5: 503804f1ebd1efa33089590394d7874d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 11d8d96a635..686474ec7fa 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210922.040542-195-runner.jar
-    md5: b2b9c14ac58167f994db6f083be117f2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210923.045907-196-runner.jar
+    md5: 0cf2654b7695566aa423f14832a91d9c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index b7c53887c10..1f44a581772 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210922.025031-126-runner.jar
-    md5: 224bb77d5b20978b2a9102def58d30e9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210923.032102-127-runner.jar
+    md5: 2f1c696311e62dd909a13ed31f3230bf
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index b5635f0211b..4fea6c9af24 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210922.025315-124-runner.jar
-    md5: 7e2710dc28c774b476d9b1f320e9fde6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210923.032435-125-runner.jar
+    md5: a03c37c5947a7f6d9943d78a03817af8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 3107d640e35..44464a4c702 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210922.025833-106-runner.jar
-    md5: 2c93765692a2c978b6f6f73b222f8124
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210923.033125-107-runner.jar
+    md5: fb72b956cc2875e6f508de00aea11a52
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index c03718d87e4..6ada8101e2b 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210922.025558-126-runner.jar
-    md5: 639515021d1e81f7ad28cb8feb564e64
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210923.032803-127-runner.jar
+    md5: 4ec411bdfd12bde39ea70b52d269cc7a
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index eaa9081efd9..dd5141ecb4d 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210922.032832-249-runner.jar
-    md5: e66c4aebd81db8962e41575ba82950b7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210923.041421-250-runner.jar
+    md5: b1b7ec05373c63ba4a56382203260b37
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index f7947e122b6..f925657940e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210922.033120-249-runner.jar
-    md5: bc0b411233911f8e2a84cbb8a394cfa3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210923.041835-250-runner.jar
+    md5: 848387a2c8ef9745251e9dbb74672524
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index f072468b2fa..a7f4a4aab48 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210922.040157-161-runner.jar
-    md5: 9af892eb2d368f6427e832eba38b2fb7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210923.045353-162-runner.jar
+    md5: 1ed5e6ad93e8f25c9404a898d7a7d7aa
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 22a7ddee2da..6921655b6c9 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210922.040259-164-runner.jar
-    md5: 61677b645e2065cade6d5b6f9f90f585
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210923.045521-165-runner.jar
+    md5: 655b46f72376e8e050e335c81a9e32ad
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 2aa17cafef9..778555ffbac 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210922.033041-248-runner.jar
-    md5: fab3f38c5b89881f5fb963170c5d49fe
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210923.041748-249-runner.jar
+    md5: 583f2b969bb3b708de064dddc4162517
 
 execute:
   - script: configure

From 79c340dcb7daa9953ef2a5dc634c385f490c4fc5 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 27 Sep 2021 08:46:56 -0300
Subject: [PATCH 361/709] Updated Maven artifacts (#755)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 07e431a0984..29d8d786113 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210923.034118-249-runner.jar
-    md5: 4e3ebe37e7da8b465ad03c3f12f4c1e0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210927.044648-252-runner.jar
+    md5: 11f2b0594048f5a4a25bc37522915d8b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 4a1e8a587bd..1bcac6ed5c0 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210923.034541-250-runner.jar
-    md5: 7c524e41f2cbf28a36b22e92002dcbdd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210927.045043-253-runner.jar
+    md5: 17b459a368fec4d40e1d66956f1a0804
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index edff0249b2f..210cdfa9232 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210923.035005-94-runner.jar
-    md5: 9ef2ddc0a1165835f5d32d4953bc51b9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210927.045429-97-runner.jar
+    md5: 67c1a38343450fb56b501cdb7aa43e76
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index f52ca48972a..253706f2daa 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210923.044812-255-runner.jar
-    md5: 719ada4c89da1f04ba4ce62cf33e6002
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210927.054700-258-runner.jar
+    md5: 36919a152f47d7af132123b2a26dfbe9
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210923.044619-250-runner.jar
-    md5: 503804f1ebd1efa33089590394d7874d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210927.054522-253-runner.jar
+    md5: 03c674fe2b51ef2a294978bd6616726e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 686474ec7fa..d9573fbed14 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210923.045907-196-runner.jar
-    md5: 0cf2654b7695566aa423f14832a91d9c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210927.055657-199-runner.jar
+    md5: 578a389b2bd5b92509d1563509e628d6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 1f44a581772..34cda880add 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210923.032102-127-runner.jar
-    md5: 2f1c696311e62dd909a13ed31f3230bf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210927.042749-130-runner.jar
+    md5: 042b9ae72f71e76c2466bb9552378508
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 4fea6c9af24..4abbfe20c75 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210923.032435-125-runner.jar
-    md5: a03c37c5947a7f6d9943d78a03817af8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210927.043102-128-runner.jar
+    md5: 8543c31b8043cc7546d99b94b66fa7ab
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 44464a4c702..4fe83b7d9d2 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210923.033125-107-runner.jar
-    md5: fb72b956cc2875e6f508de00aea11a52
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210927.043720-110-runner.jar
+    md5: eee988d18176846ae0f26b1f963c3dc8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 6ada8101e2b..8e7f80259a7 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210923.032803-127-runner.jar
-    md5: 4ec411bdfd12bde39ea70b52d269cc7a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210927.043406-130-runner.jar
+    md5: 9f08d439464eba63aa75765c113e80f0
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index dd5141ecb4d..e612351d017 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210923.041421-250-runner.jar
-    md5: b1b7ec05373c63ba4a56382203260b37
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210927.051556-253-runner.jar
+    md5: ed372f0a0c3c8126a10db4cf787ae1d8
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index f925657940e..b4ca897ed6c 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210923.041835-250-runner.jar
-    md5: 848387a2c8ef9745251e9dbb74672524
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210927.051915-253-runner.jar
+    md5: 0de8b587be446577f1fc3ce582111382
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index a7f4a4aab48..205bf0e1dbf 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210923.045353-162-runner.jar
-    md5: 1ed5e6ad93e8f25c9404a898d7a7d7aa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210927.055211-165-runner.jar
+    md5: 99ccccecfa7e0adad685024e63b69312
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 6921655b6c9..85c16de1c4a 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210923.045521-165-runner.jar
-    md5: 655b46f72376e8e050e335c81a9e32ad
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210927.055328-168-runner.jar
+    md5: d2f3ab56132e85140d5a9ec11a96fe1b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 778555ffbac..36e4eaaa655 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210923.041748-249-runner.jar
-    md5: 583f2b969bb3b708de064dddc4162517
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210927.051836-252-runner.jar
+    md5: d5d28bb222bbf4bfd300053c4e0d7c78
 
 execute:
   - script: configure

From 567527a140289a175006fba727a9321bc7a57d76 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 29 Sep 2021 12:35:43 -0300
Subject: [PATCH 362/709] [KOGITO-3638] - Investigate failing Scenario (#739)

* [KOGITO-3638] - Investigate failing Scenario

Verify if the s2i build is finished as expected performing a native
build with persistence enabled

Signed-off-by: spolti <fspolti@redhat.com>

* apply Tristan's suggestion

Signed-off-by: spolti <fspolti@redhat.com>

* apply review

Signed-off-by: spolti <fspolti@redhat.com>
---
 tests/features/kogito-builder-native.feature | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index 64ba6dbf9ae..ec095af3797 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -69,18 +69,17 @@ Feature: kogito-builder image native build tests
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
 
-  #ignore until https://issues.redhat.com/browse/KOGITO-3638 is resolved
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled
+  Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable          | value         |
       | RUNTIME_TYPE      | quarkus       |
       | NATIVE            | true          |
       | LIMIT_MEMORY      | 6442450944    |
       | MAVEN_ARGS_APPEND | -Ppersistence |
+    When container integ- is started with command bash
     Then file /home/kogito/bin/process-quarkus-example-runner should exist
-    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
+     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Perform a incremental s2i build for native test
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main

From 1de1554c2c1c426bc9a912685f54ae2131b7c88d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 30 Sep 2021 10:57:14 -0300
Subject: [PATCH 363/709] Updated Maven artifacts (#760)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 29d8d786113..bd11c1cc9f9 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210927.044648-252-runner.jar
-    md5: 11f2b0594048f5a4a25bc37522915d8b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210930.031040-254-runner.jar
+    md5: 4db5d0512670ee31e741a46bdd5ea1c4
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 1bcac6ed5c0..7aaa04a0247 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210927.045043-253-runner.jar
-    md5: 17b459a368fec4d40e1d66956f1a0804
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210930.031422-255-runner.jar
+    md5: 28e28c54cbfb35e1009267edc3a1451f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 210cdfa9232..e5ed0fa1920 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210927.045429-97-runner.jar
-    md5: 67c1a38343450fb56b501cdb7aa43e76
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210930.031751-99-runner.jar
+    md5: 57706af800270aa7a3468c976589e501
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 253706f2daa..2ce30d9a836 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210927.054700-258-runner.jar
-    md5: 36919a152f47d7af132123b2a26dfbe9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210930.040217-260-runner.jar
+    md5: c7f9e5f54b283e943eebe3ca09e03d43
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210927.054522-253-runner.jar
-    md5: 03c674fe2b51ef2a294978bd6616726e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210930.040043-255-runner.jar
+    md5: dcf61fe8e0619d2027bf33907dbfcc6b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index d9573fbed14..070727d162e 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210927.055657-199-runner.jar
-    md5: 578a389b2bd5b92509d1563509e628d6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210930.041131-201-runner.jar
+    md5: adfe072ee411bddfae4dc29b20d692ef
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 34cda880add..b0cd2793ea3 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210927.042749-130-runner.jar
-    md5: 042b9ae72f71e76c2466bb9552378508
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210930.025402-132-runner.jar
+    md5: 4f07aa40949ec2a8399be1ad83d2b502
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 4abbfe20c75..2fbfc983546 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210927.043102-128-runner.jar
-    md5: 8543c31b8043cc7546d99b94b66fa7ab
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210930.025654-130-runner.jar
+    md5: 9f17a4d001e87c3c33d78aec5d67da39
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 4fe83b7d9d2..640d04968a3 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210927.043720-110-runner.jar
-    md5: eee988d18176846ae0f26b1f963c3dc8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210930.030235-112-runner.jar
+    md5: 91cdcd66d575e38aaddc93204b260976
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 8e7f80259a7..8d58c4fdb67 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210927.043406-130-runner.jar
-    md5: 9f08d439464eba63aa75765c113e80f0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210930.025942-132-runner.jar
+    md5: a6379c5d40f8aec769316fa1ddf0e778
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e612351d017..19d610aa4ec 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210927.051556-253-runner.jar
-    md5: ed372f0a0c3c8126a10db4cf787ae1d8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210930.033648-255-runner.jar
+    md5: 99decb11ac8b44188bfae09b040612c0
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index b4ca897ed6c..18f2dffb22d 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210927.051915-253-runner.jar
-    md5: 0de8b587be446577f1fc3ce582111382
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210930.034007-255-runner.jar
+    md5: 77def4e9663098d3365384b1505c50ed
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 205bf0e1dbf..0d3cec2a903 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210927.055211-165-runner.jar
-    md5: 99ccccecfa7e0adad685024e63b69312
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210930.040656-167-runner.jar
+    md5: 13b25a83f4f4ef2d7b01887baf0f9fd6
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 85c16de1c4a..971d46667f7 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210927.055328-168-runner.jar
-    md5: d2f3ab56132e85140d5a9ec11a96fe1b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210930.040811-170-runner.jar
+    md5: 52626fe18ffada3c46089103900bc42d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 36e4eaaa655..4bf959c74e1 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210927.051836-252-runner.jar
-    md5: d5d28bb222bbf4bfd300053c4e0d7c78
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210930.033924-254-runner.jar
+    md5: 82a2e7486baaeb4765b9c0645ab6c541
 
 execute:
   - script: configure

From d2dac04de5d810b4e638d65bbe20b474e2a0aafe Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 1 Oct 2021 06:03:19 -0300
Subject: [PATCH 364/709] [KOGITO-1594] - Specify JVM memory based on pod limit
 (#759)

* [KOGITO-1594] - Specify JVM memory based on pod limit

Signed-off-by: spolti <fspolti@redhat.com>

* rename JAVA_OPTS to DYNAMIC_RESOURCES_OPTS

Signed-off-by: spolti <fspolti@redhat.com>

* fix tests

Signed-off-by: spolti <fspolti@redhat.com>
---
 README.md                                     |  23 ++-
 kogito-builder-overrides.yaml                 |   1 +
 kogito-data-index-infinispan-overrides.yaml   |   1 +
 kogito-data-index-mongodb-overrides.yaml      |   1 +
 kogito-data-index-postgresql-overrides.yaml   |   1 +
 kogito-explainability-overrides.yaml          |   1 +
 kogito-jit-runner-overrides.yaml              |   1 +
 kogito-jobs-service-ephemeral-overrides.yaml  |   1 +
 kogito-jobs-service-infinispan-overrides.yaml |   1 +
 kogito-jobs-service-mongodb-overrides.yaml    |   1 +
 kogito-jobs-service-postgresql-overrides.yaml |   1 +
 kogito-management-console-overrides.yaml      |   1 +
 kogito-runtime-jvm-overrides.yaml             |   1 +
 kogito-task-console-overrides.yaml            |   1 +
 kogito-trusty-infinispan-overrides.yaml       |   1 +
 kogito-trusty-redis-overrides.yaml            |   1 +
 kogito-trusty-ui-overrides.yaml               |   1 +
 .../kogito-builder/added/kogito-app-launch.sh |   8 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/container-limits                    |  76 ++++++++
 .../added/debug-options                       |  18 ++
 .../added/java-default-options                | 183 ++++++++++++++++++
 modules/kogito-dynamic-resources/configure    |  11 ++
 modules/kogito-dynamic-resources/module.yaml  |  61 ++++++
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   7 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 .../added/kogito-app-launch.sh                |   4 +-
 rhpam-kogito-builder-rhel8-overrides.yaml     |   1 +
 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml |   1 +
 .../features/common-dynamic-resources.feature |  60 ++++++
 tests/features/common.feature                 |   1 +
 .../kogito-data-index-common.feature          |   2 +-
 .../kogito-data-index-postgresql.feature      |   2 +-
 .../kogito-jobs-service-common.feature        |   7 +-
 .../kogito-jobs-service-ephemeral.feature     |   2 +-
 .../kogito-jobs-service-infinispan.feature    |   2 +-
 .../kogito-jobs-service-mongodb.feature       |   2 +-
 .../kogito-jobs-service-postgresql.feature    |   2 +-
 tests/features/kogito-explainability.feature  |   4 +-
 tests/features/kogito-jit-runner.feature      |   2 +-
 .../kogito-management-console.feature         |   4 +-
 tests/features/kogito-task-console.feature    |   4 +-
 .../trusty/kogito-trusty-common.feature       |   2 +-
 .../trusty/kogito-trusty-infinispan.feature   |   4 +-
 .../features/trusty/kogito-trusty-ui.feature  |   6 +-
 56 files changed, 527 insertions(+), 40 deletions(-)
 create mode 100644 modules/kogito-dynamic-resources/added/container-limits
 create mode 100644 modules/kogito-dynamic-resources/added/debug-options
 create mode 100644 modules/kogito-dynamic-resources/added/java-default-options
 create mode 100644 modules/kogito-dynamic-resources/configure
 create mode 100644 modules/kogito-dynamic-resources/module.yaml
 create mode 100644 tests/features/common-dynamic-resources.feature

diff --git a/README.md b/README.md
index c8d5ded4a68..dc115fe7ddf 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Table of Contents
 - [Kogito Container Images](#kogito-container-images)
 - [Table of Contents](#table-of-contents)
   - [Kogito Images Requirements](#kogito-images-requirements)
+  - [Kogito Images JVM Memory Management](#kogito-images-jvm-memory-management)
   - [Kogito Runtime and Builder Images](#kogito-runtime-and-builder-images)
     - [Kogito Builder Images](#kogito-builder-images)
       - [Kogito Builder Image usage](#kogito-builder-image-usage)
@@ -103,7 +104,27 @@ To interact with Kogito images, you would need to install the needed dependencie
         * Useful to test Kogito apps on native mode before create a Container image with it.
     * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
         
-        
+
+## Kogito Images JVM Memory Management
+
+All the Kogito Container Images contains a base module that will calculate the JVM max (Xmx) and min (Xms) values based
+on the container memory limits. To auto tune it, you can use the following environment variables to instruct the scripts
+what value the min and max should have:
+
+- JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in **JAVA_OPTIONS**. This is used to calculate a default 
+  maximal heap memory based on a containers restriction. If used in a container without any memory constraints for the
+  container then this option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio of the 
+  container available memory as set here. The default is `50` which means 50% of the available memory is used as an 
+  upper boundary. You can skip this mechanism by setting this value to `0` in which case no `-Xmx` option is added. 
+
+- JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in **JAVA_OPTIONS**. This is used to calculate a 
+  default initial heap memory based on the maximum heap memory. If used in a container without any memory constraints 
+  for the container then this option has no effect. If there is a memory constraint then `-Xms` is set to a ratio 
+  of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` is used as the initial heap size. 
+  You can skip this mechanism by setting this value to `0` in which case no `-Xms` option is added.
+
+For a complete list ov environment variables that can be used to configure the JVM, please check the [dynamic resources](modules/kogito-dynamic-resources/module.yaml) module      
+  
 ## Kogito Runtime and Builder Images
 
 Today, the Kogito images are divided basically in 2 vectors, when we talk about images that would be used to assemble 
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index 5721732429d..59ca866ceba 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -48,6 +48,7 @@ modules:
   - name: org.kie.kogito.graalvm.scripts
   - name: org.kie.kogito.openjdk
     version: "11"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.maven
     version: "3.8.1"
   - name: org.kie.kogito.s2i.core
diff --git a/kogito-data-index-infinispan-overrides.yaml b/kogito-data-index-infinispan-overrides.yaml
index d6c57cc6eb7..d21add9f063 100644
--- a/kogito-data-index-infinispan-overrides.yaml
+++ b/kogito-data-index-infinispan-overrides.yaml
@@ -48,6 +48,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.infinispan
   - name: org.kie.kogito.dataindex.common
diff --git a/kogito-data-index-mongodb-overrides.yaml b/kogito-data-index-mongodb-overrides.yaml
index eada7ae0ee7..dfe3720b9c4 100644
--- a/kogito-data-index-mongodb-overrides.yaml
+++ b/kogito-data-index-mongodb-overrides.yaml
@@ -29,6 +29,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.mongodb
   - name: org.kie.kogito.dataindex.common
diff --git a/kogito-data-index-postgresql-overrides.yaml b/kogito-data-index-postgresql-overrides.yaml
index 20e6a42662b..f5af07500d1 100644
--- a/kogito-data-index-postgresql-overrides.yaml
+++ b/kogito-data-index-postgresql-overrides.yaml
@@ -29,6 +29,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.postgresql
   - name: org.kie.kogito.dataindex.common
diff --git a/kogito-explainability-overrides.yaml b/kogito-explainability-overrides.yaml
index d44fd49cde1..7b69e43684a 100644
--- a/kogito-explainability-overrides.yaml
+++ b/kogito-explainability-overrides.yaml
@@ -32,6 +32,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.explainability
   - name: org.kie.kogito.security.custom.truststores
diff --git a/kogito-jit-runner-overrides.yaml b/kogito-jit-runner-overrides.yaml
index a48a32a5887..1320ea28d4f 100644
--- a/kogito-jit-runner-overrides.yaml
+++ b/kogito-jit-runner-overrides.yaml
@@ -30,6 +30,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.jit-runner
   - name: org.kie.kogito.security.custom.truststores
diff --git a/kogito-jobs-service-ephemeral-overrides.yaml b/kogito-jobs-service-ephemeral-overrides.yaml
index eb744f6b267..48016e17bc8 100644
--- a/kogito-jobs-service-ephemeral-overrides.yaml
+++ b/kogito-jobs-service-ephemeral-overrides.yaml
@@ -33,6 +33,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.jobs.service.ephemeral
   - name: org.kie.kogito.security.custom.truststores
diff --git a/kogito-jobs-service-infinispan-overrides.yaml b/kogito-jobs-service-infinispan-overrides.yaml
index 05fd71f8ee7..9c288372e7e 100644
--- a/kogito-jobs-service-infinispan-overrides.yaml
+++ b/kogito-jobs-service-infinispan-overrides.yaml
@@ -33,6 +33,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.jobs.service.infinispan
   - name: org.kie.kogito.security.custom.truststores
diff --git a/kogito-jobs-service-mongodb-overrides.yaml b/kogito-jobs-service-mongodb-overrides.yaml
index d70e6487dcf..d5b630aec5c 100644
--- a/kogito-jobs-service-mongodb-overrides.yaml
+++ b/kogito-jobs-service-mongodb-overrides.yaml
@@ -33,6 +33,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.jobs.service.mongodb
   - name: org.kie.kogito.security.custom.truststores
diff --git a/kogito-jobs-service-postgresql-overrides.yaml b/kogito-jobs-service-postgresql-overrides.yaml
index 77b2ca07fd5..bebe3fe65e7 100644
--- a/kogito-jobs-service-postgresql-overrides.yaml
+++ b/kogito-jobs-service-postgresql-overrides.yaml
@@ -33,6 +33,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.jobs.service.postgresql
   - name: org.kie.kogito.security.custom.truststores
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index e15516c6073..17af2e46f28 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -33,6 +33,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.management.console
   - name: org.kie.kogito.security.custom.truststores
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index a79c192d831..ab337588ecf 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -38,6 +38,7 @@ modules:
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.runtime.jvm
   - name: org.kie.kogito.security.custom.truststores
diff --git a/kogito-task-console-overrides.yaml b/kogito-task-console-overrides.yaml
index 035cede7ce2..f12e3a3cfa7 100644
--- a/kogito-task-console-overrides.yaml
+++ b/kogito-task-console-overrides.yaml
@@ -33,6 +33,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.task.console
   - name: org.kie.kogito.security.custom.truststores
diff --git a/kogito-trusty-infinispan-overrides.yaml b/kogito-trusty-infinispan-overrides.yaml
index c55a22288f1..215b9bd0d1a 100644
--- a/kogito-trusty-infinispan-overrides.yaml
+++ b/kogito-trusty-infinispan-overrides.yaml
@@ -48,6 +48,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.trusty.infinispan
   - name: org.kie.kogito.trusty.common
diff --git a/kogito-trusty-redis-overrides.yaml b/kogito-trusty-redis-overrides.yaml
index d1ae764669c..6f2e150b1de 100644
--- a/kogito-trusty-redis-overrides.yaml
+++ b/kogito-trusty-redis-overrides.yaml
@@ -32,6 +32,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.trusty.redis
   - name: org.kie.kogito.trusty.common
diff --git a/kogito-trusty-ui-overrides.yaml b/kogito-trusty-ui-overrides.yaml
index 19079ac5ea5..529ee90f432 100644
--- a/kogito-trusty-ui-overrides.yaml
+++ b/kogito-trusty-ui-overrides.yaml
@@ -33,6 +33,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.openjdk
     version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.trusty.ui
   - name: org.kie.kogito.security.custom.truststores
diff --git a/modules/kogito-builder/added/kogito-app-launch.sh b/modules/kogito-builder/added/kogito-app-launch.sh
index a4611348aed..ad0c65f3dfe 100644
--- a/modules/kogito-builder/added/kogito-app-launch.sh
+++ b/modules/kogito-builder/added/kogito-app-launch.sh
@@ -23,6 +23,8 @@ source "${KOGITO_HOME}"/launch/configure.sh
 
 runtime_type=$(get_runtime_type)
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 #############################################
 
 case ${runtime_type} in 
@@ -35,11 +37,13 @@ case ${runtime_type} in
                 -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
         else
         # shellcheck disable=SC2086
-            exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
+            exec java ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 \
+                -Dquarkus.http.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
         fi
     ;;
     "springboot") # shellcheck disable=SC2086
-        exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
+        exec java ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} \
+            -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
     ;;
     *)
         log_error "${runtime_type} is not supported."
diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
index 97ea54c7129..0056bdbea76 100644
--- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
@@ -19,8 +19,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index 36f053c2b1c..083ec8bebde 100644
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -19,8 +19,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
index 3b0ab3ecd5e..9dd74d23318 100644
--- a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
@@ -19,8 +19,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-dynamic-resources/added/container-limits b/modules/kogito-dynamic-resources/added/container-limits
new file mode 100644
index 00000000000..3445c49bd7c
--- /dev/null
+++ b/modules/kogito-dynamic-resources/added/container-limits
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+# Detected container limits
+# If found these are exposed as the following environment variables:
+#
+# - CONTAINER_MAX_MEMORY
+# - CONTAINER_CORE_LIMIT
+#
+# This script is meant to be sourced.
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+fi
+
+ceiling() {
+    awk -vnumber="$1" -vdiv="$2" '
+        function ceiling(x){
+            return x%1 ? int(x)+1 : x
+        }
+        BEGIN{
+            print ceiling(number/div)
+        }
+    '
+}
+
+# Based on the cgroup limits, figure out the max number of core we should utilize
+core_limit() {
+    local cpu_period_file="/sys/fs/cgroup/cpu/cpu.cfs_period_us"
+    local cpu_quota_file="/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
+    if [ -r "${cpu_period_file}" ]; then
+        local cpu_period="$(cat ${cpu_period_file})"
+
+        if [ -r "${cpu_quota_file}" ]; then
+            local cpu_quota="$(cat ${cpu_quota_file})"
+            # cfs_quota_us == -1 --> no restrictions
+            if [ "x$cpu_quota" != "x-1" ]; then
+                ceiling "$cpu_quota" "$cpu_period"
+            fi
+        fi
+  fi
+}
+
+max_unbounded() {
+    cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2*1024}'
+}
+
+container_memory() {
+    # High number which is the max limit unit which memory is supposed to be unbounded.
+    local mem_file="/sys/fs/cgroup/memory/memory.limit_in_bytes"
+    local max_mem_unbounded="$(max_unbounded)"
+    if [ -r "${mem_file}" ]; then
+        local max_mem="$(cat ${mem_file})"
+        if [ ${max_mem} -lt ${max_mem_unbounded} ]; then
+            echo "${max_mem}"
+        fi
+    fi
+}
+
+min() {
+    printf "%s\n" "$@" | sort -g | head -n1
+}
+
+local limit="$(core_limit)"
+if [ x$limit != x ]; then
+    export CONTAINER_CORE_LIMIT="$limit"
+fi
+
+local env_core_limit="$(min $CONTAINER_CORE_LIMIT $JAVA_CORE_LIMIT)"
+if [ -n "$env_core_limit" ]; then
+    export CORE_LIMIT="$env_core_limit"
+fi
+
+local max_mem="$(container_memory)"
+if [ x$max_mem != x ]; then
+    export CONTAINER_MAX_MEMORY="$max_mem"
+fi
diff --git a/modules/kogito-dynamic-resources/added/debug-options b/modules/kogito-dynamic-resources/added/debug-options
new file mode 100644
index 00000000000..bbc71d2d8ae
--- /dev/null
+++ b/modules/kogito-dynamic-resources/added/debug-options
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Check for debug options and echo them if enabled. Meant to be included by
+# a run script.
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+fi
+
+debug_options() {
+    if [ "x${JAVA_DEBUG}" != "x" ]; then
+        local debug_port=${JAVA_DEBUG_PORT:-5005}
+        echo "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${debug_port}"
+    fi
+}
+
+## Echo options, trimming trailing and multiple spaces
+echo "$(debug_options)" | awk '$1=$1'
diff --git a/modules/kogito-dynamic-resources/added/java-default-options b/modules/kogito-dynamic-resources/added/java-default-options
new file mode 100644
index 00000000000..d4c1900ffc3
--- /dev/null
+++ b/modules/kogito-dynamic-resources/added/java-default-options
@@ -0,0 +1,183 @@
+#!/bin/sh
+# =================================================================
+# Detect whether running in a container and set appropriate options
+# for limiting Java VM resources
+#
+# Usage: JAVA_OPTS="$(java-default-options) $(debug_options)"
+
+# Env Vars respected:
+
+# JAVA_OPTIONS: Checked for already set options.
+# JAVA_OPTS: Checked for already set options
+# JAVA_INITIAL_MEM_RATIO: Ratio of maximum memory to use for initial heap size
+#                         (i.e. -Xms).  Defaults to 25 (i.e -Xms=-Xmx/4).
+# JAVA_MAX_INITIAL_MEM: The maximum value of the initial heap size, defaults to 4G.
+# JAVA_MAX_MEM_RATIO: Ratio use to calculate a default maximum Memory, in percent.
+#                     E.g. the default value "50" implies that 50% of the Memory
+#                     given to the container is used as the maximum heap memory with
+#                     '-Xmx'. It is a heuristic and should be better backed up with real
+#                     experiments and measurements.
+#                     For a good overviews what tuning options are available -->
+#                             https://youtu.be/Vt4G-pHXfs4
+#                             https://www.youtube.com/watch?v=w1rZOY5gbvk
+#                             https://vimeo.com/album/4133413/video/181900266
+# Also note that heap is only a small portion of the memory used by a JVM. There are lot
+# of other memory areas (metadata, thread, code cache, ...) which addes to the overall
+# size. There is no easy solution for this, 50% seems to be are reasonable compromise.
+# However, when your container gets killed because of an OOM, then you should tune
+# the absolute values
+#
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+fi
+
+__DEFAULT_JAVA_MAX_MEM_RATIO=50
+__DEFAULT_JAVA_INITIAL_MEM_RATIO=25
+__DEFAULT_JAVA_MAX_INITIAL_MEM=4096
+
+# stubs for jvm specific overrides
+jvm_specific_options() {
+    :
+}
+
+jvm_specific_diagnostics() {
+    :
+}
+
+# Include overridden jvm_specific_*() functions
+if [ -f "${JBOSS_CONTAINER_OPENJDK_JDK_MODULE}/jvm-options" ]; then
+    source "${JBOSS_CONTAINER_OPENJDK_JDK_MODULE}/jvm-options"
+fi
+
+initialize_container_limits() {
+    # we can't run without limits
+    source ${JBOSS_CONTAINER_JAVA_JVM_MODULE}/container-limits
+}
+
+# Check for memory options and calculate a sane default if not given
+max_memory() {
+    # Check whether -Xmx is already given in JAVA_OPTIONS. Then we dont
+    # do anything here
+    # XXX: I think this should be removed.  If folks want to hard code max/min,
+    # then they can set the ratios to zero and set the options in JAVA_OPTS_APPEND.
+    if echo "${JAVA_OPTS:-${JAVA_OPTIONS}}" | grep -q -- "-Xmx"; then
+        return
+    fi
+
+    # Check if explicitly disabled
+    if [ "x$JAVA_MAX_MEM_RATIO" = "x0" ]; then
+        return
+    fi
+
+    # Check for the 'real memory size' and calculate mx from a ratio
+    # given (default is 50%)
+    if [ "x$CONTAINER_MAX_MEMORY" != x ]; then
+        local max_mem="${CONTAINER_MAX_MEMORY}"
+        local ratio=${JAVA_MAX_MEM_RATIO:-${__DEFAULT_JAVA_MAX_MEM_RATIO}}
+        local mx=$(echo "${max_mem} ${ratio} 1048576" | awk '{printf "%d\n" , ($1*$2)/(100*$3) + 0.5}')
+        echo "-Xmx${mx}m"
+    fi
+}
+
+# Check for memory options and calculate a sane default if not given
+initial_memory() {
+    # Check whether -Xms is already given in JAVA_OPTS. Then we dont
+    # do anything here
+    # XXX: I think this should be removed.  If folks want to hard code max/min,
+    # then they can set the ratios to zero and set the options in JAVA_OPTS_APPEND.
+    if echo "${JAVA_OPTS:-${JAVA_OPTIONS}}" | grep -q -- "-Xms"; then
+        return
+    fi
+
+    # Check if explicitly disabled
+    if [ "x$JAVA_INITIAL_MEM_RATIO" = "x0" ]; then
+        return
+    fi
+
+    # Check for the 'real memory size' and calculate ms from a ratio
+    # given (default is 25%)
+    if [ "x$CONTAINER_MAX_MEMORY" != x ]; then
+        local max_mem="${CONTAINER_MAX_MEMORY}"
+        local max_ratio=${JAVA_MAX_MEM_RATIO:-${__DEFAULT_JAVA_MAX_MEM_RATIO}}
+        local initial_ratio=${JAVA_INITIAL_MEM_RATIO:-${__DEFAULT_JAVA_INITIAL_MEM_RATIO}}
+        local ms=$(echo "${max_mem} ${max_ratio} ${initial_ratio} 1048576" | awk '{printf "%d\n" , ($1*(($2*$3)/10000))/$4 + 0.5}')
+        local max_initial_memory=${JAVA_MAX_INITIAL_MEM:-${__DEFAULT_JAVA_MAX_INITIAL_MEM}}
+        if [ "${ms}" -lt "${max_initial_memory}" ] ; then
+          echo "-Xms${ms}m"
+        else
+          echo "-Xms${max_initial_memory}m"
+        fi
+    fi
+}
+
+# Switch on diagnostics except when switched off
+diagnostics() {
+    if [ "x$JAVA_DIAGNOSTICS" != "x" ]; then
+        echo "$(jvm_specific_diagnostics)"
+    fi
+}
+
+cpu_core_tunning() {
+    # If both are set rely on JAVA_CORE_LIMIT limited to CONTAINER_CORE_LIMIT
+    # If none are set, just return.
+    local core_limit=${JAVA_CORE_LIMIT:-${CONTAINER_CORE_LIMIT}}
+    if [ "x$core_limit" = "x0" -o "x$core_limit" = "x" ]; then
+        return
+    else
+        if [ "x$CONTAINER_CORE_LIMIT" != "x" ] && [ $core_limit -gt $CONTAINER_CORE_LIMIT ]; then
+            core_limit=$CONTAINER_CORE_LIMIT
+        fi
+         echo "-XX:ParallelGCThreads=${core_limit} " \
+              "-Djava.util.concurrent.ForkJoinPool.common.parallelism=${core_limit} "\
+              "-XX:CICompilerCount=2"
+    fi
+}
+
+gc_config() {
+    local minHeapFreeRatio=${GC_MIN_HEAP_FREE_RATIO:-10}
+    local maxHeapFreeRatio=${GC_MAX_HEAP_FREE_RATIO:-20}
+    local timeRatio=${GC_TIME_RATIO:-4}
+    local adaptiveSizePolicyWeight=${GC_ADAPTIVE_SIZE_POLICY_WEIGHT:-90}
+    local maxMetaspaceSize
+    local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelOldGC}"
+    # for compat reasons we don't set a default value for metaspaceSize
+    local metaspaceSize
+
+    if [ -n "${GC_MAX_METASPACE_SIZE}" ]; then
+        maxMetaspaceSize=${GC_MAX_METASPACE_SIZE}
+    fi
+
+    if [ -n "${GC_METASPACE_SIZE}" ]; then
+        metaspaceSize=${GC_METASPACE_SIZE}
+        if [ -n "${maxMetaspaceSize}" ]; then
+        # clamp the max size of metaspaceSize to be <= maxMetaspaceSize
+            if [ "${metaspaceSize}" -gt "${maxMetaspaceSize}" ]; then
+                metaspaceSize=${maxMetaspaceSize}
+            fi
+        fi
+    fi
+
+    local allOptions="$(jvm_specific_options) "
+    allOptions+="${gcOptions} "
+    allOptions+="-XX:MinHeapFreeRatio=${minHeapFreeRatio} "
+    allOptions+="-XX:MaxHeapFreeRatio=${maxHeapFreeRatio} "
+    allOptions+="-XX:GCTimeRatio=${timeRatio} "
+    allOptions+="-XX:AdaptiveSizePolicyWeight=${adaptiveSizePolicyWeight} "
+    if [ -n "${maxMetaspaceSize}" ]; then
+        allOptions+="-XX:MaxMetaspaceSize=${maxMetaspaceSize}m "
+    fi
+    if [ -n "${metaspaceSize}" ]; then
+        allOptions+="-XX:MetaspaceSize=${metaspaceSize}m "
+    fi
+
+    echo "${allOptions}"
+}
+
+error_handling() {
+    echo "-XX:+ExitOnOutOfMemoryError"
+}
+
+initialize_container_limits > /dev/null
+
+## Echo options, trimming trailing and multiple spaces
+echo "$(initial_memory) $(max_memory) $(gc_config) $(diagnostics) $(cpu_core_tunning) $(error_handling)" | awk '$1=$1'
diff --git a/modules/kogito-dynamic-resources/configure b/modules/kogito-dynamic-resources/configure
new file mode 100644
index 00000000000..c9c4131f860
--- /dev/null
+++ b/modules/kogito-dynamic-resources/configure
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR=$(dirname "$0")
+
+mkdir -p "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
+
+cp -prv "${SCRIPT_DIR}"/added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
+chown -R kogito:root "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
+chmod -R ug+x-w "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
+
diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml
new file mode 100644
index 00000000000..0410207ba1b
--- /dev/null
+++ b/modules/kogito-dynamic-resources/module.yaml
@@ -0,0 +1,61 @@
+schema_version: 1
+name: org.kie.kogito.dynamic.resources
+version: "2.0.0-snapshot"
+
+description: -|
+  Module retrieved from https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash
+  However it contains a few customizations to fit Kogito needs.
+
+execute:
+  - script: configure
+
+envs:
+  - name: JBOSS_CONTAINER_JAVA_JVM_MODULE
+    value: /opt/container/java/jvm
+  - name: JAVA_OPTIONS
+    description: User specified Java options to be appended to generated options in JAVA_OPTS (internal use).
+    example: "-verbose:class"
+  - name: JAVA_MAX_MEM_RATIO
+    description: Is used when no `-Xmx` option is given in **JAVA_OPTIONS**. This is used to calculate a default maximal heap memory based on a containers restriction. If used in a container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio of the container available memory as set here. The default is `50` which means 50% of the available memory is used as an upper boundary. You can skip this mechanism by setting this value to `0` in which case no `-Xmx` option is added.
+  - name: JAVA_INITIAL_MEM_RATIO
+    description: Is used when no `-Xms` option is given in **JAVA_OPTIONS**. This is used to calculate a default initial heap memory based on the maximum heap memory. If used in a container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xms` is set to a ratio of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` is used as the initial heap size. You can skip this mechanism by setting this value to `0` in which case no `-Xms` option is added.
+    example: "25"
+  - name: JAVA_MAX_INITIAL_MEM
+    description: Is used when no `-Xms` option is given in **JAVA_OPTIONS**. This is used to calculate the maximum value of the initial heap memory. If used in a container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xms` is limited to the value set here. The default is 4096Mb which means the calculated value of `-Xms` never will be greater than 4096Mb. The value of this variable is expressed in MB.
+    example: "4096"
+  - name: JAVA_DIAGNOSTICS
+    description: Set this to get some diagnostics information to standard output when things are happening. **Disabled by default.**
+    example: "true"
+  - name: JAVA_DEBUG
+    description: If set remote debugging will be switched on. **Disabled by default.**
+    example: "true"
+  - name: JAVA_DEBUG_PORT
+    description: Port used for remote debugging. Defaults to *5005*.
+    example: "8787"
+  - name: CONTAINER_CORE_LIMIT
+    description: A calculated core limit as described in https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt.
+    example: "2"
+  - name: CONTAINER_MAX_MEMORY
+    description: Memory limit given to the container.
+    example: "1024"
+  - name: GC_MIN_HEAP_FREE_RATIO
+    description: Minimum percentage of heap free after GC to avoid expansion.
+    example: "20"
+  - name: GC_MAX_HEAP_FREE_RATIO
+    description: Maximum percentage of heap free after GC to avoid shrinking.
+    example: "40"
+  - name: GC_TIME_RATIO
+    description: Specifies the ratio of the time spent outside the garbage collection (for example, the time spent for application execution) to the time spent in the garbage collection.
+    example: "4"
+  - name: GC_ADAPTIVE_SIZE_POLICY_WEIGHT
+    description: The weighting given to the current GC time versus previous GC times.
+    example: "90"
+  - name: GC_METASPACE_SIZE
+    description: The initial metaspace size.
+    example: "20"
+  - name: GC_MAX_METASPACE_SIZE
+    description: The maximum metaspace size.
+    example: "100"
+  - name: GC_CONTAINER_OPTIONS
+    description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelOldGC`.
+    example: -XX:+UseG1GC
\ No newline at end of file
diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
index ac4288e4675..8f9ca3eda06 100644
--- a/modules/kogito-explainability/added/kogito-app-launch.sh
+++ b/modules/kogito-explainability/added/kogito-app-launch.sh
@@ -21,8 +21,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-jit-runner/added/kogito-app-launch.sh b/modules/kogito-jit-runner/added/kogito-app-launch.sh
index ddfe15db199..9c94ebab69a 100644
--- a/modules/kogito-jit-runner/added/kogito-app-launch.sh
+++ b/modules/kogito-jit-runner/added/kogito-app-launch.sh
@@ -19,8 +19,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JIT_RUNNER_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_JIT_RUNNER_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
index 6f4c71b3e58..116813d5e47 100644
--- a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
@@ -20,8 +20,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+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/jobs-service-common-runner.jar
diff --git a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
index 29847efd554..72387251f5b 100644
--- a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
@@ -20,8 +20,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+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/jobs-service-infinispan-runner.jar
diff --git a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
index 23c1ead6860..e3fe6e701e4 100644
--- a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
@@ -20,8 +20,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+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/jobs-service-mongodb-runner.jar
diff --git a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
index 2c9ed73aa3a..5858954f30c 100644
--- a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
@@ -20,8 +20,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+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/jobs-service-postgresql-runner.jar
diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
index 551612fdd15..21accf91317 100644
--- a/modules/kogito-management-console/added/kogito-app-launch.sh
+++ b/modules/kogito-management-console/added/kogito-app-launch.sh
@@ -20,8 +20,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
         -jar "${KOGITO_HOME}"/bin/management-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
index 5d339738a78..0b089518eb9 100644
--- a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
+++ b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
@@ -25,16 +25,19 @@ runtime_type=$(get_runtime_type)
 
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
 case ${runtime_type} in 
     "quarkus") 
-        exec java ${JAVA_OPTIONS} ${KOGITO_QUARKUS_JVM_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+        exec java ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_QUARKUS_JVM_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
             -Dquarkus.http.host=0.0.0.0 \
             -Dquarkus.http.port=8080 \
             -jar "${KOGITO_HOME}"/bin/*.jar
     ;;
     "springboot") 
-        exec java ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
+        exec java ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+            -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
     ;;
     *)
         log_error "${runtime_type} is not supported."
diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh
index 2436ed1e110..0d0052b8c07 100644
--- a/modules/kogito-task-console/added/kogito-app-launch.sh
+++ b/modules/kogito-task-console/added/kogito-app-launch.sh
@@ -20,8 +20,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
         -jar "${KOGITO_HOME}"/bin/task-console-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
index 46f01bce0d7..0c4a19e233a 100644
--- a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
@@ -20,8 +20,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-trusty-redis/added/kogito-app-launch.sh b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
index ea4df0a4ffc..7921b7c037c 100644
--- a/modules/kogito-trusty-redis/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
@@ -20,8 +20,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
index 20b604651a6..13e619778d2 100644
--- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
@@ -21,8 +21,10 @@ CONFIGURE_SCRIPTS=(
 source "${KOGITO_HOME}"/launch/configure.sh
 #############################################
 
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
         -jar "${KOGITO_HOME}"/bin/trusty-ui-runner.jar
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 0df1ba36117..2464f6b87c2 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -52,6 +52,7 @@ modules:
     - name: org.kie.kogito.graalvm.scripts
     - name: org.kie.kogito.openjdk
       version: "11"
+    - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
       version: "3.8.1"
     - name: org.kie.kogito.s2i.core
diff --git a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
index 6d917f89503..540e7793c57 100644
--- a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
@@ -39,6 +39,7 @@ modules:
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.openjdk
       version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.runtime.jvm
     - name: org.kie.kogito.security.custom.truststores
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
new file mode 100644
index 00000000000..870c79bcfe3
--- /dev/null
+++ b/tests/features/common-dynamic-resources.feature
@@ -0,0 +1,60 @@
+@quay.io/kiegroup/kogito-builder
+@quay.io/kiegroup/kogito-runtime-jvm
+@quay.io/kiegroup/kogito-data-index-infinispan
+@quay.io/kiegroup/kogito-data-index-mongodb
+@quay.io/kiegroup/kogito-data-index-postgresql
+@quay.io/kiegroup/kogito-trusty-infinispan
+@quay.io/kiegroup/kogito-trusty-redis
+@quay.io/kiegroup/kogito-trusty-ui
+@quay.io/kiegroup/kogito-explainability
+@quay.io/kiegroup/kogito-jit-runner
+@quay.io/kiegroup/kogito-jobs-service-ephemeral
+@quay.io/kiegroup/kogito-jobs-service-infinispan
+@quay.io/kiegroup/kogito-jobs-service-mongodb
+@quay.io/kiegroup/kogito-jobs-service-postgresql
+@quay.io/kiegroup/kogito-management-console
+@quay.io/kiegroup/kogito-task-console
+@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
+@rhpam-7/rhpam-kogito-builder-rhel8
+Feature: Common tests for Kogito images
+
+  Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
+    When container is started with args
+      | arg       | value                                                                           |
+      | mem_limit | 1073741824                                                                      |
+      | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 80, "JAVA_INITIAL_MEM_RATIO": 25} |
+    Then container log should match regex -Xms205m
+    And container log should match regex -Xmx819m
+
+  Scenario: Verify if the DEFAULT MEM RATIO properties are overridden with different values
+    When container is started with args
+      | arg       | value                                                                           |
+      | mem_limit | 1073741824                                                                      |
+      | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 50, "JAVA_INITIAL_MEM_RATIO": 10} |
+    Then container log should match regex -Xms51m
+    And container log should match regex -Xmx512m
+
+  Scenario: Verify if the properties were correctly set when aren't passed
+    When container is started with args
+      | arg       | value                   |
+      | mem_limit | 1073741824              |
+      | env_json  | {"SCRIPT_DEBUG":"true"} |
+    Then container log should match regex -Xms128m
+    And container log should match regex -Xmx512m
+
+  Scenario: Verify if Java Remote Debug is correctly configured
+    When container is started with env
+      | variable       | value |
+      | SCRIPT_DEBUG   | true  |
+      | JAVA_DEBUG     | true  |
+      |JAVA_DEBUG_PORT | 9222  |
+    Then container log should match regex -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9222
+
+  Scenario: Verify if the DEFAULT MEM RATIO properties are overridden with different values from user provided Xmx and Xms
+    When container is started with args
+      | arg       | value                                                                                                                 |
+      | mem_limit | 1073741824                                                                                                            |
+      | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 50, "JAVA_INITIAL_MEM_RATIO": 10, "JAVA_OPTIONS":"-Xms4000m -Xmx8000m"} |
+    Then container log should match regex -Xms4000m
+    And container log should match regex -Xmx8000m
+
diff --git a/tests/features/common.feature b/tests/features/common.feature
index b995b579288..6b76073a493 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -25,3 +25,4 @@ Feature: Common tests for Kogito images
     Then run bash -c 'echo $USER' in container and check its output for kogito
      And run sh -c 'echo $HOME' in container and check its output for /home/kogito
      And run sh -c 'id' in container and check its output for uid=1001(kogito) gid=0(root) groups=0(root),1001(kogito)
+
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index f4c5fd560ae..a11ca931635 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -6,4 +6,4 @@ Feature: Kogito-data-index common feature.
     When container is started with env
       | variable               | value   |
       | SCRIPT_DEBUG           | true    |
-    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
index dee5eb3be82..e4237ff9cfb 100644
--- a/tests/features/data-index/kogito-data-index-postgresql.feature
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -22,7 +22,7 @@ Feature: Kogito-data-index postgresql feature.
       | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:postgresql://10.1.1.10:5432/quarkus |
       | QUARKUS_DATASOURCE_USERNAME  | kogito                                   |
       | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
-    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-postgresql-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-postgresql-runner.jar
      And container log should contain org.postgresql.util.PSQLException: The connection attempt failed
      And container log should not contain Application failed to start
 
diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature
index 56997e71f6b..d071023ff1f 100644
--- a/tests/features/jobs-service/kogito-jobs-service-common.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-common.feature
@@ -1,4 +1,7 @@
-@quay.io/kiegroup/kogito-jobs-service-infinispan @quay.io/kiegroup/kogito-jobs-service-mongodb @quay.io/kiegroup/kogito-jobs-service-ephemeral @quay.io/kiegroup/kogito-jobs-service-postgresql
+@quay.io/kiegroup/kogito-jobs-service-infinispan
+@quay.io/kiegroup/kogito-jobs-service-mongodb
+@quay.io/kiegroup/kogito-jobs-service-ephemeral
+@quay.io/kiegroup/kogito-jobs-service-postgresql
 Feature: Kogito-jobs-service common feature.
 
   Scenario: verify if the events is correctly enabled
@@ -7,4 +10,4 @@ Feature: Kogito-jobs-service common feature.
       | SCRIPT_DEBUG            | true                                      |
       | ENABLE_EVENTS           | true                                      |
       | KOGITO_JOBS_PROPS       | -Dkafka.bootstrap.servers=localhost:11111 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkafka.bootstrap.servers=localhost:11111 -Dquarkus.profile=events-support -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar
+    Then container log should contain -Dkafka.bootstrap.servers=localhost:11111 -Dquarkus.profile=events-support -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index 4fb9d055b62..9694ef189b2 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -19,7 +19,7 @@ Feature: Kogito-jobs-service-ephemeral feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-common-runner.jar
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-common-runner.jar
     And container log should contain started in
     And container log should not contain Application failed to start
 
diff --git a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
index 0ed0803557e..d190d5ae046 100644
--- a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
@@ -25,7 +25,7 @@ Feature: Kogito-jobs-service-infinispan feature.
       | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-infinispan-runner.jar
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-infinispan-runner.jar
     And container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
     And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
index beb5d97b2c1..a756b279944 100644
--- a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
@@ -21,5 +21,5 @@ Feature: Kogito-jobs-service-mongodb feature.
       | SCRIPT_DEBUG                      | true                                           |
       | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://user:password@localhost:27017/admin  |
       | QUARKUS_MONGODB_DATABASE          | kogito                                         |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-mongodb-runner.jar
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-mongodb-runner.jar
     And container log should not contain Application failed to start
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index fa0c61070f2..8cb75d30233 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -22,6 +22,6 @@ Feature: Kogito-jobs-service-postgresql feature.
       | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:postgresql://10.1.1.10:5432/quarkus |
       | QUARKUS_DATASOURCE_USERNAME  | kogito                                   |
       | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
-    Then container log should contain + exec java -XshowSettings:properties -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-postgresql-runner.jar
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-postgresql-runner.jar
     And container log should contain The connection attempt failed
     And container log should contain Failed to start application (with profile prod)
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index be623ae120c..861e0e9cba9 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -23,14 +23,14 @@ Feature: Kogito-explainability feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/explainability-service-messaging-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/explainability-service-messaging-runner.jar
 
   Scenario: Verify if the explainability rest binary is selected by the enviroment variable EXPLAINABILITY_COMMUNICATION
     When container is started with env
       | variable      | value |
       | EXPLAINABILITY_COMMUNICATION  | rest |
       | SCRIPT_DEBUG  | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/explainability-service-rest-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/explainability-service-rest-runner.jar
 
   Scenario: Verify if the communication is correctly set to its default value if a wrong communication type is set
     When container is started with env
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index b0b7447c284..de51f70ed16 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -19,7 +19,7 @@ Feature: Kogito-jit-runner feature.
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jitexecutor-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jitexecutor-runner.jar
 
   Scenario: Verify that jit runner can evaluate a DMN model with a context
     When container is started with env
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index e6c439113de..b91cdbf5908 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -19,7 +19,7 @@ Feature: kogito-management-console feature
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/management-console-runner.jar
+    Then container log should contain -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/management-console-runner.jar
     And container log should contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
@@ -29,7 +29,7 @@ Feature: kogito-management-console feature
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/management-console-runner.jar
+    Then container log should contain -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/management-console-runner.jar
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index e79278e7f34..55fffb1f631 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -19,7 +19,7 @@ Feature: kogito-task-console feature
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/task-console-runner.jar
+    Then container log should contain -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/task-console-runner.jar
     And container log should contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
@@ -29,7 +29,7 @@ Feature: kogito-task-console feature
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/task-console-runner.jar
+    Then container log should contain -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/task-console-runner.jar
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/trusty/kogito-trusty-common.feature b/tests/features/trusty/kogito-trusty-common.feature
index 00c76257dbb..3dd79f9fa9e 100644
--- a/tests/features/trusty/kogito-trusty-common.feature
+++ b/tests/features/trusty/kogito-trusty-common.feature
@@ -4,7 +4,7 @@ Feature: Kogito-trusty common feature.
     When container is started with env
       | variable               | value   |
       | SCRIPT_DEBUG           | true    |
-    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
+    Then container log should contain -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
 
   Scenario: Verify if a custom certificate is correctly handled
     When container is started with command /home/kogito/kogito-app-launch.sh
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
index 9905f312725..6a1ceab1051 100644
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -20,7 +20,7 @@ Feature: Kogito-trusty infinispan feature.
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
       | EXPLAINABILITY_ENABLED     | false  |
-    Then container log should contain + exec java -XshowSettings:properties -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-service-infinispan-runner.jar
+    Then container log should contain -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-service-infinispan-runner.jar
 
   Scenario: verify if auth is correctly set
     When container is started with env
@@ -31,7 +31,7 @@ Feature: Kogito-trusty infinispan feature.
       | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM       | SecretRealm       |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
     Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
     Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
diff --git a/tests/features/trusty/kogito-trusty-ui.feature b/tests/features/trusty/kogito-trusty-ui.feature
index 868f67bf552..d7137ac2f9d 100644
--- a/tests/features/trusty/kogito-trusty-ui.feature
+++ b/tests/features/trusty/kogito-trusty-ui.feature
@@ -19,7 +19,7 @@ Feature: kogito-trusty-ui feature
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-ui-runner.jar
+    Then container log should contain -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-ui-runner.jar
     And container log should contain Trusty url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
@@ -28,8 +28,8 @@ Feature: kogito-trusty-ui feature
     When container is started with env
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
-      | KOGITO_TRUSTY_ENDPOINT | http://test:9090 |
-    Then container log should contain + exec java -XshowSettings:properties -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-ui-runner.jar
+      | KOGITO_TRUSTY_ENDPOINT    | http://test:9090 |
+    Then container log should contain -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-ui-runner.jar
     And container log should not contain Trusty url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start

From 83b486b1ace2c862920d53b81d9c3fec70c4c8c7 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 4 Oct 2021 08:55:21 -0300
Subject: [PATCH 365/709] [KOGITO-416] - Limiting GraalVM memory usage relying
 on container cgroups (#764)

Signed-off-by: spolti <fspolti@redhat.com>
---
 README.md                                     |  7 +++++++
 .../added/memory-limit.sh                     | 20 ++++++++++++-------
 .../tests/bats/memory-limits.bats             | 15 ++++++++------
 tests/features/kogito-builder-native.feature  |  8 ++++++--
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index dc115fe7ddf..09e818d1096 100644
--- a/README.md
+++ b/README.md
@@ -125,6 +125,13 @@ what value the min and max should have:
 
 For a complete list ov environment variables that can be used to configure the JVM, please check the [dynamic resources](modules/kogito-dynamic-resources/module.yaml) module      
   
+When performing Quarkus native builds, by default, it will rely on the cgroups memory report to determine the amount of memory
+that will be used by the builder container. On OpenShift or k8s, it can be defined by setting the memory limit.
+The build process will use 80% of the total memory reported by cgroups. For backwards compatibility, the env
+`LIMIT_MEMORY` will be respected, but it is recommended unset it and let the memory be calculated automatic based
+on the available memory, it can be used in specific scenarios, like a CI test where it does not run on OpenShift cluster.
+
+
 ## Kogito Runtime and Builder Images
 
 Today, the Kogito images are divided basically in 2 vectors, when we talk about images that would be used to assemble 
diff --git a/modules/kogito-graalvm-scripts/added/memory-limit.sh b/modules/kogito-graalvm-scripts/added/memory-limit.sh
index 867cf2fb798..5fbc5cd9892 100644
--- a/modules/kogito-graalvm-scripts/added/memory-limit.sh
+++ b/modules/kogito-graalvm-scripts/added/memory-limit.sh
@@ -13,23 +13,29 @@
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
+source "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/container-limits
 
 function configure() {
-    # does not accepts
-    if [[  "${LIMIT_MEMORY}" =~ ^[-+]?[0-9]+{9}$ ]]; then
+    # backwards compatibility, if LIMIT_MEMORY it is set honor it
+    if [ "${LIMIT_MEMORY}x" != "x" ]; then
+        CONTAINER_MAX_MEMORY="${LIMIT_MEMORY}"
+        log_info "Using backwards compatibility with LIMIT_MEMORY env, if you want to rely com cgroups, unset this env."
+    fi
+    if [[  "${CONTAINER_MAX_MEMORY}" =~ ^[-+]?[0-9]+{9}$ ]]; then
         # native builds requires at least 1024m (1073741824=1024MB - 1 MB = 2^20 B in base 2)
         local limit=1073741824
         # only 80% of the actual limit will be used for the JVM
-        local jvm_limit_memory=$(("${LIMIT_MEMORY}"*80/100))
-        log_info "Limit memory for this container is set to ${LIMIT_MEMORY}. Allocated memory for JVM will be set to ${jvm_limit_memory}."
+        local jvm_limit_memory=$(awk -vn="${CONTAINER_MAX_MEMORY}" 'BEGIN{printf("%.0f\n",n*0.8)}')
+
         if [ "${jvm_limit_memory}" -lt "${limit}" ]; then
             limit=$(echo "scale=1; ${limit} / (80/100)" | bc -l)
-            printf "Provided memory (${LIMIT_MEMORY}) limit is too small (should be greater then %.0f bytes), native build will use all available memory.\n" "${limit}"
+            printf "Available memory (${CONTAINER_MAX_MEMORY}) limit is too small (should be greater than %.0f bytes), native build will use all available memory.\n" "${limit}"
         else
-            export KOGITO_OPTS="${KOGITO_OPTS} -Dnative-image.xmx=${jvm_limit_memory}"
+            log_info "Limit memory for this container is set to ${CONTAINER_MAX_MEMORY}. Allocated memory for JVM will be set to ${jvm_limit_memory}."
+            export KOGITO_OPTS="${KOGITO_OPTS} -Dquarkus.native.native-image-xmx=${jvm_limit_memory}"
         fi
     else
-        log_warning "Provided memory (${LIMIT_MEMORY}) limit is not valid, native build will use all available memory"
+        log_warning "Not able to determine the available memory. Using all memory available."
     fi
 }
 
diff --git a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats b/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
index eb147deb345..f500322d9a6 100644
--- a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
+++ b/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
@@ -1,15 +1,17 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=/tmp/kogito
+export JBOSS_CONTAINER_JAVA_JVM_MODULE=${KOGITO_HOME}/launch
 mkdir -p "${KOGITO_HOME}"/launch
 cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+cp $BATS_TEST_DIRNAME/../../../kogito-dynamic-resources/added/container-limits "${KOGITO_HOME}"/launch/
 
 # imports
 source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
 
 @test "test a valid memory limit value" {
     export LIMIT_MEMORY="1342177280"
-    local expected=" -Dnative-image.xmx=1073741824" # 80% of LIMIT_MEMORY, top expected by JVM
+    local expected=" -Dquarkus.native.native-image-xmx=1073741824" # 80% of LIMIT_MEMORY, top expected by JVM
     configure
     echo "Expected: ${expected}"
     echo "Result: ${KOGITO_OPTS}"
@@ -18,7 +20,7 @@ source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
 
 @test "test a result jvm memory with float points" {
     export LIMIT_MEMORY="2147483648" # 80% is 1717986918.4
-    local expected=" -Dnative-image.xmx=1717986918"
+    local expected=" -Dquarkus.native.native-image-xmx=1717986918"
     configure
     echo "Expected: ${expected}"
     echo "Result: ${KOGITO_OPTS}"
@@ -27,7 +29,7 @@ source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
 
 @test "test a small memory limit value" {
     export LIMIT_MEMORY="1073741600"
-    local expected="Provided memory (1073741600) limit is too small"
+    local expected="Available memory (1073741600) limit is too small"
     run configure
     local result="${lines[1]}"
     echo "Expected: ${expected}"
@@ -38,9 +40,10 @@ source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
 @test "test a invalid memory limit value" {
     function log_warning() { echo "WARN ${1}"; }
     export LIMIT_MEMORY="1024m"
-    local expected="WARN Provided memory (1024m) limit is not valid, native build will use all available memory"
+    local expected="WARN Not able to determine the available memory. Using all memory available."
     run configure
     echo "Expected: ${expected}"
-    echo "Result: ${output}"
-    [ "${expected}" = "${output}" ]
+    echo "Result: ${lines[@]}"
+    [ "${lines[0]}" = "INFO Using backwards compatibility with LIMIT_MEMORY env, if you want to rely com cgroups, unset this env." ]
+    [ "${lines[1]}" = "WARN Not able to determine the available memory. Using all memory available." ]
 }
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index ec095af3797..822adb6933f 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -30,7 +30,7 @@ Feature: kogito-builder image native build tests
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And s2i build log should contain -J-Xmx4g
+    And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main
@@ -50,7 +50,7 @@ Feature: kogito-builder image native build tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
     And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
-    And s2i build log should contain -J-Xmx4g
+    And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
     Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
@@ -68,6 +68,7 @@ Feature: kogito-builder image native build tests
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
+    And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
@@ -80,6 +81,7 @@ Feature: kogito-builder image native build tests
     Then file /home/kogito/bin/process-quarkus-example-runner should exist
      And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
      And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
+     And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Perform a incremental s2i build for native test
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main
@@ -117,6 +119,7 @@ Feature: kogito-builder image native build tests
       | request_body    | {"strings":["hello"]} |
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
+    And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
@@ -143,3 +146,4 @@ Feature: kogito-builder image native build tests
       | request_method  | GET                             |
       | content_type    | application/json                |
       | request_body    | {"status": "UP", "checks": []}  |
+    And s2i build log should contain -J-Xmx5153960755

From b566be21553f596e5ad4af0581c959f7d61fa6c3 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 4 Oct 2021 09:21:45 -0300
Subject: [PATCH 366/709] Updated Maven artifacts (#769)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index bd11c1cc9f9..de0f1cafc1b 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20210930.031040-254-runner.jar
-    md5: 4db5d0512670ee31e741a46bdd5ea1c4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211002.043253-256-runner.jar
+    md5: ce902181429ded460c68044f21a43337
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 7aaa04a0247..a0256e40fb3 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20210930.031422-255-runner.jar
-    md5: 28e28c54cbfb35e1009267edc3a1451f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211002.043619-257-runner.jar
+    md5: a5a97ec16d60fe3ee58998359aad154f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index e5ed0fa1920..386c73a0914 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20210930.031751-99-runner.jar
-    md5: 57706af800270aa7a3468c976589e501
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211002.043932-101-runner.jar
+    md5: 5882fce9acd2da0f3223426540334e0d
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 2ce30d9a836..5cecd67a1db 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20210930.040217-260-runner.jar
-    md5: c7f9e5f54b283e943eebe3ca09e03d43
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211002.052103-262-runner.jar
+    md5: 991c3b8ff40297e9aa8533c552947592
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20210930.040043-255-runner.jar
-    md5: dcf61fe8e0619d2027bf33907dbfcc6b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211002.051938-257-runner.jar
+    md5: 69f82a7ef92170c5ebb180d9be896b9c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 070727d162e..8578e662965 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20210930.041131-201-runner.jar
-    md5: adfe072ee411bddfae4dc29b20d692ef
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211002.052911-203-runner.jar
+    md5: 14f86cf6c35c14707ad97bf43e38e0e0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index b0cd2793ea3..d47e3167ffd 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20210930.025402-132-runner.jar
-    md5: 4f07aa40949ec2a8399be1ad83d2b502
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20211002.041751-134-runner.jar
+    md5: 1f682f486ab3d7025e92b25202356dc2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 2fbfc983546..c752ce77418 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20210930.025654-130-runner.jar
-    md5: 9f17a4d001e87c3c33d78aec5d67da39
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211002.042027-132-runner.jar
+    md5: f57c0ada46c61f1b31b14f60131dc7be
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 640d04968a3..1b8245498a2 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20210930.030235-112-runner.jar
-    md5: 91cdcd66d575e38aaddc93204b260976
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211002.042534-114-runner.jar
+    md5: 375f9e3a65e96f8a4174d4e4a0d95086
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 8d58c4fdb67..4f317570e55 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20210930.025942-132-runner.jar
-    md5: a6379c5d40f8aec769316fa1ddf0e778
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211002.042306-134-runner.jar
+    md5: f2cfa308bbdeff28d109309a6bc6758a
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 19d610aa4ec..e01e566c58c 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20210930.033648-255-runner.jar
-    md5: 99decb11ac8b44188bfae09b040612c0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211002.045650-256-runner.jar
+    md5: 56f8dcc84936e2f379e855ee0c239a69
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 18f2dffb22d..0fec371426d 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20210930.034007-255-runner.jar
-    md5: 77def4e9663098d3365384b1505c50ed
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211002.045932-256-runner.jar
+    md5: 01230654b038798f3e29a771f46b6403
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 0d3cec2a903..59cbf1690ef 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20210930.040656-167-runner.jar
-    md5: 13b25a83f4f4ef2d7b01887baf0f9fd6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211002.052516-169-runner.jar
+    md5: 792bbd1686b5c715c7f82d2f90af7b37
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 971d46667f7..5261fb35f8d 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20210930.040811-170-runner.jar
-    md5: 52626fe18ffada3c46089103900bc42d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211002.052619-172-runner.jar
+    md5: df49c570de9d68a03b4a5b639f105cad
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 4bf959c74e1..b0230695a7c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20210930.033924-254-runner.jar
-    md5: 82a2e7486baaeb4765b9c0645ab6c541
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211002.045857-255-runner.jar
+    md5: 13e5033bfcbc4fd6ba10f96ea0fdb62f
 
 execute:
   - script: configure

From e859d0ee68e3942bcf724b39da958000a76a0f90 Mon Sep 17 00:00:00 2001
From: Michael Anstis <manstis@users.noreply.github.com>
Date: Fri, 8 Oct 2021 16:52:42 +0100
Subject: [PATCH 367/709] FAI-606: trusty-storage: Create image for
 trusty-storage-postgreSQL (#758)

* FAI-606: trusty-storage: Create image for trusty-storage-postgreSQL

* Add correct SNAPSHOT URL and checksum

* Update modules/kogito-trusty-postgresql/module.yaml

* Update modules/kogito-trusty-postgresql/module.yaml

* Fix path.

* Add kogito-trusty-postgresql to the dynamic features test.

Co-authored-by: Michael Anstis <manstis@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 README.md                                     | 20 +++++++--
 kogito-imagestream.yaml                       | 21 +++++++++
 kogito-trusty-postgresql-overrides.yaml       | 43 +++++++++++++++++++
 .../added/kogito-app-launch.sh                | 30 +++++++++++++
 modules/kogito-trusty-postgresql/configure    | 11 +++++
 modules/kogito-trusty-postgresql/module.yaml  | 12 ++++++
 scripts/README.md                             |  1 +
 scripts/update-maven-artifacts.py             |  1 +
 .../features/common-custom-truststore.feature |  9 +++-
 .../features/common-dynamic-resources.feature |  1 +
 tests/features/common.feature                 |  1 +
 .../trusty/kogito-trusty-common.feature       | 12 ++----
 .../trusty/kogito-trusty-postgresql.feature   | 27 ++++++++++++
 13 files changed, 175 insertions(+), 14 deletions(-)
 create mode 100644 kogito-trusty-postgresql-overrides.yaml
 create mode 100644 modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-trusty-postgresql/configure
 create mode 100644 modules/kogito-trusty-postgresql/module.yaml
 create mode 100644 tests/features/trusty/kogito-trusty-postgresql.feature

diff --git a/README.md b/README.md
index 09e818d1096..d2f69f27871 100644
--- a/README.md
+++ b/README.md
@@ -549,13 +549,14 @@ Order has been created Order[12345] with assigned approver JOHN
 
 The Kogito Component Images can be considered as lightweight images that will complement the Kogito core engine 
 by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications.
-Today we have 14 Kogito Component Images:
+Today we have 15 Kogito Component Images:
 
 * [quay.io/kiegroup/kogito-data-index-infinispan](https://quay.io/kiegroup/kogito-data-index-infinispan)
 * [quay.io/kiegroup/kogito-data-index-mongodb](https://quay.io/kiegroup/kogito-data-index-mongodb)
 * [quay.io/kiegroup/kogito-data-index-postgresql](https://quay.io/kiegroup/kogito-data-index-postgresql)
 * [quay.io/kiegroup/kogito-trusty-infinispan](https://quay.io/kiegroup/kogito-trusty-infinispan)
 * [quay.io/kiegroup/kogito-trusty-redis](https://quay.io/kiegroup/kogito-trusty-redis)
+* [quay.io/kiegroup/kogito-trusty-postgresql](https://quay.io/kiegroup/kogito-trusty-postgresql)
 * [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
 * [quay.io/kiegroup/kogito-jobs-service-ephemeral](https://quay.io/kiegroup/kogito-jobs-service-ephemeral) 
 * [quay.io/kiegroup/kogito-jobs-service-infinispan](https://quay.io/kiegroup/kogito-jobs-service-infinispan)
@@ -636,14 +637,15 @@ to your Kogito infrastructure on a Kubernetes cluster and provide its capabiliti
 ### Kogito Trusty Component Image
 
 The Trusty Service aims at collecting tracing information by one or more Kogito runtime services and provides analytical capabilities on top of the collected data. 
-The Trusty Service depends on a running Infinispan or Redis Server.
+The Trusty Service depends on a running Infinispan, Redis Server or PostgreSQL RDBMS.
 The Trusty service can be switched by using its corresponding image
 
 - Infinispan: quay.io/kiegroup/kogito-trusty-infinispan
     [image.yaml](kogito-trusty-infinispan-overrides.yaml)
 - Redis: quay.io/kiegroup/kogito-trusty-redis
     [image.yaml](kogito-trusty-redis-overrides.yaml)
-
+- PostgreSQL: quay.io/kiegroup/kogito-trusty-postgresql
+    [image.yaml](kogito-trusty-postgresql-overrides.yaml)
 
 Basic usage with Infinispan:
 ```bash
@@ -655,6 +657,14 @@ Basic usage with Redis:
 $ docker run -it --env KOGITO_PERSISTENCE_REDIS_URL=redis://localhost:6379 quay.io/kiegroup/kogito-trusty-redis:latest
 ```
 
+Basic usage with PostgreSQL:
+```bash
+$ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus"  \
+    --env QUARKUS_DATASOURCE_USERNAME="kogito" \
+    --env QUARKUS_DATASOURCE_PASSWORD="secret" \
+    quay.io/kiegroup/kogito-trusty-postgresql:latest
+```
+
 To enable debug just use this env while running this image:
 
 ```bash
@@ -836,6 +846,7 @@ imagestream.image.openshift.io/kogito-data-index-mongodb created
 imagestream.image.openshift.io/kogito-data-index-postgresql created
 imagestream.image.openshift.io/kogito-trusty-infinispan created
 imagestream.image.openshift.io/kogito-trusty-redis created
+imagestream.image.openshift.io/kogito-trusty-postgresql created
 imagestream.image.openshift.io/kogito-jobs-service-ephemeral created
 imagestream.image.openshift.io/kogito-jobs-service-infinispan created
 imagestream.image.openshift.io/kogito-jobs-service-mongodb created
@@ -1027,6 +1038,7 @@ With this Makefile you can:
      $ make build-image image_name=kogito-data-index-postgresql
      $ make build-image image_name=kogito-trusty-infinispan
      $ make build-image image_name=kogito-trusty-redis
+     $ make build-image image_name=kogito-trusty-postgresql
      $ make build-image image_name=kogito-explainability
      $ make build-image image_name=kogito-jobs-service-ephemeral
      $ make build-image image_name=kogito-jobs-service-infinispan
@@ -1095,6 +1107,7 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-data-index-postgresql](modules/kogito-data-index-postgresql): Installs and Configure the postgresql data-index jar inside the image.
 - [kogito-trusty-infinispan](modules/kogito-trusty-infinispan): Installs and Configure the infinispan trusty jar inside the image.
 - [kogito-trusty-redis](modules/kogito-trusty-redis): Installs and Configure the redis trusty jar inside the image.
+- [kogito-trusty-postgresql](modules/kogito-trusty-postgresql): Installs and Configure the PostgreSQL trusty jar inside the image.
 - [kogito-explainability](modules/kogito-explainability): Installs and Configure the explainability jar inside the image.
 - [kogito-epel](modules/kogito-epel): Configures the epel repository on the target image.
 - [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image.
@@ -1129,6 +1142,7 @@ Please inspect the images overrides files to learn which modules are being insta
 - [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-redis](kogito-trusty-redis-overrides.yaml)
+- [quay.io/kiegroup/kogito-trusty-postgresql](kogito-trusty-postgresql-overrides.yaml)
 - [quay.io/kiegroup/kogito-explainability](kogito-explainability-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-infinispan](kogito-jobs-service-infinispan-overrides.yaml)
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 3521bf1a23d..68fa572e0cc 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -174,6 +174,27 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-trusty-redis:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-trusty-postgresql
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Trusty Service for PostgreSQL persistence provider
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Runtime image for the Kogito Trusty Service with PostgreSQL
+            iconClass: icon-jbpm
+            tags: kogito,trusty,trusty-postgresql
+            supports: persistence backed by PostgreSQL RDBMS
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-trusty-postgresql:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-trusty-postgresql-overrides.yaml b/kogito-trusty-postgresql-overrides.yaml
new file mode 100644
index 00000000000..b08234ee217
--- /dev/null
+++ b/kogito-trusty-postgresql-overrides.yaml
@@ -0,0 +1,43 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-trusty-postgresql"
+description: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
+
+labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
+- name: "io.k8s.display-name"
+  value: "Kogito Trusty Service - PostgreSQL"
+- name: "io.openshift.tags"
+  value: "kogito,trusty,trusty-postgresql"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.trusty.postgresql
+  - name: org.kie.kogito.trusty.common
+  - name: org.kie.kogito.security.custom.truststores
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh b/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..a1cf28e9311
--- /dev/null
+++ b/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  "${KOGITO_HOME}"/launch/kogito-trusty.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
+        -jar "${KOGITO_HOME}"/bin/trusty-service-postgresql-runner.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-postgresql/configure b/modules/kogito-trusty-postgresql/configure
new file mode 100644
index 00000000000..5deaff44cee
--- /dev/null
+++ b/modules/kogito-trusty-postgresql/configure
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v "${SOURCES_DIR}"/trusty-service-postgresql-runner.jar "${KOGITO_HOME}"/bin/
+
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
new file mode 100644
index 00000000000..2ccd82b1bf4
--- /dev/null
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.trusty.postgresql
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: trusty-service-postgresql-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211005.110152-1-runner.jar
+    md5: 40991d7f2a95cf313bb973b7ccbe85c8
+
+execute:
+  - script: configure
+
diff --git a/scripts/README.md b/scripts/README.md
index 6c61dac0b16..39b647dd7b4 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -203,6 +203,7 @@ The command will update the needed files with the new URL:
 - kogito-trusty-ui/module.yaml
 - kogito-trusty-infinispan/module.yaml
 - kogito-trusty-redis/module.yaml
+- kogito-trusty-postgresql/module.yaml
 
 ### Update tests script
 
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index ed31ef2f2d2..70da217c04a 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -29,6 +29,7 @@
     "data-index-service-postgresql": "kogito-data-index-postgresql",
     "trusty-service-infinispan": "kogito-trusty-infinispan",
     "trusty-service-redis": "kogito-trusty-redis",
+    "trusty-service-postgresql": "kogito-trusty-postgresql",
     "explainability-service-rest": "kogito-explainability",
     "explainability-service-messaging": "kogito-explainability",
     "jobs-service-infinispan": "kogito-jobs-service-infinispan",
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 5ba23268391..80fc0d630e5 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -6,8 +6,13 @@
 @quay.io/kiegroup/kogito-management-console 
 @quay.io/kiegroup/kogito-explainability 
 @quay.io/kiegroup/kogito-jit-runner 
-@quay.io/kiegroup/kogito-jobs-service-ephemeral @quay.io/kiegroup/kogito-jobs-service-infinispan @quay.io/kiegroup/kogito-jobs-service-mongodb @quay.io/kiegroup/kogito-jobs-service-postgresql
-@quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis 
+@quay.io/kiegroup/kogito-jobs-service-ephemeral
+@quay.io/kiegroup/kogito-jobs-service-infinispan
+@quay.io/kiegroup/kogito-jobs-service-mongodb
+@quay.io/kiegroup/kogito-jobs-service-postgresql
+@quay.io/kiegroup/kogito-trusty-infinispan
+@quay.io/kiegroup/kogito-trusty-redis
+@quay.io/kiegroup/kogito-trusty-postgresql
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: Common tests for Custom TrustStore configuration
   Scenario: Verify if a custom certificate is correctly handled
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index 870c79bcfe3..e9e3083013e 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -5,6 +5,7 @@
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-trusty-infinispan
 @quay.io/kiegroup/kogito-trusty-redis
+@quay.io/kiegroup/kogito-trusty-postgresql
 @quay.io/kiegroup/kogito-trusty-ui
 @quay.io/kiegroup/kogito-explainability
 @quay.io/kiegroup/kogito-jit-runner
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 6b76073a493..9058daba4f8 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -6,6 +6,7 @@
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-trusty-infinispan
 @quay.io/kiegroup/kogito-trusty-redis
+@quay.io/kiegroup/kogito-trusty-postgresql
 @quay.io/kiegroup/kogito-trusty-ui
 @quay.io/kiegroup/kogito-explainability
 @quay.io/kiegroup/kogito-jit-runner
diff --git a/tests/features/trusty/kogito-trusty-common.feature b/tests/features/trusty/kogito-trusty-common.feature
index 3dd79f9fa9e..f755568bc0b 100644
--- a/tests/features/trusty/kogito-trusty-common.feature
+++ b/tests/features/trusty/kogito-trusty-common.feature
@@ -1,15 +1,9 @@
-@quay.io/kiegroup/kogito-trusty-infinispan @quay.io/kiegroup/kogito-trusty-redis
+@quay.io/kiegroup/kogito-trusty-infinispan
+@quay.io/kiegroup/kogito-trusty-redis
+@quay.io/kiegroup/kogito-trusty-postgresql
 Feature: Kogito-trusty common feature.
   Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable               | value   |
       | SCRIPT_DEBUG           | true    |
     Then container log should contain -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
-
-  Scenario: Verify if a custom certificate is correctly handled
-    When container is started with command /home/kogito/kogito-app-launch.sh
-      | variable            | value              |
-      | CUSTOM_TRUSTSTORE   | my-truststore.jks  |
-      | RUNTIME_TYPE        | quarkus            |
-    Then container log should contain INFO ---> Configuring custom Java Truststore
-    Then container log should contain ERROR ---> A custom truststore was specified
\ No newline at end of file
diff --git a/tests/features/trusty/kogito-trusty-postgresql.feature b/tests/features/trusty/kogito-trusty-postgresql.feature
new file mode 100644
index 00000000000..ef6371f2659
--- /dev/null
+++ b/tests/features/trusty/kogito-trusty-postgresql.feature
@@ -0,0 +1,27 @@
+@quay.io/kiegroup/kogito-trusty-postgresql
+Feature: Kogito-trusty postgresql feature.
+
+  Scenario: verify if all labels are correctly set on kogito-trusty-postgresql image
+    Given image is built
+     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+      And the image should contain label io.openshift.s2i.destination with value /tmp
+      And the image should contain label io.openshift.expose-services with value 8080:http
+      And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for PostgreSQL persistence provider
+      And the image should contain label io.k8s.display-name with value Kogito Trusty Service - PostgreSQL
+      And the image should contain label io.openshift.tags with value kogito,trusty,trusty-postgresql
+
+  Scenario: verify if the trusty service binaries are available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/trusty-service-postgresql-runner.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-postgresql-runner.jar
+
+  Scenario: verify if all parameters are correctly set
+    When container is started with env
+      | variable                     | value                                    |
+      | SCRIPT_DEBUG                 | true                                     |
+      | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:postgresql://10.1.1.10:5432/quarkus |
+      | QUARKUS_DATASOURCE_USERNAME  | kogito                                   |
+      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-service-postgresql-runner.jar
+    And container log should contain org.postgresql.util.PSQLException: The connection attempt failed
+    And container log should not contain Application failed to start

From f99c846931aa5d644386ca2353a99840167cbe1a Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 11 Oct 2021 14:41:03 -0300
Subject: [PATCH 368/709] Updated Maven artifacts (#783)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index de0f1cafc1b..0c88ad9b578 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211002.043253-256-runner.jar
-    md5: ce902181429ded460c68044f21a43337
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211011.033025-263-runner.jar
+    md5: 33824101887f3eee9e07a9bf274f9628
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index a0256e40fb3..01916cd0f5b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211002.043619-257-runner.jar
-    md5: a5a97ec16d60fe3ee58998359aad154f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211011.033335-263-runner.jar
+    md5: b0657b0a6561f5b1de5ad148bd51c116
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 386c73a0914..9a117c5c7e7 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211002.043932-101-runner.jar
-    md5: 5882fce9acd2da0f3223426540334e0d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211011.033633-107-runner.jar
+    md5: 03145ada47c002bce88ba8e99c822c9f
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 5cecd67a1db..74bdd0ec4af 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211002.052103-262-runner.jar
-    md5: 991c3b8ff40297e9aa8533c552947592
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211011.041701-268-runner.jar
+    md5: 71952f0266ae0780ade843b3dd8001ce
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211002.051938-257-runner.jar
-    md5: 69f82a7ef92170c5ebb180d9be896b9c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211011.041539-263-runner.jar
+    md5: b6a412449d4fab8bb647d7960e9d2697
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 8578e662965..6959019908d 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211002.052911-203-runner.jar
-    md5: 14f86cf6c35c14707ad97bf43e38e0e0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211011.042630-209-runner.jar
+    md5: 11a0e787f2b97b988df19fc3d120c27c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index d47e3167ffd..ac9382b9235 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20211002.041751-134-runner.jar
-    md5: 1f682f486ab3d7025e92b25202356dc2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20211011.031542-141-runner.jar
+    md5: 52067c411b1db64733d2295eb98de801
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index c752ce77418..e300fa5241a 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211002.042027-132-runner.jar
-    md5: f57c0ada46c61f1b31b14f60131dc7be
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211011.031815-139-runner.jar
+    md5: e6ed4a17d0b16f799a3714b2ad5c10e2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 1b8245498a2..0f4ec52e479 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211002.042534-114-runner.jar
-    md5: 375f9e3a65e96f8a4174d4e4a0d95086
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211011.032317-121-runner.jar
+    md5: cd9b8e9b0fd8dff691c31371836f884c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 4f317570e55..363d79658d0 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211002.042306-134-runner.jar
-    md5: f2cfa308bbdeff28d109309a6bc6758a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211011.032045-141-runner.jar
+    md5: fb34a17c73a2ba88e889221959fc7440
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e01e566c58c..fc42be237c8 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211002.045650-256-runner.jar
-    md5: 56f8dcc84936e2f379e855ee0c239a69
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211011.035246-262-runner.jar
+    md5: 6708f2d6de2a64be87faad7fb5891134
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 0fec371426d..abc9996c6cb 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211002.045932-256-runner.jar
-    md5: 01230654b038798f3e29a771f46b6403
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211011.035535-262-runner.jar
+    md5: 78a70bb9ca7013639a8cbce6dee3f8d0
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 59cbf1690ef..dfeacf93112 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211002.052516-169-runner.jar
-    md5: 792bbd1686b5c715c7f82d2f90af7b37
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211011.042114-175-runner.jar
+    md5: 8850d60485201ba88574e40dfb2f19f7
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 2ccd82b1bf4..1df9a61244c 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211005.110152-1-runner.jar
-    md5: 40991d7f2a95cf313bb973b7ccbe85c8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211011.042327-6-runner.jar
+    md5: 582b01004f2bbdb90c9b77643f085347
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 5261fb35f8d..b1e08d0806f 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211002.052619-172-runner.jar
-    md5: df49c570de9d68a03b4a5b639f105cad
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211011.042218-178-runner.jar
+    md5: b9123c10d34f0fa6bf9586baf56bbfde
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index b0230695a7c..b2eccec220f 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211002.045857-255-runner.jar
-    md5: 13e5033bfcbc4fd6ba10f96ea0fdb62f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211011.035454-261-runner.jar
+    md5: 6819cb46cb35a0a08dde8fd571eeb81c
 
 execute:
   - script: configure

From d44e4d3f23a2acd7e0043304caac617278b69985 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 13 Oct 2021 12:51:35 -0300
Subject: [PATCH 369/709] Updated Maven artifacts (#790)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 0c88ad9b578..dc474b557ff 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211011.033025-263-runner.jar
-    md5: 33824101887f3eee9e07a9bf274f9628
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211013.043042-265-runner.jar
+    md5: 31d432f9a0d2cc04ac14adf1d22681ae
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 01916cd0f5b..4f599596705 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211011.033335-263-runner.jar
-    md5: b0657b0a6561f5b1de5ad148bd51c116
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211013.043623-266-runner.jar
+    md5: 3334877ebcf277b9bd9479a0efff42d9
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 9a117c5c7e7..badfd7913c2 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211011.033633-107-runner.jar
-    md5: 03145ada47c002bce88ba8e99c822c9f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211013.044135-110-runner.jar
+    md5: 6a11294ca544d95199782f7ea10a85f5
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 74bdd0ec4af..5c38b595e1f 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211011.041701-268-runner.jar
-    md5: 71952f0266ae0780ade843b3dd8001ce
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211013.054223-271-runner.jar
+    md5: 47adc1c081cd0ef72eb9369881ccc9db
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211011.041539-263-runner.jar
-    md5: b6a412449d4fab8bb647d7960e9d2697
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211013.054014-266-runner.jar
+    md5: ab2148ac532cdbee8050e6235a01c3ba
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 6959019908d..b527bc34225 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211011.042630-209-runner.jar
-    md5: 11a0e787f2b97b988df19fc3d120c27c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211013.055711-212-runner.jar
+    md5: adfb27334347fe66c3ddfd6bb6ff7845
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index ac9382b9235..8db06f21555 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20211011.031542-141-runner.jar
-    md5: 52067c411b1db64733d2295eb98de801
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20211013.040632-144-runner.jar
+    md5: 4382158592f93758ecadc6ae6df5f8f8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index e300fa5241a..8ec4d61a363 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211011.031815-139-runner.jar
-    md5: e6ed4a17d0b16f799a3714b2ad5c10e2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211013.041041-142-runner.jar
+    md5: a3cc205d50aa55a7df52b811717dd657
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 0f4ec52e479..40e99b70708 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211011.032317-121-runner.jar
-    md5: cd9b8e9b0fd8dff691c31371836f884c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211013.041835-124-runner.jar
+    md5: 38135bb85f18812dc444cca6bbf6478d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 363d79658d0..153d991d273 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211011.032045-141-runner.jar
-    md5: fb34a17c73a2ba88e889221959fc7440
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211013.041444-144-runner.jar
+    md5: da8a1183ac186b425620ea5506f28b05
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index fc42be237c8..1104b12556d 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211011.035246-262-runner.jar
-    md5: 6708f2d6de2a64be87faad7fb5891134
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211013.051332-265-runner.jar
+    md5: 2fad3107af5b21e9b15654d460e5bbd1
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index abc9996c6cb..c29e8785b2f 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211011.035535-262-runner.jar
-    md5: 78a70bb9ca7013639a8cbce6dee3f8d0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211013.051759-265-runner.jar
+    md5: 2433598700854e382b894ef0db0116a9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index dfeacf93112..57d71909278 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211011.042114-175-runner.jar
-    md5: 8850d60485201ba88574e40dfb2f19f7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211013.054918-178-runner.jar
+    md5: 1319c884e5eb6299e5034a038418b9c3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 1df9a61244c..e6fa9d49959 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211011.042327-6-runner.jar
-    md5: 582b01004f2bbdb90c9b77643f085347
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211013.055239-9-runner.jar
+    md5: ec9ca2decd476035c70fea0f4639a866
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index b1e08d0806f..02ecf398a96 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211011.042218-178-runner.jar
-    md5: b9123c10d34f0fa6bf9586baf56bbfde
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211013.055053-181-runner.jar
+    md5: 4fa894c2913e06ef4722a612dffc9aac
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index b2eccec220f..101e0c34f4f 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211011.035454-261-runner.jar
-    md5: 6819cb46cb35a0a08dde8fd571eeb81c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211013.051709-263-runner.jar
+    md5: 8a17885373023b78d22b0bbc7a94bf08
 
 execute:
   - script: configure

From a3675a17bd3df3c10f7127d8bb81ed7421941307 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 14 Oct 2021 11:59:29 -0300
Subject: [PATCH 370/709] Updated Maven artifacts (#792)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index dc474b557ff..9945741842a 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211013.043042-265-runner.jar
-    md5: 31d432f9a0d2cc04ac14adf1d22681ae
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211014.043612-267-runner.jar
+    md5: 25b7416f5ab8c71266ad296286633e38
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 4f599596705..e21752e7cb2 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211013.043623-266-runner.jar
-    md5: 3334877ebcf277b9bd9479a0efff42d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211014.044114-268-runner.jar
+    md5: 6c794e3040ce6c987965c3cb91423455
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index badfd7913c2..4924c696e64 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211013.044135-110-runner.jar
-    md5: 6a11294ca544d95199782f7ea10a85f5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211014.044541-112-runner.jar
+    md5: 74664b5168937fe8ea7b36cc2199440e
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 5c38b595e1f..f02601cb788 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211013.054223-271-runner.jar
-    md5: 47adc1c081cd0ef72eb9369881ccc9db
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211014.054048-273-runner.jar
+    md5: 72c46c083ac7529bf1577bef3870e6c7
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211013.054014-266-runner.jar
-    md5: ab2148ac532cdbee8050e6235a01c3ba
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211014.053857-268-runner.jar
+    md5: 97ccb33d257da2a781c06eef05bb2707
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index b527bc34225..021f281c5c6 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211013.055711-212-runner.jar
-    md5: adfb27334347fe66c3ddfd6bb6ff7845
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211014.055319-214-runner.jar
+    md5: 33cee3795a14c34c45a4ebc8f477ff26
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 8db06f21555..1b35fb1ff8e 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20211013.040632-144-runner.jar
-    md5: 4382158592f93758ecadc6ae6df5f8f8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20211014.041428-146-runner.jar
+    md5: e170d9c77dfdeb0944c286801f69eb0d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 8ec4d61a363..e0c04dff19d 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211013.041041-142-runner.jar
-    md5: a3cc205d50aa55a7df52b811717dd657
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211014.041836-144-runner.jar
+    md5: f18747a918dd4bbbae008c250edb54c2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 40e99b70708..8f174c21d1b 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211013.041835-124-runner.jar
-    md5: 38135bb85f18812dc444cca6bbf6478d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211014.042602-126-runner.jar
+    md5: 83f553f50fdf99925901351401ac3735
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 153d991d273..3e307e96085 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211013.041444-144-runner.jar
-    md5: da8a1183ac186b425620ea5506f28b05
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211014.042222-146-runner.jar
+    md5: e05e81a64a69127e933167cc3b90c1af
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 1104b12556d..26a3d751ccd 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211013.051332-265-runner.jar
-    md5: 2fad3107af5b21e9b15654d460e5bbd1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211014.051317-267-runner.jar
+    md5: 77d1d28a52f95d257f7cfdfd45696729
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index c29e8785b2f..fbb13cf9666 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211013.051759-265-runner.jar
-    md5: 2433598700854e382b894ef0db0116a9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211014.051714-267-runner.jar
+    md5: b454b8bf5f63dc415033f35cf3acf3f5
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 57d71909278..dceb1ee62d2 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211013.054918-178-runner.jar
-    md5: 1319c884e5eb6299e5034a038418b9c3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211014.054651-180-runner.jar
+    md5: bcaac808705988ea1855bfc9598f4abd
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index e6fa9d49959..93de7654e1b 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211013.055239-9-runner.jar
-    md5: ec9ca2decd476035c70fea0f4639a866
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211014.054946-11-runner.jar
+    md5: 17f32f55ddc7c538f2b6d9fbef3e8418
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 02ecf398a96..da0f4ddbc28 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211013.055053-181-runner.jar
-    md5: 4fa894c2913e06ef4722a612dffc9aac
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211014.054817-183-runner.jar
+    md5: bc9209a1c4dfac7b0636da7eccf89ceb
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 101e0c34f4f..5ad8ff85d8b 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211013.051709-263-runner.jar
-    md5: 8a17885373023b78d22b0bbc7a94bf08
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211014.051629-265-runner.jar
+    md5: b85a3aaee259ecff8e897e8fbcd0ef30
 
 execute:
   - script: configure

From ff68ba5e7eddf030481bf9d307bd5b742f601f31 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Fri, 15 Oct 2021 11:50:30 -0300
Subject: [PATCH 371/709] [KOGITO-6087] - Create image for data-index-inmemory
 service (#785)

* [KOGITO-6087] - Create image for data-index-inmemory service

Signed-off-by: spolti <fspolti@redhat.com>

* remove origin reom maven repo

Signed-off-by: spolti <fspolti@redhat.com>

* jobs service postgresql test improvement

* Apply suggestions from code review

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 README.md                                     | 22 +++++++---
 kogito-data-index-ephemeral-overrides.yaml    | 43 +++++++++++++++++++
 kogito-imagestream.yaml                       | 23 +++++++++-
 .../added/kogito-app-launch.sh                | 30 +++++++++++++
 modules/kogito-data-index-ephemeral/configure | 12 ++++++
 .../kogito-data-index-ephemeral/module.yaml   | 16 +++++++
 scripts/README.md                             |  1 +
 scripts/update-maven-artifacts.py             |  1 +
 .../features/common-custom-truststore.feature |  1 +
 .../features/common-dynamic-resources.feature |  1 +
 tests/features/common.feature                 |  1 +
 .../kogito-data-index-common.feature          |  1 +
 .../kogito-data-index-ephemeral.feature       | 25 +++++++++++
 .../kogito-data-index-postgresql.feature      |  5 +--
 .../kogito-jobs-service-postgresql.feature    |  2 +-
 15 files changed, 174 insertions(+), 10 deletions(-)
 create mode 100644 kogito-data-index-ephemeral-overrides.yaml
 create mode 100644 modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-data-index-ephemeral/configure
 create mode 100644 modules/kogito-data-index-ephemeral/module.yaml
 create mode 100644 tests/features/data-index/kogito-data-index-ephemeral.feature

diff --git a/README.md b/README.md
index d2f69f27871..8013f16217a 100644
--- a/README.md
+++ b/README.md
@@ -549,9 +549,10 @@ Order has been created Order[12345] with assigned approver JOHN
 
 The Kogito Component Images can be considered as lightweight images that will complement the Kogito core engine 
 by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications.
-Today we have 15 Kogito Component Images:
+Today we have 16 Kogito Component Images:
 
 * [quay.io/kiegroup/kogito-data-index-infinispan](https://quay.io/kiegroup/kogito-data-index-infinispan)
+* [quay.io/kiegroup/kogito-data-index-ephemeral](https://quay.io/kiegroup/kogito-data-index-ephemeral)
 * [quay.io/kiegroup/kogito-data-index-mongodb](https://quay.io/kiegroup/kogito-data-index-mongodb)
 * [quay.io/kiegroup/kogito-data-index-postgresql](https://quay.io/kiegroup/kogito-data-index-postgresql)
 * [quay.io/kiegroup/kogito-trusty-infinispan](https://quay.io/kiegroup/kogito-trusty-infinispan)
@@ -576,9 +577,11 @@ The Data Index Service depends on a running Infinispan, MongoDB or PostgreSQL.
 The Persistence service can be switched by using its corresponding image
 
 - Infinispan: quay.io/kiegroup/kogito-data-index-infinispan
-    [image.yaml](kogito-data-index-infinispan-overrides.yaml)
-- Mongodb: quay.io/kiegroup/kogito-data-index-mongodb
-    [image.yaml](kogito-data-index-mongodb-overrides.yaml)
+  [image.yaml](kogito-data-index-infinispan-overrides.yaml)
+- Ephemeral PostgreSQL: quay.io/kiegroup/kogito-data-index-ephemeral
+  [image.yaml](kogito-data-index-ephemeral-overrides.yaml)
+- Mongodb: quay.io/kiegroup/kogito-data-index-mongodb 
+  [image.yaml](kogito-data-index-mongodb-overrides.yaml)
 - PostgreSQL: quay.io/kiegroup/kogito-data-index-postgresql
   [image.yaml](kogito-data-index-postgresql-overrides.yaml)
 
@@ -588,6 +591,11 @@ Basic usage with Infinispan:
 $ docker run -it --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
 ```
 
+Basic usage with Ephemeral PostgreSQL:
+```bash
+$ docker run -it quay.io/kiegroup/kogito-data-index-ephemeral:latest
+```
+
 Basic usage with Mongodb:
 ```bash
 $ docker run -it --env QUARKUS_MONGODB_CONNECTION_STRING=mongodb://localhost:27017 quay.io/kiegroup/kogito-data-index-mongodb:latest
@@ -842,6 +850,7 @@ imagestream.image.openshift.io/kogito-runtime-native created
 imagestream.image.openshift.io/kogito-runtime-jvm created
 imagestream.image.openshift.io/kogito-builder created
 imagestream.image.openshift.io/kogito-data-index-infinispan created
+imagestream.image.openshift.io/kogito-data-index-ephemeral created
 imagestream.image.openshift.io/kogito-data-index-mongodb created
 imagestream.image.openshift.io/kogito-data-index-postgresql created
 imagestream.image.openshift.io/kogito-trusty-infinispan created
@@ -1034,6 +1043,7 @@ With this Makefile you can:
      $ make build-image image_name=kogito-runtime-jvm-ubi8
      $ make build-image image_name=kogito-runtime-native
      $ make build-image image_name=kogito-data-index-infinispan
+     $ make build-image image_name=kogito-data-index-ephemeral
      $ make build-image image_name=kogito-data-index-mongodb
      $ make build-image image_name=kogito-data-index-postgresql
      $ make build-image image_name=kogito-trusty-infinispan
@@ -1103,8 +1113,9 @@ Below you can find all modules used to build the Kogito Images
 
 - [kogito-data-index-common](modules/kogito-data-index-common): Data Index common module.
 - [kogito-data-index-infinispan](modules/kogito-data-index-infinispan): Installs and Configure the infinispan data-index jar inside the image.
+- [kogito-data-index-ephemeral](modules/kogito-data-index-ephemeral): Installs and Configure the ephemeral PostgreSQL data-index jar inside the image.
 - [kogito-data-index-mongodb](modules/kogito-data-index-mongodb): Installs and Configure the mongodb data-index jar inside the image.
-- [kogito-data-index-postgresql](modules/kogito-data-index-postgresql): Installs and Configure the postgresql data-index jar inside the image.
+- [kogito-data-index-postgresql](modules/kogito-data-index-postgresql): Installs and Configure the PostgreSQL data-index jar inside the image.
 - [kogito-trusty-infinispan](modules/kogito-trusty-infinispan): Installs and Configure the infinispan trusty jar inside the image.
 - [kogito-trusty-redis](modules/kogito-trusty-redis): Installs and Configure the redis trusty jar inside the image.
 - [kogito-trusty-postgresql](modules/kogito-trusty-postgresql): Installs and Configure the PostgreSQL trusty jar inside the image.
@@ -1138,6 +1149,7 @@ For each image, we use a specific *-overrides.yaml file which will specific the
 Please inspect the images overrides files to learn which modules are being installed on each image:
 
 - [quay.io/kiegroup/kogito-data-index-infinispan](kogito-data-index-infinispan-overrides.yaml)
+- [quay.io/kiegroup/kogito-data-index-ephemeral](kogito-data-index-ephemeral-overrides.yaml)
 - [quay.io/kiegroup/kogito-data-index-mongodb](kogito-data-index-mongodb-overrides.yaml)
 - [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-overrides.yaml)
diff --git a/kogito-data-index-ephemeral-overrides.yaml b/kogito-data-index-ephemeral-overrides.yaml
new file mode 100644
index 00000000000..564d5f1c6fc
--- /dev/null
+++ b/kogito-data-index-ephemeral-overrides.yaml
@@ -0,0 +1,43 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-data-index-ephemeral"
+description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
+
+labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
+- name: "io.k8s.display-name"
+  value: "Kogito Data Index Service - ephemeral PostgreSQL"
+- name: "io.openshift.tags"
+  value: "kogito,data-index,data-index-ephemeral"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.dataindex.ephemeral
+  - name: org.kie.kogito.dataindex.common
+  - name: org.kie.kogito.security.custom.truststores
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 68fa572e0cc..133ba6249c4 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -83,13 +83,34 @@ items:
             description: Runtime image for the Kogito Data Index Service with Infinispan
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-infinispan
-            supports: persistence backed by Infinispan server
+            supports: persistence backed by Infinispan Server
             version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-data-index-infinispan:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-data-index-ephemeral
+      annotations:
+        openshift.io/display-name: Runtime image for the Kogito Data Index Service for ephemeral PostgreSQL persistence provider
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Runtime image for the Kogito Data Index Service with ephemeral PostgreSQL
+            iconClass: icon-jbpm
+            tags: kogito,data-index,data-index-ephemeral
+            supports: persistence backed by ephemeral PostgreSQL Server
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-data-index-ephemeral:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..8e466e85663
--- /dev/null
+++ b/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
+        -jar "${KOGITO_HOME}"/bin/data-index-service-ephemeral-runner.jar
+
diff --git a/modules/kogito-data-index-ephemeral/configure b/modules/kogito-data-index-ephemeral/configure
new file mode 100644
index 00000000000..674347b01fe
--- /dev/null
+++ b/modules/kogito-data-index-ephemeral/configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v "${SOURCES_DIR}"/data-index-service-ephemeral-runner.jar "${KOGITO_HOME}"/bin/
+
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
+
diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
new file mode 100644
index 00000000000..9db35635085
--- /dev/null
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -0,0 +1,16 @@
+schema_version: 1
+name: org.kie.kogito.dataindex.ephemeral
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: data-index-service-ephemeral-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211013.044626-76-runner.jar
+    md5: a490b7ed76d4579a8667bb785682253d
+
+execute:
+  - script: configure
+
+packages:
+  install:
+    - pam
+
diff --git a/scripts/README.md b/scripts/README.md
index 39b647dd7b4..cb0570f1c86 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -190,6 +190,7 @@ If no argument is given, it takes the JBoss repository as the default value.
 The command will update the needed files with the new URL:
 
 - kogito-data-index-infinispan/module.yaml
+- kogito-data-index-ephemeral/module.yaml
 - kogito-data-index-mongodb/module.yaml
 - kogito-data-index-postgresql/module.yaml
 - kogito-explainability/module.yaml
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 70da217c04a..03366b050f1 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -25,6 +25,7 @@
     # service-name: module-name(directory in which module's module.yaml file is present)
     # Note: Service name should be same as given in the repository
     "data-index-service-infinispan": "kogito-data-index-infinispan",
+    "data-index-service-inmemory": "kogito-data-index-ephemeral",
     "data-index-service-mongodb": "kogito-data-index-mongodb",
     "data-index-service-postgresql": "kogito-data-index-postgresql",
     "trusty-service-infinispan": "kogito-trusty-infinispan",
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 80fc0d630e5..52617f69703 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -1,5 +1,6 @@
 @quay.io/kiegroup/kogito-runtime-jvm 
 @quay.io/kiegroup/kogito-data-index-infinispan
+@quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-task-console 
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index e9e3083013e..ae7f5814b4a 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -1,6 +1,7 @@
 @quay.io/kiegroup/kogito-builder
 @quay.io/kiegroup/kogito-runtime-jvm
 @quay.io/kiegroup/kogito-data-index-infinispan
+@quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-trusty-infinispan
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 9058daba4f8..e4a687c0b10 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -2,6 +2,7 @@
 @quay.io/kiegroup/kogito-runtime-jvm
 @quay.io/kiegroup/kogito-runtime-native
 @quay.io/kiegroup/kogito-data-index-infinispan
+@quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-trusty-infinispan
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index a11ca931635..c112efabdef 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -1,4 +1,5 @@
 @quay.io/kiegroup/kogito-data-index-infinispan
+@quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-postgresql
 Feature: Kogito-data-index common feature.
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
new file mode 100644
index 00000000000..a096665f636
--- /dev/null
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -0,0 +1,25 @@
+@quay.io/kiegroup/kogito-data-index-ephemeral
+Feature: Kogito-data-index ephemeral postgresql feature.
+
+  Scenario: verify if all labels are correctly set on kogito-data-index-ephemeral image
+    Given image is built
+     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+      And the image should contain label io.openshift.s2i.destination with value /tmp
+      And the image should contain label io.openshift.expose-services with value 8080:http
+      And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
+      And the image should contain label io.k8s.display-name with value Kogito Data Index Service - ephemeral PostgreSQL
+      And the image should contain label io.openshift.tags with value kogito,data-index,data-index-ephemeral
+
+  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-ephemeral-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-ephemeral-runner.jar
+
+  Scenario: verify if of kogito-data-index-ephemeral container is correctly started
+    When container is started with env
+      | variable       | value  |
+      | SCRIPT_DEBUG   | true   |
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-ephemeral-runner.jar
+    And container log should contain Embedded Postgres started at port
+    And container log should not contain Application failed to start
+
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
index e4237ff9cfb..e0831f80653 100644
--- a/tests/features/data-index/kogito-data-index-postgresql.feature
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -23,6 +23,5 @@ Feature: Kogito-data-index postgresql feature.
       | QUARKUS_DATASOURCE_USERNAME  | kogito                                   |
       | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
     Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-postgresql-runner.jar
-     And container log should contain org.postgresql.util.PSQLException: The connection attempt failed
-     And container log should not contain Application failed to start
-
+    And container log should contain Datasource '<default>': The connection attempt failed
+    And container log should not contain Application failed to start
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index 8cb75d30233..4ae4a41588e 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -23,5 +23,5 @@ Feature: Kogito-jobs-service-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/jobs-service-postgresql-runner.jar
-    And container log should contain The connection attempt failed
+    And container log should contain Datasource '<default>': The connection attempt failed
     And container log should contain Failed to start application (with profile prod)

From dc27cff7b2c8c90eb3b1335f1aab4910038f22c3 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 15 Oct 2021 21:02:47 +0200
Subject: [PATCH 372/709] Switch from jobs-service-common to
 jobs-service-inmemory (#791)

* Jobs service common jar -> inmemory

* added package
---
 .../added/kogito-app-launch.sh                         |  2 +-
 modules/kogito-jobs-service-ephemeral/configure        |  2 +-
 modules/kogito-jobs-service-ephemeral/module.yaml      | 10 +++++++---
 scripts/update-maven-artifacts.py                      |  2 +-
 .../jobs-service/kogito-jobs-service-ephemeral.feature |  8 ++++----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
index 116813d5e47..0c25b1428f8 100644
--- a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
@@ -26,4 +26,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/jobs-service-common-runner.jar
+    -jar "${KOGITO_HOME}"/bin/jobs-service-ephemeral-runner.jar
diff --git a/modules/kogito-jobs-service-ephemeral/configure b/modules/kogito-jobs-service-ephemeral/configure
index 5421fc450e2..c1db24e61e8 100644
--- a/modules/kogito-jobs-service-ephemeral/configure
+++ b/modules/kogito-jobs-service-ephemeral/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/jobs-service-common-runner.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/jobs-service-ephemeral-runner.jar "${KOGITO_HOME}"/bin/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 1b35fb1ff8e..28cbb3c2235 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -3,9 +3,13 @@ name: org.kie.kogito.jobs.service.ephemeral
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: jobs-service-common-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-common/2.0.0-SNAPSHOT/jobs-service-common-2.0.0-20211014.041428-146-runner.jar
-    md5: e170d9c77dfdeb0944c286801f69eb0d
+  - name: jobs-service-ephemeral-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211013.042142-76-runner.jar
+    md5: 77d97b15d5b3d24f62e74b5a114d9723
+
+packages:
+  install:
+  - pam.x86_64
 
 execute:
   - script: configure
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 03366b050f1..2801c741401 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -35,7 +35,7 @@
     "explainability-service-messaging": "kogito-explainability",
     "jobs-service-infinispan": "kogito-jobs-service-infinispan",
     "jobs-service-mongodb": "kogito-jobs-service-mongodb",
-    "jobs-service-common": "kogito-jobs-service-ephemeral",
+    "jobs-service-inmemory": "kogito-jobs-service-ephemeral",
     "jobs-service-postgresql": "kogito-jobs-service-postgresql",
     "management-console": "kogito-management-console",
     "task-console": "kogito-task-console",
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index 9694ef189b2..5804a594699 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -11,15 +11,15 @@ Feature: Kogito-jobs-service-ephemeral feature.
     And the image should contain label io.k8s.display-name with value Kogito in memory Jobs Service
     And the image should contain label io.openshift.tags with value kogito,jobs-service-ephemeral
 
-  Scenario: verify if the jobs service common binary is available on /home/kogito/bin
+  Scenario: verify if the jobs service ephemeral binary is available on /home/kogito/bin
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/jobs-service-common-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-common-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/jobs-service-ephemeral-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-ephemeral-runner.jar
 
-  Scenario: Verify if the debug is correctly enabled with the common 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/jobs-service-common-runner.jar
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-ephemeral-runner.jar
     And container log should contain started in
     And container log should not contain Application failed to start
 

From a19a5ddd0ead3803e842dbe8e766a9ae43677dfc Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 18 Oct 2021 09:19:07 -0300
Subject: [PATCH 373/709] Updated Maven artifacts (#800)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 9945741842a..48a300a14e4 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211014.043612-267-runner.jar
-    md5: 25b7416f5ab8c71266ad296286633e38
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211017.034240-270-runner.jar
+    md5: d04473eed51ba99d887968c666dac0fb
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index e21752e7cb2..07e6b45a460 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211014.044114-268-runner.jar
-    md5: 6c794e3040ce6c987965c3cb91423455
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211017.034622-271-runner.jar
+    md5: 0f68653fdd4d8463814825290ab13b4c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 4924c696e64..24472818cb9 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211014.044541-112-runner.jar
-    md5: 74664b5168937fe8ea7b36cc2199440e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211017.035017-115-runner.jar
+    md5: e30fd6921e1476e98fae81f041c3386a
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index f02601cb788..97206a8d0be 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211014.054048-273-runner.jar
-    md5: 72c46c083ac7529bf1577bef3870e6c7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211017.043543-276-runner.jar
+    md5: 77757cc9ef1972ff0f35f4ed429dd2e2
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211014.053857-268-runner.jar
-    md5: 97ccb33d257da2a781c06eef05bb2707
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211017.043404-271-runner.jar
+    md5: 59a6ecbbf05e5f83a5b69dcee7181f2f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 021f281c5c6..5fa20acf86d 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211014.055319-214-runner.jar
-    md5: 33cee3795a14c34c45a4ebc8f477ff26
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211017.044635-217-runner.jar
+    md5: be8c4a15ecdcef7b051a27ca02f5eea8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index e0c04dff19d..f1ec092b7db 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211014.041836-144-runner.jar
-    md5: f18747a918dd4bbbae008c250edb54c2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211017.032903-147-runner.jar
+    md5: e8cfaf46c36c8d1566763b366986a965
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 8f174c21d1b..47d100858ea 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211014.042602-126-runner.jar
-    md5: 83f553f50fdf99925901351401ac3735
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211017.033456-129-runner.jar
+    md5: 24600a11c93c1e403bb69a8c523355ad
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 3e307e96085..1e80f733197 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211014.042222-146-runner.jar
-    md5: e05e81a64a69127e933167cc3b90c1af
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211017.033154-149-runner.jar
+    md5: f7c31583727f4f1a157468b0e61646f3
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 26a3d751ccd..1dbeeb0edd2 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211014.051317-267-runner.jar
-    md5: 77d1d28a52f95d257f7cfdfd45696729
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211017.040951-270-runner.jar
+    md5: 5cc96f91a0865ac978c1483f263a6f1f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index fbb13cf9666..df4970bf035 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211014.051714-267-runner.jar
-    md5: b454b8bf5f63dc415033f35cf3acf3f5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211017.041310-270-runner.jar
+    md5: 0f9d676cecfaef82ca4893dc5a66e183
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index dceb1ee62d2..c29dd7f9dc2 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211014.054651-180-runner.jar
-    md5: bcaac808705988ea1855bfc9598f4abd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211017.044040-183-runner.jar
+    md5: a8de2a17da3ace2f7b1775be0e2b94f9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 93de7654e1b..48b05b01148 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211014.054946-11-runner.jar
-    md5: 17f32f55ddc7c538f2b6d9fbef3e8418
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211017.044315-14-runner.jar
+    md5: 2e61850eaf5e15eb1fd9386a0d943dfa
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index da0f4ddbc28..fa0ba29fcd8 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211014.054817-183-runner.jar
-    md5: bc9209a1c4dfac7b0636da7eccf89ceb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211017.044155-186-runner.jar
+    md5: b22366020964b68b66f695fd369ece95
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 5ad8ff85d8b..85e3b15d4a0 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211014.051629-265-runner.jar
-    md5: b85a3aaee259ecff8e897e8fbcd0ef30
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211017.041226-268-runner.jar
+    md5: 7aaea64a284f0144133371ed412436f6
 
 execute:
   - script: configure

From 5b76482df672d5414c63ea9c1347fda864ed2ed9 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 19 Oct 2021 09:29:38 -0300
Subject: [PATCH 374/709] Updated Maven artifacts (#806)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 48a300a14e4..87129ece680 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211017.034240-270-runner.jar
-    md5: d04473eed51ba99d887968c666dac0fb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211019.042718-272-runner.jar
+    md5: a1985762744ed1e540f571c9ecddb94e
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 07e6b45a460..3949ac134c8 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211017.034622-271-runner.jar
-    md5: 0f68653fdd4d8463814825290ab13b4c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211019.043325-273-runner.jar
+    md5: 8825d7fa0f3249e0fbc05a00509bfde8
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 24472818cb9..8aa9c41841c 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211017.035017-115-runner.jar
-    md5: e30fd6921e1476e98fae81f041c3386a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211019.043920-117-runner.jar
+    md5: 98081827dd0ef9673fc396cef36c22d2
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 97206a8d0be..d114d01907a 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211017.043543-276-runner.jar
-    md5: 77757cc9ef1972ff0f35f4ed429dd2e2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211019.055118-277-runner.jar
+    md5: 0a7b176b72ca0046da2d456464bf3b64
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211017.043404-271-runner.jar
-    md5: 59a6ecbbf05e5f83a5b69dcee7181f2f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211019.054842-272-runner.jar
+    md5: f1b3c5698c447db1f2e15a9ff6cc9793
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 5fa20acf86d..fa9d8dbd4f4 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211017.044635-217-runner.jar
-    md5: be8c4a15ecdcef7b051a27ca02f5eea8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211019.060915-218-runner.jar
+    md5: f4cfc0b3e2b9a7783f13be7271eb65f5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index f1ec092b7db..533857c3d59 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211017.032903-147-runner.jar
-    md5: e8cfaf46c36c8d1566763b366986a965
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211019.040230-149-runner.jar
+    md5: 8997073848e98808c46bf83a41e479d1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 47d100858ea..f2deb5cab28 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211017.033456-129-runner.jar
-    md5: 24600a11c93c1e403bb69a8c523355ad
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211019.041307-131-runner.jar
+    md5: 612d1ce90b8b4ad62e266b286c5922dc
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 1e80f733197..a05889705f2 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211017.033154-149-runner.jar
-    md5: f7c31583727f4f1a157468b0e61646f3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211019.040748-151-runner.jar
+    md5: 30f212aef0fd2049d478c23aac6bbdfc
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 1dbeeb0edd2..7578118680c 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211017.040951-270-runner.jar
-    md5: 5cc96f91a0865ac978c1483f263a6f1f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211019.051838-272-runner.jar
+    md5: 8515d65ee6e819cf1d9c0a445bcca606
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index df4970bf035..af1ce1e7e38 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211017.041310-270-runner.jar
-    md5: 0f9d676cecfaef82ca4893dc5a66e183
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211019.052438-272-runner.jar
+    md5: 78ae2ae347c2cd77d9a9b87de9c9a5d5
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index c29dd7f9dc2..3f81f19cc9b 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211017.044040-183-runner.jar
-    md5: a8de2a17da3ace2f7b1775be0e2b94f9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211019.055957-185-runner.jar
+    md5: 7ef175e9729a38d74df196f6eea5b759
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 48b05b01148..fa434429304 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211017.044315-14-runner.jar
-    md5: 2e61850eaf5e15eb1fd9386a0d943dfa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211019.060415-16-runner.jar
+    md5: 3ab090b88f6132e0f604cec29cdf21eb
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index fa0ba29fcd8..36f197b4e76 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211017.044155-186-runner.jar
-    md5: b22366020964b68b66f695fd369ece95
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211019.060203-188-runner.jar
+    md5: 7ee2f4fae706db7c40d96b0f639aec21
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 85e3b15d4a0..a8c07fe7464 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211017.041226-268-runner.jar
-    md5: 7aaea64a284f0144133371ed412436f6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211019.052332-270-runner.jar
+    md5: a271ccb9fcd22ac246903233500052b9
 
 execute:
   - script: configure

From c19ccd10f2e948d6baeeb0988968bc9eb6484281 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 20 Oct 2021 09:56:08 -0300
Subject: [PATCH 375/709] Updated Maven artifacts (#809)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 87129ece680..e7a6713d717 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211019.042718-272-runner.jar
-    md5: a1985762744ed1e540f571c9ecddb94e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211020.035441-273-runner.jar
+    md5: 2a6c4b894b007bb915e34c49d4103980
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 3949ac134c8..b94313df8da 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211019.043325-273-runner.jar
-    md5: 8825d7fa0f3249e0fbc05a00509bfde8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211020.040029-274-runner.jar
+    md5: bfb4d23bfb6c17f5c510bc5ebe8f6bd3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 8aa9c41841c..31a17f3a167 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211019.043920-117-runner.jar
-    md5: 98081827dd0ef9673fc396cef36c22d2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211020.040548-118-runner.jar
+    md5: 5303ff17f2765ca827fd73dd606281a3
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index d114d01907a..fde1fe38c2d 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211019.055118-277-runner.jar
-    md5: 0a7b176b72ca0046da2d456464bf3b64
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211020.050740-278-runner.jar
+    md5: 914576fe02b0c98ffcf4fa45b8146407
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211019.054842-272-runner.jar
-    md5: f1b3c5698c447db1f2e15a9ff6cc9793
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211020.050442-273-runner.jar
+    md5: 68d51b78beeb3ce13af88a0b117de529
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index fa9d8dbd4f4..4c46769b947 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211019.060915-218-runner.jar
-    md5: f4cfc0b3e2b9a7783f13be7271eb65f5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211020.052708-219-runner.jar
+    md5: 2ae0633f6be5a02546ddfc014033690d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 533857c3d59..31c56d9f951 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211019.040230-149-runner.jar
-    md5: 8997073848e98808c46bf83a41e479d1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211020.033244-150-runner.jar
+    md5: 4d998864ae8f4ca42ccaf66f01d683f7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index f2deb5cab28..2f79c9a5945 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211019.041307-131-runner.jar
-    md5: 612d1ce90b8b4ad62e266b286c5922dc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211020.034225-132-runner.jar
+    md5: bce97b3eb63298f089aae1422059dd28
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index a05889705f2..b0d570b7eee 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211019.040748-151-runner.jar
-    md5: 30f212aef0fd2049d478c23aac6bbdfc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211020.033750-152-runner.jar
+    md5: c14e92d16db94adf274de1a139fede01
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 3f81f19cc9b..95928eb82dd 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211019.055957-185-runner.jar
-    md5: 7ef175e9729a38d74df196f6eea5b759
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211020.051647-186-runner.jar
+    md5: 5c7b45cfb238fb50efb2f0d312c94f0d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index fa434429304..f166dfd1d22 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211019.060415-16-runner.jar
-    md5: 3ab090b88f6132e0f604cec29cdf21eb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211020.052138-17-runner.jar
+    md5: 86dc60ffc4c60398b5fdb3f1bd550b6c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 36f197b4e76..37e4094fd55 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211019.060203-188-runner.jar
-    md5: 7ee2f4fae706db7c40d96b0f639aec21
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211020.051856-189-runner.jar
+    md5: 210008e51c51bfd1df56c6504c2768c7
 
 execute:
   - script: configure

From 6cb1a2bf1602d0b6f33ec8956feae46b01f07237 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 21 Oct 2021 10:54:19 -0300
Subject: [PATCH 376/709] Updated Maven artifacts (#814)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index e7a6713d717..7d616ef7fd2 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211020.035441-273-runner.jar
-    md5: 2a6c4b894b007bb915e34c49d4103980
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211021.035655-274-runner.jar
+    md5: 3efa67a625de2698d392c883f88f9498
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index b94313df8da..dbab2b9612d 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211020.040029-274-runner.jar
-    md5: bfb4d23bfb6c17f5c510bc5ebe8f6bd3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211021.040102-275-runner.jar
+    md5: 8b6aaefa3b4d514689ea65da7ee54139
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 31a17f3a167..f7f20dc192f 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211020.040548-118-runner.jar
-    md5: 5303ff17f2765ca827fd73dd606281a3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211021.040449-119-runner.jar
+    md5: 59ccc13d99890afdc3387e82a70f9a3f
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index fde1fe38c2d..16eba9b3d28 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211020.050740-278-runner.jar
-    md5: 914576fe02b0c98ffcf4fa45b8146407
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211021.045444-279-runner.jar
+    md5: 26fd2f3c25d5d2e5975ab3de37168826
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211020.050442-273-runner.jar
-    md5: 68d51b78beeb3ce13af88a0b117de529
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211021.045307-274-runner.jar
+    md5: 429629798554c1bf52d2f594f2bc6bb0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 4c46769b947..736d9e51a45 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211020.052708-219-runner.jar
-    md5: 2ae0633f6be5a02546ddfc014033690d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211021.050543-220-runner.jar
+    md5: 75dd2f2ea5eb74b300ded0a01108c3da
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 31c56d9f951..d55631dffee 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211020.033244-150-runner.jar
-    md5: 4d998864ae8f4ca42ccaf66f01d683f7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211021.034138-151-runner.jar
+    md5: 9740a96900d6110d2d7cd215b9f7a2dd
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 2f79c9a5945..90a7d869391 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211020.034225-132-runner.jar
-    md5: bce97b3eb63298f089aae1422059dd28
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211021.034805-133-runner.jar
+    md5: 448e5ee78ee8f8a030ddf4d8641384b0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index b0d570b7eee..d00e6346751 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211020.033750-152-runner.jar
-    md5: c14e92d16db94adf274de1a139fede01
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211021.034454-153-runner.jar
+    md5: 36d2598fa7373f3ce214510a3d3be225
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 7578118680c..3ed00b00a96 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211019.051838-272-runner.jar
-    md5: 8515d65ee6e819cf1d9c0a445bcca606
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211021.042911-273-runner.jar
+    md5: e4280c83bca8794cbc07bf2e0d4eeb04
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index af1ce1e7e38..2d8cb7521a3 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211019.052438-272-runner.jar
-    md5: 78ae2ae347c2cd77d9a9b87de9c9a5d5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211021.043237-273-runner.jar
+    md5: ea12ea42ab3c540b4cf6c63df8ede59a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 95928eb82dd..53bfa400e27 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211020.051647-186-runner.jar
-    md5: 5c7b45cfb238fb50efb2f0d312c94f0d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211021.045937-187-runner.jar
+    md5: 31aecba0403c877af8ffce45142ccdd3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index f166dfd1d22..fec4f92f0ca 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211020.052138-17-runner.jar
-    md5: 86dc60ffc4c60398b5fdb3f1bd550b6c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211021.050212-18-runner.jar
+    md5: 5b4f72ea12c79b7fb19d2d3159943d14
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 37e4094fd55..5e727f722d6 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211020.051856-189-runner.jar
-    md5: 210008e51c51bfd1df56c6504c2768c7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211021.050052-190-runner.jar
+    md5: 144bfaa5a6dfd224bfe4de0343d4d016
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index a8c07fe7464..9d8b7ac671e 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211019.052332-270-runner.jar
-    md5: a271ccb9fcd22ac246903233500052b9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211021.043153-271-runner.jar
+    md5: eb1e22c3fd885f16083a8e1a8246d0aa
 
 execute:
   - script: configure

From 85e215a7230a96ba66c25e29c92ddffc42e2fed0 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 21 Oct 2021 16:03:45 +0200
Subject: [PATCH 377/709] Correct set KOGITO_VERSION in features (#807)

* Correct set KOGITO_VERSION in features

* updated script

* corrected script

* updated features
---
 scripts/common.py                               | 2 +-
 tests/features/rhpam-kogito-builder-jvm.feature | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/common.py b/scripts/common.py
index 48f63aa48bf..bc9cff58ddf 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -263,7 +263,7 @@ def update_artifacts_version_in_behave_tests(artifacts_version):
     """
     print("Set artifacts_version {} in behave tests".format(artifacts_version))
     # pattern to change the KOGITO_VERSION
-    pattern = re.compile('\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT)|([\d.]+.Final))[\s]*\|')
+    pattern = re.compile('\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT)|([\d.]+.Final)|([\d.]+\.redhat-[\d]+))[\s]*\|')
     replacement = '| KOGITO_VERSION | {} | '.format(artifacts_version)
     update_in_behave_tests(pattern, replacement)
 
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 5a377846784..b87abaac208 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -32,7 +32,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | NATIVE         | false          |
       | KOGITO_VERSION | 1.5.0.redhat-00001 |
     Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-dm-archetype archetype...
+    And s2i build log should contain Generating quarkus project structure for project...
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |
@@ -61,7 +61,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
     Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure using the kogito-quarkus-dm-archetype archetype...
+    And s2i build log should contain Generating quarkus project structure for myproject...
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |
@@ -80,7 +80,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
-    And s2i build log should contain Generating springboot project structure using the kogito-springboot-dm-archetype archetype...
+    And s2i build log should contain Generating springboot project structure for project...
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |

From fc93486d1ee8d4676c955a06d8a893f002aa2f7c Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 21 Oct 2021 16:05:23 +0200
Subject: [PATCH 378/709] KOGITO-6140 Correct artifacts mapping for ephemeral
 (#812)

* KOGITO-6140 Correct artifacts mapping for ephemeral

* corrected features

* updated modules
---
 .../kogito-data-index-ephemeral/added/kogito-app-launch.sh  | 2 +-
 modules/kogito-data-index-ephemeral/configure               | 2 +-
 modules/kogito-data-index-ephemeral/module.yaml             | 6 +++---
 .../added/kogito-app-launch.sh                              | 2 +-
 modules/kogito-jobs-service-ephemeral/configure             | 2 +-
 modules/kogito-jobs-service-ephemeral/module.yaml           | 6 +++---
 .../features/data-index/kogito-data-index-ephemeral.feature | 4 ++--
 .../jobs-service/kogito-jobs-service-ephemeral.feature      | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
index 8e466e85663..8a664c25912 100644
--- a/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
@@ -26,5 +26,5 @@ exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGIT
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/data-index-service-ephemeral-runner.jar
+        -jar "${KOGITO_HOME}"/bin/data-index-service-inmemory-runner.jar
 
diff --git a/modules/kogito-data-index-ephemeral/configure b/modules/kogito-data-index-ephemeral/configure
index 674347b01fe..ecf8f70a9a2 100644
--- a/modules/kogito-data-index-ephemeral/configure
+++ b/modules/kogito-data-index-ephemeral/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/data-index-service-ephemeral-runner.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/data-index-service-inmemory-runner.jar "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 9db35635085..9b4f99913ee 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.dataindex.ephemeral
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: data-index-service-ephemeral-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211013.044626-76-runner.jar
-    md5: a490b7ed76d4579a8667bb785682253d
+  - name: data-index-service-inmemory-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211021.040807-85-runner.jar
+    md5: a4c160192760794ba0b95caa33022f03
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
index 0c25b1428f8..704e393a514 100644
--- a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
@@ -26,4 +26,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/jobs-service-ephemeral-runner.jar
+    -jar "${KOGITO_HOME}"/bin/jobs-service-inmemory-runner.jar
diff --git a/modules/kogito-jobs-service-ephemeral/configure b/modules/kogito-jobs-service-ephemeral/configure
index c1db24e61e8..6c2a214085d 100644
--- a/modules/kogito-jobs-service-ephemeral/configure
+++ b/modules/kogito-jobs-service-ephemeral/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/jobs-service-ephemeral-runner.jar "${KOGITO_HOME}"/bin/
+cp -v "${SOURCES_DIR}"/jobs-service-inmemory-runner.jar "${KOGITO_HOME}"/bin/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 28cbb3c2235..86290a78167 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.jobs.service.ephemeral
 version: "2.0.0-snapshot"
 
 artifacts:
-  - name: jobs-service-ephemeral-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211013.042142-76-runner.jar
-    md5: 77d97b15d5b3d24f62e74b5a114d9723
+  - name: jobs-service-inmemory-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211021.035032-85-runner.jar
+    md5: 9477752eb0a3766c508b1e8ee74cad20
 
 packages:
   install:
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
index a096665f636..654bc1a9891 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -13,13 +13,13 @@ Feature: Kogito-data-index ephemeral postgresql feature.
 
   Scenario: verify if the indexing service binaries are available on /home/kogito/bin
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-ephemeral-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-ephemeral-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-inmemory-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-inmemory-runner.jar
 
   Scenario: verify if of kogito-data-index-ephemeral container is correctly started
     When container is started with env
       | variable       | value  |
       | SCRIPT_DEBUG   | true   |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-ephemeral-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-inmemory-runner.jar
     And container log should contain Embedded Postgres started at port
     And container log should not contain Application failed to start
 
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index 5804a594699..a0bdea3b69d 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -13,13 +13,13 @@ Feature: Kogito-jobs-service-ephemeral feature.
 
   Scenario: verify if the jobs service ephemeral binary is available on /home/kogito/bin
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/jobs-service-ephemeral-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-ephemeral-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/jobs-service-inmemory-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-inmemory-runner.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/jobs-service-ephemeral-runner.jar
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-inmemory-runner.jar
     And container log should contain started in
     And container log should not contain Application failed to start
 

From 6631be0c483e9b603d55004847ed5bad5d23b52f Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 25 Oct 2021 10:34:14 -0300
Subject: [PATCH 379/709] Updated Maven artifacts (#819)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 6 +++---
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 9b4f99913ee..c21788fbc82 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211021.040807-85-runner.jar
-    md5: a4c160192760794ba0b95caa33022f03
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211025.032429-89-runner.jar
+    md5: dc196888f136cb29b202a3244656c4d4
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 7d616ef7fd2..91a09ee2171 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211021.035655-274-runner.jar
-    md5: 3efa67a625de2698d392c883f88f9498
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211025.031504-278-runner.jar
+    md5: e603ef5997d596628d069b8510b855a5
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index dbab2b9612d..dd56025cda6 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211021.040102-275-runner.jar
-    md5: 8b6aaefa3b4d514689ea65da7ee54139
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211025.031825-279-runner.jar
+    md5: f917daaf490c00b9ee59888406887e4d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index f7f20dc192f..314a694f974 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211021.040449-119-runner.jar
-    md5: 59ccc13d99890afdc3387e82a70f9a3f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211025.032137-123-runner.jar
+    md5: fdc8c3fae78c21cdef6d397ea384c313
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 16eba9b3d28..6454a159a6e 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211021.045444-279-runner.jar
-    md5: 26fd2f3c25d5d2e5975ab3de37168826
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211025.034805-283-runner.jar
+    md5: d391286aae6f8a8a7cf9f5aa9ee7f671
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211021.045307-274-runner.jar
-    md5: 429629798554c1bf52d2f594f2bc6bb0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211025.034637-278-runner.jar
+    md5: 6b0053a1abb654eee837470439308826
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 736d9e51a45..ef27d9ed3a4 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211021.050543-220-runner.jar
-    md5: 75dd2f2ea5eb74b300ded0a01108c3da
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211025.035801-224-runner.jar
+    md5: 253afc40cc63c8f75b200f1701626792
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 86290a78167..f4670293d91 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,12 +4,12 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211021.035032-85-runner.jar
-    md5: 9477752eb0a3766c508b1e8ee74cad20
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211025.030941-89-runner.jar
+    md5: 35d70ba8c612e25bd3d99ff75fd58a1a
 
 packages:
   install:
-  - pam.x86_64
+    - pam.x86_64
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index d55631dffee..d1e042922c0 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211021.034138-151-runner.jar
-    md5: 9740a96900d6110d2d7cd215b9f7a2dd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211025.030231-155-runner.jar
+    md5: ba647692731f8cb69838c91ab592b69d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 90a7d869391..bb2c2ae4dbc 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211021.034805-133-runner.jar
-    md5: 448e5ee78ee8f8a030ddf4d8641384b0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211025.030745-137-runner.jar
+    md5: b1b3b6247e6756e093bbada55893f37e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index d00e6346751..b3054a0ebe4 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211021.034454-153-runner.jar
-    md5: 36d2598fa7373f3ce214510a3d3be225
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211025.030514-157-runner.jar
+    md5: 283501df6e027190a864dc563fafe91a
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 3ed00b00a96..40cee8c6d6e 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211021.042911-273-runner.jar
-    md5: e4280c83bca8794cbc07bf2e0d4eeb04
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211023.054621-275-runner.jar
+    md5: efb8fdb35e410e300ff8c0ee46317ded
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 2d8cb7521a3..3d8d3d59c5f 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211021.043237-273-runner.jar
-    md5: ea12ea42ab3c540b4cf6c63df8ede59a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211023.054947-275-runner.jar
+    md5: 31bb1c1e567b0d34fb5220b816675dce
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 53bfa400e27..cfa28f2f219 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211021.045937-187-runner.jar
-    md5: 31aecba0403c877af8ffce45142ccdd3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211025.035228-191-runner.jar
+    md5: 4eeac6bc4672104e45386a67dc89b0b9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index fec4f92f0ca..9804b11f5d8 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211021.050212-18-runner.jar
-    md5: 5b4f72ea12c79b7fb19d2d3159943d14
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211025.035450-22-runner.jar
+    md5: 913c8944b4d8f0fa8d02e026a153a8d3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 5e727f722d6..1fff5f6d008 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211021.050052-190-runner.jar
-    md5: 144bfaa5a6dfd224bfe4de0343d4d016
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211025.035337-194-runner.jar
+    md5: 27e69b9844ff5d13802d5cf382e6a178
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 9d8b7ac671e..45b65e88ac7 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211021.043153-271-runner.jar
-    md5: eb1e22c3fd885f16083a8e1a8246d0aa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211023.054905-273-runner.jar
+    md5: 85b544f27a3c2a59d90efcb32752d9fa
 
 execute:
   - script: configure

From b2ea8c1ba8b66ae51367038c576146fe5f3cddf1 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 28 Oct 2021 10:52:03 -0300
Subject: [PATCH 380/709] Updated Maven artifacts (#826)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index c21788fbc82..608c021784a 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211025.032429-89-runner.jar
-    md5: dc196888f136cb29b202a3244656c4d4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211028.044622-93-runner.jar
+    md5: ecc3c54c988b42c3a0312802880bd0a7
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 91a09ee2171..3c1f6d611be 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211025.031504-278-runner.jar
-    md5: e603ef5997d596628d069b8510b855a5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211028.042614-282-runner.jar
+    md5: efcb5d177b2ed578b04e7bd4af51931c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index dd56025cda6..1a399aaf9bf 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211025.031825-279-runner.jar
-    md5: f917daaf490c00b9ee59888406887e4d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211028.043421-283-runner.jar
+    md5: bc2fa239cdf50aea83755b895120226f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 314a694f974..baccef4c1ac 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211025.032137-123-runner.jar
-    md5: fdc8c3fae78c21cdef6d397ea384c313
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211028.044056-127-runner.jar
+    md5: d7dc00bf954df4e1f1e0f32c2138c0db
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 6454a159a6e..c86d809d90f 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211025.034805-283-runner.jar
-    md5: d391286aae6f8a8a7cf9f5aa9ee7f671
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211028.060232-287-runner.jar
+    md5: fdccfbd5391f17d3a447c4bd7f3ab9b8
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211025.034637-278-runner.jar
-    md5: 6b0053a1abb654eee837470439308826
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211028.060008-282-runner.jar
+    md5: 2163527f3ec2baed03a5071de62fee1d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index ef27d9ed3a4..99a63250291 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211025.035801-224-runner.jar
-    md5: 253afc40cc63c8f75b200f1701626792
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211028.062122-228-runner.jar
+    md5: 15fc720fdf765acac007e7785321983b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index f4670293d91..94f2847b5c5 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211025.030941-89-runner.jar
-    md5: 35d70ba8c612e25bd3d99ff75fd58a1a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211028.041433-93-runner.jar
+    md5: e8cbb886008fa728519ced562a39c1a3
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index d1e042922c0..e14fe47360c 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211025.030231-155-runner.jar
-    md5: ba647692731f8cb69838c91ab592b69d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211028.040042-159-runner.jar
+    md5: 4aaf95e1de47045d56ec6da073c1a576
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index bb2c2ae4dbc..ba133cf597c 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211025.030745-137-runner.jar
-    md5: b1b3b6247e6756e093bbada55893f37e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211028.041104-141-runner.jar
+    md5: 170062aa03da210485e857a2fe96f6f1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index b3054a0ebe4..eea6aafd941 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211025.030514-157-runner.jar
-    md5: 283501df6e027190a864dc563fafe91a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211028.040604-161-runner.jar
+    md5: c851179cb492233ba208e64edcf00140
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 40cee8c6d6e..7a4cd5149d4 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211023.054621-275-runner.jar
-    md5: efb8fdb35e410e300ff8c0ee46317ded
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211028.053128-279-runner.jar
+    md5: 8fb08ecd8bb0327f4f9fb030311c772f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 3d8d3d59c5f..1cf2f4a1c9a 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211023.054947-275-runner.jar
-    md5: 31bb1c1e567b0d34fb5220b816675dce
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211028.053723-279-runner.jar
+    md5: 05226e65cf0d174cb7c415330f7d2cc3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index cfa28f2f219..8cb3ae5ca11 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211025.035228-191-runner.jar
-    md5: 4eeac6bc4672104e45386a67dc89b0b9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211028.061124-195-runner.jar
+    md5: 71367368f252d97ac3080b1399e67ba4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 9804b11f5d8..a0db435b5c5 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211025.035450-22-runner.jar
-    md5: 913c8944b4d8f0fa8d02e026a153a8d3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211028.061543-26-runner.jar
+    md5: 9754cb06de88d1a3977b73d267516871
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 1fff5f6d008..ea448ceb34c 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211025.035337-194-runner.jar
-    md5: 27e69b9844ff5d13802d5cf382e6a178
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211028.061333-198-runner.jar
+    md5: e11c59126cf57ed284b0ad3e98025f59
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 45b65e88ac7..a54306be573 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211023.054905-273-runner.jar
-    md5: 85b544f27a3c2a59d90efcb32752d9fa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211028.053624-277-runner.jar
+    md5: bc2938fe797cb8399d96b1d936916cc9
 
 execute:
   - script: configure

From 934dcddb8714fc5509fa5c19a60e38543875aaea Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 3 Nov 2021 10:51:14 -0300
Subject: [PATCH 381/709] Updated Maven artifacts (#841)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 608c021784a..17df0e46ccf 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211028.044622-93-runner.jar
-    md5: ecc3c54c988b42c3a0312802880bd0a7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211102.054645-98-runner.jar
+    md5: 5673b78ff0998d26df78cbaf89eec40f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 3c1f6d611be..bca36d41a54 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211028.042614-282-runner.jar
-    md5: efcb5d177b2ed578b04e7bd4af51931c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211102.053355-287-runner.jar
+    md5: 448fb228115df087ee1eb6d4df0b8056
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 1a399aaf9bf..09e65aeb221 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211028.043421-283-runner.jar
-    md5: bc2fa239cdf50aea83755b895120226f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211102.053836-288-runner.jar
+    md5: 0ca593266c52b1e338df9476e0eafe1c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index baccef4c1ac..d99be4bf36c 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211028.044056-127-runner.jar
-    md5: d7dc00bf954df4e1f1e0f32c2138c0db
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211102.054304-132-runner.jar
+    md5: d21df7ada31d35de9fcae5a9f559c81c
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index c86d809d90f..1bb19956cb2 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211028.060232-287-runner.jar
-    md5: fdccfbd5391f17d3a447c4bd7f3ab9b8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211102.064928-292-runner.jar
+    md5: 8d90db2e4b967029ddeb9096ddc5683e
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211028.060008-282-runner.jar
-    md5: 2163527f3ec2baed03a5071de62fee1d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211102.064707-287-runner.jar
+    md5: f693805df1119663b588789f6e7d3512
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 99a63250291..7733cda6532 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211028.062122-228-runner.jar
-    md5: 15fc720fdf765acac007e7785321983b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211102.070642-233-runner.jar
+    md5: 67c643621aeaae694713488b0095107e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 94f2847b5c5..8f6ed3446f5 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211028.041433-93-runner.jar
-    md5: e8cbb886008fa728519ced562a39c1a3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211102.052557-97-runner.jar
+    md5: b0a86c5f96a7bde720a0a585ccfaceec
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index e14fe47360c..b003d3a4f4b 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211028.040042-159-runner.jar
-    md5: 4aaf95e1de47045d56ec6da073c1a576
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211102.051535-164-runner.jar
+    md5: 630a53b24d8a77b496f624d100ef7ae8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index ba133cf597c..27de3cb028e 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211028.041104-141-runner.jar
-    md5: 170062aa03da210485e857a2fe96f6f1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211102.052319-146-runner.jar
+    md5: 7de31eb2963292db0b33ac4dc9bd4656
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index eea6aafd941..18fba727aab 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211028.040604-161-runner.jar
-    md5: c851179cb492233ba208e64edcf00140
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211102.051932-165-runner.jar
+    md5: f2f106f35364288dc564e171cbaea68d
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 7a4cd5149d4..d12c399c068 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211028.053128-279-runner.jar
-    md5: 8fb08ecd8bb0327f4f9fb030311c772f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211102.061821-284-runner.jar
+    md5: 0dec0a1a1cfcbb4cf70572e211cc9bf4
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 1cf2f4a1c9a..6ff01341fd8 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211028.053723-279-runner.jar
-    md5: 05226e65cf0d174cb7c415330f7d2cc3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211102.062355-284-runner.jar
+    md5: 8cb06ad12252d6a96629fc6145a65756
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 8cb3ae5ca11..ee6a3443976 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211028.061124-195-runner.jar
-    md5: 71367368f252d97ac3080b1399e67ba4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211102.065755-199-runner.jar
+    md5: b04cf5b40dbf20bd75672d21d606ec5f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index a0db435b5c5..b609417aefd 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211028.061543-26-runner.jar
-    md5: 9754cb06de88d1a3977b73d267516871
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211102.070140-30-runner.jar
+    md5: 5c650e2c4dbfeeadd1be47bd22050e8a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index ea448ceb34c..178bc7fcad5 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211028.061333-198-runner.jar
-    md5: e11c59126cf57ed284b0ad3e98025f59
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211102.065947-202-runner.jar
+    md5: 2967e4070092f310b6af960f36213697
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index a54306be573..3f669f95a22 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211028.053624-277-runner.jar
-    md5: bc2938fe797cb8399d96b1d936916cc9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211102.062253-282-runner.jar
+    md5: 9204cbc251cf29fe4a129ca3012b913a
 
 execute:
   - script: configure

From 877b3fe89321a71a80dc757f4b85c73534ad5a7f Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Thu, 4 Nov 2021 14:37:44 -0300
Subject: [PATCH 382/709] fix kogito-jobs-service-postgresql test (#845)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .../features/jobs-service/kogito-jobs-service-postgresql.feature | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index 4ae4a41588e..2aab4a74980 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -24,4 +24,3 @@ Feature: Kogito-jobs-service-postgresql feature.
       | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
     Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-postgresql-runner.jar
     And container log should contain Datasource '<default>': The connection attempt failed
-    And container log should contain Failed to start application (with profile prod)

From 589a08ff6d68b2eb35eb0e91a246fecd7a386f11 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 5 Nov 2021 11:08:56 -0300
Subject: [PATCH 383/709] Updated Maven artifacts (#851)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 17df0e46ccf..e0723ca4ba4 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211102.054645-98-runner.jar
-    md5: 5673b78ff0998d26df78cbaf89eec40f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211105.042914-101-runner.jar
+    md5: 01d945bf82b2bc5a52acadd868d8d44a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index bca36d41a54..535daedbc06 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211102.053355-287-runner.jar
-    md5: 448fb228115df087ee1eb6d4df0b8056
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211105.042104-290-runner.jar
+    md5: d114bf628024b8e1f5b8c11b70fcbf58
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 09e65aeb221..544a1b72f25 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211102.053836-288-runner.jar
-    md5: 0ca593266c52b1e338df9476e0eafe1c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211105.042402-291-runner.jar
+    md5: eb06949c3b7abab40bdcfb11a35b0b26
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index d99be4bf36c..e8086d8a2df 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211102.054304-132-runner.jar
-    md5: d21df7ada31d35de9fcae5a9f559c81c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211105.042652-135-runner.jar
+    md5: c550834ee3fd1288f18f89e76c02a7bd
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 1bb19956cb2..c7522733129 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211102.064928-292-runner.jar
-    md5: 8d90db2e4b967029ddeb9096ddc5683e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211105.050652-295-runner.jar
+    md5: 8f5510d14c7d89b3e8b8dc3603b6bff6
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211102.064707-287-runner.jar
-    md5: f693805df1119663b588789f6e7d3512
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211105.050543-290-runner.jar
+    md5: 8d427c8ccdaf3cc35c0e0852d26b9124
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 7733cda6532..1333ed31e27 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211102.070642-233-runner.jar
-    md5: 67c643621aeaae694713488b0095107e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211105.051531-236-runner.jar
+    md5: a1ff9517a2ef1d94f160b9aa0b96f72e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 8f6ed3446f5..835b9d2ceee 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211102.052557-97-runner.jar
-    md5: b0a86c5f96a7bde720a0a585ccfaceec
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211105.041605-100-runner.jar
+    md5: 21211aa564fc806a4035e8be67865fd1
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index b003d3a4f4b..6536e218626 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211102.051535-164-runner.jar
-    md5: 630a53b24d8a77b496f624d100ef7ae8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211105.040946-167-runner.jar
+    md5: f393ba5f4ea20b8447bbe85beecf851c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 27de3cb028e..616fcd82023 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211102.052319-146-runner.jar
-    md5: 7de31eb2963292db0b33ac4dc9bd4656
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211105.041425-149-runner.jar
+    md5: 584629ab344281385fc033121913bcd2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 18fba727aab..dad08cfbfd5 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211102.051932-165-runner.jar
-    md5: f2f106f35364288dc564e171cbaea68d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211105.041207-168-runner.jar
+    md5: 4be6ddc2d5abf5d1d08deb6b618c92ac
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index d12c399c068..08291cbb02c 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211102.061821-284-runner.jar
-    md5: 0dec0a1a1cfcbb4cf70572e211cc9bf4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211105.044440-287-runner.jar
+    md5: 8d432e6f1a3832e0df2e68a6cfa61e4e
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 6ff01341fd8..4c75589f1de 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211102.062355-284-runner.jar
-    md5: 8cb06ad12252d6a96629fc6145a65756
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211105.044708-287-runner.jar
+    md5: a612fdbdae538ff8276800874e952b76
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index ee6a3443976..18547678d76 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211102.065755-199-runner.jar
-    md5: b04cf5b40dbf20bd75672d21d606ec5f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211105.051038-202-runner.jar
+    md5: b3040845344c0fa66dcf6438935caa19
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index b609417aefd..2e3671583a6 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211102.070140-30-runner.jar
-    md5: 5c650e2c4dbfeeadd1be47bd22050e8a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211105.051236-33-runner.jar
+    md5: 03f225fa86d449dd2501bd3d76bbae15
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 178bc7fcad5..d704857ae82 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211102.065947-202-runner.jar
-    md5: 2967e4070092f310b6af960f36213697
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211105.051136-205-runner.jar
+    md5: 05ee4d6c04c383f3ade7e29a18cd8033
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 3f669f95a22..0dc271752fe 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211102.062253-282-runner.jar
-    md5: 9204cbc251cf29fe4a129ca3012b913a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211105.044636-285-runner.jar
+    md5: 3b25f30c32d1c6f2923a5c005b8d4252
 
 execute:
   - script: configure

From 31be17a6dc4f4f20abbca147885fe8fcb454c942 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 8 Nov 2021 09:05:03 -0300
Subject: [PATCH 384/709] Updated Maven artifacts (#856)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index e0723ca4ba4..f55ec4cd8f5 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211105.042914-101-runner.jar
-    md5: 01d945bf82b2bc5a52acadd868d8d44a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211106.040846-102-runner.jar
+    md5: 32297fc9a1a95db10eb5fe71871c1f0e
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 535daedbc06..4bd8f85f1e0 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211105.042104-290-runner.jar
-    md5: d114bf628024b8e1f5b8c11b70fcbf58
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211106.035848-291-runner.jar
+    md5: dfac199a07ce926e23c9eb230fdd1081
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 544a1b72f25..b540da3164d 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211105.042402-291-runner.jar
-    md5: eb06949c3b7abab40bdcfb11a35b0b26
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211106.040225-292-runner.jar
+    md5: e970815a048b2115bb178fabb7bd98ff
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index e8086d8a2df..96276be1b6e 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211105.042652-135-runner.jar
-    md5: c550834ee3fd1288f18f89e76c02a7bd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211106.040549-136-runner.jar
+    md5: 49e181691f7f5995dda18fb2bc536453
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index c7522733129..886eab1536a 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211105.050652-295-runner.jar
-    md5: 8f5510d14c7d89b3e8b8dc3603b6bff6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211107.064710-297-runner.jar
+    md5: 719f072560dda455015bfa852b2c0236
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211105.050543-290-runner.jar
-    md5: 8d427c8ccdaf3cc35c0e0852d26b9124
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211107.064553-292-runner.jar
+    md5: 5d70ad9b8b478160c726ab94b5074356
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 1333ed31e27..039f287c19e 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211105.051531-236-runner.jar
-    md5: a1ff9517a2ef1d94f160b9aa0b96f72e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211107.065607-238-runner.jar
+    md5: 72341b1fb1d817f76ca501ddccf9a8d9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 835b9d2ceee..1a86be6126b 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211105.041605-100-runner.jar
-    md5: 21211aa564fc806a4035e8be67865fd1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211106.035234-101-runner.jar
+    md5: afaa9cf02ac910694213047fa1767ab0
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 6536e218626..7921631fcbc 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211105.040946-167-runner.jar
-    md5: f393ba5f4ea20b8447bbe85beecf851c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211107.060518-169-runner.jar
+    md5: 4f8746e5884a08a0e552b66e1d2753ca
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 616fcd82023..ef6bb5a92d7 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211105.041425-149-runner.jar
-    md5: 584629ab344281385fc033121913bcd2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211106.035028-150-runner.jar
+    md5: df3d0ddc94730ee2d40564761c191ee7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index dad08cfbfd5..d43643e2da9 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211105.041207-168-runner.jar
-    md5: 4be6ddc2d5abf5d1d08deb6b618c92ac
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211106.034742-169-runner.jar
+    md5: 961fc2bed85f18b44a09caeb2b94337e
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 08291cbb02c..9af2d1e2ea1 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211105.044440-287-runner.jar
-    md5: 8d432e6f1a3832e0df2e68a6cfa61e4e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211107.062437-289-runner.jar
+    md5: 97fe83270405196490ce8a9aabafa18a
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 4c75589f1de..2af234b0a0d 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211105.044708-287-runner.jar
-    md5: a612fdbdae538ff8276800874e952b76
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211107.062721-289-runner.jar
+    md5: ae443201a7210397d4345a8890761d63
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 18547678d76..50a69cffc1d 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211105.051038-202-runner.jar
-    md5: b3040845344c0fa66dcf6438935caa19
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211107.065120-204-runner.jar
+    md5: bbd4d8624fc20cbf0b8280c62a983098
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 2e3671583a6..b08216ca8d7 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211105.051236-33-runner.jar
-    md5: 03f225fa86d449dd2501bd3d76bbae15
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211107.065319-35-runner.jar
+    md5: df39c28ce891fdbe9505b721edd472ef
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index d704857ae82..39081a68e90 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211105.051136-205-runner.jar
-    md5: 05ee4d6c04c383f3ade7e29a18cd8033
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211107.065220-207-runner.jar
+    md5: 3492e719ecff4761a8d405d82f5ff5e4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 0dc271752fe..bc7bd572c83 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211105.044636-285-runner.jar
-    md5: 3b25f30c32d1c6f2923a5c005b8d4252
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211107.062643-287-runner.jar
+    md5: 26557b6ec9c563fe41a79fc8b3e6140b
 
 execute:
   - script: configure

From cfb088892b7370fc1894254b1f065ebf6445f48d Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 8 Nov 2021 13:01:11 -0300
Subject: [PATCH 385/709] =?UTF-8?q?[RHPAM-3680]=20-=20Kogito=20image=20Run?=
 =?UTF-8?q?time=20JVM=20does=20not=20consider=20much=20the=20en=E2=80=A6?=
 =?UTF-8?q?=20(#848)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [RHPAM-3680] - Kogito image Runtime JVM does not consider much the env RUNTIME_TYPE

Signed-off-by: spolti <fspolti@redhat.com>

* small typo fix

Signed-off-by: spolti <fspolti@redhat.com>
---
 kogito-builder-overrides.yaml                 |  2 +-
 modules/kogito-image-dependencies/module.yaml |  1 +
 modules/kogito-s2i-core/added/s2i-core        | 27 ++++++++++++++---
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 30 +++++++++++++++----
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index 59ca866ceba..5d314e8d9ee 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -19,7 +19,7 @@ envs:
   description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 - name: "RUNTIME_TYPE"
   example: "springboot"
-  description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
+  description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus. Applies only at build time, except for binary builds, for runtime and binary builds, it is populated during runtime by identifying the runtime type based on the provided application jar."
 - name: NATIVE
   example: true
   description: If set to true, perform a native build. Only supported for RUNTIME_TYPE is 'quarkus'.
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index 4d696804d96..ab33358c3d2 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -12,4 +12,5 @@ packages:
     - shadow-utils
     - tar
     - gzip
+    - unzip
 
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 4de5e69c4e4..95cbba1ab8f 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -211,17 +211,36 @@ function copy_kogito_app() {
 
 function get_runtime_type() {
     allowed_runtime_values=("$QUARKUS_RUNTIME_TYPE" "$SPRINGBOOT_RUNTIME_TYPE")
-    local runtime_type="${RUNTIME_TYPE:-$QUARKUS_RUNTIME_TYPE}"
+    local runtime_type="${QUARKUS_RUNTIME_TYPE}"
+
+    jar_2_inspect="${KOGITO_HOME}/bin/*.jar"
+    quarkus_main_class="io.quarkus.bootstrap.runner.QuarkusEntryPoint"
+    spring_main_class="org.springframework.boot.loader.JarLauncher"
+    if [ -f ${jar_2_inspect} ]; then
+        log_info "---> Binary build, trying to detect runtime type based on the provided application jar."
+        zipgrep "$quarkus_main_class" $jar_2_inspect > /dev/null
+        if [ $? = 0 ]; then
+            RUNTIME_TYPE="${QUARKUS_RUNTIME_TYPE}"
+        else
+            zipgrep "$spring_main_class" $jar_2_inspect > /dev/null
+            if [ $? = 0 ]; then
+                RUNTIME_TYPE="${SPRINGBOOT_RUNTIME_TYPE}"
+            fi
+        fi
+    fi
+
+    if [ "${RUNTIME_TYPE}x" = "x" ]; then
+        RUNTIME_TYPE=${RUNTIME_TYPE:-${runtime_type}}
+    fi
 
     if [[ ! "${allowed_runtime_values[*]}" =~ ${RUNTIME_TYPE} ]]; then
         log_warning "RUNTIME_TYPE ${RUNTIME_TYPE} is not allowed, the allowed types are [${allowed_runtime_values[*]}]. Application might fail"
     fi
 
-    log_info "---> Setting RUNTIME_TYPE to ${runtime_type}"
-    echo "${runtime_type}"
+    log_info "----> Setting RUNTIME_TYPE to ${RUNTIME_TYPE}"
+    echo "${RUNTIME_TYPE}"
 }
 
-
 function get_quarkus_version() {
     log_info "Trying to retrieve Quarkus version from org.kie.kogito:kogito-build-parent:${KOGITO_VERSION}"
     local ver=$($MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml help:evaluate -q \
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 13701b4b532..e52a0c64170 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 
 export KOGITO_HOME=$BATS_TMPDIR/kogito_home
-mkdir -p "${KOGITO_HOME}"/launch/
+mkdir -p "${KOGITO_HOME}"/{bin,launch}
 
 cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 cp $BATS_TEST_DIRNAME/../../../kogito-persistence/added/kogito-persistence.sh "${KOGITO_HOME}"/launch/
@@ -299,12 +299,11 @@ teardown() {
     echo "status= $status"
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Installing common application binaries" ]
-    [ "${lines[1]}" = "'target/app.jar' -> '"${KOGITO_HOME}"/bin'" ]
+    [ "${lines[1]}" = "'target/app.jar' -> '"${KOGITO_HOME}"/bin/app.jar'" ]
 }
 
 @test "test copy_kogito_app default quarkus java build no jar file present" {
     NATIVE="false"
-    mkdir "${KOGITO_HOME}"/bin
     touch target/app-runner.jar
     mkdir target/lib
     touch target/lib/{lib.jar,lib1.jar}
@@ -323,7 +322,6 @@ teardown() {
 
 @test "test copy_kogito_app default quarkus java build uberJar runner file present" {
     NATIVE="false"
-    mkdir "${KOGITO_HOME}"/bin
     touch target/app-runner.jar
 
     run copy_kogito_app
@@ -338,9 +336,7 @@ teardown() {
 }
 
 @test "test copy_kogito_app default quarkus native builds file present" {
-
     NATIVE="true"
-    mkdir "${KOGITO_HOME}"/bin
     touch target/app-runner
     mkdir target/lib
     touch target/lib/{lib.jar,lib1.jar}
@@ -409,3 +405,25 @@ teardown() {
     [ "${lines[0]}" = "---> Generating quarkus project structure for project..." ]
 }
 
+@test "test get_runtime_type to make sure it returns the expected runtime_type for Quarkus using binary build" {
+    echo "Main-Class: io.quarkus.bootstrap.runner.QuarkusEntryPoint" > /tmp/MANIFEST.MF
+    jar -0 --create --file $KOGITO_HOME/bin/my-app.jar -m /tmp/MANIFEST.MF
+
+    run get_runtime_type
+
+    echo "result: ${lines[@]}"
+    [ "${lines[2]}" = "quarkus" ]
+}
+
+@test "test get_runtime_type to make sure it returns the expected runtime_type for Springboot binary build" {
+    echo "Main-Class: org.springframework.boot.loader.JarLauncher" > /tmp/MANIFEST.MF
+    echo "public void hello(){}" > /tmp/hello.java
+    jar -0 --create --file $KOGITO_HOME/bin/my-app.jar -m /tmp/MANIFEST.MF
+    jar -0 --create --file /tmp/my-app.jar -m /tmp/MANIFEST.MF
+
+    run get_runtime_type
+
+    echo "result: ${lines[@]}"
+    [ "${lines[2]}" = "springboot" ]
+}
+

From ccece925405477736b4b203beae48306c3b12db6 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 8 Nov 2021 13:09:28 -0300
Subject: [PATCH 386/709] [RHPAM-3974] - Red Hat Maven techpreview repository
 id is wrong in Kogito S2I image (#825)

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-maven/3.8.x/configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-maven/3.8.x/configure b/modules/kogito-maven/3.8.x/configure
index 22b27b09064..c9463de1519 100644
--- a/modules/kogito-maven/3.8.x/configure
+++ b/modules/kogito-maven/3.8.x/configure
@@ -39,7 +39,7 @@ if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
       </snapshots>\
     </repository>\
     <repository>\
-      <id>jboss-eap-repository</id>\
+      <id>redhat-techpreview-repository</id>\
       <url>https://maven.repository.redhat.com/techpreview/all</url>\
       <releases>\
         <enabled>true</enabled>\
@@ -71,7 +71,7 @@ if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
       </snapshots>\
     </pluginRepository>\
     <pluginRepository>\
-      <id>jboss-eap-plugin-repository</id>\
+      <id>redhat-techpreview-repository</id>\
       <url>https://maven.repository.redhat.com/techpreview/all</url>\
       <releases>\
         <enabled>true</enabled>\

From c25869837e393614640bfd46dd5ea25066e00ef8 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 9 Nov 2021 13:56:20 -0300
Subject: [PATCH 387/709] Updated Maven artifacts (#862)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index f55ec4cd8f5..db1923c2ed1 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211106.040846-102-runner.jar
-    md5: 32297fc9a1a95db10eb5fe71871c1f0e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211109.040814-104-runner.jar
+    md5: 2de6fa2f2d9df3104a146de12635d6c6
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 4bd8f85f1e0..621b4728dc8 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211106.035848-291-runner.jar
-    md5: dfac199a07ce926e23c9eb230fdd1081
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211109.035926-293-runner.jar
+    md5: 44d2e4dea748c7bf690dbe7b63e9bf5d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index b540da3164d..5dcbe01a67c 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211106.040225-292-runner.jar
-    md5: e970815a048b2115bb178fabb7bd98ff
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211109.040237-294-runner.jar
+    md5: 7b094c17005bb8a7bb36066aa271afa9
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 96276be1b6e..7acbae86f5b 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211106.040549-136-runner.jar
-    md5: 49e181691f7f5995dda18fb2bc536453
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211109.040537-138-runner.jar
+    md5: f5c3fa540678865003675c1938a57cc1
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 886eab1536a..1f94bbc7cf7 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211107.064710-297-runner.jar
-    md5: 719f072560dda455015bfa852b2c0236
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211109.044747-298-runner.jar
+    md5: 0fb73c885bd997bfa13f55552fbef72b
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211107.064553-292-runner.jar
-    md5: 5d70ad9b8b478160c726ab94b5074356
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211109.044630-293-runner.jar
+    md5: 7b2019b7bdcfd5b130c3e9a862a9f857
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 039f287c19e..c38e3ee7bb0 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211107.065607-238-runner.jar
-    md5: 72341b1fb1d817f76ca501ddccf9a8d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211109.045731-239-runner.jar
+    md5: 84508053126a823cf76b4bd9c6424ed6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 1a86be6126b..488b9af2858 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211106.035234-101-runner.jar
-    md5: afaa9cf02ac910694213047fa1767ab0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211109.035404-103-runner.jar
+    md5: 3ca32e31b9a483e35da84a73c6141457
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 7921631fcbc..1c7e4df9d4b 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211107.060518-169-runner.jar
-    md5: 4f8746e5884a08a0e552b66e1d2753ca
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211109.034724-171-runner.jar
+    md5: 0a640dbc59824464d9013e80c2cd2320
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index ef6bb5a92d7..3a23dfc726a 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211106.035028-150-runner.jar
-    md5: df3d0ddc94730ee2d40564761c191ee7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211109.035216-152-runner.jar
+    md5: 934e7546a19e284cf610b9f15adb5249
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index d43643e2da9..83e7a8d6d67 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211106.034742-169-runner.jar
-    md5: 961fc2bed85f18b44a09caeb2b94337e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211109.034949-171-runner.jar
+    md5: 3f8dddbd4d13a0b16128444c94d0905c
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 9af2d1e2ea1..f613cef9f2c 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211107.062437-289-runner.jar
-    md5: 97fe83270405196490ce8a9aabafa18a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211109.042508-290-runner.jar
+    md5: f5a4f1abced02e56239bf034160e5bdb
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 2af234b0a0d..f31be8a4c50 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211107.062721-289-runner.jar
-    md5: ae443201a7210397d4345a8890761d63
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211109.042750-290-runner.jar
+    md5: fbea834bdb3a6e36295c5ce421200d52
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 50a69cffc1d..c340459ab9f 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211107.065120-204-runner.jar
-    md5: bbd4d8624fc20cbf0b8280c62a983098
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211109.045232-205-runner.jar
+    md5: 3ae188dc315e3da1a878bfa806ed1047
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index b08216ca8d7..65d5c76a6ec 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211107.065319-35-runner.jar
-    md5: df39c28ce891fdbe9505b721edd472ef
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211109.045434-36-runner.jar
+    md5: 19782a63ce4681a9265aeb7c0a472973
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 39081a68e90..19c28725834 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211107.065220-207-runner.jar
-    md5: 3492e719ecff4761a8d405d82f5ff5e4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211109.045331-208-runner.jar
+    md5: e8bbf848008d0f95a46bf7eb998a59cc
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index bc7bd572c83..bd3605aa530 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211107.062643-287-runner.jar
-    md5: 26557b6ec9c563fe41a79fc8b3e6140b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211109.042712-288-runner.jar
+    md5: ba8a351a1388eb5dd49bd1690994977c
 
 execute:
   - script: configure

From e0c5ae573d5645edcb24630af7a6f6261d30bd8c Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 16 Nov 2021 11:09:52 -0300
Subject: [PATCH 388/709] Updated Maven artifacts (#872)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index db1923c2ed1..edf2c86c689 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211109.040814-104-runner.jar
-    md5: 2de6fa2f2d9df3104a146de12635d6c6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211114.053545-108-runner.jar
+    md5: af24212b9fbc1e4dfd6f980c36c57013
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 621b4728dc8..969138eca0a 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211109.035926-293-runner.jar
-    md5: 44d2e4dea748c7bf690dbe7b63e9bf5d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211114.052328-297-runner.jar
+    md5: 8a995494be2f0324f30ee65c91f11837
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 5dcbe01a67c..ca327d4725b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211109.040237-294-runner.jar
-    md5: 7b094c17005bb8a7bb36066aa271afa9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211114.052754-298-runner.jar
+    md5: 71d2cd6ed5ecbbef4df92a1847e1cbc9
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 7acbae86f5b..381cf87ccf0 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211109.040537-138-runner.jar
-    md5: f5c3fa540678865003675c1938a57cc1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211114.053211-142-runner.jar
+    md5: 44a5acc1d2125d40bc54455314ee05f8
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 1f94bbc7cf7..fee1829aa84 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211109.044747-298-runner.jar
-    md5: 0fb73c885bd997bfa13f55552fbef72b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211114.062637-302-runner.jar
+    md5: b3b48c8dc291583ed0dc8e945e6bbe60
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211109.044630-293-runner.jar
-    md5: 7b2019b7bdcfd5b130c3e9a862a9f857
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211114.062504-297-runner.jar
+    md5: 643ca81d76887d958b1feb40422e74a1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index c38e3ee7bb0..136f5b325ba 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211109.045731-239-runner.jar
-    md5: 84508053126a823cf76b4bd9c6424ed6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211114.063730-243-runner.jar
+    md5: 0cd8e3e130d653bd8a57c203f9f1b504
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 488b9af2858..beb95685206 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211109.035404-103-runner.jar
-    md5: 3ca32e31b9a483e35da84a73c6141457
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211114.051614-107-runner.jar
+    md5: 694e037f8d8b40982d595a2e464e518e
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 1c7e4df9d4b..a8031acae6a 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211109.034724-171-runner.jar
-    md5: 0a640dbc59824464d9013e80c2cd2320
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211114.050706-175-runner.jar
+    md5: 65c1d96874251a8636959062951873e9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 3a23dfc726a..2cc44f3b920 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211109.035216-152-runner.jar
-    md5: 934e7546a19e284cf610b9f15adb5249
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211114.051352-156-runner.jar
+    md5: 884940bb6b1f7be22f204e4ef84ad4de
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 83e7a8d6d67..ba1782e5945 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211109.034949-171-runner.jar
-    md5: 3f8dddbd4d13a0b16128444c94d0905c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211114.051031-175-runner.jar
+    md5: 6a1bad973058f50db1806fe95fecfa5d
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index f613cef9f2c..ee53a8aa16f 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211109.042508-290-runner.jar
-    md5: f5a4f1abced02e56239bf034160e5bdb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211114.060132-294-runner.jar
+    md5: fad7544b2d644a68b38d585be1cd060b
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index f31be8a4c50..53fb0d435b1 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211109.042750-290-runner.jar
-    md5: fbea834bdb3a6e36295c5ce421200d52
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211114.060508-294-runner.jar
+    md5: afe02b76802d8dd436338a21665d0b42
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index c340459ab9f..36249262bdd 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211109.045232-205-runner.jar
-    md5: 3ae188dc315e3da1a878bfa806ed1047
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211114.063158-209-runner.jar
+    md5: a041f9bf3ea20cdef304e6b47919c723
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 65d5c76a6ec..49e69663424 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211109.045434-36-runner.jar
-    md5: 19782a63ce4681a9265aeb7c0a472973
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211114.063414-40-runner.jar
+    md5: df1024b68fa6b628c4fa66b84d2a25f6
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 19c28725834..84b899a5525 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211109.045331-208-runner.jar
-    md5: e8bbf848008d0f95a46bf7eb998a59cc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211114.063304-212-runner.jar
+    md5: 072cc661b90f9a6ae7742f64e443314c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index bd3605aa530..ae50e83714a 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211109.042712-288-runner.jar
-    md5: ba8a351a1388eb5dd49bd1690994977c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211114.060427-292-runner.jar
+    md5: c0549bc47b5923bec614a6673513abaa
 
 execute:
   - script: configure

From 15ce6784beb967f3b8aab1282fb3b3b610cfb8bf Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 18 Nov 2021 15:26:41 -0300
Subject: [PATCH 389/709] Updated Maven artifacts (#882)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index edf2c86c689..38e47607a30 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211114.053545-108-runner.jar
-    md5: af24212b9fbc1e4dfd6f980c36c57013
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211118.044256-115-runner.jar
+    md5: 44a41ad11fba7c92278e1f2a9eb426fa
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 969138eca0a..d98509cd5cf 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211114.052328-297-runner.jar
-    md5: 8a995494be2f0324f30ee65c91f11837
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211118.042724-304-runner.jar
+    md5: c0eb2567e5789bebd05d083567f4cda3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index ca327d4725b..48887962c0f 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211114.052754-298-runner.jar
-    md5: 71d2cd6ed5ecbbef4df92a1847e1cbc9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211118.043333-305-runner.jar
+    md5: 76c1a2c2de66b5b2b6878d2e30a3289f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 381cf87ccf0..6ccd1135c4e 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211114.053211-142-runner.jar
-    md5: 44a5acc1d2125d40bc54455314ee05f8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211118.043834-149-runner.jar
+    md5: e485dcd5176d20d8f43e481e6d279e1d
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index fee1829aa84..83bb2a9377f 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211114.062637-302-runner.jar
-    md5: b3b48c8dc291583ed0dc8e945e6bbe60
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211118.054639-309-runner.jar
+    md5: 327261beced86d9298a10d4507ad1731
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211114.062504-297-runner.jar
-    md5: 643ca81d76887d958b1feb40422e74a1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211118.054435-304-runner.jar
+    md5: 8865c74eb92dbf8abb83f3b852401f71
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 136f5b325ba..3929983a894 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211114.063730-243-runner.jar
-    md5: 0cd8e3e130d653bd8a57c203f9f1b504
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211118.060024-250-runner.jar
+    md5: b5a758ed279962fc5bbda41b1c3a3460
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index beb95685206..d5b85fec0f0 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211114.051614-107-runner.jar
-    md5: 694e037f8d8b40982d595a2e464e518e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211118.041724-114-runner.jar
+    md5: 09852a75e1924c090f8d38414dcc1fad
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index a8031acae6a..c38d9a2ed92 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211114.050706-175-runner.jar
-    md5: 65c1d96874251a8636959062951873e9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211118.040435-182-runner.jar
+    md5: 7de598dc69f425218aed2a671a1caca2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 2cc44f3b920..9adb57091ca 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211114.051352-156-runner.jar
-    md5: 884940bb6b1f7be22f204e4ef84ad4de
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211118.041411-163-runner.jar
+    md5: 8e969e03cef68dff9024bd4a9b6de522
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index ba1782e5945..6dff1dc2545 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211114.051031-175-runner.jar
-    md5: 6a1bad973058f50db1806fe95fecfa5d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211118.040931-182-runner.jar
+    md5: e70295489c4c933696e099d826eabb68
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index ee53a8aa16f..376b4af0cce 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211114.060132-294-runner.jar
-    md5: fad7544b2d644a68b38d585be1cd060b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211118.051901-301-runner.jar
+    md5: bae4683de55b2a16778309869bbda74e
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 53fb0d435b1..edc5e82b90b 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211114.060508-294-runner.jar
-    md5: afe02b76802d8dd436338a21665d0b42
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211118.052322-301-runner.jar
+    md5: 1658339e84910e55a63d249867831246
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 36249262bdd..b7ccf6bfcf6 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211114.063158-209-runner.jar
-    md5: a041f9bf3ea20cdef304e6b47919c723
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211118.055334-216-runner.jar
+    md5: c686a7dcba241d9764b7975ef013d36e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 49e69663424..fbddf67a8fa 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211114.063414-40-runner.jar
-    md5: df1024b68fa6b628c4fa66b84d2a25f6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211118.055614-47-runner.jar
+    md5: 307f5dd5dd44a0862f5444a15623ba49
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 84b899a5525..eb19e2b5eba 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211114.063304-212-runner.jar
-    md5: 072cc661b90f9a6ae7742f64e443314c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211118.055450-219-runner.jar
+    md5: c0a6ccaf9ff08b3b0ff7247f8824d008
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index ae50e83714a..03964f12ce0 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211114.060427-292-runner.jar
-    md5: c0549bc47b5923bec614a6673513abaa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211118.052233-299-runner.jar
+    md5: 8e7f1ef13ca2f75603cac449040de404
 
 execute:
   - script: configure

From b8cb6ef04fbf3df7ecb1d3dd9a0980001a183ed2 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 19 Nov 2021 10:41:54 -0300
Subject: [PATCH 390/709] Updated Maven artifacts (#885)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 38e47607a30..944b2670cb2 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211118.044256-115-runner.jar
-    md5: 44a41ad11fba7c92278e1f2a9eb426fa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211119.042628-116-runner.jar
+    md5: ce1e3a2056b3f777e55b2264ce0ddded
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index d98509cd5cf..eacd7264cab 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211118.042724-304-runner.jar
-    md5: c0eb2567e5789bebd05d083567f4cda3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211119.041259-305-runner.jar
+    md5: 04d3f75772b8b5e9f3c34ef589697b23
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 48887962c0f..a63d22ff8e6 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211118.043333-305-runner.jar
-    md5: 76c1a2c2de66b5b2b6878d2e30a3289f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211119.041752-306-runner.jar
+    md5: a4dec29eefb60928b83a14d5900b8313
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 6ccd1135c4e..c1f6d280e02 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211118.043834-149-runner.jar
-    md5: e485dcd5176d20d8f43e481e6d279e1d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211119.042222-150-runner.jar
+    md5: 290cc41452eb8d65a9fd92abe32b9f7c
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 83bb2a9377f..8c90ebd0746 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211118.054639-309-runner.jar
-    md5: 327261beced86d9298a10d4507ad1731
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211119.052348-310-runner.jar
+    md5: 7736e2baa188ded09ec6da2838fd7c38
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211118.054435-304-runner.jar
-    md5: 8865c74eb92dbf8abb83f3b852401f71
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211119.052152-305-runner.jar
+    md5: d4e2dece8f8937d7a363c8002e100f43
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 3929983a894..e8376dcb083 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211118.060024-250-runner.jar
-    md5: b5a758ed279962fc5bbda41b1c3a3460
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211119.053626-251-runner.jar
+    md5: 30b9d0dff5ef993ae396d5bae27c2581
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index d5b85fec0f0..488a0a930e8 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211118.041724-114-runner.jar
-    md5: 09852a75e1924c090f8d38414dcc1fad
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211119.040506-115-runner.jar
+    md5: 6617d7ef3973e8301cbcfc7d0fc54dcb
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index c38d9a2ed92..c1cd0afe5f5 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211118.040435-182-runner.jar
-    md5: 7de598dc69f425218aed2a671a1caca2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211119.035442-183-runner.jar
+    md5: 658a857bb56125ab864da0eaeef6c3f8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 9adb57091ca..29a1842ee1f 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211118.041411-163-runner.jar
-    md5: 8e969e03cef68dff9024bd4a9b6de522
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211119.040231-164-runner.jar
+    md5: ed1ee018116ed66c16804cd115a03de8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 6dff1dc2545..d7f5a23d25c 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211118.040931-182-runner.jar
-    md5: e70295489c4c933696e099d826eabb68
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211119.035856-183-runner.jar
+    md5: 00af9c0a7e4c1090f5b83f17e958e9a1
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 376b4af0cce..e30b903ad4a 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211118.051901-301-runner.jar
-    md5: bae4683de55b2a16778309869bbda74e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211119.045613-302-runner.jar
+    md5: a63c8e728dd4f22b38f96556f03a8ac7
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index edc5e82b90b..ade78927ec2 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211118.052322-301-runner.jar
-    md5: 1658339e84910e55a63d249867831246
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211119.050019-302-runner.jar
+    md5: 7e6e5be56d37ebedb285564843755605
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index b7ccf6bfcf6..33de9476319 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211118.055334-216-runner.jar
-    md5: c686a7dcba241d9764b7975ef013d36e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211119.052944-217-runner.jar
+    md5: f8178e5cf36a384384ac0356ccf198f7
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index fbddf67a8fa..e61bb2eec79 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211118.055614-47-runner.jar
-    md5: 307f5dd5dd44a0862f5444a15623ba49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211119.053228-48-runner.jar
+    md5: ab6f939d6455a24de632209842f48547
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index eb19e2b5eba..9baac6c0785 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211118.055450-219-runner.jar
-    md5: c0a6ccaf9ff08b3b0ff7247f8824d008
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211119.053103-220-runner.jar
+    md5: 9d1e84cada030ab90802abc1ef006299
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 03964f12ce0..4fb52ff8d24 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211118.052233-299-runner.jar
-    md5: 8e7f1ef13ca2f75603cac449040de404
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211119.045931-300-runner.jar
+    md5: 3e5532b396ae15fd1007f8c4cf108b3b
 
 execute:
   - script: configure

From 800f148ffe3b8668a5090c1f1d03faf8e9c20fc9 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 22 Nov 2021 14:28:50 -0300
Subject: [PATCH 391/709] Updated Maven artifacts (#892)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 944b2670cb2..9c399b9b214 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211119.042628-116-runner.jar
-    md5: ce1e3a2056b3f777e55b2264ce0ddded
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211122.043220-119-runner.jar
+    md5: 5d28dbf97dcdf1748c01be7d81c2dff9
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index eacd7264cab..6d56b85696b 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211119.041259-305-runner.jar
-    md5: 04d3f75772b8b5e9f3c34ef589697b23
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211121.045019-307-runner.jar
+    md5: 9fdb2e4b01ada4d4a1575287dc35c1c7
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index a63d22ff8e6..3e52e5e9569 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211119.041752-306-runner.jar
-    md5: a4dec29eefb60928b83a14d5900b8313
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211122.042253-309-runner.jar
+    md5: db773405987b595f1fdacbc6e7b73cb9
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index c1f6d280e02..a533e3bdfc6 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211119.042222-150-runner.jar
-    md5: 290cc41452eb8d65a9fd92abe32b9f7c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211122.042750-153-runner.jar
+    md5: 0d256595a589083d751afead9d6c1367
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 8c90ebd0746..af38cd11e03 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211119.052348-310-runner.jar
-    md5: 7736e2baa188ded09ec6da2838fd7c38
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211122.053841-313-runner.jar
+    md5: 39977df2fb9ed4b4be34be04c4cc0194
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211119.052152-305-runner.jar
-    md5: d4e2dece8f8937d7a363c8002e100f43
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211122.053645-308-runner.jar
+    md5: e434b230ff96973ba8d1342c0d078a29
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index e8376dcb083..43c9073caa4 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211119.053626-251-runner.jar
-    md5: 30b9d0dff5ef993ae396d5bae27c2581
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211122.055229-254-runner.jar
+    md5: d3aeb0c636276c866c74884d2742024f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 488a0a930e8..d94ecdb1f38 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211119.040506-115-runner.jar
-    md5: 6617d7ef3973e8301cbcfc7d0fc54dcb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211122.040724-118-runner.jar
+    md5: 056a0207f1fa75d9d024674fbcd97744
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index c1cd0afe5f5..b28ba2ef2de 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211119.035442-183-runner.jar
-    md5: 658a857bb56125ab864da0eaeef6c3f8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211122.035553-186-runner.jar
+    md5: 4e46324ce0ff12bb3cb9c1fd85aa3e49
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 29a1842ee1f..11f416d7f79 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211119.040231-164-runner.jar
-    md5: ed1ee018116ed66c16804cd115a03de8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211122.040411-167-runner.jar
+    md5: 6980f22e577e0ab0a385342ae3714065
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index d7f5a23d25c..6de03595261 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211119.035856-183-runner.jar
-    md5: 00af9c0a7e4c1090f5b83f17e958e9a1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211122.035946-186-runner.jar
+    md5: 84a73444889f045f2ae35c1121490e02
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e30b903ad4a..8f1204c9fb6 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211119.045613-302-runner.jar
-    md5: a63c8e728dd4f22b38f96556f03a8ac7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211122.050933-305-runner.jar
+    md5: eb10d529c07a96f6b25a1892bc0bdab7
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index ade78927ec2..5bc27e7fc2f 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211119.050019-302-runner.jar
-    md5: 7e6e5be56d37ebedb285564843755605
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211122.051445-305-runner.jar
+    md5: 23174964665793081c5529c724854438
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 33de9476319..91ebdcad8d3 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211119.052944-217-runner.jar
-    md5: f8178e5cf36a384384ac0356ccf198f7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211122.054544-220-runner.jar
+    md5: 85a2af0cc56e9da3d1a5d75544f9a320
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index e61bb2eec79..e418ef23427 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211119.053228-48-runner.jar
-    md5: ab6f939d6455a24de632209842f48547
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211122.054827-51-runner.jar
+    md5: 0cda6759873f94586e3dfb835748c75f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 9baac6c0785..ad2d8ebdad5 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211119.053103-220-runner.jar
-    md5: 9d1e84cada030ab90802abc1ef006299
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211122.054705-223-runner.jar
+    md5: 5fcfac968e9876f33d20ae11c95aaa22
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 4fb52ff8d24..902c8af2d8d 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211119.045931-300-runner.jar
-    md5: 3e5532b396ae15fd1007f8c4cf108b3b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211122.051347-303-runner.jar
+    md5: 96cbf8a1f36e8a21b66fcad936e286a5
 
 execute:
   - script: configure

From 3bf96885b7eee38590c9a016919985dc33a83e2b Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 24 Nov 2021 15:41:19 -0300
Subject: [PATCH 392/709] Updated Maven artifacts (#901)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 9c399b9b214..5636269c82d 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211122.043220-119-runner.jar
-    md5: 5d28dbf97dcdf1748c01be7d81c2dff9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211124.035655-121-runner.jar
+    md5: ba1d8e256f4b722dd2b2b873c335abf3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 6d56b85696b..8a8eb317593 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211121.045019-307-runner.jar
-    md5: 9fdb2e4b01ada4d4a1575287dc35c1c7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211124.034720-309-runner.jar
+    md5: 9a9d1ab34cdb273ed3c7a30c9e8fa835
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 3e52e5e9569..8c8be582eb5 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211122.042253-309-runner.jar
-    md5: db773405987b595f1fdacbc6e7b73cb9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211124.035046-311-runner.jar
+    md5: c322995fec7852b03859c8170c47ea68
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index a533e3bdfc6..59ba154ecb1 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211122.042750-153-runner.jar
-    md5: 0d256595a589083d751afead9d6c1367
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211124.035400-155-runner.jar
+    md5: 1ccd9f7835e0b23d7d7d3c1aa50e6021
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index af38cd11e03..53b93f3b15e 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211122.053841-313-runner.jar
-    md5: 39977df2fb9ed4b4be34be04c4cc0194
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211124.044149-315-runner.jar
+    md5: 6e60dd25f717dc703ca43d714daf9155
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211122.053645-308-runner.jar
-    md5: e434b230ff96973ba8d1342c0d078a29
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211124.044025-310-runner.jar
+    md5: 77acd0e8d7e01f099b35cffd382e3e32
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 43c9073caa4..a5fc79f50c9 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211122.055229-254-runner.jar
-    md5: d3aeb0c636276c866c74884d2742024f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211124.045141-256-runner.jar
+    md5: 0d4f41b9ebade52f1779b2cf533ec2bc
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index d94ecdb1f38..5eb1ef02ed3 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211122.040724-118-runner.jar
-    md5: 056a0207f1fa75d9d024674fbcd97744
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211124.034144-120-runner.jar
+    md5: 4a96636a4744136e73e779c5ce9cba67
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index b28ba2ef2de..05853d5d915 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211122.035553-186-runner.jar
-    md5: 4e46324ce0ff12bb3cb9c1fd85aa3e49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211124.033439-188-runner.jar
+    md5: 99df1f6b11790c5c7acb62127cad448a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 11f416d7f79..ad9e6ab5427 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211122.040411-167-runner.jar
-    md5: 6980f22e577e0ab0a385342ae3714065
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211124.033946-169-runner.jar
+    md5: 4b8bee50f668aee17b11d028dd5ce809
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 6de03595261..bfc165f2529 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211122.035946-186-runner.jar
-    md5: 84a73444889f045f2ae35c1121490e02
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211124.033712-188-runner.jar
+    md5: cbaf49414bbd43837275803c9d03b55b
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 8f1204c9fb6..6e6e1335eb4 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211122.050933-305-runner.jar
-    md5: eb10d529c07a96f6b25a1892bc0bdab7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211124.041800-307-runner.jar
+    md5: 8e8412a999ad566c82f89706524634d1
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 5bc27e7fc2f..5d4959cb168 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211122.051445-305-runner.jar
-    md5: 23174964665793081c5529c724854438
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211124.042054-307-runner.jar
+    md5: 3eb99ee2acc5f9ce9a3154a3153e067f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 91ebdcad8d3..8fb4ec36d28 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211122.054544-220-runner.jar
-    md5: 85a2af0cc56e9da3d1a5d75544f9a320
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211124.044637-222-runner.jar
+    md5: 27911d96aed90ad339a252c549e17ded
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index e418ef23427..48938bbb62b 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211122.054827-51-runner.jar
-    md5: 0cda6759873f94586e3dfb835748c75f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211124.044837-53-runner.jar
+    md5: 3cce99e5d956fa8ca3f7b29cede23d23
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index ad2d8ebdad5..5de1800d7f2 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211122.054705-223-runner.jar
-    md5: 5fcfac968e9876f33d20ae11c95aaa22
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211124.044736-225-runner.jar
+    md5: 91721157d8874d8b88d8d77e12ac9eff
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 902c8af2d8d..eda343e1b7a 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211122.051347-303-runner.jar
-    md5: 96cbf8a1f36e8a21b66fcad936e286a5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211124.042019-305-runner.jar
+    md5: 883aae2c581e7046ee390ee3b603c72f
 
 execute:
   - script: configure

From 4b3397c17ec3b3daafedb6b3faf541716633697e Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 24 Nov 2021 19:53:14 +0100
Subject: [PATCH 393/709] KOGITO-6307 Update to GraalVM 21.3.0 (#905)

* KOGITO-6307 Update to GraalVM 21.3.0

* updated md5 hash

* updates
---
 README.md                                        |  6 +++---
 kogito-builder-overrides.yaml                    |  2 +-
 .../21.x-java-11/module.yaml                     | 16 ++++++++--------
 modules/kogito-graalvm-scripts/module.yaml       |  2 +-
 rhpam-kogito-builder-rhel8-overrides.yaml        |  2 +-
 tests/features/kogito-builder-native.feature     |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 8013f16217a..1c4bf3d0800 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ To interact with Kogito images, you would need to install the needed dependencie
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
         * used to perform local s2i images using some of the [builder images](#builder-images)
-    * [GraalVM 21.1.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-21.1.0) Java 11 or higher
+    * [GraalVM 21.3.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-21.3.0) Java 11 or higher
         * Useful to test Kogito apps on native mode before create a Container image with it.
     * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
         
@@ -154,9 +154,9 @@ When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a
 
 The Kogito Builder Image is equipped with the following components:
 
- * GraalVM 21.1.0-java11
+ * GraalVM 21.3.0-java11
  * OpenJDK 11.0.6
- * Maven 3.6.2
+ * Maven 3.8.1
  
 For more information about what is installed on this image, take a look [here](kogito-builder-overrides.yaml) in the
 **modules.install** section. 
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index 5d314e8d9ee..cc95d4b7974 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -44,7 +44,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "21.1.0-java-11"
+    version: "21.3.0-java-11"
   - name: org.kie.kogito.graalvm.scripts
   - name: org.kie.kogito.openjdk
     version: "11"
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
index 2ecd7a6f788..ca95adbcec9 100644
--- a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "21.1.0-java-11"
+version: "21.3.0-java-11"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,17 +9,17 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "21.1.0"
+    value: "21.3.0"
   - name: "GRAALVM_JAVA_VERSION"
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-21.1.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.1.0/graalvm-ce-java11-linux-amd64-21.1.0.tar.gz
-  md5: eac80a467219fc9f3496a7393c2863d2
-- name: native-image-installable-svm-java11-linux-amd64-21.1.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.1.0/native-image-installable-svm-java11-linux-amd64-21.1.0.jar
-  md5: 2e7d52eb8f2066594ada7b6a1f52be96
+- name: graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
+  md5: 0813eeb5ccc5b29789f66950360b0b2d
+- name: native-image-installable-svm-java11-linux-amd64-21.3.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/native-image-installable-svm-java11-linux-amd64-21.3.0.jar
+  md5: f6283764854911654af182af3e94749c
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml
index 4fa11507c50..9b9a412d936 100644
--- a/modules/kogito-graalvm-scripts/module.yaml
+++ b/modules/kogito-graalvm-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
-version: "21.1.0"
+version: "21.3.0"
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 2464f6b87c2..53db1319584 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -48,7 +48,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.graalvm.installer
-      version: "21.1.0-java-11"
+      version: "21.3.0-java-11"
     - name: org.kie.kogito.graalvm.scripts
     - name: org.kie.kogito.openjdk
       version: "11"
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index 822adb6933f..e6e21bfdb61 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -12,7 +12,7 @@ Feature: kogito-builder image native build tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.1.0
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.0
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest

From d26348e3df6f7b5571b411e7647f0adcc2c81966 Mon Sep 17 00:00:00 2001
From: Lei Zhang <lzhang@ca.ibm.com>
Date: Thu, 25 Nov 2021 14:30:54 -0500
Subject: [PATCH 394/709] [KOGITO-6231] Adding OpenJ9 support for IBM Z and
 Power support (#829)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adding OpenJ9 support for z/p

Co-authored-by: Spolti <filippespolti@gmail.com>
Co-authored-by: Marek Novotný <hotmana76@gmail.com>
---
 content_sets.yaml                             |  8 ++
 .../jboss/container/openjdk/jdk/jvm-options   |  9 +++
 .../semeru-11-open/configure.sh               | 25 ++++++
 .../kogito-openjdk/semeru-11-open/module.yaml | 28 +++++++
 ...ito-builder-openj9-11-rhel8-overrides.yaml | 79 +++++++++++++++++++
 ...runtime-jvm-openj9-11-rhel8-overrides.yaml | 68 ++++++++++++++++
 6 files changed, 217 insertions(+)
 create mode 100644 modules/kogito-openjdk/semeru-11-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
 create mode 100755 modules/kogito-openjdk/semeru-11-open/configure.sh
 create mode 100644 modules/kogito-openjdk/semeru-11-open/module.yaml
 create mode 100644 rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml
 create mode 100644 rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml

diff --git a/content_sets.yaml b/content_sets.yaml
index c7f2caabe15..9b1c1cad49c 100644
--- a/content_sets.yaml
+++ b/content_sets.yaml
@@ -15,3 +15,11 @@ x86_64:
   - rhel-8-for-x86_64-baseos-rpms
   - rhel-8-for-x86_64-appstream-rpms
   - rhocp-4.7-for-rhel-8-x86_64-rpms
+s390x:
+  - rhel-8-for-s390x-baseos-rpms
+  - rhel-8-for-s390x-appstream-rpms
+  - openj9-1-for-rhel-8-s390x-rpms
+ppc64le:
+  - rhel-8-for-ppc64le-baseos-rpms
+  - rhel-8-for-ppc64le-appstream-rpms
+  - openj9-1-for-rhel-8-ppc64le-rpms
diff --git a/modules/kogito-openjdk/semeru-11-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options b/modules/kogito-openjdk/semeru-11-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
new file mode 100644
index 00000000000..4484251d7f7
--- /dev/null
+++ b/modules/kogito-openjdk/semeru-11-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
@@ -0,0 +1,9 @@
+#!/bin/sh
+# ==============================================================================
+# JDK specific customizations
+#
+# ==============================================================================
+
+function jvm_specific_diagnostics() {
+    echo ""
+}
diff --git a/modules/kogito-openjdk/semeru-11-open/configure.sh b/modules/kogito-openjdk/semeru-11-open/configure.sh
new file mode 100755
index 00000000000..c85a8fd0b96
--- /dev/null
+++ b/modules/kogito-openjdk/semeru-11-open/configure.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+chmod -R ug+rwX $SCRIPT_DIR
+chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd
+
+alternatives --set java /usr/lib/jvm/ibm-semeru-open-11-jdk/bin/java
+alternatives --set javac /usr/lib/jvm/ibm-semeru-open-11-jdk/bin/javac
+
+# Update securerandom.source for quicker starts
+JAVA_SECURITY_FILE=/usr/lib/jvm/ibm-semeru-open-11-jdk/conf/security/java.security
+SECURERANDOM=securerandom.source
+if grep -q "^$SECURERANDOM=.*" $JAVA_SECURITY_FILE; then
+    sed -i "s|^$SECURERANDOM=.*|$SECURERANDOM=file:/dev/urandom|" $JAVA_SECURITY_FILE
+else
+    echo $SECURERANDOM=file:/dev/urandom >> $JAVA_SECURITY_FILE
+fi
diff --git a/modules/kogito-openjdk/semeru-11-open/module.yaml b/modules/kogito-openjdk/semeru-11-open/module.yaml
new file mode 100644
index 00000000000..694e414b886
--- /dev/null
+++ b/modules/kogito-openjdk/semeru-11-open/module.yaml
@@ -0,0 +1,28 @@
+schema_version: 1
+
+name: org.kie.kogito.openjdk
+description: "Installs the JDK for OpenJ9 11."
+version: semeru-11-open
+
+labels:
+- name: "org.jboss.product"
+  value: "openjdk"
+- name: "org.jboss.product.version"
+  value: "11"
+- name: "org.jboss.product.openjdk.version"
+  value: "11"
+
+envs:
+- name: "JAVA_HOME"
+  value: "/usr/lib/jvm/ibm-semeru-open-11-jdk"
+- name: "JAVA_VENDOR"
+  value: "IBM"
+- name: "JAVA_VERSION"
+  value: "11"
+
+packages:
+  install:
+  - ibm-semeru-open-11-jdk
+
+execute:
+- script: configure.sh
diff --git a/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml b/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml
new file mode 100644
index 00000000000..5bb2b260ca6
--- /dev/null
+++ b/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml
@@ -0,0 +1,79 @@
+schema_version: 1
+
+name: "rhpam-7/rhpam-kogito-builder-openj9-11-rhel8"
+version: "7.12.0"
+from: "registry.redhat.io/ubi8/ubi-minimal:latest"
+description: "RHPAM Platform with IBM Semeru Runtime for building Kogito based on Quarkus or SpringBoot"
+
+labels:
+  - name: "com.redhat.component"
+    value: "rhpam-7-kogito-builder-openj9-11-rhel8-container"
+  - name: "io.k8s.description"
+    value: "RHPAM Platform with IBM Semeru Runtime for building Kogito based on Quarkus or Spring Boot"
+  - name: "io.k8s.display-name"
+    value: "Red Hat build of Kogito builder with IBM Semeru Runtime based on Quarkus or SpringBoot"
+  - name: "io.openshift.tags"
+    value: "rhpam-kogito,builder,kogito,quarkus,springboot,openj9"
+  - name: "io.openshift.s2i.assemble-input-files"
+    value: "/home/kogito/bin"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "RUNTIME_TYPE"
+    example: "springboot"
+    description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
+  - name: JAVA_OPTIONS
+    example: "-Dquarkus.log.level=DEBUG"
+    description: JVM options passed to the Java command.
+  - name: MAVEN_ARGS_APPEND
+    example: "-pl mymodule -am"
+    description: Additional Maven arguments
+  - name: ARTIFACT_DIR
+    example: mymodule/target
+    description: Path to target/ where the jar files are created for multi-module builds
+
+ports:
+  - value: 8080
+
+modules:
+  install:
+    - name: org.kie.kogito.rhpam.prod.profile
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "semeru-11-open"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven
+      version: "3.8.1"
+    - name: org.kie.kogito.s2i.core
+    - name: org.kie.kogito.builder
+
+packages:
+  content_sets_file: content_sets.yaml
+  install:
+    - bc
+    - jq
+    - gcc
+    - gcc-c++
+
+osbs:
+  configuration:
+    container:
+      platforms:
+        only:
+          - s390x
+          - ppc64le
+      compose:
+        pulp_repos: true
+        signing_intent: release
+  extra_dir: osbs-extra/rhpam-kogito-builder-rhel8
+  repository:
+    name: containers/rhpam-7-kogito-builder-openj9-11
+    branch: rhba-7-rhel-8
+
+run:
+  workdir: "/home/kogito"
diff --git a/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml
new file mode 100644
index 00000000000..b77d8b0acab
--- /dev/null
+++ b/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml
@@ -0,0 +1,68 @@
+schema_version: 1
+
+name: "rhpam-7/rhpam-kogito-runtime-jvm-openj9-11-rhel8"
+version: "7.12.0"
+from: "registry.redhat.io/ubi8/ubi-minimal:latest"
+description: "RHPAM Runtime image with IBM Semeru Runtime for Kogito based on Quarkus or SpringBoot JVM image"
+
+labels:
+  - name: "com.redhat.component"
+    value: "rhpam-7-kogito-runtime-jvm-openj9-11-rhel8-container"
+  - name: "io.k8s.description"
+    value: "RHPAM Runtime image with IBM Semeru Runtime for Kogito based on Quarkus or Spring Boot JVM image"
+  - name: "io.k8s.display-name"
+    value: "Red Hat build of Kogito runtime based on Quarkus or SpringBoot JVM image"
+  - name: "io.openshift.tags"
+    value: "rhpam-kogito,runtime,kogito,quarkus,springboot,jvm,openj9"
+  - name: "io.openshift.s2i.assemble-input-files"
+    value: "/home/kogito/bin"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "RUNTIME_TYPE"
+    example: "springboot"
+    description: "Defines the runtime type of your Kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
+  - name: JAVA_OPTIONS
+    example: "-Dquarkus.log.level=DEBUG"
+    description: JVM options passed to the Java command.
+
+ports:
+  - value: 8080
+
+modules:
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "semeru-11-open"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.s2i.core
+    - name: org.kie.kogito.runtime.jvm
+    - name: org.kie.kogito.security.custom.truststores
+
+packages:
+  content_sets_file: content_sets.yaml
+  install:
+    - jq
+
+osbs:
+  configuration:
+    container:
+      platforms:
+        only:
+          - s390x
+          - ppc64le
+      compose:
+        pulp_repos: true
+        signing_intent: release
+  extra_dir: osbs-extra/rhpam-kogito-runtime-jvm-rhel8
+  repository:
+    name: containers/rhpam-7-kogito-runtime-jvm-openj9-11
+    branch: rhba-7-rhel-8
+
+run:
+  workdir: "/home/kogito"

From ac75e5b92316369f0beda1b9b362caa6b634d610 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 1 Dec 2021 16:29:14 -0300
Subject: [PATCH 395/709] [KOGITO-6333] Enforce Jackson RestEasy in
 auto-generated projects (#919)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 modules/kogito-s2i-core/added/s2i-core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 95cbba1ab8f..ac73ff5efd3 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -113,7 +113,7 @@ function build_kogito_app() {
                     -DprojectGroupId=$PROJECT_GROUP_ID \
                     -DprojectArtifactId=$PROJECT_ARTIFACT_ID \
                     -DprojectVersion=$PROJECT_VERSION \
-                    -Dextensions="kogito,quarkus-smallrye-health,quarkus-smallrye-openapi"
+                    -Dextensions="kogito,quarkus-smallrye-health,quarkus-smallrye-openapi,quarkus-resteasy,quarkus-resteasy-jackson"
 
         elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
             log_info "----> Using Spring Boot to bootstrap the application."

From b8b34d840fc8f7db7aea8cf3d3a4c5bce4460870 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Mon, 6 Dec 2021 05:52:53 -0300
Subject: [PATCH 396/709] =?UTF-8?q?[main]=20[RHPAM-4053]=20-=20Kogito=20bu?=
 =?UTF-8?q?ilder=20image:=20Source=20file=20generation=20should=20us?=
 =?UTF-8?q?=E2=80=A6=20(#920)=20(#934)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [RHPAM-4053] - Kogito builder image: Source file generation should use productized maven quarkus plugin (different GAV) and specify the quarkus platform id/version

Signed-off-by: spolti <fspolti@redhat.com>

* Update s2i-core

* Update s2i-core

* Update s2i-core

* correction

* apply fixes from review

Signed-off-by: spolti <fspolti@redhat.com>

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
Co-authored-by: radtriste <tradisso@redhat.com>

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
Co-authored-by: radtriste <tradisso@redhat.com>
---
 modules/kogito-s2i-core/added/s2i-core        | 67 ++++++++++++++-----
 modules/kogito-s2i-core/module.yaml           | 16 +++++
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 43 ++++++++++++
 3 files changed, 108 insertions(+), 18 deletions(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index ac73ff5efd3..6415b443014 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -13,6 +13,7 @@ PROJECT_VERSION="${PROJECT_VERSION:-1.0-SNAPSHOT}"
 artifactDir="target"
 readonly QUARKUS_RUNTIME_TYPE="quarkus"
 readonly SPRINGBOOT_RUNTIME_TYPE="springboot"
+
 if [ ! -z "${ARTIFACT_DIR}" ]; then
     artifactDir="${ARTIFACT_DIR}"
 fi
@@ -98,18 +99,33 @@ function build_kogito_app() {
     if [ -f "pom.xml" ]; then
         log_info "---> Building application from source..."
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \
-            -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-            -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
+	    -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
+	    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 
     else
         log_info "---> Generating $RUNTIME_TYPE project structure for $PROJECT_ARTIFACT_ID..."
+        local quarkus_version
         if [ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]; then
-            local quarkus_version
-            quarkus_version=$(get_quarkus_version) || exit 1
+
+            local quarkus_plugin="${QUARKUS_PLUGIN:-io.quarkus:quarkus-maven-plugin}"
+            if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+                quarkus_plugin="${QUARKUS_PLUGIN:-com.redhat.quarkus.platform:quarkus-maven-plugin}"
+            fi
+
+            IFS=':' read -ra GAV <<< "${quarkus_plugin}"
+            for i in "${GAV[@]}"; do
+                if [[ "$i" =~ ^[0-9]{0,2}\.[0-9]{0,3} ]]; then
+                    log_info "version [${i}] provided through QUARKUS_PLUGIN env."
+                    quarkus_version=${i}
+                else
+                    quarkus_version=$(get_quarkus_version) || exit 1
+                fi
+            done
+
             log_info "----> Using Quarkus version ${quarkus_version} to bootstrap the application."
 
-            $MAVEN_HOME/bin/mvn -U -B ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml \
-                io.quarkus:quarkus-maven-plugin:"${quarkus_version}":create  \
+            $MAVEN_HOME/bin/mvn -U -B ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml $(get_quarkus_platform_properties) \
+                "${quarkus_plugin}":"${quarkus_version}":create  \
                     -DprojectGroupId=$PROJECT_GROUP_ID \
                     -DprojectArtifactId=$PROJECT_ARTIFACT_ID \
                     -DprojectVersion=$PROJECT_VERSION \
@@ -164,8 +180,8 @@ function build_kogito_app() {
             quarkus_version=$(get_quarkus_version) || exit 1
             log_info "--> Quarkus version is '$quarkus_version'"
 
-            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml \
-                io.quarkus:quarkus-maven-plugin:"${quarkus_version}":add-extension \
+            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml $(get_quarkus_platform_properties) \
+                "${quarkus_plugin}":"${quarkus_version}":add-extension \
                 -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow"
         fi
 
@@ -241,16 +257,31 @@ function get_runtime_type() {
     echo "${RUNTIME_TYPE}"
 }
 
+function get_quarkus_platform_properties() {
+    local quarkus_platform_group_id="${QUARKUS_PLATFORM_GROUP_ID:-io.quarkus.platform}"
+    local quarkus_platform_artifact_id="${QUARKUS_PLATFORM_ARTIFACT_ID:-quarkus-bom}"
+    if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+        quarkus_platform_group_id="${QUARKUS_PLATFORM_GROUP_ID:-com.redhat.quarkus.platform}"
+        quarkus_platform_artifact_id="${QUARKUS_PLATFORM_ARTIFACT_ID:-quarkus-bom}"
+    fi
+
+    echo " -DplatformGroupId=${quarkus_platform_group_id} -DplatformArtifactId=${quarkus_platform_artifact_id} -DplatformVersion=$(get_quarkus_version)"
+}
+
 function get_quarkus_version() {
-    log_info "Trying to retrieve Quarkus version from org.kie.kogito:kogito-build-parent:${KOGITO_VERSION}"
-    local ver=$($MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml help:evaluate -q \
-        -Dartifact=org.kie.kogito:kogito-build-parent:"${KOGITO_VERSION}" \
-        -Dexpression=version.io.quarkus \
-        -DforceStdout)
-
-    if [[ ! "$ver" =~ [0-9]{0,2}\.[0-9]{0,3} ]]; then
-        log_error "--> Impossible to get Quarkus version from the generated Maven project (output: '$ver'), failing build"
-        exit 1
+    local quarkus_version="${QUARKUS_VERSION}"
+    if [ "${QUARKUS_VERSION}x" = "x" ]; then
+        log_info "----> Trying to retrieve Quarkus version from org.kie.kogito:kogito-build-parent:${KOGITO_VERSION}"
+        ver=$($MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml help:evaluate -q \
+            -Dartifact=org.kie.kogito:kogito-build-parent:"${KOGITO_VERSION}" \
+            -Dexpression=version.io.quarkus \
+            -DforceStdout)
+
+        if [[ ! "$ver" =~ [0-9]{0,2}\.[0-9]{0,3} ]]; then
+            log_error "----> Impossible to get Quarkus version from the generated Maven project (output: '$ver'), failing build"
+            exit 1
+        fi
+	    quarkus_version=$ver
     fi
-    echo $ver
+    echo $quarkus_version
 }
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 27ef9de48a8..fea7bed0ce3 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -38,6 +38,22 @@ envs:
     description: ^  Indicates the version of the artifact generated by the project.(default "1.0-SNAPSHOT")
     example: "1.0-SNAPSHOT"
 
+  - name: QUARKUS_PLUGIN
+    description: ^ Defines the maven artifact for Quarkus Maven plugin, defaults to io.quarkus:quarkus-maven-plugin. If no version specified it will be detected automatically based on the current Kogito version.
+    example: "io.quarkus:custom-plugin:custom.version"
+
+  - name: QUARKUS_VERSION
+    description: ^ Defines the Quarkus version to ve using during normal or from assets maven builds.
+    example: "2.23.0.Final"
+
+  - name: QUARKUS_PLATFORM_GROUP_ID
+    description: ^ Defines the Quarkus platform group id, defaults to io.quarkus.platform for community and com.redhat.quarkus.platform for product.
+    example: "io.quarkus.custom"
+
+  - name: QUARKUS_PLATFORM_ARTIFACT_ID
+    description: ^ Defines the Quarkus platform artifact id, defaults to quarkus-bom for community and product.
+    example: "quarkus-bom-custom"
+
 modules:
   install:
     - name: org.kie.kogito.persistence
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index e52a0c64170..74b0fa38e5a 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -405,6 +405,7 @@ teardown() {
     [ "${lines[0]}" = "---> Generating quarkus project structure for project..." ]
 }
 
+
 @test "test get_runtime_type to make sure it returns the expected runtime_type for Quarkus using binary build" {
     echo "Main-Class: io.quarkus.bootstrap.runner.QuarkusEntryPoint" > /tmp/MANIFEST.MF
     jar -0 --create --file $KOGITO_HOME/bin/my-app.jar -m /tmp/MANIFEST.MF
@@ -427,3 +428,45 @@ teardown() {
     [ "${lines[2]}" = "springboot" ]
 }
 
+
+@test "test if the Quarkus platform properties are correctly returned for community version" {
+    QUARKUS_VERSION=1.2.3.4
+
+    result=$(get_quarkus_platform_properties)
+
+    expected=" -DplatformGroupId=io.quarkus.platform -DplatformArtifactId=quarkus-bom -DplatformVersion=1.2.3.4"
+
+    echo "result  : $result  `env | grep QUARKUS`"
+    echo "expected: $expected"
+    [ "${result}" = "${expected}" ]
+}
+
+
+@test "test if the Quarkus platform properties are correctly returned for prod version" {
+    QUARKUS_VERSION="1.2.3.4"
+    JBOSS_IMAGE_NAME="rhpam-7/kogito-builder"
+
+    result=$(get_quarkus_platform_properties)
+
+    expected=" -DplatformGroupId=com.redhat.quarkus.platform -DplatformArtifactId=quarkus-bom -DplatformVersion=1.2.3.4"
+
+    echo "result  : $result"
+    echo "expected: $expected"
+    [ "${result}" = "${expected}" ]
+}
+
+
+@test "test if the Quarkus platform properties are correctly returned for using custom values" {
+    QUARKUS_VERSION="12"
+    QUARKUS_PLATFORM_GROUP_ID="groupId-1"
+    QUARKUS_PLATFORM_ARTIFACT_ID="artifactId-2"
+
+    result=$(get_quarkus_platform_properties)
+
+    expected=" -DplatformGroupId=groupId-1 -DplatformArtifactId=artifactId-2 -DplatformVersion=12"
+
+    echo "result  : $result"
+    echo "expected: $expected"
+    [ "${result}" = "${expected}" ]
+}
+

From 9cb215aa44d124eb5f6ae747a22045af0a93b60d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 7 Dec 2021 11:44:15 -0300
Subject: [PATCH 397/709] Updated Maven artifacts (#947)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 5636269c82d..4bf9b020797 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211124.035655-121-runner.jar
-    md5: ba1d8e256f4b722dd2b2b873c335abf3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211207.034232-133-runner.jar
+    md5: 02627ce0b60992a25ed6971c6af734a7
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 8a8eb317593..d2e79fe5b47 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211124.034720-309-runner.jar
-    md5: 9a9d1ab34cdb273ed3c7a30c9e8fa835
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211207.033254-321-runner.jar
+    md5: b0382be0f8028929d5136ab95b34b490
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 8c8be582eb5..49efe5353db 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211124.035046-311-runner.jar
-    md5: c322995fec7852b03859c8170c47ea68
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211207.033622-323-runner.jar
+    md5: 5ca7f74d3b7b3d8fd98799c321dc96cf
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 59ba154ecb1..a5f304fa594 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211124.035400-155-runner.jar
-    md5: 1ccd9f7835e0b23d7d7d3c1aa50e6021
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211207.033941-167-runner.jar
+    md5: a5b432b0b8a417c2c9e74fc316b6e732
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 53b93f3b15e..b40099da794 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211124.044149-315-runner.jar
-    md5: 6e60dd25f717dc703ca43d714daf9155
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211207.042812-327-runner.jar
+    md5: 58313cffd3b7fa27246fdb2a60861cd2
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211124.044025-310-runner.jar
-    md5: 77acd0e8d7e01f099b35cffd382e3e32
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211207.042634-322-runner.jar
+    md5: 18d0ecca45f69dfd4c7ebc82e0b13f07
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index a5fc79f50c9..6a09125f9b6 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211124.045141-256-runner.jar
-    md5: 0d4f41b9ebade52f1779b2cf533ec2bc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211207.044018-268-runner.jar
+    md5: 64436e3ffda0c4bf1d2900e0981a01dc
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 5eb1ef02ed3..99c39481a8b 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211124.034144-120-runner.jar
-    md5: 4a96636a4744136e73e779c5ce9cba67
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211207.032655-132-runner.jar
+    md5: 6a13b0207b546d8d382154084c9528e6
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 05853d5d915..d3229c4e5aa 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211124.033439-188-runner.jar
-    md5: 99df1f6b11790c5c7acb62127cad448a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211207.031951-200-runner.jar
+    md5: d32a4015a75a85401d4a5c0fa5f3778f
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index ad9e6ab5427..c7059747d77 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211124.033946-169-runner.jar
-    md5: 4b8bee50f668aee17b11d028dd5ce809
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211207.032500-181-runner.jar
+    md5: 5bb6504a4cc698a13b2703808af582b3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index bfc165f2529..3761a214a0b 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211124.033712-188-runner.jar
-    md5: cbaf49414bbd43837275803c9d03b55b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211207.032225-200-runner.jar
+    md5: 2a93636608dc4c6d24edcba18d020450
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 6e6e1335eb4..d395b614aa5 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211124.041800-307-runner.jar
-    md5: 8e8412a999ad566c82f89706524634d1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211207.040317-319-runner.jar
+    md5: f102721714a356998ffb30fcc644e0a7
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 5d4959cb168..3269f714d56 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211124.042054-307-runner.jar
-    md5: 3eb99ee2acc5f9ce9a3154a3153e067f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211207.040629-319-runner.jar
+    md5: 9052ed62f3841984240dade06670fd47
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 8fb4ec36d28..b4e00032a35 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211124.044637-222-runner.jar
-    md5: 27911d96aed90ad339a252c549e17ded
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211207.043419-234-runner.jar
+    md5: 7ab4e2fc3b0db3b6e90dcaf6aa41c1a7
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 48938bbb62b..a6b16a10591 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211124.044837-53-runner.jar
-    md5: 3cce99e5d956fa8ca3f7b29cede23d23
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211207.043646-65-runner.jar
+    md5: e1e8ecac210496a531666872130b8191
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 5de1800d7f2..dde5016a1aa 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211124.044736-225-runner.jar
-    md5: 91721157d8874d8b88d8d77e12ac9eff
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211207.043531-237-runner.jar
+    md5: 7bcd10d27f480adb00d78440b2598005
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index eda343e1b7a..c95c7ea753c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211124.042019-305-runner.jar
-    md5: 883aae2c581e7046ee390ee3b603c72f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211207.040553-317-runner.jar
+    md5: f1b87dcc8b436d822b182c2e7ac017ab
 
 execute:
   - script: configure

From 1d56a1b8c974a72c0720e2b6d534836c7fe32b12 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 8 Dec 2021 18:53:01 +0100
Subject: [PATCH 398/709] BAPL-1990 conscious language (#933)

---
 scripts/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/common.py b/scripts/common.py
index bc9cff58ddf..c4fbaafd2d9 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -238,7 +238,7 @@ def update_examples_ref_in_behave_tests(examples_ref):
     :param examples_ref: kogito-examples reference
     """
     print("Set examples_ref {} in behave tests".format(examples_ref))
-    # this pattern will look for any occurrences of using master or using x.x.x
+    # this pattern will look for any occurrences of using nightly-main or using nightly-x.x.x or using x.x.x
     pattern = re.compile(r'(using nightly-main)|(using nightly-\s*([\d.]+.x))|(using \s*([\d.]+[.x]?))')
     replacement = 'using {}'.format(examples_ref)
     update_in_behave_tests(pattern, replacement)

From cae345e60efc22feebc8f31369847e2160c6af1b Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 9 Dec 2021 10:03:17 -0300
Subject: [PATCH 399/709] Updated Maven artifacts (#950)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 4bf9b020797..b24b89539da 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211207.034232-133-runner.jar
-    md5: 02627ce0b60992a25ed6971c6af734a7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211208.035321-134-runner.jar
+    md5: 115050a81d1695ca9666c25be5b47db1
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index d2e79fe5b47..e924cbb56b1 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211207.033254-321-runner.jar
-    md5: b0382be0f8028929d5136ab95b34b490
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211208.034330-322-runner.jar
+    md5: 39e3af702026f220ec50c7b948ddba67
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 49efe5353db..01781e411a5 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211207.033622-323-runner.jar
-    md5: 5ca7f74d3b7b3d8fd98799c321dc96cf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211208.034708-324-runner.jar
+    md5: 2d12ea6d2dd7be5f9f5e913fb2e50fc8
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index a5f304fa594..3333bf7e98f 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211207.033941-167-runner.jar
-    md5: a5b432b0b8a417c2c9e74fc316b6e732
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211208.035026-168-runner.jar
+    md5: f9a55cced6e2617f1c6117736b6b4367
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index b40099da794..87f2366128e 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211207.042812-327-runner.jar
-    md5: 58313cffd3b7fa27246fdb2a60861cd2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211208.043743-328-runner.jar
+    md5: 9faa4e113d9a373652649cfb4b44647c
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211207.042634-322-runner.jar
-    md5: 18d0ecca45f69dfd4c7ebc82e0b13f07
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211208.043622-323-runner.jar
+    md5: 13fbb44e16907cda89ca534ebb047f78
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 6a09125f9b6..7f2a547c04d 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211207.044018-268-runner.jar
-    md5: 64436e3ffda0c4bf1d2900e0981a01dc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211208.044756-269-runner.jar
+    md5: 149f0046d9e6ffcf37329fca78f9e0af
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 99c39481a8b..925f920f2e0 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211207.032655-132-runner.jar
-    md5: 6a13b0207b546d8d382154084c9528e6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211208.033742-133-runner.jar
+    md5: 2e5597e218300af92a66296334192846
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index d3229c4e5aa..0939701b0b8 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211207.031951-200-runner.jar
-    md5: d32a4015a75a85401d4a5c0fa5f3778f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211208.033049-201-runner.jar
+    md5: 741dd15dc72be103a3a92848ffb0f756
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index c7059747d77..0b5e83a2782 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211207.032500-181-runner.jar
-    md5: 5bb6504a4cc698a13b2703808af582b3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211208.033541-182-runner.jar
+    md5: 0697abb39b03b578374d0a8c5d753ec5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 3761a214a0b..acfa60689f6 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211207.032225-200-runner.jar
-    md5: 2a93636608dc4c6d24edcba18d020450
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211208.033311-201-runner.jar
+    md5: 6eef90976b5c62dca7cd459861c4591a
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index d395b614aa5..e5c79f43a1c 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211207.040317-319-runner.jar
-    md5: f102721714a356998ffb30fcc644e0a7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211208.041352-320-runner.jar
+    md5: f064de3a342615c99c1cebb0932700e5
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 3269f714d56..2adaafc029e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211207.040629-319-runner.jar
-    md5: 9052ed62f3841984240dade06670fd47
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211208.041704-320-runner.jar
+    md5: d38cfd814ddee7cf58c2c17e9f5f7483
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index b4e00032a35..c152a5c91fc 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211207.043419-234-runner.jar
-    md5: 7ab4e2fc3b0db3b6e90dcaf6aa41c1a7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211208.044231-235-runner.jar
+    md5: bb218d688492dba4e909e1c84eb52460
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index a6b16a10591..050f2cd2d23 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211207.043646-65-runner.jar
-    md5: e1e8ecac210496a531666872130b8191
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211208.044443-66-runner.jar
+    md5: acbf631e6b9e2221ea62b5f70440d76e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index dde5016a1aa..c30b33cbbaa 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211207.043531-237-runner.jar
-    md5: 7bcd10d27f480adb00d78440b2598005
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211208.044337-238-runner.jar
+    md5: 5a641df41532d7d813e1642f8842e110
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index c95c7ea753c..e7762f2680c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211207.040553-317-runner.jar
-    md5: f1b87dcc8b436d822b182c2e7ac017ab
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211208.041623-318-runner.jar
+    md5: 9f54aa70c714bf910215d779aa904fc5
 
 execute:
   - script: configure

From d98fb096203fba356f7a316df87c5258edee8187 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 10 Dec 2021 09:40:20 -0300
Subject: [PATCH 400/709] Updated Maven artifacts (#952)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index b24b89539da..598ff36a529 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211208.035321-134-runner.jar
-    md5: 115050a81d1695ca9666c25be5b47db1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211210.034009-136-runner.jar
+    md5: c18e97ae58ba943272d111b8b458eae4
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index e924cbb56b1..9aa06a7c690 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211208.034330-322-runner.jar
-    md5: 39e3af702026f220ec50c7b948ddba67
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211210.033049-324-runner.jar
+    md5: 8fc6c35b6653dcc3d5324b54216381aa
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 01781e411a5..c80bd9b8e30 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211208.034708-324-runner.jar
-    md5: 2d12ea6d2dd7be5f9f5e913fb2e50fc8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211210.033409-326-runner.jar
+    md5: 36e80fa3a997d6486eea93a8662e2b00
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 3333bf7e98f..cf25e8e5734 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211208.035026-168-runner.jar
-    md5: f9a55cced6e2617f1c6117736b6b4367
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211210.033716-170-runner.jar
+    md5: d4836b61662b46979862acc61359db98
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 87f2366128e..c14ab54497f 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211208.043743-328-runner.jar
-    md5: 9faa4e113d9a373652649cfb4b44647c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211210.042338-330-runner.jar
+    md5: 9cd2938a75a294bac58cc7b697545d95
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211208.043622-323-runner.jar
-    md5: 13fbb44e16907cda89ca534ebb047f78
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211210.042217-325-runner.jar
+    md5: eee1e35fbb0ae8fb090d9525787dd6e9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 7f2a547c04d..5de6a0d9977 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211208.044756-269-runner.jar
-    md5: 149f0046d9e6ffcf37329fca78f9e0af
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211210.043332-271-runner.jar
+    md5: c756b063743b9fcf8e3137649ad99f51
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 925f920f2e0..01ba823e919 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211208.033742-133-runner.jar
-    md5: 2e5597e218300af92a66296334192846
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211210.032514-135-runner.jar
+    md5: 1791ea3d1ba819654ee71d418bf3d7db
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 0939701b0b8..edd16b6d541 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211208.033049-201-runner.jar
-    md5: 741dd15dc72be103a3a92848ffb0f756
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211210.031806-203-runner.jar
+    md5: d6ba75e484ab588ab6a7342d23d15857
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 0b5e83a2782..31d2d7f0659 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211208.033541-182-runner.jar
-    md5: 0697abb39b03b578374d0a8c5d753ec5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211210.032315-184-runner.jar
+    md5: 503183eeaa62bd4bc04394a96dcb90a6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index acfa60689f6..e82f8bbf4d4 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211208.033311-201-runner.jar
-    md5: 6eef90976b5c62dca7cd459861c4591a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211210.032042-203-runner.jar
+    md5: c4ff3c87e5ac2355d17d3e6278db4a30
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e5c79f43a1c..760cb6d8ded 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211208.041352-320-runner.jar
-    md5: f064de3a342615c99c1cebb0932700e5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211210.035955-322-runner.jar
+    md5: dc9b2b13bf997e07d2ddfc9a76a9e892
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 2adaafc029e..66e25d5fd30 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211208.041704-320-runner.jar
-    md5: d38cfd814ddee7cf58c2c17e9f5f7483
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211210.040257-322-runner.jar
+    md5: 62642385e4a367fa67f1522ac5c8146d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index c152a5c91fc..78f557abda9 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211208.044231-235-runner.jar
-    md5: bb218d688492dba4e909e1c84eb52460
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211210.042820-237-runner.jar
+    md5: 6ad7c7179c999d9eb381f17826dd421f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 050f2cd2d23..8656aca40c1 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211208.044443-66-runner.jar
-    md5: acbf631e6b9e2221ea62b5f70440d76e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211210.043031-68-runner.jar
+    md5: 16c3d437c7c2c4069938be60cd295ef9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index c30b33cbbaa..11184a87df5 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211208.044337-238-runner.jar
-    md5: 5a641df41532d7d813e1642f8842e110
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211210.042926-240-runner.jar
+    md5: 8cf71ead3a3c4745fd5dbe3090493078
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index e7762f2680c..0ebd82cdbda 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211208.041623-318-runner.jar
-    md5: 9f54aa70c714bf910215d779aa904fc5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211210.040217-320-runner.jar
+    md5: 9107eb45dbd92b19c7a47a776bfc0c40
 
 execute:
   - script: configure

From 356d757be7f007797cccdbb4248132a83fe4ef98 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 13 Dec 2021 11:24:07 -0300
Subject: [PATCH 401/709] Updated Maven artifacts (#959)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 598ff36a529..3d99e587e69 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211210.034009-136-runner.jar
-    md5: c18e97ae58ba943272d111b8b458eae4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211212.050313-140-runner.jar
+    md5: 52982dd0eed6792a36ec2cc3ba358adb
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 9aa06a7c690..0cb76017668 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211210.033049-324-runner.jar
-    md5: 8fc6c35b6653dcc3d5324b54216381aa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211212.045427-328-runner.jar
+    md5: 199d96813fe4c3378334d9e7938e3847
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index c80bd9b8e30..8634a6a0534 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211210.033409-326-runner.jar
-    md5: 36e80fa3a997d6486eea93a8662e2b00
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211212.045744-330-runner.jar
+    md5: ed9b5f03056d1041dd80cd489399a8cf
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index cf25e8e5734..3e0aa9a5930 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211210.033716-170-runner.jar
-    md5: d4836b61662b46979862acc61359db98
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211212.050044-174-runner.jar
+    md5: 9f668190b3dc1b9601fa8278412a32f8
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index c14ab54497f..7b711b73011 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211210.042338-330-runner.jar
-    md5: 9cd2938a75a294bac58cc7b697545d95
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211212.054537-334-runner.jar
+    md5: a9e45ec276f6d66f92bd6a1c45837496
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211210.042217-325-runner.jar
-    md5: eee1e35fbb0ae8fb090d9525787dd6e9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211212.054407-329-runner.jar
+    md5: 38411a6792eaa8264ca0247f64987c5e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 5de6a0d9977..f253b80ed91 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211210.043332-271-runner.jar
-    md5: c756b063743b9fcf8e3137649ad99f51
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211212.055511-275-runner.jar
+    md5: 4cbb3f956ba39c5c1c7dd2cbaccdebe8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 01ba823e919..8bddc22868f 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211210.032514-135-runner.jar
-    md5: 1791ea3d1ba819654ee71d418bf3d7db
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211212.044901-139-runner.jar
+    md5: 6311adaa59624665cdb40ca39fa073cf
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index edd16b6d541..70146aeb43f 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211210.031806-203-runner.jar
-    md5: d6ba75e484ab588ab6a7342d23d15857
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211212.044234-207-runner.jar
+    md5: 849db9c4a427023aa6ae8845f9d29b6b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 31d2d7f0659..fa8b2979d67 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211210.032315-184-runner.jar
-    md5: 503183eeaa62bd4bc04394a96dcb90a6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211212.044713-188-runner.jar
+    md5: b8da47c103598482df9e4310e6173ff0
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index e82f8bbf4d4..ec62830860a 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211210.032042-203-runner.jar
-    md5: c4ff3c87e5ac2355d17d3e6278db4a30
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211212.044457-207-runner.jar
+    md5: 66f4444a203eb49eb609ef936dd2cc49
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 760cb6d8ded..e1d24dee9ee 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211210.035955-322-runner.jar
-    md5: dc9b2b13bf997e07d2ddfc9a76a9e892
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211212.052143-326-runner.jar
+    md5: dbab0d7532d6ee6c6bda9409ff85408e
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 66e25d5fd30..0817b933a05 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211210.040257-322-runner.jar
-    md5: 62642385e4a367fa67f1522ac5c8146d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211212.052453-326-runner.jar
+    md5: 91e671ff0911fb9230c010dbcde63100
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 78f557abda9..6e1aedce02f 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211210.042820-237-runner.jar
-    md5: 6ad7c7179c999d9eb381f17826dd421f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211212.055017-241-runner.jar
+    md5: 147d87a79308559abf095dc8a4b87be9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 8656aca40c1..7815a64e7e4 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211210.043031-68-runner.jar
-    md5: 16c3d437c7c2c4069938be60cd295ef9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211212.055218-72-runner.jar
+    md5: bca3e6e754751a874babb3a1de2b10ba
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 11184a87df5..053d63b944f 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211210.042926-240-runner.jar
-    md5: 8cf71ead3a3c4745fd5dbe3090493078
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211212.055117-244-runner.jar
+    md5: 56b50c1fbb5af66af0801b84e8ac0106
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 0ebd82cdbda..a094478e7f6 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211210.040217-320-runner.jar
-    md5: 9107eb45dbd92b19c7a47a776bfc0c40
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211212.052411-324-runner.jar
+    md5: 11d119c3bd26a11571c345b74e4db808
 
 execute:
   - script: configure

From 4e41c694eb72be00e234d6ff105ff5842cdb2e35 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:28:07 -0300
Subject: [PATCH 402/709] Updated Maven artifacts (#965)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 3d99e587e69..ab98053d57d 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211212.050313-140-runner.jar
-    md5: 52982dd0eed6792a36ec2cc3ba358adb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211213.072503-142-runner.jar
+    md5: af381a3bef81077df22f36f2d54e1e41
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 0cb76017668..ab5e4fa790f 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211212.045427-328-runner.jar
-    md5: 199d96813fe4c3378334d9e7938e3847
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211213.071436-330-runner.jar
+    md5: 8aa310620d6956e590d43d4c88f3671a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 8634a6a0534..feebb78dbd8 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211212.045744-330-runner.jar
-    md5: ed9b5f03056d1041dd80cd489399a8cf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211213.071830-332-runner.jar
+    md5: 037026efdfa832af9c2d3a52cf357886
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 3e0aa9a5930..00b75795c23 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211212.050044-174-runner.jar
-    md5: 9f668190b3dc1b9601fa8278412a32f8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211213.072202-176-runner.jar
+    md5: 6b482959fe43325297234b78f93afa7b
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 7b711b73011..fdfd94145f9 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211212.054537-334-runner.jar
-    md5: a9e45ec276f6d66f92bd6a1c45837496
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211213.082801-336-runner.jar
+    md5: 1e5bcd299572ca39d43fe00c7719bad5
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211212.054407-329-runner.jar
-    md5: 38411a6792eaa8264ca0247f64987c5e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211213.082537-331-runner.jar
+    md5: a154382e90d62085332359bb43948a54
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index f253b80ed91..403c7a0608a 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211212.055511-275-runner.jar
-    md5: 4cbb3f956ba39c5c1c7dd2cbaccdebe8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211213.084501-277-runner.jar
+    md5: a4a35d27f8993f493a44a6d2bdfc7760
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 8bddc22868f..c2d26761a68 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211212.044901-139-runner.jar
-    md5: 6311adaa59624665cdb40ca39fa073cf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211213.070834-141-runner.jar
+    md5: 8613774498074a96998c355da6444271
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 70146aeb43f..c76fafd258d 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211212.044234-207-runner.jar
-    md5: 849db9c4a427023aa6ae8845f9d29b6b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211213.070047-209-runner.jar
+    md5: 18d23936549a1d53fe9433d12cc80e87
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index fa8b2979d67..bf109136cbe 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211212.044713-188-runner.jar
-    md5: b8da47c103598482df9e4310e6173ff0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211213.070633-190-runner.jar
+    md5: 7e19744978cde1a854488045a48e7cec
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index ec62830860a..640cfe1b194 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211212.044457-207-runner.jar
-    md5: 66f4444a203eb49eb609ef936dd2cc49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211213.070348-209-runner.jar
+    md5: 58b5791c215766e56dfb8ef36dffcf0e
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index e1d24dee9ee..7e58f29302f 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211212.052143-326-runner.jar
-    md5: dbab0d7532d6ee6c6bda9409ff85408e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211213.075821-328-runner.jar
+    md5: f46e8a247d7611a935d66d131ebdb67f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 0817b933a05..8539ae67520 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211212.052453-326-runner.jar
-    md5: 91e671ff0911fb9230c010dbcde63100
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211213.080242-328-runner.jar
+    md5: 4025fca03380ed3afd47b8c568540486
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 6e1aedce02f..be38bf2492d 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211212.055017-241-runner.jar
-    md5: 147d87a79308559abf095dc8a4b87be9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211213.083637-243-runner.jar
+    md5: 81d5435cef668ed1ade83cdc367702f1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 7815a64e7e4..f40965bcbfe 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211212.055218-72-runner.jar
-    md5: bca3e6e754751a874babb3a1de2b10ba
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211213.084011-74-runner.jar
+    md5: 3e7051ed849bf75f5354bbba0aa18ab6
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 053d63b944f..7a87f6cd743 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211212.055117-244-runner.jar
-    md5: 56b50c1fbb5af66af0801b84e8ac0106
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211213.083822-246-runner.jar
+    md5: e44e319800f1beebf4c7967cf4a4d4ec
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index a094478e7f6..b069999264b 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211212.052411-324-runner.jar
-    md5: 11d119c3bd26a11571c345b74e4db808
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211213.080157-326-runner.jar
+    md5: dd2e25430caf14987104368be351b841
 
 execute:
   - script: configure

From c8b2137df1538576ca263d27818cdc253d0bd4d1 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 15 Dec 2021 15:44:47 +0100
Subject: [PATCH 403/709] BXMSPROD-1577 Improved result message for nightlies
 (#955)

---
 .ci/jenkins/Jenkinsfile.deploy  | 135 +++++++++++++++++---------------
 .ci/jenkins/Jenkinsfile.promote |   8 +-
 2 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index a8da684505f..f3e3adee162 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -5,7 +5,8 @@ deployProperties = [ : ]
 commitDone = false
 
 BUILT_IMAGES = []
-FAILED_IMAGES = []
+BUILD_FAILED_IMAGES = []
+TEST_FAILED_IMAGES = []
 
 pipeline {
     agent {
@@ -184,33 +185,41 @@ pipeline {
                 }
             }
         }
-        stage('Build Images') {
+        stage('Build & Test Images') {
             steps {
                 script {
-                    // Init workspaces before build
-                    getImages().each { image -> initWorkspace(image) }
-                    // Build images
-                    launchParallelForEachImage('Build', { img -> buildImage(img) })
-                }
-            }
-            post {
-                always {
-                    script {
-                        cleanWorkspaces()
+                    parallelStages = [:]
+                    getImages().each { image -> 
+                        initWorkspace(image)
+                        String workspacePath = getWorkspacePath(image)
+                        parallelStages["Build&Test ${image}"] = { 
+                            stage("Build ${image}") {
+                                try {
+                                    dir(workspacePath) {
+                                        buildImage(image)
+                                    }
+                                    registerBuiltImage(image)
+                                } catch (err) {
+                                    registerBuildFailedImage(image)
+                                    util.archiveConsoleLog(image)
+                                    throw err
+                                }
+                            }
+                            stage("Test ${image}") {
+                                dir(workspacePath) {
+                                    try {
+                                        testImage(image)
+                                    } catch (err) {
+                                        registerTestFailedImage(image)
+                                    } finally {
+                                        junit testResults: "target/test/results/*.xml", allowEmptyResults: true
+                                        archiveArtifacts artifacts: "target/test/results/*.xml", allowEmptyArchive: true
+                                    }
+                                }
+                            }
+                        }
                     }
-                }
-            }
-        }
-        stage('Test Images') {
-            when {
-                expression { return !params.SKIP_TESTS }
-            }
-            steps {
-                script {
-                    // Init workspaces before test
-                    getImages().each { image -> initWorkspace(image) }
-                    // Test images
-                    launchParallelForEachImage('Test', { img -> testImage(img) })
+                    parallel parallelStages
                 }
             }
             post {
@@ -278,9 +287,17 @@ pipeline {
                         getBuiltImages().each {
                             prBody += "- ${it}\n"
                         }
-                        if (getFailedImages()){
-                            prBody += '\nFailed images:\n'
-                            getFailedImages().each {
+                        if (getBuildFailedImages()){
+                            prBody += '\nBuild failures on those images:\n'
+                            getBuildFailedImages().each {
+                                prBody += "- ${it}\n"
+                            }
+                        } else {
+                            prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
+                        }
+                        if (getTestFailedImages()){
+                            prBody += '\nTest failures on those images:\n'
+                            getTestFailedImages().each {
                                 prBody += "- ${it}\n"
                             }
                         } else {
@@ -327,7 +344,7 @@ pipeline {
 
 void sendUnsuccessfulNotification() {
     if (params.SEND_NOTIFICATION) {
-        sendNotification("**Deploy job** #${BUILD_NUMBER} was: ${currentBuild.currentResult}\nPlease look here: ${BUILD_URL}")
+        mailer.sendMarkdownTestSummaryNotification('Deploy', getNotificationSubject(), [env.KOGITO_CI_EMAIL_TO])
     } else {
         echo 'No notification sent per configuration'
     }
@@ -335,10 +352,14 @@ void sendUnsuccessfulNotification() {
 
 void sendNotification(String body) {
     emailext body: body,
-        subject: "[${getBuildBranch()}] Kogito Images",
+        subject: getNotificationSubject(),
         to: env.KOGITO_CI_EMAIL_TO
 }
 
+String getNotificationSubject() {
+    return "[${getBuildBranch()}] Kogito Images"
+}
+
 void checkoutRepo() {
     deleteDir()
     checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
@@ -362,49 +383,29 @@ void cleanImages() {
     sh "${env.CONTAINER_ENGINE} rmi -f \$(${env.CONTAINER_ENGINE} images -q) || date"
 }
 
-void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
-    parallelStages = [:]
-    getImages().each { image ->
-        parallelStages["${stageNamePrefix} ${image}"] = {
-            dir(getWorkspacePath(image)) {
-                executeOnImage(image)
-            }
-        }
-    }
-    parallel parallelStages
+void buildImage(String imageName) {
+    sh "make build-image image_name=${imageName} ignore_test=true cekit_option='--work-dir .'"
 }
 
-void buildImage(image) {
-    try {
-        sh "make build-image image_name=${image} ignore_test=true cekit_option='--work-dir .'"
-        registerBuiltImage(image)
-    } catch (err) {
-        registerFailedImage(image)
-        unstable("${image} build failed")
-    }
+void testImage(String imageName) {
+    sh "make build-image image_name=${imageName} ignore_build=true cekit_option='--work-dir .'"
 }
 
-void testImage(image) {
-    try {
-        sh "make build-image image_name=${image} ignore_build=true cekit_option='--work-dir .'"
-    } catch (err) {
-        removeBuiltImage (image)
-        registerFailedImage(image)
-        unstable("${image} testing failed")
-    } finally {
-        junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
+void registerBuiltImage(String imageName) {
+    lock("${BUILD_URL} build success") {
+        BUILT_IMAGES.add(imageName)
     }
 }
 
-void registerBuiltImage(String imageName) {
-    lock("${BUILD_URL}") {
-        BUILT_IMAGES.add(imageName)
+void registerBuildFailedImage(String imageName) {
+    lock("${BUILD_URL} build failed") {
+        BUILD_FAILED_IMAGES.add(imageName)
     }
 }
 
-void registerFailedImage(String imageName) {
-    lock("${BUILD_URL}") {
-        FAILED_IMAGES.add(imageName)
+void registerTestFailedImage(String imageName) {
+    lock("${BUILD_URL} test failed") {
+        TEST_FAILED_IMAGES.add(imageName)
     }
 }
 
@@ -418,8 +419,12 @@ List getBuiltImages() {
     return BUILT_IMAGES
 }
 
-List getFailedImages() {
-    return FAILED_IMAGES
+List getBuildFailedImages() {
+    return BUILD_FAILED_IMAGES
+}
+
+List getTestFailedImages() {
+    return TEST_FAILED_IMAGES
 }
 
 void tagImages() {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 2bea6cb2333..e2c78d015f5 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -202,7 +202,7 @@ pipeline {
 
 void sendUnsuccessfulNotification() {
     if (params.SEND_NOTIFICATION) {
-        sendNotification("**Promote job** #${BUILD_NUMBER} was: ${currentBuild.currentResult}\nPlease look here: ${BUILD_URL}")
+        mailer.sendMarkdownTestSummaryNotification('Promote', getNotificationSubject(), [env.KOGITO_CI_EMAIL_TO])
     } else {
         echo 'No notification sent per configuration'
     }
@@ -210,10 +210,14 @@ void sendUnsuccessfulNotification() {
 
 void sendNotification(String body, String subjectProject = 'Kogito Images') {
     emailext body: body,
-        subject: "[${getBuildBranch()}] ${subjectProject}",
+        subject: getNotificationSubject()
         to: env.KOGITO_CI_EMAIL_TO
 }
 
+String getNotificationSubject() {
+    return "[${getBuildBranch()}] Kogito Images"
+}
+
 void installGitHubReleaseCLI() {
     sh 'go get github.com/github-release/github-release'
 }

From bfdfca7d7ff785383f4da216adf05bbbba9e5ff6 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 15 Dec 2021 12:14:17 -0300
Subject: [PATCH 404/709] Updated Maven artifacts (#968)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index ab98053d57d..c035413bc66 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211213.072503-142-runner.jar
-    md5: af381a3bef81077df22f36f2d54e1e41
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211215.045810-144-runner.jar
+    md5: 4c6595032c7bebadbc1197d5cb74d012
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index ab5e4fa790f..a9ea9c06fc2 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211213.071436-330-runner.jar
-    md5: 8aa310620d6956e590d43d4c88f3671a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211215.044846-332-runner.jar
+    md5: 4c7c61854bbf54cb3511b68351ef613b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index feebb78dbd8..ae16de35c4a 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211213.071830-332-runner.jar
-    md5: 037026efdfa832af9c2d3a52cf357886
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211215.045215-334-runner.jar
+    md5: dc7c7c7d172e47afbfd80dac16931bd0
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 00b75795c23..829c704c467 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211213.072202-176-runner.jar
-    md5: 6b482959fe43325297234b78f93afa7b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211215.045528-178-runner.jar
+    md5: a1f76fcb3305c5704e48599177c5f1d9
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index fdfd94145f9..1c186733b91 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211213.082801-336-runner.jar
-    md5: 1e5bcd299572ca39d43fe00c7719bad5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211215.054054-338-runner.jar
+    md5: 95cf0fb6db50f21b24fce4311e576f10
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211213.082537-331-runner.jar
-    md5: a154382e90d62085332359bb43948a54
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211215.053934-333-runner.jar
+    md5: 43c8a6f9465776e593dc84ec8e8fa200
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 403c7a0608a..33a338a04fb 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211213.084501-277-runner.jar
-    md5: a4a35d27f8993f493a44a6d2bdfc7760
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211215.055018-279-runner.jar
+    md5: a750c0c5065e97f0aee9466797b039d9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index c2d26761a68..a787252ecb8 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211213.070834-141-runner.jar
-    md5: 8613774498074a96998c355da6444271
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211215.044324-143-runner.jar
+    md5: 18b988d53822d0a9f4ca1e5dea34ddb5
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index c76fafd258d..857f9952bd0 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211213.070047-209-runner.jar
-    md5: 18d23936549a1d53fe9433d12cc80e87
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211215.043656-211-runner.jar
+    md5: 5f0fd30ce85961367806ca9041234568
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index bf109136cbe..205abfc08b6 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211213.070633-190-runner.jar
-    md5: 7e19744978cde1a854488045a48e7cec
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211215.044138-192-runner.jar
+    md5: 2148082162460aa824d1e0f1c020dc29
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 640cfe1b194..f54dbd32e59 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211213.070348-209-runner.jar
-    md5: 58b5791c215766e56dfb8ef36dffcf0e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211215.043919-211-runner.jar
+    md5: 1d2301b423efda1b99e7b566f4264fc6
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 7e58f29302f..106e656eb72 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211213.075821-328-runner.jar
-    md5: f46e8a247d7611a935d66d131ebdb67f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211215.051731-330-runner.jar
+    md5: cec477f2343a5d01b969c047d09850d2
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 8539ae67520..30e34447f98 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211213.080242-328-runner.jar
-    md5: 4025fca03380ed3afd47b8c568540486
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211215.052026-330-runner.jar
+    md5: 9c841e5f3ff43def5c9dc0532a7beecb
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index be38bf2492d..459cc3723db 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211213.083637-243-runner.jar
-    md5: 81d5435cef668ed1ade83cdc367702f1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211215.054525-245-runner.jar
+    md5: 267604776d4eb3a5a18d4d24cc2b29ae
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index f40965bcbfe..85ea545337f 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211213.084011-74-runner.jar
-    md5: 3e7051ed849bf75f5354bbba0aa18ab6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211215.054723-76-runner.jar
+    md5: c07fc7d7ec8ea57ac4519090540a95fa
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 7a87f6cd743..f2476d9b52e 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211213.083822-246-runner.jar
-    md5: e44e319800f1beebf4c7967cf4a4d4ec
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211215.054623-248-runner.jar
+    md5: 427df42fd67186cef61eb00cfcbc064f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index b069999264b..b08cbe4a84c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211213.080157-326-runner.jar
-    md5: dd2e25430caf14987104368be351b841
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211215.051949-328-runner.jar
+    md5: f487df8c8b96cf22930ea3303a48dc00
 
 execute:
   - script: configure

From 02d1c02fb7395ba5cd6e61d65640025bff060445 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 7 Jan 2022 10:47:07 +0100
Subject: [PATCH 405/709] KOGITO-6503 Update kogito-examples paths (#1012)

* KOGITO-6503 Update kogito-examples paths

* update

* correction
---
 .ci/jenkins/Jenkinsfile                       |  1 +
 README.md                                     | 17 ++++-----
 kogito-runtime-jvm-overrides.yaml             |  2 +-
 kogito-runtime-native-overrides.yaml          |  2 +-
 ...kogito-runtime-native-rhel8-overrides.yaml |  2 +-
 tests/features/kogito-builder-native.feature  | 12 +++---
 tests/features/kogito-builder.feature         |  6 +--
 .../kogito-common-builder-jvm.feature         | 38 +++++++++----------
 .../kogito-common-runtime-jvm.feature         |  8 ++--
 .../kogito-common-runtime-native.feature      |  2 +-
 tests/test-apps/clone-repo.sh                 | 14 +++----
 11 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index ae58edfb7be..148ae89992c 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -114,6 +114,7 @@ void testImage(image) {
         sh "make build-image image_name=${image} ignore_build=true cekit_option='--work-dir .'"
     } finally {
         junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
+        archiveArtifacts artifacts: "target/test/results/*.xml"
     }
 }
 
diff --git a/README.md b/README.md
index 1c4bf3d0800..8ec69f0accc 100644
--- a/README.md
+++ b/README.md
@@ -185,7 +185,7 @@ repository: the *rules-quarkus-helloworld* example, with native compilation disa
 $ s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus \
-    --context-dir rules-quarkus-helloworld \
+    --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
     quay.io/kiegroup/kogito-builder:latest \
     rules-example:1.0
 ...
@@ -231,9 +231,8 @@ repository: the *process-springboot-example*.
 ```bash
 $ s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
-    --context-dir \
+    --context-dir kogito-springboot-examples/process-springboot-example \
     -e RUNTIME_TYPE=springboot \
-    process-springboot-example \
     quay.io/kiegroup/kogito-builder:latest \
     springboot-example:1.0
 ```
@@ -270,7 +269,7 @@ Let's start 2 builds with the incremental option enabled and compare the time sp
 $ time s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus
-    --context-dir rules-quarkus-helloworld \
+    --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
     quay.io/kiegroup/kogito-builder:latest \
     rules-example-incremental:1.0 \
     --incremental \    
@@ -288,7 +287,7 @@ And now, let's run it again.
 $ time s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus
-    --context-dir rules-quarkus-helloworld \
+    --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
     quay.io/kiegroup/kogito-builder:latest \
     rules-example-incremental:1.0 \
     --incremental \
@@ -316,7 +315,7 @@ To make it possible we just need to set the **MAVEN_MIRROR_URL** environment var
 $ time s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus
-    --context-dir rules-quarkus-helloworld \
+    --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
     quay.io/kiegroup/kogito-builder:latest \
     rules-example-incremental-1 \
     --incremental \
@@ -423,7 +422,7 @@ docker run -it quay.io/kiegroup/kogito-runtime-jvm:latest /home/kogito/kogito-ap
 In the next few lines let's take a look on how this image can be used to receive an already built UberJAR. 
 To configure Quarkus to generate an UberJAR please follow the instructions described [here](https://quarkus.io/guides/maven-tooling#configuration-reference)
 
-For this example let's use the [process-quarkus-example](https://github.com/kiegroup/kogito-examples/tree/stable/process-quarkus-example).
+For this example let's use the [process-quarkus-example](https://github.com/kiegroup/kogito-examples/tree/stable/kogito-quarkus-examples/process-quarkus-example).
 Once you have checked out the example on your local machine follow the steps below:
 
 **Example with UberJAR**
@@ -831,7 +830,7 @@ rights you can deploy it into the **openshift** namespace, otherwise, deploy it
 To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/kiegroup/kogito-images/main/kogito-imagestream.yaml).
 It points to the latest released version.
 
-Let's use the *rules-quarkus-helloworld* from [Kogito Examples](https://github.com/kiegroup/kogito-examples).
+Let's use the *kogito-quarkus-examples/rules-quarkus-helloworld* from [Kogito Examples](https://github.com/kiegroup/kogito-examples).
 
 ```bash
 # creating a new namespace
@@ -864,7 +863,7 @@ imagestream.image.openshift.io/kogito-management-console created
 
 # performing a new build
 $ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-builder:latest \ 
-    https://github.com/kiegroup/kogito-examples.git#main --context-dir=rules-quarkus-helloworld \
+    https://github.com/kiegroup/kogito-examples.git#main --context-dir=kogito-quarkus-examples/rules-quarkus-helloworld \
     --strategy=source --env NATIVE=false 
 --> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-builder" under tag "latest" for "kogito-builder:latest"
 
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index ab337588ecf..03ee9a7857d 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -44,6 +44,6 @@ modules:
   - name: org.kie.kogito.security.custom.truststores
 
 ## s2i build . quay.io/kiegroup/kogito-builder:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
+## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-overrides.yaml
index 2b8dd46acc0..7462c22af7d 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -40,7 +40,7 @@ modules:
   - name: org.kie.kogito.runtime.native
 
 ## s2i build . quay.io/kiegroup/kogito-builder:latest kogitotest:10.0 -e RUNTIME_TYPE=quarkus -e NATIVE=true --runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
+## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
 
diff --git a/rhpam-kogito-runtime-native-rhel8-overrides.yaml b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
index b1f8e43f07a..c4babfac694 100644
--- a/rhpam-kogito-runtime-native-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
@@ -55,7 +55,7 @@ osbs:
     branch: rhba-7-rhel-8
 
 ## s2i build . -e BINARY=true registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8:latest
-## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/rules-quarkus-helloworld
+## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
 
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index e6e21bfdb61..fe21d6bee3e 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -15,7 +15,7 @@ Feature: kogito-builder image native build tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.0
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -33,7 +33,7 @@ Feature: kogito-builder image native build tests
     And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
       | variable | value          |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -53,7 +53,7 @@ Feature: kogito-builder image native build tests
     And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -71,7 +71,7 @@ Feature: kogito-builder image native build tests
     And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable          | value         |
       | RUNTIME_TYPE      | quarkus       |
       | NATIVE            | true          |
@@ -84,7 +84,7 @@ Feature: kogito-builder image native build tests
      And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Perform a incremental s2i build for native test
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -102,7 +102,7 @@ Feature: kogito-builder image native build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario:Perform a second incremental s2i build for native scenario, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value      |
       | RUNTIME_TYPE | quarkus    |
       | NATIVE       | true       |
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 9baf7a5296d..07f2b2051bf 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -23,7 +23,7 @@ Feature: kogito-builder image tests
     And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | NATIVE            | false         |
       | RUNTIME_TYPE      | quarkus       |
@@ -33,7 +33,7 @@ Feature: kogito-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
       | RUNTIME_TYPE      | springboot    |
@@ -90,7 +90,7 @@ Feature: kogito-builder image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
-    Given s2i build /tmp/kogito-examples from serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value                 |
       | RUNTIME_TYPE        | quarkus               |
       | NATIVE              | false                 |
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index 9321e0653f3..c5e6cd8fbfa 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -8,7 +8,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
       | variable     | value   |
       | NATIVE       | false   |
       | RUNTIME_TYPE | quarkus |
@@ -26,7 +26,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
       | variable     | value   |
       | NATIVE       | false   |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value                     |
       | NATIVE       | false                     |
       | RUNTIME_TYPE | quarkus                   |
@@ -62,7 +62,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -79,11 +79,11 @@ Feature: kogito-builder image JVM build tests
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value                            |
-      | RUNTIME_TYPE      | quarkus                          |
-      | NATIVE            | false                            |
-      | ARTIFACT_DIR      | rules-quarkus-helloworld/target  |
-      | MAVEN_ARGS_APPEND | -pl rules-quarkus-helloworld -am |
+      | variable          | value                                                    |
+      | RUNTIME_TYPE      | quarkus                                                  |
+      | NATIVE            | false                                                    |
+      | ARTIFACT_DIR      | kogito-quarkus-examples/rules-quarkus-helloworld/target  |
+      | MAVEN_ARGS_APPEND | -pl kogito-quarkus-examples/rules-quarkus-helloworld -am                         |
     Then check that page is served
       | property        | value                 |
       | port            | 8080                  |
@@ -96,7 +96,7 @@ Feature: kogito-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Perform a incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -114,7 +114,7 @@ Feature: kogito-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -135,7 +135,7 @@ Feature: kogito-builder image JVM build tests
 #### SpringBoot Scenarios
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-      Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
         | variable     | value        |
         | RUNTIME_TYPE | springboot   |
         | JAVA_OPTIONS | -Ddebug=true |
@@ -153,7 +153,7 @@ Feature: kogito-builder image JVM build tests
       And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | RUNTIME_TYPE        | springboot   |
@@ -171,7 +171,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -192,8 +192,8 @@ Feature: kogito-builder image JVM build tests
       | variable          | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | RUNTIME_TYPE      | springboot                         |
-      | ARTIFACT_DIR      | process-springboot-example/target  |
-      | MAVEN_ARGS_APPEND | -pl process-springboot-example -am |
+      | ARTIFACT_DIR      | kogito-springboot-examples/process-springboot-example/target  |
+      | MAVEN_ARGS_APPEND | -pl kogito-springboot-examples/process-springboot-example -am |
     Then check that page is served
       | property             | value                                                                         |
       | port                 | 8080                                                                          |
@@ -208,7 +208,7 @@ Feature: kogito-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Perform a incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -225,7 +225,7 @@ Feature: kogito-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-springboot-example with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -233,7 +233,7 @@ Feature: kogito-builder image JVM build tests
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                           |
       | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
       | RUNTIME_TYPE      | quarkus                         |
diff --git a/tests/features/kogito-common-runtime-jvm.feature b/tests/features/kogito-common-runtime-jvm.feature
index d8778530e0e..be848fbb020 100644
--- a/tests/features/kogito-common-runtime-jvm.feature
+++ b/tests/features/kogito-common-runtime-jvm.feature
@@ -8,7 +8,7 @@ Feature: kogito-runtime-jvm feature.
     And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
+    Given s2i build /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld from target
       | variable            | value                     |
       | RUNTIME_TYPE        | quarkus                   |
       | NATIVE              | false                     |
@@ -25,7 +25,7 @@ Feature: kogito-runtime-jvm feature.
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port with quarkus
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld from target
+    Given s2i build /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld from target
       | variable            | value                     |
       | RUNTIME_TYPE        | quarkus                   |
       | NATIVE              | false                     |
@@ -43,7 +43,7 @@ Feature: kogito-runtime-jvm feature.
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with springboot
-    Given s2i build /tmp/kogito-examples/process-springboot-example from target
+    Given s2i build /tmp/kogito-examples/kogito-springboot-examples/process-springboot-example from target
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | RUNTIME_TYPE        | springboot   |
@@ -61,7 +61,7 @@ Feature: kogito-runtime-jvm feature.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port with springboot
-    Given s2i build /tmp/kogito-examples/process-springboot-example from target
+    Given s2i build /tmp/kogito-examples/kogito-springboot-examples/process-springboot-example from target
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | BINARY_BUILD        | true         |
diff --git a/tests/features/kogito-common-runtime-native.feature b/tests/features/kogito-common-runtime-native.feature
index fc3880bc187..221eaf001a4 100644
--- a/tests/features/kogito-common-runtime-native.feature
+++ b/tests/features/kogito-common-runtime-native.feature
@@ -3,7 +3,7 @@
 Feature: Kogito-runtime-native feature.
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus native
-    Given s2i build /tmp/kogito-examples/rules-quarkus-helloworld-native/ from target
+    Given s2i build /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/ from target
       | variable            | value                     |
       | NATIVE              | true                      |
       | BINARY              | true                      |
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index a6d91028832..402c81892fc 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -41,25 +41,25 @@ git fetch origin --tags
 git checkout nightly-main
 
 # make a new copy of rules-quarkus-helloworld for native tests
-cp -rv  /tmp/kogito-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/rules-quarkus-helloworld-native/
+cp -rv  /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/
 
 # generating the app binaries to test the binary build
-mvn -f rules-quarkus-helloworld clean package ${MAVEN_OPTIONS}
-mvn -f process-springboot-example clean package ${MAVEN_OPTIONS}
+mvn -f kogito-quarkus-examples/rules-quarkus-helloworld clean package ${MAVEN_OPTIONS}
+mvn -f kogito-springboot-examples/process-springboot-example clean package ${MAVEN_OPTIONS}
 
 if [ "$NATIVE_BUILD" = 'true' ]; then
-    mvn -f rules-quarkus-helloworld-native -Pnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
+    mvn -f kogito-quarkus-examples/rules-quarkus-helloworld-native -Pnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
 fi
 
 # preparing directory to run kogito maven archetypes tests
 mkdir -pv /tmp/kogito-examples/dmn-example
-cp /tmp/kogito-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-example/
+cp /tmp/kogito-examples/kogito-quarkus-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-example/
 
 # by adding the application.properties file telling app to start on
 # port 10000, the purpose of this tests is make sure that the images
 # will ensure the use of the port 8080.
-cp "${SCRIPT_DIR}"/application.properties /tmp/kogito-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
-(echo ""; echo "server.port=10000") >> /tmp/kogito-examples/process-springboot-example/src/main/resources/application.properties
+cp "${SCRIPT_DIR}"/application.properties /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
+(echo ""; echo "server.port=10000") >> /tmp/kogito-examples/kogito-springboot-examples/process-springboot-example/src/main/resources/application.properties
 
 git add --all  :/
 git commit -am "test"

From f8f039aff4c5fd28ca524d73ed221087eb3759ea Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 7 Jan 2022 11:53:35 -0300
Subject: [PATCH 406/709] Updated Maven artifacts (#1003)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index c035413bc66..a8621273c2b 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20211215.045810-144-runner.jar
-    md5: 4c6595032c7bebadbc1197d5cb74d012
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220102.040120-159-runner.jar
+    md5: 5383cdc40c2a55b2813b1119ae333801
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index a9ea9c06fc2..fbbe7d26cfd 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20211215.044846-332-runner.jar
-    md5: 4c7c61854bbf54cb3511b68351ef613b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220102.035124-347-runner.jar
+    md5: 3a481333bbd48b0561b865fc99626f88
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index ae16de35c4a..1daf0060c99 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20211215.045215-334-runner.jar
-    md5: dc7c7c7d172e47afbfd80dac16931bd0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220102.035500-349-runner.jar
+    md5: 7b98f50a33610e2a3421dcb8f2f0fd92
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 829c704c467..79ee7076e01 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20211215.045528-178-runner.jar
-    md5: a1f76fcb3305c5704e48599177c5f1d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220102.035823-193-runner.jar
+    md5: 42e0739bbc50c9017ada5b2bcb07f89f
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 1c186733b91..ee6e563b8e6 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20211215.054054-338-runner.jar
-    md5: 95cf0fb6db50f21b24fce4311e576f10
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220102.044853-353-runner.jar
+    md5: 52954f46dcaf93b48b3020891b910dcc
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20211215.053934-333-runner.jar
-    md5: 43c8a6f9465776e593dc84ec8e8fa200
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220102.044730-348-runner.jar
+    md5: f6749db19ce1eeef3ae73f516cee2a85
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 33a338a04fb..e6a28c02669 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20211215.055018-279-runner.jar
-    md5: a750c0c5065e97f0aee9466797b039d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220102.045852-294-runner.jar
+    md5: e8ef9193ee9195e16db5a10b9c46bb91
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index a787252ecb8..93e3713c171 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20211215.044324-143-runner.jar
-    md5: 18b988d53822d0a9f4ca1e5dea34ddb5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220102.034543-158-runner.jar
+    md5: af544fa186c9c57075002e04b6376bd2
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 857f9952bd0..7eb1c007b9c 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20211215.043656-211-runner.jar
-    md5: 5f0fd30ce85961367806ca9041234568
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220102.033753-226-runner.jar
+    md5: b10dfd28bce6e82fc9259a14f217f041
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 205abfc08b6..47af4a48612 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20211215.044138-192-runner.jar
-    md5: 2148082162460aa824d1e0f1c020dc29
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220102.034335-207-runner.jar
+    md5: 52c51ea6d6a449f57063a73c14fcc632
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index f54dbd32e59..a48cf1f0011 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20211215.043919-211-runner.jar
-    md5: 1d2301b423efda1b99e7b566f4264fc6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220102.034040-226-runner.jar
+    md5: 9ad403891dc1f9bfd10a73613651fd08
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 106e656eb72..775202edba6 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20211215.051731-330-runner.jar
-    md5: cec477f2343a5d01b969c047d09850d2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220102.042423-344-runner.jar
+    md5: 62e787af6f527232400614e51383ffc7
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 30e34447f98..a49fa30fbf0 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20211215.052026-330-runner.jar
-    md5: 9c841e5f3ff43def5c9dc0532a7beecb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220102.042731-344-runner.jar
+    md5: 71273ffbff1a27a52a77d03ea7bace8f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 459cc3723db..c3bf6082564 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20211215.054525-245-runner.jar
-    md5: 267604776d4eb3a5a18d4d24cc2b29ae
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220102.045341-260-runner.jar
+    md5: 20c25c9128358f13e2648e544dc7705b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 85ea545337f..85bd31405b9 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20211215.054723-76-runner.jar
-    md5: c07fc7d7ec8ea57ac4519090540a95fa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220102.045551-91-runner.jar
+    md5: 6b5548f3adf731b2b36806640c0298b4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index f2476d9b52e..567c66a5ae3 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20211215.054623-248-runner.jar
-    md5: 427df42fd67186cef61eb00cfcbc064f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220102.045445-263-runner.jar
+    md5: 8986f4cc3ac121ae101c23542d69fe3e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index b08cbe4a84c..a0b9643fdca 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20211215.051949-328-runner.jar
-    md5: f487df8c8b96cf22930ea3303a48dc00
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220102.042652-342-runner.jar
+    md5: 537b3d4f8ab1cd126161ef45b3aae775
 
 execute:
   - script: configure

From b91a8059c7542cd46f72f80ae0b4eda64c5fbb1d Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Tue, 11 Jan 2022 16:39:46 +0100
Subject: [PATCH 407/709] Allow maven mirror for archetype tests (#1021)
 (#1025)

* Allow changing Maven Mirror for archetype tests

* update

* update
---
 scripts/common.py       | 9 +++++++++
 scripts/update-tests.py | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/scripts/common.py b/scripts/common.py
index c4fbaafd2d9..b72cb165da9 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -299,6 +299,15 @@ def update_maven_repo_in_behave_tests(repo_url, replaceJbossRepository):
                                                                                                            repo_url)
     update_in_behave_tests(pattern, replacement)
 
+def update_maven_mirror_url_in_quarkus_plugin_behave_tests(repo_url):
+    """
+    Update maven repository into behave tests
+    :param repo_url: Maven repository url
+    """
+    print("Set maven repo {} in quarkus plugin behave tests".format(repo_url))
+    pattern = re.compile('(Kogito Maven archetype.*(?<!springboot)\r?\n\s*Given.*\r?\n\s*)\|\s*variable[\s]*\|[\s]*value[\s]*\|')
+    replacement = "\g<1>| variable | value |\n      | {} | {} |\n      | MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE | true |\n      | DEBUG | true |".format("MAVEN_MIRROR_URL", repo_url)
+    update_in_behave_tests(pattern, replacement)
 
 def ignore_maven_self_signed_certificate_in_behave_tests():
     """
diff --git a/scripts/update-tests.py b/scripts/update-tests.py
index 1283b9aa960..22d903838e4 100644
--- a/scripts/update-tests.py
+++ b/scripts/update-tests.py
@@ -20,6 +20,7 @@
     parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False, action='store_true', help='If set to true will relax the SSL for user-generated self-signed certificates')
     parser.add_argument('--runtime-image-jvm', dest='runtime_image_jvm', help='To update the runtime jvm image name in behave tests\'s steps')
     parser.add_argument('--runtime-image-native', dest='runtime_image_native', help='To update the runtime native image name in behave tests\'s steps')
+    parser.add_argument('--archetype-maven-mirror-url', dest='archetype_maven_mirror_url', help='Maven mirror URL to be used for archetype generation')
     args = parser.parse_args()
 
     if args.repo_url:
@@ -46,3 +47,6 @@
     
     if args.runtime_image_native:
         common.update_runtime_image_in_behave_tests(args.runtime_image_native, 'native')
+    
+    if args.archetype_maven_mirror_url:
+        common.update_maven_mirror_url_in_quarkus_plugin_behave_tests(args.archetype_maven_mirror_url)

From cd54f6a02e930cf559d03eab4ee44a7f6095a83f Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 17 Jan 2022 11:36:10 -0300
Subject: [PATCH 408/709] Updated Maven artifacts (#1032)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index a8621273c2b..c847623b590 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220102.040120-159-runner.jar
-    md5: 5383cdc40c2a55b2813b1119ae333801
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220116.040711-174-runner.jar
+    md5: a245d131aa3460a68ff002dabdacfd68
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index fbbe7d26cfd..5e354dd9e3d 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220102.035124-347-runner.jar
-    md5: 3a481333bbd48b0561b865fc99626f88
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220116.035455-362-runner.jar
+    md5: afec698112781545f240e1747362c50b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 1daf0060c99..0b27f4853d2 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220102.035500-349-runner.jar
-    md5: 7b98f50a33610e2a3421dcb8f2f0fd92
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220116.035914-364-runner.jar
+    md5: 91d03719eec22840dbd7cd203f893efe
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 79ee7076e01..245003e50b0 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220102.035823-193-runner.jar
-    md5: 42e0739bbc50c9017ada5b2bcb07f89f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220116.040324-208-runner.jar
+    md5: b0b318ed1828b1802fdb9cc89b5f13e0
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index ee6e563b8e6..8ed74c9e698 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220102.044853-353-runner.jar
-    md5: 52954f46dcaf93b48b3020891b910dcc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220116.045844-368-runner.jar
+    md5: 273b0fd1c442eb2e4a756a53a7b09923
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220102.044730-348-runner.jar
-    md5: f6749db19ce1eeef3ae73f516cee2a85
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220116.045709-363-runner.jar
+    md5: 6f6bb8d5b61aaf68b4b1827f99a98722
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index e6a28c02669..739b35b35cd 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220102.045852-294-runner.jar
-    md5: e8ef9193ee9195e16db5a10b9c46bb91
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220116.051103-309-runner.jar
+    md5: 8945c7568286946c5d0357bfce50fdbb
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 93e3713c171..f7eaef49445 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220102.034543-158-runner.jar
-    md5: af544fa186c9c57075002e04b6376bd2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220116.034805-173-runner.jar
+    md5: 93346f7fb5d8edb98e9a0bc287dfc748
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 7eb1c007b9c..f11fc7562bb 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220102.033753-226-runner.jar
-    md5: b10dfd28bce6e82fc9259a14f217f041
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220116.033823-241-runner.jar
+    md5: 88f2075073ab302f140c1a4a615eab08
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 47af4a48612..febc49d2aa0 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220102.034335-207-runner.jar
-    md5: 52c51ea6d6a449f57063a73c14fcc632
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220116.034453-222-runner.jar
+    md5: 8ed2f7d321f6939af927ff23d02b54af
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index a48cf1f0011..447801f78db 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220102.034040-226-runner.jar
-    md5: 9ad403891dc1f9bfd10a73613651fd08
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220116.034140-241-runner.jar
+    md5: eda7d6b50a29960623dfacd74e23f2de
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 775202edba6..370f84fa6ab 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220102.042423-344-runner.jar
-    md5: 62e787af6f527232400614e51383ffc7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220116.043632-356-runner.jar
+    md5: 57a7c8dacbed7ccb6f12c6b9f7f7b75f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index a49fa30fbf0..355fcbb06d9 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220102.042731-344-runner.jar
-    md5: 71273ffbff1a27a52a77d03ea7bace8f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220116.044016-356-runner.jar
+    md5: 61ea0b69c303e53e282396fa49876013
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index c3bf6082564..2159e55903c 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220102.045341-260-runner.jar
-    md5: 20c25c9128358f13e2648e544dc7705b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220116.050444-275-runner.jar
+    md5: ec4be6669159346cfd8489edf36b0d1d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 85bd31405b9..997e0597acc 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220102.045551-91-runner.jar
-    md5: 6b5548f3adf731b2b36806640c0298b4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220116.050733-106-runner.jar
+    md5: 44c4a6efa8135d2bf39ce80743ef20b5
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 567c66a5ae3..ac28f96a0ab 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220102.045445-263-runner.jar
-    md5: 8986f4cc3ac121ae101c23542d69fe3e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220116.050608-278-runner.jar
+    md5: c95a594a702f3f312856eed51e736007
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index a0b9643fdca..dad782a4ddc 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220102.042652-342-runner.jar
-    md5: 537b3d4f8ab1cd126161ef45b3aae775
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220116.043932-354-runner.jar
+    md5: 21a9f4cff16b52423f44186de2673f2e
 
 execute:
   - script: configure

From aa9244c6660866b5f5008ce0734e2e3b01788ce9 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 18 Jan 2022 10:55:08 -0300
Subject: [PATCH 409/709] Updated Maven artifacts (#1035)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index c847623b590..9625609e93a 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220116.040711-174-runner.jar
-    md5: a245d131aa3460a68ff002dabdacfd68
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220118.041015-176-runner.jar
+    md5: be41f9030cfa468e4188b6fe50fc6696
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 5e354dd9e3d..13230ff87de 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220116.035455-362-runner.jar
-    md5: afec698112781545f240e1747362c50b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220118.040120-364-runner.jar
+    md5: 88dbba6e179c851867c57b330c003009
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 0b27f4853d2..1d8fc433f1c 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220116.035914-364-runner.jar
-    md5: 91d03719eec22840dbd7cd203f893efe
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220118.040428-366-runner.jar
+    md5: 3298c63f73aa1bf433211b2d7262549c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 245003e50b0..1a12822e391 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220116.040324-208-runner.jar
-    md5: b0b318ed1828b1802fdb9cc89b5f13e0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220118.040731-210-runner.jar
+    md5: 944658b0e88eed1d68b003abd0b5449b
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 8ed74c9e698..260a3041d43 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220116.045844-368-runner.jar
-    md5: 273b0fd1c442eb2e4a756a53a7b09923
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220118.045445-370-runner.jar
+    md5: 62244e0efc78b63044590f59bdbb7bed
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220116.045709-363-runner.jar
-    md5: 6f6bb8d5b61aaf68b4b1827f99a98722
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220118.045310-365-runner.jar
+    md5: da8aa59ec1fab327f5019dd41dac2243
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 739b35b35cd..fd1e985c1fa 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220116.051103-309-runner.jar
-    md5: 8945c7568286946c5d0357bfce50fdbb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220118.050700-311-runner.jar
+    md5: df61a0c273f541b64985e62355a17580
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index f7eaef49445..92bea8f83df 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220116.034805-173-runner.jar
-    md5: 93346f7fb5d8edb98e9a0bc287dfc748
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220118.035619-175-runner.jar
+    md5: 8a9cec8bfc2aba6acb11cbc7d37d728d
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index f11fc7562bb..bbbd3915b85 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220116.033823-241-runner.jar
-    md5: 88f2075073ab302f140c1a4a615eab08
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220118.034835-243-runner.jar
+    md5: bf771cf6f7b6831a88e120c400732256
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index febc49d2aa0..03f6efa9060 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220116.034453-222-runner.jar
-    md5: 8ed2f7d321f6939af927ff23d02b54af
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220118.035339-224-runner.jar
+    md5: 5dc6db71f5506a887be42f12e97a29bf
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 447801f78db..82796eab514 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220116.034140-241-runner.jar
-    md5: eda7d6b50a29960623dfacd74e23f2de
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220118.035105-243-runner.jar
+    md5: a7b95038b7af69d940be66e522f51b23
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 370f84fa6ab..fda96cce4de 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220116.043632-356-runner.jar
-    md5: 57a7c8dacbed7ccb6f12c6b9f7f7b75f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220118.043300-358-runner.jar
+    md5: 042a2c41a6df04a6b8c4f99cbb7f3e37
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 355fcbb06d9..952264187c7 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220116.044016-356-runner.jar
-    md5: 61ea0b69c303e53e282396fa49876013
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220118.043624-358-runner.jar
+    md5: 845f9bd376a8e8976f73a9bff967d311
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 2159e55903c..4addc132a5d 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220116.050444-275-runner.jar
-    md5: ec4be6669159346cfd8489edf36b0d1d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220118.050052-277-runner.jar
+    md5: ed311d293ddcbb8009ee904ebf4ebadc
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 997e0597acc..429aa36cac9 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220116.050733-106-runner.jar
-    md5: 44c4a6efa8135d2bf39ce80743ef20b5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220118.050334-108-runner.jar
+    md5: d353d4effeb17b15cbc71c1fff6394dd
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index ac28f96a0ab..c73ad0590f8 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220116.050608-278-runner.jar
-    md5: c95a594a702f3f312856eed51e736007
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220118.050210-280-runner.jar
+    md5: 4c55ebff5c2f63bd962d2048a1eff85a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index dad782a4ddc..431e6a422f5 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220116.043932-354-runner.jar
-    md5: 21a9f4cff16b52423f44186de2673f2e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220118.043542-356-runner.jar
+    md5: 65049193380ea82ae1feb95c6ab3dcdb
 
 execute:
   - script: configure

From 8761698f4dab781aae885c81c820bbbff1fd51f0 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Thu, 20 Jan 2022 00:22:15 +0100
Subject: [PATCH 410/709] Correct bats tests (#1039)

jar command does not accept --create anymore...
---
 modules/kogito-s2i-core/tests/bats/s2i-core.bats | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 74b0fa38e5a..e79a0ca938d 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -408,7 +408,7 @@ teardown() {
 
 @test "test get_runtime_type to make sure it returns the expected runtime_type for Quarkus using binary build" {
     echo "Main-Class: io.quarkus.bootstrap.runner.QuarkusEntryPoint" > /tmp/MANIFEST.MF
-    jar -0 --create --file $KOGITO_HOME/bin/my-app.jar -m /tmp/MANIFEST.MF
+    jar -0 -c --file $KOGITO_HOME/bin/my-app.jar -m /tmp/MANIFEST.MF
 
     run get_runtime_type
 
@@ -419,8 +419,8 @@ teardown() {
 @test "test get_runtime_type to make sure it returns the expected runtime_type for Springboot binary build" {
     echo "Main-Class: org.springframework.boot.loader.JarLauncher" > /tmp/MANIFEST.MF
     echo "public void hello(){}" > /tmp/hello.java
-    jar -0 --create --file $KOGITO_HOME/bin/my-app.jar -m /tmp/MANIFEST.MF
-    jar -0 --create --file /tmp/my-app.jar -m /tmp/MANIFEST.MF
+    jar -0 -c --file $KOGITO_HOME/bin/my-app.jar -m /tmp/MANIFEST.MF
+    jar -0 -c --file /tmp/my-app.jar -m /tmp/MANIFEST.MF
 
     run get_runtime_type
 

From 4a71b82727b860ceabccc4187f0178faae2f88aa Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 20 Jan 2022 13:19:45 -0300
Subject: [PATCH 411/709] Updated Maven artifacts (#1041)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 9625609e93a..ed116303242 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220118.041015-176-runner.jar
-    md5: be41f9030cfa468e4188b6fe50fc6696
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220120.052716-178-runner.jar
+    md5: a5a48453e9098eebf04886e9cc159d41
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 13230ff87de..046ca2e9da3 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220118.040120-364-runner.jar
-    md5: 88dbba6e179c851867c57b330c003009
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220120.051015-366-runner.jar
+    md5: 57ce4c2b6fb9788e90ef0e3f7a1cd296
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 1d8fc433f1c..cb28e78b9c8 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220118.040428-366-runner.jar
-    md5: 3298c63f73aa1bf433211b2d7262549c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220120.051357-368-runner.jar
+    md5: 68e830535befba0b61e378058aa65d77
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 1a12822e391..10b7e37c19c 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220118.040731-210-runner.jar
-    md5: 944658b0e88eed1d68b003abd0b5449b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220120.052351-212-runner.jar
+    md5: 48e9c9214effe2162786b879533f839c
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 260a3041d43..16b9adf07fc 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220118.045445-370-runner.jar
-    md5: 62244e0efc78b63044590f59bdbb7bed
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220120.061837-372-runner.jar
+    md5: 1524acc7f8bf9602f775610aea413fb3
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220118.045310-365-runner.jar
-    md5: da8aa59ec1fab327f5019dd41dac2243
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220120.061711-367-runner.jar
+    md5: 598b7a1cd40347822773f5f79f3eaf0d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index fd1e985c1fa..18df0c31e13 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220118.050700-311-runner.jar
-    md5: df61a0c273f541b64985e62355a17580
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220120.063008-313-runner.jar
+    md5: 3bf393ef0254c808ab7238ca159876c3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 92bea8f83df..811ef273efc 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220118.035619-175-runner.jar
-    md5: 8a9cec8bfc2aba6acb11cbc7d37d728d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220120.050237-177-runner.jar
+    md5: e6e9a286637c5a2b1916f0d0757d5850
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index bbbd3915b85..4ce4cfb0900 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220118.034835-243-runner.jar
-    md5: bf771cf6f7b6831a88e120c400732256
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220120.045323-245-runner.jar
+    md5: 1e63b03e3ed8201ea7d1ee265daa12b2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 03f6efa9060..0e58d96ec8d 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220118.035339-224-runner.jar
-    md5: 5dc6db71f5506a887be42f12e97a29bf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220120.045923-226-runner.jar
+    md5: 3e6772fa7c407f2622e28e540387ae23
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 82796eab514..fa37c7969b7 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220118.035105-243-runner.jar
-    md5: a7b95038b7af69d940be66e522f51b23
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220120.045627-245-runner.jar
+    md5: 1135e06afab3eeb3190db88f5e4965fe
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index fda96cce4de..cf20231d642 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220118.043300-358-runner.jar
-    md5: 042a2c41a6df04a6b8c4f99cbb7f3e37
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220120.055813-360-runner.jar
+    md5: e4ceb63f861400dd761a599a681d4269
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 952264187c7..4dcb4011a39 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220118.043624-358-runner.jar
-    md5: 845f9bd376a8e8976f73a9bff967d311
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220120.060135-360-runner.jar
+    md5: 39004333d69ff564dc20fe76baa353a4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 4addc132a5d..56e86708000 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220118.050052-277-runner.jar
-    md5: ed311d293ddcbb8009ee904ebf4ebadc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220120.062408-279-runner.jar
+    md5: 65f266a80bc4224cc0d4355c300256a9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 429aa36cac9..245a6279d27 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220118.050334-108-runner.jar
-    md5: d353d4effeb17b15cbc71c1fff6394dd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220120.062641-110-runner.jar
+    md5: ffe82636a69b0b34b35671a4b920219b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index c73ad0590f8..8929f5dde45 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220118.050210-280-runner.jar
-    md5: 4c55ebff5c2f63bd962d2048a1eff85a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220120.062524-282-runner.jar
+    md5: 71b1654aaa3abfdd066f4dda5b9a5a58
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 431e6a422f5..8362c1656a7 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220118.043542-356-runner.jar
-    md5: 65049193380ea82ae1feb95c6ab3dcdb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220120.060053-358-runner.jar
+    md5: 5e1b1c7c6447d08fe3dce666fb1c649e
 
 execute:
   - script: configure

From a628f8396bfc6cbeb0ff4ee238cf4904f2c4f323 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 21 Jan 2022 10:35:19 -0300
Subject: [PATCH 412/709] Updated Maven artifacts (#1044)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index ed116303242..122f1c1d3a8 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220120.052716-178-runner.jar
-    md5: a5a48453e9098eebf04886e9cc159d41
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220121.033839-179-runner.jar
+    md5: ea98d206ce171930c5973e9503c248ed
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 046ca2e9da3..bb7eb740e70 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220120.051015-366-runner.jar
-    md5: 57ce4c2b6fb9788e90ef0e3f7a1cd296
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220121.032457-367-runner.jar
+    md5: 15d15bd65e794b62b3ddd6ada0765032
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index cb28e78b9c8..76b74260d64 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220120.051357-368-runner.jar
-    md5: 68e830535befba0b61e378058aa65d77
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220121.032800-369-runner.jar
+    md5: 3aafca30061dae0e7d82579abfa19aaa
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 10b7e37c19c..a71a7ae501a 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220120.052351-212-runner.jar
-    md5: 48e9c9214effe2162786b879533f839c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220121.033557-213-runner.jar
+    md5: 2ccb05a9cdd72e572c2081f032610119
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 16b9adf07fc..929b09e8304 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220120.061837-372-runner.jar
-    md5: 1524acc7f8bf9602f775610aea413fb3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220121.041937-373-runner.jar
+    md5: e1cc9630ada6e7fa4a55cb37fb6c04f2
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220120.061711-367-runner.jar
-    md5: 598b7a1cd40347822773f5f79f3eaf0d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220121.041814-368-runner.jar
+    md5: b624393b81a2b70eabba14c21b826539
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 18df0c31e13..0cbd213c36c 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220120.063008-313-runner.jar
-    md5: 3bf393ef0254c808ab7238ca159876c3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220121.042905-314-runner.jar
+    md5: c4e86b7797191c0d65e52c0c3d89d836
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 811ef273efc..3a1ba798b34 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220120.050237-177-runner.jar
-    md5: e6e9a286637c5a2b1916f0d0757d5850
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220121.031854-178-runner.jar
+    md5: 264d5d8b4fd6bdf1b63ab565dcf13044
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 4ce4cfb0900..319379f5bd2 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220120.045323-245-runner.jar
-    md5: 1e63b03e3ed8201ea7d1ee265daa12b2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220121.031128-246-runner.jar
+    md5: 850ac909c92648493825139aea823e94
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 0e58d96ec8d..ed878c379fc 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220120.045923-226-runner.jar
-    md5: 3e6772fa7c407f2622e28e540387ae23
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220121.031621-227-runner.jar
+    md5: cbe554a0174810fe896e530397756a31
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index fa37c7969b7..be8ebd95ed4 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220120.045627-245-runner.jar
-    md5: 1135e06afab3eeb3190db88f5e4965fe
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220121.031357-246-runner.jar
+    md5: 5cf615e32e90b6d01a4f35aea054521a
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index cf20231d642..a2e0f20ffe5 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220120.055813-360-runner.jar
-    md5: e4ceb63f861400dd761a599a681d4269
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220121.040034-361-runner.jar
+    md5: ab1d88a172a9ffedc9310137b32ef7e7
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 4dcb4011a39..6a06e78481b 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220120.060135-360-runner.jar
-    md5: 39004333d69ff564dc20fe76baa353a4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220121.040315-361-runner.jar
+    md5: db6840a762d6024586c9b686e319c434
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 56e86708000..cc066a623dc 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220120.062408-279-runner.jar
-    md5: 65f266a80bc4224cc0d4355c300256a9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220121.042455-280-runner.jar
+    md5: 02345905d4f99ae51b54c04502ff9c4f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 8929f5dde45..23cd8d97179 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220120.062524-282-runner.jar
-    md5: 71b1654aaa3abfdd066f4dda5b9a5a58
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220121.042614-283-runner.jar
+    md5: 941ffd97a480cde5bf51b1fadaca43d2
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 8362c1656a7..30ecb1298e1 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220120.060053-358-runner.jar
-    md5: 5e1b1c7c6447d08fe3dce666fb1c649e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220121.040238-359-runner.jar
+    md5: ef7f4a03d821cc90fef80d486a53d671
 
 execute:
   - script: configure

From 08d0dbdcd1963d163db555cffa5088ea4f7070fe Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Fri, 21 Jan 2022 15:27:29 +0100
Subject: [PATCH 413/709] BXMSPROD-1579 Send build summary as PR comment
 (#1043)

* BXMSPROD-1579 Added PR comment from Jenkins

* trigger build
---
 .ci/jenkins/Jenkinsfile     | 134 ++++++++++++++++++++++++------------
 .ci/jenkins/dsl/jobs.groovy |   6 +-
 Makefile                    |   2 +-
 3 files changed, 97 insertions(+), 45 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 148ae89992c..a3a446f119d 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -4,8 +4,10 @@ def changeAuthor = env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepo
 def changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
 def changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 
-pipeline{
-    agent { label 'kogito-image-slave && !master'}
+BUILD_FAILED_IMAGES = []
+
+pipeline {
+    agent { label 'kogito-image-slave && !master' }
     tools {
         jdk 'kie-jdk11'
     }
@@ -15,28 +17,28 @@ pipeline{
     environment {
         CI = true
     }
-    stages{
-        stage('Initialization'){
-            steps{
-                script{
+    stages {
+        stage('Initialization') {
+            steps {
+                script {
                     clean()
-                    
+
                     // Set the mirror url only if exist
                     if (env.MAVEN_MIRROR_REPOSITORY != null
-                            && env.MAVEN_MIRROR_REPOSITORY != ''){
+                            && env.MAVEN_MIRROR_REPOSITORY != '') {
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
-                    }
+                            }
 
                     githubscm.checkoutIfExists('kogito-images', changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
 
                     //Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                    if(env.MAVEN_MIRROR_URL != ''){
+                    if (env.MAVEN_MIRROR_URL != '') {
                         sh 'python3 scripts/update-tests.py --ignore-self-signed-cert'
                     }
                 }
             }
         }
-        stage('Validate CeKit Image and Modules descriptors'){
+        stage('Validate CeKit Image and Modules descriptors') {
             steps {
                 script {
                     sh '''
@@ -46,37 +48,78 @@ pipeline{
                     '''
                     sh './cekit-image-validator-runner modules/'
                     sh './cekit-image-validator-runner image.yaml'
-                    getImages().each{ image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }   
+                    getImages().each { image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }
                 }
             }
         }
-        stage('Prepare offline kogito-examples'){
-            steps{
-                sh "make clone-repos"
+        stage('Prepare offline kogito-examples') {
+            steps {
+                sh 'make clone-repos'
             }
         }
-        stage('Build Images') {
-            steps{
+        stage('Build & Test Images') {
+            steps {
                 script {
-                    getImages().each{ image -> initWorkspace(image) }
-                    launchParallelForEachImage("Build", {img -> buildImage(img)})
+                    parallelStages = [:]
+                    getImages().each { image ->
+                        initWorkspace(image)
+                        String workspacePath = getWorkspacePath(image)
+                        parallelStages["Build&Test ${image}"] = {
+                            stage("Build ${image}") {
+                                try {
+                                    dir(workspacePath) {
+                                        buildImage(image)
+                                    }
+                                } catch (err) {
+                                    registerBuildFailedImage(image)
+                                    util.archiveConsoleLog(image)
+                                    throw err
+                                }
+                            }
+                            stage("Test ${image}") {
+                                dir(workspacePath) {
+                                    try {
+                                        testImage(image)
+                                    } catch (err) {
+                                        echo "Testing error(s) for image ${image}"
+                                    } finally {
+                                        junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
+                                        archiveArtifacts artifacts: 'target/test/results/*.xml', allowEmptyArchive: true
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    parallel parallelStages
                 }
             }
-        }
-        stage('Test Images') {
-            steps {
-                script {
-                    launchParallelForEachImage("Test", {img -> testImage(img)})
+            post {
+                always {
+                    script {
+                        cleanWorkspaces()
+                    }
                 }
             }
         }
     }
-    post{
-        always{
-            script{
+    post {
+        always {
+            script {
                 clean()
             }
         }
+        unsuccessful {
+            script {
+                def additionalInfo = ''
+                if (getBuildFailedImages()){
+                    additionalInfo += 'Build failures on those images:\n'
+                    getBuildFailedImages().each {
+                        additionalInfo += "- ${it}\n"
+                    }
+                }
+                pullrequest.postComment(util.getMarkdownTestSummary('PR', additionalInfo, "${BUILD_URL}", 'GITHUB'))
+            }
+        }
     }
 }
 
@@ -88,16 +131,16 @@ void clean() {
     sh "rm -rf \$HOME/.cekit/cache"
 }
 
-void cleanImages(){
+void cleanImages() {
     sh "docker rm -f \$(docker ps -a -q) || date"
     sh "docker rmi -f \$(docker images -q) || date"
 }
 
 void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
     parallelStages = [:]
-    getImages().each{ image -> 
+    getImages().each { image ->
         parallelStages["${stageNamePrefix} ${image}"] = {
-            dir(getWorkspacePath(image)){
+            dir(getWorkspacePath(image)) {
                 executeOnImage(image)
             }
         }
@@ -105,36 +148,41 @@ void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
     parallel parallelStages
 }
 
-void buildImage(image) {
-    sh "make build-image image_name=${image} ignore_test=true cekit_option='--work-dir .'"
+void buildImage(String imageName) {
+    sh "make build-image image_name=${imageName} ignore_test=true cekit_option='--work-dir .'"
+}
+
+void testImage(String imageName) {
+    sh "make build-image image_name=${imageName} ignore_build=true cekit_option='--work-dir .'"
 }
 
-void testImage(image) {
-    try {
-        sh "make build-image image_name=${image} ignore_build=true cekit_option='--work-dir .'"
-    } finally {
-        junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
-        archiveArtifacts artifacts: "target/test/results/*.xml"
+void registerBuildFailedImage(String imageName) {
+    lock("${BUILD_URL} build failed") {
+        BUILD_FAILED_IMAGES.add(imageName)
     }
 }
 
-void initWorkspace(String image){
+List getBuildFailedImages() {
+    return BUILD_FAILED_IMAGES
+}
+
+void initWorkspace(String image) {
     sh "mkdir -p ${getWorkspacePath(image)}"
     sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
 }
 
-void cleanWorkspaces(){
+void cleanWorkspaces() {
     sh "rm -rf ${getWorkspacesPath()}"
 }
 
-String getWorkspacesPath(){
+String getWorkspacesPath() {
     return "${WORKSPACE}/workspaces"
 }
 
-String getWorkspacePath(String image){
+String getWorkspacePath(String image) {
     return "${getWorkspacesPath()}/${image}"
 }
 
-String[] getImages(){
+String[] getImages() {
     return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
 }
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index fa4639c505f..3e42f7a26ba 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -47,7 +47,11 @@ if (Utils.isLTSBranch(this)) {
 
 void setupPrJob(String branch = "${GIT_BRANCH}") {
     def jobParams = getDefaultJobParams()
-    jobParams.pr.run_only_for_branches = [ branch ]
+    jobParams.pr.putAll([
+        run_only_for_branches: [ branch ],
+        disable_status_message_error: true,
+        disable_status_message_failure: true,
+    ])
     KogitoJobTemplate.createPRJob(this, jobParams)
 }
 
diff --git a/Makefile b/Makefile
index f4eb3a29dcc..3e13314069a 100644
--- a/Makefile
+++ b/Makefile
@@ -97,4 +97,4 @@ push-local-registry:
 # run bat tests locally
 .PHONY: bats
 bats:
-	./scripts/run-bats.sh
\ No newline at end of file
+	./scripts/run-bats.sh

From b68577b7cb938ad3d940c3bb47cc36f3133be856 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 24 Jan 2022 12:00:50 -0300
Subject: [PATCH 414/709] Updated Maven artifacts (#1050)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 122f1c1d3a8..3eb508dbc12 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220121.033839-179-runner.jar
-    md5: ea98d206ce171930c5973e9503c248ed
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220124.043906-182-runner.jar
+    md5: 48bdf05b10147578c5f225d346dd8f4e
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index bb7eb740e70..1c1e4bf2143 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220121.032457-367-runner.jar
-    md5: 15d15bd65e794b62b3ddd6ada0765032
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220124.042317-370-runner.jar
+    md5: 759d15312d3c3c0092c74bb379e8da7c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 76b74260d64..c395fbefbc4 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220121.032800-369-runner.jar
-    md5: 3aafca30061dae0e7d82579abfa19aaa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220124.042655-372-runner.jar
+    md5: 1e721ffa6fa60425aefacaec648626c6
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index a71a7ae501a..0f8533d72c9 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220121.033557-213-runner.jar
-    md5: 2ccb05a9cdd72e572c2081f032610119
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220124.043535-216-runner.jar
+    md5: a2acfbe682b2bdc4f9e5fa4726c9c2bf
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 929b09e8304..bbbaddb91ad 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220121.041937-373-runner.jar
-    md5: e1cc9630ada6e7fa4a55cb37fb6c04f2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220124.052722-376-runner.jar
+    md5: 6f601571d1990c568eadec70a44cfea6
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220121.041814-368-runner.jar
-    md5: b624393b81a2b70eabba14c21b826539
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220124.052551-371-runner.jar
+    md5: 96d9aa0d2253ab4f80c394142fed62d9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 0cbd213c36c..a7d9ec45b54 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220121.042905-314-runner.jar
-    md5: c4e86b7797191c0d65e52c0c3d89d836
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220124.053704-317-runner.jar
+    md5: 5affbeee2ce6aeb91a0b510dd71bf69e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 3a1ba798b34..8f59604cfeb 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220121.031854-178-runner.jar
-    md5: 264d5d8b4fd6bdf1b63ab565dcf13044
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220124.041550-181-runner.jar
+    md5: 6a48455caf6a30f9e539f3a3331cdd9c
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 319379f5bd2..9eeb6087a52 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220121.031128-246-runner.jar
-    md5: 850ac909c92648493825139aea823e94
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220124.040715-249-runner.jar
+    md5: 6d4d767c02f3fe4da89af808c1a263d6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index ed878c379fc..d023be93eb5 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220121.031621-227-runner.jar
-    md5: cbe554a0174810fe896e530397756a31
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220124.041246-230-runner.jar
+    md5: f55c17b539872c3116a693548c444360
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index be8ebd95ed4..6b1f3032d7a 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220121.031357-246-runner.jar
-    md5: 5cf615e32e90b6d01a4f35aea054521a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220124.040958-249-runner.jar
+    md5: bb2aefec5539dbfefd4871a0793c2e8b
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index a2e0f20ffe5..108b7c062fa 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220121.040034-361-runner.jar
-    md5: ab1d88a172a9ffedc9310137b32ef7e7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220124.050713-364-runner.jar
+    md5: 05fabc2a7f012b676812ae55416e4299
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 6a06e78481b..719590244a8 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220121.040315-361-runner.jar
-    md5: db6840a762d6024586c9b686e319c434
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220124.051026-364-runner.jar
+    md5: 4744749ee1a6e3cca2befc08f473cee7
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index cc066a623dc..ce64bd13390 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220121.042455-280-runner.jar
-    md5: 02345905d4f99ae51b54c04502ff9c4f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220124.053223-283-runner.jar
+    md5: 64f46d2909382e7e18538a4b480d46d3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 23cd8d97179..f87ed0aaaa1 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220121.042614-283-runner.jar
-    md5: 941ffd97a480cde5bf51b1fadaca43d2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220124.053328-286-runner.jar
+    md5: 10cd73c7351b330d85ce3770229c8547
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 30ecb1298e1..df57f5f6f7b 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220121.040238-359-runner.jar
-    md5: ef7f4a03d821cc90fef80d486a53d671
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220124.050949-362-runner.jar
+    md5: 32a095d9adcab5259cce5666cc85ee90
 
 execute:
   - script: configure

From d047b3384269fc9887f1b15c7c2d639885307d7a Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Wed, 26 Jan 2022 04:38:58 -0300
Subject: [PATCH 415/709] add release-notes to images (#1053)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .github/pull_request_template.md | 5 +++--
 RELEASE_NOTES.md                 | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 RELEASE_NOTES.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 134526c2298..6f8c08e161c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,9 +3,10 @@ Many thanks for submitting your Pull Request :heart:!
 Please make sure your PR meets the following requirements:
 
 - [ ] You have read the [contributors guide](README.md#contributing-to-kogito-images-repository)
-- [ ] Pull Request title is properly formatted: `[KOGITO-XYZ] Subject`
+- [ ] Pull Request title is properly formatted: `[KOGITO|RHPAM-XYZ] Subject`
 - [ ] Pull Request contains link to the JIRA issue
 - [ ] Pull Request contains description of the issue
 - [ ] Pull Request does not include fixes for issues other than the main ticket
 - [ ] Your feature/bug fix has a testcase that verifies it
-- [ ] You've tested the new feature/bug fix in an actual OpenShift cluster
\ No newline at end of file
+- [ ] You've tested the new feature/bug fix in an actual OpenShift cluster
+  [ ] You've added a [RELEASE_NOTES.md](RELEASE_NOTES.md) entry regarding this change
\ No newline at end of file
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
new file mode 100644
index 00000000000..c3dfe3db442
--- /dev/null
+++ b/RELEASE_NOTES.md
@@ -0,0 +1,7 @@
+<!-- Keep them in alphabetical order -->
+## Enhancements
+
+## Bug Fixes
+
+## Known Issues
+

From 9ff38fac7be724ee4a2776b2d9580d92d4b86079 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 26 Jan 2022 10:00:40 -0300
Subject: [PATCH 416/709] Updated Maven artifacts (#1055)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 3eb508dbc12..3db86e006b4 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220124.043906-182-runner.jar
-    md5: 48bdf05b10147578c5f225d346dd8f4e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220126.051208-184-runner.jar
+    md5: b21f51627bb8e9201f6d4be5f847d0c2
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 1c1e4bf2143..1664654b209 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220124.042317-370-runner.jar
-    md5: 759d15312d3c3c0092c74bb379e8da7c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220126.045657-372-runner.jar
+    md5: e7075366ec0a43e64560cb20a1e7f507
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index c395fbefbc4..04c666d0643 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220124.042655-372-runner.jar
-    md5: 1e721ffa6fa60425aefacaec648626c6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220126.050019-374-runner.jar
+    md5: 37b0c8f8ea69f3b2c88e322805a94751
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 0f8533d72c9..e76376b50f7 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220124.043535-216-runner.jar
-    md5: a2acfbe682b2bdc4f9e5fa4726c9c2bf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220126.050908-218-runner.jar
+    md5: 08406d212f3f29895fbda85a1ea1d69e
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index bbbaddb91ad..859737fb405 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220124.052722-376-runner.jar
-    md5: 6f601571d1990c568eadec70a44cfea6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220126.055546-378-runner.jar
+    md5: 4c5d8d7530b4e362b7390d73307f261f
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220124.052551-371-runner.jar
-    md5: 96d9aa0d2253ab4f80c394142fed62d9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220126.055426-373-runner.jar
+    md5: d1e426068fff0fc58b7ff62a155b6666
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index a7d9ec45b54..d400f829047 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220124.053704-317-runner.jar
-    md5: 5affbeee2ce6aeb91a0b510dd71bf69e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220126.060558-319-runner.jar
+    md5: cb4af49034aace64cf33cdd9c04424a8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 8f59604cfeb..70a0a6ac81b 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220124.041550-181-runner.jar
-    md5: 6a48455caf6a30f9e539f3a3331cdd9c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220126.045002-183-runner.jar
+    md5: 1eba879059dfaf02f544627f350f4c81
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 9eeb6087a52..3f55928a96e 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220124.040715-249-runner.jar
-    md5: 6d4d767c02f3fe4da89af808c1a263d6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220126.044132-251-runner.jar
+    md5: e3fd697d46230b1427922021097cf1c8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index d023be93eb5..164ff0d80df 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220124.041246-230-runner.jar
-    md5: f55c17b539872c3116a693548c444360
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220126.044706-232-runner.jar
+    md5: 25079c34404a31e502036840ed382e1e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 6b1f3032d7a..7d306b7811d 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220124.040958-249-runner.jar
-    md5: bb2aefec5539dbfefd4871a0793c2e8b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220126.044420-251-runner.jar
+    md5: 3da1b2082d391ab728681b884bad74d4
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 108b7c062fa..70777de59ca 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220124.050713-364-runner.jar
-    md5: 05fabc2a7f012b676812ae55416e4299
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220126.053546-366-runner.jar
+    md5: 1fb613f4fd0a119d72f78f356de4ee6f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 719590244a8..a75efa23565 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220124.051026-364-runner.jar
-    md5: 4744749ee1a6e3cca2befc08f473cee7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220126.053848-366-runner.jar
+    md5: 4e5dfa3b3258da7cd8a4abaf40afa9b4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index ce64bd13390..2ed0a6078e6 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220124.053223-283-runner.jar
-    md5: 64f46d2909382e7e18538a4b480d46d3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220126.060052-285-runner.jar
+    md5: acbf564c9010bf47ea3425faf1abb0f0
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index f87ed0aaaa1..7248144201e 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220124.053328-286-runner.jar
-    md5: 10cd73c7351b330d85ce3770229c8547
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220126.060207-288-runner.jar
+    md5: ac4e8fcf9263770013322cf55ab2fd3c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index df57f5f6f7b..6c5e73ada27 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220124.050949-362-runner.jar
-    md5: 32a095d9adcab5259cce5666cc85ee90
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220126.053811-364-runner.jar
+    md5: 140631b6ba85b64babd5f64c7678a830
 
 execute:
   - script: configure

From fac05e4739e578e6bd4039fbc63d9928fa4ca7ac Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 31 Jan 2022 10:52:17 -0300
Subject: [PATCH 417/709] Updated Maven artifacts (#1065)

Co-authored-by: Jenkins CI <jenkins@eng-jenkins-csb-business-automation.apps.ocp-c1.prod.psi.redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 15 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 3db86e006b4..1770d16f7e0 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220126.051208-184-runner.jar
-    md5: b21f51627bb8e9201f6d4be5f847d0c2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220131.034030-189-runner.jar
+    md5: df8b88ab0014f25d13b7c4366a612de5
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 1664654b209..3c9934cef9a 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220126.045657-372-runner.jar
-    md5: e7075366ec0a43e64560cb20a1e7f507
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220131.032637-377-runner.jar
+    md5: 41f58dc6bc9d412542191c1fae5be687
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 04c666d0643..52107166e75 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220126.050019-374-runner.jar
-    md5: 37b0c8f8ea69f3b2c88e322805a94751
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220131.032946-379-runner.jar
+    md5: a023dd28131e27c8c6716a0efb9be156
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index e76376b50f7..9642ddb53dc 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220126.050908-218-runner.jar
-    md5: 08406d212f3f29895fbda85a1ea1d69e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220131.033742-223-runner.jar
+    md5: dbf89ff7e10de7547100bac73d6d6289
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 859737fb405..81233599c09 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220126.055546-378-runner.jar
-    md5: 4c5d8d7530b4e362b7390d73307f261f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220131.042201-383-runner.jar
+    md5: 8ecdf03ffe77b0c42514dc33181ba3b0
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220126.055426-373-runner.jar
-    md5: d1e426068fff0fc58b7ff62a155b6666
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220131.042039-378-runner.jar
+    md5: 926fbb420ebd840a2e024fec32da9959
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index d400f829047..7e2a81dd754 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220126.060558-319-runner.jar
-    md5: cb4af49034aace64cf33cdd9c04424a8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220131.043148-324-runner.jar
+    md5: 84309e1dfe34437459a018e5f6f7ef6a
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 70a0a6ac81b..95843fa1726 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220126.045002-183-runner.jar
-    md5: 1eba879059dfaf02f544627f350f4c81
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220131.032049-188-runner.jar
+    md5: 89d3e3718509da2fa21686e6d8becfde
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 3f55928a96e..ce0e427e161 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220126.044132-251-runner.jar
-    md5: e3fd697d46230b1427922021097cf1c8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220131.031328-256-runner.jar
+    md5: cb051c821496f44081269799e601c082
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 164ff0d80df..a3084f53b9e 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220126.044706-232-runner.jar
-    md5: 25079c34404a31e502036840ed382e1e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220131.031818-237-runner.jar
+    md5: d4ffe912cb3cc5a267ac59de85926459
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 7d306b7811d..60327a001d5 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220126.044420-251-runner.jar
-    md5: 3da1b2082d391ab728681b884bad74d4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220131.031553-256-runner.jar
+    md5: ddb49f3966e812504f3ce214d4d2132b
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 70777de59ca..04c31792f9d 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220126.053546-366-runner.jar
-    md5: 1fb613f4fd0a119d72f78f356de4ee6f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220131.040048-371-runner.jar
+    md5: 2e4a157a7c0d4403ae9c87c7057f5a42
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index a75efa23565..5e57a5f40a5 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220126.053848-366-runner.jar
-    md5: 4e5dfa3b3258da7cd8a4abaf40afa9b4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220131.040337-371-runner.jar
+    md5: 5223029fd2f37b59b72d9210d3a274c3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 2ed0a6078e6..4e3fefd5ea7 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220126.060052-285-runner.jar
-    md5: acbf564c9010bf47ea3425faf1abb0f0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220131.042653-290-runner.jar
+    md5: dadb6015d5d94203d09a2c718d71fa36
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 7248144201e..bcd747178ba 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220126.060207-288-runner.jar
-    md5: ac4e8fcf9263770013322cf55ab2fd3c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220131.042804-293-runner.jar
+    md5: ce16ad5b63b6c3dd8b9e754d1acba98b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6c5e73ada27..ec26a12b20f 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220126.053811-364-runner.jar
-    md5: 140631b6ba85b64babd5f64c7678a830
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220131.040300-369-runner.jar
+    md5: ac384fb51a356cc6075c3233a35f35ab
 
 execute:
   - script: configure

From df0acb1058de1e530ffecfc8a0b83e9977576572 Mon Sep 17 00:00:00 2001
From: Lei Zhang <lzhan@redhat.com>
Date: Tue, 1 Feb 2022 13:33:23 -0500
Subject: [PATCH 418/709] [RHPAM-4143] - Exclude memory-limit.sh for non-native
 ocp image build (#1068)

---
 modules/kogito-builder/s2i/bin/assemble | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-builder/s2i/bin/assemble b/modules/kogito-builder/s2i/bin/assemble
index dba36e2be05..31c816fc209 100644
--- a/modules/kogito-builder/s2i/bin/assemble
+++ b/modules/kogito-builder/s2i/bin/assemble
@@ -20,11 +20,17 @@ log_info "----> RUNTIME_TYPE has been set to $runtime_type"
 # Configure GraalVM memory limits
 
 case ${runtime_type} in 
-    "quarkus") 
-              CONFIGURE_SCRIPTS=(
+    "quarkus")
+	if [ "${NATIVE^^}" == "TRUE" ]; then
+	      CONFIGURE_SCRIPTS=(
                 "${KOGITO_HOME}"/launch/configure-maven.sh
                 "${KOGITO_HOME}"/launch/memory-limit.sh
               )
+	else
+	      CONFIGURE_SCRIPTS=(
+                "${KOGITO_HOME}"/launch/configure-maven.sh
+              )
+	fi
     ;;
     "springboot") 
               CONFIGURE_SCRIPTS=(

From 1dcbc1c60de226eb6487b44e749441585c947e77 Mon Sep 17 00:00:00 2001
From: Kevin O'Neal <oneal.kevin@gmail.com>
Date: Fri, 4 Feb 2022 02:51:02 -0600
Subject: [PATCH 419/709] [KOGITO-6229] - Add Oracle DB Support to Data Index
 (#975)

* [KOGITO-6229] - Add Oracle DB Support to Data Index

* add oracle image to update script

* Update modules/kogito-data-index-oracle/module.yaml

* Update modules/kogito-data-index-oracle/module.yaml

* Update tests/features/data-index/kogito-data-index-oracle.feature

* Update tests/features/data-index/kogito-data-index-oracle.feature

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
Co-authored-by: Spolti <filippespolti@gmail.com>
---
 README.md                                     | 13 ++++++
 kogito-data-index-oracle-overrides.yaml       | 43 +++++++++++++++++++
 .../added/kogito-app-launch.sh                | 29 +++++++++++++
 modules/kogito-data-index-oracle/configure    | 12 ++++++
 modules/kogito-data-index-oracle/module.yaml  | 12 ++++++
 scripts/update-maven-artifacts.py             |  1 +
 .../kogito-data-index-oracle.feature          | 27 ++++++++++++
 7 files changed, 137 insertions(+)
 create mode 100644 kogito-data-index-oracle-overrides.yaml
 create mode 100644 modules/kogito-data-index-oracle/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-data-index-oracle/configure
 create mode 100644 modules/kogito-data-index-oracle/module.yaml
 create mode 100644 tests/features/data-index/kogito-data-index-oracle.feature

diff --git a/README.md b/README.md
index 8ec69f0accc..ee6134d0e90 100644
--- a/README.md
+++ b/README.md
@@ -581,6 +581,8 @@ The Persistence service can be switched by using its corresponding image
   [image.yaml](kogito-data-index-ephemeral-overrides.yaml)
 - Mongodb: quay.io/kiegroup/kogito-data-index-mongodb 
   [image.yaml](kogito-data-index-mongodb-overrides.yaml)
+- Oracle: quay.io/kiegroup/kogito-data-index-oracle
+  [image.yaml](kogito-data-index-oracle-overrides.yaml)
 - PostgreSQL: quay.io/kiegroup/kogito-data-index-postgresql
   [image.yaml](kogito-data-index-postgresql-overrides.yaml)
 
@@ -600,6 +602,14 @@ Basic usage with Mongodb:
 $ docker run -it --env QUARKUS_MONGODB_CONNECTION_STRING=mongodb://localhost:27017 quay.io/kiegroup/kogito-data-index-mongodb:latest
 ```
 
+Basic usage with Oracle:
+```bash
+$ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:oracle:thin://localhost:1521/kogito"  \
+    --env QUARKUS_DATASOURCE_USERNAME="kogito" \
+    --env QUARKUS_DATASOURCE_PASSWORD="secret" \
+    quay.io/kiegroup/kogito-data-index-oracle:latest
+```
+
 Basic usage with PostgreSQL:
 ```bash
 $ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus"  \
@@ -1044,6 +1054,7 @@ With this Makefile you can:
      $ make build-image image_name=kogito-data-index-infinispan
      $ make build-image image_name=kogito-data-index-ephemeral
      $ make build-image image_name=kogito-data-index-mongodb
+     $ make build-image image_name=kogito-data-index-oracle
      $ make build-image image_name=kogito-data-index-postgresql
      $ make build-image image_name=kogito-trusty-infinispan
      $ make build-image image_name=kogito-trusty-redis
@@ -1114,6 +1125,7 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-data-index-infinispan](modules/kogito-data-index-infinispan): Installs and Configure the infinispan data-index jar inside the image.
 - [kogito-data-index-ephemeral](modules/kogito-data-index-ephemeral): Installs and Configure the ephemeral PostgreSQL data-index jar inside the image.
 - [kogito-data-index-mongodb](modules/kogito-data-index-mongodb): Installs and Configure the mongodb data-index jar inside the image.
+- [kogito-data-index-oracle](modules/kogito-data-index-oracle): Installs and Configure the Oracle data-index jar inside the image.
 - [kogito-data-index-postgresql](modules/kogito-data-index-postgresql): Installs and Configure the PostgreSQL data-index jar inside the image.
 - [kogito-trusty-infinispan](modules/kogito-trusty-infinispan): Installs and Configure the infinispan trusty jar inside the image.
 - [kogito-trusty-redis](modules/kogito-trusty-redis): Installs and Configure the redis trusty jar inside the image.
@@ -1150,6 +1162,7 @@ Please inspect the images overrides files to learn which modules are being insta
 - [quay.io/kiegroup/kogito-data-index-infinispan](kogito-data-index-infinispan-overrides.yaml)
 - [quay.io/kiegroup/kogito-data-index-ephemeral](kogito-data-index-ephemeral-overrides.yaml)
 - [quay.io/kiegroup/kogito-data-index-mongodb](kogito-data-index-mongodb-overrides.yaml)
+- [quay.io/kiegroup/kogito-data-index-oracle](kogito-data-index-oracle-overrides.yaml)
 - [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-redis](kogito-trusty-redis-overrides.yaml)
diff --git a/kogito-data-index-oracle-overrides.yaml b/kogito-data-index-oracle-overrides.yaml
new file mode 100644
index 00000000000..6f167e03c18
--- /dev/null
+++ b/kogito-data-index-oracle-overrides.yaml
@@ -0,0 +1,43 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-data-index-oracle"
+description: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
+
+labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
+- name: "io.k8s.display-name"
+  value: "Kogito Data Index Service - Oracle"
+- name: "io.openshift.tags"
+  value: "kogito,data-index,data-index-oracle"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.dataindex.oracle
+  - name: org.kie.kogito.dataindex.common
+  - name: org.kie.kogito.security.custom.truststores
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..82d3fcd6c23
--- /dev/null
+++ b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
+        -jar "${KOGITO_HOME}"/bin/data-index-service-oracle-runner.jar
diff --git a/modules/kogito-data-index-oracle/configure b/modules/kogito-data-index-oracle/configure
new file mode 100644
index 00000000000..6f3631debd6
--- /dev/null
+++ b/modules/kogito-data-index-oracle/configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+cp -v "${SOURCES_DIR}"/data-index-service-oracle-runner.jar "${KOGITO_HOME}"/bin/
+
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
+
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
new file mode 100644
index 00000000000..a7c9810caa9
--- /dev/null
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.dataindex.oracle
+version: "2.0.0-snapshot"
+
+artifacts:
+  - name: data-index-service-oracle-runner.jar
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220124.043203-5-runner.jar
+    md5: 9dd485c017dc9e61efaadc27fcf4c0ba
+
+execute:
+  - script: configure
+
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
index 2801c741401..383e38c625d 100644
--- a/scripts/update-maven-artifacts.py
+++ b/scripts/update-maven-artifacts.py
@@ -27,6 +27,7 @@
     "data-index-service-infinispan": "kogito-data-index-infinispan",
     "data-index-service-inmemory": "kogito-data-index-ephemeral",
     "data-index-service-mongodb": "kogito-data-index-mongodb",
+    "data-index-service-oracle": "kogito-data-index-oracle",
     "data-index-service-postgresql": "kogito-data-index-postgresql",
     "trusty-service-infinispan": "kogito-trusty-infinispan",
     "trusty-service-redis": "kogito-trusty-redis",
diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature
new file mode 100644
index 00000000000..d65eedbe938
--- /dev/null
+++ b/tests/features/data-index/kogito-data-index-oracle.feature
@@ -0,0 +1,27 @@
+@quay.io/kiegroup/kogito-data-index-oracle
+Feature: Kogito-data-index oracle feature.
+
+  Scenario: verify if all labels are correctly set on kogito-data-index-oracle image
+    Given image is built
+     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+      And the image should contain label io.openshift.s2i.destination with value /tmp
+      And the image should contain label io.openshift.expose-services with value 8080:http
+      And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Oracle persistence provider
+      And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Oracle
+      And the image should contain label io.openshift.tags with value kogito,data-index,data-index-oracle
+
+  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/data-index-service-oracle-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-oracle-runner.jar
+
+  Scenario: verify if of container is correctly started with oracle parameters
+    When container is started with env
+      | variable                     | value                                     |
+      | SCRIPT_DEBUG                 | true                                      |
+      | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:oracle:thin:@//10.1.1.53:1521/quarkus |
+      | QUARKUS_DATASOURCE_USERNAME  | kogito                                    |
+      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                    |
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-oracle-runner.jar
+    And container log should contain Datasource '<default>': IO Error: The Network Adapter could not establish the connection
+    And container log should not contain Application failed to start

From a0ba601bb0c02252139722e965adcb24ffb54be7 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 8 Feb 2022 10:45:53 -0300
Subject: [PATCH 420/709] Updated Maven artifacts (#1090)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 1770d16f7e0..b1b63ba2f32 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220131.034030-189-runner.jar
-    md5: df8b88ab0014f25d13b7c4366a612de5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220208.051921-199-runner.jar
+    md5: f7cef5e18fde69e56191bd27933fe527
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 3c9934cef9a..512086a2bb3 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220131.032637-377-runner.jar
-    md5: 41f58dc6bc9d412542191c1fae5be687
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220208.050815-388-runner.jar
+    md5: a15248c1c863cac3f2b018ba5f6710d2
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 52107166e75..f18b3f64958 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220131.032946-379-runner.jar
-    md5: a023dd28131e27c8c6716a0efb9be156
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220208.051043-390-runner.jar
+    md5: db4ab99aff83b2a0f88a7e72bdbd35ea
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index a7c9810caa9..746bc2902eb 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220124.043203-5-runner.jar
-    md5: 9dd485c017dc9e61efaadc27fcf4c0ba
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220208.051426-23-runner.jar
+    md5: 96e29fe0b1527f2b9d667b128c83603a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 9642ddb53dc..16d266f9034 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220131.033742-223-runner.jar
-    md5: dbf89ff7e10de7547100bac73d6d6289
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220208.051704-233-runner.jar
+    md5: 25d033e47926af1c6872c122559d162e
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 81233599c09..d47df7f4ee9 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220131.042201-383-runner.jar
-    md5: 8ecdf03ffe77b0c42514dc33181ba3b0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220208.033318-392-runner.jar
+    md5: c699d139cd147adc51aa591f7b5425cf
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220131.042039-378-runner.jar
-    md5: 926fbb420ebd840a2e024fec32da9959
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220208.033212-387-runner.jar
+    md5: 23a1cc0ebec3e5aa955bf26da51f951e
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 7e2a81dd754..3a75ea280a6 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220131.043148-324-runner.jar
-    md5: 84309e1dfe34437459a018e5f6f7ef6a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220208.034200-333-runner.jar
+    md5: dc4ae439befe9c7f8d5448ccfcda782c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 95843fa1726..2d5c7eb981a 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220131.032049-188-runner.jar
-    md5: 89d3e3718509da2fa21686e6d8becfde
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220208.050311-199-runner.jar
+    md5: a801032a623a831388ad3faf139a6cea
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index ce0e427e161..c8fdc10ce22 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220131.031328-256-runner.jar
-    md5: cb051c821496f44081269799e601c082
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220208.045727-267-runner.jar
+    md5: e38cf0242aca0e5e70c6563c024fea42
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index a3084f53b9e..92324376d2a 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220131.031818-237-runner.jar
-    md5: d4ffe912cb3cc5a267ac59de85926459
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220208.050109-248-runner.jar
+    md5: f68edef7c48b92c987073b37a944f039
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 60327a001d5..ae6342abebe 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220131.031553-256-runner.jar
-    md5: ddb49f3966e812504f3ce214d4d2132b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220208.045918-267-runner.jar
+    md5: 06cee6decb8622a0a30fb097d8ce7861
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 04c31792f9d..b0cda1b3291 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220131.040048-371-runner.jar
-    md5: 2e4a157a7c0d4403ae9c87c7057f5a42
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220208.031526-380-runner.jar
+    md5: e9bb53928b2d2cb8272dfb5a16d8746f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 5e57a5f40a5..22a2c1fd03d 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220131.040337-371-runner.jar
-    md5: 5223029fd2f37b59b72d9210d3a274c3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220208.031736-380-runner.jar
+    md5: 66a9ff5e1dc3be1fdcbf4ab2d64f08a3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 4e3fefd5ea7..00f5b0c59d6 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220131.042653-290-runner.jar
-    md5: dadb6015d5d94203d09a2c718d71fa36
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220208.033639-299-runner.jar
+    md5: 8a9b20b6b4be02a4845f8d7de2d5d8c4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 245a6279d27..57bb711ff28 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220120.062641-110-runner.jar
-    md5: ffe82636a69b0b34b35671a4b920219b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220208.033906-130-runner.jar
+    md5: 4006fc2aa49b79f58fddc497dbbd850b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index bcd747178ba..14cda92e9bc 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220131.042804-293-runner.jar
-    md5: ce16ad5b63b6c3dd8b9e754d1acba98b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220208.033741-302-runner.jar
+    md5: 0c7c534a984be359990b35cef439c939
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index ec26a12b20f..316c82316a4 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220131.040300-369-runner.jar
-    md5: ac384fb51a356cc6075c3233a35f35ab
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220208.031703-378-runner.jar
+    md5: 4e494b327844d6e29709802cf1833885
 
 execute:
   - script: configure

From fd2f57f162439e036cd20a197ed32b3e0a8c00ef Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 16 Feb 2022 10:21:40 -0300
Subject: [PATCH 421/709] Updated Maven artifacts (#1106)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index b1b63ba2f32..08e71a6bb87 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220208.051921-199-runner.jar
-    md5: f7cef5e18fde69e56191bd27933fe527
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220215.025046-206-runner.jar
+    md5: 1d7d7ef9cd196794813ca680fdb24486
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 512086a2bb3..ab7aa64dcf8 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220208.050815-388-runner.jar
-    md5: a15248c1c863cac3f2b018ba5f6710d2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220215.023937-395-runner.jar
+    md5: 2ccf97119d900bff51157aa76d108d0c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index f18b3f64958..c4f8ce26b38 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220208.051043-390-runner.jar
-    md5: db4ab99aff83b2a0f88a7e72bdbd35ea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220215.024207-397-runner.jar
+    md5: 33b4165da78d47be3b6a0153b2235873
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 746bc2902eb..71167049535 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220208.051426-23-runner.jar
-    md5: 96e29fe0b1527f2b9d667b128c83603a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220215.024557-30-runner.jar
+    md5: 113e2a2c5de2ece8e79e7e64736fd614
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 16d266f9034..b60338a6edd 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220208.051704-233-runner.jar
-    md5: 25d033e47926af1c6872c122559d162e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220215.024828-240-runner.jar
+    md5: 7ef1e884b0a3ed2243c33ffc46ce87cd
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index d47df7f4ee9..6b9a202f024 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220208.033318-392-runner.jar
-    md5: c699d139cd147adc51aa591f7b5425cf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220215.032326-400-runner.jar
+    md5: 0ff200d80ba7d86a47da7400233e4085
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220208.033212-387-runner.jar
-    md5: 23a1cc0ebec3e5aa955bf26da51f951e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220215.032214-395-runner.jar
+    md5: 6affe17442b85b6a5a92378519ed3b68
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 3a75ea280a6..6df4fc6d4de 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220208.034200-333-runner.jar
-    md5: dc4ae439befe9c7f8d5448ccfcda782c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220215.033331-341-runner.jar
+    md5: 538c0d9a61ff84763f9a99bac17237eb
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 2d5c7eb981a..fe51d59f0db 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220208.050311-199-runner.jar
-    md5: a801032a623a831388ad3faf139a6cea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220215.023428-206-runner.jar
+    md5: 550a562fefb7100a21edf407d388575f
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index c8fdc10ce22..5eaa1e902d8 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220208.045727-267-runner.jar
-    md5: e38cf0242aca0e5e70c6563c024fea42
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220215.022858-274-runner.jar
+    md5: d49d957103601fffd92e70e621257695
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 92324376d2a..050dbeab7dc 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220208.050109-248-runner.jar
-    md5: f68edef7c48b92c987073b37a944f039
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220215.023232-255-runner.jar
+    md5: a70eb3325cb9088bd7b9890a7c8a9ba6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index ae6342abebe..0e45bdf8833 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220208.045918-267-runner.jar
-    md5: 06cee6decb8622a0a30fb097d8ce7861
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220215.023048-274-runner.jar
+    md5: 2b92257953ffee2618f8ecee10d8044b
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index b0cda1b3291..a43eafdaa70 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220208.031526-380-runner.jar
-    md5: e9bb53928b2d2cb8272dfb5a16d8746f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220215.030618-388-runner.jar
+    md5: 8e1db2a51f8d810e17a01ffefbdb2fd5
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 22a2c1fd03d..3deed38c25f 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220208.031736-380-runner.jar
-    md5: 66a9ff5e1dc3be1fdcbf4ab2d64f08a3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220215.030827-388-runner.jar
+    md5: 97cb524a90427baa4890a8e0eac936d5
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 00f5b0c59d6..66bd0c426c9 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220208.033639-299-runner.jar
-    md5: 8a9b20b6b4be02a4845f8d7de2d5d8c4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220215.032741-307-runner.jar
+    md5: 9f4ba5f150df5b446e011aaac63694ee
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 57bb711ff28..65badfaf4bc 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220208.033906-130-runner.jar
-    md5: 4006fc2aa49b79f58fddc497dbbd850b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220215.033022-138-runner.jar
+    md5: 590442b7f632678c0068cd7f59598f4c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 14cda92e9bc..f6f66e2de86 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220208.033741-302-runner.jar
-    md5: 0c7c534a984be359990b35cef439c939
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220215.032853-310-runner.jar
+    md5: 10cc69a7b3206eb613e705ea0685d6d2
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 316c82316a4..ca4f2be92dc 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220208.031703-378-runner.jar
-    md5: 4e494b327844d6e29709802cf1833885
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220215.030755-386-runner.jar
+    md5: 53b2aa1d18a95184da5d22d949c54ccb
 
 execute:
   - script: configure

From 35954414407ef9c3cec8a160b2730d50897c1bf2 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 25 Feb 2022 11:31:36 -0300
Subject: [PATCH 422/709] Updated Maven artifacts (#1130)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 08e71a6bb87..48e9a78f32b 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220215.025046-206-runner.jar
-    md5: 1d7d7ef9cd196794813ca680fdb24486
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220225.025802-219-runner.jar
+    md5: 8bc0faa7eb90a4b47e322e9d448965a2
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index ab7aa64dcf8..711315ab15c 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220215.023937-395-runner.jar
-    md5: 2ccf97119d900bff51157aa76d108d0c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220225.024708-408-runner.jar
+    md5: 3742e9dff95fb3dc14c1ab598b4d6a13
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index c4f8ce26b38..68ae3cd06b1 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220215.024207-397-runner.jar
-    md5: 33b4165da78d47be3b6a0153b2235873
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220225.024940-410-runner.jar
+    md5: bf70254edb891c9d30362468f2ce8549
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 71167049535..ddd43d5f97a 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220215.024557-30-runner.jar
-    md5: 113e2a2c5de2ece8e79e7e64736fd614
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220225.025325-43-runner.jar
+    md5: 7a5692d0dff06d04674044d6c88602fe
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index b60338a6edd..f820a056033 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220215.024828-240-runner.jar
-    md5: 7ef1e884b0a3ed2243c33ffc46ce87cd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220225.025552-253-runner.jar
+    md5: f3cb970b3d723882e46a90a89bcd334d
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 6b9a202f024..690358d31e2 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220215.032326-400-runner.jar
-    md5: 0ff200d80ba7d86a47da7400233e4085
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220225.033023-412-runner.jar
+    md5: 1116aa13e03bf9d87f9417cddb1ed2bb
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220215.032214-395-runner.jar
-    md5: 6affe17442b85b6a5a92378519ed3b68
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220225.032917-407-runner.jar
+    md5: 198835459841219b649149934afecd6d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 6df4fc6d4de..3806cb282e8 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220215.033331-341-runner.jar
-    md5: 538c0d9a61ff84763f9a99bac17237eb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220225.033848-353-runner.jar
+    md5: 8f98a8b584eb24d9345d7c8643369805
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index fe51d59f0db..2dd770984f3 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220215.023428-206-runner.jar
-    md5: 550a562fefb7100a21edf407d388575f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220225.024211-219-runner.jar
+    md5: cc118e2255dd71719f0fa01cef80b862
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 5eaa1e902d8..5472234063e 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220215.022858-274-runner.jar
-    md5: d49d957103601fffd92e70e621257695
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220225.023639-287-runner.jar
+    md5: a7ae2426816c9274059896938fa9f8ae
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 050dbeab7dc..ec3e09ef932 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220215.023232-255-runner.jar
-    md5: a70eb3325cb9088bd7b9890a7c8a9ba6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220225.024021-268-runner.jar
+    md5: c9e8a4c95ed8683b3a551cf3406abecd
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 0e45bdf8833..6328336a50f 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220215.023048-274-runner.jar
-    md5: 2b92257953ffee2618f8ecee10d8044b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220225.023832-287-runner.jar
+    md5: 9745b2c3bc54422e207b1046cc5acc78
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index a43eafdaa70..b818533898c 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220215.030618-388-runner.jar
-    md5: 8e1db2a51f8d810e17a01ffefbdb2fd5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220225.031315-400-runner.jar
+    md5: 331b1ccf98fedb0e17031706f38d6528
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 3deed38c25f..2af41e7b2f5 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220215.030827-388-runner.jar
-    md5: 97cb524a90427baa4890a8e0eac936d5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220225.031520-400-runner.jar
+    md5: fd4a60c3773c314e44207177ff594f1d
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 66bd0c426c9..5e58e73907e 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220215.032741-307-runner.jar
-    md5: 9f4ba5f150df5b446e011aaac63694ee
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220225.033339-319-runner.jar
+    md5: 66901b21d8f50ee3cc27fba3f28f6c33
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 65badfaf4bc..25414d240ec 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220215.033022-138-runner.jar
-    md5: 590442b7f632678c0068cd7f59598f4c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220225.033601-150-runner.jar
+    md5: b97f17216bb429b19730793148ee3c97
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index f6f66e2de86..1b0fb94a400 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220215.032853-310-runner.jar
-    md5: 10cc69a7b3206eb613e705ea0685d6d2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220225.033440-322-runner.jar
+    md5: c0f45a030de7f3990d76075ddb521c1a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index ca4f2be92dc..369417b1a7b 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220215.030755-386-runner.jar
-    md5: 53b2aa1d18a95184da5d22d949c54ccb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220225.031450-398-runner.jar
+    md5: 1aa5d689eb23d5639630e6cab3226992
 
 execute:
   - script: configure

From b939e870593de641a526a0dc283f4d720b9a70ea Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 28 Feb 2022 11:49:36 +0100
Subject: [PATCH 423/709] Update to GraalVM 21.3.1 (#1133)

Needed by Quarkus 2.7.1.Final
---
 README.md                                        |  4 ++--
 kogito-builder-overrides.yaml                    |  2 +-
 .../21.x-java-11/module.yaml                     | 16 ++++++++--------
 modules/kogito-graalvm-scripts/module.yaml       |  2 +-
 rhpam-kogito-builder-rhel8-overrides.yaml        |  2 +-
 tests/features/kogito-builder-native.feature     |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index ee6134d0e90..22d6c6537c0 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ To interact with Kogito images, you would need to install the needed dependencie
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
         * used to perform local s2i images using some of the [builder images](#builder-images)
-    * [GraalVM 21.3.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-21.3.0) Java 11 or higher
+    * [GraalVM 21.3.1](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-21.3.1) Java 11 or higher
         * Useful to test Kogito apps on native mode before create a Container image with it.
     * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
         
@@ -154,7 +154,7 @@ When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a
 
 The Kogito Builder Image is equipped with the following components:
 
- * GraalVM 21.3.0-java11
+ * GraalVM 21.3.1-java11
  * OpenJDK 11.0.6
  * Maven 3.8.1
  
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index cc95d4b7974..f057d9ad960 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -44,7 +44,7 @@ modules:
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
-    version: "21.3.0-java-11"
+    version: "21.3.1-java-11"
   - name: org.kie.kogito.graalvm.scripts
   - name: org.kie.kogito.openjdk
     version: "11"
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
index ca95adbcec9..01bc632bbbf 100644
--- a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "21.3.0-java-11"
+version: "21.3.1-java-11"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,17 +9,17 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "21.3.0"
+    value: "21.3.1"
   - name: "GRAALVM_JAVA_VERSION"
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
-  md5: 0813eeb5ccc5b29789f66950360b0b2d
-- name: native-image-installable-svm-java11-linux-amd64-21.3.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/native-image-installable-svm-java11-linux-amd64-21.3.0.jar
-  md5: f6283764854911654af182af3e94749c
+- name: graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
+  md5: 6dee8a2f8c81c974f8a7d782c4d78b81
+- name: native-image-installable-svm-java11-linux-amd64-21.3.1.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/native-image-installable-svm-java11-linux-amd64-21.3.1.jar
+  md5: aa5a819fba0fbaeea7d77e989f53fdc5
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml
index 9b9a412d936..ae15a436e79 100644
--- a/modules/kogito-graalvm-scripts/module.yaml
+++ b/modules/kogito-graalvm-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
-version: "21.3.0"
+version: "21.3.1"
 
 execute:
 - script: configure
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 53db1319584..7307e4eb384 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -48,7 +48,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.graalvm.installer
-      version: "21.3.0-java-11"
+      version: "21.3.1-java-11"
     - name: org.kie.kogito.graalvm.scripts
     - name: org.kie.kogito.openjdk
       version: "11"
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index fe21d6bee3e..2fcdd097d36 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -12,7 +12,7 @@ Feature: kogito-builder image native build tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.0
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.1
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest

From 8df97227c496203125e436fa0e56a8ae0f9114f0 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 2 Mar 2022 11:59:22 -0300
Subject: [PATCH 424/709] Updated Maven artifacts (#1143)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 48e9a78f32b..aaecc56a6da 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220225.025802-219-runner.jar
-    md5: 8bc0faa7eb90a4b47e322e9d448965a2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220301.025712-224-runner.jar
+    md5: 982ba86e84260b493b3a3571ec63a4d3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 711315ab15c..b16ea0f2d01 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220225.024708-408-runner.jar
-    md5: 3742e9dff95fb3dc14c1ab598b4d6a13
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220301.024557-413-runner.jar
+    md5: 93a14fdf9a08f4e129ee4729fa3b6f89
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 68ae3cd06b1..c2915318a0b 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220225.024940-410-runner.jar
-    md5: bf70254edb891c9d30362468f2ce8549
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220301.024825-415-runner.jar
+    md5: eb53f2f047a5e6ef39193f2bcd3e1d3c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index ddd43d5f97a..85f858c96eb 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220225.025325-43-runner.jar
-    md5: 7a5692d0dff06d04674044d6c88602fe
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220301.025208-48-runner.jar
+    md5: 3f735aa596f0f5655dbd417fad087b82
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index f820a056033..45e8d259d13 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220225.025552-253-runner.jar
-    md5: f3cb970b3d723882e46a90a89bcd334d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220301.025448-258-runner.jar
+    md5: 9f18f083842e9e23d03e8060a891115c
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 690358d31e2..9f6409cf234 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220225.033023-412-runner.jar
-    md5: 1116aa13e03bf9d87f9417cddb1ed2bb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220301.033002-417-runner.jar
+    md5: 43326f0e865fa80455ba4f1c91d247e8
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220225.032917-407-runner.jar
-    md5: 198835459841219b649149934afecd6d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220301.032849-412-runner.jar
+    md5: 140ac408b7edd8c57dc623af501197af
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 3806cb282e8..800628e5ba7 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220225.033848-353-runner.jar
-    md5: 8f98a8b584eb24d9345d7c8643369805
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220301.033816-358-runner.jar
+    md5: 16fa25e4ead51a01d02bb6de52b10918
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 2dd770984f3..efb419ce2df 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220225.024211-219-runner.jar
-    md5: cc118e2255dd71719f0fa01cef80b862
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220301.024038-224-runner.jar
+    md5: 38b66fc240365604c63b58645af8ed61
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 5472234063e..4b2c6f413cb 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220225.023639-287-runner.jar
-    md5: a7ae2426816c9274059896938fa9f8ae
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220301.023455-292-runner.jar
+    md5: 35cb6b5ae7c06cc632d54e00e843efcf
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index ec3e09ef932..885d5bf2fe2 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220225.024021-268-runner.jar
-    md5: c9e8a4c95ed8683b3a551cf3406abecd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220301.023843-273-runner.jar
+    md5: fb9ffbd2a1f011e116f9584058823410
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 6328336a50f..e801d73fde7 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220225.023832-287-runner.jar
-    md5: 9745b2c3bc54422e207b1046cc5acc78
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220301.023651-292-runner.jar
+    md5: 56c747df2e95c1fbbdf52b944937ea93
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index b818533898c..9417681b441 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220225.031315-400-runner.jar
-    md5: 331b1ccf98fedb0e17031706f38d6528
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220301.031219-405-runner.jar
+    md5: cbe5bd899dda7ac3da215e232864cb48
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 2af41e7b2f5..78ee60f840e 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220225.031520-400-runner.jar
-    md5: fd4a60c3773c314e44207177ff594f1d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220301.031428-405-runner.jar
+    md5: da950ad59a8abb9b667771dd60071e2f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 5e58e73907e..a6cd6cc0fb0 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220225.033339-319-runner.jar
-    md5: 66901b21d8f50ee3cc27fba3f28f6c33
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220301.033330-324-runner.jar
+    md5: e6ee3037db93cf52937b5ff22c115740
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 25414d240ec..ab0959a3135 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220225.033601-150-runner.jar
-    md5: b97f17216bb429b19730793148ee3c97
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220301.033541-155-runner.jar
+    md5: 27c1378378739042f73d962e44401c3e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 1b0fb94a400..21ba6078513 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220225.033440-322-runner.jar
-    md5: c0f45a030de7f3990d76075ddb521c1a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220301.033423-327-runner.jar
+    md5: fca827bc043482b2ddb0a0c79933515f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 369417b1a7b..a43371e497f 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220225.031450-398-runner.jar
-    md5: 1aa5d689eb23d5639630e6cab3226992
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220301.031356-403-runner.jar
+    md5: d5ea281bbc11cb9677115d1ad1a486cc
 
 execute:
   - script: configure

From 0a431cf26051930a856da72ad29028647c773309 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 3 Mar 2022 09:40:45 -0300
Subject: [PATCH 425/709] Updated Maven artifacts (#1150)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index aaecc56a6da..e3958cd2093 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220301.025712-224-runner.jar
-    md5: 982ba86e84260b493b3a3571ec63a4d3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220303.030936-226-runner.jar
+    md5: d7c72f21a6e6a6c25d14193724a8885f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index b16ea0f2d01..ce5be9ed4ca 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220301.024557-413-runner.jar
-    md5: 93a14fdf9a08f4e129ee4729fa3b6f89
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220303.025825-415-runner.jar
+    md5: 73d826cde218e3317dd3c5461a6f660f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index c2915318a0b..ef6e68f1b89 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220301.024825-415-runner.jar
-    md5: eb53f2f047a5e6ef39193f2bcd3e1d3c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220303.030055-417-runner.jar
+    md5: f8086d4f7d5e745ef4b4105e274c8cfc
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 85f858c96eb..a8b68dc94fb 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220301.025208-48-runner.jar
-    md5: 3f735aa596f0f5655dbd417fad087b82
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220303.030441-50-runner.jar
+    md5: f3894b04399a8e02d233618265b759d8
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 45e8d259d13..d868effe90c 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220301.025448-258-runner.jar
-    md5: 9f18f083842e9e23d03e8060a891115c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220303.030716-260-runner.jar
+    md5: dbaf2c3588810651a0ef89e15cb46655
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 9f6409cf234..4696a4d171a 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220301.033002-417-runner.jar
-    md5: 43326f0e865fa80455ba4f1c91d247e8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220303.034234-419-runner.jar
+    md5: 7dfed2518ccf364533cb5f3f138edb49
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220301.032849-412-runner.jar
-    md5: 140ac408b7edd8c57dc623af501197af
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220303.034120-414-runner.jar
+    md5: 3d4b1d975961f0036568e521a5cd140d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 800628e5ba7..f7e69c8af94 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220301.033816-358-runner.jar
-    md5: 16fa25e4ead51a01d02bb6de52b10918
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220303.035130-360-runner.jar
+    md5: 0daf38371a17de14be17b30794dd1910
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index efb419ce2df..86318a05f90 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220301.024038-224-runner.jar
-    md5: 38b66fc240365604c63b58645af8ed61
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220303.025308-226-runner.jar
+    md5: 9411b650a4a3f2161f6dafa3a832aad5
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 4b2c6f413cb..1a1ccac1dbf 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220301.023455-292-runner.jar
-    md5: 35cb6b5ae7c06cc632d54e00e843efcf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220303.024724-294-runner.jar
+    md5: 74d8cf5aab7440dd16e11af590d70d19
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 885d5bf2fe2..68258110a8f 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220301.023843-273-runner.jar
-    md5: fb9ffbd2a1f011e116f9584058823410
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220303.025114-275-runner.jar
+    md5: a356039c823d9f800c7fa00a7f9e0808
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index e801d73fde7..07b5b560e0b 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220301.023651-292-runner.jar
-    md5: 56c747df2e95c1fbbdf52b944937ea93
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220303.024913-294-runner.jar
+    md5: 6940a7009e28b59969f987fc88ffcdd0
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 9417681b441..fadd3eb8a24 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220301.031219-405-runner.jar
-    md5: cbe5bd899dda7ac3da215e232864cb48
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220303.032439-407-runner.jar
+    md5: 41d3f9ad7edb6cc9b12ca7532f285da3
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 78ee60f840e..d39994f8411 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220301.031428-405-runner.jar
-    md5: da950ad59a8abb9b667771dd60071e2f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220303.032658-407-runner.jar
+    md5: 8f29d6a71c6a91b1021bd4257060e4a1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index a6cd6cc0fb0..f01429e3ac6 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220301.033330-324-runner.jar
-    md5: e6ee3037db93cf52937b5ff22c115740
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220303.034601-326-runner.jar
+    md5: 47bb94278b79198197aeef5cc3afda4a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index ab0959a3135..b074dc785f5 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220301.033541-155-runner.jar
-    md5: 27c1378378739042f73d962e44401c3e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220303.034829-157-runner.jar
+    md5: 6c9c24cad35111156684103900f999c0
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 21ba6078513..9ad184a0059 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220301.033423-327-runner.jar
-    md5: fca827bc043482b2ddb0a0c79933515f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220303.034705-329-runner.jar
+    md5: bbcfb277fb7bc203b28c00d6cc7be16a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index a43371e497f..60cae214007 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220301.031356-403-runner.jar
-    md5: d5ea281bbc11cb9677115d1ad1a486cc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220303.032619-405-runner.jar
+    md5: 87493377ae9223d64823933698a49dbf
 
 execute:
   - script: configure

From b5e648053a157dcac52ce2e83f112f2d83541172 Mon Sep 17 00:00:00 2001
From: Ant Stephenson <1628676+AntStephenson@users.noreply.github.com>
Date: Thu, 3 Mar 2022 15:08:59 +0000
Subject: [PATCH 426/709] Enable multi-arch builds for existing builder /
 runtime images (#1148)

Remove container file reference

Fix content_sets.yaml for multi-arch builds

Add arch check for graalvm scripts and remove s390x arch

Fix shellcheck issues

(cherry picked from commit 6e8f388231c6121a9f8fd4990009e267b01e2ce7)
---
 content_sets.yaml                                      |  4 ++--
 .../kogito-graalvm-installer/20.x-java-1.8/configure   |  7 ++++++-
 .../kogito-graalvm-installer/20.x-java-11/configure    |  7 ++++++-
 .../kogito-graalvm-installer/21.x-java-11/configure    |  7 ++++++-
 modules/kogito-graalvm-scripts/configure               |  6 ++++++
 rhpam-kogito-builder-rhel8-overrides.yaml              | 10 ++++++++--
 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml          | 10 ++++++++--
 7 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/content_sets.yaml b/content_sets.yaml
index 9b1c1cad49c..5b28c45381a 100644
--- a/content_sets.yaml
+++ b/content_sets.yaml
@@ -18,8 +18,8 @@ x86_64:
 s390x:
   - rhel-8-for-s390x-baseos-rpms
   - rhel-8-for-s390x-appstream-rpms
-  - openj9-1-for-rhel-8-s390x-rpms
+  - rhocp-4.7-for-rhel-8-s390x-rpms
 ppc64le:
   - rhel-8-for-ppc64le-baseos-rpms
   - rhel-8-for-ppc64le-appstream-rpms
-  - openj9-1-for-rhel-8-ppc64le-rpms
+  - rhocp-4.7-for-rhel-8-ppc64le-rpms
diff --git a/modules/kogito-graalvm-installer/20.x-java-1.8/configure b/modules/kogito-graalvm-installer/20.x-java-1.8/configure
index 89d1e9e1345..40cb96d146a 100644
--- a/modules/kogito-graalvm-installer/20.x-java-1.8/configure
+++ b/modules/kogito-graalvm-installer/20.x-java-1.8/configure
@@ -1,6 +1,12 @@
 #!/bin/sh
 set -e
 
+architecture=$(uname -i)
+
+if [ "$architecture" != x86_64 ]; then
+    exit 0;
+fi
+
 SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 
@@ -11,4 +17,3 @@ mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr
 mkdir -p "${KOGITO_HOME}"/ssl-libs
 cp -v "$GRAALVM_HOME"/jre/lib/amd64/libsunec.so "${KOGITO_HOME}"/ssl-libs
 cp -v "$GRAALVM_HOME"/jre/lib/security/cacerts "${KOGITO_HOME}"/
-
diff --git a/modules/kogito-graalvm-installer/20.x-java-11/configure b/modules/kogito-graalvm-installer/20.x-java-11/configure
index 939cb569277..b16cd087e26 100644
--- a/modules/kogito-graalvm-installer/20.x-java-11/configure
+++ b/modules/kogito-graalvm-installer/20.x-java-11/configure
@@ -1,6 +1,12 @@
 #!/bin/sh
 set -e
 
+architecture=$(uname -i)
+
+if [ "$architecture" != x86_64 ]; then
+    exit 0;
+fi
+
 SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 
@@ -11,4 +17,3 @@ mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr
 mkdir -p "${KOGITO_HOME}"/ssl-libs
 cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
 cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
-
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/configure b/modules/kogito-graalvm-installer/21.x-java-11/configure
index 939cb569277..b16cd087e26 100644
--- a/modules/kogito-graalvm-installer/21.x-java-11/configure
+++ b/modules/kogito-graalvm-installer/21.x-java-11/configure
@@ -1,6 +1,12 @@
 #!/bin/sh
 set -e
 
+architecture=$(uname -i)
+
+if [ "$architecture" != x86_64 ]; then
+    exit 0;
+fi
+
 SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 
@@ -11,4 +17,3 @@ mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr
 mkdir -p "${KOGITO_HOME}"/ssl-libs
 cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
 cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
-
diff --git a/modules/kogito-graalvm-scripts/configure b/modules/kogito-graalvm-scripts/configure
index 7e00fb055df..77f615b55b6 100644
--- a/modules/kogito-graalvm-scripts/configure
+++ b/modules/kogito-graalvm-scripts/configure
@@ -1,6 +1,12 @@
 #!/bin/sh
 set -e
 
+architecture=$(uname -i)
+
+if [ "$architecture" != x86_64 ]; then
+    exit 0;
+fi
+
 SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 7307e4eb384..2d4d5251433 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -70,11 +70,17 @@ packages:
 
 osbs:
   configuration:
-    container_file: container.yaml
+    container:
+      platforms:
+        only:
+          - x86_64
+          - ppc64le
+      compose:
+        pulp_repos: true
   extra_dir: osbs-extra/rhpam-kogito-builder-rhel8
   repository:
     name: containers/rhpam-7-kogito-builder
     branch: rhba-7-rhel-8
 
 run:
-  workdir: "/home/kogito"
\ No newline at end of file
+  workdir: "/home/kogito"
diff --git a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
index 540e7793c57..ee49e694673 100644
--- a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
@@ -51,11 +51,17 @@ packages:
 
 osbs:
   configuration:
-    container_file: container.yaml
+    container:
+      platforms:
+        only:
+          - x86_64
+          - ppc64le
+      compose:
+        pulp_repos: true
   extra_dir: osbs-extra/rhpam-kogito-runtime-jvm-rhel8
   repository:
     name: containers/rhpam-7-kogito-runtime-jvm
     branch: rhba-7-rhel-8
 
 run:
-  workdir: "/home/kogito"
\ No newline at end of file
+  workdir: "/home/kogito"

From a08001c59f0ab8070cd6a31315aada87409ff155 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 4 Mar 2022 15:57:50 +0100
Subject: [PATCH 427/709] Correct SKIP_TESTS handling (#1158)

---
 .ci/jenkins/Jenkinsfile.deploy | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index f3e3adee162..9c445dacbbe 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -206,14 +206,16 @@ pipeline {
                                 }
                             }
                             stage("Test ${image}") {
-                                dir(workspacePath) {
-                                    try {
-                                        testImage(image)
-                                    } catch (err) {
-                                        registerTestFailedImage(image)
-                                    } finally {
-                                        junit testResults: "target/test/results/*.xml", allowEmptyResults: true
-                                        archiveArtifacts artifacts: "target/test/results/*.xml", allowEmptyArchive: true
+                                if(!shouldSkipTests()) {
+                                    dir(workspacePath) {
+                                        try {
+                                            testImage(image)
+                                        } catch (err) {
+                                            registerTestFailedImage(image)
+                                        } finally {
+                                            junit testResults: "target/test/results/*.xml", allowEmptyResults: true
+                                            archiveArtifacts artifacts: "target/test/results/*.xml", allowEmptyArchive: true
+                                        }
                                     }
                                 }
                             }

From 7dd0c4b6afc816c6450c55596bc8c816f1e8f36c Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 7 Mar 2022 12:01:11 -0300
Subject: [PATCH 428/709] Updated Maven artifacts (#1165)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index e3958cd2093..a29926388f0 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220303.030936-226-runner.jar
-    md5: d7c72f21a6e6a6c25d14193724a8885f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220307.025707-230-runner.jar
+    md5: f213f637272d8ebdd5eb21564acb96c5
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index ce5be9ed4ca..4b6380522a4 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220303.025825-415-runner.jar
-    md5: 73d826cde218e3317dd3c5461a6f660f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220307.024640-419-runner.jar
+    md5: d255a2de9fd69574cd5dd6ee7313ae9d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index ef6e68f1b89..1473fc9227d 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220303.030055-417-runner.jar
-    md5: f8086d4f7d5e745ef4b4105e274c8cfc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220307.024905-421-runner.jar
+    md5: b08f1e875ec903aded9e58fa9958f6cd
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index a8b68dc94fb..5d0a1b65ba8 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220303.030441-50-runner.jar
-    md5: f3894b04399a8e02d233618265b759d8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220307.025241-54-runner.jar
+    md5: 9fc9aad8a222155a237778958bb17eaf
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index d868effe90c..ce4a163b9d0 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220303.030716-260-runner.jar
-    md5: dbaf2c3588810651a0ef89e15cb46655
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220307.025500-264-runner.jar
+    md5: 36cab4e139da8c64fb67213ee5045564
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 4696a4d171a..9964e89a19e 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220303.034234-419-runner.jar
-    md5: 7dfed2518ccf364533cb5f3f138edb49
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220307.033046-423-runner.jar
+    md5: 1262de1ff418749827e713a5180f404d
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220303.034120-414-runner.jar
-    md5: 3d4b1d975961f0036568e521a5cd140d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220307.032937-418-runner.jar
+    md5: 46dc6309e05eb22cdaa44f06e20fd972
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index f7e69c8af94..79c152227d1 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220303.035130-360-runner.jar
-    md5: 0daf38371a17de14be17b30794dd1910
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220307.033837-364-runner.jar
+    md5: bf3a2cf82b998734f90bfe1d4fe510ea
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 86318a05f90..4799c9db947 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220303.025308-226-runner.jar
-    md5: 9411b650a4a3f2161f6dafa3a832aad5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220307.024146-230-runner.jar
+    md5: eaf72c64a5e9b33e57cf1cd50e02218c
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 1a1ccac1dbf..f3c5e5b1165 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220303.024724-294-runner.jar
-    md5: 74d8cf5aab7440dd16e11af590d70d19
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220307.023639-298-runner.jar
+    md5: 9f54e1f510c3f09c66bafe22e2ed7064
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 68258110a8f..c0ad33d0007 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220303.025114-275-runner.jar
-    md5: a356039c823d9f800c7fa00a7f9e0808
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220307.023958-279-runner.jar
+    md5: 7195fbba4ef471cc38ecf146371bc3b3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 07b5b560e0b..1730c60ae69 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220303.024913-294-runner.jar
-    md5: 6940a7009e28b59969f987fc88ffcdd0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220307.023820-298-runner.jar
+    md5: e0da3e22e5d1a7ef65515ca03646ef38
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index fadd3eb8a24..0f5180d67ee 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220303.032439-407-runner.jar
-    md5: 41d3f9ad7edb6cc9b12ca7532f285da3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220307.031335-411-runner.jar
+    md5: 8f732628d218e81a23c6fec0bca194ab
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d39994f8411..25502a7d6a8 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220303.032658-407-runner.jar
-    md5: 8f29d6a71c6a91b1021bd4257060e4a1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220307.031542-411-runner.jar
+    md5: b156518f6b39a04a626a4f3ff59fe434
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index f01429e3ac6..dbbb0c271d9 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220303.034601-326-runner.jar
-    md5: 47bb94278b79198197aeef5cc3afda4a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220307.033359-330-runner.jar
+    md5: b8507b1f7bd8469e01f7daac911ee24c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index b074dc785f5..32422226eb2 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220303.034829-157-runner.jar
-    md5: 6c9c24cad35111156684103900f999c0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220307.033608-161-runner.jar
+    md5: c17fc3359b9bb7ff7418c226f220bc8e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 9ad184a0059..3d2113cab3f 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220303.034705-329-runner.jar
-    md5: bbcfb277fb7bc203b28c00d6cc7be16a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220307.033453-333-runner.jar
+    md5: 6d47a00f310c2b93dbc395b8a64ef20c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 60cae214007..2e767709df7 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220303.032619-405-runner.jar
-    md5: 87493377ae9223d64823933698a49dbf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220307.031509-409-runner.jar
+    md5: f0c9e285df50db779c9dc3d2437552de
 
 execute:
   - script: configure

From 70b2cb57839b4c1c02f86a54077d9b7d8f17f7a2 Mon Sep 17 00:00:00 2001
From: Spolti <fspolti@redhat.com>
Date: Tue, 8 Mar 2022 11:45:24 -0300
Subject: [PATCH 429/709] [KOGITO-6215] - Improve logs on kogito-builder image
 while trying to get project version (#1168)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .github/pull_request_template.md       | 2 +-
 RELEASE_NOTES.md                       | 1 +
 modules/kogito-s2i-core/added/s2i-core | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6f8c08e161c..89e499ab01c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,4 +9,4 @@ Please make sure your PR meets the following requirements:
 - [ ] Pull Request does not include fixes for issues other than the main ticket
 - [ ] Your feature/bug fix has a testcase that verifies it
 - [ ] You've tested the new feature/bug fix in an actual OpenShift cluster
-  [ ] You've added a [RELEASE_NOTES.md](RELEASE_NOTES.md) entry regarding this change
\ No newline at end of file
+- [ ] You've added a [RELEASE_NOTES.md](RELEASE_NOTES.md) entry regarding this change
\ No newline at end of file
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c3dfe3db442..e660bc61d7a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -2,6 +2,7 @@
 ## Enhancements
 
 ## Bug Fixes
+- [KOGITO-6215](https://issues.redhat.com/browse/KOGITO-6215) - Improve logs on kogito-builder image while trying to get project version
 
 ## Known Issues
 
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 6415b443014..9ad34536b70 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -277,7 +277,7 @@ function get_quarkus_version() {
             -Dexpression=version.io.quarkus \
             -DforceStdout)
 
-        if [[ ! "$ver" =~ [0-9]{0,2}\.[0-9]{0,3} ]]; then
+        if [[ ! "$ver" =~ ^[0-9]{0,2}\.[0-9]{0,3}\.[0-9]{0,2} ]]; then
             log_error "----> Impossible to get Quarkus version from the generated Maven project (output: '$ver'), failing build"
             exit 1
         fi

From dd4aba2c316a8555f18c1a38baa86fbff5f5775d Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 8 Mar 2022 16:17:26 -0300
Subject: [PATCH 430/709] Updated Maven artifacts (#1169)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index a29926388f0..7f0042e47b3 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220307.025707-230-runner.jar
-    md5: f213f637272d8ebdd5eb21564acb96c5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220308.024923-231-runner.jar
+    md5: e966fdb7856c8c16f6f00005efcb9d2b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 4b6380522a4..39fd0cab7c3 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220307.024640-419-runner.jar
-    md5: d255a2de9fd69574cd5dd6ee7313ae9d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220308.023859-420-runner.jar
+    md5: 3c1372fbba6312b234723234d86f7903
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 1473fc9227d..dab77f5bef6 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220307.024905-421-runner.jar
-    md5: b08f1e875ec903aded9e58fa9958f6cd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220308.024115-422-runner.jar
+    md5: 209c15dc443d43a1f6e6c6cd9f89c1f3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 5d0a1b65ba8..017e8ec797d 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220307.025241-54-runner.jar
-    md5: 9fc9aad8a222155a237778958bb17eaf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220308.024444-55-runner.jar
+    md5: 7b502e0ad64ab9e098a29b4155d2d752
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index ce4a163b9d0..fc16c597414 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220307.025500-264-runner.jar
-    md5: 36cab4e139da8c64fb67213ee5045564
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220308.024711-265-runner.jar
+    md5: 5471b42eb2a9d5d4d46e4e3d287d7a22
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 9964e89a19e..1bbdc40869b 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220307.033046-423-runner.jar
-    md5: 1262de1ff418749827e713a5180f404d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220308.032124-424-runner.jar
+    md5: 578cf05b5876bcd75c3ec05aa92e641c
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220307.032937-418-runner.jar
-    md5: 46dc6309e05eb22cdaa44f06e20fd972
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220308.032013-419-runner.jar
+    md5: 19e4dbf7990b372b4a0cec8d2b7aea39
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 79c152227d1..d1bc1cfda79 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220307.033837-364-runner.jar
-    md5: bf3a2cf82b998734f90bfe1d4fe510ea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220308.032942-365-runner.jar
+    md5: 5293636f522ebead7bd6e2f75dbf6469
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 4799c9db947..23ef11902c5 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220307.024146-230-runner.jar
-    md5: eaf72c64a5e9b33e57cf1cd50e02218c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220308.023419-231-runner.jar
+    md5: c5476e4d5a09873d1dab154350acd220
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index f3c5e5b1165..f3f5d1f2f33 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220307.023639-298-runner.jar
-    md5: 9f54e1f510c3f09c66bafe22e2ed7064
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220308.022858-299-runner.jar
+    md5: e32edb46601927a74a729fdc69454ed3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index c0ad33d0007..0c08f284433 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220307.023958-279-runner.jar
-    md5: 7195fbba4ef471cc38ecf146371bc3b3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220308.023232-280-runner.jar
+    md5: 07f532438a77e29a7b32ff16384166e1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 1730c60ae69..8e7e07d42f0 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220307.023820-298-runner.jar
-    md5: e0da3e22e5d1a7ef65515ca03646ef38
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220308.023048-299-runner.jar
+    md5: 2f31a6a640c848296ee8aa9e90b70b5a
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 0f5180d67ee..6b108a71657 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220307.031335-411-runner.jar
-    md5: 8f732628d218e81a23c6fec0bca194ab
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220308.030417-412-runner.jar
+    md5: 7ac73cbfa8a0d471e175d91f8993fe15
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 25502a7d6a8..5c18aeb5edf 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220307.031542-411-runner.jar
-    md5: b156518f6b39a04a626a4f3ff59fe434
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220308.030618-412-runner.jar
+    md5: 4769d1d7ec176886d900fec3e787de03
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index dbbb0c271d9..a5b9fd4b48c 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220307.033359-330-runner.jar
-    md5: b8507b1f7bd8469e01f7daac911ee24c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220308.032440-331-runner.jar
+    md5: a55bcea14590ddab18b15e391233dedb
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 32422226eb2..be209960f24 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220307.033608-161-runner.jar
-    md5: c17fc3359b9bb7ff7418c226f220bc8e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220308.032659-162-runner.jar
+    md5: 77c1f80c93e40b6892d741e8698618c6
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 3d2113cab3f..59712e16aac 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220307.033453-333-runner.jar
-    md5: 6d47a00f310c2b93dbc395b8a64ef20c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220308.032538-334-runner.jar
+    md5: 6658410ab8673a7ff36ee7c59e53fab1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 2e767709df7..7f9af8c3124 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220307.031509-409-runner.jar
-    md5: f0c9e285df50db779c9dc3d2437552de
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220308.030549-410-runner.jar
+    md5: 17c04c766f42c2694e9a2a2db3bc063b
 
 execute:
   - script: configure

From a2312e284aee68505991ce49fc1fd9063d3eaa0b Mon Sep 17 00:00:00 2001
From: Fast Chauffeur <desmax74@users.noreply.github.com>
Date: Tue, 8 Mar 2022 20:17:51 +0100
Subject: [PATCH 431/709] [Kogito-4717]Remove JQ module from kogito images
 (#1071)

Signed-off-by: desmax74 <mdessi@redhat.com>
---
 README.md                                         |  3 +--
 kogito-builder-overrides.yaml                     |  1 -
 kogito-runtime-jvm-overrides.yaml                 |  1 -
 kogito-runtime-native-overrides.yaml              |  1 -
 modules/kogito-jq/clean.sh                        |  4 ----
 modules/kogito-jq/module.yaml                     | 15 ---------------
 .../added/kogito-kubernetes-client.sh             |  2 +-
 ...-kogito-builder-openj9-11-rhel8-overrides.yaml |  1 -
 rhpam-kogito-builder-rhel8-overrides.yaml         |  1 -
 ...ito-runtime-jvm-openj9-11-rhel8-overrides.yaml |  2 --
 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml     |  2 --
 rhpam-kogito-runtime-native-rhel8-overrides.yaml  |  1 -
 12 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 modules/kogito-jq/clean.sh
 delete mode 100644 modules/kogito-jq/module.yaml

diff --git a/README.md b/README.md
index 22d6c6537c0..88e2bda3250 100644
--- a/README.md
+++ b/README.md
@@ -1139,8 +1139,7 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-jobs-service-ephemeral](modules/kogito-jobs-service-ephemeral): Installs and Configure the in-memory jobs-service jar inside the image
 - [kogito-jobs-service-infinispan](modules/kogito-jobs-service-infinispan): Installs and Configure the infinispan jobs-service jar inside the image
 - [kogito-jobs-service-mongodb](modules/kogito-jobs-service-mongodb): Installs and Configure the mongodb jobs-service jar inside the image
-- [kogito-jobs-service-postgresql](modules/kogito-jobs-service-postgresql): Installs and Configure the postgresql jobs-service jar inside the image  
-- [kogito-jq](modules/kogito-jq): Provides jq binary.
+- [kogito-jobs-service-postgresql](modules/kogito-jobs-service-postgresql): Installs and Configure the postgresql jobs-service jar inside the image
 - [kogito-kubernetes-client](modules/kogito-kubernetes-client): Provides a simple wrapper to interact with Kubernetes API.
 - [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
 - [kogito-logging](modules/kogito-logging): Provides common logging functions.
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index f057d9ad960..4b5d1cd9f2a 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -40,7 +40,6 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.jq
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.graalvm.installer
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index 03ee9a7857d..5d73f815894 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -33,7 +33,6 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.jq
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.openjdk
diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-overrides.yaml
index 7462c22af7d..be7271c7f50 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -33,7 +33,6 @@ modules:
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.jq
   - name: org.kie.kogito.logging
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.s2i.core
diff --git a/modules/kogito-jq/clean.sh b/modules/kogito-jq/clean.sh
deleted file mode 100644
index d99eb4fb10e..00000000000
--- a/modules/kogito-jq/clean.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-microdnf clean all
-rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-jq/module.yaml b/modules/kogito-jq/module.yaml
deleted file mode 100644
index bc3a40321bb..00000000000
--- a/modules/kogito-jq/module.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.jq
-version: "2.0.0-snapshot"
-
-modules:
-  install:
-    - name: org.kie.kogito.epel
-      version: "7"
-
-execute:
-  - script: clean.sh
-
-packages:
-  install:
-    - jq
\ No newline at end of file
diff --git a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
index 472588e9066..6ff9c801f84 100644
--- a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
+++ b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
@@ -18,7 +18,7 @@ function is_running_on_kubernetes() {
 # ${3} labels (list only), restrict resources by these labels. e.g. app=myapp. Defaults to empty
 # ${4} fields (list only), restrict resources by these fields. e.g. metadata.name=${resource_name}. see: https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/
 # see: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.14/
-# to parse this response, use jq: https://stedolan.github.io/jq/tutorial/ (installed in this module)
+# to parse this response, use jq: https://stedolan.github.io/jq/tutorial/
 function list_or_get_k8s_resource() {
     local api="${1}"
     local resource="${2}"
diff --git a/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml b/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml
index 5bb2b260ca6..bf9653143b5 100644
--- a/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml
@@ -56,7 +56,6 @@ packages:
   content_sets_file: content_sets.yaml
   install:
     - bc
-    - jq
     - gcc
     - gcc-c++
 
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 2d4d5251433..d59c5661ae7 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -62,7 +62,6 @@ packages:
   content_sets_file: content_sets.yaml
   install:
     - bc
-    - jq
     - gcc
     - gcc-c++
     - glibc-devel
diff --git a/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml
index b77d8b0acab..76159eafb44 100644
--- a/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml
@@ -46,8 +46,6 @@ modules:
 
 packages:
   content_sets_file: content_sets.yaml
-  install:
-    - jq
 
 osbs:
   configuration:
diff --git a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
index ee49e694673..a89722e0e26 100644
--- a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
@@ -46,8 +46,6 @@ modules:
 
 packages:
   content_sets_file: content_sets.yaml
-  install:
-    - jq
 
 osbs:
   configuration:
diff --git a/rhpam-kogito-runtime-native-rhel8-overrides.yaml b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
index c4babfac694..b5052a01bfd 100644
--- a/rhpam-kogito-runtime-native-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
@@ -44,7 +44,6 @@ packages:
   content_sets_file: content_sets.yaml
   install:
     - glibc
-    - jq
 
 osbs:
   configuration:

From 0a0c5a5534c6fc963074fde1d0a6aededd197244 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 9 Mar 2022 09:31:29 -0300
Subject: [PATCH 432/709] Updated Maven artifacts (#1173)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 7f0042e47b3..14b2a530fda 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220308.024923-231-runner.jar
-    md5: e966fdb7856c8c16f6f00005efcb9d2b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220309.030552-233-runner.jar
+    md5: e9add5322e567ecc3805254b2a57ed5e
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 39fd0cab7c3..4374b9620e2 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220308.023859-420-runner.jar
-    md5: 3c1372fbba6312b234723234d86f7903
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220309.025454-422-runner.jar
+    md5: 607f4c5387bf5f9b34c1eb1a614fd36b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index dab77f5bef6..1534e63107a 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220308.024115-422-runner.jar
-    md5: 209c15dc443d43a1f6e6c6cd9f89c1f3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220309.025726-424-runner.jar
+    md5: ef49ee584d2d67f30341bb7df8115a58
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 017e8ec797d..c1494591720 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220308.024444-55-runner.jar
-    md5: 7b502e0ad64ab9e098a29b4155d2d752
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220309.030111-57-runner.jar
+    md5: d35f5f69f299b0eaea63902d0404b717
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index fc16c597414..6a0207690cb 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220308.024711-265-runner.jar
-    md5: 5471b42eb2a9d5d4d46e4e3d287d7a22
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220309.030340-267-runner.jar
+    md5: 9dcfbe749805e967d7f4b9c132d419e7
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 1bbdc40869b..f3c932307c5 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220308.032124-424-runner.jar
-    md5: 578cf05b5876bcd75c3ec05aa92e641c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220309.033849-426-runner.jar
+    md5: 9929f3eef0073032eaa85ee5d65585c2
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220308.032013-419-runner.jar
-    md5: 19e4dbf7990b372b4a0cec8d2b7aea39
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220309.033742-421-runner.jar
+    md5: 8f246b5e40862fbe84d5f844702c25a5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index d1bc1cfda79..53e9ffdf385 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220308.032942-365-runner.jar
-    md5: 5293636f522ebead7bd6e2f75dbf6469
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220309.034648-367-runner.jar
+    md5: a6f1b1eaac81bfe10f41f5abdaf8eb18
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 23ef11902c5..09c91d7e85a 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220308.023419-231-runner.jar
-    md5: c5476e4d5a09873d1dab154350acd220
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220309.024945-233-runner.jar
+    md5: fa9d87362e41fc99b471d73ecf2f4357
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index f3f5d1f2f33..faac119fa53 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220308.022858-299-runner.jar
-    md5: e32edb46601927a74a729fdc69454ed3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220309.024416-301-runner.jar
+    md5: 9c2048b5c6f6fc20364c10eeb63ade79
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 0c08f284433..a00f278fd76 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220308.023232-280-runner.jar
-    md5: 07f532438a77e29a7b32ff16384166e1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220309.024751-282-runner.jar
+    md5: 572a652adc10bf29295b11ea0c074d46
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 8e7e07d42f0..1649fa0b43f 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220308.023048-299-runner.jar
-    md5: 2f31a6a640c848296ee8aa9e90b70b5a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220309.024605-301-runner.jar
+    md5: 12c614ede11b03fb794d0d36a281fb34
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 6b108a71657..4c0347eaa7c 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220308.030417-412-runner.jar
-    md5: 7ac73cbfa8a0d471e175d91f8993fe15
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220309.032133-414-runner.jar
+    md5: e84ec6bbef0d5d59d5f27e91ab53d29f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 5c18aeb5edf..4767da16890 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220308.030618-412-runner.jar
-    md5: 4769d1d7ec176886d900fec3e787de03
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220309.032340-414-runner.jar
+    md5: 4fc04daff20ee6aed7a77354cab5339a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index a5b9fd4b48c..acd984e5637 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220308.032440-331-runner.jar
-    md5: a55bcea14590ddab18b15e391233dedb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220309.034207-333-runner.jar
+    md5: b44e39076d4db3b160d3c3cdb9dfefaf
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index be209960f24..c81bdbfd611 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220308.032659-162-runner.jar
-    md5: 77c1f80c93e40b6892d741e8698618c6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220309.034420-164-runner.jar
+    md5: 97bbc5a2e13f3b0a04e38afcdc480605
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 59712e16aac..695f9c34afa 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220308.032538-334-runner.jar
-    md5: 6658410ab8673a7ff36ee7c59e53fab1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220309.034300-336-runner.jar
+    md5: b4dbc21226356f25ff0fa025f602195c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 7f9af8c3124..616567bcaa5 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220308.030549-410-runner.jar
-    md5: 17c04c766f42c2694e9a2a2db3bc063b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220309.032310-412-runner.jar
+    md5: 85511cbcc79eb3e14e55ab486537e87c
 
 execute:
   - script: configure

From 0c632fe9650898905db5ad933f054c211b9a2128 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 10 Mar 2022 11:17:08 -0300
Subject: [PATCH 433/709] Updated Maven artifacts (#1175)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 14b2a530fda..57c7943c17d 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220309.030552-233-runner.jar
-    md5: e9add5322e567ecc3805254b2a57ed5e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220310.030542-235-runner.jar
+    md5: 92e1d91c830a1cacfad220605e4a37ba
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 4374b9620e2..a9ec31550b5 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220309.025454-422-runner.jar
-    md5: 607f4c5387bf5f9b34c1eb1a614fd36b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220310.025443-424-runner.jar
+    md5: 3ff17ccb968813e2855c7b4eabe257ce
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 1534e63107a..7b874de27d4 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220309.025726-424-runner.jar
-    md5: ef49ee584d2d67f30341bb7df8115a58
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220310.025708-426-runner.jar
+    md5: 793cca4ddb55b3a7eb6359e9393ec857
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index c1494591720..354721b3772 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220309.030111-57-runner.jar
-    md5: d35f5f69f299b0eaea63902d0404b717
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220310.030049-59-runner.jar
+    md5: 068c4a61b2cb7dbde6a7f0ef5335f815
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 6a0207690cb..3646660a20e 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220309.030340-267-runner.jar
-    md5: 9dcfbe749805e967d7f4b9c132d419e7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220310.030325-269-runner.jar
+    md5: 17132c9e58ece72f5f978afa9e65f704
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index f3c932307c5..5b2730c593d 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220309.033849-426-runner.jar
-    md5: 9929f3eef0073032eaa85ee5d65585c2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220310.033900-428-runner.jar
+    md5: e6366afafc4ac0202a264eee7e53236c
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220309.033742-421-runner.jar
-    md5: 8f246b5e40862fbe84d5f844702c25a5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220310.033752-423-runner.jar
+    md5: 2d71de6f39553598b3e0d44b2181c148
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 53e9ffdf385..246153c8ac2 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220309.034648-367-runner.jar
-    md5: a6f1b1eaac81bfe10f41f5abdaf8eb18
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220310.034658-369-runner.jar
+    md5: 60ea345d9595763ac09c7f67e88ffc94
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 09c91d7e85a..4dc91ee83f0 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220309.024945-233-runner.jar
-    md5: fa9d87362e41fc99b471d73ecf2f4357
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220310.024949-235-runner.jar
+    md5: ed8c8ab2df58f5d179eff8c807558d3e
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index faac119fa53..114a857b042 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220309.024416-301-runner.jar
-    md5: 9c2048b5c6f6fc20364c10eeb63ade79
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220310.024419-303-runner.jar
+    md5: 26f237feae00e591fa6590f15ee8a445
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index a00f278fd76..40c3f5ce3ac 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220309.024751-282-runner.jar
-    md5: 572a652adc10bf29295b11ea0c074d46
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220310.024759-284-runner.jar
+    md5: 349fb89b3128c02b06ea121f1bf96853
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 1649fa0b43f..88d68a89b30 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220309.024605-301-runner.jar
-    md5: 12c614ede11b03fb794d0d36a281fb34
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220310.024610-303-runner.jar
+    md5: f417bddcee251826b15a6aa904ec33f5
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 4c0347eaa7c..80f0ffb877d 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220309.032133-414-runner.jar
-    md5: e84ec6bbef0d5d59d5f27e91ab53d29f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220310.032142-416-runner.jar
+    md5: f633c697bce5734d7370f7babcb0c8eb
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 4767da16890..c39888f3092 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220309.032340-414-runner.jar
-    md5: 4fc04daff20ee6aed7a77354cab5339a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220310.032348-416-runner.jar
+    md5: f09e737d164ec8b2cae32a384e26b290
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index acd984e5637..f6f7d0a5ba0 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220309.034207-333-runner.jar
-    md5: b44e39076d4db3b160d3c3cdb9dfefaf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220310.034219-335-runner.jar
+    md5: 34846e4cdc13b2deb957b9ac21244915
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index c81bdbfd611..201f5ed1ac0 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220309.034420-164-runner.jar
-    md5: 97bbc5a2e13f3b0a04e38afcdc480605
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220310.034429-166-runner.jar
+    md5: 73560e68730c55e35963458b8edd3ff1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 695f9c34afa..f3189bc2b78 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220309.034300-336-runner.jar
-    md5: b4dbc21226356f25ff0fa025f602195c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220310.034311-338-runner.jar
+    md5: 2aff01917b5c3626188306a86d445299
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 616567bcaa5..67d5026cc6e 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220309.032310-412-runner.jar
-    md5: 85511cbcc79eb3e14e55ab486537e87c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220310.032319-414-runner.jar
+    md5: 853a1e1c363a861aaae1a95cb7381bd3
 
 execute:
   - script: configure

From ceb18793109d040b67988412d9a1901fb60e0eff Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 11 Mar 2022 12:04:06 -0300
Subject: [PATCH 434/709] Updated Maven artifacts (#1177)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 57c7943c17d..e1a1aef75c4 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220310.030542-235-runner.jar
-    md5: 92e1d91c830a1cacfad220605e4a37ba
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220311.030243-237-runner.jar
+    md5: 8bcb8f413366691fe69f8c1265484cea
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index a9ec31550b5..dd3e3ca8e88 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220310.025443-424-runner.jar
-    md5: 3ff17ccb968813e2855c7b4eabe257ce
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220311.025216-426-runner.jar
+    md5: 7240e136f8f6b3d1c91de4f41e5fbbcd
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 7b874de27d4..b2ff41c807e 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220310.025708-426-runner.jar
-    md5: 793cca4ddb55b3a7eb6359e9393ec857
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220311.025436-428-runner.jar
+    md5: 0666addb223b557abebc8c51da63bfa0
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 354721b3772..af2a19aaf71 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220310.030049-59-runner.jar
-    md5: 068c4a61b2cb7dbde6a7f0ef5335f815
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220311.025812-61-runner.jar
+    md5: 1a0c16aed9f3fb91fde4b388d59701a2
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 3646660a20e..9922efaae0a 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220310.030325-269-runner.jar
-    md5: 17132c9e58ece72f5f978afa9e65f704
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220311.030035-271-runner.jar
+    md5: 76e3dae8548d323c9e21ab904285ab95
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 5b2730c593d..84598950831 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220310.033900-428-runner.jar
-    md5: e6366afafc4ac0202a264eee7e53236c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220311.033521-430-runner.jar
+    md5: 9f37426e07bb88fa72342b926a3c303a
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220310.033752-423-runner.jar
-    md5: 2d71de6f39553598b3e0d44b2181c148
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220311.033410-425-runner.jar
+    md5: bf9bdcbfe1661d59cc62ed03b1aa3f8c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 246153c8ac2..4a2f8a87cb4 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220310.034658-369-runner.jar
-    md5: 60ea345d9595763ac09c7f67e88ffc94
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220311.034317-371-runner.jar
+    md5: cfd32453de54551b2e1ade0398395ea6
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 4dc91ee83f0..9a2c802fc1b 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220310.024949-235-runner.jar
-    md5: ed8c8ab2df58f5d179eff8c807558d3e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220311.024714-237-runner.jar
+    md5: 8050558133cb881b48057d94fa7d674c
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 114a857b042..eb2126d42b3 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220310.024419-303-runner.jar
-    md5: 26f237feae00e591fa6590f15ee8a445
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220311.024141-305-runner.jar
+    md5: 41d0072cc452c550a20e1475b44dfd53
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 40c3f5ce3ac..26d8219d564 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220310.024759-284-runner.jar
-    md5: 349fb89b3128c02b06ea121f1bf96853
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220311.024520-286-runner.jar
+    md5: 664153b57d158a7a3593a830a6554895
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 88d68a89b30..888d4826119 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220310.024610-303-runner.jar
-    md5: f417bddcee251826b15a6aa904ec33f5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220311.024331-305-runner.jar
+    md5: 44eeb270f2638aaca4d9e76deff0aad0
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 80f0ffb877d..094ccfb1f2e 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220310.032142-416-runner.jar
-    md5: f633c697bce5734d7370f7babcb0c8eb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220311.031756-418-runner.jar
+    md5: 5082cf168b9aa4d624d28edf0d2570b5
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index c39888f3092..725e6a2c150 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220310.032348-416-runner.jar
-    md5: f09e737d164ec8b2cae32a384e26b290
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220311.032007-418-runner.jar
+    md5: 4770881da085b93e8f9a18cf9fd261f0
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index f6f7d0a5ba0..c195f5506da 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220310.034219-335-runner.jar
-    md5: 34846e4cdc13b2deb957b9ac21244915
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220311.033838-337-runner.jar
+    md5: c88f040ae5f3e5f2471b98b52c61a208
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 201f5ed1ac0..b46b2fa3652 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220310.034429-166-runner.jar
-    md5: 73560e68730c55e35963458b8edd3ff1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220311.034050-168-runner.jar
+    md5: 3028f4d3acf11138dec5085c96a3d8f3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index f3189bc2b78..4fc5c8a7d8c 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220310.034311-338-runner.jar
-    md5: 2aff01917b5c3626188306a86d445299
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220311.033933-340-runner.jar
+    md5: ee8fc5ffa07320260c98ffdedab0176c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 67d5026cc6e..409e3829a07 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220310.032319-414-runner.jar
-    md5: 853a1e1c363a861aaae1a95cb7381bd3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220311.031934-416-runner.jar
+    md5: 6f42060b46fd73ab3bcd2e9fc78a392d
 
 execute:
   - script: configure

From 07abdaecf564e970256f621ef766473e348c62ca Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 14 Mar 2022 08:58:48 -0300
Subject: [PATCH 435/709] Updated Maven artifacts (#1183)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index e1a1aef75c4..3e7abe648a5 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220311.030243-237-runner.jar
-    md5: 8bcb8f413366691fe69f8c1265484cea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220314.030347-243-runner.jar
+    md5: cc49f8e19d6972cf036e13d9e58e3744
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index dd3e3ca8e88..dc55909a6dd 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220311.025216-426-runner.jar
-    md5: 7240e136f8f6b3d1c91de4f41e5fbbcd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220314.025259-432-runner.jar
+    md5: 2f4257f71f1c96e3d5b226afb6595473
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index b2ff41c807e..8ac85eb3bf0 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220311.025436-428-runner.jar
-    md5: 0666addb223b557abebc8c51da63bfa0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220314.025526-434-runner.jar
+    md5: 0bcab1792c67d9466ced5bdef6466cdf
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index af2a19aaf71..cd4287c5d07 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220311.025812-61-runner.jar
-    md5: 1a0c16aed9f3fb91fde4b388d59701a2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220314.025912-67-runner.jar
+    md5: ca3f5598926a8b44467fdd2c5be6c088
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 9922efaae0a..a8c44e1f294 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220311.030035-271-runner.jar
-    md5: 76e3dae8548d323c9e21ab904285ab95
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220314.030138-277-runner.jar
+    md5: 9dbbb15aca022042a229312cb1a9575e
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 84598950831..de6306cae29 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220311.033521-430-runner.jar
-    md5: 9f37426e07bb88fa72342b926a3c303a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220314.033703-436-runner.jar
+    md5: 07653f2cd5cdf8863f79cd93703a2b8f
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220311.033410-425-runner.jar
-    md5: bf9bdcbfe1661d59cc62ed03b1aa3f8c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220314.033556-431-runner.jar
+    md5: c1c9f3211de2a10fccf87c0c96ab5ed2
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 4a2f8a87cb4..2a18922b130 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220311.034317-371-runner.jar
-    md5: cfd32453de54551b2e1ade0398395ea6
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220314.034501-377-runner.jar
+    md5: 79a23f1db4b14dfc12643205a29fef65
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 9a2c802fc1b..3f45dfb9962 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220311.024714-237-runner.jar
-    md5: 8050558133cb881b48057d94fa7d674c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220314.024805-243-runner.jar
+    md5: fcbbd0db87f1d6430ac967cad8111f1b
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index eb2126d42b3..3ecd6b7c5c2 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220311.024141-305-runner.jar
-    md5: 41d0072cc452c550a20e1475b44dfd53
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220314.024247-311-runner.jar
+    md5: dfee98a6c4fbb25acc81531a6fc058e8
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 26d8219d564..a1776242e82 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220311.024520-286-runner.jar
-    md5: 664153b57d158a7a3593a830a6554895
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220314.024616-292-runner.jar
+    md5: a3c7f8df832a63e369d7f5e798ef2810
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 888d4826119..26761ed79a6 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220311.024331-305-runner.jar
-    md5: 44eeb270f2638aaca4d9e76deff0aad0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220314.024433-311-runner.jar
+    md5: 9f94e509c5db8c119715b17c1c9da3fd
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 094ccfb1f2e..b404d4f580a 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220311.031756-418-runner.jar
-    md5: 5082cf168b9aa4d624d28edf0d2570b5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220314.031954-424-runner.jar
+    md5: 2bedd232553abc98e9784aea02df193f
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 725e6a2c150..d504f6bbd00 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220311.032007-418-runner.jar
-    md5: 4770881da085b93e8f9a18cf9fd261f0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220314.032208-424-runner.jar
+    md5: db14d1bb21bdd5d70c8fd1832b22382c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index c195f5506da..9c37a0ac4b0 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220311.033838-337-runner.jar
-    md5: c88f040ae5f3e5f2471b98b52c61a208
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220314.034020-343-runner.jar
+    md5: 74966e6576965c0119a771b74056a2ea
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index b46b2fa3652..a080f254c04 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220311.034050-168-runner.jar
-    md5: 3028f4d3acf11138dec5085c96a3d8f3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220314.034232-174-runner.jar
+    md5: 64b56f33548bbcbe1682bb3b3fd827a9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 4fc5c8a7d8c..cb922bfe471 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220311.033933-340-runner.jar
-    md5: ee8fc5ffa07320260c98ffdedab0176c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220314.034116-346-runner.jar
+    md5: efc66f21986862cffd192721ada54ca4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 409e3829a07..51fb9ac4138 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220311.031934-416-runner.jar
-    md5: 6f42060b46fd73ab3bcd2e9fc78a392d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220314.032134-422-runner.jar
+    md5: 1df09a6d1bfcd5be8580cc939d8f2b38
 
 execute:
   - script: configure

From b99feab5d1ea4f68620daee266e2e3990e4aa0e9 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Wed, 16 Mar 2022 10:36:39 -0300
Subject: [PATCH 436/709] Updated Maven artifacts (#1187)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 3e7abe648a5..59411288ed8 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220314.030347-243-runner.jar
-    md5: cc49f8e19d6972cf036e13d9e58e3744
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220316.025650-245-runner.jar
+    md5: 97fff6efd50e36310a9755c5845ec41e
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index dc55909a6dd..4d23d5d9ad5 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220314.025259-432-runner.jar
-    md5: 2f4257f71f1c96e3d5b226afb6595473
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220316.024556-434-runner.jar
+    md5: f50534fa031d4bfef2ae53de61ea837f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 8ac85eb3bf0..54def192c12 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220314.025526-434-runner.jar
-    md5: 0bcab1792c67d9466ced5bdef6466cdf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220316.024821-436-runner.jar
+    md5: 64204188b8af4060b737915e9a626af1
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index cd4287c5d07..5c544ad104a 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220314.025912-67-runner.jar
-    md5: ca3f5598926a8b44467fdd2c5be6c088
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220316.025200-69-runner.jar
+    md5: bcfb9f5011a9f9e2693d6c26b229455c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index a8c44e1f294..a88a6d39233 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220314.030138-277-runner.jar
-    md5: 9dbbb15aca022042a229312cb1a9575e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220316.025432-279-runner.jar
+    md5: c8ded035bcd7f3f1a30dc136fee64fa2
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index de6306cae29..db35c194722 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220314.033703-436-runner.jar
-    md5: 07653f2cd5cdf8863f79cd93703a2b8f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220316.032957-438-runner.jar
+    md5: 936cf64311286375327afdc704d72b95
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220314.033556-431-runner.jar
-    md5: c1c9f3211de2a10fccf87c0c96ab5ed2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220316.032846-433-runner.jar
+    md5: 6e53b473e3788859a11fd5b4d2e15ce7
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 2a18922b130..ec2578a0efa 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220314.034501-377-runner.jar
-    md5: 79a23f1db4b14dfc12643205a29fef65
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220316.033819-379-runner.jar
+    md5: 9de83146fccfcbccd0a070430512cebc
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 3f45dfb9962..a4ec1987240 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220314.024805-243-runner.jar
-    md5: fcbbd0db87f1d6430ac967cad8111f1b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220316.024111-245-runner.jar
+    md5: b207f33854029de11af9058ff062a8c1
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 3ecd6b7c5c2..800e3daff92 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220314.024247-311-runner.jar
-    md5: dfee98a6c4fbb25acc81531a6fc058e8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220316.023549-313-runner.jar
+    md5: 84830717af248eef4afc32f3ae536f35
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index a1776242e82..f203c6dc565 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220314.024616-292-runner.jar
-    md5: a3c7f8df832a63e369d7f5e798ef2810
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220316.023924-294-runner.jar
+    md5: 7c4c452dbeda94a91c853aa7550fa0b9
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 26761ed79a6..764c4c48c59 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220314.024433-311-runner.jar
-    md5: 9f94e509c5db8c119715b17c1c9da3fd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220316.023738-313-runner.jar
+    md5: bf0415e69694d8497c7bdcfca31e155c
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index b404d4f580a..808c1bc4c34 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220314.031954-424-runner.jar
-    md5: 2bedd232553abc98e9784aea02df193f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220316.031232-426-runner.jar
+    md5: 12b672996309a36a31e7da4d801c3bcc
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d504f6bbd00..b637c464abb 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220314.032208-424-runner.jar
-    md5: db14d1bb21bdd5d70c8fd1832b22382c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220316.031443-426-runner.jar
+    md5: 46e879ec8bf419a7c23c1f94d4a99d3e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 9c37a0ac4b0..fd12dd1ab47 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220314.034020-343-runner.jar
-    md5: 74966e6576965c0119a771b74056a2ea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220316.033317-345-runner.jar
+    md5: e8d855cdc6887100bf75f372cb73d09b
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index a080f254c04..8e22489da23 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220314.034232-174-runner.jar
-    md5: 64b56f33548bbcbe1682bb3b3fd827a9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220316.033536-176-runner.jar
+    md5: 5fa7fa60859272263d73de37c4d816b8
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index cb922bfe471..4b316874c62 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220314.034116-346-runner.jar
-    md5: efc66f21986862cffd192721ada54ca4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220316.033415-348-runner.jar
+    md5: 5f2bcd326b43e6baf0c42105488691f3
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 51fb9ac4138..5b28226dbdf 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220314.032134-422-runner.jar
-    md5: 1df09a6d1bfcd5be8580cc939d8f2b38
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220316.031409-424-runner.jar
+    md5: d3d043e94b58710fc5e7316fe5a8d899
 
 execute:
   - script: configure

From 9eec0e2f21dcfd4e98bcf4c14782d6871b0a8e08 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Fri, 18 Mar 2022 10:00:44 -0300
Subject: [PATCH 437/709] Updated Maven artifacts (#1189)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 59411288ed8..328f3459a92 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220316.025650-245-runner.jar
-    md5: 97fff6efd50e36310a9755c5845ec41e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220318.025636-247-runner.jar
+    md5: fcfecd2367908d3480cec16712435e15
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 4d23d5d9ad5..75db62b9ca9 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220316.024556-434-runner.jar
-    md5: f50534fa031d4bfef2ae53de61ea837f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220318.024533-436-runner.jar
+    md5: 40403bf52e7744cee0c90eb94a14d13c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 54def192c12..66dab591833 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220316.024821-436-runner.jar
-    md5: 64204188b8af4060b737915e9a626af1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220318.024801-438-runner.jar
+    md5: 3a4c2f73670a7313ca1618d4bcc7c91f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 5c544ad104a..42e90ffd7d8 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220316.025200-69-runner.jar
-    md5: bcfb9f5011a9f9e2693d6c26b229455c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220318.025143-71-runner.jar
+    md5: f907e87e85d21dff3dd38b865109b509
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index a88a6d39233..112295efa9e 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220316.025432-279-runner.jar
-    md5: c8ded035bcd7f3f1a30dc136fee64fa2
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220318.025419-281-runner.jar
+    md5: f24fc5bb12a2ad71dd7412ae7c574a55
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index db35c194722..e3484f70799 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220316.032957-438-runner.jar
-    md5: 936cf64311286375327afdc704d72b95
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220318.032959-440-runner.jar
+    md5: a87f175ca57d34abdf1cb3a436e49354
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220316.032846-433-runner.jar
-    md5: 6e53b473e3788859a11fd5b4d2e15ce7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220318.032855-435-runner.jar
+    md5: 08d72a0c4df9c0b057b63a920e12d8af
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index ec2578a0efa..289c787b242 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220316.033819-379-runner.jar
-    md5: 9de83146fccfcbccd0a070430512cebc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220318.033754-381-runner.jar
+    md5: f251037047f7a92bbeb4ccee207d6735
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index a4ec1987240..760689afda2 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220316.024111-245-runner.jar
-    md5: b207f33854029de11af9058ff062a8c1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220318.024044-247-runner.jar
+    md5: 7520335baedade0b017c1dc190059b3a
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 800e3daff92..864c60cdbae 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220316.023549-313-runner.jar
-    md5: 84830717af248eef4afc32f3ae536f35
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220318.023517-315-runner.jar
+    md5: 48f36a6cb0ed9ab918cf02d4f092f115
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index f203c6dc565..290fc072542 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220316.023924-294-runner.jar
-    md5: 7c4c452dbeda94a91c853aa7550fa0b9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220318.023857-296-runner.jar
+    md5: 6fba9c7c8e8f85b22423e6ebcaa817c4
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 764c4c48c59..9d57b3b75c1 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220316.023738-313-runner.jar
-    md5: bf0415e69694d8497c7bdcfca31e155c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220318.023710-315-runner.jar
+    md5: 10acd6a1fdf4f67b841eaa1f5e5b862d
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 808c1bc4c34..b0b0d229d8b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220316.031232-426-runner.jar
-    md5: 12b672996309a36a31e7da4d801c3bcc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220318.031230-428-runner.jar
+    md5: c052b89376c5613806dfe74b26805d97
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index b637c464abb..e17aa2a550c 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220316.031443-426-runner.jar
-    md5: 46e879ec8bf419a7c23c1f94d4a99d3e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220318.031440-428-runner.jar
+    md5: bd43c4c4a811aa44f2da97151aaf1828
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index fd12dd1ab47..9a7de898886 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220316.033317-345-runner.jar
-    md5: e8d855cdc6887100bf75f372cb73d09b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220318.033314-347-runner.jar
+    md5: 8a74f3776ac4acdd0fddaae5950a75c7
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 8e22489da23..d429eecc5a8 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220316.033536-176-runner.jar
-    md5: 5fa7fa60859272263d73de37c4d816b8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220318.033524-178-runner.jar
+    md5: 94c0091f09b6daa88f5013c3c235cd9a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 4b316874c62..ce9213b843f 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220316.033415-348-runner.jar
-    md5: 5f2bcd326b43e6baf0c42105488691f3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220318.033408-350-runner.jar
+    md5: 2348eecc4dadcd48adab876ff09a3a45
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 5b28226dbdf..c874f44300c 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220316.031409-424-runner.jar
-    md5: d3d043e94b58710fc5e7316fe5a8d899
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220318.031406-426-runner.jar
+    md5: 0e6604dc5df4a189e73e8db5e745fbbd
 
 execute:
   - script: configure

From 3f944bb87be93bac2ee91385d8a9ec37ce515887 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 21 Mar 2022 12:09:58 -0300
Subject: [PATCH 438/709] Updated Maven artifacts (#1193)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 328f3459a92..3e3dfa215d1 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220318.025636-247-runner.jar
-    md5: fcfecd2367908d3480cec16712435e15
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220321.025536-250-runner.jar
+    md5: 09d40854bb6c7a0c2a4105f0d356413b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 75db62b9ca9..8d5bd691a2d 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220318.024533-436-runner.jar
-    md5: 40403bf52e7744cee0c90eb94a14d13c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220321.024448-439-runner.jar
+    md5: 45d5c010912b3751cc4b81e64b919777
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 66dab591833..176b7ae1ee8 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220318.024801-438-runner.jar
-    md5: 3a4c2f73670a7313ca1618d4bcc7c91f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220321.024711-441-runner.jar
+    md5: f46c9c35602caa674020681c2ae17530
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 42e90ffd7d8..77a9ae0908a 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220318.025143-71-runner.jar
-    md5: f907e87e85d21dff3dd38b865109b509
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220321.025046-74-runner.jar
+    md5: 6ade32d0f3a9de2dd695ab0e43668f4f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 112295efa9e..970607e95a9 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220318.025419-281-runner.jar
-    md5: f24fc5bb12a2ad71dd7412ae7c574a55
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220321.025319-284-runner.jar
+    md5: 0f55265775180f33c0afbd1fa882a217
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index e3484f70799..19a0425f080 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220318.032959-440-runner.jar
-    md5: a87f175ca57d34abdf1cb3a436e49354
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220321.032848-443-runner.jar
+    md5: a2b3cb75954fb9d3aeaf4d273637b3ab
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220318.032855-435-runner.jar
-    md5: 08d72a0c4df9c0b057b63a920e12d8af
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220321.032742-438-runner.jar
+    md5: 0f2d8fe76fa20846cc83ac0f1f68af15
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 289c787b242..18aafb805cb 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220318.033754-381-runner.jar
-    md5: f251037047f7a92bbeb4ccee207d6735
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220321.033712-384-runner.jar
+    md5: d94ff5f624b3250447bc427865c13cb1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 760689afda2..ce6a538305c 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220318.024044-247-runner.jar
-    md5: 7520335baedade0b017c1dc190059b3a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220321.023941-250-runner.jar
+    md5: 6d0bb18dfac0aa90e031ef1204d3c37b
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 864c60cdbae..234b4bedce6 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220318.023517-315-runner.jar
-    md5: 48f36a6cb0ed9ab918cf02d4f092f115
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220321.023406-318-runner.jar
+    md5: 0a3159efbb9f76ca74775e008c07dda5
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 290fc072542..b432c2708ef 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220318.023857-296-runner.jar
-    md5: 6fba9c7c8e8f85b22423e6ebcaa817c4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220321.023746-299-runner.jar
+    md5: 58a4ae7f77963e04c88215d7dc275776
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 9d57b3b75c1..593acfa32c3 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220318.023710-315-runner.jar
-    md5: 10acd6a1fdf4f67b841eaa1f5e5b862d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220321.023558-318-runner.jar
+    md5: 6e5634dc173c46b7982b99fda55c78e3
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index b0b0d229d8b..f9b4c70c262 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220318.031230-428-runner.jar
-    md5: c052b89376c5613806dfe74b26805d97
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220321.031123-431-runner.jar
+    md5: fe16518188abdf761726c47a9e7e5087
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index e17aa2a550c..1dfe6ae49bf 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220318.031440-428-runner.jar
-    md5: bd43c4c4a811aa44f2da97151aaf1828
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220321.031334-431-runner.jar
+    md5: bf726e81793296855cba79de6e1c36ab
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 9a7de898886..8350545ace1 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220318.033314-347-runner.jar
-    md5: 8a74f3776ac4acdd0fddaae5950a75c7
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220321.033204-350-runner.jar
+    md5: c2232cf2b8f9cce9d590964d6f3872fa
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index d429eecc5a8..48e766ab928 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220318.033524-178-runner.jar
-    md5: 94c0091f09b6daa88f5013c3c235cd9a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220321.033427-181-runner.jar
+    md5: df7cb06c7b58b608dd7b8ee3df06699c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index ce9213b843f..dc67a5815b2 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220318.033408-350-runner.jar
-    md5: 2348eecc4dadcd48adab876ff09a3a45
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220321.033303-353-runner.jar
+    md5: 249f60eb4e89be9e75d0074f55f74bb4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index c874f44300c..501df9a0d27 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220318.031406-426-runner.jar
-    md5: 0e6604dc5df4a189e73e8db5e745fbbd
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220321.031301-429-runner.jar
+    md5: 0123e6201da31d210b3147d85b441ac1
 
 execute:
   - script: configure

From 792fa538dea23b570212900da57d715ff2efe495 Mon Sep 17 00:00:00 2001
From: Ant Stephenson <1628676+AntStephenson@users.noreply.github.com>
Date: Mon, 21 Mar 2022 17:43:26 +0000
Subject: [PATCH 439/709] [RHPAM-4056] Remove unsupported OpenJ9 images.
 (#1197)

(cherry picked from commit 1939546d74119c88637958b8214e3cc691d662c6)
(cherry picked from commit fb3933f8bb16992c5fd1f2f62f2e89de0964f88c)
---
 content_sets.yaml                             |  4 -
 .../jboss/container/openjdk/jdk/jvm-options   |  9 ---
 .../semeru-11-open/configure.sh               | 25 ------
 .../kogito-openjdk/semeru-11-open/module.yaml | 28 -------
 ...ito-builder-openj9-11-rhel8-overrides.yaml | 78 -------------------
 ...runtime-jvm-openj9-11-rhel8-overrides.yaml | 66 ----------------
 6 files changed, 210 deletions(-)
 delete mode 100644 modules/kogito-openjdk/semeru-11-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
 delete mode 100755 modules/kogito-openjdk/semeru-11-open/configure.sh
 delete mode 100644 modules/kogito-openjdk/semeru-11-open/module.yaml
 delete mode 100644 rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml
 delete mode 100644 rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml

diff --git a/content_sets.yaml b/content_sets.yaml
index 5b28c45381a..73c13e114a0 100644
--- a/content_sets.yaml
+++ b/content_sets.yaml
@@ -15,10 +15,6 @@ x86_64:
   - rhel-8-for-x86_64-baseos-rpms
   - rhel-8-for-x86_64-appstream-rpms
   - rhocp-4.7-for-rhel-8-x86_64-rpms
-s390x:
-  - rhel-8-for-s390x-baseos-rpms
-  - rhel-8-for-s390x-appstream-rpms
-  - rhocp-4.7-for-rhel-8-s390x-rpms
 ppc64le:
   - rhel-8-for-ppc64le-baseos-rpms
   - rhel-8-for-ppc64le-appstream-rpms
diff --git a/modules/kogito-openjdk/semeru-11-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options b/modules/kogito-openjdk/semeru-11-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
deleted file mode 100644
index 4484251d7f7..00000000000
--- a/modules/kogito-openjdk/semeru-11-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# ==============================================================================
-# JDK specific customizations
-#
-# ==============================================================================
-
-function jvm_specific_diagnostics() {
-    echo ""
-}
diff --git a/modules/kogito-openjdk/semeru-11-open/configure.sh b/modules/kogito-openjdk/semeru-11-open/configure.sh
deleted file mode 100755
index c85a8fd0b96..00000000000
--- a/modules/kogito-openjdk/semeru-11-open/configure.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Configure module
-set -e
-
-SCRIPT_DIR=$(dirname $0)
-ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
-
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
-
-alternatives --set java /usr/lib/jvm/ibm-semeru-open-11-jdk/bin/java
-alternatives --set javac /usr/lib/jvm/ibm-semeru-open-11-jdk/bin/javac
-
-# Update securerandom.source for quicker starts
-JAVA_SECURITY_FILE=/usr/lib/jvm/ibm-semeru-open-11-jdk/conf/security/java.security
-SECURERANDOM=securerandom.source
-if grep -q "^$SECURERANDOM=.*" $JAVA_SECURITY_FILE; then
-    sed -i "s|^$SECURERANDOM=.*|$SECURERANDOM=file:/dev/urandom|" $JAVA_SECURITY_FILE
-else
-    echo $SECURERANDOM=file:/dev/urandom >> $JAVA_SECURITY_FILE
-fi
diff --git a/modules/kogito-openjdk/semeru-11-open/module.yaml b/modules/kogito-openjdk/semeru-11-open/module.yaml
deleted file mode 100644
index 694e414b886..00000000000
--- a/modules/kogito-openjdk/semeru-11-open/module.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-schema_version: 1
-
-name: org.kie.kogito.openjdk
-description: "Installs the JDK for OpenJ9 11."
-version: semeru-11-open
-
-labels:
-- name: "org.jboss.product"
-  value: "openjdk"
-- name: "org.jboss.product.version"
-  value: "11"
-- name: "org.jboss.product.openjdk.version"
-  value: "11"
-
-envs:
-- name: "JAVA_HOME"
-  value: "/usr/lib/jvm/ibm-semeru-open-11-jdk"
-- name: "JAVA_VENDOR"
-  value: "IBM"
-- name: "JAVA_VERSION"
-  value: "11"
-
-packages:
-  install:
-  - ibm-semeru-open-11-jdk
-
-execute:
-- script: configure.sh
diff --git a/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml b/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml
deleted file mode 100644
index bf9653143b5..00000000000
--- a/rhpam-kogito-builder-openj9-11-rhel8-overrides.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-schema_version: 1
-
-name: "rhpam-7/rhpam-kogito-builder-openj9-11-rhel8"
-version: "7.12.0"
-from: "registry.redhat.io/ubi8/ubi-minimal:latest"
-description: "RHPAM Platform with IBM Semeru Runtime for building Kogito based on Quarkus or SpringBoot"
-
-labels:
-  - name: "com.redhat.component"
-    value: "rhpam-7-kogito-builder-openj9-11-rhel8-container"
-  - name: "io.k8s.description"
-    value: "RHPAM Platform with IBM Semeru Runtime for building Kogito based on Quarkus or Spring Boot"
-  - name: "io.k8s.display-name"
-    value: "Red Hat build of Kogito builder with IBM Semeru Runtime based on Quarkus or SpringBoot"
-  - name: "io.openshift.tags"
-    value: "rhpam-kogito,builder,kogito,quarkus,springboot,openj9"
-  - name: "io.openshift.s2i.assemble-input-files"
-    value: "/home/kogito/bin"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "RUNTIME_TYPE"
-    example: "springboot"
-    description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
-  - name: JAVA_OPTIONS
-    example: "-Dquarkus.log.level=DEBUG"
-    description: JVM options passed to the Java command.
-  - name: MAVEN_ARGS_APPEND
-    example: "-pl mymodule -am"
-    description: Additional Maven arguments
-  - name: ARTIFACT_DIR
-    example: mymodule/target
-    description: Path to target/ where the jar files are created for multi-module builds
-
-ports:
-  - value: 8080
-
-modules:
-  install:
-    - name: org.kie.kogito.rhpam.prod.profile
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "semeru-11-open"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.maven
-      version: "3.8.1"
-    - name: org.kie.kogito.s2i.core
-    - name: org.kie.kogito.builder
-
-packages:
-  content_sets_file: content_sets.yaml
-  install:
-    - bc
-    - gcc
-    - gcc-c++
-
-osbs:
-  configuration:
-    container:
-      platforms:
-        only:
-          - s390x
-          - ppc64le
-      compose:
-        pulp_repos: true
-        signing_intent: release
-  extra_dir: osbs-extra/rhpam-kogito-builder-rhel8
-  repository:
-    name: containers/rhpam-7-kogito-builder-openj9-11
-    branch: rhba-7-rhel-8
-
-run:
-  workdir: "/home/kogito"
diff --git a/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml
deleted file mode 100644
index 76159eafb44..00000000000
--- a/rhpam-kogito-runtime-jvm-openj9-11-rhel8-overrides.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-schema_version: 1
-
-name: "rhpam-7/rhpam-kogito-runtime-jvm-openj9-11-rhel8"
-version: "7.12.0"
-from: "registry.redhat.io/ubi8/ubi-minimal:latest"
-description: "RHPAM Runtime image with IBM Semeru Runtime for Kogito based on Quarkus or SpringBoot JVM image"
-
-labels:
-  - name: "com.redhat.component"
-    value: "rhpam-7-kogito-runtime-jvm-openj9-11-rhel8-container"
-  - name: "io.k8s.description"
-    value: "RHPAM Runtime image with IBM Semeru Runtime for Kogito based on Quarkus or Spring Boot JVM image"
-  - name: "io.k8s.display-name"
-    value: "Red Hat build of Kogito runtime based on Quarkus or SpringBoot JVM image"
-  - name: "io.openshift.tags"
-    value: "rhpam-kogito,runtime,kogito,quarkus,springboot,jvm,openj9"
-  - name: "io.openshift.s2i.assemble-input-files"
-    value: "/home/kogito/bin"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "RUNTIME_TYPE"
-    example: "springboot"
-    description: "Defines the runtime type of your Kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
-  - name: JAVA_OPTIONS
-    example: "-Dquarkus.log.level=DEBUG"
-    description: JVM options passed to the Java command.
-
-ports:
-  - value: 8080
-
-modules:
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "semeru-11-open"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.s2i.core
-    - name: org.kie.kogito.runtime.jvm
-    - name: org.kie.kogito.security.custom.truststores
-
-packages:
-  content_sets_file: content_sets.yaml
-
-osbs:
-  configuration:
-    container:
-      platforms:
-        only:
-          - s390x
-          - ppc64le
-      compose:
-        pulp_repos: true
-        signing_intent: release
-  extra_dir: osbs-extra/rhpam-kogito-runtime-jvm-rhel8
-  repository:
-    name: containers/rhpam-7-kogito-runtime-jvm-openj9-11
-    branch: rhba-7-rhel-8
-
-run:
-  workdir: "/home/kogito"

From 02f088ce992f8176657cd43fc5b6c422d8b9f3f1 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Tue, 22 Mar 2022 09:43:11 -0300
Subject: [PATCH 440/709] Updated Maven artifacts (#1198)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 3e3dfa215d1..5d476431c69 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220321.025536-250-runner.jar
-    md5: 09d40854bb6c7a0c2a4105f0d356413b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220322.025836-251-runner.jar
+    md5: 9a98f6018fbc5003e1f3e8c9b2954f6f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 8d5bd691a2d..f4871e61bf4 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220321.024448-439-runner.jar
-    md5: 45d5c010912b3751cc4b81e64b919777
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220322.024753-440-runner.jar
+    md5: e0533928bf299194edc1ab3ed1c97e14
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 176b7ae1ee8..5dc7686bcf3 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220321.024711-441-runner.jar
-    md5: f46c9c35602caa674020681c2ae17530
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220322.025013-442-runner.jar
+    md5: b6fb4718120543aa184e9a4e58e2128b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 77a9ae0908a..682069159cf 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220321.025046-74-runner.jar
-    md5: 6ade32d0f3a9de2dd695ab0e43668f4f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220322.025347-75-runner.jar
+    md5: 7979700fc7df5ac63fadc5f3069ef08c
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 970607e95a9..9b158d9ed8d 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220321.025319-284-runner.jar
-    md5: 0f55265775180f33c0afbd1fa882a217
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220322.025620-285-runner.jar
+    md5: 1b5a9013abc450c28414b4272d032bbf
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 19a0425f080..6ca59bfac16 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220321.032848-443-runner.jar
-    md5: a2b3cb75954fb9d3aeaf4d273637b3ab
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220322.033136-444-runner.jar
+    md5: f7199b1635a95b123bbd53fa80e6ae4c
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220321.032742-438-runner.jar
-    md5: 0f2d8fe76fa20846cc83ac0f1f68af15
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220322.033026-439-runner.jar
+    md5: 1a7838fe5e450db2060a1a679d90cd5b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 18aafb805cb..51eff06180d 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220321.033712-384-runner.jar
-    md5: d94ff5f624b3250447bc427865c13cb1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220322.033958-385-runner.jar
+    md5: aa530c62d1b170635fa0f9ece40dab2b
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index ce6a538305c..bbc8605f7e1 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220321.023941-250-runner.jar
-    md5: 6d0bb18dfac0aa90e031ef1204d3c37b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220322.024249-251-runner.jar
+    md5: 9f27cd8db533a7a7d976ebe62e863528
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 234b4bedce6..687eca7f850 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220321.023406-318-runner.jar
-    md5: 0a3159efbb9f76ca74775e008c07dda5
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220322.023728-319-runner.jar
+    md5: 9fb8ca3e0b78261b908c68b042e77372
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index b432c2708ef..7892f521df1 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220321.023746-299-runner.jar
-    md5: 58a4ae7f77963e04c88215d7dc275776
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220322.024058-300-runner.jar
+    md5: c72157ca1f367de390297610f602ad1c
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 593acfa32c3..0f0d854b61c 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220321.023558-318-runner.jar
-    md5: 6e5634dc173c46b7982b99fda55c78e3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220322.023914-319-runner.jar
+    md5: 4a137e6c96540dd4ddfb68380a7bb61b
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index f9b4c70c262..ddfe34895e7 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220321.031123-431-runner.jar
-    md5: fe16518188abdf761726c47a9e7e5087
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220322.031415-432-runner.jar
+    md5: 82b94602e08f42e68ba5477d539598b8
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 1dfe6ae49bf..65b8fdb4ab5 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220321.031334-431-runner.jar
-    md5: bf726e81793296855cba79de6e1c36ab
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220322.031618-432-runner.jar
+    md5: 7cfeca34e79c5d80fd45680fd5d225cb
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 8350545ace1..88ac68cae0f 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220321.033204-350-runner.jar
-    md5: c2232cf2b8f9cce9d590964d6f3872fa
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220322.033454-351-runner.jar
+    md5: 50e44dccd4fa51d1c480795ff78dad8c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 48e766ab928..27f0c2b3a9c 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220321.033427-181-runner.jar
-    md5: df7cb06c7b58b608dd7b8ee3df06699c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220322.033714-182-runner.jar
+    md5: a0ad40a1cf1ecc8a86120ad6fb225a79
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index dc67a5815b2..a23390a2523 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220321.033303-353-runner.jar
-    md5: 249f60eb4e89be9e75d0074f55f74bb4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220322.033552-354-runner.jar
+    md5: 7c2c1175207a2f00a125002449ee155f
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 501df9a0d27..63fdbcda5a2 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220321.031301-429-runner.jar
-    md5: 0123e6201da31d210b3147d85b441ac1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220322.031549-430-runner.jar
+    md5: 6f86ab7b5d4a9c3ac85ef9723b5cb430
 
 execute:
   - script: configure

From 1d70bfea3e26d98db9e88dd2b317c2489616264a Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Thu, 24 Mar 2022 12:27:42 -0300
Subject: [PATCH 441/709] Updated Maven artifacts (#1200)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 5d476431c69..10100862592 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220322.025836-251-runner.jar
-    md5: 9a98f6018fbc5003e1f3e8c9b2954f6f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220324.030213-253-runner.jar
+    md5: 67facc7cfc19dfb61f3a1628df5fb31b
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index f4871e61bf4..8758e8b161b 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220322.024753-440-runner.jar
-    md5: e0533928bf299194edc1ab3ed1c97e14
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220324.025122-442-runner.jar
+    md5: 48b1e561bfbbf0a5bbe0ddc0397abc0d
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 5dc7686bcf3..1fe46ad4a11 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220322.025013-442-runner.jar
-    md5: b6fb4718120543aa184e9a4e58e2128b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220324.025349-444-runner.jar
+    md5: d42126c068625ae36ccb96facfeaf8bc
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 682069159cf..25336374436 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220322.025347-75-runner.jar
-    md5: 7979700fc7df5ac63fadc5f3069ef08c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220324.025735-77-runner.jar
+    md5: 1531f0525abe86b251f0b978c79bcae1
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 9b158d9ed8d..a301f56af8c 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220322.025620-285-runner.jar
-    md5: 1b5a9013abc450c28414b4272d032bbf
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220324.030001-287-runner.jar
+    md5: 6d069920350099890fc7f416349cc857
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 6ca59bfac16..0064ec20a6a 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220322.033136-444-runner.jar
-    md5: f7199b1635a95b123bbd53fa80e6ae4c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220324.033554-446-runner.jar
+    md5: 78031eaa74f458c5dabe8b4054d10c6f
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220322.033026-439-runner.jar
-    md5: 1a7838fe5e450db2060a1a679d90cd5b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220324.033441-441-runner.jar
+    md5: ad7f29a0c1164462cfb0297a66546518
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 51eff06180d..5cc4a3e835a 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220322.033958-385-runner.jar
-    md5: aa530c62d1b170635fa0f9ece40dab2b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220324.034427-387-runner.jar
+    md5: 11aae852e16738cbbe49de964331aa54
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index bbc8605f7e1..0adbfdc06e6 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220322.024249-251-runner.jar
-    md5: 9f27cd8db533a7a7d976ebe62e863528
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220324.024616-253-runner.jar
+    md5: b902ace294ec57f74f33bad86846087b
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 687eca7f850..4a498a2e109 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220322.023728-319-runner.jar
-    md5: 9fb8ca3e0b78261b908c68b042e77372
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220324.024052-321-runner.jar
+    md5: 5c5f9fd445cfe395b66edb9a7fcdf0b1
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 7892f521df1..9e65529bf56 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220322.024058-300-runner.jar
-    md5: c72157ca1f367de390297610f602ad1c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220324.024421-302-runner.jar
+    md5: b59c307031a5afd1822715a97c705fde
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 0f0d854b61c..cc2b6f8bcc5 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220322.023914-319-runner.jar
-    md5: 4a137e6c96540dd4ddfb68380a7bb61b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220324.024238-321-runner.jar
+    md5: ed48027adc534c8c274dea43f4728b60
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index ddfe34895e7..1e766794d2b 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220322.031415-432-runner.jar
-    md5: 82b94602e08f42e68ba5477d539598b8
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220324.031821-434-runner.jar
+    md5: 0ed4e1c968e2c4e89fcb9b79c92cc276
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 65b8fdb4ab5..9478bb0b73b 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220322.031618-432-runner.jar
-    md5: 7cfeca34e79c5d80fd45680fd5d225cb
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220324.032035-434-runner.jar
+    md5: b0106e1184b89feb5026e3a0c686fbb4
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 88ac68cae0f..a8bc2cbb09e 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220322.033454-351-runner.jar
-    md5: 50e44dccd4fa51d1c480795ff78dad8c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220324.033923-353-runner.jar
+    md5: 1760bda27d74e4ea3212cb41ea08b09c
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 27f0c2b3a9c..83e6e029900 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220322.033714-182-runner.jar
-    md5: a0ad40a1cf1ecc8a86120ad6fb225a79
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220324.034147-184-runner.jar
+    md5: b1983b92756e31f53b3ea306d7f510f9
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index a23390a2523..4e503beaa9f 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220322.033552-354-runner.jar
-    md5: 7c2c1175207a2f00a125002449ee155f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220324.034023-356-runner.jar
+    md5: 244c4a1e793eb5b8d9b8b4811bea1e07
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 63fdbcda5a2..ec67f5e1a96 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220322.031549-430-runner.jar
-    md5: 6f86ab7b5d4a9c3ac85ef9723b5cb430
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220324.032000-432-runner.jar
+    md5: 2a4ac1bf5d24658b30fd8ba0f46f354b
 
 execute:
   - script: configure

From c80a2665d5a1e2b030fb4e5ba38b0ba3f9cb9243 Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 28 Mar 2022 13:28:51 -0300
Subject: [PATCH 442/709] Updated Maven artifacts (#1204)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 10100862592..f3b69b7ad95 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220324.030213-253-runner.jar
-    md5: 67facc7cfc19dfb61f3a1628df5fb31b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220328.030821-257-runner.jar
+    md5: dd46a82a587a540f7076632dcf63a7a0
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 8758e8b161b..bb84d25b466 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220324.025122-442-runner.jar
-    md5: 48b1e561bfbbf0a5bbe0ddc0397abc0d
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220328.025552-446-runner.jar
+    md5: c02fde4eb8d89c491be1b211cc49f92f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 1fe46ad4a11..7ec9b0379bf 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220324.025349-444-runner.jar
-    md5: d42126c068625ae36ccb96facfeaf8bc
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220328.025838-448-runner.jar
+    md5: dab2b10adb237b272ac0f81ef3edbd7e
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 25336374436..b95264ee09c 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220324.025735-77-runner.jar
-    md5: 1531f0525abe86b251f0b978c79bcae1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220328.030243-81-runner.jar
+    md5: 9a1b603ece8f48d8d8d48ba06f972de3
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index a301f56af8c..a38510cd7cd 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220324.030001-287-runner.jar
-    md5: 6d069920350099890fc7f416349cc857
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220328.030540-291-runner.jar
+    md5: 0dae9dd14ea78ab23f782220eca59503
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 0064ec20a6a..dd12f74d879 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220324.033554-446-runner.jar
-    md5: 78031eaa74f458c5dabe8b4054d10c6f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220328.034201-450-runner.jar
+    md5: 09157e2d31d70d2dfcdff931cb3ba84b
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220324.033441-441-runner.jar
-    md5: ad7f29a0c1164462cfb0297a66546518
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220328.034050-445-runner.jar
+    md5: 3f65fc7a8b40f32ee6f6c2886bb353ea
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 5cc4a3e835a..1e989869169 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220324.034427-387-runner.jar
-    md5: 11aae852e16738cbbe49de964331aa54
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220328.035029-391-runner.jar
+    md5: 26bcdab248f783814f3106d13174ce03
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 0adbfdc06e6..05675afeeca 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220324.024616-253-runner.jar
-    md5: b902ace294ec57f74f33bad86846087b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220328.025016-257-runner.jar
+    md5: f7165a4137081b010d989b814312ff72
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 4a498a2e109..94da3d2bbd7 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220324.024052-321-runner.jar
-    md5: 5c5f9fd445cfe395b66edb9a7fcdf0b1
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220328.024437-325-runner.jar
+    md5: 0ecb447542a6ececa7904caac3174c23
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 9e65529bf56..c72abc6c220 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220324.024421-302-runner.jar
-    md5: b59c307031a5afd1822715a97c705fde
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220328.024824-306-runner.jar
+    md5: 932add2bf43b94440f33de8566b695e3
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index cc2b6f8bcc5..846dd3adbdc 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220324.024238-321-runner.jar
-    md5: ed48027adc534c8c274dea43f4728b60
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220328.024623-325-runner.jar
+    md5: a7fed40b62758692f3bae33c0aaadd6f
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 1e766794d2b..fd331d2fc13 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220324.031821-434-runner.jar
-    md5: 0ed4e1c968e2c4e89fcb9b79c92cc276
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220328.032422-438-runner.jar
+    md5: 4466284496fbb7c57e786bebe79ba3a4
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 9478bb0b73b..d8f36be0370 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220324.032035-434-runner.jar
-    md5: b0106e1184b89feb5026e3a0c686fbb4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220328.032634-438-runner.jar
+    md5: a3522eab6a816e118affe3b79e48b557
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index a8bc2cbb09e..6ba8114f082 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220324.033923-353-runner.jar
-    md5: 1760bda27d74e4ea3212cb41ea08b09c
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220328.034550-357-runner.jar
+    md5: fcf9fdeab411f7eac61312b01c79b99a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 83e6e029900..03358290c21 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220324.034147-184-runner.jar
-    md5: b1983b92756e31f53b3ea306d7f510f9
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220328.034759-188-runner.jar
+    md5: 97af35409558461d779153acabfb284e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 4e503beaa9f..cb14fb03e4a 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220324.034023-356-runner.jar
-    md5: 244c4a1e793eb5b8d9b8b4811bea1e07
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220328.034643-360-runner.jar
+    md5: 463de8dea1155b50fb156d1bfd3186af
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index ec67f5e1a96..df21e98f298 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220324.032000-432-runner.jar
-    md5: 2a4ac1bf5d24658b30fd8ba0f46f354b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220328.032559-436-runner.jar
+    md5: cc699ce0a68a17fbd0b7b1452e0f63ab
 
 execute:
   - script: configure

From da4158e5eef43d74dbd0914dfcbc6a0420a5719a Mon Sep 17 00:00:00 2001
From: bsig-cloud gh bot <51681526+bsig-gh-bot@users.noreply.github.com>
Date: Mon, 4 Apr 2022 12:19:12 -0300
Subject: [PATCH 443/709] Updated Maven artifacts (#1208)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 modules/kogito-data-index-ephemeral/module.yaml    | 4 ++--
 modules/kogito-data-index-infinispan/module.yaml   | 4 ++--
 modules/kogito-data-index-mongodb/module.yaml      | 4 ++--
 modules/kogito-data-index-oracle/module.yaml       | 4 ++--
 modules/kogito-data-index-postgresql/module.yaml   | 4 ++--
 modules/kogito-explainability/module.yaml          | 8 ++++----
 modules/kogito-jit-runner/module.yaml              | 4 ++--
 modules/kogito-jobs-service-ephemeral/module.yaml  | 4 ++--
 modules/kogito-jobs-service-infinispan/module.yaml | 4 ++--
 modules/kogito-jobs-service-mongodb/module.yaml    | 4 ++--
 modules/kogito-jobs-service-postgresql/module.yaml | 4 ++--
 modules/kogito-management-console/module.yaml      | 4 ++--
 modules/kogito-task-console/module.yaml            | 4 ++--
 modules/kogito-trusty-infinispan/module.yaml       | 4 ++--
 modules/kogito-trusty-postgresql/module.yaml       | 4 ++--
 modules/kogito-trusty-redis/module.yaml            | 4 ++--
 modules/kogito-trusty-ui/module.yaml               | 4 ++--
 17 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index f3b69b7ad95..757cc3940b8 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220328.030821-257-runner.jar
-    md5: dd46a82a587a540f7076632dcf63a7a0
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220404.030705-261-runner.jar
+    md5: 089e8f51bab1f5c70967f7edb17fb05f
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index bb84d25b466..aab0914d628 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220328.025552-446-runner.jar
-    md5: c02fde4eb8d89c491be1b211cc49f92f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220404.025504-450-runner.jar
+    md5: 17b4319dd628a76f30f6b3f3a701b65a
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 7ec9b0379bf..67be84461c8 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220328.025838-448-runner.jar
-    md5: dab2b10adb237b272ac0f81ef3edbd7e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220404.025742-452-runner.jar
+    md5: 84770ec122e4ea3fcf7172383c7812f9
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index b95264ee09c..a859cf42581 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220328.030243-81-runner.jar
-    md5: 9a1b603ece8f48d8d8d48ba06f972de3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220404.030139-85-runner.jar
+    md5: 7e8d22c5ae0a1bf748ae21e79abf2fa0
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index a38510cd7cd..98163b73413 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220328.030540-291-runner.jar
-    md5: 0dae9dd14ea78ab23f782220eca59503
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220404.030434-295-runner.jar
+    md5: 6697093d813a347279f0d520d14f1ccf
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index dd12f74d879..32ff530adea 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -4,11 +4,11 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220328.034201-450-runner.jar
-    md5: 09157e2d31d70d2dfcdff931cb3ba84b
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220404.033934-454-runner.jar
+    md5: adf7e263ec370e308707cda1570d5f3d
   - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220328.034050-445-runner.jar
-    md5: 3f65fc7a8b40f32ee6f6c2886bb353ea
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220404.033825-449-runner.jar
+    md5: 2f47df6c4dab34d5f8d42db44602c528
 
 execute:
   - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 1e989869169..a5c0d75920f 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220328.035029-391-runner.jar
-    md5: 26bcdab248f783814f3106d13174ce03
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220404.034752-395-runner.jar
+    md5: c0c6b3ff17868553dab18ada0b874a4d
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 05675afeeca..10a0bda04a4 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220328.025016-257-runner.jar
-    md5: f7165a4137081b010d989b814312ff72
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220404.024952-261-runner.jar
+    md5: 9a8f32ab219d46b22c77d39ff3ee0fec
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 94da3d2bbd7..eae6e26e7ff 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220328.024437-325-runner.jar
-    md5: 0ecb447542a6ececa7904caac3174c23
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220404.024438-329-runner.jar
+    md5: 664998f6a5a966546918619216bdb783
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index c72abc6c220..69e8535983b 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220328.024824-306-runner.jar
-    md5: 932add2bf43b94440f33de8566b695e3
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220404.024808-310-runner.jar
+    md5: 6d490e11f2db6088012ac51e8c7a8606
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 846dd3adbdc..64a3eac2073 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220328.024623-325-runner.jar
-    md5: a7fed40b62758692f3bae33c0aaadd6f
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220404.024621-329-runner.jar
+    md5: cce13d9570b36719bca94b186c2aaa64
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index fd331d2fc13..bed3c94ddb0 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220328.032422-438-runner.jar
-    md5: 4466284496fbb7c57e786bebe79ba3a4
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220404.032229-442-runner.jar
+    md5: e5b389ebfc089abf83c4a34e1518b79c
 
 execute:
   - script: configure
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index d8f36be0370..cb3cd2920c0 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220328.032634-438-runner.jar
-    md5: a3522eab6a816e118affe3b79e48b557
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220404.032429-442-runner.jar
+    md5: cfe99b9b4d1f398ea762261da32d51b1
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 6ba8114f082..3a0f70a1baf 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220328.034550-357-runner.jar
-    md5: fcf9fdeab411f7eac61312b01c79b99a
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220404.034252-361-runner.jar
+    md5: 96494956d6d654b7729971233076a64a
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 03358290c21..1e06b650360 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220328.034759-188-runner.jar
-    md5: 97af35409558461d779153acabfb284e
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220404.034510-192-runner.jar
+    md5: 853ef345959340b543bdf29997aff016
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index cb14fb03e4a..f03d1c8b40a 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220328.034643-360-runner.jar
-    md5: 463de8dea1155b50fb156d1bfd3186af
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220404.034352-364-runner.jar
+    md5: d6cdf942ca99709fed2f2b241f129b4e
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index df21e98f298..f4890913b24 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -4,8 +4,8 @@ version: "2.0.0-snapshot"
 
 artifacts:
   - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220328.032559-436-runner.jar
-    md5: cc699ce0a68a17fbd0b7b1452e0f63ab
+    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220404.032400-440-runner.jar
+    md5: bef4d94a621f51fae03c8b1cdbff19ce
 
 execute:
   - script: configure

From d527654263830cd67bcf7e17c94359386f5766c5 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 22 Apr 2022 16:13:26 +0200
Subject: [PATCH 444/709] Correct Run BDD Runtimes (#1238)

---
 .ci/jenkins/dsl/jobs.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 3e42f7a26ba..b18b10e6be0 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -58,7 +58,7 @@ void setupPrJob(String branch = "${GIT_BRANCH}") {
 void setupDeployJob(String jobFolder, KogitoJobType jobType) {
     def jobParams = getJobParams('kogito-images-deploy', jobFolder, "${JENKINSFILE_PATH}/Jenkinsfile.deploy", 'Kogito Images Deploy')
     if (jobType == KogitoJobType.PR) {
-        jobParams.git.branch = '${GIT_BRANCH_NAME}'
+        jobParams.git.branch = '${BUILD_BRANCH_NAME}'
         jobParams.git.author = '${GIT_AUTHOR}'
         jobParams.git.project_url = Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository)
     }

From fcc366d344ecd9f68edb8dc49022c100b699cbb6 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 27 Apr 2022 09:08:39 -0300
Subject: [PATCH 445/709] =?UTF-8?q?[KOGITO-6684]=20-=20Kogito=20images=20f?=
 =?UTF-8?q?or=20supporting=20services=20should=20no=20longe=E2=80=A6=20(#1?=
 =?UTF-8?q?206)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-6684] - Kogito images for supporting services should no longer download the runner jar from maven repository

Signed-off-by: spolti <fspolti@redhat.com>

* apply suggestions from review.

Signed-off-by: spolti <fspolti@redhat.com>

* review changes

Signed-off-by: spolti <fspolti@redhat.com>

* apply review's suggestion

Signed-off-by: spolti <fspolti@redhat.com>

* updates

* update pipelines

* update jenkinsfile

Co-authored-by: radtriste <tradisso@redhat.com>
---
 .ci/jenkins/Jenkinsfile                       |  20 +-
 .ci/jenkins/Jenkinsfile.deploy                |  78 ++++----
 .ci/jenkins/Jenkinsfile.promote               |  70 +++----
 Makefile                                      |  11 +-
 README.md                                     |   2 +-
 RELEASE_NOTES.md                              |   2 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-data-index-ephemeral/configure |   2 +-
 .../kogito-data-index-ephemeral/module.yaml   |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 .../kogito-data-index-infinispan/configure    |   2 +-
 .../kogito-data-index-infinispan/module.yaml  |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-data-index-mongodb/configure   |   2 +-
 modules/kogito-data-index-mongodb/module.yaml |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-data-index-oracle/configure    |   2 +-
 modules/kogito-data-index-oracle/module.yaml  |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 .../kogito-data-index-postgresql/configure    |   2 +-
 .../kogito-data-index-postgresql/module.yaml  |   7 +-
 .../added/kogito-app-launch.sh                |   5 +-
 .../added/launch/kogito-explainability.sh     |   8 +-
 modules/kogito-explainability/configure       |   6 +-
 modules/kogito-explainability/module.yaml     |  12 +-
 .../tests/bats/kogito-explainability.bats     |  12 +-
 .../added/kogito-app-launch.sh                |   4 +-
 modules/kogito-jit-runner/configure           |   2 +-
 modules/kogito-jit-runner/module.yaml         |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 .../kogito-jobs-service-ephemeral/configure   |   2 +-
 .../kogito-jobs-service-ephemeral/module.yaml |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 .../kogito-jobs-service-infinispan/configure  |   2 +-
 .../module.yaml                               |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-jobs-service-mongodb/configure |   2 +-
 .../kogito-jobs-service-mongodb/module.yaml   |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 .../kogito-jobs-service-postgresql/configure  |   2 +-
 .../module.yaml                               |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 .../{configure => configure.sh}               |   2 +-
 modules/kogito-management-console/module.yaml |  11 +-
 .../3.6.x/added/configure-maven.sh            |   2 +-
 modules/kogito-maven/3.6.x/configure          |   4 +-
 modules/kogito-maven/3.6.x/maven/settings.xml |   4 +-
 .../3.8.x/added/configure-maven.sh            |   2 +-
 modules/kogito-maven/3.8.x/configure          |   4 +-
 modules/kogito-maven/3.8.x/maven/settings.xml |   4 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-task-console/configure         |   2 +-
 modules/kogito-task-console/module.yaml       |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-trusty-infinispan/configure    |   2 +-
 modules/kogito-trusty-infinispan/module.yaml  |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-trusty-postgresql/configure    |   2 +-
 modules/kogito-trusty-postgresql/module.yaml  |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-trusty-redis/configure         |   2 +-
 modules/kogito-trusty-redis/module.yaml       |   7 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-trusty-ui/configure            |   2 +-
 modules/kogito-trusty-ui/module.yaml          |   7 +-
 scripts/README.md                             |  50 -----
 scripts/build-kogito-apps-components.sh       | 102 +++++++++++
 scripts/setup-maven.sh                        |  42 +++++
 scripts/update-maven-artifacts.py             | 171 ------------------
 .../kogito-data-index-ephemeral.feature       |   6 +-
 .../kogito-data-index-infinispan.feature      |   4 -
 .../kogito-data-index-mongodb.feature         |   4 -
 .../kogito-data-index-oracle.feature          |   5 +-
 .../kogito-data-index-postgresql.feature      |  14 --
 .../kogito-jobs-service-ephemeral.feature     |   6 +-
 .../kogito-jobs-service-infinispan.feature    |   6 +-
 .../kogito-jobs-service-mongodb.feature       |   6 +-
 .../kogito-jobs-service-postgresql.feature    |  14 --
 .../kogito-common-postresql-services.feature  |  14 ++
 tests/features/kogito-explainability.feature  |   8 +-
 tests/features/kogito-jit-runner.feature      |   6 +-
 .../kogito-management-console.feature         |   8 +-
 tests/features/kogito-task-console.feature    |   8 +-
 .../supporting-services-common.feature        |  21 +++
 .../trusty/kogito-trusty-infinispan.feature   |   6 +-
 .../trusty/kogito-trusty-postgresql.feature   |  14 --
 .../trusty/kogito-trusty-redis.feature        |   7 +-
 .../features/trusty/kogito-trusty-ui.feature  |   8 +-
 tests/test-apps/clone-repo.sh                 |  33 +---
 89 files changed, 432 insertions(+), 559 deletions(-)
 rename modules/kogito-management-console/{configure => configure.sh} (80%)
 create mode 100755 scripts/build-kogito-apps-components.sh
 create mode 100755 scripts/setup-maven.sh
 delete mode 100644 scripts/update-maven-artifacts.py
 create mode 100644 tests/features/kogito-common-postresql-services.feature
 create mode 100644 tests/features/supporting-services-common.feature

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index a3a446f119d..1982fd83faa 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.1/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
@@ -65,19 +65,15 @@ pipeline {
                         initWorkspace(image)
                         String workspacePath = getWorkspacePath(image)
                         parallelStages["Build&Test ${image}"] = {
-                            stage("Build ${image}") {
-                                try {
-                                    dir(workspacePath) {
+                            stage("Build/Test ${image}") {
+                                dir(workspacePath) {
+                                    try {
                                         buildImage(image)
+                                    } catch (err) {
+                                        registerBuildFailedImage(image)
+                                        util.archiveConsoleLog(image, 400)
+                                        throw err
                                     }
-                                } catch (err) {
-                                    registerBuildFailedImage(image)
-                                    util.archiveConsoleLog(image)
-                                    throw err
-                                }
-                            }
-                            stage("Test ${image}") {
-                                dir(workspacePath) {
                                     try {
                                         testImage(image)
                                     } catch (err) {
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 9c445dacbbe..b31347cef26 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -107,34 +107,34 @@ pipeline {
                 }
             }
         }
-        stage('Update Maven information') {
-            steps {
-                script {
-                    // Update artifacts
-                    updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
-                    if (getMavenArtifactRepository() != '') {
-                        updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()} --ignore-self-signed-cert"
-                    }
-
-                    try {
-                        sh updateArtifactCmd
-                    } catch (err) {
-                        unstable('Error while updating Maven artifacts. Please check logs.')
-                    } finally {
-                        if (isThereAnyChanges()) {
-                            commitChanges('Updated Maven artifacts')
-                        } else {
-                            echo 'No changes to commit'
-                        }
-                    }
-                }
-            }
-        }
+        // stage('Update Maven information') {
+        //     steps {
+        //         script {
+        //             // Update artifacts
+        //             updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
+        //             if (getMavenArtifactRepository() != '') {
+        //                 updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()} --ignore-self-signed-cert"
+        //             }
+        //
+        //             try {
+        //                 sh updateArtifactCmd
+        //             } catch (err) {
+        //                 unstable('Error while updating Maven artifacts. Please check logs.')
+        //             } finally {
+        //                 if (isThereAnyChanges()) {
+        //                     commitChanges('Updated Maven artifacts')
+        //                 } else {
+        //                     echo 'No changes to commit'
+        //                 }
+        //             }
+        //         }
+        //     }
+        // }
         stage('Validate CeKit Image and Modules descriptors') {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.1/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
@@ -193,28 +193,24 @@ pipeline {
                         initWorkspace(image)
                         String workspacePath = getWorkspacePath(image)
                         parallelStages["Build&Test ${image}"] = { 
-                            stage("Build ${image}") {
-                                try {
-                                    dir(workspacePath) {
+                            stage("Build/Test ${image}") {
+                                dir(workspacePath) {
+                                    try {
                                         buildImage(image)
+                                        registerBuiltImage(image)
+                                    } catch (err) {
+                                        registerBuildFailedImage(image)
+                                        util.archiveConsoleLog(image, 400)
+                                        throw err
                                     }
-                                    registerBuiltImage(image)
-                                } catch (err) {
-                                    registerBuildFailedImage(image)
-                                    util.archiveConsoleLog(image)
-                                    throw err
-                                }
-                            }
-                            stage("Test ${image}") {
-                                if(!shouldSkipTests()) {
-                                    dir(workspacePath) {
+                                    if(!shouldSkipTests()) {
                                         try {
                                             testImage(image)
                                         } catch (err) {
                                             registerTestFailedImage(image)
                                         } finally {
-                                            junit testResults: "target/test/results/*.xml", allowEmptyResults: true
-                                            archiveArtifacts artifacts: "target/test/results/*.xml", allowEmptyArchive: true
+                                            junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
+                                            archiveArtifacts artifacts: 'target/test/results/*.xml', allowEmptyArchive: true
                                         }
                                     }
                                 }
@@ -425,6 +421,10 @@ List getBuildFailedImages() {
     return BUILD_FAILED_IMAGES
 }
 
+boolean isBuildFailedImage(String imageName) {
+    return BUILD_FAILED_IMAGES.contains(imageName)
+}
+
 List getTestFailedImages() {
     return TEST_FAILED_IMAGES
 }
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index e2c78d015f5..416d7aee963 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -55,41 +55,41 @@ pipeline {
                 }
             }
         }
-        stage('Update PR with released Maven artifacts') {
-            when {
-                expression { return isRelease() && getPRSourceBranch() != '' }
-            }
-            steps {
-                script {
-                    // Update maven information with new artifacts from Maven central in the PR
-                    dir('artifacts-update') {
-                        checkoutRepo()
-                        githubscm.forkRepo(getBotAuthorCredsID())
-
-                        // Get the working branch
-                        sh 'git fetch origin'
-                        sh "git checkout ${getPRSourceBranch()}"
-
-                        // Update artifacts
-                        updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
-                        if (getMavenArtifactRepository() != '') {
-                            updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()}"
-                        }
-                        sh updateArtifactCmd
-
-                        try {
-                            githubscm.commitChanges('Setup Maven artifacts to released ones')
-                            githubscm.pushObject('origin', getPRSourceBranch(), getBotAuthorCredsID())
-                        } catch (err) {
-                            String body = "Seems like no change is to be committed.\nPlease review in ${env.BUILD_URL}console.\n" +
-                                    "And take your decision here: ${env.BUILD_URL}input"
-                            sendNotification(body, 'Release Pipeline')
-                            input message: 'Should the pipeline continue ?', ok: 'Yes'
-                        }
-                    }
-                }
-            }
-        }
+        // stage('Update PR with released Maven artifacts') {
+        //     when {
+        //         expression { return isRelease() && getPRSourceBranch() != '' }
+        //     }
+        //     steps {
+        //         script {
+        //             // Update maven information with new artifacts from Maven central in the PR
+        //             dir('artifacts-update') {
+        //                 checkoutRepo()
+        //                 githubscm.forkRepo(getBotAuthorCredsID())
+        //
+        //                 // Get the working branch
+        //                 sh 'git fetch origin'
+        //                 sh "git checkout ${getPRSourceBranch()}"
+        //
+        //                 // Update artifacts
+        //                 updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
+        //                 if (getMavenArtifactRepository() != '') {
+        //                     updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()}"
+        //                 }
+        //                 sh updateArtifactCmd
+        //
+        //                 try {
+        //                     githubscm.commitChanges('Setup Maven artifacts to released ones')
+        //                     githubscm.pushObject('origin', getPRSourceBranch(), getBotAuthorCredsID())
+        //                 } catch (err) {
+        //                     String body = "Seems like no change is to be committed.\nPlease review in ${env.BUILD_URL}console.\n" +
+        //                             "And take your decision here: ${env.BUILD_URL}input"
+        //                     sendNotification(body, 'Release Pipeline')
+        //                    input message: 'Should the pipeline continue ?', ok: 'Yes'
+        //                }
+        //            }
+        //        }
+        //    }
+        // }
         stage('Pull "old" images') {
             steps {
                 script {
diff --git a/Makefile b/Makefile
index 3e13314069a..160521cdc09 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
 SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
+KOGITO_APPS_TARGET_BRANCH ?= main
 BUILD_ENGINE := docker
 .DEFAULT_GOAL := build
 CEKIT_CMD := cekit -v ${cekit_option}
@@ -9,6 +10,7 @@ clone-repos:
 # if the NO_TEST env defined, proceed with the tests, as first step prepare the repo to be used
 ifneq ($(ignore_test),true)
 	cd tests/test-apps && sh clone-repo.sh $(NATIVE)
+	cd ../..
 endif
 
 .PHONY: list
@@ -21,13 +23,14 @@ list:
 build: clone-repos _build
 
 _build:
-	@for f in $(shell make list); do make build-image image_name=$${f}; done
+	@for f in $(shell make list); do make build-image image_name=$${iname}; done
 
 
 .PHONY: build-image
 image_name=
 build-image:
 ifneq ($(ignore_build),true)
+	scripts/build-kogito-apps-components.sh ${KOGITO_APPS_TARGET_BRANCH} ${image_name};
 	${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set to true, ignore the tests
@@ -42,14 +45,15 @@ endif
 # Build all images
 .PHONY: build-prod
 # start to build the images
-build-prod: clone-repos
-	@for iname in $(shell make list arg=--prod); do make build-prod-image image_name=$${iname} ; done
+build-prod:
+	@for iname in $(shell make list arg=--prod); do make build-prod-image image_name=$${iname}; done
 
 
 .PHONY: build-prod-image
 image_name=
 build-prod-image: clone-repos
 ifneq ($(ignore_build),true)
+	scripts/build-kogito-apps-components.sh ${KOGITO_APPS_TARGET_BRANCH} ${image_name};
 	scripts/build-product-image.sh "build" $(image_name) ${BUILD_ENGINE}
 endif
 # if ignore_test is set to true, ignore the tests
@@ -57,7 +61,6 @@ ifneq ($(ignore_test),true)
 	scripts/build-product-image.sh "test" $(image_name) ${test_options}
 endif
 
-
 # push images to quay.io, this requires permissions under kiegroup organization
 .PHONY: push
 push: build _push
diff --git a/README.md b/README.md
index 88e2bda3250..8a5813aa5fd 100644
--- a/README.md
+++ b/README.md
@@ -373,7 +373,7 @@ Both methods are described below.
 
 ##### KJAR Maven Project
 
-[KJAR](https://developers.redhat.com/blog/2018/03/14/what-is-a-kjar/) stands for Knowledge jar which is a custom JAR file 
+[KieJAR](https://developers.redhat.com/blog/2018/03/14/what-is-a-kjar/) stands for Knowledge Is Everything jar which is a custom JAR file 
 that contains Business Process or Rules and all needed dependencies and files to execute it on the target runtime, 
 either Quarkus or Spring Boot.
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e660bc61d7a..6f1adefdfd7 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,8 +1,8 @@
 <!-- Keep them in alphabetical order -->
 ## Enhancements
+- [KOGITO-6684](https://issues.redhat.com/browse/KOGITO-6684) - Kogito images for supporting services should no longer download the runner jar from maven repository
 
 ## Bug Fixes
-- [KOGITO-6215](https://issues.redhat.com/browse/KOGITO-6215) - Improve logs on kogito-builder image while trying to get project version
 
 ## Known Issues
 
diff --git a/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
index 8a664c25912..4e847a99d2d 100644
--- a/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
@@ -26,5 +26,5 @@ exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGIT
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/data-index-service-inmemory-runner.jar
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
 
diff --git a/modules/kogito-data-index-ephemeral/configure b/modules/kogito-data-index-ephemeral/configure
index ecf8f70a9a2..08f17a9c6f8 100644
--- a/modules/kogito-data-index-ephemeral/configure
+++ b/modules/kogito-data-index-ephemeral/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/data-index-service-inmemory-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/data-index-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/module.yaml
index 757cc3940b8..733867b8670 100644
--- a/modules/kogito-data-index-ephemeral/module.yaml
+++ b/modules/kogito-data-index-ephemeral/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.dataindex.ephemeral
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: data-index-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-inmemory/2.0.0-SNAPSHOT/data-index-service-inmemory-2.0.0-20220404.030705-261-runner.jar
-    md5: 089e8f51bab1f5c70967f7edb17fb05f
+- path: /tmp/build/data-index-service-inmemory/data-index-service-inmemory-quarkus-app.zip
+  name: data-index-service-inmemory-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
index 0056bdbea76..df50ceaccdf 100644
--- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
@@ -26,4 +26,4 @@ exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGIT
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/data-index-service-infinispan-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-infinispan/configure b/modules/kogito-data-index-infinispan/configure
index 7a15744634b..5e2c185feb3 100644
--- a/modules/kogito-data-index-infinispan/configure
+++ b/modules/kogito-data-index-infinispan/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/data-index-service-infinispan-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/data-index-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index aab0914d628..037c9f5d46f 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.dataindex.infinispan
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: data-index-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-infinispan/2.0.0-SNAPSHOT/data-index-service-infinispan-2.0.0-20220404.025504-450-runner.jar
-    md5: 17b4319dd628a76f30f6b3f3a701b65a
+- path: /tmp/build/data-index-service-infinispan/data-index-service-infinispan-quarkus-app.zip
+  name: data-index-service-infinispan-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index 083ec8bebde..df50ceaccdf 100644
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -26,4 +26,4 @@ exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGIT
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/data-index-service-mongodb-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-mongodb/configure b/modules/kogito-data-index-mongodb/configure
index 00fbaf97492..1448e355e03 100644
--- a/modules/kogito-data-index-mongodb/configure
+++ b/modules/kogito-data-index-mongodb/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/data-index-service-mongodb-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/data-index-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 67be84461c8..9ccc0746f87 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.dataindex.mongodb
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: data-index-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-mongodb/2.0.0-SNAPSHOT/data-index-service-mongodb-2.0.0-20220404.025742-452-runner.jar
-    md5: 84770ec122e4ea3fcf7172383c7812f9
+- path: /tmp/build/data-index-service-mongodb/data-index-service-mongodb-quarkus-app.zip
+  name: data-index-service-mongodb-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
index 82d3fcd6c23..05fa13ccac7 100644
--- a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
@@ -26,4 +26,4 @@ exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGIT
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/data-index-service-oracle-runner.jar
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-data-index-oracle/configure b/modules/kogito-data-index-oracle/configure
index 6f3631debd6..051da7b2118 100644
--- a/modules/kogito-data-index-oracle/configure
+++ b/modules/kogito-data-index-oracle/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/data-index-service-oracle-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/data-index-service-oracle-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index a859cf42581..858ba49111b 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.dataindex.oracle
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: data-index-service-oracle-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-oracle/2.0.0-SNAPSHOT/data-index-service-oracle-2.0.0-20220404.030139-85-runner.jar
-    md5: 7e8d22c5ae0a1bf748ae21e79abf2fa0
+- path: /tmp/build/data-index-service-oracle/data-index-service-oracle-quarkus-app.zip
+  name: data-index-service-oracle-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
index 9dd74d23318..df50ceaccdf 100644
--- a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
@@ -26,4 +26,4 @@ exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGIT
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/data-index-service-postgresql-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-postgresql/configure b/modules/kogito-data-index-postgresql/configure
index 60a3afaef7f..54b243a83aa 100644
--- a/modules/kogito-data-index-postgresql/configure
+++ b/modules/kogito-data-index-postgresql/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/data-index-service-postgresql-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/data-index-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 98163b73413..9612d41f906 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.dataindex.postgresql
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: data-index-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/data-index-service-postgresql/2.0.0-SNAPSHOT/data-index-service-postgresql-2.0.0-20220404.030434-295-runner.jar
-    md5: 6697093d813a347279f0d520d14f1ccf
+- path: /tmp/build/data-index-service-postgresql/data-index-service-postgresql-quarkus-app.zip
+  name: data-index-service-postgresql-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
index 8f9ca3eda06..77505f7d70a 100644
--- a/modules/kogito-explainability/added/kogito-app-launch.sh
+++ b/modules/kogito-explainability/added/kogito-app-launch.sh
@@ -11,7 +11,6 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
-
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
@@ -24,8 +23,8 @@ source "${KOGITO_HOME}"/launch/configure.sh
 DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_EXPLAINABILITY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/"${EXPLAINABILITY_SERVICE_JAR}"
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/"${EXPLAINABILITY_SERVICE_COMMUNICATION}"/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-explainability/added/launch/kogito-explainability.sh b/modules/kogito-explainability/added/launch/kogito-explainability.sh
index 5cb2c7f94a5..39436a468eb 100644
--- a/modules/kogito-explainability/added/launch/kogito-explainability.sh
+++ b/modules/kogito-explainability/added/launch/kogito-explainability.sh
@@ -17,10 +17,12 @@ function configure_explainability_jar {
     local communication="MESSAGING"
     if [[ ! "${allowed_communication_types[*]}" =~ ${EXPLAINABILITY_COMMUNICATION^^} ]]; then
         log_warning "Explainability communication type ${EXPLAINABILITY_COMMUNICATION} is not allowed, the allowed types are [${allowed_communication_types[*]}]. Defaulting to ${communication}."
-    elif [ "${EXPLAINABILITY_COMMUNICATION^^}" == "REST" ]; then
-        communication="${EXPLAINABILITY_COMMUNICATION^^}"
+        unset EXPLAINABILITY_COMMUNICATION
+
+    elif [ "x${EXPLAINABILITY_COMMUNICATION}" != "x" ]; then
+        communication="${EXPLAINABILITY_COMMUNICATION}"
     fi
 
     log_info "Explainability communication is set to ${communication}"
-    EXPLAINABILITY_SERVICE_JAR="explainability-service-${communication,,}-runner.jar"
+    EXPLAINABILITY_SERVICE_COMMUNICATION="${communication,,}"
 }
diff --git a/modules/kogito-explainability/configure b/modules/kogito-explainability/configure
index d2542b11cae..ec958af86b2 100644
--- a/modules/kogito-explainability/configure
+++ b/modules/kogito-explainability/configure
@@ -5,8 +5,10 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/explainability-service-rest-runner.jar "${KOGITO_HOME}"/bin/
-cp -v "${SOURCES_DIR}"/explainability-service-messaging-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/explainability-service-rest-quarkus-app.zip -d "${KOGITO_HOME}"/bin/rest/
+unzip "${SOURCES_DIR}"/explainability-service-messaging-quarkus-app.zip -d "${KOGITO_HOME}"/bin/messaging/
+
+
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 32ff530adea..3e710f3ec8d 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -2,13 +2,13 @@ schema_version: 1
 name: org.kie.kogito.explainability
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: explainability-service-rest-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-rest/2.0.0-SNAPSHOT/explainability-service-rest-2.0.0-20220404.033934-454-runner.jar
-    md5: adf7e263ec370e308707cda1570d5f3d
-  - name: explainability-service-messaging-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/explainability-service-messaging/2.0.0-SNAPSHOT/explainability-service-messaging-2.0.0-20220404.033825-449-runner.jar
-    md5: 2f47df6c4dab34d5f8d42db44602c528
+- path: /tmp/build/explainability-service-rest/explainability-service-rest-quarkus-app.zip
+  name: explainability-service-rest-quarkus-app.zip
+- path: /tmp/build/explainability-service-messaging/explainability-service-messaging-quarkus-app.zip
+  name: explainability-service-messaging-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-explainability/tests/bats/kogito-explainability.bats b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
index 733158339bb..edda6753d3a 100644
--- a/modules/kogito-explainability/tests/bats/kogito-explainability.bats
+++ b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
@@ -15,23 +15,23 @@ teardown() {
 
 @test "test if the default explainability communication type is correctly set" {
     configure_explainability_jar
-    expected="explainability-service-messaging-runner.jar"
+    expected="messaging"
     echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
-    [ "${EXPLAINABILITY_SERVICE_JAR}" = "${expected}" ]
+    [ "${EXPLAINABILITY_SERVICE_COMMUNICATION}" = "${expected}" ]
 }
 
 @test "test if explainability communication service default value is correctly set if a nonsense type is set" {
     EXPLAINABILITY_COMMUNICATION="nonsense"
     configure_explainability_jar
-    expected="explainability-service-messaging-runner.jar"
+    expected="messaging"
     echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
-    [ "${EXPLAINABILITY_SERVICE_JAR}" = "${expected}" ]
+    [ "${EXPLAINABILITY_SERVICE_COMMUNICATION}" = "${expected}" ]
 }
 
 @test "test if explainability communication service default value s correctly set if set to rest" {
     EXPLAINABILITY_COMMUNICATION="rest"
     configure_explainability_jar
-    expected="explainability-service-rest-runner.jar"
+    expected="rest"
     echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
-    [ "${EXPLAINABILITY_SERVICE_JAR}" = "${expected}" ]
+    [ "${EXPLAINABILITY_SERVICE_COMMUNICATION}" = "${expected}" ]
 }
\ No newline at end of file
diff --git a/modules/kogito-jit-runner/added/kogito-app-launch.sh b/modules/kogito-jit-runner/added/kogito-app-launch.sh
index 9c94ebab69a..e4b381a1ea4 100644
--- a/modules/kogito-jit-runner/added/kogito-app-launch.sh
+++ b/modules/kogito-jit-runner/added/kogito-app-launch.sh
@@ -22,8 +22,8 @@ source "${KOGITO_HOME}"/launch/configure.sh
 DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
 
 # shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_JIT_RUNNER_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/jitexecutor-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-jit-runner/configure b/modules/kogito-jit-runner/configure
index ef97f8daf42..0e635d596b7 100644
--- a/modules/kogito-jit-runner/configure
+++ b/modules/kogito-jit-runner/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/jitexecutor-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/jitexecutor-runner-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index a5c0d75920f..6f2d2ba56b9 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.jit-runner
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: jitexecutor-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jitexecutor-runner/2.0.0-SNAPSHOT/jitexecutor-runner-2.0.0-20220404.034752-395-runner.jar
-    md5: c0c6b3ff17868553dab18ada0b874a4d
+- path: /tmp/build/jitexecutor-runner/jitexecutor-runner-quarkus-app.zip
+  name: jitexecutor-runner-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
index 704e393a514..0404ab50c69 100644
--- a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
@@ -26,4 +26,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/jobs-service-inmemory-runner.jar
+    -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-ephemeral/configure b/modules/kogito-jobs-service-ephemeral/configure
index 6c2a214085d..e3ed8783d72 100644
--- a/modules/kogito-jobs-service-ephemeral/configure
+++ b/modules/kogito-jobs-service-ephemeral/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/jobs-service-inmemory-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 10a0bda04a4..26640033dbe 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.jobs.service.ephemeral
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: jobs-service-inmemory-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-inmemory/2.0.0-SNAPSHOT/jobs-service-inmemory-2.0.0-20220404.024952-261-runner.jar
-    md5: 9a8f32ab219d46b22c77d39ff3ee0fec
+- path: /tmp/build/jobs-service-inmemory/jobs-service-inmemory-quarkus-app.zip
+  name: jobs-service-inmemory-quarkus-app.zip
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
index 72387251f5b..0404ab50c69 100644
--- a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
@@ -26,4 +26,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/jobs-service-infinispan-runner.jar
+    -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-infinispan/configure b/modules/kogito-jobs-service-infinispan/configure
index b07797c497f..36cdb38990e 100644
--- a/modules/kogito-jobs-service-infinispan/configure
+++ b/modules/kogito-jobs-service-infinispan/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/jobs-service-infinispan-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/jobs-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index eae6e26e7ff..99b44db97be 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.jobs.service.infinispan
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: jobs-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-infinispan/2.0.0-SNAPSHOT/jobs-service-infinispan-2.0.0-20220404.024438-329-runner.jar
-    md5: 664998f6a5a966546918619216bdb783
+- path: /tmp/build/jobs-service-infinispan/jobs-service-infinispan-quarkus-app.zip
+  name: jobs-service-infinispan-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
index e3fe6e701e4..0404ab50c69 100644
--- a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
@@ -26,4 +26,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/jobs-service-mongodb-runner.jar
+    -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-mongodb/configure b/modules/kogito-jobs-service-mongodb/configure
index a5b3aa79026..73ca03f66fd 100644
--- a/modules/kogito-jobs-service-mongodb/configure
+++ b/modules/kogito-jobs-service-mongodb/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/jobs-service-mongodb-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/jobs-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 69e8535983b..21d04c045b2 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.jobs.service.mongodb
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: jobs-service-mongodb-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-mongodb/2.0.0-SNAPSHOT/jobs-service-mongodb-2.0.0-20220404.024808-310-runner.jar
-    md5: 6d490e11f2db6088012ac51e8c7a8606
+- path: /tmp/build/jobs-service-mongodb/jobs-service-mongodb-quarkus-app.zip
+  name: jobs-service-mongodb-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
index 5858954f30c..0404ab50c69 100644
--- a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
@@ -26,4 +26,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/jobs-service-postgresql-runner.jar
+    -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-postgresql/configure b/modules/kogito-jobs-service-postgresql/configure
index 82daedf5e94..3e8752902fd 100644
--- a/modules/kogito-jobs-service-postgresql/configure
+++ b/modules/kogito-jobs-service-postgresql/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/jobs-service-postgresql-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 64a3eac2073..0e91fd3f0c7 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.jobs.service.postgresql
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: jobs-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/jobs-service-postgresql/2.0.0-SNAPSHOT/jobs-service-postgresql-2.0.0-20220404.024621-329-runner.jar
-    md5: cce13d9570b36719bca94b186c2aaa64
+- path: /tmp/build/jobs-service-postgresql/jobs-service-postgresql-quarkus-app.zip
+  name: jobs-service-postgresql-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
index 21accf91317..e0a80090d6b 100644
--- a/modules/kogito-management-console/added/kogito-app-launch.sh
+++ b/modules/kogito-management-console/added/kogito-app-launch.sh
@@ -26,4 +26,4 @@ DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-option
 exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/management-console-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-management-console/configure b/modules/kogito-management-console/configure.sh
similarity index 80%
rename from modules/kogito-management-console/configure
rename to modules/kogito-management-console/configure.sh
index 098a0655efe..e370070e013 100644
--- a/modules/kogito-management-console/configure
+++ b/modules/kogito-management-console/configure.sh
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/management-console-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/management-console-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index bed3c94ddb0..941d55a3a14 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -2,10 +2,13 @@ schema_version: 1
 name: org.kie.kogito.management.console
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: management-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/management-console/2.0.0-SNAPSHOT/management-console-2.0.0-20220404.032229-442-runner.jar
-    md5: e5b389ebfc089abf83c4a34e1518b79c
+  - path: /tmp/build/management-console/management-console-quarkus-app.zip
+    name: management-console-quarkus-app.zip
 
 execute:
-  - script: configure
+  - script: configure.sh
+
+
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index 7a19bf4e183..389728340cf 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-#Please keep them in alphabatical order
+#Please keep them in alphabetical order
 function prepareEnv() {
     unset HTTP_PROXY_HOST
     unset HTTP_PROXY_PORT
diff --git a/modules/kogito-maven/3.6.x/configure b/modules/kogito-maven/3.6.x/configure
index c9463de1519..835c91ee8a8 100644
--- a/modules/kogito-maven/3.6.x/configure
+++ b/modules/kogito-maven/3.6.x/configure
@@ -83,8 +83,8 @@ if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
   </pluginRepositories>\
 </profile>\
 "
-    sed -i "s|<!-- ### redhat maven repositories ### -->|$rh_repos|" "${KOGITO_HOME}"/.m2/settings.xml
-    sed -i "s|<!-- ### redhat maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### extra maven repositories ### -->|${rh_repos}|" "${KOGITO_HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
 
     mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp
     #format and write the new file
diff --git a/modules/kogito-maven/3.6.x/maven/settings.xml b/modules/kogito-maven/3.6.x/maven/settings.xml
index 13ea10d6509..4d77e856c13 100644
--- a/modules/kogito-maven/3.6.x/maven/settings.xml
+++ b/modules/kogito-maven/3.6.x/maven/settings.xml
@@ -12,7 +12,7 @@
   </proxies>
 
   <profiles>
-    <!-- ### redhat maven repositories ### -->
+    <!-- ### extra maven repositories ### -->
 
     <profile>
       <id>default</id>
@@ -54,7 +54,7 @@
     </profile>
   </profiles>
   <activeProfiles>
-    <!-- ### redhat maven profile ### -->
+    <!-- ### extra maven profile ### -->
     <activeProfile>default</activeProfile>
   </activeProfiles>
 </settings>
diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/3.8.x/added/configure-maven.sh
index 7a19bf4e183..389728340cf 100644
--- a/modules/kogito-maven/3.8.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x/added/configure-maven.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-#Please keep them in alphabatical order
+#Please keep them in alphabetical order
 function prepareEnv() {
     unset HTTP_PROXY_HOST
     unset HTTP_PROXY_PORT
diff --git a/modules/kogito-maven/3.8.x/configure b/modules/kogito-maven/3.8.x/configure
index c9463de1519..efb7e334832 100644
--- a/modules/kogito-maven/3.8.x/configure
+++ b/modules/kogito-maven/3.8.x/configure
@@ -83,8 +83,8 @@ if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
   </pluginRepositories>\
 </profile>\
 "
-    sed -i "s|<!-- ### redhat maven repositories ### -->|$rh_repos|" "${KOGITO_HOME}"/.m2/settings.xml
-    sed -i "s|<!-- ### redhat maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### extra maven repositories ### -->|$rh_repos|" "${KOGITO_HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
 
     mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp
     #format and write the new file
diff --git a/modules/kogito-maven/3.8.x/maven/settings.xml b/modules/kogito-maven/3.8.x/maven/settings.xml
index 13ea10d6509..4d77e856c13 100644
--- a/modules/kogito-maven/3.8.x/maven/settings.xml
+++ b/modules/kogito-maven/3.8.x/maven/settings.xml
@@ -12,7 +12,7 @@
   </proxies>
 
   <profiles>
-    <!-- ### redhat maven repositories ### -->
+    <!-- ### extra maven repositories ### -->
 
     <profile>
       <id>default</id>
@@ -54,7 +54,7 @@
     </profile>
   </profiles>
   <activeProfiles>
-    <!-- ### redhat maven profile ### -->
+    <!-- ### extra maven profile ### -->
     <activeProfile>default</activeProfile>
   </activeProfiles>
 </settings>
diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh
index 0d0052b8c07..6e80c75f944 100644
--- a/modules/kogito-task-console/added/kogito-app-launch.sh
+++ b/modules/kogito-task-console/added/kogito-app-launch.sh
@@ -26,4 +26,4 @@ DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-option
 exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/task-console-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-task-console/configure b/modules/kogito-task-console/configure
index 4e28e7122f7..484f7192af4 100644
--- a/modules/kogito-task-console/configure
+++ b/modules/kogito-task-console/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/task-console-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/task-console-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index cb3cd2920c0..dfeaf53bd31 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.task.console
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: task-console-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/task-console/2.0.0-SNAPSHOT/task-console-2.0.0-20220404.032429-442-runner.jar
-    md5: cfe99b9b4d1f398ea762261da32d51b1
+- path: /tmp/build/task-console/task-console-quarkus-app.zip
+  name: task-console-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
index 0c4a19e233a..2caba923a96 100644
--- a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
@@ -27,4 +27,4 @@ exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGIT
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/trusty-service-infinispan-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/configure b/modules/kogito-trusty-infinispan/configure
index 9516a7f88f3..fdc16014397 100644
--- a/modules/kogito-trusty-infinispan/configure
+++ b/modules/kogito-trusty-infinispan/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/trusty-service-infinispan-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/trusty-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 3a0f70a1baf..d091dc6710c 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.trusty.infinispan
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: trusty-service-infinispan-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-infinispan/2.0.0-SNAPSHOT/trusty-service-infinispan-2.0.0-20220404.034252-361-runner.jar
-    md5: 96494956d6d654b7729971233076a64a
+- path: /tmp/build/trusty-service-infinispan/trusty-service-infinispan-quarkus-app.zip
+  name: trusty-service-infinispan-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh b/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
index a1cf28e9311..2caba923a96 100644
--- a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
@@ -27,4 +27,4 @@ exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGIT
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/trusty-service-postgresql-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-postgresql/configure b/modules/kogito-trusty-postgresql/configure
index 5deaff44cee..a2e9d402777 100644
--- a/modules/kogito-trusty-postgresql/configure
+++ b/modules/kogito-trusty-postgresql/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/trusty-service-postgresql-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/trusty-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 1e06b650360..ff854b0ad35 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.trusty.postgresql
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: trusty-service-postgresql-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-postgresql/2.0.0-SNAPSHOT/trusty-service-postgresql-2.0.0-20220404.034510-192-runner.jar
-    md5: 853ef345959340b543bdf29997aff016
+- path: /tmp/build/trusty-service-postgresql/trusty-service-postgresql-quarkus-app.zip
+  name: trusty-service-postgresql-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/added/kogito-app-launch.sh b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
index 7921b7c037c..2caba923a96 100644
--- a/modules/kogito-trusty-redis/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
@@ -27,4 +27,4 @@ exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGIT
         -Djava.library.path="${KOGITO_HOME}"/lib \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/trusty-service-redis-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-redis/configure b/modules/kogito-trusty-redis/configure
index 2dfd8d9465f..132ba778469 100644
--- a/modules/kogito-trusty-redis/configure
+++ b/modules/kogito-trusty-redis/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v "${SOURCES_DIR}"/trusty-service-redis-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/trusty-service-redis-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index f03d1c8b40a..9b97aba54f5 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.trusty.redis
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: trusty-service-redis-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-service-redis/2.0.0-SNAPSHOT/trusty-service-redis-2.0.0-20220404.034352-364-runner.jar
-    md5: d6cdf942ca99709fed2f2b241f129b4e
+- path: /tmp/build/trusty-service-redis/trusty-service-redis-quarkus-app.zip
+  name: trusty-service-redis-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
index 13e619778d2..18ff16a26ae 100644
--- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
@@ -27,4 +27,4 @@ DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-option
 exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
         -Dquarkus.http.host=0.0.0.0 \
         -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/trusty-ui-runner.jar
\ No newline at end of file
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-ui/configure b/modules/kogito-trusty-ui/configure
index 195e7cd5797..41a4214e0d8 100644
--- a/modules/kogito-trusty-ui/configure
+++ b/modules/kogito-trusty-ui/configure
@@ -5,7 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-cp -v ${SOURCES_DIR}/trusty-ui-runner.jar "${KOGITO_HOME}"/bin/
+unzip "${SOURCES_DIR}"/trusty-ui-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index f4890913b24..750d0ea2fc0 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -2,10 +2,11 @@ schema_version: 1
 name: org.kie.kogito.trusty.ui
 version: "2.0.0-snapshot"
 
+# see build-kogito-apps-components.sh script, responsible for build it.
+# called by the Makefile before builds
 artifacts:
-  - name: trusty-ui-runner.jar
-    url: https://repository.jboss.org/nexus/content/groups/public/org/kie/kogito/trusty-ui/2.0.0-SNAPSHOT/trusty-ui-2.0.0-20220404.032400-440-runner.jar
-    md5: bef4d94a621f51fae03c8b1cdbff19ce
+- path: /tmp/build/trusty-ui/trusty-ui-quarkus-app.zip
+  name: trusty-ui-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/scripts/README.md b/scripts/README.md
index cb0570f1c86..0a209f45060 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -11,7 +11,6 @@ Today we have these scripts:
 - [push-local-registry.sh](push-local-registry.sh)
 - [push-staging.py](push-staging.py)
 - [run-bats.sh](run-bats.sh)
-- [update-maven-artifacts.py](update-maven-artifacts.py)
 - [update-tests.py](update-tests.py)
 
 
@@ -156,55 +155,6 @@ It will look for the current RC images available on [quay.io](https://quay.io/or
 accordingly then push the new tag so it can be tested by others. 
 If there is no need to update the tag, there is the option to override it, just set the flag "-o".
 
-### Updating Kogito Images Service artifacts
-
-The `update-maven-artifacts` script will help in fetching the artifacts from the Maven repository and update them into service modules (`module.yaml` will be updated)
-
-#### Script dependencies
-
-The `update-maven-artifacts.py` has some dependencies that needs to be manually installed:
-
-```bash
-$ pip install -U ruamel.yaml
-$ pip install -U elementpath
-```
-
-#### Usage
-
-Its default behavior is pretty simple:
-
-```bash
-$ python update-maven-artifacts.py
-```
-
-##### Update Maven artifact repository url
-
-This script also accepts `--repo-url` as argument in specifying the Maven repository from where to fetch the artifacts
-
-```bash
-$ python update-maven-artifacts.py --repo-url='https://maven-repository.mirror.com/public'
-```
-
-If no argument is given, it takes the JBoss repository as the default value.
-
-The command will update the needed files with the new URL:
-
-- kogito-data-index-infinispan/module.yaml
-- kogito-data-index-ephemeral/module.yaml
-- kogito-data-index-mongodb/module.yaml
-- kogito-data-index-postgresql/module.yaml
-- kogito-explainability/module.yaml
-- kogito-jit-runner/module.yaml
-- kogito-jobs-service-ephemeral/module.yaml
-- kogito-jobs-service-infinispan/module.yaml
-- kogito-jobs-service-mongodb/module.yaml
-- kogito-jobs-service-postgresql/module.yaml  
-- kogito-management-console/module.yaml
-- kogito-task-console/module.yaml
-- kogito-trusty-ui/module.yaml
-- kogito-trusty-infinispan/module.yaml
-- kogito-trusty-redis/module.yaml
-- kogito-trusty-postgresql/module.yaml
 
 ### Update tests script
 
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
new file mode 100755
index 00000000000..362ad30fb1f
--- /dev/null
+++ b/scripts/build-kogito-apps-components.sh
@@ -0,0 +1,102 @@
+#!/usr/bin/env bash
+# Parameters:
+#   1 - git target branch - defaults to main
+#   2 - image name - can't  be empty.
+
+# fast fail
+set -e
+set -o pipefail
+
+# Read entries before sourcing
+branchTag="${1:main}"
+imageName="${2}"
+contextDir=""
+shift $#
+
+. $(dirname "${BASH_SOURCE[0]}")/setup-maven.sh
+MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
+
+case ${imageName} in
+    "kogito-management-console")
+        contextDir="management-console"
+        ;;
+    "kogito-task-console")
+        contextDir="task-console"
+        ;;
+    "kogito-data-index-ephemeral")
+        contextDir="data-index/data-index-service/data-index-service-inmemory"
+        ;;
+    "kogito-data-index-infinispan")
+        contextDir="data-index/data-index-service/data-index-service-infinispan"
+        ;;
+    "kogito-data-index-mongodb")
+        contextDir="data-index/data-index-service/data-index-service-mongodb"
+        ;;
+    "kogito-data-index-oracle")
+        contextDir="data-index/data-index-service/data-index-service-oracle"
+        ;;
+    "kogito-data-index-postgresql")
+        contextDir="data-index/data-index-service/data-index-service-postgresql"
+        ;;
+    "kogito-jobs-service-ephemeral")
+        contextDir="jobs-service/jobs-service-inmemory"
+        ;;
+    "kogito-jobs-service-infinispan")
+        contextDir="jobs-service/jobs-service-infinispan"
+        ;;
+    "kogito-jobs-service-mongodb")
+        contextDir="jobs-service/jobs-service-mongodb"
+        ;;
+    "kogito-jobs-service-postgresql")
+        contextDir="jobs-service/jobs-service-postgresql"
+        ;;
+    "kogito-trusty-infinispan")
+        contextDir="trusty/trusty-service/trusty-service-infinispan"
+        ;;
+    "kogito-trusty-postgresql")
+        contextDir="trusty/trusty-service/trusty-service-postgresql"
+        ;;
+    "kogito-trusty-redis")
+        contextDir="trusty/trusty-service/trusty-service-redis"
+        ;;
+    "kogito-trusty-ui")
+        contextDir="trusty-ui"
+        ;;
+    "kogito-explainability")
+        contextDir="explainability/explainability-service-messaging explainability/explainability-service-rest"
+        ;;
+    "kogito-jit-runner")
+        contextDir="jitexecutor/jitexecutor-runner"
+        ;;
+    *)
+        echo "${imageName} is not a supporting service image, exiting..."
+        exit 0
+        ;;
+esac
+
+KOGITO_APPS_REPO_NAME="kogito-apps"
+
+for ctx in ${contextDir}; do
+    target_tmp_dir="/tmp/build/$(basename ${ctx})"
+    build_target_dir="/tmp/$(basename ${ctx})"
+    rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
+    rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
+    cd ${build_target_dir}
+
+    echo "Using branch/tag ${branchTag}, checking out. Temporary build dir is ${build_target_dir} and target dis is ${target_tmp_dir}"
+
+    if [ ! -d "${build_target_dir}/${KOGITO_APPS_REPO_NAME}" ]; then
+        git_command="git clone --single-branch --branch ${branchTag} --depth 1 https://github.com/kiegroup/${KOGITO_APPS_REPO_NAME}.git"
+        echo "cloning ${KOGITO_APPS_REPO_NAME} with the following git command: ${git_command}"
+        eval ${git_command}
+    fi
+    cd ${KOGITO_APPS_REPO_NAME} && echo "working dir `pwd`"
+    mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS} -Dmaven.repo.local=/tmp/temp_maven/${ctx}"
+    echo "Building component(s) ${contextDir} with the following maven command [${mvn_command}]"
+    export YARN_CACHE_FOLDER=/tmp/cache/${ctx} # Fix for building yarn apps in parallel
+    eval ${mvn_command}
+    cd ${ctx}/target/
+    zip -r $(basename ${ctx})-quarkus-app.zip quarkus-app
+    cp -v $(basename ${ctx})-quarkus-app.zip ${target_tmp_dir}/
+    cd -
+done
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
new file mode 100755
index 00000000000..93ee3a41567
--- /dev/null
+++ b/scripts/setup-maven.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# Holds common maven configuration for CI;
+# Usage: . setup-maven.sh
+
+MAVEN_VERSION="3.8.x"
+
+MVN_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-maven/${MAVEN_VERSION}"
+MAVEN_OPTIONS="-DskipTests"
+
+if [ "${CI}" ]; then
+    # setup maven env
+    export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
+    # export MAVEN_REPO_URL=
+    cp "${MVN_MODULE}"/maven/settings.xml "${HOME}"/.m2/settings.xml
+    source "${MVN_MODULE}"/added/configure-maven.sh
+    configure
+
+    # Add NPM registry if needed
+    if [ ! -z "${NPM_REGISTRY_URL}" ]; then
+        echo "enabling npm repository: ${NPM_REGISTRY_URL}"
+        npm_profile="\
+<profile>\
+  <id>internal-npm-registry</id>\
+  <properties>\
+  <npmRegistryURL>${NPM_REGISTRY_URL}</npmRegistryURL>\
+  <yarnDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/yarn/</yarnDownloadRoot>\
+  <nodeDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/node/</nodeDownloadRoot>\
+  <npmDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/npm/</npmDownloadRoot>\
+  </properties>\
+</profile>\
+"   
+        sed -i -E "s|(<!-- ### extra maven repositories ### -->)|\1\n${npm_profile}|" "${HOME}"/.m2/settings.xml
+        sed -i -E "s|(<!-- ### extra maven profile ### -->)|\1\n<activeProfile>internal-npm-registry</activeProfile>|" "${HOME}"/.m2/settings.xml
+    fi
+
+    cat "${HOME}"/.m2/settings.xml
+fi
+
+if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" = "true" ]; then
+    MAVEN_OPTIONS="${MAVEN_OPTIONS} -Denforcer.skip"
+fi
+
diff --git a/scripts/update-maven-artifacts.py b/scripts/update-maven-artifacts.py
deleted file mode 100644
index 383e38c625d..00000000000
--- a/scripts/update-maven-artifacts.py
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/usr/bin/python3
-# Script responsible for fetching the latest artifacts of kogito services and updating their module.yaml files as well
-# as updating Maven version Should be run from root directory of the repository
-# Sample usage:  python3 scripts/update-maven-artifacts.py
-#
-# Dependencies
-#   ruamel.yaml
-#   elementpath
-
-import sys
-sys.dont_write_bytecode = True
-
-import common
-
-import xml.etree.ElementTree as ET
-import requests
-import subprocess as sp
-import os
-import argparse
-
-DEFAULT_REPO_URL = "https://repository.jboss.org/nexus/content/groups/public/"
-KOGITO_ARTIFACT_PATH = "org/kie/kogito"
-
-Modules = {
-    # service-name: module-name(directory in which module's module.yaml file is present)
-    # Note: Service name should be same as given in the repository
-    "data-index-service-infinispan": "kogito-data-index-infinispan",
-    "data-index-service-inmemory": "kogito-data-index-ephemeral",
-    "data-index-service-mongodb": "kogito-data-index-mongodb",
-    "data-index-service-oracle": "kogito-data-index-oracle",
-    "data-index-service-postgresql": "kogito-data-index-postgresql",
-    "trusty-service-infinispan": "kogito-trusty-infinispan",
-    "trusty-service-redis": "kogito-trusty-redis",
-    "trusty-service-postgresql": "kogito-trusty-postgresql",
-    "explainability-service-rest": "kogito-explainability",
-    "explainability-service-messaging": "kogito-explainability",
-    "jobs-service-infinispan": "kogito-jobs-service-infinispan",
-    "jobs-service-mongodb": "kogito-jobs-service-mongodb",
-    "jobs-service-inmemory": "kogito-jobs-service-ephemeral",
-    "jobs-service-postgresql": "kogito-jobs-service-postgresql",
-    "management-console": "kogito-management-console",
-    "task-console": "kogito-task-console",
-    "trusty-ui": "kogito-trusty-ui",
-    "jitexecutor-runner": "kogito-jit-runner"
-}
-
-
-def is_snapshot_version(version):
-    """
-    Check whether the given version is a snapshot version
-    :param version: The version to check
-    :return: whether the given version is a snapshot version
-    """
-    return version.endswith("-SNAPSHOT")
-
-
-def get_metadata_root(service):
-    """
-    Get the root element from the maven-metadata
-    :param service: Service information (repo_url, version, name)
-    :return: root object
-    """
-    metadataURL=service["repo_url"]+"maven-metadata.xml"
-    mavenMetadata=requests.get(metadataURL, verify=service["ignore_self_signed_cert"])
-    with open('maven-metadata.xml', 'wb') as f:
-        f.write(mavenMetadata.content)
-    tree = ET.parse('maven-metadata.xml')
-    root = tree.getroot()
-    os.remove("maven-metadata.xml")
-    return root
-
-
-def get_snapshot_version(service):
-    """
-    parse the xml and finds the snapshotVersion
-    :param service: Service information (repo_url, version, name)
-    :return: snapshotVersion string
-    """
-    root = get_metadata_root(service)
-    snapshotVersion = root.find("./versioning/snapshotVersions/snapshotVersion/value").text
-    return snapshotVersion
-
-
-def get_runner_url(service):
-    """
-    Creates the updated URL for runner.jar
-    :param service: Service information (repo_url, version, name)
-    :return: url string
-    """
-    finalVersion = service["version"]
-    if is_snapshot_version(finalVersion):
-        finalVersion = get_snapshot_version(service)
-    url = service["repo_url"] + "{0}-{1}-runner.jar".format(service["name"], finalVersion)
-    check_url(url)
-    return url
-
-
-def get_md5(service):
-    """
-    Fetches the md5 code for the latest runner.jar
-    :param service: Service information (repo_url, version, name)
-    :return: runnerMD5 string
-    """
-    runnerURL = get_runner_url(service)
-    runnerMD5URL = runnerURL+".md5"
-    check_url(runnerMD5URL)
-    runnerMD5 = sp.getoutput("curl -s  {}".format(runnerMD5URL))
-    return runnerMD5
-
-
-def check_url(url):
-    """
-    Check url returns 2xx code.
-    :param url
-    """
-    resultCode = int(sp.getoutput('curl -I -s -o /dev/null -w "%{0}" {1}'.format('{http_code}', url)))
-    if resultCode < 200 or resultCode >= 300:
-        raise ValueError('Got http code {0} for url {1}'.format(resultCode, url))
-
-
-def update_artifacts(service, modulePath):
-    """
-    Updates the module.yaml file of services with latest artifacts. When an image contains more than one jar, the correct one is selected by
-    checking if the name of the service is contained in the name of the artifact.
-    :param service: Service information (repo_url, version, name)
-    :param modulePath: relative file location of the module.yaml for the kogito service
-    """
-
-    with open(modulePath) as module:
-        data = common.yaml_loader().load(module)
-        # print(service)
-        # print(data['artifacts'])
-        # print(filter(lambda x: service['name'] in x['name']))
-        artifact = next(filter(lambda x: service['name'] in x['name'], data['artifacts']))
-        artifact['url'] = get_runner_url(service)
-        artifact['md5'] = get_md5(service)
-    with open(modulePath, 'w') as module:
-        common.yaml_loader().dump(data, module)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given maven repository')
-    parser.add_argument('--repo-url', dest='repo_url', default=DEFAULT_REPO_URL, help='Defines the url of the repository to extract the artifacts from, defaults to {}'.format(DEFAULT_REPO_URL))
-    parser.add_argument('--ignore-self-signed-cert', action='store_false', help='If set, will relax the SSL for user-generated self-signed certificates')
-    args = parser.parse_args()
-
-    artifactsVersion = common.retrieve_artifacts_version()
-    print("Retrieve artifacts version: ", artifactsVersion)
-
-    # Update Kogito Service modules
-    moduleError = False
-    for serviceName, modulePath in Modules.items():
-        service = {
-            "repo_url": args.repo_url + "{}/{}/{}/".format(KOGITO_ARTIFACT_PATH, serviceName, artifactsVersion),
-            "name": serviceName,
-            "version": artifactsVersion,
-            "ignore_self_signed_cert": args.ignore_self_signed_cert
-        }
-        moduleYamlFile = "modules/{}/module.yaml".format(modulePath)
-
-        print("Update artifact: ", serviceName)
-        try:
-            update_artifacts(service, moduleYamlFile)
-            print("Successfully updated the artifacts for: ", serviceName)
-        except Exception as e:
-            print("Error updating artifact ", serviceName)
-            print(e)
-            moduleError = True
-    
-    if moduleError:
-        raise RuntimeError('Script did not succeed successfully')
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
index 654bc1a9891..e3c799b3554 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -11,15 +11,11 @@ Feature: Kogito-data-index ephemeral postgresql feature.
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - ephemeral PostgreSQL
       And the image should contain label io.openshift.tags with value kogito,data-index,data-index-ephemeral
 
-  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-inmemory-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-inmemory-runner.jar
-
   Scenario: verify if of kogito-data-index-ephemeral container is correctly started
     When container is started with env
       | variable       | value  |
       | SCRIPT_DEBUG   | true   |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-inmemory-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -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 Embedded Postgres started at port
     And container log should not contain Application failed to start
 
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index 32c7f31d1fc..a4c72bb3b90 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -11,10 +11,6 @@ Feature: Kogito-data-index infinispan feature.
      And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Infinispan
      And the image should contain label io.openshift.tags with value kogito,data-index,data-index-infinispan
 
-  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-infinispan-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-infinispan-runner.jar
-
   Scenario: verify if all parameters are correctly set
     When container is started with env
       | variable                                  | value             |
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
index e28d11a632f..4a587ca0d28 100644
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -11,10 +11,6 @@ Feature: Kogito-data-index mongodb feature.
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Mongodb
       And the image should contain label io.openshift.tags with value kogito,data-index,data-index-mongodb
 
-  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-mongodb-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-mongodb-runner.jar
-
   Scenario: verify if all parameters are correctly set
     When container is started with env
       | variable                                   | value                       |
diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature
index d65eedbe938..e2d734a99d9 100644
--- a/tests/features/data-index/kogito-data-index-oracle.feature
+++ b/tests/features/data-index/kogito-data-index-oracle.feature
@@ -11,9 +11,6 @@ Feature: Kogito-data-index oracle feature.
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Oracle
       And the image should contain label io.openshift.tags with value kogito,data-index,data-index-oracle
 
-  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-oracle-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-oracle-runner.jar
 
   Scenario: verify if of container is correctly started with oracle parameters
     When container is started with env
@@ -22,6 +19,6 @@ Feature: Kogito-data-index oracle feature.
       | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:oracle:thin:@//10.1.1.53:1521/quarkus |
       | QUARKUS_DATASOURCE_USERNAME  | kogito                                    |
       | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                    |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-oracle-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -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>': IO Error: The Network Adapter could not establish the connection
     And container log should not contain Application failed to start
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
index e0831f80653..334d344d1ac 100644
--- a/tests/features/data-index/kogito-data-index-postgresql.feature
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -11,17 +11,3 @@ Feature: Kogito-data-index postgresql feature.
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - PostgreSQL
       And the image should contain label io.openshift.tags with value kogito,data-index,data-index-postgresql
 
-  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/data-index-service-postgresql-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-postgresql-runner.jar
-
-  Scenario: verify if of container is correctly started with postgresql parameters
-    When container is started with env
-      | variable                     | value                                    |
-      | SCRIPT_DEBUG                 | true                                     |
-      | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:postgresql://10.1.1.10:5432/quarkus |
-      | QUARKUS_DATASOURCE_USERNAME  | kogito                                   |
-      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/data-index-service-postgresql-runner.jar
-    And container log should contain Datasource '<default>': The connection attempt failed
-    And container log should not contain Application failed to start
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index a0bdea3b69d..d1916da29ad 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -11,15 +11,11 @@ Feature: Kogito-jobs-service-ephemeral feature.
     And the image should contain label io.k8s.display-name with value Kogito in memory Jobs Service
     And the image should contain label io.openshift.tags with value kogito,jobs-service-ephemeral
 
-  Scenario: verify if the jobs service ephemeral binary is available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/jobs-service-inmemory-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-inmemory-runner.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/jobs-service-inmemory-runner.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/tests/features/jobs-service/kogito-jobs-service-infinispan.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
index d190d5ae046..fd620195634 100644
--- a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
@@ -10,10 +10,6 @@ Feature: Kogito-jobs-service-infinispan feature.
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Infinispan
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Infinispan
     And the image should contain label io.openshift.tags with value kogito,jobs-service-infinispan
-  
-  Scenario: verify if the jobs service infinispan binary is available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/jobs-service-infinispan-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-infinispan-runner.jar
 
   Scenario: verify if auth is correctly set
     When container is started with env
@@ -25,7 +21,7 @@ Feature: Kogito-jobs-service-infinispan feature.
       | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-infinispan-runner.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_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
     And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
index a756b279944..8ad10b190bb 100644
--- a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
@@ -10,10 +10,6 @@ Feature: Kogito-jobs-service-mongodb feature.
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on MongoDB
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on MongoDB
     And the image should contain label io.openshift.tags with value kogito,jobs-service-mongodb
-  
-  Scenario: verify if the jobs service mongodb binary is available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/jobs-service-mongodb-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-mongodb-runner.jar
 
   Scenario: verify if of container is correctly started with mongo parameters
     When container is started with env
@@ -21,5 +17,5 @@ Feature: Kogito-jobs-service-mongodb feature.
       | SCRIPT_DEBUG                      | true                                           |
       | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://user:password@localhost:27017/admin  |
       | QUARKUS_MONGODB_DATABASE          | kogito                                         |
-    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-mongodb-runner.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 not contain Application failed to start
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index 2aab4a74980..9f5815c154d 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -10,17 +10,3 @@ Feature: Kogito-jobs-service-postgresql feature.
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Postgresql
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Postgresql
     And the image should contain label io.openshift.tags with value kogito,jobs-service-postgresql
-  
-  Scenario: verify if the jobs service postgresql binary is available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/jobs-service-postgresql-runner.jar' in container and immediately check its output for /home/kogito/bin/jobs-service-postgresql-runner.jar
-
-  Scenario: verify if of container is correctly started with postgresql parameters
-    When container is started with env
-      | variable                     | value                                    |
-      | SCRIPT_DEBUG                 | true                                     |
-      | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:postgresql://10.1.1.10:5432/quarkus |
-      | QUARKUS_DATASOURCE_USERNAME  | kogito                                   |
-      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
-    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jobs-service-postgresql-runner.jar
-    And container log should contain Datasource '<default>': The connection attempt failed
diff --git a/tests/features/kogito-common-postresql-services.feature b/tests/features/kogito-common-postresql-services.feature
new file mode 100644
index 00000000000..9e165720913
--- /dev/null
+++ b/tests/features/kogito-common-postresql-services.feature
@@ -0,0 +1,14 @@
+@quay.io/kiegroup/kogito-jobs-service-postgresql
+@quay.io/kiegroup/kogito-trusty-postgresql
+@quay.io/kiegroup/kogito-data-index-postgresql
+Feature: Kogito-data-index postgresql feature.
+
+  Scenario: verify if of container is correctly started with postgresql parameters
+    When container is started with env
+      | variable                     | value                                     |
+      | SCRIPT_DEBUG                 | true                                      |
+      | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:postgresql://localhost:5432/quarkus  |
+      | QUARKUS_DATASOURCE_USERNAME  | kogito                                    |
+      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                    |
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
+     And container log should contain Datasource '<default>': Connection to localhost:5432 refused
\ No newline at end of file
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index 861e0e9cba9..cb73a644386 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -13,24 +13,24 @@ Feature: Kogito-explainability feature.
 
   Scenario: verify if the messaging binary is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/explainability-service-messaging-runner.jar' in container and immediately check its output for /home/kogito/bin/explainability-service-messaging-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/messaging/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/messaging/quarkus-app/quarkus-run.jar
 
   Scenario: verify if the rest binary is available on /home/kogito
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/explainability-service-rest-runner.jar' in container and immediately check its output for /home/kogito/bin/explainability-service-rest-runner.jar
+    Then run sh -c 'ls /home/kogito/bin/rest/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/rest/quarkus-app/quarkus-run.jar
 
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/explainability-service-messaging-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/messaging/quarkus-app/quarkus-run.jar
 
   Scenario: Verify if the explainability rest binary is selected by the enviroment variable EXPLAINABILITY_COMMUNICATION
     When container is started with env
       | variable      | value |
       | EXPLAINABILITY_COMMUNICATION  | rest |
       | SCRIPT_DEBUG  | true  |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/explainability-service-rest-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/rest/quarkus-app/quarkus-run.jar
 
   Scenario: Verify if the communication is correctly set to its default value if a wrong communication type is set
     When container is started with env
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index de51f70ed16..d4757313e15 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -11,15 +11,11 @@ Feature: Kogito-jit-runner feature.
     And the image should contain label io.k8s.display-name with value Kogito JIT Runner
     And the image should contain label io.openshift.tags with value kogito,jit-runner
 
-  Scenario: verify if the binary index is available on /home/kogito
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/jitexecutor-runner.jar' in container and immediately check its output for /home/kogito/bin/jitexecutor-runner.jar
-
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/jitexecutor-runner.jar
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
 
   Scenario: Verify that jit runner can evaluate a DMN model with a context
     When container is started with env
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index b91cdbf5908..e86b2869074 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -11,15 +11,11 @@ Feature: kogito-management-console feature
     And the image should contain label io.k8s.display-name with value Kogito Management Console
     And the image should contain label io.openshift.tags with value kogito,management,management-console
 
-  Scenario: verify if the management console jar is available on /home/kogito
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/management-console-runner.jar' in container and immediately check its output for /home/kogito/bin/management-console-runner.jar
-
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/management-console-runner.jar
+    Then container log should contain -Dkogito.dataindex.http.url=http://localhost:8180 -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 Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
@@ -29,7 +25,7 @@ Feature: kogito-management-console feature
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/management-console-runner.jar
+    Then container log should contain -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index 55fffb1f631..b0fd321f733 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -11,15 +11,11 @@ Feature: kogito-task-console feature
     And the image should contain label io.k8s.display-name with value Kogito Task Console
     And the image should contain label io.openshift.tags with value kogito,task,task-console
 
-  Scenario: verify if the task console jar is available on /home/kogito
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/task-console-runner.jar' in container and immediately check its output for /home/kogito/bin/task-console-runner.jar
-
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain -Dkogito.dataindex.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/task-console-runner.jar
+    Then container log should contain -Dkogito.dataindex.http.url=http://localhost:8180 -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 Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
@@ -29,7 +25,7 @@ Feature: kogito-task-console feature
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/task-console-runner.jar
+    Then container log should contain -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
     And container log should not contain Data index url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature
new file mode 100644
index 00000000000..a7ac9ebdebf
--- /dev/null
+++ b/tests/features/supporting-services-common.feature
@@ -0,0 +1,21 @@
+@quay.io/kiegroup/kogito-management-console
+@quay.io/kiegroup/kogito-task-console
+@quay.io/kiegroup/kogito-data-index-ephemeral
+@quay.io/kiegroup/kogito-data-index-infinispan
+@quay.io/kiegroup/kogito-data-index-mongodb
+@quay.io/kiegroup/kogito-data-index-oracle
+@quay.io/kiegroup/kogito-data-index-postgresql
+@quay.io/kiegroup/kogito-jobs-service-ephemeral
+@quay.io/kiegroup/kogito-jobs-service-infinispan
+@quay.io/kiegroup/kogito-jobs-service-mongodb
+@quay.io/kiegroup/kogito-jobs-service-postgresql
+@quay.io/kiegroup/kogito-trusty-infinispan
+@quay.io/kiegroup/kogito-trusty-postgresql
+@quay.io/kiegroup/kogito-trusty-redis
+@quay.io/kiegroup/kogito-trusty-ui
+@quay.io/kiegroup/kogito-jit-runner
+Feature: kogito supporting services common feature
+
+Scenario: verify if the management console jar is available on /home/kogito
+  When container is started with command bash
+  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
\ No newline at end of file
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
index 6a1ceab1051..5a67c049f88 100644
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -11,16 +11,12 @@ Feature: Kogito-trusty infinispan feature.
     And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Infinispan
     And the image should contain label io.openshift.tags with value kogito,trusty,trusty-infinispan
 
-  Scenario: verify if the binary index is available on /home/kogito
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/trusty-service-infinispan-runner.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-infinispan-runner.jar
-
   Scenario: Verify if the explainability messaging is disabled
     When container is started with env
       | variable      | value |
       | SCRIPT_DEBUG  | true  |
       | EXPLAINABILITY_ENABLED     | false  |
-    Then container log should contain -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-service-infinispan-runner.jar
+    Then container log should contain -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
 
   Scenario: verify if auth is correctly set
     When container is started with env
diff --git a/tests/features/trusty/kogito-trusty-postgresql.feature b/tests/features/trusty/kogito-trusty-postgresql.feature
index ef6371f2659..43e0e867ab2 100644
--- a/tests/features/trusty/kogito-trusty-postgresql.feature
+++ b/tests/features/trusty/kogito-trusty-postgresql.feature
@@ -11,17 +11,3 @@ Feature: Kogito-trusty postgresql feature.
       And the image should contain label io.k8s.display-name with value Kogito Trusty Service - PostgreSQL
       And the image should contain label io.openshift.tags with value kogito,trusty,trusty-postgresql
 
-  Scenario: verify if the trusty service binaries are available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/trusty-service-postgresql-runner.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-postgresql-runner.jar
-
-  Scenario: verify if all parameters are correctly set
-    When container is started with env
-      | variable                     | value                                    |
-      | SCRIPT_DEBUG                 | true                                     |
-      | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:postgresql://10.1.1.10:5432/quarkus |
-      | QUARKUS_DATASOURCE_USERNAME  | kogito                                   |
-      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                   |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-service-postgresql-runner.jar
-    And container log should contain org.postgresql.util.PSQLException: The connection attempt failed
-    And container log should not contain Application failed to start
diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature
index 9b0607472a6..8219f0eb2b8 100644
--- a/tests/features/trusty/kogito-trusty-redis.feature
+++ b/tests/features/trusty/kogito-trusty-redis.feature
@@ -11,13 +11,10 @@ Feature: Kogito-trusty redis feature.
       And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Redis
       And the image should contain label io.openshift.tags with value kogito,trusty,trusty-redis
 
-  Scenario: verify if the indexing service binaries are available on /home/kogito/bin
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/trusty-service-redis-runner.jar' in container and immediately check its output for /home/kogito/bin/trusty-service-redis-runner.jar
-
   Scenario: verify if all parameters are correctly set
     When container is started with env
       | variable                                   | value                       |
       | SCRIPT_DEBUG                               | true                        |
       | KOGITO_PERSISTENCE_REDIS_URL               | redis://127.0.0.1:6379      |
-    Then container log should contain KOGITO_PERSISTENCE_REDIS_URL=redis://127.0.0.1:6379
\ No newline at end of file
+    Then container log should contain KOGITO_PERSISTENCE_REDIS_URL=redis://127.0.0.1:6379
+    And container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/tests/features/trusty/kogito-trusty-ui.feature b/tests/features/trusty/kogito-trusty-ui.feature
index d7137ac2f9d..e14f130438e 100644
--- a/tests/features/trusty/kogito-trusty-ui.feature
+++ b/tests/features/trusty/kogito-trusty-ui.feature
@@ -11,15 +11,11 @@ Feature: kogito-trusty-ui feature
     And the image should contain label io.k8s.display-name with value Kogito Trusty UI
     And the image should contain label io.openshift.tags with value kogito,trusty,trusty-ui
 
-  Scenario: verify if the trusty ui jar is available on /home/kogito
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/trusty-ui-runner.jar' in container and immediately check its output for /home/kogito/bin/trusty-ui-runner.jar
-
   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-ui-runner.jar
+    Then container log should contain -Dkogito.trusty.http.url=http://localhost:8180 -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 Trusty url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
@@ -29,7 +25,7 @@ Feature: kogito-trusty-ui feature
       | variable                  | value            |
       | SCRIPT_DEBUG              | true             |
       | KOGITO_TRUSTY_ENDPOINT    | http://test:9090 |
-    Then container log should contain -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/trusty-ui-runner.jar
+    Then container log should contain -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
     And container log should not contain Trusty url not set, default will be used: http://localhost:8180
     And container log should contain started in
     And container log should not contain Application failed to start
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 402c81892fc..c6ee5c88e23 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -2,36 +2,21 @@
 #
 # Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
 
-SCRIPT_DIR=`pwd`
-MVN_MODULE="${SCRIPT_DIR}/../../modules/kogito-maven/3.6.x"
+set -e
+base_dir=`dirname $(realpath -s $0)`
+
+. ${base_dir}/../../scripts/setup-maven.sh
+
+MAVEN_OPTIONS="-U ${MAVEN_OPTIONS}"
+
 CONTAINER_ENGINE="docker"
-MAVEN_OPTIONS="-DskipTests -U"
 MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS="-Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=${CONTAINER_ENGINE}"
-# MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true
 
 NATIVE_BUILD=$1
 if [ -z $NATIVE_BUILD ]; then
     NATIVE_BUILD=true
 fi
 
-# exit when any command fails
-set -e
-# Setup maven configuration only on CI
-if [ "${CI}" ]; then
-    # setup maven env
-    export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
-    # export MAVEN_REPO_URL=
-    cp "${MVN_MODULE}"/maven/settings.xml "${HOME}"/.m2/settings.xml
-    source "${MVN_MODULE}"/added/configure-maven.sh
-    configure
-
-    cat "${HOME}"/.m2/settings.xml
-fi
-
-if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" = "true" ]; then
-    MAVEN_OPTIONS="${MAVEN_OPTIONS} -Denforcer.skip"
-fi
-
 # Clone examples
 cd /tmp
 rm -rf kogito-examples/
@@ -49,6 +34,7 @@ mvn -f kogito-springboot-examples/process-springboot-example clean package ${MAV
 
 if [ "$NATIVE_BUILD" = 'true' ]; then
     mvn -f kogito-quarkus-examples/rules-quarkus-helloworld-native -Pnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
+    ls -lah /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/target/
 fi
 
 # preparing directory to run kogito maven archetypes tests
@@ -58,7 +44,8 @@ cp /tmp/kogito-examples/kogito-quarkus-examples/dmn-quarkus-example/src/main/res
 # by adding the application.properties file telling app to start on
 # port 10000, the purpose of this tests is make sure that the images
 # will ensure the use of the port 8080.
-cp "${SCRIPT_DIR}"/application.properties /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
+
+cp ${base_dir}/application.properties /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
 (echo ""; echo "server.port=10000") >> /tmp/kogito-examples/kogito-springboot-examples/process-springboot-example/src/main/resources/application.properties
 
 git add --all  :/

From 34244285461e62c039747f46a9d491b8e1cc9a37 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 2 May 2022 10:38:03 +0200
Subject: [PATCH 446/709] Try to stabilize images build (#1248)

---
 scripts/build-kogito-apps-components.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 362ad30fb1f..94bc14f0457 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -93,7 +93,8 @@ for ctx in ${contextDir}; do
     cd ${KOGITO_APPS_REPO_NAME} && echo "working dir `pwd`"
     mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS} -Dmaven.repo.local=/tmp/temp_maven/${ctx}"
     echo "Building component(s) ${contextDir} with the following maven command [${mvn_command}]"
-    export YARN_CACHE_FOLDER=/tmp/cache/${ctx} # Fix for building yarn apps in parallel
+    export YARN_CACHE_FOLDER=/tmp/cache/yarn/${ctx} # Fix for building yarn apps in parallel
+    export CYPRESS_CACHE_FOLDER=/tmp/cache/cypress/${ctx} # https://docs.cypress.io/guides/getting-started/installing-cypress#Advanced
     eval ${mvn_command}
     cd ${ctx}/target/
     zip -r $(basename ${ctx})-quarkus-app.zip quarkus-app

From d5573fee4bd0e0eaa02a97373682f088c409d238 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 4 May 2022 20:36:46 +0200
Subject: [PATCH 447/709] KOGITO-6962 DSL reorganization for flexibility
 (#1225)

---
 .ci/jenkins/dsl/jobs.groovy            | 81 +++++++++++---------------
 .ci/jenkins/dsl/test.sh                | 24 ++------
 .github/workflows/jenkins-tests-PR.yml |  7 +--
 3 files changed, 42 insertions(+), 70 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index b18b10e6be0..a8372a9842d 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -1,43 +1,32 @@
-import org.kie.jenkins.jobdsl.templates.KogitoJobTemplate
-import org.kie.jenkins.jobdsl.FolderUtils
+/*
+* This file is describing all the Jenkins jobs in the DSL format (see https://plugins.jenkins.io/job-dsl/)
+* needed by the Kogito pipelines.
+*
+* The main part of Jenkins job generation is defined into the https://github.com/kiegroup/kogito-pipelines repository.
+*
+* This file is making use of shared libraries defined in
+* https://github.com/kiegroup/kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
+*/
+
+import org.kie.jenkins.jobdsl.model.Folder
+import org.kie.jenkins.jobdsl.KogitoJobTemplate
+import org.kie.jenkins.jobdsl.KogitoJobUtils
 import org.kie.jenkins.jobdsl.Utils
-import org.kie.jenkins.jobdsl.KogitoJobType
 
-JENKINSFILE_PATH = '.ci/jenkins'
-
-def getDefaultJobParams() {
-    return KogitoJobTemplate.getDefaultJobParams(this, 'kogito-images')
-}
-
-def getJobParams(String jobName, String jobFolder, String jenkinsfileName, String jobDescription = '') {
-    def jobParams = getDefaultJobParams()
-    jobParams.job.name = jobName
-    jobParams.job.folder = jobFolder
-    jobParams.jenkinsfile = jenkinsfileName
-    if (jobDescription) {
-        jobParams.job.description = jobDescription
-    }
-    return jobParams
-}
-
-if (Utils.isMainBranch(this)) {
-    // For BDD runtimes PR job
-    setupDeployJob(FolderUtils.getPullRequestRuntimesBDDFolder(this), KogitoJobType.PR)
-}
+jenkins_path = '.ci/jenkins'
 
+// PR checks
 setupPrJob()
+setupDeployJob(Folder.PULLREQUEST_RUNTIMES_BDD)
 
-// Branch jobs
-setupDeployJob(FolderUtils.getNightlyFolder(this), KogitoJobType.NIGHTLY)
-setupPromoteJob(FolderUtils.getNightlyFolder(this), KogitoJobType.NIGHTLY)
+// Nightly jobs
+setupDeployJob(Folder.NIGHTLY)
 
-// No release directly on main branch
-if (!Utils.isMainBranch(this)) {
-    setupDeployJob(FolderUtils.getReleaseFolder(this), KogitoJobType.RELEASE)
-    setupPromoteJob(FolderUtils.getReleaseFolder(this), KogitoJobType.RELEASE)
-}
+// Release jobs
+setupDeployJob(Folder.RELEASE)
+setupPromoteJob(Folder.RELEASE)
 
-if (Utils.isLTSBranch(this)) {
+if (Utils.isProductizedBranch(this)) {
     setupProdUpdateVersionJob()
 }
 
@@ -45,29 +34,29 @@ if (Utils.isLTSBranch(this)) {
 // Methods
 /////////////////////////////////////////////////////////////////
 
-void setupPrJob(String branch = "${GIT_BRANCH}") {
-    def jobParams = getDefaultJobParams()
+void setupPrJob() {
+    def jobParams = KogitoJobUtils.getDefaultJobParams(this)
     jobParams.pr.putAll([
-        run_only_for_branches: [ branch ],
+        run_only_for_branches: [ "${GIT_BRANCH}" ],
         disable_status_message_error: true,
         disable_status_message_failure: true,
     ])
     KogitoJobTemplate.createPRJob(this, jobParams)
 }
 
-void setupDeployJob(String jobFolder, KogitoJobType jobType) {
-    def jobParams = getJobParams('kogito-images-deploy', jobFolder, "${JENKINSFILE_PATH}/Jenkinsfile.deploy", 'Kogito Images Deploy')
-    if (jobType == KogitoJobType.PR) {
+void setupDeployJob(Folder jobFolder) {
+    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images-deploy', jobFolder, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
+    if (jobFolder.isPullRequest()) {
         jobParams.git.branch = '${BUILD_BRANCH_NAME}'
         jobParams.git.author = '${GIT_AUTHOR}'
         jobParams.git.project_url = Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository)
     }
-    KogitoJobTemplate.createPipelineJob(this, jobParams).with {
+    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
 
             stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
-            if (jobType == KogitoJobType.PR) {
+            if (jobFolder.isPullRequest()) {
                 // author can be changed as param only for PR behavior, due to source branch/target, else it is considered as an env
                 stringParam('GIT_AUTHOR', "${GIT_AUTHOR_NAME}", 'Set the Git author to checkout')
             }
@@ -104,10 +93,9 @@ void setupDeployJob(String jobFolder, KogitoJobType jobType) {
             env('CONTAINER_TLS_OPTIONS', '')
             env('MAX_REGISTRY_RETRIES', 3)
 
-            env('RELEASE', jobType == KogitoJobType.RELEASE)
             env('JENKINS_EMAIL_CREDS_ID', "${JENKINS_EMAIL_CREDS_ID}")
 
-            if (jobType == KogitoJobType.PR) {
+            if (jobFolder.isPullRequest()) {
                 env('MAVEN_ARTIFACT_REPOSITORY', "${MAVEN_PR_CHECKS_REPOSITORY_URL}")
             } else {
                 env('GIT_AUTHOR', "${GIT_AUTHOR_NAME}")
@@ -124,8 +112,8 @@ void setupDeployJob(String jobFolder, KogitoJobType jobType) {
     }
 }
 
-void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
-    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-promote', jobFolder, "${JENKINSFILE_PATH}/Jenkinsfile.promote", 'Kogito Images Promote')).with {
+void setupPromoteJob(Folder jobFolder) {
+    KogitoJobTemplate.createPipelineJob(this, KogitoJobUtils.getBasicJobParams(this, 'kogito-images-promote', jobFolder, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote'))?.with {
         parameters {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
 
@@ -170,7 +158,6 @@ void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
             env('CONTAINER_TLS_OPTIONS', '--tls-verify=false')
             env('MAX_REGISTRY_RETRIES', 3)
 
-            env('RELEASE', jobType == KogitoJobType.RELEASE)
             env('JENKINS_EMAIL_CREDS_ID', "${JENKINS_EMAIL_CREDS_ID}")
 
             env('GIT_AUTHOR', "${GIT_AUTHOR_NAME}")
@@ -187,7 +174,7 @@ void setupPromoteJob(String jobFolder, KogitoJobType jobType) {
 }
 
 void setupProdUpdateVersionJob() {
-    KogitoJobTemplate.createPipelineJob(this, getJobParams('kogito-images-update-prod-version', FolderUtils.getToolsFolder(this), "${JENKINSFILE_PATH}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images')).with {
+    KogitoJobTemplate.createPipelineJob(this, KogitoJobUtils.getBasicJobParams(this, 'kogito-images-update-prod-version', Folder.TOOLS, "${jenkins_path}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images'))?.with {
         parameters {
             stringParam('JIRA_NUMBER', '', 'KIECLOUD-XXX or RHPAM-YYYY or else. This will be added to the commit and PR.')
             stringParam('PROD_PROJECT_VERSION', '', 'Which version to set ?')
diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index 9af49b284b8..125afbb9e8c 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -1,20 +1,8 @@
 #!/bin/bash -e
 
-TEMP_DIR=`mktemp -d`
-
-branch=$1
-author=$2
-
-if [ -z $branch ]; then
-  branch='main'
-fi
-
-if [ -z $author ]; then
-  author='kiegroup'
-fi
-
-echo '----- Cloning main dsl pipelines repo'
-git clone --single-branch --branch $branch https://github.com/${author}/kogito-pipelines.git $TEMP_DIR
-
-echo '----- Launching seed tests'
-${TEMP_DIR}/dsl/seed/scripts/seed_test.sh ${TEMP_DIR}
+file=$(mktemp)
+# For more usage of the script, use ./test.sh -h
+# TODO to update before merge
+curl -o ${file} https://raw.githubusercontent.com/radtriste/kogito-pipelines/kogito-6962/dsl/seed/scripts/seed_test.sh
+chmod u+x ${file}
+${file} $@
\ No newline at end of file
diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index 2c37b480902..d3f00dfb465 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -1,8 +1,6 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
 name: Jenkins Tests
-
 on:
   pull_request:
     paths: 
@@ -11,7 +9,6 @@ on:
 jobs:
   dsl-tests:
     runs-on: ubuntu-latest
-
     steps:
     - name: Checkout 
       uses: actions/checkout@v2
@@ -20,6 +17,6 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
-      
+
     - name: Test DSL
-      run: cd .ci/jenkins/dsl && ./test.sh
+      run: cd .ci/jenkins/dsl && ./test.sh -b ${{ github.head_ref }} -o ${{ github.event.pull_request.user.login }} -t ${{ github.base_ref }} -a ${{ github.event.pull_request.base.user.login }}
\ No newline at end of file

From cc63bfe67e5b0a54722f85b5ed6126eb89bf8d08 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 5 May 2022 14:20:46 +0200
Subject: [PATCH 448/709] KOGITO-7101 Correct DSL tests (#1250)

---
 .ci/jenkins/dsl/test.sh                | 3 +--
 .github/workflows/jenkins-tests-PR.yml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index 125afbb9e8c..184413cb5fd 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -2,7 +2,6 @@
 
 file=$(mktemp)
 # For more usage of the script, use ./test.sh -h
-# TODO to update before merge
-curl -o ${file} https://raw.githubusercontent.com/radtriste/kogito-pipelines/kogito-6962/dsl/seed/scripts/seed_test.sh
+curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
 chmod u+x ${file}
 ${file} $@
\ No newline at end of file
diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index d3f00dfb465..000b57ee296 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -19,4 +19,4 @@ jobs:
         java-version: 11
 
     - name: Test DSL
-      run: cd .ci/jenkins/dsl && ./test.sh -b ${{ github.head_ref }} -o ${{ github.event.pull_request.user.login }} -t ${{ github.base_ref }} -a ${{ github.event.pull_request.base.user.login }}
\ No newline at end of file
+      run: .ci/jenkins/dsl/test.sh -h ${{ github.head_ref }} -r ${{ github.event.pull_request.head.repo.full_name }} -b ${{ github.base_ref }} -t ${{ github.event.pull_request.base.repo.full_name }} .ci/jenkins/dsl
\ No newline at end of file

From 2c9cc60521048c8ae828f9e714c02b3d102cc7f1 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 5 May 2022 15:37:18 +0200
Subject: [PATCH 449/709] Jenkinsfiles: Corrected boolean env var handling
 (#1251)

---
 .ci/jenkins/Jenkinsfile.deploy  | 2 +-
 .ci/jenkins/Jenkinsfile.promote | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index b31347cef26..9864782d918 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -590,7 +590,7 @@ String getWorkspacePath(String image) {
 ////////////////////////////////////////////////////////////////////////
 
 boolean isRelease() {
-    return env.RELEASE.toBoolean()
+    return env.RELEASE ? env.RELEASE.toBoolean() : false
 }
 
 String getRepoName() {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 416d7aee963..75bb48d032b 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -417,7 +417,7 @@ String getParamOrDeployProperty(String paramKey, String deployPropertyKey) {
 ////////////////////////////////////////////////////////////////////////
 
 boolean isRelease() {
-    return env.RELEASE.toBoolean()
+    return env.RELEASE ? env.RELEASE.toBoolean() : false
 }
 
 String getRepoName() {

From 6e81644a72b8ec8a26aa7cfc05a3ca4637b7caf5 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 6 May 2022 16:29:57 +0200
Subject: [PATCH 450/709] KOGITO-7110 Correct nightly DSL generation (#1252)

---
 .ci/jenkins/dsl/jobs.groovy | 120 ++++++++++++++++++------------------
 1 file changed, 61 insertions(+), 59 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index a8372a9842d..bab697c4fdc 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -51,6 +51,34 @@ void setupDeployJob(Folder jobFolder) {
         jobParams.git.author = '${GIT_AUTHOR}'
         jobParams.git.project_url = Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository)
     }
+    jobParams.env.putAll([
+        CI: true,
+        REPO_NAME: 'kogito-images',
+        PROPERTIES_FILE_NAME: 'deployment.properties',
+
+        CONTAINER_ENGINE: 'docker',
+        CONTAINER_TLS_OPTIONS: '',
+        MAX_REGISTRY_RETRIES: 3,
+
+        JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+    ])
+    if (jobFolder.isPullRequest()) {
+        jobParams.env.putAll([
+            MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_PR_CHECKS_REPOSITORY_URL}",
+        ])
+    } else {
+        jobParams.env.putAll([
+            GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+
+            AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+            GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+            GIT_AUTHOR_BOT: "${GIT_BOT_AUTHOR_NAME}",
+            BOT_CREDENTIALS_ID: "${GIT_BOT_AUTHOR_CREDENTIALS_ID}",
+
+            MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+            DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
+        ])
+    }
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
@@ -83,37 +111,33 @@ void setupDeployJob(Folder jobFolder) {
 
             booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
         }
+    }
+}
 
-        environmentVariables {
-            env('CI', true)
-            env('REPO_NAME', 'kogito-images')
-            env('PROPERTIES_FILE_NAME', 'deployment.properties')
-
-            env('CONTAINER_ENGINE', 'docker')
-            env('CONTAINER_TLS_OPTIONS', '')
-            env('MAX_REGISTRY_RETRIES', 3)
+void setupPromoteJob(Folder jobFolder) {
+    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images-promote', jobFolder, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote')
+    jobParams.env.putAll([
+        CI: true,
+        REPO_NAME: 'kogito-images',
+        PROPERTIES_FILE_NAME: 'deployment.properties',
 
-            env('JENKINS_EMAIL_CREDS_ID', "${JENKINS_EMAIL_CREDS_ID}")
+        CONTAINER_ENGINE: 'podman',
+        CONTAINER_TLS_OPTIONS: '--tls-verify=false',
+        MAX_REGISTRY_RETRIES: 3,
 
-            if (jobFolder.isPullRequest()) {
-                env('MAVEN_ARTIFACT_REPOSITORY', "${MAVEN_PR_CHECKS_REPOSITORY_URL}")
-            } else {
-                env('GIT_AUTHOR', "${GIT_AUTHOR_NAME}")
+        JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
 
-                env('AUTHOR_CREDS_ID', "${GIT_AUTHOR_CREDENTIALS_ID}")
-                env('GITHUB_TOKEN_CREDS_ID', "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}")
-                env('GIT_AUTHOR_BOT', "${GIT_BOT_AUTHOR_NAME}")
-                env('BOT_CREDENTIALS_ID', "${GIT_BOT_AUTHOR_CREDENTIALS_ID}")
+        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
 
-                env('MAVEN_ARTIFACT_REPOSITORY', "${MAVEN_ARTIFACTS_REPOSITORY}")
-                env('DEFAULT_STAGING_REPOSITORY', "${MAVEN_NEXUS_STAGING_PROFILE_URL}")
-            }
-        }
-    }
-}
+        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+        GIT_AUTHOR_BOT: "${GIT_BOT_AUTHOR_NAME}",
+        BOT_CREDENTIALS_ID: "${GIT_BOT_AUTHOR_CREDENTIALS_ID}",
 
-void setupPromoteJob(Folder jobFolder) {
-    KogitoJobTemplate.createPipelineJob(this, KogitoJobUtils.getBasicJobParams(this, 'kogito-images-promote', jobFolder, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote'))?.with {
+        DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
+        MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+    ])
+    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
 
@@ -148,47 +172,25 @@ void setupPromoteJob(Folder jobFolder) {
 
             booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
         }
-
-        environmentVariables {
-            env('CI', true)
-            env('REPO_NAME', 'kogito-images')
-            env('PROPERTIES_FILE_NAME', 'deployment.properties')
-
-            env('CONTAINER_ENGINE', 'podman')
-            env('CONTAINER_TLS_OPTIONS', '--tls-verify=false')
-            env('MAX_REGISTRY_RETRIES', 3)
-
-            env('JENKINS_EMAIL_CREDS_ID', "${JENKINS_EMAIL_CREDS_ID}")
-
-            env('GIT_AUTHOR', "${GIT_AUTHOR_NAME}")
-
-            env('AUTHOR_CREDS_ID', "${GIT_AUTHOR_CREDENTIALS_ID}")
-            env('GITHUB_TOKEN_CREDS_ID', "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}")
-            env('GIT_AUTHOR_BOT', "${GIT_BOT_AUTHOR_NAME}")
-            env('BOT_CREDENTIALS_ID', "${GIT_BOT_AUTHOR_CREDENTIALS_ID}")
-
-            env('DEFAULT_STAGING_REPOSITORY', "${MAVEN_NEXUS_STAGING_PROFILE_URL}")
-            env('MAVEN_ARTIFACT_REPOSITORY', "${MAVEN_ARTIFACTS_REPOSITORY}")
-        }
     }
 }
 
 void setupProdUpdateVersionJob() {
-    KogitoJobTemplate.createPipelineJob(this, KogitoJobUtils.getBasicJobParams(this, 'kogito-images-update-prod-version', Folder.TOOLS, "${jenkins_path}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images'))?.with {
+    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images-update-prod-version', Folder.TOOLS, "${jenkins_path}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images')
+    jobParams.env.putAll([
+        REPO_NAME: 'kogito-images',
+
+        BUILD_BRANCH_NAME: "${GIT_BRANCH}",
+        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+        GIT_AUTHOR_BOT: "${GIT_BOT_AUTHOR_NAME}",
+        BOT_CREDENTIALS_ID: "${GIT_BOT_AUTHOR_CREDENTIALS_ID}",
+    ])
+    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
             stringParam('JIRA_NUMBER', '', 'KIECLOUD-XXX or RHPAM-YYYY or else. This will be added to the commit and PR.')
             stringParam('PROD_PROJECT_VERSION', '', 'Which version to set ?')
         }
-
-        environmentVariables {
-            env('REPO_NAME', 'kogito-images')
-
-            env('BUILD_BRANCH_NAME', "${GIT_BRANCH}")
-            env('GIT_AUTHOR', "${GIT_AUTHOR_NAME}")
-            env('AUTHOR_CREDS_ID', "${GIT_AUTHOR_CREDENTIALS_ID}")
-            env('GITHUB_TOKEN_CREDS_ID', "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}")
-            env('GIT_AUTHOR_BOT', "${GIT_BOT_AUTHOR_NAME}")
-            env('BOT_CREDENTIALS_ID', "${GIT_BOT_AUTHOR_CREDENTIALS_ID}")
-        }
     }
 }

From fbe74aae523f11864ba168a543dc133e032e2c2e Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 25 May 2022 10:23:43 +0200
Subject: [PATCH 451/709] 7.22.x Release fix backports (#1265)

* [1.22.x] Fix Jenkins pipelines (#1262)

* Fix Jenkins pipelines

* setup MAVEN_SETTINGS_PATH option

* corrected bats test

* small correction

* Added Kogito Apps URI parameters for building images (#1263)
---
 .ci/jenkins/Jenkinsfile                       | 16 ++++++----
 .ci/jenkins/Jenkinsfile.deploy                | 22 ++++++++++++--
 .ci/jenkins/dsl/jobs.groovy                   |  3 ++
 Makefile                                      |  5 ++--
 .../3.6.x/added/configure-maven.sh            | 16 ++++++----
 modules/kogito-maven/3.6.x/configure          |  8 ++---
 modules/kogito-maven/3.6.x/module.yaml        |  3 ++
 .../3.8.x/added/configure-maven.sh            | 16 ++++++----
 modules/kogito-maven/3.8.x/configure          |  8 ++---
 modules/kogito-maven/3.8.x/module.yaml        |  3 ++
 .../tests/bats/maven-settings.bats            |  1 +
 modules/kogito-s2i-core/added/s2i-core        | 14 +++++----
 scripts/build-kogito-apps-components.sh       | 29 ++++++++++++-------
 scripts/common.py                             | 15 +++++-----
 scripts/setup-maven.sh                        | 23 +++++++++++----
 scripts/update-tests.py                       |  4 +--
 tests/test-apps/clone-repo.sh                 | 14 +++++----
 17 files changed, 135 insertions(+), 65 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 1982fd83faa..2fef36dac45 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -1,8 +1,8 @@
 @Library('jenkins-pipeline-shared-libraries')_
 
-def changeAuthor = env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepoGitUrl) : (env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR)
-def changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
-def changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
+changeAuthor = env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepoGitUrl) : (env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR)
+changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
+changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 
 BUILD_FAILED_IMAGES = []
 
@@ -145,11 +145,17 @@ void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
 }
 
 void buildImage(String imageName) {
-    sh "make build-image image_name=${imageName} ignore_test=true cekit_option='--work-dir .'"
+    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true"
 }
 
 void testImage(String imageName) {
-    sh "make build-image image_name=${imageName} ignore_build=true cekit_option='--work-dir .'"
+    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true"
+}
+
+String getMakeBuildImageArgs() {
+    List args = [ "cekit_option='--work-dir .'" ]
+    args.add("KOGITO_APPS_TARGET_BRANCH=${changeTarget}")
+    return args.join(' ')
 }
 
 void registerBuildFailedImage(String imageName) {
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 9864782d918..8f7391e5de8 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -178,6 +178,7 @@ pipeline {
 
                     // Debug purpose in case of issue
                     sh 'cat tests/test-apps/clone-repo.sh'
+                    sh 'cat scripts/setup-maven.sh'
                     sh 'cat tests/features/kogito-builder.feature'
 
                     // Prepare local examples
@@ -382,11 +383,20 @@ void cleanImages() {
 }
 
 void buildImage(String imageName) {
-    sh "make build-image image_name=${imageName} ignore_test=true cekit_option='--work-dir .'"
+    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true"
 }
 
 void testImage(String imageName) {
-    sh "make build-image image_name=${imageName} ignore_build=true cekit_option='--work-dir .'"
+    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true"
+}
+
+String getMakeBuildImageArgs() {
+    List args = [ "cekit_option='--work-dir .'" ]
+    args.add("KOGITO_APPS_TARGET_BRANCH=${getKogitoAppsRef()}")
+    if (getKogitoAppsUri()) {
+        args.add("KOGITO_APPS_TARGET_URI=${getKogitoAppsUri()}")
+    }
+    return args.join(' ')
 }
 
 void registerBuiltImage(String imageName) {
@@ -605,6 +615,14 @@ String getBuildBranch() {
     return params.BUILD_BRANCH_NAME
 }
 
+String getKogitoAppsRef() {
+    return params.APPS_REF ?: getBuildBranch()
+}
+
+String getKogitoAppsUri() {
+    return params.APPS_URI
+}
+
 String getGitAuthor() {
     return "${GIT_AUTHOR}"
 }
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index bab697c4fdc..9c0deea5a48 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -89,6 +89,9 @@ void setupDeployJob(Folder jobFolder) {
                 stringParam('GIT_AUTHOR', "${GIT_AUTHOR_NAME}", 'Set the Git author to checkout')
             }
 
+            stringParam('APPS_URI', '', 'Git uri to the kogito-apps repository to use for tests.')
+            stringParam('APPS_REF', '', 'Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
+
             // Build&Test information
             booleanParam('SKIP_TESTS', false, 'Skip tests')
             stringParam('EXAMPLES_URI', '', 'Git uri to the kogito-examples repository to use for tests.')
diff --git a/Makefile b/Makefile
index 160521cdc09..d70b25f3294 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
 SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
 KOGITO_APPS_TARGET_BRANCH ?= main
+KOGITO_APPS_TARGET_URI ?= https://github.com/kiegroup/kogito-apps.git
 BUILD_ENGINE := docker
 .DEFAULT_GOAL := build
 CEKIT_CMD := cekit -v ${cekit_option}
@@ -30,7 +31,7 @@ _build:
 image_name=
 build-image:
 ifneq ($(ignore_build),true)
-	scripts/build-kogito-apps-components.sh ${KOGITO_APPS_TARGET_BRANCH} ${image_name};
+	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
 	${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set to true, ignore the tests
@@ -53,7 +54,7 @@ build-prod:
 image_name=
 build-prod-image: clone-repos
 ifneq ($(ignore_build),true)
-	scripts/build-kogito-apps-components.sh ${KOGITO_APPS_TARGET_BRANCH} ${image_name};
+	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
 	scripts/build-product-image.sh "build" $(image_name) ${BUILD_ENGINE}
 endif
 # if ignore_test is set to true, ignore the tests
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index 389728340cf..288c75b956a 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -30,6 +30,10 @@ function configure() {
     ignore_maven_self_signed_certificates
     set_kogito_maven_repo
     add_maven_repo
+
+    if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+        cat "${MAVEN_SETTINGS_PATH}"
+    fi
 }
 
 # insert settings for HTTP proxy into maven settings.xml if supplied
@@ -73,7 +77,7 @@ function configure_proxy() {
         fi
         xml="$xml\
        </proxy>"
-        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${HOME}"/.m2/settings.xml
+        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -85,7 +89,7 @@ function configure_mirrors() {
       <url>$MAVEN_MIRROR_URL</url>\
       <mirrorOf>external:*</mirrorOf>\
     </mirror>"
-        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${HOME}"/.m2/settings.xml
+        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -104,7 +108,7 @@ function ignore_maven_self_signed_certificates() {
 function set_kogito_maven_repo() {
     local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
     if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${HOME}"/.m2/settings.xml
+        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -163,7 +167,7 @@ function _add_maven_repo() {
                     </snapshots>\n\
                 </repository>\n\
                 <!-- ### configured repositories ### -->"
-    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
 
     local pluginRepo="\n\
                 <pluginRepository>\n\
@@ -184,10 +188,10 @@ function _add_maven_repo() {
                 </pluginRepository>\n\
                 <!-- ### configured plugin repositories ### -->"
 
-    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
 
     # new repo should be skipped by mirror if exists
-    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${HOME}"/.m2/settings.xml
+    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
 }
 
 # Finds the environment variable  and returns its value if found.
diff --git a/modules/kogito-maven/3.6.x/configure b/modules/kogito-maven/3.6.x/configure
index 835c91ee8a8..089ff99ca26 100644
--- a/modules/kogito-maven/3.6.x/configure
+++ b/modules/kogito-maven/3.6.x/configure
@@ -83,10 +83,10 @@ if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
   </pluginRepositories>\
 </profile>\
 "
-    sed -i "s|<!-- ### extra maven repositories ### -->|${rh_repos}|" "${KOGITO_HOME}"/.m2/settings.xml
-    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### extra maven repositories ### -->|${rh_repos}|" "${MAVEN_SETTINGS_PATH}"
+    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
 
-    mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp
+    mv "${MAVEN_SETTINGS_PATH}" "${KOGITO_HOME}"/.m2/settings.xml.bkp
     #format and write the new file
-    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${KOGITO_HOME}"/.m2/settings.xml
+    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${MAVEN_SETTINGS_PATH}"
 fi
diff --git a/modules/kogito-maven/3.6.x/module.yaml b/modules/kogito-maven/3.6.x/module.yaml
index 2f5dc84625d..6cce677771f 100644
--- a/modules/kogito-maven/3.6.x/module.yaml
+++ b/modules/kogito-maven/3.6.x/module.yaml
@@ -7,6 +7,9 @@ envs:
     value: "3.6.2"
   - name: " MAVEN_HOME"
     value: "/usr/share/maven"
+  - name: "MAVEN_SETTINGS_PATH"
+    description: "The location of the settings.xml file"
+    value: '${KOGITO_HOME}/.m2/settings.xml'
   - name: "HTTP_PROXY"
     description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
     example: "http://127.0.0.1:8080"
diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/3.8.x/added/configure-maven.sh
index 389728340cf..288c75b956a 100644
--- a/modules/kogito-maven/3.8.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x/added/configure-maven.sh
@@ -30,6 +30,10 @@ function configure() {
     ignore_maven_self_signed_certificates
     set_kogito_maven_repo
     add_maven_repo
+
+    if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+        cat "${MAVEN_SETTINGS_PATH}"
+    fi
 }
 
 # insert settings for HTTP proxy into maven settings.xml if supplied
@@ -73,7 +77,7 @@ function configure_proxy() {
         fi
         xml="$xml\
        </proxy>"
-        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${HOME}"/.m2/settings.xml
+        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -85,7 +89,7 @@ function configure_mirrors() {
       <url>$MAVEN_MIRROR_URL</url>\
       <mirrorOf>external:*</mirrorOf>\
     </mirror>"
-        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${HOME}"/.m2/settings.xml
+        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -104,7 +108,7 @@ function ignore_maven_self_signed_certificates() {
 function set_kogito_maven_repo() {
     local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
     if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${HOME}"/.m2/settings.xml
+        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -163,7 +167,7 @@ function _add_maven_repo() {
                     </snapshots>\n\
                 </repository>\n\
                 <!-- ### configured repositories ### -->"
-    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
 
     local pluginRepo="\n\
                 <pluginRepository>\n\
@@ -184,10 +188,10 @@ function _add_maven_repo() {
                 </pluginRepository>\n\
                 <!-- ### configured plugin repositories ### -->"
 
-    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
 
     # new repo should be skipped by mirror if exists
-    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${HOME}"/.m2/settings.xml
+    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
 }
 
 # Finds the environment variable  and returns its value if found.
diff --git a/modules/kogito-maven/3.8.x/configure b/modules/kogito-maven/3.8.x/configure
index efb7e334832..15519128386 100644
--- a/modules/kogito-maven/3.8.x/configure
+++ b/modules/kogito-maven/3.8.x/configure
@@ -83,10 +83,10 @@ if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
   </pluginRepositories>\
 </profile>\
 "
-    sed -i "s|<!-- ### extra maven repositories ### -->|$rh_repos|" "${KOGITO_HOME}"/.m2/settings.xml
-    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### extra maven repositories ### -->|$rh_repos|" "${MAVEN_SETTINGS_PATH}"
+    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
 
-    mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp
+    mv "${MAVEN_SETTINGS_PATH}" "${KOGITO_HOME}"/.m2/settings.xml.bkp
     #format and write the new file
-    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${KOGITO_HOME}"/.m2/settings.xml
+    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${MAVEN_SETTINGS_PATH}"
 fi
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 9ff4c310986..05629e6f70f 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -7,6 +7,9 @@ envs:
     value: "3.8.1"
   - name: " MAVEN_HOME"
     value: "/usr/share/maven"
+  - name: "MAVEN_SETTINGS_PATH"
+    description: "The location of the settings.xml file"
+    value: '${KOGITO_HOME}/.m2/settings.xml'
   - name: "HTTP_PROXY"
     description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
     example: "http://127.0.0.1:8080"
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index 3daade8a709..a17ad163101 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -8,6 +8,7 @@ setup() {
     export HOME=$BATS_TMPDIR/maven
     mkdir -p ${HOME}/.m2/
     cp $BATS_TEST_DIRNAME/../../3.6.x/maven/settings.xml ${HOME}/.m2/
+    export MAVEN_SETTINGS_PATH="${HOME}/.m2/settings.xml"
 }
 
 teardown() {
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 9ad34536b70..38ebc221979 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -94,11 +94,13 @@ function build_kogito_app() {
 
     if [ "${SCRIPT_DEBUG}" != "true" ]; then
         export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --batch-mode"
+    else 
+        set -x
     fi
 
     if [ -f "pom.xml" ]; then
         log_info "---> Building application from source..."
-        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \
+        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${MAVEN_SETTINGS_PATH}" \
 	    -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
 	    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
 
@@ -124,7 +126,7 @@ function build_kogito_app() {
 
             log_info "----> Using Quarkus version ${quarkus_version} to bootstrap the application."
 
-            $MAVEN_HOME/bin/mvn -U -B ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml $(get_quarkus_platform_properties) \
+            $MAVEN_HOME/bin/mvn -U -B ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
                 "${quarkus_plugin}":"${quarkus_version}":create  \
                     -DprojectGroupId=$PROJECT_GROUP_ID \
                     -DprojectArtifactId=$PROJECT_ARTIFACT_ID \
@@ -136,7 +138,7 @@ function build_kogito_app() {
             $MAVEN_HOME/bin/mvn archetype:generate -U -B -DinteractiveMode=false -DarchetypeGroupId=org.kie.kogito \
                 -DarchetypeArtifactId=kogito-spring-boot-archetype -DarchetypeVersion=$KOGITO_VERSION \
                 -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
-                ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml
+                ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}"
         else
             log_error "---> Invalid RUNTIME_TYPE(${RUNTIME_TYPE}) provided, failing build..."
             exit 1
@@ -180,12 +182,12 @@ function build_kogito_app() {
             quarkus_version=$(get_quarkus_version) || exit 1
             log_info "--> Quarkus version is '$quarkus_version'"
 
-            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml $(get_quarkus_platform_properties) \
+            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
                 "${quarkus_plugin}":"${quarkus_version}":add-extension \
                 -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow"
         fi
 
-        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${KOGITO_HOME}"/.m2/settings.xml \
+        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${MAVEN_SETTINGS_PATH}" \
             -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
             -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
     fi
@@ -272,7 +274,7 @@ function get_quarkus_version() {
     local quarkus_version="${QUARKUS_VERSION}"
     if [ "${QUARKUS_VERSION}x" = "x" ]; then
         log_info "----> Trying to retrieve Quarkus version from org.kie.kogito:kogito-build-parent:${KOGITO_VERSION}"
-        ver=$($MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${KOGITO_HOME}"/.m2/settings.xml help:evaluate -q \
+        ver=$($MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" help:evaluate -q \
             -Dartifact=org.kie.kogito:kogito-build-parent:"${KOGITO_VERSION}" \
             -Dexpression=version.io.quarkus \
             -DforceStdout)
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 94bc14f0457..f359e9e12d8 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -1,19 +1,28 @@
 #!/usr/bin/env bash
 # Parameters:
-#   1 - git target branch - defaults to main
-#   2 - image name - can't  be empty.
+#   1 - image name - can't  be empty.
+#   2 - git target branch - defaults to main
+#   3 - git target uri - defaults to https://github.com/kiegroup/kogito-apps.git
 
 # fast fail
 set -e
 set -o pipefail
 
+KOGITO_APPS_REPO_NAME="kogito-apps"
+
 # Read entries before sourcing
-branchTag="${1:main}"
-imageName="${2}"
+imageName="${1}"
+gitBranch="${2:-main}"
+gitUri="${3:-https://github.com/kiegroup/kogito-apps.git}"
 contextDir=""
 shift $#
 
-. $(dirname "${BASH_SOURCE[0]}")/setup-maven.sh
+echo ${imageName}
+echo ${gitBranch}
+echo ${gitUri}
+
+script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
+
 MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
 
 case ${imageName} in
@@ -74,19 +83,19 @@ case ${imageName} in
         ;;
 esac
 
-KOGITO_APPS_REPO_NAME="kogito-apps"
-
 for ctx in ${contextDir}; do
     target_tmp_dir="/tmp/build/$(basename ${ctx})"
     build_target_dir="/tmp/$(basename ${ctx})"
     rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
     rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
-    cd ${build_target_dir}
 
-    echo "Using branch/tag ${branchTag}, checking out. Temporary build dir is ${build_target_dir} and target dis is ${target_tmp_dir}"
+    . ${script_dir_path}/setup-maven.sh "${build_target_dir}"/settings.xml
+
+    cd ${build_target_dir}
+    echo "Using branch/tag ${gitBranch}, checking out. Temporary build dir is ${build_target_dir} and target dis is ${target_tmp_dir}"
 
     if [ ! -d "${build_target_dir}/${KOGITO_APPS_REPO_NAME}" ]; then
-        git_command="git clone --single-branch --branch ${branchTag} --depth 1 https://github.com/kiegroup/${KOGITO_APPS_REPO_NAME}.git"
+        git_command="git clone --single-branch --branch ${gitBranch} --depth 1 ${gitUri}"
         echo "cloning ${KOGITO_APPS_REPO_NAME} with the following git command: ${git_command}"
         eval ${git_command}
     fi
diff --git a/scripts/common.py b/scripts/common.py
index b72cb165da9..d5eb509c8f4 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -24,6 +24,7 @@
 BEHAVE_BASE_DIR = 'tests/features'
 
 CLONE_REPO_SCRIPT = 'tests/test-apps/clone-repo.sh'
+SETUP_MAVEN_SCRIPT = 'scripts/setup-maven.sh'
 
 
 def yaml_loader():
@@ -354,13 +355,13 @@ def update_examples_uri_in_clone_repo(examples_uri):
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
 
-def update_maven_repo_in_clone_repo(repo_url, replace_jboss_repository):
+def update_maven_repo_in_setup_maven(repo_url, replace_jboss_repository):
     """
-    Update maven repository into clone-repo.sh script
+    Update maven repository into setup-maven.sh script
     :param repo_url: Maven repository url
     :param replace_jboss_repository: Set to true if default Jboss repository needs to be overridden
     """
-    print("Set maven repo {} in clone-repo script".format(repo_url))
+    print("Set maven repo {} in setup-maven script".format(repo_url))
     pattern = ""
     replacement = ""
     if replace_jboss_repository:
@@ -369,16 +370,16 @@ def update_maven_repo_in_clone_repo(repo_url, replace_jboss_repository):
     else:
         pattern = re.compile(r'(# export MAVEN_REPO_URL=.*)')
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
-    update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
+    update_in_file(SETUP_MAVEN_SCRIPT, pattern, replacement)
 
-def ignore_maven_self_signed_certificate_in_clone_repo():
+def ignore_maven_self_signed_certificate_in_setup_maven():
     """
     Sets the environment variable to ignore the self-signed certificates in maven
     """
-    print("Setting MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE env in clone repo")
+    print("Setting MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE env in setup maven")
     pattern = re.compile(r'(# MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=.*)')
     replacement = "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true"
-    update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
+    update_in_file(SETUP_MAVEN_SCRIPT, pattern, replacement)
 
 
 def update_in_file(file, pattern, replacement):
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
index 93ee3a41567..0ceb203dda0 100755
--- a/scripts/setup-maven.sh
+++ b/scripts/setup-maven.sh
@@ -6,15 +6,28 @@ MAVEN_VERSION="3.8.x"
 
 MVN_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-maven/${MAVEN_VERSION}"
 MAVEN_OPTIONS="-DskipTests"
+# Do not remove below, this can be updated by the python scripts
+MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true
+
+maven_settings_path=$1
+if [ -z "${maven_settings_path}" ]; then
+    maven_settings_path="${HOME}"/.m2/settings.xml
+fi
 
 if [ "${CI}" ]; then
+    echo "Updating settings file ${maven_settings_path}"
+
     # setup maven env
+    # Do not remove below, this can be updated by the python scripts
     export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
     # export MAVEN_REPO_URL=
-    cp "${MVN_MODULE}"/maven/settings.xml "${HOME}"/.m2/settings.xml
+    cp "${MVN_MODULE}"/maven/settings.xml "${maven_settings_path}"
+    export MAVEN_SETTINGS_PATH="${maven_settings_path}"
     source "${MVN_MODULE}"/added/configure-maven.sh
     configure
 
+    export MAVEN_OPTIONS="${MAVEN_OPTIONS} -s ${maven_settings_path}"
+
     # Add NPM registry if needed
     if [ ! -z "${NPM_REGISTRY_URL}" ]; then
         echo "enabling npm repository: ${NPM_REGISTRY_URL}"
@@ -29,14 +42,14 @@ if [ "${CI}" ]; then
   </properties>\
 </profile>\
 "   
-        sed -i -E "s|(<!-- ### extra maven repositories ### -->)|\1\n${npm_profile}|" "${HOME}"/.m2/settings.xml
-        sed -i -E "s|(<!-- ### extra maven profile ### -->)|\1\n<activeProfile>internal-npm-registry</activeProfile>|" "${HOME}"/.m2/settings.xml
+        sed -i -E "s|(<!-- ### extra maven repositories ### -->)|\1\n${npm_profile}|" "${MAVEN_SETTINGS_PATH}"
+        sed -i -E "s|(<!-- ### extra maven profile ### -->)|\1\n<activeProfile>internal-npm-registry</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
     fi
 
-    cat "${HOME}"/.m2/settings.xml
+    cat "${maven_settings_path}"
 fi
 
 if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" = "true" ]; then
-    MAVEN_OPTIONS="${MAVEN_OPTIONS} -Denforcer.skip"
+    export MAVEN_OPTIONS="${MAVEN_OPTIONS} -Denforcer.skip"
 fi
 
diff --git a/scripts/update-tests.py b/scripts/update-tests.py
index 22d903838e4..5560284493b 100644
--- a/scripts/update-tests.py
+++ b/scripts/update-tests.py
@@ -25,7 +25,7 @@
 
     if args.repo_url:
         common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_jboss_repo)
-        common.update_maven_repo_in_clone_repo(args.repo_url, args.replace_jboss_repo)
+        common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_jboss_repo)
 
     if args.examples_uri:
         common.update_examples_uri_in_behave_tests(args.examples_uri)
@@ -40,7 +40,7 @@
     
     if args.ignore_self_signed_cert:
         common.ignore_maven_self_signed_certificate_in_behave_tests()
-        common.ignore_maven_self_signed_certificate_in_clone_repo()
+        common.ignore_maven_self_signed_certificate_in_setup_maven()
     
     if args.runtime_image_jvm:
         common.update_runtime_image_in_behave_tests(args.runtime_image_jvm, 'jvm')
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index c6ee5c88e23..595a67e4789 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -5,7 +5,7 @@
 set -e
 base_dir=`dirname $(realpath -s $0)`
 
-. ${base_dir}/../../scripts/setup-maven.sh
+. ${base_dir}/../../scripts/setup-maven.sh "$(mktemp)"
 
 MAVEN_OPTIONS="-U ${MAVEN_OPTIONS}"
 
@@ -17,6 +17,8 @@ if [ -z $NATIVE_BUILD ]; then
     NATIVE_BUILD=true
 fi
 
+set -e
+
 # Clone examples
 cd /tmp
 rm -rf kogito-examples/
@@ -28,6 +30,8 @@ git checkout nightly-main
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/
 
+set -x
+
 # generating the app binaries to test the binary build
 mvn -f kogito-quarkus-examples/rules-quarkus-helloworld clean package ${MAVEN_OPTIONS}
 mvn -f kogito-springboot-examples/process-springboot-example clean package ${MAVEN_OPTIONS}
@@ -48,9 +52,7 @@ cp /tmp/kogito-examples/kogito-quarkus-examples/dmn-quarkus-example/src/main/res
 cp ${base_dir}/application.properties /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
 (echo ""; echo "server.port=10000") >> /tmp/kogito-examples/kogito-springboot-examples/process-springboot-example/src/main/resources/application.properties
 
-git add --all  :/
-git commit -am "test"
+set +x
 
-if [ "${CI}" ]; then
-    rm "${HOME}"/.m2/settings.xml
-fi
\ No newline at end of file
+git add --all  :/
+git commit -am "test"
\ No newline at end of file

From 5d238967796687089c2da6c099dede0001f1242d Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 31 May 2022 14:25:53 +0200
Subject: [PATCH 452/709] 7.13 fix backports (#1258)

* 7.13 backports

* RHPAM-4306 Updated Maven settings default profile (#1256)
---
 modules/kogito-maven/3.6.x/maven/settings.xml    | 4 ++--
 modules/kogito-maven/3.8.x/maven/settings.xml    | 4 ++--
 tests/features/kogito-common-builder-jvm.feature | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/kogito-maven/3.6.x/maven/settings.xml b/modules/kogito-maven/3.6.x/maven/settings.xml
index 4d77e856c13..5fe723c3e7e 100644
--- a/modules/kogito-maven/3.6.x/maven/settings.xml
+++ b/modules/kogito-maven/3.6.x/maven/settings.xml
@@ -15,7 +15,7 @@
     <!-- ### extra maven repositories ### -->
 
     <profile>
-      <id>default</id>
+      <id>kogito-images</id>
       <repositories>
         <repository>
           <id>jboss-public-repository-group</id>
@@ -55,6 +55,6 @@
   </profiles>
   <activeProfiles>
     <!-- ### extra maven profile ### -->
-    <activeProfile>default</activeProfile>
+    <activeProfile>kogito-images</activeProfile>
   </activeProfiles>
 </settings>
diff --git a/modules/kogito-maven/3.8.x/maven/settings.xml b/modules/kogito-maven/3.8.x/maven/settings.xml
index 4d77e856c13..5fe723c3e7e 100644
--- a/modules/kogito-maven/3.8.x/maven/settings.xml
+++ b/modules/kogito-maven/3.8.x/maven/settings.xml
@@ -15,7 +15,7 @@
     <!-- ### extra maven repositories ### -->
 
     <profile>
-      <id>default</id>
+      <id>kogito-images</id>
       <repositories>
         <repository>
           <id>jboss-public-repository-group</id>
@@ -55,6 +55,6 @@
   </profiles>
   <activeProfiles>
     <!-- ### extra maven profile ### -->
-    <activeProfile>default</activeProfile>
+    <activeProfile>kogito-images</activeProfile>
   </activeProfiles>
 </settings>
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index c5e6cd8fbfa..a6e7a7bd1a7 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -83,7 +83,7 @@ Feature: kogito-builder image JVM build tests
       | RUNTIME_TYPE      | quarkus                                                  |
       | NATIVE            | false                                                    |
       | ARTIFACT_DIR      | kogito-quarkus-examples/rules-quarkus-helloworld/target  |
-      | MAVEN_ARGS_APPEND | -pl kogito-quarkus-examples/rules-quarkus-helloworld -am                         |
+      | MAVEN_ARGS_APPEND | -pl :rules-quarkus-helloworld -am                         |
     Then check that page is served
       | property        | value                 |
       | port            | 8080                  |
@@ -193,7 +193,7 @@ Feature: kogito-builder image JVM build tests
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | RUNTIME_TYPE      | springboot                         |
       | ARTIFACT_DIR      | kogito-springboot-examples/process-springboot-example/target  |
-      | MAVEN_ARGS_APPEND | -pl kogito-springboot-examples/process-springboot-example -am |
+      | MAVEN_ARGS_APPEND | -pl :process-springboot-example -am |
     Then check that page is served
       | property             | value                                                                         |
       | port                 | 8080                                                                          |

From 2a77d1cdb38d790d759d67419dcfb95bf8387841 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Tue, 31 May 2022 10:53:47 -0300
Subject: [PATCH 453/709] [KOGITO-7000] - Do not build examples when building
 only supporting services images (#1268)

Signed-off-by: spolti <fspolti@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d70b25f3294..a20bb076efe 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CEKIT_CMD := cekit -v ${cekit_option}
 NATIVE := true
 
 clone-repos:
-# if the NO_TEST env defined, proceed with the tests, as first step prepare the repo to be used
+# if the ignore_test env is not defined or false, proceed with the tests, as first step prepare the examples to be used
 ifneq ($(ignore_test),true)
 	cd tests/test-apps && sh clone-repo.sh $(NATIVE)
 	cd ../..

From f91999dc67771457bcdd5b5bdb297f3484aac90d Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 7 Jun 2022 15:46:53 +0200
Subject: [PATCH 454/709] KOGITO-7356 Do not use master node in pipelines
 (#1273)

---
 .ci/jenkins/dsl/Jenkinsfile.seed | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 .ci/jenkins/dsl/Jenkinsfile.seed

diff --git a/.ci/jenkins/dsl/Jenkinsfile.seed b/.ci/jenkins/dsl/Jenkinsfile.seed
deleted file mode 100644
index e383f20e284..00000000000
--- a/.ci/jenkins/dsl/Jenkinsfile.seed
+++ /dev/null
@@ -1,10 +0,0 @@
-@Library('jenkins-pipeline-shared-libraries')_
-
-seed_generation = null
-node('master') {
-    dir("${SEED_REPO}") {
-        checkout(githubscm.resolveRepository("${SEED_REPO}", "${SEED_AUTHOR}", "${SEED_BRANCH}", false))
-        seed_generation = load "${SEED_SCRIPTS_FILEPATH}"
-    }
-}
-seed_generation.generate()

From af3cc654a87104f5dc5b0bfa4dfe4f35b862233c Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Mon, 20 Jun 2022 11:09:55 -0300
Subject: [PATCH 455/709] [KOGITO-7376] - [SW] Move SW examples to
 kogito-examples root (#1279)

Signed-off-by: spolti <fspolti@redhat.com>
---
 tests/features/kogito-builder.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 07f2b2051bf..9799fdb4b61 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -90,7 +90,7 @@ Feature: kogito-builder image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
-    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value                 |
       | RUNTIME_TYPE        | quarkus               |
       | NATIVE              | false                 |

From 31513914c82632741d0283a02eb5099697dfd2a1 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 5 Jul 2022 17:17:49 +0200
Subject: [PATCH 456/709] Update GHA DSL check to use composite action (#1286)

---
 .github/workflows/jenkins-tests-PR.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index 000b57ee296..29ef3fb9ee6 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -5,18 +5,15 @@ on:
   pull_request:
     paths: 
     - '.ci/jenkins/**'
+    - '.github/workflows/jenkins-tests-PR.yml'
 
 jobs:
   dsl-tests:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout 
-      uses: actions/checkout@v2
-
-    - name: Set up JDK 1.11
-      uses: actions/setup-java@v1
+    - name: DSL tests
+      uses: kiegroup/kogito-pipelines/.ci/actions/dsl-tests@main
       with:
-        java-version: 11
-
-    - name: Test DSL
-      run: .ci/jenkins/dsl/test.sh -h ${{ github.head_ref }} -r ${{ github.event.pull_request.head.repo.full_name }} -b ${{ github.base_ref }} -t ${{ github.event.pull_request.base.repo.full_name }} .ci/jenkins/dsl
\ No newline at end of file
+        main-config-file-repo: kiegroup/kogito-pipelines
+        main-config-file-ref: main
+        main-config-file-path: dsl/config/main.yaml
\ No newline at end of file

From 373a872a3a5f1a18e062afc74ec9687d8a555eb3 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 6 Jul 2022 11:41:01 +0200
Subject: [PATCH 457/709] Correct DSL local testing (#1289)

---
 .ci/jenkins/dsl/test.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index 184413cb5fd..c3e8a6d221e 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -1,5 +1,9 @@
 #!/bin/bash -e
 
+export DSL_DEFAULT_MAIN_CONFIG_FILE_REPO=kiegroup/kogito-pipelines
+export DSL_DEFAULT_MAIN_CONFIG_FILE_REF=main
+export DSL_DEFAULT_MAIN_CONFIG_FILE_PATH=dsl/config/main.yaml
+
 file=$(mktemp)
 # For more usage of the script, use ./test.sh -h
 curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh

From ca8be158872f6ae85ba2723cbdcc4d238814ad4d Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 13 Jul 2022 11:38:28 +0200
Subject: [PATCH 458/709] [KOGITO-7504] Update Maven to 3.8.6 (#1291)

---
 README.md                                        |  4 ++--
 kogito-builder-overrides.yaml                    |  2 +-
 modules/kogito-maven/3.8.x/module.yaml           | 10 +++++-----
 rhpam-kogito-builder-rhel8-overrides.yaml        |  2 +-
 tests/features/kogito-builder-native.feature     |  2 +-
 tests/features/kogito-common-builder-jvm.feature |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 8a5813aa5fd..4268530e404 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ To interact with Kogito images, you would need to install the needed dependencie
             * if any dependency is missing CeKit will tell which one.
     * [Bats](https://github.com/sstephenson/bats) 
     * Java 11 or higher
-    * Maven 3.8.1 or higher
+    * Maven 3.8.6 or higher
             
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
@@ -156,7 +156,7 @@ The Kogito Builder Image is equipped with the following components:
 
  * GraalVM 21.3.1-java11
  * OpenJDK 11.0.6
- * Maven 3.8.1
+ * Maven 3.8.6
  
 For more information about what is installed on this image, take a look [here](kogito-builder-overrides.yaml) in the
 **modules.install** section. 
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index 4b5d1cd9f2a..63977540cc3 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -49,7 +49,7 @@ modules:
     version: "11"
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.maven
-    version: "3.8.1"
+    version: "3.8.6"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.builder
 
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 05629e6f70f..97fb20d38b9 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.maven
-version: "3.8.1"
+version: "3.8.6"
 
 envs:
   - name: "MAVEN_VERSION"
-    value: "3.8.1"
+    value: "3.8.6"
   - name: " MAVEN_HOME"
     value: "/usr/share/maven"
   - name: "MAVEN_SETTINGS_PATH"
@@ -70,9 +70,9 @@ envs:
     example: "true"
 # unfortunately by now the version needs to be hardcoded.
 artifacts:
-  - name: apache-maven-3.8.1-bin.tar.gz
-    url: https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
-    md5: 90197f18ed9036a1709ff0e09558c083
+  - name: apache-maven-3.8.6-bin.tar.gz
+    url: https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz
+    md5: 0e07de4a7b5c84ebed737a2002f52019
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index d59c5661ae7..3b8356a942c 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -54,7 +54,7 @@ modules:
       version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
-      version: "3.8.1"
+      version: "3.8.6"
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.builder
 
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index 2fcdd097d36..ae090229617 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -9,7 +9,7 @@ Feature: kogito-builder image native build tests
   Scenario: verify if the maven and graal vm settings are correct on kogito-builder image for native
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.1
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index a6e7a7bd1a7..e828b4edbe1 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -4,7 +4,7 @@ Feature: kogito-builder image JVM build tests
   Scenario: verify if the maven and java installation are correct
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image

From 6eb9cb394d6fd20534e15833d8887234dd8df844 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 13 Jul 2022 11:39:15 +0200
Subject: [PATCH 459/709] Revert "[KOGITO-7504] Update Maven to 3.8.6 (#1291)"
 (#1292)

This reverts commit ca8be158872f6ae85ba2723cbdcc4d238814ad4d.
---
 README.md                                        |  4 ++--
 kogito-builder-overrides.yaml                    |  2 +-
 modules/kogito-maven/3.8.x/module.yaml           | 10 +++++-----
 rhpam-kogito-builder-rhel8-overrides.yaml        |  2 +-
 tests/features/kogito-builder-native.feature     |  2 +-
 tests/features/kogito-common-builder-jvm.feature |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 4268530e404..8a5813aa5fd 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ To interact with Kogito images, you would need to install the needed dependencie
             * if any dependency is missing CeKit will tell which one.
     * [Bats](https://github.com/sstephenson/bats) 
     * Java 11 or higher
-    * Maven 3.8.6 or higher
+    * Maven 3.8.1 or higher
             
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
@@ -156,7 +156,7 @@ The Kogito Builder Image is equipped with the following components:
 
  * GraalVM 21.3.1-java11
  * OpenJDK 11.0.6
- * Maven 3.8.6
+ * Maven 3.8.1
  
 For more information about what is installed on this image, take a look [here](kogito-builder-overrides.yaml) in the
 **modules.install** section. 
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index 63977540cc3..4b5d1cd9f2a 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -49,7 +49,7 @@ modules:
     version: "11"
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.maven
-    version: "3.8.6"
+    version: "3.8.1"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.builder
 
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 97fb20d38b9..05629e6f70f 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.maven
-version: "3.8.6"
+version: "3.8.1"
 
 envs:
   - name: "MAVEN_VERSION"
-    value: "3.8.6"
+    value: "3.8.1"
   - name: " MAVEN_HOME"
     value: "/usr/share/maven"
   - name: "MAVEN_SETTINGS_PATH"
@@ -70,9 +70,9 @@ envs:
     example: "true"
 # unfortunately by now the version needs to be hardcoded.
 artifacts:
-  - name: apache-maven-3.8.6-bin.tar.gz
-    url: https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz
-    md5: 0e07de4a7b5c84ebed737a2002f52019
+  - name: apache-maven-3.8.1-bin.tar.gz
+    url: https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
+    md5: 90197f18ed9036a1709ff0e09558c083
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 3b8356a942c..d59c5661ae7 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -54,7 +54,7 @@ modules:
       version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
-      version: "3.8.6"
+      version: "3.8.1"
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.builder
 
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index ae090229617..2fcdd097d36 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -9,7 +9,7 @@ Feature: kogito-builder image native build tests
   Scenario: verify if the maven and graal vm settings are correct on kogito-builder image for native
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.1
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index e828b4edbe1..a6e7a7bd1a7 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -4,7 +4,7 @@ Feature: kogito-builder image JVM build tests
   Scenario: verify if the maven and java installation are correct
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image

From 873f77c453a41df22ec761b5ad694acd6b29a425 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 13 Jul 2022 13:53:44 +0200
Subject: [PATCH 460/709] [KOGITO-7504] Update Maven to 3.8.6 (#1293)

This reverts commit 6eb9cb394d6fd20534e15833d8887234dd8df844.
---
 README.md                                        |  4 ++--
 kogito-builder-overrides.yaml                    |  2 +-
 modules/kogito-maven/3.8.x/module.yaml           | 10 +++++-----
 rhpam-kogito-builder-rhel8-overrides.yaml        |  2 +-
 tests/features/kogito-builder-native.feature     |  2 +-
 tests/features/kogito-common-builder-jvm.feature |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 8a5813aa5fd..4268530e404 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ To interact with Kogito images, you would need to install the needed dependencie
             * if any dependency is missing CeKit will tell which one.
     * [Bats](https://github.com/sstephenson/bats) 
     * Java 11 or higher
-    * Maven 3.8.1 or higher
+    * Maven 3.8.6 or higher
             
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
@@ -156,7 +156,7 @@ The Kogito Builder Image is equipped with the following components:
 
  * GraalVM 21.3.1-java11
  * OpenJDK 11.0.6
- * Maven 3.8.1
+ * Maven 3.8.6
  
 For more information about what is installed on this image, take a look [here](kogito-builder-overrides.yaml) in the
 **modules.install** section. 
diff --git a/kogito-builder-overrides.yaml b/kogito-builder-overrides.yaml
index 4b5d1cd9f2a..63977540cc3 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-builder-overrides.yaml
@@ -49,7 +49,7 @@ modules:
     version: "11"
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.maven
-    version: "3.8.1"
+    version: "3.8.6"
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.builder
 
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 05629e6f70f..97fb20d38b9 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -1,10 +1,10 @@
 schema_version: 1
 name: org.kie.kogito.maven
-version: "3.8.1"
+version: "3.8.6"
 
 envs:
   - name: "MAVEN_VERSION"
-    value: "3.8.1"
+    value: "3.8.6"
   - name: " MAVEN_HOME"
     value: "/usr/share/maven"
   - name: "MAVEN_SETTINGS_PATH"
@@ -70,9 +70,9 @@ envs:
     example: "true"
 # unfortunately by now the version needs to be hardcoded.
 artifacts:
-  - name: apache-maven-3.8.1-bin.tar.gz
-    url: https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
-    md5: 90197f18ed9036a1709ff0e09558c083
+  - name: apache-maven-3.8.6-bin.tar.gz
+    url: https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz
+    md5: 0e07de4a7b5c84ebed737a2002f52019
 
 execute:
   - script: configure
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index d59c5661ae7..3b8356a942c 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -54,7 +54,7 @@ modules:
       version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
-      version: "3.8.1"
+      version: "3.8.6"
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.builder
 
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-builder-native.feature
index 2fcdd097d36..ae090229617 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-builder-native.feature
@@ -9,7 +9,7 @@ Feature: kogito-builder image native build tests
   Scenario: verify if the maven and graal vm settings are correct on kogito-builder image for native
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.1
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index a6e7a7bd1a7..e828b4edbe1 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -4,7 +4,7 @@ Feature: kogito-builder image JVM build tests
   Scenario: verify if the maven and java installation are correct
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.1
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image

From ba1337e6eb1c8a61b126d81347f15890f8a46655 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Tue, 26 Jul 2022 10:14:46 -0300
Subject: [PATCH 461/709] =?UTF-8?q?[RHPAM-4452]=20-=20Kogito-runtime-nativ?=
 =?UTF-8?q?e=20(techpreview):=20Image=20does=20not=20re=E2=80=A6=20(#1302)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [RHPAM-4452] - Kogito-runtime-native (techpreview): Image does not recognize the runner binary in the S2I build

Signed-off-by: spolti <fspolti@redhat.com>

* Update kogito-common-runtime-native.feature

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 rhpam-kogito-runtime-native-rhel8-overrides.yaml    | 2 +-
 tests/features/kogito-common-runtime-native.feature | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rhpam-kogito-runtime-native-rhel8-overrides.yaml b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
index b5052a01bfd..e99c26005ba 100644
--- a/rhpam-kogito-runtime-native-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
@@ -25,7 +25,7 @@ envs:
     example: "-Dquarkus.log.level=DEBUG"
     description: JVM options passed to the Java command.
   - name: BINARY_BUILD
-    value: "true"
+    example: "true"
     description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
 
 ports:
diff --git a/tests/features/kogito-common-runtime-native.feature b/tests/features/kogito-common-runtime-native.feature
index 221eaf001a4..5d435894f18 100644
--- a/tests/features/kogito-common-runtime-native.feature
+++ b/tests/features/kogito-common-runtime-native.feature
@@ -6,7 +6,7 @@ Feature: Kogito-runtime-native feature.
     Given s2i build /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/ from target
       | variable            | value                     |
       | NATIVE              | true                      |
-      | BINARY              | true                      |
+      | BINARY_BUILD        | true                      |
       | RUNTIME_TYPE        | quarkus                   |
       | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
     Then check that page is served

From 20c206d219217d99fc368b3a33f7230aadd51a06 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Mon, 1 Aug 2022 08:39:43 -0300
Subject: [PATCH 462/709] [KOGITO-7394] - [SW] Productize the
 data-index-ephemeral image (#1278)

* [KOGITO-7394] - [SW] Productize the data-index-ephemeral image

Signed-off-by: spolti <fspolti@redhat.com>

* review additions

Signed-off-by: spolti <fspolti@redhat.com>

* review updates

Signed-off-by: spolti <fspolti@redhat.com>

* review additions

Signed-off-by: spolti <fspolti@redhat.com>

* keep only the name and checksum

Signed-off-by: spolti <fspolti@redhat.com>

* adapt to use quarkus-app.zip format

Signed-off-by: spolti <fspolti@redhat.com>

* apply review suggestions

Signed-off-by: spolti <fspolti@redhat.com>

* update module to use prod build

Signed-off-by: spolti <fspolti@redhat.com>

* rename feom rhpam to openshift logic

Signed-off-by: spolti <fspolti@redhat.com>

* Update logic-imagestream.yaml

Co-authored-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>

* Added option to ignore test preparation

* Update Makefile

Co-authored-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Co-authored-by: radtriste <tradisso@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 .ci/jenkins/Jenkinsfile                       |  2 +-
 .ci/jenkins/Jenkinsfile.deploy                |  2 +-
 Makefile                                      | 12 ++-
 RELEASE_NOTES.md                              |  1 -
 kogito-data-index-ephemeral-overrides.yaml    |  1 +
 ...-data-index-ephemeral-rhel8-overrides.yaml | 62 +++++++++++++++
 logic-imagestream.yaml                        | 29 +++++++
 modules/kogito-data-index-common/configure    |  4 -
 .../added/kogito-app-launch.sh                |  0
 .../{ => community}/configure                 |  0
 .../{ => community}/module.yaml               |  0
 .../prod/added/kogito-app-launch.sh           | 30 ++++++++
 .../prod/configure                            | 13 ++++
 .../prod/module.yaml                          | 16 ++++
 .../gating.yaml                               |  7 ++
 rhpam-kogito-imagestream.yaml                 |  1 +
 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml |  2 +-
 scripts/build-kogito-apps-components.sh       |  6 +-
 scripts/build-product-image.sh                |  2 +-
 scripts/common.py                             | 75 ++++++++++++++++---
 scripts/list-images.py                        | 13 +++-
 scripts/manage-kogito-version.py              | 10 ++-
 scripts/push-staging.py                       |  7 +-
 scripts/update-tests.py                       | 22 ++++--
 tests/features/common-build-runtime.feature   |  6 +-
 .../features/common-custom-truststore.feature |  1 +
 tests/features/common.feature                 |  1 +
 .../kogito-common-runtime-jvm.feature         |  3 +-
 .../logic-data-index-ephemeral.feature        | 19 +++++
 tests/test-apps/clone-repo.sh                 | 15 +++-
 30 files changed, 314 insertions(+), 48 deletions(-)
 create mode 100644 logic-data-index-ephemeral-rhel8-overrides.yaml
 create mode 100644 logic-imagestream.yaml
 rename modules/kogito-data-index-ephemeral/{ => community}/added/kogito-app-launch.sh (100%)
 rename modules/kogito-data-index-ephemeral/{ => community}/configure (100%)
 rename modules/kogito-data-index-ephemeral/{ => community}/module.yaml (100%)
 create mode 100644 modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-data-index-ephemeral/prod/configure
 create mode 100644 modules/kogito-data-index-ephemeral/prod/module.yaml
 create mode 100644 osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml
 create mode 100644 tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 2fef36dac45..cea9685bcc4 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -149,7 +149,7 @@ void buildImage(String imageName) {
 }
 
 void testImage(String imageName) {
-    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true"
+    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true"
 }
 
 String getMakeBuildImageArgs() {
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 8f7391e5de8..7712be3e1d8 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -387,7 +387,7 @@ void buildImage(String imageName) {
 }
 
 void testImage(String imageName) {
-    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true"
+    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true"
 }
 
 String getMakeBuildImageArgs() {
diff --git a/Makefile b/Makefile
index a20bb076efe..be5ef4b8792 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,11 @@ NATIVE := true
 clone-repos:
 # if the ignore_test env is not defined or false, proceed with the tests, as first step prepare the examples to be used
 ifneq ($(ignore_test),true)
-	cd tests/test-apps && sh clone-repo.sh $(NATIVE)
+ifneq ($(ignore_test_prepare),true)
+	cd tests/test-apps && sh clone-repo.sh $(NATIVE) $(image_name)
 	cd ../..
 endif
+endif
 
 .PHONY: list
 list:
@@ -29,7 +31,9 @@ _build:
 
 .PHONY: build-image
 image_name=
-build-image:
+build-image: clone-repos _build-image
+
+_build-image:
 ifneq ($(ignore_build),true)
 	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
 	${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
@@ -52,7 +56,9 @@ build-prod:
 
 .PHONY: build-prod-image
 image_name=
-build-prod-image: clone-repos
+build-prod-image: clone-repos _build-prod-image
+
+_build-prod-image:
 ifneq ($(ignore_build),true)
 	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
 	scripts/build-product-image.sh "build" $(image_name) ${BUILD_ENGINE}
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 6f1adefdfd7..c3dfe3db442 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,5 @@
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-- [KOGITO-6684](https://issues.redhat.com/browse/KOGITO-6684) - Kogito images for supporting services should no longer download the runner jar from maven repository
 
 ## Bug Fixes
 
diff --git a/kogito-data-index-ephemeral-overrides.yaml b/kogito-data-index-ephemeral-overrides.yaml
index 564d5f1c6fc..d91d4e4e22b 100644
--- a/kogito-data-index-ephemeral-overrides.yaml
+++ b/kogito-data-index-ephemeral-overrides.yaml
@@ -32,6 +32,7 @@ modules:
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.ephemeral
+    version: "2.0.0-snapshot"
   - name: org.kie.kogito.dataindex.common
   - name: org.kie.kogito.security.custom.truststores
 
diff --git a/logic-data-index-ephemeral-rhel8-overrides.yaml b/logic-data-index-ephemeral-rhel8-overrides.yaml
new file mode 100644
index 00000000000..fa4f0982eb9
--- /dev/null
+++ b/logic-data-index-ephemeral-rhel8-overrides.yaml
@@ -0,0 +1,62 @@
+schema_version: 1
+
+name: "openshift-serverless-1/logic-data-index-ephemeral-rhel8"
+version: "1.24.0"
+description: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
+
+labels:
+- name: "com.redhat.component"
+  value: "openshift-serverless-1-logic-data-index-ephemeral-rhel8-container"
+- name: "io.k8s.description"
+  value: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
+- name: "io.k8s.display-name"
+  value: "Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL"
+- name: "io.openshift.tags"
+  value: "logic-data-index,kogito,data-index,data-index-ephemeral"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.dataindex.ephemeral
+    version: "1.24.0"
+  - name: org.kie.kogito.dataindex.common
+  - name: org.kie.kogito.security.custom.truststores
+
+packages:
+  content_sets_file: content_sets.yaml
+
+osbs:
+  configuration:
+    container:
+      platforms:
+        only:
+        - x86_64
+        - ppc64le
+      compose:
+        pulp_repos: true
+  extra_dir: osbs-extra/logic-data-index-ephemeral-rhel8
+  repository:
+    name: containers/openshift-serverless-1-logic-data-index-ephemeral
+    branch: openshift-serverless-1.24-rhel-8
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
+
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
new file mode 100644
index 00000000000..e1ce6de23b8
--- /dev/null
+++ b/logic-imagestream.yaml
@@ -0,0 +1,29 @@
+kind: ImageStreamList
+apiVersion: v1
+metadata:
+  name: openshift-serverless-kogito-image-streams
+  annotations:
+    description: ImageStream definitions for Red Hat OpenShift Serverless Logic images
+    openshift.io/provider-display-name: Kie Group
+items:
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: logic-data-index-ephemeral-rhel8
+      annotations:
+        openshift.io/display-name: Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
+        openshift.io/provider-display-name: Kie Group
+    spec:
+      tags:
+      - name: '1.24.0'
+        annotations:
+          description: Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
+          iconClass: icon-jbpm
+          tags: logic-data-index,kogito,data-index,data-index-ephemeral
+          supports: quarkus
+          version: '1.24.0'
+        referencePolicy:
+          type: Local
+        from:
+          kind: DockerImage
+          name: registry.redhat.io/openshift-serverless-1/logic-data-index-ephemeral-rhel8:1.24.0
diff --git a/modules/kogito-data-index-common/configure b/modules/kogito-data-index-common/configure
index 3c2e4e3deb6..02e69e573b3 100644
--- a/modules/kogito-data-index-common/configure
+++ b/modules/kogito-data-index-common/configure
@@ -1,10 +1,6 @@
 #!/bin/sh
 set -e
 
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
 mkdir -p "${KOGITO_HOME}"/data/protobufs/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh
similarity index 100%
rename from modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
rename to modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-ephemeral/configure b/modules/kogito-data-index-ephemeral/community/configure
similarity index 100%
rename from modules/kogito-data-index-ephemeral/configure
rename to modules/kogito-data-index-ephemeral/community/configure
diff --git a/modules/kogito-data-index-ephemeral/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
similarity index 100%
rename from modules/kogito-data-index-ephemeral/module.yaml
rename to modules/kogito-data-index-ephemeral/community/module.yaml
diff --git a/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..4e847a99d2d
--- /dev/null
+++ b/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
+# shellcheck disable=SC2086
+exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
+        -Djava.library.path="${KOGITO_HOME}"/lib \
+        -Dquarkus.http.host=0.0.0.0 \
+        -Dquarkus.http.port=8080 \
+        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
+
diff --git a/modules/kogito-data-index-ephemeral/prod/configure b/modules/kogito-data-index-ephemeral/prod/configure
new file mode 100644
index 00000000000..3fbee431118
--- /dev/null
+++ b/modules/kogito-data-index-ephemeral/prod/configure
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+mkdir -p "${KOGITO_HOME}"/bin/quarkus-app
+unzip "${SOURCES_DIR}"/data-index-service-inmemory-image-build.zip -d "${KOGITO_HOME}"/bin/quarkus-app/
+
+cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
+
diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml
new file mode 100644
index 00000000000..67f2730e39d
--- /dev/null
+++ b/modules/kogito-data-index-ephemeral/prod/module.yaml
@@ -0,0 +1,16 @@
+schema_version: 1
+name: org.kie.kogito.dataindex.ephemeral
+version: "1.24.0"
+
+artifacts:
+  # openshift-serverless-logic-1.24.0.DR1-data-index-service-inmemory-image-build.zip
+- name: data-index-service-inmemory-image-build.zip
+  md5: 978b1be29f9b18d229aa09e6a3a4acb1
+
+execute:
+  - script: configure
+
+packages:
+  install:
+    - pam
+
diff --git a/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml b/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml
new file mode 100644
index 00000000000..5d497c87432
--- /dev/null
+++ b/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+id: "cvp-logic-data-index-ephemeral-rhel8"
+product_versions:
+  - cvp
+decision_context: cvp_default
+rules:
+  - !PassingTestCaseRule {test_case_name: logic-data-index-ephemeral-rhel8.openshift.external}
\ No newline at end of file
diff --git a/rhpam-kogito-imagestream.yaml b/rhpam-kogito-imagestream.yaml
index f762fdace2e..3d176295ab4 100644
--- a/rhpam-kogito-imagestream.yaml
+++ b/rhpam-kogito-imagestream.yaml
@@ -69,3 +69,4 @@ items:
           from:
             kind: DockerImage
             name: registry.redhat.io/rhpam-7/rhpam-kogito-builder-rhel8:7.11.0
+
diff --git a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
index a89722e0e26..248841c687d 100644
--- a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
@@ -11,7 +11,7 @@ labels:
   - name: "io.k8s.description"
     value: "RHPAM Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
   - name: "io.k8s.display-name"
-    value: "Red Hat build of Kogito runtime based on Quarkus or SpringBoot JVM image"
+    value: "RHPAM Kogito Runtime based on Quarkus or Spring Boot JVM image"
   - name: "io.openshift.tags"
     value: "rhpam-kogito,runtime,kogito,quarkus,springboot,jvm"
   - name: "io.openshift.s2i.assemble-input-files"
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index f359e9e12d8..d42bdf190d9 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -17,10 +17,6 @@ gitUri="${3:-https://github.com/kiegroup/kogito-apps.git}"
 contextDir=""
 shift $#
 
-echo ${imageName}
-echo ${gitBranch}
-echo ${gitUri}
-
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
 
 MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
@@ -78,7 +74,7 @@ case ${imageName} in
         contextDir="jitexecutor/jitexecutor-runner"
         ;;
     *)
-        echo "${imageName} is not a supporting service image, exiting..."
+        echo "${imageName} is not a supporting service image or can't be built from sources, exiting..."
         exit 0
         ;;
 esac
diff --git a/scripts/build-product-image.sh b/scripts/build-product-image.sh
index 8a92b2fcd26..5eddd86bc5a 100755
--- a/scripts/build-product-image.sh
+++ b/scripts/build-product-image.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Simple usage: /bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}
+# Simple usage: /bin/sh scripts/build-product-image.sh "build" ${IMAGE_NAME} ${BUILD_ENGINE}
 
 ver=$(cekit --version )
 ver=$((${ver//./} + 0))
diff --git a/scripts/common.py b/scripts/common.py
index d5eb509c8f4..673ee509f3c 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -26,6 +26,18 @@
 CLONE_REPO_SCRIPT = 'tests/test-apps/clone-repo.sh'
 SETUP_MAVEN_SCRIPT = 'scripts/setup-maven.sh'
 
+SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral", "kogito-data-index-infinispan",
+                              "kogito-data-index-mongodb", "kogito-data-index-oracle",
+                              "kogito-data-index-postgresql", "kogito-explainability",
+                              "kogito-jit-runner", "kogito-jobs-service-ephemeral",
+                              "kogito-jobs-service-infinispan", "kogito-jobs-service-mongodb",
+                              "kogito-jobs-service-postgresql", "kogito-management-console",
+                              "kogito-task-console", "kogito-trusty-infinispan",
+                              "kogito-trusty-postgresql", "kogito-trusty-redis",
+                              "kogito-trusty-ui"}
+
+PROD_SUPPORTING_SERVICES_IMAGES = {"logic-data-index-ephemeral-rhel8"}
+
 
 def yaml_loader():
     """
@@ -46,6 +58,7 @@ def update_community_image_version(target_version):
     """
     update_image_version_tag_in_yaml_file(target_version, IMAGE_FILENAME)
 
+
 def update_prod_image_version(target_version):
     """
     Update rhpam-*-overrides.yaml files version tag.
@@ -55,6 +68,7 @@ def update_prod_image_version(target_version):
         file = "{}-overrides.yaml".format(img)
         update_image_version_tag_in_yaml_file(target_version, file)
 
+
 def update_image_version_tag_in_yaml_file(target_version, yaml_file):
     """
     Update root version tag in yaml file.
@@ -76,18 +90,20 @@ def update_image_version_tag_in_yaml_file(target_version, yaml_file):
     except TypeError as err:
         print("Unexpected error:", err)
 
+
 def update_image_stream(target_version, prod=False):
     """
     Update the imagestream file, it will update the tag name, version and image tag.
+    :param prod: if the imagestream is the prod version
     :param target_version: version used to update the imagestream file;
     """
-    imageStreamFilename = IMAGE_STREAM_FILENAME
+    image_stream_filename = IMAGE_STREAM_FILENAME
     if prod:
-        imageStreamFilename = PROD_IMAGE_STREAM_FILENAME
-    print("Updating ImageStream images version from file {0} to version {1}".format(imageStreamFilename,
+        image_stream_filename = PROD_IMAGE_STREAM_FILENAME
+    print("Updating ImageStream images version from file {0} to version {1}".format(image_stream_filename,
                                                                                     target_version))
     try:
-        with open(imageStreamFilename) as imagestream:
+        with open(image_stream_filename) as imagestream:
             data = yaml_loader().load(imagestream)
             for item_index, item in enumerate(data['items'], start=0):
                 for tag_index, tag in enumerate(item['spec']['tags'], start=0):
@@ -98,7 +114,7 @@ def update_image_stream(target_version, prod=False):
                     updated_image_name = image_dict[0] + ':' + target_version
                     data['items'][item_index]['spec']['tags'][tag_index]['from']['name'] = updated_image_name
 
-        with open(imageStreamFilename, 'w') as imagestream:
+        with open(image_stream_filename, 'w') as imagestream:
             yaml_loader().dump(data, imagestream)
 
     except TypeError:
@@ -128,12 +144,14 @@ def get_community_module_dirs():
     """
     return get_all_module_dirs(COMMUNITY_PREFIX)
 
+
 def get_prod_module_dirs():
     """
     Retrieve the RHPAM module directories
     """
     return get_all_module_dirs(PRODUCT_PREFIX)
 
+
 def get_images(prefix):
     """
     Retrieve the Kogito images' files
@@ -149,21 +167,47 @@ def get_images(prefix):
 
     return images
 
+
 def get_community_images():
     """
     Retrieve the Community images' names
     """
     return get_images(COMMUNITY_PREFIX)
 
+
 def get_prod_images():
     """
     Retrieve the Prod images' names
     """
     return get_images(PRODUCT_PREFIX)
 
+
+def get_supporting_services_images(is_prod_image):
+    """
+    Retrieve the Supporting Services images' names
+    """
+    if is_prod_image:
+        return PROD_SUPPORTING_SERVICES_IMAGES
+    return SUPPORTING_SERVICES_IMAGES
+
+
+def is_supporting_services_image(image_name, prod=False):
+    """
+    Raise an error if the given image is not a supporting service
+    """
+    found = False
+    if prod:
+        if image_name not in PROD_SUPPORTING_SERVICES_IMAGES:
+            raise RuntimeError('{} is not a productized supporting service'.format(image_name))
+    else:
+        if image_name not in SUPPORTING_SERVICES_IMAGES:
+            raise RuntimeError('{} is not a supporting service'.format(image_name))
+
+
 def update_modules_version(target_version, prod=False):
     """
     Update every Kogito module.yaml to the given version.
+    :param prod: if the module to be updated is prod version.
     :param target_version: version used to update all Kogito module.yaml files
     """
     modules = []
@@ -171,7 +215,7 @@ def update_modules_version(target_version, prod=False):
         modules = get_prod_module_dirs()
     else:
         get_community_module_dirs()
-    
+
     for module_dir in modules:
         update_module_version(module_dir, target_version)
 
@@ -264,10 +308,12 @@ def update_artifacts_version_in_behave_tests(artifacts_version):
     """
     print("Set artifacts_version {} in behave tests".format(artifacts_version))
     # pattern to change the KOGITO_VERSION
-    pattern = re.compile('\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT)|([\d.]+.Final)|([\d.]+\.redhat-[\d]+))[\s]*\|')
+    pattern = re.compile(
+        '\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT)|([\d.]+.Final)|([\d.]+\.redhat-[\d]+))[\s]*\|')
     replacement = '| KOGITO_VERSION | {} | '.format(artifacts_version)
     update_in_behave_tests(pattern, replacement)
 
+
 def update_runtime_image_in_behave_tests(runtime_image_name, image_suffix):
     """
     Update a runtime image into behave tests
@@ -285,31 +331,35 @@ def update_runtime_image_in_behave_tests(runtime_image_name, image_suffix):
     update_in_behave_tests(pattern, replacement)
 
 
-def update_maven_repo_in_behave_tests(repo_url, replaceJbossRepository):
+def update_maven_repo_in_behave_tests(repo_url, replace_jboss_repository):
     """
     Update maven repository into behave tests
     :param repo_url: Maven repository url
-    :param replaceJbossRepository: Set to true if default Jboss repository needs to be overriden
+    :param replace_jboss_repository: Set to true if default Jboss repository needs to be overriden
     """
     print("Set maven repo {} in behave tests".format(repo_url))
     pattern = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
     env_var_key = "MAVEN_REPO_URL"
-    if replaceJbossRepository:
+    if replace_jboss_repository:
         env_var_key = "JBOSS_MAVEN_REPO_URL"
     replacement = "| variable | value |\n      | {} | {} |\n      | MAVEN_DOWNLOAD_OUTPUT | true |".format(env_var_key,
                                                                                                            repo_url)
     update_in_behave_tests(pattern, replacement)
 
+
 def update_maven_mirror_url_in_quarkus_plugin_behave_tests(repo_url):
     """
     Update maven repository into behave tests
     :param repo_url: Maven repository url
     """
     print("Set maven repo {} in quarkus plugin behave tests".format(repo_url))
-    pattern = re.compile('(Kogito Maven archetype.*(?<!springboot)\r?\n\s*Given.*\r?\n\s*)\|\s*variable[\s]*\|[\s]*value[\s]*\|')
-    replacement = "\g<1>| variable | value |\n      | {} | {} |\n      | MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE | true |\n      | DEBUG | true |".format("MAVEN_MIRROR_URL", repo_url)
+    pattern = re.compile(
+        '(Kogito Maven archetype.*(?<!springboot)\r?\n\s*Given.*\r?\n\s*)\|\s*variable[\s]*\|[\s]*value[\s]*\|')
+    replacement = "\g<1>| variable | value |\n      | {} | {} |\n      | MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE | true |\n      | DEBUG | true |".format(
+        "MAVEN_MIRROR_URL", repo_url)
     update_in_behave_tests(pattern, replacement)
 
+
 def ignore_maven_self_signed_certificate_in_behave_tests():
     """
     Sets the environment variable to ignore the self-signed certificates in maven
@@ -372,6 +422,7 @@ def update_maven_repo_in_setup_maven(repo_url, replace_jboss_repository):
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
     update_in_file(SETUP_MAVEN_SCRIPT, pattern, replacement)
 
+
 def ignore_maven_self_signed_certificate_in_setup_maven():
     """
     Sets the environment variable to ignore the self-signed certificates in maven
diff --git a/scripts/list-images.py b/scripts/list-images.py
index afda2fdbd81..47d17a0c10b 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -1,24 +1,33 @@
 #!/usr/bin/python3
 # Script responsible to update the tests with
 # Should be run from root directory of the repository
-# Sample usage:  python3 scripts/update-tests.py
+
 
 import argparse
 import sys
 
 import common
 
+sys.tracebacklimit = 0
 sys.dont_write_bytecode = True
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
         description='Kogito Version Manager - List Images by Community and Product version')
     parser.add_argument('--prod', default=False, action='store_true', help='List product images')
+    parser.add_argument('-s', '--supporting-services', default=False, action='store_true',
+                        help='List Supporting Services images')
+    parser.add_argument('-is', '--is-supporting-services', default=False, type=str,
+                        help='Query the given image, if not found raise exception.')
 
     args = parser.parse_args()
 
     images = []
-    if args.prod:
+    if args.is_supporting_services:
+        common.is_supporting_services_image(args.is_supporting_services, args.prod)
+    elif args.supporting_services:
+        images = common.get_supporting_services_images(args.prod)
+    elif args.prod:
         images = common.get_prod_images()
     else:
         images = common.get_community_images()
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index cee58d58f54..21f7594f78c 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -12,16 +12,18 @@
 #  ruamel.yaml
 
 import sys
-sys.dont_write_bytecode = True
-
 import argparse
 import common
 import re
 
+sys.dont_write_bytecode = True
+
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Kogito Version Manager')
     parser.add_argument('--bump-to', dest='bump_to', help='bump everything to the next version')
-    parser.add_argument('--artifacts-version', dest='artifacts_version', help='update the artifacts version in modules/tests. Default is equal to bump-to')
+    parser.add_argument('--artifacts-version', dest='artifacts_version',
+                        help='update the artifacts version in modules/tests. Default is equal to bump-to')
     parser.add_argument('--examples-ref', dest='examples_ref',
                         help='Update Behave tests to use the desired branch for kogito-examples')
     parser.add_argument('--confirm', default=False, action='store_true', help='To confirm automatically the setup')
@@ -42,7 +44,7 @@
                 examples_ref = args.examples_ref
             if 'rc' in args.bump_to:
                 examples_ref = 'main'
-            
+
             artifacts_version = args.bump_to
             if args.artifacts_version:
                 artifacts_version = args.artifacts_version
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 888f6b542f1..92e633f2d12 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -116,10 +116,10 @@ def find_current_rc_version():
     """
     version = get_current_version()
     if '-rc' in version:
-        CURRENT_IMAGE_VERSION = version
+        current_image_version = version
     else:
-        CURRENT_IMAGE_VERSION = version + '-rc1'
-    return CURRENT_IMAGE_VERSION
+        current_image_version = version + '-rc1'
+    return current_image_version
 
 
 def get_next_rc_version(current_rc_version, override_tags):
@@ -127,6 +127,7 @@ def get_next_rc_version(current_rc_version, override_tags):
     After finding the current rc tag of the image, adds one to it
     e.g: 0.10.0-rc1 will returned as 0.10.0-rc2
     :param current_rc_version: takes the current rc version of the image as input
+    :param override_tags: override image tags
     :return: returns the next rc version of the image
     """
     return current_rc_version if override_tags else (
diff --git a/scripts/update-tests.py b/scripts/update-tests.py
index 5560284493b..8b5b701a634 100644
--- a/scripts/update-tests.py
+++ b/scripts/update-tests.py
@@ -11,16 +11,24 @@
 import argparse
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and version.')
+    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and '
+                                                 'version.')
     parser.add_argument('--repo-url', dest='repo_url', help='Defines the url of the repository to setup into the tests')
-    parser.add_argument('--replace-jboss-repo', dest='replace_jboss_repo', default=False, action='store_true', help='Enable if repo-url should replace the main JBoss repository')
+    parser.add_argument('--replace-jboss-repo', dest='replace_jboss_repo', default=False, action='store_true',
+                        help='Enable if repo-url should replace the main JBoss repository')
     parser.add_argument('--examples-uri', dest='examples_uri', help='To update the examples uri for testing')
     parser.add_argument('--examples-ref', dest='examples_ref', help='To update the examples ref for testing')
-    parser.add_argument('--artifacts-version', dest='artifacts_version', help='To update the artifacts version for testing')
-    parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False, action='store_true', help='If set to true will relax the SSL for user-generated self-signed certificates')
-    parser.add_argument('--runtime-image-jvm', dest='runtime_image_jvm', help='To update the runtime jvm image name in behave tests\'s steps')
-    parser.add_argument('--runtime-image-native', dest='runtime_image_native', help='To update the runtime native image name in behave tests\'s steps')
-    parser.add_argument('--archetype-maven-mirror-url', dest='archetype_maven_mirror_url', help='Maven mirror URL to be used for archetype generation')
+    parser.add_argument('--artifacts-version', dest='artifacts_version',
+                        help='To update the artifacts version for testing')
+    parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False,
+                        action='store_true',
+                        help='If set to true will relax the SSL for user-generated self-signed certificates')
+    parser.add_argument('--runtime-image-jvm', dest='runtime_image_jvm',
+                        help='To update the runtime jvm image name in behave tests\'s steps')
+    parser.add_argument('--runtime-image-native', dest='runtime_image_native',
+                        help='To update the runtime native image name in behave tests\'s steps')
+    parser.add_argument('--archetype-maven-mirror-url', dest='archetype_maven_mirror_url',
+                        help='Maven mirror URL to be used for archetype generation')
     args = parser.parse_args()
 
     if args.repo_url:
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
index dcf5912b696..6c155ca6584 100644
--- a/tests/features/common-build-runtime.feature
+++ b/tests/features/common-build-runtime.feature
@@ -1,4 +1,8 @@
-@quay.io/kiegroup/kogito-builder @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-runtime-jvm @rhpam-7/rhpam-kogito-builder-rhel8 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
+@quay.io/kiegroup/kogito-builder
+@quay.io/kiegroup/kogito-runtime-native
+@quay.io/kiegroup/kogito-runtime-jvm
+@rhpam-7/rhpam-kogito-builder-rhel8
+@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: Common tests for Kogito builder and runtime images
 
   Scenario: Verify if usage help is correctly called
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 52617f69703..ce6a8223cfb 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -15,6 +15,7 @@
 @quay.io/kiegroup/kogito-trusty-redis
 @quay.io/kiegroup/kogito-trusty-postgresql
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
+@openshift-serverless-1/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Custom TrustStore configuration
   Scenario: Verify if a custom certificate is correctly handled
     When container is started with command /home/kogito/kogito-app-launch.sh
diff --git a/tests/features/common.feature b/tests/features/common.feature
index e4a687c0b10..b1aa78fc9f5 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -20,6 +20,7 @@
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 @rhpam-7/rhpam-kogito-builder-rhel8
 @rhpam-7/rhpam-kogito-runtime-native-rhel8
+@openshift-serverless-1/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/kogito-common-runtime-jvm.feature b/tests/features/kogito-common-runtime-jvm.feature
index be848fbb020..2f2d6c369bc 100644
--- a/tests/features/kogito-common-runtime-jvm.feature
+++ b/tests/features/kogito-common-runtime-jvm.feature
@@ -1,4 +1,5 @@
-@quay.io/kiegroup/kogito-runtime-jvm @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
+@quay.io/kiegroup/kogito-runtime-jvm
+@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: kogito-runtime-jvm feature.
 
   Scenario: verify if the java installation is correct
diff --git a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
new file mode 100644
index 00000000000..31c872d8455
--- /dev/null
+++ b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
@@ -0,0 +1,19 @@
+@openshift-serverless-1/logic-data-index-ephemeral-rhel8
+Feature: logic-data-index-ephemeral-rhel8 feature.
+
+  Scenario: verify if all labels are correctly set on logic-data-index-ephemeral-rhel8 image
+    Given image is built
+      Then the image should contain label io.openshift.expose-services with value 8080:http
+      And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
+      And the image should contain label io.k8s.display-name with value Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
+      And the image should contain label io.openshift.tags with value logic-data-index,kogito,data-index,data-index-ephemeral
+      And the image should contain label com.redhat.component with value openshift-serverless-1-logic-data-index-ephemeral-rhel8-container
+
+  Scenario: verify if of logic-data-index-ephemeral-rhel8 container is correctly started
+    When container is started with env
+      | variable       | value  |
+      | SCRIPT_DEBUG   | true   |
+    Then container log should contain -Djava.library.path=/home/kogito/lib -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 Embedded Postgres started at port
+    And container log should not contain Application failed to start
+
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 595a67e4789..f34e852e10f 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -2,9 +2,22 @@
 #
 # Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
 
+# if image name is supporting services, don't build it
+IMAGE_NAME="$2"
+prod=""
+if [ -n "${IMAGE_NAME}" ]; then
+    if [[ ${IMAGE_NAME} =~ rhpam|logic* ]]; then
+        prod="--prod"
+    fi
+    python3 ../../scripts/list-images.py ${prod} -is ${IMAGE_NAME}
+    if [ $? = 0 ]; then
+        echo "Target image is supporting services, skipping examples build"
+        exit 0
+    fi
+fi
+
 set -e
 base_dir=`dirname $(realpath -s $0)`
-
 . ${base_dir}/../../scripts/setup-maven.sh "$(mktemp)"
 
 MAVEN_OPTIONS="-U ${MAVEN_OPTIONS}"

From 96e7ce2f6a8f7032005c2601a33d3da91202ced3 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 5 Aug 2022 09:28:25 +0200
Subject: [PATCH 463/709] Fix Data Index Ephemeral tests (#1308) (#1309)

* Fix Data Index Ephemeral tests

* Added tests to logic-data-index-ephemeral-rhel8
---
 tests/features/common-dynamic-resources.feature            | 1 +
 tests/features/data-index/kogito-data-index-common.feature | 1 +
 tests/features/supporting-services-common.feature          | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index ae7f5814b4a..bcbcd83f0a0 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -18,6 +18,7 @@
 @quay.io/kiegroup/kogito-task-console
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 @rhpam-7/rhpam-kogito-builder-rhel8
+@openshift-serverless-1/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index c112efabdef..9a876a2e334 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -2,6 +2,7 @@
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-postgresql
+@openshift-serverless-1/logic-data-index-ephemeral-rhel8
 Feature: Kogito-data-index common feature.
   Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature
index a7ac9ebdebf..67b47fb999b 100644
--- a/tests/features/supporting-services-common.feature
+++ b/tests/features/supporting-services-common.feature
@@ -14,8 +14,9 @@
 @quay.io/kiegroup/kogito-trusty-redis
 @quay.io/kiegroup/kogito-trusty-ui
 @quay.io/kiegroup/kogito-jit-runner
+@openshift-serverless-1/logic-data-index-ephemeral-rhel8
 Feature: kogito supporting services common feature
 
-Scenario: verify if the management console jar is available on /home/kogito
+Scenario: Verify if the application jar exists
   When container is started with command bash
   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
\ No newline at end of file

From bb1bc00e69b69eed52e876d0576223af9687891e Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Tue, 9 Aug 2022 13:04:22 -0300
Subject: [PATCH 464/709] [RHPAM-4451] - improve logs for quarkus bootstrap app
 (#1311)

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-s2i-core/added/s2i-core          | 2 +-
 tests/features/kogito-builder.feature           | 1 +
 tests/features/rhpam-kogito-builder-jvm.feature | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 38ebc221979..cdecdac41bc 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -124,7 +124,7 @@ function build_kogito_app() {
                 fi
             done
 
-            log_info "----> Using Quarkus version ${quarkus_version} to bootstrap the application."
+            log_info "----> Using Quarkus ${quarkus_plugin}:${quarkus_version} to bootstrap the application."
 
             $MAVEN_HOME/bin/mvn -U -B ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
                 "${quarkus_plugin}":"${quarkus_version}":create  \
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 9799fdb4b61..84ccd64f318 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -49,6 +49,7 @@ Feature: kogito-builder image tests
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
+    And s2i build log should contain Using Quarkus io.quarkus:quarkus-maven-plugin:
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index b87abaac208..44d4fc6f3f3 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -33,6 +33,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | KOGITO_VERSION | 1.5.0.redhat-00001 |
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
+    And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |

From fd78fa984eb3d72485df46f70e9da6acc1c0e775 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 10 Aug 2022 11:54:47 -0300
Subject: [PATCH 465/709] rename image to tech-preview (#1312) (#1313)

Signed-off-by: spolti <fspolti@redhat.com>
---
 logic-data-index-ephemeral-rhel8-overrides.yaml                 | 2 +-
 logic-imagestream.yaml                                          | 2 +-
 tests/features/common-custom-truststore.feature                 | 2 +-
 tests/features/common-dynamic-resources.feature                 | 2 +-
 tests/features/common.feature                                   | 2 +-
 tests/features/data-index/kogito-data-index-common.feature      | 2 +-
 .../logic-data-index-ephemeral.feature                          | 2 +-
 tests/features/supporting-services-common.feature               | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/logic-data-index-ephemeral-rhel8-overrides.yaml b/logic-data-index-ephemeral-rhel8-overrides.yaml
index fa4f0982eb9..e3d1d089922 100644
--- a/logic-data-index-ephemeral-rhel8-overrides.yaml
+++ b/logic-data-index-ephemeral-rhel8-overrides.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 
-name: "openshift-serverless-1/logic-data-index-ephemeral-rhel8"
+name: "openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8"
 version: "1.24.0"
 description: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
index e1ce6de23b8..c276821247c 100644
--- a/logic-imagestream.yaml
+++ b/logic-imagestream.yaml
@@ -26,4 +26,4 @@ items:
           type: Local
         from:
           kind: DockerImage
-          name: registry.redhat.io/openshift-serverless-1/logic-data-index-ephemeral-rhel8:1.24.0
+          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.24.0
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index ce6a8223cfb..32d7a40d8ff 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -15,7 +15,7 @@
 @quay.io/kiegroup/kogito-trusty-redis
 @quay.io/kiegroup/kogito-trusty-postgresql
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
-@openshift-serverless-1/logic-data-index-ephemeral-rhel8
+@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Custom TrustStore configuration
   Scenario: Verify if a custom certificate is correctly handled
     When container is started with command /home/kogito/kogito-app-launch.sh
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index bcbcd83f0a0..006e3dd31f4 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -18,7 +18,7 @@
 @quay.io/kiegroup/kogito-task-console
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 @rhpam-7/rhpam-kogito-builder-rhel8
-@openshift-serverless-1/logic-data-index-ephemeral-rhel8
+@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
diff --git a/tests/features/common.feature b/tests/features/common.feature
index b1aa78fc9f5..16de9e08940 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -20,7 +20,7 @@
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 @rhpam-7/rhpam-kogito-builder-rhel8
 @rhpam-7/rhpam-kogito-runtime-native-rhel8
-@openshift-serverless-1/logic-data-index-ephemeral-rhel8
+@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index 9a876a2e334..9e9ff110e43 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -2,7 +2,7 @@
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-postgresql
-@openshift-serverless-1/logic-data-index-ephemeral-rhel8
+@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Kogito-data-index common feature.
   Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
diff --git a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
index 31c872d8455..61e18d059f6 100644
--- a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
+++ b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
@@ -1,4 +1,4 @@
-@openshift-serverless-1/logic-data-index-ephemeral-rhel8
+@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: logic-data-index-ephemeral-rhel8 feature.
 
   Scenario: verify if all labels are correctly set on logic-data-index-ephemeral-rhel8 image
diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature
index 67b47fb999b..0ffeeb9c133 100644
--- a/tests/features/supporting-services-common.feature
+++ b/tests/features/supporting-services-common.feature
@@ -14,7 +14,7 @@
 @quay.io/kiegroup/kogito-trusty-redis
 @quay.io/kiegroup/kogito-trusty-ui
 @quay.io/kiegroup/kogito-jit-runner
-@openshift-serverless-1/logic-data-index-ephemeral-rhel8
+@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: kogito supporting services common feature
 
 Scenario: Verify if the application jar exists

From 40dda241dd7e620779339b7c89ded49184bc3487 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 10 Aug 2022 12:00:06 -0300
Subject: [PATCH 466/709] update dataindex artifact to the latest version
 (#1314)

* update dataindex artifact to the latest version

Signed-off-by: spolti <fspolti@redhat.com>

* Update modules/kogito-data-index-ephemeral/prod/module.yaml

Signed-off-by: spolti <fspolti@redhat.com>
---
 modules/kogito-data-index-ephemeral/prod/module.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml
index 67f2730e39d..a4e4407b11f 100644
--- a/modules/kogito-data-index-ephemeral/prod/module.yaml
+++ b/modules/kogito-data-index-ephemeral/prod/module.yaml
@@ -3,9 +3,9 @@ name: org.kie.kogito.dataindex.ephemeral
 version: "1.24.0"
 
 artifacts:
-  # openshift-serverless-logic-1.24.0.DR1-data-index-service-inmemory-image-build.zip
+  # data-index-service-inmemory-1.24.0.Final-redhat-00011-image-build.zip
 - name: data-index-service-inmemory-image-build.zip
-  md5: 978b1be29f9b18d229aa09e6a3a4acb1
+  md5: 439ecd6255b9c204e3808e5a35a58463
 
 execute:
   - script: configure

From c823f2d77e2bca52a3a3d8c633e0e851a854fba2 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Tue, 16 Aug 2022 12:48:53 -0300
Subject: [PATCH 467/709] =?UTF-8?q?[KOGITO-7744]=20-=20Move=20ENABLE=5FRH?=
 =?UTF-8?q?=5FMAVEN=5FREPO=20from=20maven=20module=20to=20prod=20m?=
 =?UTF-8?q?=E2=80=A6=20(#1317)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-7744] - Move ENABLE_RH_MAVEN_REPO from maven module to prod module

Signed-off-by: spolti <fspolti@redhat.com>

* remove ENABLE_RH_MAVEN_REPO from older maven module as well

Signed-off-by: spolti <fspolti@redhat.com>

Signed-off-by: spolti <fspolti@redhat.com>
---
 RELEASE_NOTES.md                              |  1 +
 modules/kogito-maven/3.6.x/configure          | 79 ------------------
 modules/kogito-maven/3.8.x/configure          | 80 ------------------
 modules/rhpam-kogito-prod-profile/configure   | 82 +++++++++++++++++++
 modules/rhpam-kogito-prod-profile/module.yaml |  7 +-
 rhpam-kogito-builder-rhel8-overrides.yaml     |  2 +-
 .../features/rhpam-kogito-builder-jvm.feature |  1 -
 tests/test-apps/clone-repo.sh                 |  1 -
 8 files changed, 89 insertions(+), 164 deletions(-)
 create mode 100644 modules/rhpam-kogito-prod-profile/configure

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c3dfe3db442..89641dd4102 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,6 @@
 <!-- Keep them in alphabetical order -->
 ## Enhancements
+[KOGITO-7744](https://issues.redhat.com/browse/KOGITO-7744) - Move ENABLE_RH_MAVEN_REPO from maven module to prod module
 
 ## Bug Fixes
 
diff --git a/modules/kogito-maven/3.6.x/configure b/modules/kogito-maven/3.6.x/configure
index 089ff99ca26..1c590fd9a6d 100644
--- a/modules/kogito-maven/3.6.x/configure
+++ b/modules/kogito-maven/3.6.x/configure
@@ -11,82 +11,3 @@ mkdir "${KOGITO_HOME}"/.m2
 cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
 cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
 
-# configure Red Hat repositories on the maven settings.xml for product builds
-if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
-    echo "enabling red hat repositories"
-    rh_repos="    <!-- JBoss EAP Maven repository -->\
-<profile>\
-  <id>redhat-maven-repositories</id>\
-  <repositories>\
-    <repository>\
-      <id>redhat-ga-repository</id>\
-      <url>https://maven.repository.redhat.com/ga/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-    <repository>\
-      <id>redhat-ea-repository</id>\
-      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-    <repository>\
-      <id>redhat-techpreview-repository</id>\
-      <url>https://maven.repository.redhat.com/techpreview/all</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-  </repositories>\
-  <pluginRepositories>\
-    <pluginRepository>\
-      <id>redhat-ga-plugin-repository</id>\
-      <url>https://maven.repository.redhat.com/ga/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-    <pluginRepository>\
-      <id>redhat-ea-plugin-repository</id>\
-      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-    <pluginRepository>\
-      <id>redhat-techpreview-repository</id>\
-      <url>https://maven.repository.redhat.com/techpreview/all</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-  </pluginRepositories>\
-</profile>\
-"
-    sed -i "s|<!-- ### extra maven repositories ### -->|${rh_repos}|" "${MAVEN_SETTINGS_PATH}"
-    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
-
-    mv "${MAVEN_SETTINGS_PATH}" "${KOGITO_HOME}"/.m2/settings.xml.bkp
-    #format and write the new file
-    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${MAVEN_SETTINGS_PATH}"
-fi
diff --git a/modules/kogito-maven/3.8.x/configure b/modules/kogito-maven/3.8.x/configure
index 15519128386..196423d3aac 100644
--- a/modules/kogito-maven/3.8.x/configure
+++ b/modules/kogito-maven/3.8.x/configure
@@ -10,83 +10,3 @@ mv /usr/share/apache-maven-"${MAVEN_VERSION}" /usr/share/maven
 mkdir "${KOGITO_HOME}"/.m2
 cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
 cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
-
-# configure Red Hat repositories on the maven settings.xml for product builds
-if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
-    echo "enabling red hat repositories"
-    rh_repos="    <!-- JBoss EAP Maven repository -->\
-<profile>\
-  <id>redhat-maven-repositories</id>\
-  <repositories>\
-    <repository>\
-      <id>redhat-ga-repository</id>\
-      <url>https://maven.repository.redhat.com/ga/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-    <repository>\
-      <id>redhat-ea-repository</id>\
-      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-    <repository>\
-      <id>redhat-techpreview-repository</id>\
-      <url>https://maven.repository.redhat.com/techpreview/all</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-  </repositories>\
-  <pluginRepositories>\
-    <pluginRepository>\
-      <id>redhat-ga-plugin-repository</id>\
-      <url>https://maven.repository.redhat.com/ga/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-    <pluginRepository>\
-      <id>redhat-ea-plugin-repository</id>\
-      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-    <pluginRepository>\
-      <id>redhat-techpreview-repository</id>\
-      <url>https://maven.repository.redhat.com/techpreview/all</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-  </pluginRepositories>\
-</profile>\
-"
-    sed -i "s|<!-- ### extra maven repositories ### -->|$rh_repos|" "${MAVEN_SETTINGS_PATH}"
-    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
-
-    mv "${MAVEN_SETTINGS_PATH}" "${KOGITO_HOME}"/.m2/settings.xml.bkp
-    #format and write the new file
-    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${MAVEN_SETTINGS_PATH}"
-fi
diff --git a/modules/rhpam-kogito-prod-profile/configure b/modules/rhpam-kogito-prod-profile/configure
new file mode 100644
index 00000000000..821a9250fce
--- /dev/null
+++ b/modules/rhpam-kogito-prod-profile/configure
@@ -0,0 +1,82 @@
+#!/bin/sh
+set -e
+
+# configure Red Hat repositories on the maven settings.xml for product builds
+if [ "${ENABLE_RH_MAVEN_REPO}" = "true" ]; then
+    echo "enabling red hat repositories"
+    rh_repos="    <!-- JBoss EAP Maven repository -->\
+<profile>\
+  <id>redhat-maven-repositories</id>\
+  <repositories>\
+    <repository>\
+      <id>redhat-ga-repository</id>\
+      <url>https://maven.repository.redhat.com/ga/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+    <repository>\
+      <id>redhat-ea-repository</id>\
+      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+    <repository>\
+      <id>redhat-techpreview-repository</id>\
+      <url>https://maven.repository.redhat.com/techpreview/all</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+  </repositories>\
+  <pluginRepositories>\
+    <pluginRepository>\
+      <id>redhat-ga-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/ga/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+    <pluginRepository>\
+      <id>redhat-ea-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+    <pluginRepository>\
+      <id>redhat-techpreview-repository</id>\
+      <url>https://maven.repository.redhat.com/techpreview/all</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+  </pluginRepositories>\
+</profile>\
+"
+    sed -i "s|<!-- ### extra maven repositories ### -->|$rh_repos|" "${MAVEN_SETTINGS_PATH}"
+    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
+
+    mv "${MAVEN_SETTINGS_PATH}" "${KOGITO_HOME}"/.m2/settings.xml.bkp
+    #format and write the new file
+    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${MAVEN_SETTINGS_PATH}"
+fi
diff --git a/modules/rhpam-kogito-prod-profile/module.yaml b/modules/rhpam-kogito-prod-profile/module.yaml
index 9ad849a3c80..67dbec0dab0 100644
--- a/modules/rhpam-kogito-prod-profile/module.yaml
+++ b/modules/rhpam-kogito-prod-profile/module.yaml
@@ -1,9 +1,12 @@
 schema_version: 1
 name: org.kie.kogito.rhpam.prod.profile
-version: '7.11.0'
-description: Holds custom configurations for productized Kogito images. Add as first module to be installed.
+version: '7.13.0'
+description: Holds custom configurations for productized Kogito images. Add as the last module as it can depend on other modules.
 
 envs:
   - name: "ENABLE_RH_MAVEN_REPO"
     value: "true"
     description: "If set, will enable the usage of the Red Hat Maven repositories to resolve Java dependencies. Enabled by default on productized images."
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 3b8356a942c..ef9c53ba0b5 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -42,7 +42,6 @@ ports:
 
 modules:
   install:
-    - name: org.kie.kogito.rhpam.prod.profile
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
@@ -57,6 +56,7 @@ modules:
       version: "3.8.6"
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.builder
+    - name: org.kie.kogito.rhpam.prod.profile
 
 packages:
   content_sets_file: content_sets.yaml
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 44d4fc6f3f3..01294006abd 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -13,7 +13,6 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
     And the image should contain label com.redhat.component with value rhpam-7-kogito-builder-rhel8-container
 
-
   Scenario: verify if prod builder image contains the red hat maven repositories
     When container is started with command bash
     Then file /home/kogito/.m2/settings.xml should contain <id>redhat-maven-repositories</id>
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index f34e852e10f..6e326b57a4b 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 #
 # Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
-
 # if image name is supporting services, don't build it
 IMAGE_NAME="$2"
 prod=""

From f4952cfe21ae518e7071582e35b06cfc7e150901 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Mon, 22 Aug 2022 10:21:10 -0300
Subject: [PATCH 468/709] [KOGITO-7700] - Allow adding quarkus extensions when
 building from (#1321)

* [KOGITO-7700] - Allow adding quarkus extensions when building from
assets

Fixes https://issues.redhat.com/browse/KOGITO-7791

Signed-off-by: spolti <fspolti@redhat.com>

* Correction on adding quarkus extensions

* Update RELEASE_NOTES.md

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* Update modules/kogito-s2i-core/module.yaml

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

Signed-off-by: spolti <fspolti@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 RELEASE_NOTES.md                       |  3 ++-
 modules/kogito-s2i-core/added/s2i-core |  8 ++++++++
 modules/kogito-s2i-core/module.yaml    |  4 ++++
 tests/features/kogito-builder.feature  | 17 +++++++++--------
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 89641dd4102..33434cef765 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,8 +1,9 @@
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-[KOGITO-7744](https://issues.redhat.com/browse/KOGITO-7744) - Move ENABLE_RH_MAVEN_REPO from maven module to prod module
+[KOGITO-7700](https://issues.redhat.com/browse/KOGITO-7700) - Allow adding quarkus extensions when building from assets
 
 ## Bug Fixes
+[KOGITO-7791](https://issues.redhat.com/browse/KOGITO-7791) - [TEST] - Serverless Workflow Extension is building the service properly is failing
 
 ## Known Issues
 
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index cdecdac41bc..1afc637fd0a 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -133,6 +133,14 @@ function build_kogito_app() {
                     -DprojectVersion=$PROJECT_VERSION \
                     -Dextensions="kogito,quarkus-smallrye-health,quarkus-smallrye-openapi,quarkus-resteasy,quarkus-resteasy-jackson"
 
+            if [ ! -z ${QUARKUS_EXTRA_EXTENSIONS} ]; then
+                log_info "----> Adding extra Quarkus extensions: ${QUARKUS_EXTRA_EXTENSIONS}"
+                $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
+				-f $PROJECT_ARTIFACT_ID/pom.xml \
+                                "${quarkus_plugin}":"${quarkus_version}":add-extension \
+                                -Dextensions="${QUARKUS_EXTRA_EXTENSIONS}"
+            fi
+
         elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
             log_info "----> Using Spring Boot to bootstrap the application."
             $MAVEN_HOME/bin/mvn archetype:generate -U -B -DinteractiveMode=false -DarchetypeGroupId=org.kie.kogito \
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index fea7bed0ce3..d57761cb564 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -54,6 +54,10 @@ envs:
     description: ^ Defines the Quarkus platform artifact id, defaults to quarkus-bom for community and product.
     example: "quarkus-bom-custom"
 
+  - name: QUARKUS_EXTRA_EXTENSIONS
+    description: ^ Defines the Quarkus' extra extensions (as comma-separated list) to be added when performing build from assets.
+    example: "org.kie.kogito:kogito-addons-quarkus-knative-eventing,quarkus-kubernetes"
+
 modules:
   install:
     - name: org.kie.kogito.persistence
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-builder.feature
index 84ccd64f318..3e4b581cb9c 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-builder.feature
@@ -92,14 +92,15 @@ Feature: kogito-builder image tests
 
   Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
     Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable            | value                 |
-      | RUNTIME_TYPE        | quarkus               |
-      | NATIVE              | false                 |
-      | KOGITO_VERSION      | 2.0.0-SNAPSHOT        |
-      | PROJECT_GROUP_ID    | com.mycompany         |
-      | PROJECT_ARTIFACT_ID | myproject             |
-      | PROJECT_VERSION     | 2.0-SNAPSHOT          |
-      | K_SINK              | http://localhost:8181 |
+      | variable                 | value                                                 |
+      | RUNTIME_TYPE             | quarkus                                               |
+      | NATIVE                   | false                                                 |
+      | KOGITO_VERSION           | 2.0.0-SNAPSHOT                                        |
+      | PROJECT_GROUP_ID         | com.mycompany                                         |
+      | PROJECT_ARTIFACT_ID      | myproject                                             |
+      | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
+      | K_SINK                   | http://localhost:8181                                 |
+      | QUARKUS_EXTRA_EXTENSIONS | org.kie.kogito:kogito-addons-quarkus-knative-eventing |
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for myproject...
     And s2i build log should contain Adding Kogito Quarkus Workflows extension to the generated project.

From cf643ec48396e60e9754f798a1ea5fec20f2241e Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 24 Aug 2022 10:15:10 +0200
Subject: [PATCH 469/709] KOGITO-7785 Setup init-branch job (#1323)

---
 .ci/jenkins/Jenkinsfile.init-branch     | 460 ++++++++++++++++++++++++
 .ci/jenkins/dsl/jobs.groovy             |  46 +++
 scripts/build-kogito-apps-components.sh |   9 +-
 3 files changed, 513 insertions(+), 2 deletions(-)
 create mode 100644 .ci/jenkins/Jenkinsfile.init-branch

diff --git a/.ci/jenkins/Jenkinsfile.init-branch b/.ci/jenkins/Jenkinsfile.init-branch
new file mode 100644
index 00000000000..1754609d2a0
--- /dev/null
+++ b/.ci/jenkins/Jenkinsfile.init-branch
@@ -0,0 +1,460 @@
+import org.jenkinsci.plugins.workflow.libs.Library
+@Library('jenkins-pipeline-shared-libraries')_
+
+import org.kie.jenkins.MavenCommand
+
+BUILT_IMAGES = []
+BUILD_FAILED_IMAGES = []
+
+droolsRepo = 'drools'
+kogitoRuntimesRepo = 'kogito-runtimes'
+kogitoAppsRepo = 'kogito-apps'
+
+pipeline {
+    agent {
+        label 'kogito-image-slave && !master'
+    }
+
+    // Needed for local build
+    tools {
+        jdk 'kie-jdk11'
+    }
+
+    options {
+        timeout(time: 120, unit: 'MINUTES')
+    }
+
+    // parameters {
+    // For parameters, check into ./dsl/jobs.groovy file
+    // }
+
+    environment {
+        // Static env is defined into ./dsl/jobs.groovy file
+
+        KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
+
+        JAVA_HOME = "${GRAALVM_HOME}"
+
+        OPENSHIFT_API = credentials('OPENSHIFT_API')
+        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
+        OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
+    }
+
+    stages {
+        stage('Initialization') {
+            steps {
+                script {
+                    clean()
+
+                    if (params.DISPLAY_NAME) {
+                        currentBuild.displayName = params.DISPLAY_NAME
+                    }
+
+                    checkoutRepo(droolsRepo, getDroolsTargetBranch())
+                    checkoutRepo(kogitoRuntimesRepo, getBuildBranch())
+                    checkoutRepo(kogitoAppsRepo, getBuildBranch())
+                    checkoutRepo(getRepoName(), getBuildBranch())
+                }
+            }
+        }
+        stage('Build upstream projects') {
+            steps {
+                script {
+                    getMavenCommand(droolsRepo).withProperty('quickly').run('clean install')
+                    getMavenCommand(kogitoRuntimesRepo).withProperty('quickly').run('clean install')
+                    getMavenCommand(kogitoAppsRepo).withProperty('quickly').run('clean install')
+                }
+            }
+        }
+        stage('Update project version') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getKogitoVersion()} --confirm"
+                        if (getBuildBranch() != 'main') {
+                            versionCmd += " --examples-ref nightly-${getBuildBranch()}"
+                        }
+                        if (getKogitoArtifactsVersion()) {
+                            versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
+                        }
+                        sh versionCmd
+                    }
+                }
+            }
+        }
+        stage('Validate CeKit Image and Modules descriptors') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        sh '''
+                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.1/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                            tar -xzvf cekit-image-validator-runner.tgz
+                            chmod +x cekit-image-validator-runner
+                        '''
+                        sh './cekit-image-validator-runner modules/'
+                        sh './cekit-image-validator-runner image.yaml'
+                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }
+                    }
+                }
+            }
+            post {
+                always {
+                    dir(getRepoName()) {
+                        sh 'rm -rf cekit-image-validator-runner*'
+                    }
+                }
+            }
+        }
+        stage('Build Images') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        parallelStages = [:]
+                        getImages().each { image ->
+                            initWorkspace(image)
+                            String workspacePath = getWorkspacePath(image)
+                            parallelStages["Build ${image}"] = {
+                                stage("Build ${image}") {
+                                    dir(workspacePath) {
+                                        try {
+                                            buildImage(image)
+                                            registerBuiltImage(image)
+                                        } catch (err) {
+                                            registerBuildFailedImage(image)
+                                            util.archiveConsoleLog(image, 400)
+                                            throw err
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        parallel parallelStages
+                    }
+                }
+            }
+            post {
+                always {
+                    script {
+                        cleanWorkspaces()
+                    }
+                }
+            }
+        }
+        stage('Tagging') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        tagImages()
+                    }
+                }
+            }
+        }
+        stage('Pushing') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        if (isDeployImageInOpenshiftRegistry()) {
+                            loginOpenshiftRegistry()
+                        } else if (getDeployImageRegistryCredentials()) {
+                            loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials())
+                        }
+                        pushImages()
+
+                        if (isQuayRegistry()) {
+                            makeQuayImagesPublic()
+                        }
+                    }
+                }
+            }
+        }
+        stage('Update branch') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        if (githubscm.isThereAnyChanges()) {
+                            githubscm.commitChanges("[${getBuildBranch()}] Update version to ${getKogitoVersion()}")
+                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
+                        } else {
+                            println '[WARN] no changes to commit'
+                        }
+                    }
+                }
+            }
+        }
+    }
+    post {
+        unsuccessful {
+            sendUnsuccessfulNotification()
+        }
+        cleanup {
+            clean()
+        }
+    }
+}
+
+void sendUnsuccessfulNotification() {
+    if (params.SEND_NOTIFICATION) {
+        mailer.sendMarkdownTestSummaryNotification('Init', "[${getBuildBranch()}] Kogito Images", [env.KOGITO_CI_EMAIL_TO])
+    } else {
+        echo 'No notification sent per configuration'
+    }
+}
+
+void checkoutRepo(String repository, String branch) {
+    dir(repository) {
+        deleteDir()
+        checkout(githubscm.resolveRepository(repository, getGitAuthor(), branch, false))
+        sh "git checkout ${branch}"
+    }
+}
+
+void clean() {
+    cleanWs()
+    cleanImages()
+
+    // Clean Cekit cache, in case we reuse an old node
+    sh 'rm -rf \$HOME/.cekit/cache'
+}
+
+void cleanImages() {
+    sh "${env.CONTAINER_ENGINE} rm -f \$(${env.CONTAINER_ENGINE} ps -a -q) || date"
+    sh "${env.CONTAINER_ENGINE} rmi -f \$(${env.CONTAINER_ENGINE} images -q) || date"
+}
+
+void buildImage(String imageName) {
+    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true"
+}
+
+String getMakeBuildImageArgs() {
+    List args = [ "cekit_option='--work-dir .'" ]
+    args.add("KOGITO_APPS_TARGET_BRANCH=${getKogitoAppsRef()}")
+    if (getKogitoAppsUri()) {
+        args.add("KOGITO_APPS_TARGET_URI=${getKogitoAppsUri()}")
+    }
+    return args.join(' ')
+}
+
+void registerBuiltImage(String imageName) {
+    lock("${BUILD_URL} build success") {
+        BUILT_IMAGES.add(imageName)
+    }
+}
+
+void registerBuildFailedImage(String imageName) {
+    lock("${BUILD_URL} build failed") {
+        BUILD_FAILED_IMAGES.add(imageName)
+    }
+}
+
+void removeBuiltImage (String imageName) {
+    lock("${BUILD_URL}") {
+        BUILT_IMAGES = BUILT_IMAGES.findAll { it != imageName }
+    }
+}
+
+List getBuiltImages() {
+    return BUILT_IMAGES
+}
+
+List getBuildFailedImages() {
+    return BUILD_FAILED_IMAGES
+}
+
+boolean isBuildFailedImage(String imageName) {
+    return BUILD_FAILED_IMAGES.contains(imageName)
+}
+
+void tagImages() {
+    for (String imageName : getBuiltImages()) {
+        String builtImageFullTag = "quay.io/kiegroup/${imageName}:latest"
+        tagImage(builtImageFullTag, buildImageName(imageName))
+
+        String reducedTag = getReducedTag()
+        if (reducedTag) {
+            tagImage(builtImageFullTag, buildImageName(imageName, reducedTag))
+        }
+    }
+}
+
+void tagImage(String oldImageName, String newImageName) {
+    sh "${env.CONTAINER_ENGINE} tag ${oldImageName} ${newImageName}"
+}
+
+void pushImages() {
+    for (String imageName : getBuiltImages()) {
+        pushImage(buildImageName(imageName))
+
+        String reducedTag = getReducedTag()
+        if (reducedTag) {
+            pushImage(buildImageName(imageName, reducedTag))
+        }
+    }
+}
+
+void pushImage(String fullImageName) {
+    retry(env.MAX_REGISTRY_RETRIES) {
+        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_TLS_OPTIONS} ${fullImageName}"
+    }
+}
+
+// Set images public on quay. Useful when new images are introduced.
+void makeQuayImagesPublic() {
+    String namespace = getDeployImageNamespace()
+    for (String imageName : getBuiltImages()) {
+        String repository = getFinalImageName(imageName)
+        echo "Check and set public if needed Quay repository ${namespace}/${repository}"
+        try {
+            cloud.makeQuayImagePublic(namespace, repository, [ usernamePassword: getDeployImageRegistryCredentials()])
+        } catch (err) {
+            echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
+        }
+    }
+}
+
+String buildImageName(String imageName, String imageTag = '') {
+    return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName(imageName)}:${imageTag ?: getDeployImageTag()}"
+}
+
+String getFinalImageName(String imageName) {
+    return getDeployImageNameSuffix() ? "${imageName}-${getDeployImageNameSuffix()}" : imageName
+}
+
+String getReducedTag() {
+    try {
+        String version = getDeployImageTag()
+        String[] versionSplit = version.split("\\.")
+        return "${versionSplit[0]}.${versionSplit[1]}"
+    } catch (error) {
+        echo "${getDeployImageTag()} cannot be reduced to the format X.Y"
+    }
+    return ''
+}
+
+void loginOpenshift() {
+    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]) {
+        sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
+    }
+}
+
+void loginOpenshiftRegistry() {
+    loginOpenshift()
+    // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
+    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_TLS_OPTIONS} ${env.OPENSHIFT_REGISTRY}"
+}
+
+void loginContainerRegistry(String registry, String credsId) {
+    withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
+        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_TLS_OPTIONS} ${registry}"
+    }
+}
+
+////////////////////////////////////////////////////////////////////////
+// Deploy image information
+////////////////////////////////////////////////////////////////////////
+
+boolean isDeployImageInOpenshiftRegistry() {
+    return params.IMAGE_USE_OPENSHIFT_REGISTRY
+}
+
+String getDeployImageRegistryCredentials() {
+    return params.IMAGE_REGISTRY_CREDENTIALS
+}
+
+String getDeployImageRegistry() {
+    return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.IMAGE_REGISTRY
+}
+
+String getDeployImageNamespace() {
+    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
+}
+
+String getDeployImageNameSuffix() {
+    return params.IMAGE_NAME_SUFFIX
+}
+
+String getDeployImageTag() {
+    if (params.IMAGE_TAG != '') {
+        return params.IMAGE_TAG
+    } else {
+        return sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+    }
+}
+
+boolean isQuayRegistry() {
+    return getDeployImageRegistry() == 'quay.io'
+}
+
+////////////////////////////////////////////////////////////////////////
+// Workspaces
+////////////////////////////////////////////////////////////////////////
+
+void initWorkspace(String image) {
+    sh "mkdir -p ${getWorkspacePath(image)}"
+    sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
+}
+
+void cleanWorkspaces() {
+    sh "rm -rf ${getWorkspacesPath()}"
+}
+
+String getWorkspacesPath() {
+    return "${WORKSPACE}/workspaces"
+}
+
+String getWorkspacePath(String image) {
+    return "${getWorkspacesPath()}/${image}"
+}
+
+////////////////////////////////////////////////////////////////////////
+// utils
+////////////////////////////////////////////////////////////////////////
+
+String getRepoName() {
+    return env.REPO_NAME
+}
+
+String getBuildBranch() {
+    return params.BUILD_BRANCH_NAME
+}
+
+String getKogitoAppsRef() {
+    return params.APPS_REF ?: getBuildBranch()
+}
+
+String getKogitoAppsUri() {
+    return params.APPS_URI
+}
+
+String getGitAuthor() {
+    return "${GIT_AUTHOR}"
+}
+
+String getGitAuthorCredsID() {
+    return "${AUTHOR_CREDS_ID}"
+}
+
+String getKogitoVersion() {
+    return params.KOGITO_VERSION
+}
+
+String getKogitoArtifactsVersion() {
+    return params.KOGITO_ARTIFACTS_VERSION
+}
+
+String getMavenArtifactRepository() {
+    return env.MAVEN_ARTIFACT_REPOSITORY
+}
+
+String[] getImages() {
+    return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
+}
+
+MavenCommand getMavenCommand(String directory) {
+    return new MavenCommand(this, ['-fae', '-ntp'])
+                .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
+                .inDirectory(directory)
+}
+
+String getDroolsTargetBranch() {
+    return util.calculateTargetReleaseBranch(getBuildBranch(), 7)
+}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 9c0deea5a48..fd4b20ccd74 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -19,6 +19,9 @@ jenkins_path = '.ci/jenkins'
 setupPrJob()
 setupDeployJob(Folder.PULLREQUEST_RUNTIMES_BDD)
 
+// Init branch
+setupInitBranchJob()
+
 // Nightly jobs
 setupDeployJob(Folder.NIGHTLY)
 
@@ -44,6 +47,49 @@ void setupPrJob() {
     KogitoJobTemplate.createPRJob(this, jobParams)
 }
 
+void setupInitBranchJob() {
+    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images', Folder.INIT_BRANCH, "${jenkins_path}/Jenkinsfile.init-branch", 'Kogito Images Init Branch')
+    jobParams.env.putAll([
+        CI: true,
+        REPO_NAME: 'kogito-images',
+        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+
+        CONTAINER_ENGINE: 'docker',
+        CONTAINER_TLS_OPTIONS: '',
+        MAX_REGISTRY_RETRIES: 3,
+
+        JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+
+        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+
+        MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+    ])
+    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
+        parameters {
+            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
+
+            stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
+
+            stringParam('APPS_URI', '', 'Git uri to the kogito-apps repository to use for tests.')
+            stringParam('APPS_REF', '', 'Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
+
+            // Deploy information
+            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
+            stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
+            stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
+            stringParam('IMAGE_TAG', '', 'Image tag to use to deploy images')
+
+            // Release information
+            stringParam('KOGITO_VERSION', '', 'Kogito version to set.')
+            stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Kogito Artifacts version to set')
+
+            booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
+        }
+    }
+}
+
 void setupDeployJob(Folder jobFolder) {
     def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images-deploy', jobFolder, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
     if (jobFolder.isPullRequest()) {
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index d42bdf190d9..5b846723b70 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -82,13 +82,18 @@ esac
 for ctx in ${contextDir}; do
     target_tmp_dir="/tmp/build/$(basename ${ctx})"
     build_target_dir="/tmp/$(basename ${ctx})"
+    mvn_local_repo="/tmp/temp_maven/$(basename ${ctx})"
     rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
     rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
+    rm -rf ${mvn_local_repo} && mkdir -p ${mvn_local_repo}
 
     . ${script_dir_path}/setup-maven.sh "${build_target_dir}"/settings.xml
 
+    echo "Copy current maven repo to maven context local repo"
+    cp -r ${HOME}/.m2/repository/* "${mvn_local_repo}"
+
     cd ${build_target_dir}
-    echo "Using branch/tag ${gitBranch}, checking out. Temporary build dir is ${build_target_dir} and target dis is ${target_tmp_dir}"
+    echo "Using branch/tag ${gitBranch}, checking out. Temporary build dir is ${build_target_dir} and target dist is ${target_tmp_dir}"
 
     if [ ! -d "${build_target_dir}/${KOGITO_APPS_REPO_NAME}" ]; then
         git_command="git clone --single-branch --branch ${gitBranch} --depth 1 ${gitUri}"
@@ -96,7 +101,7 @@ for ctx in ${contextDir}; do
         eval ${git_command}
     fi
     cd ${KOGITO_APPS_REPO_NAME} && echo "working dir `pwd`"
-    mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS} -Dmaven.repo.local=/tmp/temp_maven/${ctx}"
+    mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS} -Dmaven.repo.local=${mvn_local_repo}"
     echo "Building component(s) ${contextDir} with the following maven command [${mvn_command}]"
     export YARN_CACHE_FOLDER=/tmp/cache/yarn/${ctx} # Fix for building yarn apps in parallel
     export CYPRESS_CACHE_FOLDER=/tmp/cache/cypress/${ctx} # https://docs.cypress.io/guides/getting-started/installing-cypress#Advanced

From 65acab95e7bc5bd000f741300057cbd78a774e08 Mon Sep 17 00:00:00 2001
From: Fast Chauffeur <desmax74@users.noreply.github.com>
Date: Wed, 14 Sep 2022 10:04:33 +0200
Subject: [PATCH 470/709] [kogito-7891] Move s2i to builder-s2i module (#1332)

---
 .ci/jenkins/Jenkinsfile.deploy                |  2 +-
 README.md                                     | 50 +++++++++----------
 RELEASE_NOTES.md                              |  3 +-
 image.yaml                                    |  2 -
 kogito-imagestream.yaml                       |  6 +--
 kogito-runtime-jvm-overrides.yaml             |  2 +-
 kogito-runtime-native-overrides.yaml          |  4 +-
 ....yaml => kogito-s2i-builder-overrides.yaml |  6 +--
 modules/kogito-builder/module.yaml            |  6 ---
 .../added/kogito-app-launch.sh                |  2 +-
 .../configure                                 |  0
 modules/kogito-s2i-builder/module.yaml        | 19 +++++++
 .../s2i/bin/assemble                          |  0
 .../s2i/bin/usage                             |  2 +-
 rhpam-kogito-builder-rhel8-overrides.yaml     |  2 +-
 tests/features/common-build-runtime.feature   |  2 +-
 .../features/common-dynamic-resources.feature |  2 +-
 tests/features/common.feature                 |  2 +-
 .../kogito-common-builder-jvm.feature         |  4 +-
 tests/features/kogito-runtime-native.feature  |  2 +-
 ...ture => kogito-s2i-builder-native.feature} |  6 +--
 ...der.feature => kogito-s2i-builder.feature} |  8 +--
 22 files changed, 71 insertions(+), 61 deletions(-)
 rename kogito-builder-overrides.yaml => kogito-s2i-builder-overrides.yaml (94%)
 delete mode 100644 modules/kogito-builder/module.yaml
 rename modules/{kogito-builder => kogito-s2i-builder}/added/kogito-app-launch.sh (97%)
 rename modules/{kogito-builder => kogito-s2i-builder}/configure (100%)
 create mode 100644 modules/kogito-s2i-builder/module.yaml
 rename modules/{kogito-builder => kogito-s2i-builder}/s2i/bin/assemble (100%)
 rename modules/{kogito-builder => kogito-s2i-builder}/s2i/bin/usage (97%)
 rename tests/features/{kogito-builder-native.feature => kogito-s2i-builder-native.feature} (98%)
 rename tests/features/{kogito-builder.feature => kogito-s2i-builder.feature} (98%)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 7712be3e1d8..c37679cea0e 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -179,7 +179,7 @@ pipeline {
                     // Debug purpose in case of issue
                     sh 'cat tests/test-apps/clone-repo.sh'
                     sh 'cat scripts/setup-maven.sh'
-                    sh 'cat tests/features/kogito-builder.feature'
+                    sh 'cat tests/features/kogito-s2i-builder.feature'
 
                     // Prepare local examples
                     sh 'make clone-repos'
diff --git a/README.md b/README.md
index 4268530e404..ac489cf4db1 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,9 @@ Table of Contents
   - [Kogito Images Requirements](#kogito-images-requirements)
   - [Kogito Images JVM Memory Management](#kogito-images-jvm-memory-management)
   - [Kogito Runtime and Builder Images](#kogito-runtime-and-builder-images)
-    - [Kogito Builder Images](#kogito-builder-images)
-      - [Kogito Builder Image usage](#kogito-builder-image-usage)
-      - [Kogito Builder Image example](#kogito-builder-image-example)
+    - [Kogito s2i Builder Images](#kogito-s2i-builder-images)
+      - [Kogito s2i Builder Image usage](#kogito-s2i-builder-image-usage)
+      - [Kogito s2i Builder Image example](#kogito-s2i-builder-image-example)
         - [Builder Image Examples with Quarkus](#builder-image-example-with-quarkus)
         - [Builder Image Examples with Springboot](#builder-image-example-with-springboot)
       - [Improving Build Time](#improving-build-time)
@@ -146,7 +146,7 @@ be used by the Kogito Runtime images to run the Kogito application.
 
 The current available Kogito Builder image is:
 
-* [quay.io/kiegroup/kogito-builder](https://quay.io/kiegroup/kogito-builder)
+* [quay.io/kiegroup/kogito-s2i-builder](https://quay.io/kiegroup/kogito-s2i-builder)
 
 The builder image supports building applications based on Spring Boot and Quarkus. To define your runtime, specify the `RUNTIME_TYPE` environment variable. If var is not defined, it defaults to `quarkus`.
 When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a native image using GraalVM, which allows you to have lightweight and fast applications ready to run in the Cloud.
@@ -158,7 +158,7 @@ The Kogito Builder Image is equipped with the following components:
  * OpenJDK 11.0.6
  * Maven 3.8.6
  
-For more information about what is installed on this image, take a look [here](kogito-builder-overrides.yaml) in the
+For more information about what is installed on this image, take a look [here](kogito-s2i-builder-overrides.yaml) in the
 **modules.install** section. 
 
 #### Kogito Builder Image usage
@@ -166,7 +166,7 @@ For more information about what is installed on this image, take a look [here](k
 This image contains a helper option to better understand how to use it:
 
 ```bash
-$ docker run -it quay.io/kiegroup/kogito-builder:latest /home/kogito/kogito-app-launch.sh -h
+$ docker run -it quay.io/kiegroup/kogito-s2i-builder:latest /home/kogito/kogito-app-launch.sh -h
 ```
 
 By default, quarkus is selected as runtime, and a normal java build will be performed. To perform a native build, just set the **NATIVE** build environment variable to **true**.
@@ -186,7 +186,7 @@ $ s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus \
     --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-builder:latest \
+    quay.io/kiegroup/kogito-s2i-builder:latest \
     rules-example:1.0
 ...
 [INFO] BUILD SUCCESS
@@ -233,7 +233,7 @@ $ s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
     --context-dir kogito-springboot-examples/process-springboot-example \
     -e RUNTIME_TYPE=springboot \
-    quay.io/kiegroup/kogito-builder:latest \
+    quay.io/kiegroup/kogito-s2i-builder:latest \
     springboot-example:1.0
 ```
 
@@ -270,7 +270,7 @@ $ time s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus
     --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-builder:latest \
+    quay.io/kiegroup/kogito-s2i-builder:latest \
     rules-example-incremental:1.0 \
     --incremental \    
     --env NATIVE=false
@@ -288,7 +288,7 @@ $ time s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus
     --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-builder:latest \
+    quay.io/kiegroup/kogito-s2i-builder:latest \
     rules-example-incremental:1.0 \
     --incremental \
     --env NATIVE=false
@@ -316,7 +316,7 @@ $ time s2i build https://github.com/kiegroup/kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus
     --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-builder:latest \
+    quay.io/kiegroup/kogito-s2i-builder:latest \
     rules-example-incremental-1 \
     --incremental \
     --env NATIVE=false \
@@ -857,7 +857,7 @@ to build a new example application in Ruby.
 $ oc create -f https://raw.githubusercontent.com/kiegroup/kogito-images/0.16.0/kogito-imagestream.yaml
 imagestream.image.openshift.io/kogito-runtime-native created
 imagestream.image.openshift.io/kogito-runtime-jvm created
-imagestream.image.openshift.io/kogito-builder created
+imagestream.image.openshift.io/kogito-s2i-builder created
 imagestream.image.openshift.io/kogito-data-index-infinispan created
 imagestream.image.openshift.io/kogito-data-index-ephemeral created
 imagestream.image.openshift.io/kogito-data-index-mongodb created
@@ -872,10 +872,10 @@ imagestream.image.openshift.io/kogito-jobs-service-postgresql created
 imagestream.image.openshift.io/kogito-management-console created
 
 # performing a new build
-$ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-builder:latest \ 
+$ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-s2i-builder:latest \ 
     https://github.com/kiegroup/kogito-examples.git#main --context-dir=kogito-quarkus-examples/rules-quarkus-helloworld \
     --strategy=source --env NATIVE=false 
---> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-builder" under tag "latest" for "kogito-builder:latest"
+--> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-s2i-builder" under tag "latest" for "kogito-s2i-builder:latest"
 
     Kogito based on Quarkus 
     ----------------------- 
@@ -991,24 +991,24 @@ For more complex deployment, please use the [Kogito Cloud Operator](https://gith
 
 To be able to build the image it should be installed and available on OpenShift before it can be used.
 
-Suppose we have built the kogito-builder with the following command:
+Suppose we have built the kogito-s2i-builder with the following command:
 
 ```bash
-$ make build-image image_name=kogito-builder
+$ make build-image image_name=kogito-s2i-builder
 ```
 
 We'll have as output the following image:
 
 ```bash
-quay.io/kiegroup/kogito-builder:X.X.X
+quay.io/kiegroup/kogito-s2i-builder:X.X.X
 ```
 
 Then we need to tag the image properly. 
 Suppose your local registry is openshift.local.registry:8443, you should do:
 
 ```bash
-$ docker tag quay.io/kiegroup/kogito-builder:X.X.X \
-    openshift.local.registry:8443/{NAMESPACE}/kogito-builder:X.X.X
+$ docker tag quay.io/kiegroup/kogito-s2i-builder:X.X.X \
+    openshift.local.registry:8443/{NAMESPACE}/kogito-s2i-builder:X.X.X
 ```
 
 Where the namespace is the place where you want the image to be available for usage. 
@@ -1016,7 +1016,7 @@ Once the image is properly tagged, log in to the registry and push the new image
 
 ```bash
 $ docker login -u <USERNAME> -p <PASSWORD>  openshift.local.registry:8443
-$ docker push  openshift.local.registry:8443/{NAMESPACE}/kogito-builder:X.X.X
+$ docker push  openshift.local.registry:8443/{NAMESPACE}/kogito-s2i-builder:X.X.X
 ```
 
 To deploy and test the new image, follow the same steps as described [here](#using-released-images)
@@ -1048,7 +1048,7 @@ With this Makefile you can:
  
 - Build images individually, by default it will build and test each image
      ```bash
-     $ make build-image image_name=kogito-builder
+     $ make build-image image_name=kogito-s2i-builder
      $ make build-image image_name=kogito-runtime-jvm-ubi8
      $ make build-image image_name=kogito-runtime-native
      $ make build-image image_name=kogito-data-index-infinispan
@@ -1151,7 +1151,7 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-persistence](modules/kogito-persistence): Provides the needed configuration scripts to properly configure the Kogito Services in the target image.
 - [kogito-runtime-native](modules/kogito-runtime-native): Main module for the quay.io/kiegroup/kogito-runtime-native image.
 - [kogito-runtime-jvm](modules/kogito-runtime-jvm): Main module for the quay.io/kiegroup/kogito-runtime-jvm image.
-- [kogito-builder](modules/kogito-builder): Main module for the quay.io/kiegroup/kogito-builder image.
+- [kogito-s2i-builder](modules/kogito-s2i-builder): Main module for the quay.io/kiegroup/kogito-s2i-builder image.
 - [kogito-s2i-core](modules/kogito-s2i-core): Provides the source-to-image needed scripts and configurations.
 
 
@@ -1176,7 +1176,7 @@ Please inspect the images overrides files to learn which modules are being insta
 - [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-overrides.yaml)
 - [quay.io/kiegroup/kogito-runtime-jvm](kogito-runtime-jvm-overrides.yaml)
 - [quay.io/kiegroup/kogito-runtime-native](kogito-runtime-native-overrides.yaml)
-- [quay.io/kiegroup/kogito-builder](kogito-builder-overrides.yaml)
+- [quay.io/kiegroup/kogito-s2i-builder](kogito-s2i-builder-overrides.yaml)
 
 
 ### Testing Images
@@ -1201,12 +1201,12 @@ See [Writing Behave Tests](#writing-behave-tests).
 
 Example:
 ```bash
-make build-image image_name=kogito-builder test_options=--wip
+make build-image image_name=kogito-s2i-builder test_options=--wip
 ```
 
 Or by name:
 ```bash
-make build-image image_name=kogito-builder test_options=--name <Test Scenario Name>
+make build-image image_name=kogito-s2i-builder test_options=--name <Test Scenario Name>
 ```
 
 You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 33434cef765..da5faf99334 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,9 +1,8 @@
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-[KOGITO-7700](https://issues.redhat.com/browse/KOGITO-7700) - Allow adding quarkus extensions when building from assets
+[KOGITO-7891](KOGITO-7891) - SInce 1.28 the legacy builder based on s2i is renamed kogito-s2-builder and the new builder will be a jvm and maven builder
 
 ## Bug Fixes
-[KOGITO-7791](https://issues.redhat.com/browse/KOGITO-7791) - [TEST] - Serverless Workflow Extension is building the service properly is failing
 
 ## Known Issues
 
diff --git a/image.yaml b/image.yaml
index f72a5272677..e06f9b8b3b5 100644
--- a/image.yaml
+++ b/image.yaml
@@ -25,5 +25,3 @@ packages:
 
 run:
   user: 1001
-  cmd:
-    - "/usr/local/s2i/run"
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 133ba6249c4..2d203337691 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -51,7 +51,7 @@ items:
   - kind: ImageStream
     apiVersion: v1
     metadata:
-      name: kogito-builder
+      name: kogito-s2i-builder
       annotations:
         openshift.io/display-name: Platform for building Kogito based on Quarkus or Springboot
         openshift.io/provider-display-name: Kie Group.
@@ -61,14 +61,14 @@ items:
           annotations:
             description: Platform for building Kogito based on Quarkus or Springboot
             iconClass: icon-jbpm
-            tags: builder,kogito,quarkus,springboot
+            tags: s2i-builder,kogito,quarkus,springboot
             supports: quarkus
             version: '2.0.0-snapshot'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-builder:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-s2i-builder:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index 5d73f815894..fbd1d962171 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -42,7 +42,7 @@ modules:
   - name: org.kie.kogito.runtime.jvm
   - name: org.kie.kogito.security.custom.truststores
 
-## s2i build . quay.io/kiegroup/kogito-builder:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+## s2i build . quay.io/kiegroup/kogito-s2i-builder:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-overrides.yaml
index be7271c7f50..5917b7f43da 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -11,7 +11,7 @@ labels:
 - name: "io.k8s.display-name"
   value: "Kogito based on Quarkus native image"
 - name: "io.openshift.tags"
-  value: "builder,runtime,kogito,quarkus,native"
+  value: "runtime,kogito,quarkus,native"
 - name: "io.openshift.s2i.assemble-input-files"
   value: "/home/kogito/bin"
 
@@ -38,7 +38,7 @@ modules:
   - name: org.kie.kogito.s2i.core
   - name: org.kie.kogito.runtime.native
 
-## s2i build . quay.io/kiegroup/kogito-builder:latest kogitotest:10.0 -e RUNTIME_TYPE=quarkus -e NATIVE=true --runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+## s2i build . quay.io/kiegroup/kogito-s2i-builder:latest kogitotest:10.0 -e RUNTIME_TYPE=quarkus -e NATIVE=true --runtime-image quay.io/kiegroup/kogito-runtime-native:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
diff --git a/kogito-builder-overrides.yaml b/kogito-s2i-builder-overrides.yaml
similarity index 94%
rename from kogito-builder-overrides.yaml
rename to kogito-s2i-builder-overrides.yaml
index 63977540cc3..32e09cf8c8c 100644
--- a/kogito-builder-overrides.yaml
+++ b/kogito-s2i-builder-overrides.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-builder"
+name: "quay.io/kiegroup/kogito-s2i-builder"
 description: "Platform for building Kogito based on Quarkus or Springboot"
 
 labels:
@@ -11,7 +11,7 @@ labels:
 - name: "io.k8s.display-name"
   value: "Kogito based on Quarkus or Spring Boot"
 - name: "io.openshift.tags"
-  value: "builder,kogito,quarkus,springboot"
+  value: "s2i-builder,kogito,quarkus,springboot"
 
 envs:
 - name: "SCRIPT_DEBUG"
@@ -51,7 +51,7 @@ modules:
   - name: org.kie.kogito.maven
     version: "3.8.6"
   - name: org.kie.kogito.s2i.core
-  - name: org.kie.kogito.builder
+  - name: org.kie.kogito.s2i.builder
 
 packages:
   install:
diff --git a/modules/kogito-builder/module.yaml b/modules/kogito-builder/module.yaml
deleted file mode 100644
index 10f47ecc756..00000000000
--- a/modules/kogito-builder/module.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.builder
-version: "2.0.0-snapshot"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-builder/added/kogito-app-launch.sh b/modules/kogito-s2i-builder/added/kogito-app-launch.sh
similarity index 97%
rename from modules/kogito-builder/added/kogito-app-launch.sh
rename to modules/kogito-s2i-builder/added/kogito-app-launch.sh
index ad0c65f3dfe..46d47dba1d2 100644
--- a/modules/kogito-builder/added/kogito-app-launch.sh
+++ b/modules/kogito-s2i-builder/added/kogito-app-launch.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# S2I run script for the 'kogito-builder' image.
+# S2I run script for the 'kogito-s2i-builder' image.
 # The run script executes the server that runs your application.
 #
 # For more information see the documentation:
diff --git a/modules/kogito-builder/configure b/modules/kogito-s2i-builder/configure
similarity index 100%
rename from modules/kogito-builder/configure
rename to modules/kogito-s2i-builder/configure
diff --git a/modules/kogito-s2i-builder/module.yaml b/modules/kogito-s2i-builder/module.yaml
new file mode 100644
index 00000000000..e5f1ca10058
--- /dev/null
+++ b/modules/kogito-s2i-builder/module.yaml
@@ -0,0 +1,19 @@
+schema_version: 1
+name: org.kie.kogito.s2i.builder
+version: "2.0.0-snapshot"
+
+labels:
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
+
+execute:
+  - script: configure
+
+run:
+  user: 1001
+  cmd:
+    - "/usr/local/s2i/run"
diff --git a/modules/kogito-builder/s2i/bin/assemble b/modules/kogito-s2i-builder/s2i/bin/assemble
similarity index 100%
rename from modules/kogito-builder/s2i/bin/assemble
rename to modules/kogito-s2i-builder/s2i/bin/assemble
diff --git a/modules/kogito-builder/s2i/bin/usage b/modules/kogito-s2i-builder/s2i/bin/usage
similarity index 97%
rename from modules/kogito-builder/s2i/bin/usage
rename to modules/kogito-s2i-builder/s2i/bin/usage
index 9e87cc0c05d..a1df5f9d5cf 100644
--- a/modules/kogito-builder/s2i/bin/usage
+++ b/modules/kogito-s2i-builder/s2i/bin/usage
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-IMAGE_NAME="quay.io/kiegroup/kogito-builder"
+IMAGE_NAME="quay.io/kiegroup/kogito-s2i-builder"
 RUNTIME_JVM_IMAGE_NAME="quay.io/kiegroup/kogito-runtime-jvm"
 
 NATIVE_COMMANDS="For the native build, just set the NATIVE environment variable to "true" and use
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index ef9c53ba0b5..77169934608 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -55,7 +55,7 @@ modules:
     - name: org.kie.kogito.maven
       version: "3.8.6"
     - name: org.kie.kogito.s2i.core
-    - name: org.kie.kogito.builder
+    - name: org.kie.kogito.s2i.builder
     - name: org.kie.kogito.rhpam.prod.profile
 
 packages:
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
index 6c155ca6584..9a1568507fb 100644
--- a/tests/features/common-build-runtime.feature
+++ b/tests/features/common-build-runtime.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-builder
+@quay.io/kiegroup/kogito-s2i-builder
 @quay.io/kiegroup/kogito-runtime-native
 @quay.io/kiegroup/kogito-runtime-jvm
 @rhpam-7/rhpam-kogito-builder-rhel8
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index 006e3dd31f4..4ad6f9f88e1 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-builder
+@quay.io/kiegroup/kogito-s2i-builder
 @quay.io/kiegroup/kogito-runtime-jvm
 @quay.io/kiegroup/kogito-data-index-infinispan
 @quay.io/kiegroup/kogito-data-index-ephemeral
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 16de9e08940..97cec0135ed 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-builder
+@quay.io/kiegroup/kogito-s2i-builder
 @quay.io/kiegroup/kogito-runtime-jvm
 @quay.io/kiegroup/kogito-runtime-native
 @quay.io/kiegroup/kogito-data-index-infinispan
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index e828b4edbe1..e5ade0fff2f 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -1,5 +1,5 @@
-@quay.io/kiegroup/kogito-builder @rhpam-7/rhpam-kogito-builder-rhel8
-Feature: kogito-builder image JVM build tests
+@quay.io/kiegroup/kogito-s2i-builder @rhpam-7/rhpam-kogito-builder-rhel8
+Feature: kogito-s2i-builder image JVM build tests
 
   Scenario: verify if the maven and java installation are correct
     When container is started with command bash
diff --git a/tests/features/kogito-runtime-native.feature b/tests/features/kogito-runtime-native.feature
index dbdec925a78..1cf48122a9d 100644
--- a/tests/features/kogito-runtime-native.feature
+++ b/tests/features/kogito-runtime-native.feature
@@ -9,5 +9,5 @@ Feature: Kogito-runtime-native feature.
      And the image should contain label io.openshift.expose-services with value 8080:http
      And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus native image
      And the image should contain label io.k8s.display-name with value Kogito based on Quarkus native image
-     And the image should contain label io.openshift.tags with value builder,runtime,kogito,quarkus,native
+     And the image should contain label io.openshift.tags with value runtime,kogito,quarkus,native
      And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
diff --git a/tests/features/kogito-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
similarity index 98%
rename from tests/features/kogito-builder-native.feature
rename to tests/features/kogito-s2i-builder-native.feature
index ae090229617..60633374e96 100644
--- a/tests/features/kogito-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -1,12 +1,12 @@
-@quay.io/kiegroup/kogito-builder
-Feature: kogito-builder image native build tests
+@quay.io/kiegroup/kogito-s2i-builder
+Feature: kogito-s2i-builder image native build tests
 
   Scenario: verify java cacerts and libsunec are available in the given kogito builder container.
     When container is started with command bash
     Then  file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
 
-  Scenario: verify if the maven and graal vm settings are correct on kogito-builder image for native
+  Scenario: verify if the maven and graal vm settings are correct on kogito-s2i-builder image for native
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
diff --git a/tests/features/kogito-builder.feature b/tests/features/kogito-s2i-builder.feature
similarity index 98%
rename from tests/features/kogito-builder.feature
rename to tests/features/kogito-s2i-builder.feature
index 3e4b581cb9c..d28630e4201 100644
--- a/tests/features/kogito-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -1,7 +1,7 @@
-@quay.io/kiegroup/kogito-builder
-Feature: kogito-builder image tests
+@quay.io/kiegroup/kogito-s2i-builder
+Feature: kogito-s2i-builder image tests
 
-  Scenario: verify if all labels are correctly set on kogito-builder image
+  Scenario: verify if all labels are correctly set on kogito-s2i-builder image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
@@ -9,7 +9,7 @@ Feature: kogito-builder image tests
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Platform for building Kogito based on Quarkus or Spring Boot
     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus or Spring Boot
-    And the image should contain label io.openshift.tags with value builder,kogito,quarkus,springboot
+    And the image should contain label io.openshift.tags with value s2i-builder,kogito,quarkus,springboot
 
   Scenario: verify if community builder image does not contain the red hat maven repositories
     When container is started with command bash

From e761e95611bfd1c797e9d6057753501b6c33b5e5 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 21 Sep 2022 14:45:29 +0200
Subject: [PATCH 471/709] Correct SWF testing (#1338)

Following https://github.com/kiegroup/kogito-runtimes/pull/2448
---
 tests/features/kogito-s2i-builder.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index d28630e4201..1106879cfd9 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -109,7 +109,7 @@ Feature: kogito-s2i-builder image tests
       | port                  | 8080                          |
       | path                  | /                             |
       | wait                  | 80                            |
-      | expected_status_code  | 200                           |
+      | expected_status_code  | 202                           |
       | request_method        | POST                          |
       | content_type          | application/cloudevents+json  |
       | request_body          | {"specversion": "1.0", "datacontenttype": "application/json", "source": "behave", "type": "orderEvent", "id": "12345", "data": {"id":"f0643c68-609c-48aa-a820-5df423fa4fe0","country":"Brazil","total":10000,"description":"iPhone 12"}}|

From d82a6b0dacc5a1ad5336eb3a2d85c5522c7f0c38 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 30 Sep 2022 16:17:20 +0200
Subject: [PATCH 472/709] KOGITO-8043 Jenkins node master -> built-in (#1342)

---
 .ci/jenkins/Jenkinsfile                     | 2 +-
 .ci/jenkins/Jenkinsfile.deploy              | 2 +-
 .ci/jenkins/Jenkinsfile.init-branch         | 2 +-
 .ci/jenkins/Jenkinsfile.promote             | 2 +-
 .ci/jenkins/Jenkinsfile.update-prod-version | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index cea9685bcc4..f9554fecbc4 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -7,7 +7,7 @@ changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 BUILD_FAILED_IMAGES = []
 
 pipeline {
-    agent { label 'kogito-image-slave && !master' }
+    agent { label 'kogito-image-slave && !built-in' }
     tools {
         jdk 'kie-jdk11'
     }
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index c37679cea0e..e440d3be3d3 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -10,7 +10,7 @@ TEST_FAILED_IMAGES = []
 
 pipeline {
     agent {
-        label 'kogito-image-slave && !master'
+        label 'kogito-image-slave && !built-in'
     }
 
     // Needed for local build
diff --git a/.ci/jenkins/Jenkinsfile.init-branch b/.ci/jenkins/Jenkinsfile.init-branch
index 1754609d2a0..2ebf5c71401 100644
--- a/.ci/jenkins/Jenkinsfile.init-branch
+++ b/.ci/jenkins/Jenkinsfile.init-branch
@@ -12,7 +12,7 @@ kogitoAppsRepo = 'kogito-apps'
 
 pipeline {
     agent {
-        label 'kogito-image-slave && !master'
+        label 'kogito-image-slave && !built-in'
     }
 
     // Needed for local build
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 75bb48d032b..054cd268cc4 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -5,7 +5,7 @@ deployProperties = [:]
 
 pipeline {
     agent {
-        label 'kogito-image-slave && !master'
+        label 'kogito-image-slave && !built-in'
     }
 
     options {
diff --git a/.ci/jenkins/Jenkinsfile.update-prod-version b/.ci/jenkins/Jenkinsfile.update-prod-version
index 8ae4e6650f6..6ec73f190a5 100644
--- a/.ci/jenkins/Jenkinsfile.update-prod-version
+++ b/.ci/jenkins/Jenkinsfile.update-prod-version
@@ -2,7 +2,7 @@
 
 pipeline {
     agent {
-        label 'kie-rhel7 && !master'
+        label 'kie-rhel7 && !built-in'
     }
 
     options {

From bf51cca6c48df73686db6f323ad49f8fdab49e6c Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 7 Oct 2022 10:16:31 +0200
Subject: [PATCH 473/709] KOGITO-7798 Refactor setup branch job (#1340)

---
 .../{Jenkinsfile.init-branch => Jenkinsfile.setup-branch} | 2 +-
 .ci/jenkins/dsl/jobs.groovy                               | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
 rename .ci/jenkins/{Jenkinsfile.init-branch => Jenkinsfile.setup-branch} (99%)

diff --git a/.ci/jenkins/Jenkinsfile.init-branch b/.ci/jenkins/Jenkinsfile.setup-branch
similarity index 99%
rename from .ci/jenkins/Jenkinsfile.init-branch
rename to .ci/jenkins/Jenkinsfile.setup-branch
index 2ebf5c71401..aecf875cada 100644
--- a/.ci/jenkins/Jenkinsfile.init-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -194,7 +194,7 @@ pipeline {
 
 void sendUnsuccessfulNotification() {
     if (params.SEND_NOTIFICATION) {
-        mailer.sendMarkdownTestSummaryNotification('Init', "[${getBuildBranch()}] Kogito Images", [env.KOGITO_CI_EMAIL_TO])
+        mailer.sendMarkdownTestSummaryNotification('Setup branch', "[${getBuildBranch()}] Kogito Images", [env.KOGITO_CI_EMAIL_TO])
     } else {
         echo 'No notification sent per configuration'
     }
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index fd4b20ccd74..0f25ec1d4c1 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -20,7 +20,7 @@ setupPrJob()
 setupDeployJob(Folder.PULLREQUEST_RUNTIMES_BDD)
 
 // Init branch
-setupInitBranchJob()
+createSetupBranchJob()
 
 // Nightly jobs
 setupDeployJob(Folder.NIGHTLY)
@@ -47,8 +47,8 @@ void setupPrJob() {
     KogitoJobTemplate.createPRJob(this, jobParams)
 }
 
-void setupInitBranchJob() {
-    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images', Folder.INIT_BRANCH, "${jenkins_path}/Jenkinsfile.init-branch", 'Kogito Images Init Branch')
+void createSetupBranchJob() {
+    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images', Folder.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
     jobParams.env.putAll([
         CI: true,
         REPO_NAME: 'kogito-images',
@@ -63,6 +63,8 @@ void setupInitBranchJob() {
         AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
 
         MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+
+        IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}"
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {

From b2f71db33437d9f170afc265831d4802c2f8c8a9 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Tue, 11 Oct 2022 04:11:36 -0400
Subject: [PATCH 474/709] [main] Update version to 2.0.0-snapshot

---
 .../kogito-common-builder-jvm.feature         | 28 +++++++++----------
 .../kogito-s2i-builder-native.feature         | 16 +++++------
 tests/features/kogito-s2i-builder.feature     | 20 ++++++-------
 .../features/rhpam-kogito-builder-jvm.feature | 12 ++++----
 tests/test-apps/clone-repo.sh                 |  2 +-
 5 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index e5ade0fff2f..f143e736292 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -8,7 +8,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot
       | variable     | value   |
       | NATIVE       | false   |
       | RUNTIME_TYPE | quarkus |
@@ -26,7 +26,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot
       | variable     | value   |
       | NATIVE       | false   |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value                     |
       | NATIVE       | false                     |
       | RUNTIME_TYPE | quarkus                   |
@@ -62,7 +62,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -78,7 +78,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                                                    |
       | RUNTIME_TYPE      | quarkus                                                  |
       | NATIVE            | false                                                    |
@@ -96,7 +96,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Perform a incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 2.0.0-snapshot
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -114,7 +114,7 @@ Feature: kogito-s2i-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 2.0.0-snapshot
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -135,7 +135,7 @@ Feature: kogito-s2i-builder image JVM build tests
 #### SpringBoot Scenarios
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-      Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
         | variable     | value        |
         | RUNTIME_TYPE | springboot   |
         | JAVA_OPTIONS | -Ddebug=true |
@@ -153,7 +153,7 @@ Feature: kogito-s2i-builder image JVM build tests
       And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using 2.0.0-snapshot
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | RUNTIME_TYPE        | springboot   |
@@ -171,7 +171,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -188,7 +188,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
   
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | RUNTIME_TYPE      | springboot                         |
@@ -208,7 +208,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Perform a incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using 2.0.0-snapshot
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -225,7 +225,7 @@ Feature: kogito-s2i-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using 2.0.0-snapshot
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -233,7 +233,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                           |
       | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
       | RUNTIME_TYPE      | quarkus                         |
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 60633374e96..be44dbc7f7f 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -15,7 +15,7 @@ Feature: kogito-s2i-builder image native build tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.1
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot
       | variable | value          |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -53,7 +53,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -71,7 +71,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable          | value         |
       | RUNTIME_TYPE      | quarkus       |
       | NATIVE            | true          |
@@ -84,7 +84,7 @@ Feature: kogito-s2i-builder image native build tests
      And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Perform a incremental s2i build for native test
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 2.0.0-snapshot
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -102,7 +102,7 @@ Feature: kogito-s2i-builder image native build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario:Perform a second incremental s2i build for native scenario, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 2.0.0-snapshot
       | variable     | value      |
       | RUNTIME_TYPE | quarkus    |
       | NATIVE       | true       |
@@ -122,12 +122,12 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 1106879cfd9..fc8320032b7 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -23,7 +23,7 @@ Feature: kogito-s2i-builder image tests
     And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | NATIVE            | false         |
       | RUNTIME_TYPE      | quarkus       |
@@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
       | RUNTIME_TYPE      | springboot    |
@@ -42,11 +42,11 @@ Feature: kogito-s2i-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus:quarkus-maven-plugin:
@@ -70,11 +70,11 @@ Feature: kogito-s2i-builder image tests
 
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION      | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -91,11 +91,11 @@ Feature: kogito-s2i-builder image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
-    Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION           | 2.0.0-SNAPSHOT                                        |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -117,9 +117,9 @@ Feature: kogito-s2i-builder image tests
 #### SpringBoot Scenarios
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 01294006abd..05ade90a98f 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -25,11 +25,11 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 1.5.0.redhat-00001 |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -52,11 +52,11 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | request_body    | {"status": "UP", "checks": []}  |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION      | 1.5.0.redhat-00001 |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -75,9 +75,9 @@ Feature: rhpam-kogito-builder-rhel8 feature.
 #### SpringBoot Scenarios
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 6e326b57a4b..049a88f50a2 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -37,7 +37,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
 git fetch origin --tags
-git checkout nightly-main
+git checkout -b 2.0.0-snapshot origin/2.0.0-snapshot
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/

From 9d9c5a061eaf9449975de5b8ab816bbeb6615313 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 13 Oct 2022 17:01:49 +0200
Subject: [PATCH 475/709] Correct setup branch job for main (#1349)

---
 .ci/jenkins/Jenkinsfile.setup-branch          |  4 +--
 .../kogito-common-builder-jvm.feature         | 28 +++++++++----------
 .../kogito-s2i-builder-native.feature         | 16 +++++------
 tests/features/kogito-s2i-builder.feature     | 20 ++++++-------
 .../features/rhpam-kogito-builder-jvm.feature | 12 ++++----
 tests/test-apps/clone-repo.sh                 |  2 +-
 6 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index aecf875cada..33387b584aa 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -71,9 +71,7 @@ pipeline {
                 script {
                     dir(getRepoName()) {
                         versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getKogitoVersion()} --confirm"
-                        if (getBuildBranch() != 'main') {
-                            versionCmd += " --examples-ref nightly-${getBuildBranch()}"
-                        }
+                        versionCmd += " --examples-ref nightly-${getBuildBranch()}"
                         if (getKogitoArtifactsVersion()) {
                             versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
                         }
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index f143e736292..e5ade0fff2f 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -8,7 +8,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
       | variable     | value   |
       | NATIVE       | false   |
       | RUNTIME_TYPE | quarkus |
@@ -26,7 +26,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
       | variable     | value   |
       | NATIVE       | false   |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value                     |
       | NATIVE       | false                     |
       | RUNTIME_TYPE | quarkus                   |
@@ -62,7 +62,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -78,7 +78,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                                                    |
       | RUNTIME_TYPE      | quarkus                                                  |
       | NATIVE            | false                                                    |
@@ -96,7 +96,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Perform a incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -114,7 +114,7 @@ Feature: kogito-s2i-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -135,7 +135,7 @@ Feature: kogito-s2i-builder image JVM build tests
 #### SpringBoot Scenarios
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-      Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
         | variable     | value        |
         | RUNTIME_TYPE | springboot   |
         | JAVA_OPTIONS | -Ddebug=true |
@@ -153,7 +153,7 @@ Feature: kogito-s2i-builder image JVM build tests
       And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | RUNTIME_TYPE        | springboot   |
@@ -171,7 +171,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -188,7 +188,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
   
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | RUNTIME_TYPE      | springboot                         |
@@ -208,7 +208,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Perform a incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -225,7 +225,7 @@ Feature: kogito-s2i-builder image JVM build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario: Perform a second incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -233,7 +233,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                           |
       | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
       | RUNTIME_TYPE      | quarkus                         |
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index be44dbc7f7f..09c83ddfbcb 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -15,7 +15,7 @@ Feature: kogito-s2i-builder image native build tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.1
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
       | variable | value          |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -53,7 +53,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -71,7 +71,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable          | value         |
       | RUNTIME_TYPE      | quarkus       |
       | NATIVE            | true          |
@@ -84,7 +84,7 @@ Feature: kogito-s2i-builder image native build tests
      And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Perform a incremental s2i build for native test
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -102,7 +102,7 @@ Feature: kogito-s2i-builder image native build tests
 
   # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
   Scenario:Perform a second incremental s2i build for native scenario, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using 2.0.0-snapshot
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value      |
       | RUNTIME_TYPE | quarkus    |
       | NATIVE       | true       |
@@ -122,12 +122,12 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index fc8320032b7..57447a9fc85 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -23,7 +23,7 @@ Feature: kogito-s2i-builder image tests
     And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | NATIVE            | false         |
       | RUNTIME_TYPE      | quarkus       |
@@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
       | RUNTIME_TYPE      | springboot    |
@@ -42,11 +42,11 @@ Feature: kogito-s2i-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus:quarkus-maven-plugin:
@@ -70,11 +70,11 @@ Feature: kogito-s2i-builder image tests
 
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -91,11 +91,11 @@ Feature: kogito-s2i-builder image tests
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
   Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
-    Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -117,9 +117,9 @@ Feature: kogito-s2i-builder image tests
 #### SpringBoot Scenarios
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 05ade90a98f..a9477051ed9 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -25,11 +25,11 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -52,11 +52,11 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | request_body    | {"status": "UP", "checks": []}  |
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -75,9 +75,9 @@ Feature: rhpam-kogito-builder-rhel8 feature.
 #### SpringBoot Scenarios
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using 2.0.0-snapshot and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 049a88f50a2..4cf8028a89d 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -37,7 +37,7 @@ rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
 git fetch origin --tags
-git checkout -b 2.0.0-snapshot origin/2.0.0-snapshot
+git checkout -b nightly-main origin/nightly-main
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/

From 8f33bbc1f8d5dcc7b4755907d0116fc14cf8ad73 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 17 Oct 2022 09:25:00 +0200
Subject: [PATCH 476/709] Correct GHA DSL checks (#1348)

---
 .ci/jenkins/dsl/test.sh                      | 5 -----
 .github/workflows/jenkins-tests-PR.yml       | 5 ++++-
 .github/workflows/kogito-images-pr-check.yml | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index c3e8a6d221e..ad8af34ac25 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -1,9 +1,4 @@
 #!/bin/bash -e
-
-export DSL_DEFAULT_MAIN_CONFIG_FILE_REPO=kiegroup/kogito-pipelines
-export DSL_DEFAULT_MAIN_CONFIG_FILE_REF=main
-export DSL_DEFAULT_MAIN_CONFIG_FILE_PATH=dsl/config/main.yaml
-
 file=$(mktemp)
 # For more usage of the script, use ./test.sh -h
 curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index 29ef3fb9ee6..af60e1ae062 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -9,6 +9,9 @@ on:
 
 jobs:
   dsl-tests:
+    concurrency:
+      group: ${{ github.repository.name }}_dsl_tests-${{ github.head_ref }}
+      cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
     - name: DSL tests
@@ -16,4 +19,4 @@ jobs:
       with:
         main-config-file-repo: kiegroup/kogito-pipelines
         main-config-file-ref: main
-        main-config-file-path: dsl/config/main.yaml
\ No newline at end of file
+        main-config-file-path: dsl/config/main.yaml
diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
index 6747e3620eb..1c3cab42d48 100644
--- a/.github/workflows/kogito-images-pr-check.yml
+++ b/.github/workflows/kogito-images-pr-check.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install xmllint
         run: |
           sudo apt-get update
@@ -27,7 +27,7 @@ jobs:
     name: Validate Kogito imagestreams
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Download openshift-validator-tool
         run: |
           wget https://github.com/jboss-container-images/jboss-kie-modules/raw/main/tools/openshift-template-validator/openshift-template-validator-linux-amd64
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Shellcheck
         run: sudo apt install shellcheck
       - name: Check configure scripts

From 425bfefe556c94737cd86fb8c4b2ffccb57f01ae Mon Sep 17 00:00:00 2001
From: Fast Chauffeur <desmax74@users.noreply.github.com>
Date: Mon, 17 Oct 2022 05:31:20 -0400
Subject: [PATCH 477/709] [KOGITO-7779] Produce a BASE Kogito Serverless
 Workflow Builder Image (#1329)

* [KOGITO-7779] Produce a BASE Kogito Serverless Workflow Builder Image

* Decorrelated build and runtime builds

* [KOGITO-7779] Produce a BASE Kogito Serverless Workflow Builder Image

Signed-off-by: desmax74 <mdessi@redhat.com>

* [KOGITO-7779] Produce a BASE Kogito Serverless Workflow Builder Image

Signed-off-by: desmax74 <mdessi@redhat.com>

* [KOGITO-7779] Produce a BASE Kogito Serverless Workflow Builder Image

Signed-off-by: desmax74 <mdessi@redhat.com>

* [KOGITO-7779] Produce a BASE Kogito Serverless Workflow Builder Image

Signed-off-by: desmax74 <mdessi@redhat.com>

* [KOGITO-7779] Produce a BASE Kogito Serverless Workflow Builder Image

Signed-off-by: desmax74 <mdessi@redhat.com>

* Update swf module

* added SCRIPT_DEBUG support

* update

* Apply suggestions from code review

* Update README.md

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* [KOGITO-7779] Produce a BASE Kogito Serverless Workflow Builder Image

Signed-off-by: desmax74 <mdessi@redhat.com>

* Update README.md

Signed-off-by: desmax74 <mdessi@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 README.md                                     | 54 ++++++++++++---
 kogito-base-builder-overrides.yaml            | 30 +++++++++
 kogito-imagestream.yaml                       | 42 ++++++++++++
 kogito-swf-builder-overrides.yaml             | 25 +++++++
 modules/kogito-base-builder/module.yaml       |  4 ++
 .../kogito-swf-builder/added/add-extension.sh | 24 +++++++
 modules/kogito-swf-builder/added/build-app.sh | 37 ++++++++++
 .../kogito-swf-builder/added/create-app.sh    | 30 +++++++++
 modules/kogito-swf-builder/configure.sh       | 13 ++++
 modules/kogito-swf-builder/module.yaml        | 31 +++++++++
 tests/features/common.feature                 |  1 +
 tests/features/kogito-swf-builder.feature     | 16 +++++
 tests/test-apps/swf-builder/Dockerfile        | 30 +++++++++
 tests/test-apps/swf-builder/greet.sw.json     | 67 +++++++++++++++++++
 .../test-apps/swf-builder/swf-builder-test.sh | 26 +++++++
 15 files changed, 422 insertions(+), 8 deletions(-)
 create mode 100644 kogito-base-builder-overrides.yaml
 create mode 100644 kogito-swf-builder-overrides.yaml
 create mode 100644 modules/kogito-base-builder/module.yaml
 create mode 100755 modules/kogito-swf-builder/added/add-extension.sh
 create mode 100755 modules/kogito-swf-builder/added/build-app.sh
 create mode 100755 modules/kogito-swf-builder/added/create-app.sh
 create mode 100644 modules/kogito-swf-builder/configure.sh
 create mode 100644 modules/kogito-swf-builder/module.yaml
 create mode 100644 tests/features/kogito-swf-builder.feature
 create mode 100644 tests/test-apps/swf-builder/Dockerfile
 create mode 100644 tests/test-apps/swf-builder/greet.sw.json
 create mode 100755 tests/test-apps/swf-builder/swf-builder-test.sh

diff --git a/README.md b/README.md
index ac489cf4db1..93982776300 100644
--- a/README.md
+++ b/README.md
@@ -144,15 +144,27 @@ Those are described bellow.
 The Kogito Builder Images are responsible for building the project with Apache Maven and generating the binary that will 
 be used by the Kogito Runtime images to run the Kogito application.
 
-The current available Kogito Builder image is:
+There are three builder images available:
+
+
+* [quay.io/kiegroup/kogito-base-builder](https://quay.io/kiegroup/kogito-base-builder)  
+The Kogito base Builder Image is equipped with the following components:
+  * OpenJDK 11.0.6
+  * Maven 3.8.6
+
+* [quay.io/kiegroup/kogito-swf-builder](https://quay.io/kiegroup/kogito-swf-builder)  
+  The Kogito SWF Builder Image extends the kogito-base-builder is equipped with the following components for faster builds:
+    * Quarkus dependencies
+    * kogito-quarkus-serverless-workflow extension dependencies
+    * kogito-addons-quarkus-knative-eventing extension dependencies
 
 * [quay.io/kiegroup/kogito-s2i-builder](https://quay.io/kiegroup/kogito-s2i-builder)
 
-The builder image supports building applications based on Spring Boot and Quarkus. To define your runtime, specify the `RUNTIME_TYPE` environment variable. If var is not defined, it defaults to `quarkus`.
+Former name: `quay.io/kiegroup/kogito-builder`  
+The Kogito s2i builder image supports building applications based on Spring Boot and Quarkus. To define your runtime, specify the `RUNTIME_TYPE` environment variable. If var is not defined, it defaults to `quarkus`.
 When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a native image using GraalVM, which allows you to have lightweight and fast applications ready to run in the Cloud.
 
-
-The Kogito Builder Image is equipped with the following components:
+The Kogito s2i Builder Image is equipped with the following components:
 
  * GraalVM 21.3.1-java11
  * OpenJDK 11.0.6
@@ -161,7 +173,33 @@ The Kogito Builder Image is equipped with the following components:
 For more information about what is installed on this image, take a look [here](kogito-s2i-builder-overrides.yaml) in the
 **modules.install** section. 
 
-#### Kogito Builder Image usage
+#### Kogito swf Builder Image usage
+
+The main purpose is the use in the Kogito Serverless operator as a builder
+
+```bash
+FROM quay.io/kiegroup/kogito-swf-builder:latest AS builder
+
+# Copy from build context to resources directory
+COPY * ./resources/
+
+# Build app with given resources
+RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
+#=============================
+# Runtime Run
+#=============================
+...
+```
+but obvioulsy can be used to create other swf "flavours" images installing the org.kie.kogito.swf.builder and 
+adding in the configure script the addition of other extensions
+to reuse the scaffolding and the pom created byt the swf builder
+
+```bash
+"${MAVEN_HOME}"/bin/mvn -Dmaven.repo.local="${KOGITO_HOME}"/.m2/repository -U -B -s "${MAVEN_SETTINGS_PATH:-/home/kogito/.m2/settings.xml}" \
+quarkus:add-extension -Dextensions="${QUARKUS_EXTENSIONS:-my-other-kogito-quarkus-extension,my-custom-kogito-addons-quarkus-extension}"
+```
+
+#### Kogito s2i Builder Image usage
 
 This image contains a helper option to better understand how to use it:
 
@@ -174,9 +212,9 @@ By default, quarkus is selected as runtime, and a normal java build will be perf
 See the next topic for an example.
  
 
-#### Kogito Builder Image example
+#### Kogito s2i Builder Image example
 
-##### Builder Image Example with Quarkus
+##### S2i Builder Image Example with Quarkus
 In this example, let's use a simple application based on Quarkus that is available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
 repository: the *rules-quarkus-helloworld* example, with native compilation disabled.
 
@@ -224,7 +262,7 @@ $ curl -H "Content-Type: application/json" -X POST -d '{"strings":["hello"]}' ht
 
 
 
-##### Builder Image Example with Springboot
+##### S2i Builder Image Example with Springboot
 In this example, let's use a simple application based on Spring Boot that is available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
 repository: the *process-springboot-example*.
 
diff --git a/kogito-base-builder-overrides.yaml b/kogito-base-builder-overrides.yaml
new file mode 100644
index 00000000000..777fc15a2d8
--- /dev/null
+++ b/kogito-base-builder-overrides.yaml
@@ -0,0 +1,30 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-base-builder"
+description: "Image with JDK and Maven, used as a base image"
+
+labels:
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Platform for building Kogito based on JDK and Maven"
+  - name: "io.k8s.display-name"
+    value: "Kogito based on JDK and Maven"
+  - name: "io.openshift.tags"
+    value: "base-builder,kogito"
+
+modules:
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven
+      version: "3.8.6"
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 2d203337691..f49f8ee32e7 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -69,6 +69,48 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-s2i-builder:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-swf-builder
+      annotations:
+        openshift.io/display-name: Kogito Serverless Workflow builder with basic Quarkus SWF extensions preinstalled
+        openshift.io/provider-display-name: KIE Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Kogito Serverless Workflow builder with minimum Quarkus extensions libraries preinstalled
+            iconClass: icon-jbpm
+            tags: kogito,quarkus,swf,maven
+            supports: quarkus
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-swf-builder:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-base-builder
+      annotations:
+        openshift.io/display-name: Kogito base builder
+        openshift.io/provider-display-name: KIE Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: Kogito base builder
+            iconClass: icon-jbpm
+            tags: kogito,jdk,maven
+            supports: quarkus
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-base-builder:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
new file mode 100644
index 00000000000..e3b01897014
--- /dev/null
+++ b/kogito-swf-builder-overrides.yaml
@@ -0,0 +1,25 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-swf-builder"
+description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
+
+labels:
+  - name: "org.quarkus.version"
+    value: "2.13.0.Final"
+
+modules:
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven
+      version: "3.8.6"
+    - name: org.kie.kogito.swf.builder
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
\ No newline at end of file
diff --git a/modules/kogito-base-builder/module.yaml b/modules/kogito-base-builder/module.yaml
new file mode 100644
index 00000000000..db2f97e83fa
--- /dev/null
+++ b/modules/kogito-base-builder/module.yaml
@@ -0,0 +1,4 @@
+schema_version: 1
+name: org.kie.kogito.base.builder
+version: "2.0.0-snapshot"
+description: "Kogito base builder"
diff --git a/modules/kogito-swf-builder/added/add-extension.sh b/modules/kogito-swf-builder/added/add-extension.sh
new file mode 100755
index 00000000000..2b6c4101d1f
--- /dev/null
+++ b/modules/kogito-swf-builder/added/add-extension.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -e
+
+script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+extensions="$1"
+
+# Call the configure-maven here
+source "${KOGITO_HOME}"/launch/configure-maven.sh
+configure
+
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    printenv
+fi
+
+cd "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+
+"${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
+io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":add-extension ${QUARKUS_ADD_EXTENSION_ARGS}\
+-DplatformVersion="${QUARKUS_VERSION}" \
+-Dextensions="${extensions}"
diff --git a/modules/kogito-swf-builder/added/build-app.sh b/modules/kogito-swf-builder/added/build-app.sh
new file mode 100755
index 00000000000..8c71c9f5a89
--- /dev/null
+++ b/modules/kogito-swf-builder/added/build-app.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -e
+
+script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+resources_path="$1"
+if [ ! -z "${resources_path}" ]; then
+  resources_path="$(realpath "${resources_path}")"
+fi
+
+# Call the configure-maven here
+source "${KOGITO_HOME}"/launch/configure-maven.sh
+configure
+
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    printenv
+fi
+
+cd "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+
+if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
+  ${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}"
+fi
+
+# Copy resources if exists
+if [ ! -z "${resources_path}" ]; then
+  if [ -d "${resources_path}" ]; then
+    cp -rv "${resources_path}"/* src/main/resources/
+  else
+    cp -rv "${resources_path}" src/main/resources/
+  fi
+fi
+
+"${MAVEN_HOME}"/bin/mvn ${MAVEN_ARGS_APPEND} -U -B clean install -DskipTests -s "${MAVEN_SETTINGS_PATH}" -Dquarkus.container-image.build=false
diff --git a/modules/kogito-swf-builder/added/create-app.sh b/modules/kogito-swf-builder/added/create-app.sh
new file mode 100755
index 00000000000..38385330ccd
--- /dev/null
+++ b/modules/kogito-swf-builder/added/create-app.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -e
+
+script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+
+cd "${KOGITO_HOME}"
+
+# Call the configure-maven here
+source "${KOGITO_HOME}"/launch/configure-maven.sh
+configure
+
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    printenv
+fi
+
+"${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
+io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":create ${QUARKUS_CREATE_ARGS} \
+-DprojectGroupId="${PROJECT_GROUP_ID}" \
+-DprojectArtifactId="${PROJECT_ARTIFACT_ID}" \
+-DprojectVersionId="${PROJECT_VERSION}" \
+-DplatformVersion="${QUARKUS_VERSION}" \
+-Dextensions="${quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing}"
+
+cd "${PROJECT_ARTIFACT_ID}"
+
+"${MAVEN_HOME}"/bin/mvn ${MAVEN_ARGS_APPEND} -U -B clean install -DskipTests -s "${MAVEN_SETTINGS_PATH}" -Dquarkus.container-image.build=false
diff --git a/modules/kogito-swf-builder/configure.sh b/modules/kogito-swf-builder/configure.sh
new file mode 100644
index 00000000000..064d64b71d9
--- /dev/null
+++ b/modules/kogito-swf-builder/configure.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ADDED_DIR="${SCRIPT_DIR}"/added
+LAUNCH_DIR="${KOGITO_HOME}"/launch
+
+cp -v "${ADDED_DIR}"/create-app.sh "${LAUNCH_DIR}"
+cp -v "${ADDED_DIR}"/add-extension.sh "${LAUNCH_DIR}"
+cp -v "${ADDED_DIR}"/build-app.sh "${LAUNCH_DIR}"
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf-builder/module.yaml b/modules/kogito-swf-builder/module.yaml
new file mode 100644
index 00000000000..570b85b3809
--- /dev/null
+++ b/modules/kogito-swf-builder/module.yaml
@@ -0,0 +1,31 @@
+schema_version: 1
+name: org.kie.kogito.swf.builder
+version: "2.0.0-snapshot"
+description: "Kogito Serverless Workflow builder with required extensions"
+
+envs:
+  - name: PROJECT_GROUP_ID
+    value: "org.acme"
+    description: Please do not change
+  - name: PROJECT_ARTIFACT_ID
+    value: "serverless-workflow-project"
+    description: Please do not change
+  - name: PROJECT_VERSION
+    value: "1.0.0-SNAPSHOT"
+    description: Please do not change
+  - name: QUARKUS_VERSION
+    value: "2.13.0.Final"
+    description: Please do not change
+  - name: QUARKUS_EXTENSIONS
+    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
+    description: To add extension to your application
+  - name: QUARKUS_CREATE_ARGS
+    example: -DnoCode
+    description: To use only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
+  - name: QUARKUS_ADD_EXTENSION_ARGS
+    description: To use only if you plan to use the ${KOGITO_HOME}/launch/add-extension.sh
+
+execute:
+  - script: configure.sh
+  - script: added/create-app.sh
+    user: kogito
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 97cec0135ed..465dcf9878c 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -17,6 +17,7 @@
 @quay.io/kiegroup/kogito-jobs-service-postgresql
 @quay.io/kiegroup/kogito-management-console
 @quay.io/kiegroup/kogito-task-console
+@quay.io/kiegroup/kogito-swf-builder
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 @rhpam-7/rhpam-kogito-builder-rhel8
 @rhpam-7/rhpam-kogito-runtime-native-rhel8
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
new file mode 100644
index 00000000000..83e6df772ba
--- /dev/null
+++ b/tests/features/kogito-swf-builder.feature
@@ -0,0 +1,16 @@
+@quay.io/kiegroup/kogito-swf-builder
+Feature: SWF and Quarkus installation
+
+  Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
+    When container is started with command bash
+    Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.13.0.Final/quarkus-bom-2.13.0.Final.pom should exist
+      And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
+
+
+  Scenario: Verify if a build run correctly
+    When container is started with command bash
+    Then file /home/kogito/serverless-workflow-project/target/quarkus-app/quarkus-run.jar should exist
+      And file /home/kogito/serverless-workflow-project/target/classes/greet.sw.json should exist
+
+
diff --git a/tests/test-apps/swf-builder/Dockerfile b/tests/test-apps/swf-builder/Dockerfile
new file mode 100644
index 00000000000..ae2a9ed147c
--- /dev/null
+++ b/tests/test-apps/swf-builder/Dockerfile
@@ -0,0 +1,30 @@
+FROM quay.io/kiegroup/kogito-swf-builder:2.0 AS builder
+
+# Copy from build context to resources directory
+COPY * ./resources/
+
+# Build app with given resources
+RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
+
+#=============================
+# Runtime Run
+#=============================
+FROM registry.access.redhat.com/ubi8/openjdk-11:latest
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+# Default name is 'serverless-workflow-project'
+ARG PROJECT_ARTIFACT_ID='serverless-workflow-project'
+
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/lib/ /deployments/lib/
+COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/*.jar /deployments/
+COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/app/ /deployments/app/
+COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/quarkus/ /deployments/quarkus/
+
+HEALTHCHECK --interval=2s --timeout=4s CMD curl --fail http://localhost:8080 || exit 1
+
+EXPOSE 8080
+USER 185
+ENV AB_JOLOKIA_OFF=""
+ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
diff --git a/tests/test-apps/swf-builder/greet.sw.json b/tests/test-apps/swf-builder/greet.sw.json
new file mode 100644
index 00000000000..a619b3b8bc7
--- /dev/null
+++ b/tests/test-apps/swf-builder/greet.sw.json
@@ -0,0 +1,67 @@
+{
+  "id": "jsongreet",
+  "version": "1.0",
+  "name": "Greeting workflow",
+  "description": "JSON based greeting workflow",
+  "start": "ChooseOnLanguage",
+  "functions": [
+    {
+      "name": "greetFunction",
+      "type": "custom",
+      "operation": "sysout"
+    }
+  ],
+  "states": [
+    {
+      "name": "ChooseOnLanguage",
+      "type": "switch",
+      "dataConditions": [
+        {
+          "condition": "${ .language == \"English\" }",
+          "transition": "GreetInEnglish"
+        },
+        {
+          "condition": "${ .language == \"Spanish\" }",
+          "transition": "GreetInSpanish"
+        }
+      ],
+      "defaultCondition": {
+        "transition": "GreetInEnglish"
+      }
+    },
+    {
+      "name": "GreetInEnglish",
+      "type": "inject",
+      "data": {
+        "greeting": "Hello from JSON Workflow, "
+      },
+      "transition": "GreetPerson"
+    },
+    {
+      "name": "GreetInSpanish",
+      "type": "inject",
+      "data": {
+        "greeting": "Saludos desde JSON Workflow, "
+      },
+      "transition": "GreetPerson"
+    },
+    {
+      "name": "GreetPerson",
+      "type": "operation",
+      "actions": [
+        {
+          "name": "greetAction",
+          "functionRef": {
+            "refName": "greetFunction",
+            "arguments": {
+              "message": ".greeting+.name"
+            }
+          }
+        }
+      ],
+      "end": {
+        "terminate": true
+      }
+    }
+  ]
+}
diff --git a/tests/test-apps/swf-builder/swf-builder-test.sh b/tests/test-apps/swf-builder/swf-builder-test.sh
new file mode 100755
index 00000000000..0796fade5e6
--- /dev/null
+++ b/tests/test-apps/swf-builder/swf-builder-test.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+docker build "${script_dir_path}" -t quay.io/kiegroup/swf-test:latest
+
+docker run -d -p 8080:8080 quay.io/kiegroup/swf-test:latest
+
+container_name=$(docker ps -n 1 --format '{{.Names}}')
+container_id=$(docker ps -n 1 --format '{{.ID}}')
+echo "Got container name ${container_name}"
+echo "Got container id ${container_id}"
+
+set -x
+CONTAINER_NAME="${container_name}" timeout 10s bash -c 'while [[ "$(docker inspect -f {{.State.Health.Status}} ${CONTAINER_NAME})" != "healthy" ]] ; do sleep 2 &&  docker inspect -f {{.State.Health.Status}} ${CONTAINER_NAME}; done'
+status_code=$? 
+if [[ "${status_code}" != 0 ]]; then
+  echo "ERROR: Container status: $(docker inspect -f {{.State.Health.Status}} ${container_name})"
+else
+  curl -X POST -H 'Content-Type:application/json' -H 'Accept:application/json' -d '{"workflowdata" : {"name": "John", "language": "English"}}' http://localhost:8080/jsongreet
+  status_code=$?
+fi
+
+docker kill ${container_id}
+
+exit ${status_code}
\ No newline at end of file

From 8ce3039f74460f4bbaf44386f45db7ce5fe789c6 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 18 Oct 2022 10:21:20 +0200
Subject: [PATCH 478/709] Correct DSL GHA (#1353)

---
 .github/workflows/jenkins-tests-PR.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index af60e1ae062..0c0b62636fc 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -18,5 +18,5 @@ jobs:
       uses: kiegroup/kogito-pipelines/.ci/actions/dsl-tests@main
       with:
         main-config-file-repo: kiegroup/kogito-pipelines
-        main-config-file-ref: main
         main-config-file-path: dsl/config/main.yaml
+        branch-config-file-repo: kiegroup/kogito-pipelines

From 830d0d292c71bea8b54ddc93a33b8d5164351ed9 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 20 Oct 2022 10:36:42 +0200
Subject: [PATCH 479/709] KOGITO-8143 Include shell testing into CI (#1354)

---
 Makefile                                        |  1 +
 .../kogito-swf-builder/build-and-run.sh}        |  3 ++-
 .../kogito-swf-builder/resources}/Dockerfile    |  0
 .../kogito-swf-builder/resources}/greet.sw.json |  0
 tests/shell/kogito-swf-builder/run.sh           |  7 +++++++
 tests/shell/run.sh                              | 17 +++++++++++++++++
 6 files changed, 27 insertions(+), 1 deletion(-)
 rename tests/{test-apps/swf-builder/swf-builder-test.sh => shell/kogito-swf-builder/build-and-run.sh} (91%)
 rename tests/{test-apps/swf-builder => shell/kogito-swf-builder/resources}/Dockerfile (100%)
 rename tests/{test-apps/swf-builder => shell/kogito-swf-builder/resources}/greet.sw.json (100%)
 create mode 100755 tests/shell/kogito-swf-builder/run.sh
 create mode 100755 tests/shell/run.sh

diff --git a/Makefile b/Makefile
index be5ef4b8792..129d0e61cd4 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ endif
 # if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave ${test_options}
+	tests/shell/run.sh ${image_name}
 endif
 ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
diff --git a/tests/test-apps/swf-builder/swf-builder-test.sh b/tests/shell/kogito-swf-builder/build-and-run.sh
similarity index 91%
rename from tests/test-apps/swf-builder/swf-builder-test.sh
rename to tests/shell/kogito-swf-builder/build-and-run.sh
index 0796fade5e6..29bc2dec83d 100755
--- a/tests/test-apps/swf-builder/swf-builder-test.sh
+++ b/tests/shell/kogito-swf-builder/build-and-run.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
+set -e
 
 script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-docker build "${script_dir_path}" -t quay.io/kiegroup/swf-test:latest
+docker build "${script_dir_path}"/resources -t quay.io/kiegroup/swf-test:latest
 
 docker run -d -p 8080:8080 quay.io/kiegroup/swf-test:latest
 
diff --git a/tests/test-apps/swf-builder/Dockerfile b/tests/shell/kogito-swf-builder/resources/Dockerfile
similarity index 100%
rename from tests/test-apps/swf-builder/Dockerfile
rename to tests/shell/kogito-swf-builder/resources/Dockerfile
diff --git a/tests/test-apps/swf-builder/greet.sw.json b/tests/shell/kogito-swf-builder/resources/greet.sw.json
similarity index 100%
rename from tests/test-apps/swf-builder/greet.sw.json
rename to tests/shell/kogito-swf-builder/resources/greet.sw.json
diff --git a/tests/shell/kogito-swf-builder/run.sh b/tests/shell/kogito-swf-builder/run.sh
new file mode 100755
index 00000000000..71e14b69c50
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/run.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -e
+
+script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+echo "--- Test: Build And Run"
+"${script_dir_path}"/build-and-run.sh
\ No newline at end of file
diff --git a/tests/shell/run.sh b/tests/shell/run.sh
new file mode 100755
index 00000000000..f174fc5b69a
--- /dev/null
+++ b/tests/shell/run.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -e
+
+script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+image_name=$1
+
+if [ -z "${image_name}" ]; then
+  echo "Please provide the image name"
+  exit 1
+fi
+
+if [ -d  "${script_dir_path}/${image_name}" ]; then
+  "${script_dir_path}/${image_name}"/run.sh
+else
+  echo "No shell test to run for image ${image_name}"
+fi
\ No newline at end of file

From cacaa169720c0ed0de4461f76f7cd5c80a59fdcb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 20 Oct 2022 11:26:26 +0200
Subject: [PATCH 480/709] KOGITO-8144 Setup quarkus version script/job (#1355)

---
 .ci/jenkins/dsl/jobs.groovy                   |   5 +
 kogito-data-index-ephemeral-overrides.yaml    |  44 +++---
 kogito-data-index-infinispan-overrides.yaml   |  42 +++---
 kogito-data-index-mongodb-overrides.yaml      |  42 +++---
 kogito-data-index-oracle-overrides.yaml       |  42 +++---
 kogito-data-index-postgresql-overrides.yaml   |  42 +++---
 kogito-explainability-overrides.yaml          |  40 +++---
 kogito-jit-runner-overrides.yaml              |  40 +++---
 kogito-jobs-service-ephemeral-overrides.yaml  |  52 +++----
 kogito-jobs-service-infinispan-overrides.yaml |  52 +++----
 kogito-jobs-service-mongodb-overrides.yaml    |  52 +++----
 kogito-jobs-service-postgresql-overrides.yaml |  52 +++----
 kogito-management-console-overrides.yaml      |  40 +++---
 kogito-runtime-jvm-overrides.yaml             |  60 ++++----
 kogito-runtime-native-overrides.yaml          |  52 +++----
 kogito-s2i-builder-overrides.yaml             |  90 ++++++------
 kogito-swf-builder-overrides.yaml             |   4 +-
 kogito-task-console-overrides.yaml            |  40 +++---
 kogito-trusty-infinispan-overrides.yaml       |  42 +++---
 kogito-trusty-postgresql-overrides.yaml       |  42 +++---
 kogito-trusty-redis-overrides.yaml            |  42 +++---
 kogito-trusty-ui-overrides.yaml               |  42 +++---
 modules/kogito-custom-truststore/module.yaml  |   2 +-
 .../kogito-data-index-infinispan/module.yaml  |   4 +-
 modules/kogito-data-index-mongodb/module.yaml |   4 +-
 modules/kogito-data-index-oracle/module.yaml  |   4 +-
 .../kogito-data-index-postgresql/module.yaml  |   4 +-
 modules/kogito-dynamic-resources/module.yaml  |   6 +-
 modules/kogito-explainability/module.yaml     |   8 +-
 modules/kogito-graalvm-scripts/module.yaml    |   2 +-
 modules/kogito-jit-runner/module.yaml         |   4 +-
 .../kogito-jobs-service-ephemeral/module.yaml |   4 +-
 .../module.yaml                               |   4 +-
 .../kogito-jobs-service-mongodb/module.yaml   |   4 +-
 .../module.yaml                               |   4 +-
 modules/kogito-swf-builder/module.yaml        |   2 +-
 modules/kogito-task-console/module.yaml       |   4 +-
 modules/kogito-trusty-infinispan/module.yaml  |   4 +-
 modules/kogito-trusty-postgresql/module.yaml  |   4 +-
 modules/kogito-trusty-redis/module.yaml       |   4 +-
 modules/kogito-trusty-ui/module.yaml          |   4 +-
 scripts/common.py                             | 135 +++++++++++++++---
 scripts/update-quarkus-version.py             |  47 ++++++
 tests/features/kogito-swf-builder.feature     |   2 +-
 44 files changed, 686 insertions(+), 533 deletions(-)
 create mode 100644 scripts/update-quarkus-version.py

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 0f25ec1d4c1..d829fa49d7b 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -33,6 +33,11 @@ if (Utils.isProductizedBranch(this)) {
     setupProdUpdateVersionJob()
 }
 
+KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
+    'python3 scripts/update-quarkus-version.py --bump-to %new_version%'
+])
+
+
 /////////////////////////////////////////////////////////////////
 // Methods
 /////////////////////////////////////////////////////////////////
diff --git a/kogito-data-index-ephemeral-overrides.yaml b/kogito-data-index-ephemeral-overrides.yaml
index d91d4e4e22b..a94b26f602e 100644
--- a/kogito-data-index-ephemeral-overrides.yaml
+++ b/kogito-data-index-ephemeral-overrides.yaml
@@ -4,37 +4,37 @@ name: "quay.io/kiegroup/kogito-data-index-ephemeral"
 description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
-- name: "io.k8s.display-name"
-  value: "Kogito Data Index Service - ephemeral PostgreSQL"
-- name: "io.openshift.tags"
-  value: "kogito,data-index,data-index-ephemeral"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
+  - name: "io.k8s.display-name"
+    value: "Kogito Data Index Service - ephemeral PostgreSQL"
+  - name: "io.openshift.tags"
+    value: "kogito,data-index,data-index-ephemeral"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.dataindex.ephemeral
-    version: "2.0.0-snapshot"
-  - name: org.kie.kogito.dataindex.common
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.dataindex.ephemeral
+      version: "2.0.0-snapshot"
+    - name: org.kie.kogito.dataindex.common
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-data-index-infinispan-overrides.yaml b/kogito-data-index-infinispan-overrides.yaml
index d21add9f063..bf6b2bfbbf9 100644
--- a/kogito-data-index-infinispan-overrides.yaml
+++ b/kogito-data-index-infinispan-overrides.yaml
@@ -4,16 +4,16 @@ name: "quay.io/kiegroup/kogito-data-index-infinispan"
 description: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
-- name: "io.k8s.display-name"
-  value: "Kogito Data Index Service - Infinispan"
-- name: "io.openshift.tags"
-  value: "kogito,data-index,data-index-infinispan"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
+  - name: "io.k8s.display-name"
+    value: "Kogito Data Index Service - Infinispan"
+  - name: "io.openshift.tags"
+    value: "kogito,data-index,data-index-infinispan"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
@@ -39,20 +39,20 @@ envs:
     description: "Sets SASL mechanism used by authentication"
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.dataindex.infinispan
-  - name: org.kie.kogito.dataindex.common
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.dataindex.infinispan
+    - name: org.kie.kogito.dataindex.common
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-data-index-mongodb-overrides.yaml b/kogito-data-index-mongodb-overrides.yaml
index dfe3720b9c4..cdc06602fb7 100644
--- a/kogito-data-index-mongodb-overrides.yaml
+++ b/kogito-data-index-mongodb-overrides.yaml
@@ -4,36 +4,36 @@ name: "quay.io/kiegroup/kogito-data-index-mongodb"
 description: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
-- name: "io.k8s.display-name"
-  value: "Kogito Data Index Service - Mongodb"
-- name: "io.openshift.tags"
-  value: "kogito,data-index,data-index-mongodb"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
+  - name: "io.k8s.display-name"
+    value: "Kogito Data Index Service - Mongodb"
+  - name: "io.openshift.tags"
+    value: "kogito,data-index,data-index-mongodb"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.dataindex.mongodb
-  - name: org.kie.kogito.dataindex.common
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.dataindex.mongodb
+    - name: org.kie.kogito.dataindex.common
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-data-index-oracle-overrides.yaml b/kogito-data-index-oracle-overrides.yaml
index 6f167e03c18..6432f60ae92 100644
--- a/kogito-data-index-oracle-overrides.yaml
+++ b/kogito-data-index-oracle-overrides.yaml
@@ -4,36 +4,36 @@ name: "quay.io/kiegroup/kogito-data-index-oracle"
 description: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
-- name: "io.k8s.display-name"
-  value: "Kogito Data Index Service - Oracle"
-- name: "io.openshift.tags"
-  value: "kogito,data-index,data-index-oracle"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
+  - name: "io.k8s.display-name"
+    value: "Kogito Data Index Service - Oracle"
+  - name: "io.openshift.tags"
+    value: "kogito,data-index,data-index-oracle"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.dataindex.oracle
-  - name: org.kie.kogito.dataindex.common
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.dataindex.oracle
+    - name: org.kie.kogito.dataindex.common
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-data-index-postgresql-overrides.yaml b/kogito-data-index-postgresql-overrides.yaml
index f5af07500d1..f0e924a483c 100644
--- a/kogito-data-index-postgresql-overrides.yaml
+++ b/kogito-data-index-postgresql-overrides.yaml
@@ -4,36 +4,36 @@ name: "quay.io/kiegroup/kogito-data-index-postgresql"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
-- name: "io.k8s.display-name"
-  value: "Kogito Data Index Service - PostgreSQL"
-- name: "io.openshift.tags"
-  value: "kogito,data-index,data-index-postgresql"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
+  - name: "io.k8s.display-name"
+    value: "Kogito Data Index Service - PostgreSQL"
+  - name: "io.openshift.tags"
+    value: "kogito,data-index,data-index-postgresql"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.dataindex.postgresql
-  - name: org.kie.kogito.dataindex.common
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.dataindex.postgresql
+    - name: org.kie.kogito.dataindex.common
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-explainability-overrides.yaml b/kogito-explainability-overrides.yaml
index 7b69e43684a..2f086172092 100644
--- a/kogito-explainability-overrides.yaml
+++ b/kogito-explainability-overrides.yaml
@@ -4,16 +4,16 @@ name: "quay.io/kiegroup/kogito-explainability"
 description: "Runtime image for Kogito Explainability Service"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Explainability Service"
-- name: "io.k8s.display-name"
-  value: "Kogito Explainability Service"
-- name: "io.openshift.tags"
-  value: "kogito,explainability"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Explainability Service"
+  - name: "io.k8s.display-name"
+    value: "Kogito Explainability Service"
+  - name: "io.openshift.tags"
+    value: "kogito,explainability"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
@@ -23,19 +23,19 @@ envs:
     example: "REST"
     description: "Defines which kind of communication should be used by the Explainability Container: rest api or kafka events."
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.explainability
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.explainability
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jit-runner-overrides.yaml b/kogito-jit-runner-overrides.yaml
index 1320ea28d4f..b44a38886f1 100644
--- a/kogito-jit-runner-overrides.yaml
+++ b/kogito-jit-runner-overrides.yaml
@@ -4,16 +4,16 @@ name: "quay.io/kiegroup/kogito-jit-runner"
 description: "Runtime image for Kogito JIT Runner"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito JIT Runner"
-- name: "io.k8s.display-name"
-  value: "Kogito JIT Runner"
-- name: "io.openshift.tags"
-  value: "kogito,jit-runner"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito JIT Runner"
+  - name: "io.k8s.display-name"
+    value: "Kogito JIT Runner"
+  - name: "io.openshift.tags"
+    value: "kogito,jit-runner"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
@@ -21,19 +21,19 @@ envs:
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.jit-runner
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.jit-runner
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jobs-service-ephemeral-overrides.yaml b/kogito-jobs-service-ephemeral-overrides.yaml
index 48016e17bc8..ccd38724e54 100644
--- a/kogito-jobs-service-ephemeral-overrides.yaml
+++ b/kogito-jobs-service-ephemeral-overrides.yaml
@@ -4,39 +4,39 @@ name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
 description: "Runtime image for Kogito in memory Jobs Service"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito in memory Jobs Service"
-- name: "io.k8s.display-name"
-  value: "Kogito in memory Jobs Service"
-- name: "io.openshift.tags"
-  value: "kogito,jobs-service-ephemeral"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito in memory Jobs Service"
+  - name: "io.k8s.display-name"
+    value: "Kogito in memory Jobs Service"
+  - name: "io.openshift.tags"
+    value: "kogito,jobs-service-ephemeral"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: "ENABLE_EVENTS"
-  example: "true"
-  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "ENABLE_EVENTS"
+    example: "true"
+    description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.jobs.service.ephemeral
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.jobs.service.ephemeral
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jobs-service-infinispan-overrides.yaml b/kogito-jobs-service-infinispan-overrides.yaml
index 9c288372e7e..526ec6fb0fe 100644
--- a/kogito-jobs-service-infinispan-overrides.yaml
+++ b/kogito-jobs-service-infinispan-overrides.yaml
@@ -4,39 +4,39 @@ name: "quay.io/kiegroup/kogito-jobs-service-infinispan"
 description: "Runtime image for Kogito Jobs Service based on Infinispan"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Jobs Service based on Infinispan"
-- name: "io.k8s.display-name"
-  value: "Kogito Jobs Service based on Infinispan"
-- name: "io.openshift.tags"
-  value: "kogito,jobs-service-infinispan"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Jobs Service based on Infinispan"
+  - name: "io.k8s.display-name"
+    value: "Kogito Jobs Service based on Infinispan"
+  - name: "io.openshift.tags"
+    value: "kogito,jobs-service-infinispan"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: "ENABLE_EVENTS"
-  example: "true"
-  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "ENABLE_EVENTS"
+    example: "true"
+    description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.jobs.service.infinispan
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.jobs.service.infinispan
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jobs-service-mongodb-overrides.yaml b/kogito-jobs-service-mongodb-overrides.yaml
index d5b630aec5c..1e0ab551f60 100644
--- a/kogito-jobs-service-mongodb-overrides.yaml
+++ b/kogito-jobs-service-mongodb-overrides.yaml
@@ -4,39 +4,39 @@ name: "quay.io/kiegroup/kogito-jobs-service-mongodb"
 description: "Runtime image for Kogito Jobs Service based on MongoDB"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Jobs Service based on MongoDB"
-- name: "io.k8s.display-name"
-  value: "Kogito Jobs Service based on MongoDB"
-- name: "io.openshift.tags"
-  value: "kogito,jobs-service-mongodb"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Jobs Service based on MongoDB"
+  - name: "io.k8s.display-name"
+    value: "Kogito Jobs Service based on MongoDB"
+  - name: "io.openshift.tags"
+    value: "kogito,jobs-service-mongodb"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: "ENABLE_EVENTS"
-  example: "true"
-  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "ENABLE_EVENTS"
+    example: "true"
+    description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.jobs.service.mongodb
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.jobs.service.mongodb
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jobs-service-postgresql-overrides.yaml b/kogito-jobs-service-postgresql-overrides.yaml
index bebe3fe65e7..a79405a3051 100644
--- a/kogito-jobs-service-postgresql-overrides.yaml
+++ b/kogito-jobs-service-postgresql-overrides.yaml
@@ -4,39 +4,39 @@ name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
 description: "Runtime image for Kogito Jobs Service based on Postgresql"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Jobs Service based on Postgresql"
-- name: "io.k8s.display-name"
-  value: "Kogito Jobs Service based on Postgresql"
-- name: "io.openshift.tags"
-  value: "kogito,jobs-service-postgresql"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Jobs Service based on Postgresql"
+  - name: "io.k8s.display-name"
+    value: "Kogito Jobs Service based on Postgresql"
+  - name: "io.openshift.tags"
+    value: "kogito,jobs-service-postgresql"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: "ENABLE_EVENTS"
-  example: "true"
-  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "ENABLE_EVENTS"
+    example: "true"
+    description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.jobs.service.postgresql
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.jobs.service.postgresql
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-overrides.yaml
index 17af2e46f28..5b0b0f68308 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-overrides.yaml
@@ -4,16 +4,16 @@ name: "quay.io/kiegroup/kogito-management-console"
 description: "Runtime image for Kogito Management Console"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Management Console, manage your Business Process easily."
-- name: "io.k8s.display-name"
-  value: "Kogito Management Console"
-- name: "io.openshift.tags"
-  value: "kogito,management,management-console"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Management Console, manage your Business Process easily."
+  - name: "io.k8s.display-name"
+    value: "Kogito Management Console"
+  - name: "io.openshift.tags"
+    value: "kogito,management,management-console"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
@@ -24,19 +24,19 @@ envs:
     description: "Data Index service address, defaults to http://localhost:8180."
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.management.console
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.management.console
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index fbd1d962171..eb3c9a91385 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -4,43 +4,43 @@ name: "quay.io/kiegroup/kogito-runtime-jvm"
 description: "Runtime image for Kogito based on Quarkus or Springboot JVM image"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
-- name: "io.k8s.display-name"
-  value: "Kogito based on Quarkus or Spring Boot JVM image"
-- name: "io.openshift.tags"
-  value: "runtime,kogito,quarkus,springboot,jvm"
-- name: "io.openshift.s2i.assemble-input-files"
-  value: "/home/kogito/bin"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
+  - name: "io.k8s.display-name"
+    value: "Kogito based on Quarkus or Spring Boot JVM image"
+  - name: "io.openshift.tags"
+    value: "runtime,kogito,quarkus,springboot,jvm"
+  - name: "io.openshift.s2i.assemble-input-files"
+    value: "/home/kogito/bin"
 
 envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: "RUNTIME_TYPE"
-  example: "springboot"
-  description: "Defines the runtime type of your Kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
-- name: JAVA_OPTIONS
-  example: "-Dquarkus.log.level=DEBUG"
-  description: JVM options passed to the Java command.
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "RUNTIME_TYPE"
+    example: "springboot"
+    description: "Defines the runtime type of your Kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
+  - name: JAVA_OPTIONS
+    example: "-Dquarkus.log.level=DEBUG"
+    description: JVM options passed to the Java command.
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.s2i.core
-  - name: org.kie.kogito.runtime.jvm
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.s2i.core
+    - name: org.kie.kogito.runtime.jvm
+    - name: org.kie.kogito.security.custom.truststores
 
 ## s2i build . quay.io/kiegroup/kogito-s2i-builder:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-overrides.yaml
index 5917b7f43da..52f8b5bf99d 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -4,39 +4,39 @@ name: "quay.io/kiegroup/kogito-runtime-native"
 description: "Runtime image for Kogito based on Quarkus native image"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito based on Quarkus native image"
-- name: "io.k8s.display-name"
-  value: "Kogito based on Quarkus native image"
-- name: "io.openshift.tags"
-  value: "runtime,kogito,quarkus,native"
-- name: "io.openshift.s2i.assemble-input-files"
-  value: "/home/kogito/bin"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito based on Quarkus native image"
+  - name: "io.k8s.display-name"
+    value: "Kogito based on Quarkus native image"
+  - name: "io.openshift.tags"
+    value: "runtime,kogito,quarkus,native"
+  - name: "io.openshift.s2i.assemble-input-files"
+    value: "/home/kogito/bin"
 
 envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: JAVA_OPTIONS
-  example: "-Dquarkus.log.level=DEBUG"
-  description: JVM options passed to the Java command.
-- name: BINARY_BUILD
-  example: "true"
-  description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: JAVA_OPTIONS
+    example: "-Dquarkus.log.level=DEBUG"
+    description: JVM options passed to the Java command.
+  - name: BINARY_BUILD
+    example: "true"
+    description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.s2i.core
-  - name: org.kie.kogito.runtime.native
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.s2i.core
+    - name: org.kie.kogito.runtime.native
 
 ## s2i build . quay.io/kiegroup/kogito-s2i-builder:latest kogitotest:10.0 -e RUNTIME_TYPE=quarkus -e NATIVE=true --runtime-image quay.io/kiegroup/kogito-runtime-native:latest
 ## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
diff --git a/kogito-s2i-builder-overrides.yaml b/kogito-s2i-builder-overrides.yaml
index 32e09cf8c8c..4aafa4850f2 100644
--- a/kogito-s2i-builder-overrides.yaml
+++ b/kogito-s2i-builder-overrides.yaml
@@ -4,62 +4,62 @@ name: "quay.io/kiegroup/kogito-s2i-builder"
 description: "Platform for building Kogito based on Quarkus or Springboot"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Platform for building Kogito based on Quarkus or Spring Boot"
-- name: "io.k8s.display-name"
-  value: "Kogito based on Quarkus or Spring Boot"
-- name: "io.openshift.tags"
-  value: "s2i-builder,kogito,quarkus,springboot"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Platform for building Kogito based on Quarkus or Spring Boot"
+  - name: "io.k8s.display-name"
+    value: "Kogito based on Quarkus or Spring Boot"
+  - name: "io.openshift.tags"
+    value: "s2i-builder,kogito,quarkus,springboot"
 
 envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: "RUNTIME_TYPE"
-  example: "springboot"
-  description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus. Applies only at build time, except for binary builds, for runtime and binary builds, it is populated during runtime by identifying the runtime type based on the provided application jar."
-- name: NATIVE
-  example: true
-  description: If set to true, perform a native build. Only supported for RUNTIME_TYPE is 'quarkus'.
-- name: JAVA_OPTIONS
-  example: "-Dquarkus.log.level=DEBUG"
-  description: JVM options passed to the Java command.
-- name: MAVEN_ARGS_APPEND
-  example: "-pl mymodule -am"
-  description: Additional Maven arguments
-- name: ARTIFACT_DIR
-  example: mymodule/target
-  description:  Path to target/ where the jar files are created for multi-module builds
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "RUNTIME_TYPE"
+    example: "springboot"
+    description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus. Applies only at build time, except for binary builds, for runtime and binary builds, it is populated during runtime by identifying the runtime type based on the provided application jar."
+  - name: NATIVE
+    example: true
+    description: If set to true, perform a native build. Only supported for RUNTIME_TYPE is 'quarkus'.
+  - name: JAVA_OPTIONS
+    example: "-Dquarkus.log.level=DEBUG"
+    description: JVM options passed to the Java command.
+  - name: MAVEN_ARGS_APPEND
+    example: "-pl mymodule -am"
+    description: Additional Maven arguments
+  - name: ARTIFACT_DIR
+    example: mymodule/target
+    description: Path to target/ where the jar files are created for multi-module builds
 
 ports:
   - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.graalvm.installer
-    version: "21.3.1-java-11"
-  - name: org.kie.kogito.graalvm.scripts
-  - name: org.kie.kogito.openjdk
-    version: "11"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.maven
-    version: "3.8.6"
-  - name: org.kie.kogito.s2i.core
-  - name: org.kie.kogito.s2i.builder
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.graalvm.installer
+      version: "21.3.1-java-11"
+    - name: org.kie.kogito.graalvm.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven
+      version: "3.8.6"
+    - name: org.kie.kogito.s2i.core
+    - name: org.kie.kogito.s2i.builder
 
 packages:
   install:
-  - bc
-  - gcc
-  - gcc-c++
-  - glibc-devel
-  - zlib-devel
+    - bc
+    - gcc
+    - gcc-c++
+    - glibc-devel
+    - zlib-devel
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
index e3b01897014..66f93c2575f 100644
--- a/kogito-swf-builder-overrides.yaml
+++ b/kogito-swf-builder-overrides.yaml
@@ -5,7 +5,7 @@ description: "Kogito Serverless Workflow base builder with Quarkus extensions li
 
 labels:
   - name: "org.quarkus.version"
-    value: "2.13.0.Final"
+    value: "2.13.2.Final"
 
 modules:
   install:
@@ -22,4 +22,4 @@ modules:
 
 run:
   workdir: "/home/kogito"
-  user: 1001
\ No newline at end of file
+  user: 1001
diff --git a/kogito-task-console-overrides.yaml b/kogito-task-console-overrides.yaml
index f12e3a3cfa7..8f5bb150397 100644
--- a/kogito-task-console-overrides.yaml
+++ b/kogito-task-console-overrides.yaml
@@ -4,16 +4,16 @@ name: "quay.io/kiegroup/kogito-task-console"
 description: "Runtime image for Kogito Task Console"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Task Console, manage your Business Process easily."
-- name: "io.k8s.display-name"
-  value: "Kogito Task Console"
-- name: "io.openshift.tags"
-  value: "kogito,task,task-console"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Task Console, manage your Business Process easily."
+  - name: "io.k8s.display-name"
+    value: "Kogito Task Console"
+  - name: "io.openshift.tags"
+    value: "kogito,task,task-console"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
@@ -24,19 +24,19 @@ envs:
     description: "Data Index service address, defaults to http://localhost:8180."
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.task.console
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.task.console
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-trusty-infinispan-overrides.yaml b/kogito-trusty-infinispan-overrides.yaml
index 215b9bd0d1a..af4662c7b4b 100644
--- a/kogito-trusty-infinispan-overrides.yaml
+++ b/kogito-trusty-infinispan-overrides.yaml
@@ -4,16 +4,16 @@ name: "quay.io/kiegroup/kogito-trusty-infinispan"
 description: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
-- name: "io.k8s.display-name"
-  value: "Kogito Trusty Service - Infinispan"
-- name: "io.openshift.tags"
-  value: "kogito,trusty,trusty-infinispan"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
+  - name: "io.k8s.display-name"
+    value: "Kogito Trusty Service - Infinispan"
+  - name: "io.openshift.tags"
+    value: "kogito,trusty,trusty-infinispan"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
@@ -39,20 +39,20 @@ envs:
     description: "Sets SASL mechanism used by authentication"
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.trusty.infinispan
-  - name: org.kie.kogito.trusty.common
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.trusty.infinispan
+    - name: org.kie.kogito.trusty.common
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-trusty-postgresql-overrides.yaml b/kogito-trusty-postgresql-overrides.yaml
index b08234ee217..c99a670a05a 100644
--- a/kogito-trusty-postgresql-overrides.yaml
+++ b/kogito-trusty-postgresql-overrides.yaml
@@ -4,36 +4,36 @@ name: "quay.io/kiegroup/kogito-trusty-postgresql"
 description: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
-- name: "io.k8s.display-name"
-  value: "Kogito Trusty Service - PostgreSQL"
-- name: "io.openshift.tags"
-  value: "kogito,trusty,trusty-postgresql"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
+  - name: "io.k8s.display-name"
+    value: "Kogito Trusty Service - PostgreSQL"
+  - name: "io.openshift.tags"
+    value: "kogito,trusty,trusty-postgresql"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.trusty.postgresql
-  - name: org.kie.kogito.trusty.common
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.trusty.postgresql
+    - name: org.kie.kogito.trusty.common
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-trusty-redis-overrides.yaml b/kogito-trusty-redis-overrides.yaml
index 6f2e150b1de..bbde66b9e0f 100644
--- a/kogito-trusty-redis-overrides.yaml
+++ b/kogito-trusty-redis-overrides.yaml
@@ -4,16 +4,16 @@ name: "quay.io/kiegroup/kogito-trusty-redis"
 description: "Runtime image for Kogito Trusty Service for Redis persistence provider"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Trusty Service for Redis persistence provider"
-- name: "io.k8s.display-name"
-  value: "Kogito Trusty Service - Redis"
-- name: "io.openshift.tags"
-  value: "kogito,trusty,trusty-redis"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Trusty Service for Redis persistence provider"
+  - name: "io.k8s.display-name"
+    value: "Kogito Trusty Service - Redis"
+  - name: "io.openshift.tags"
+    value: "kogito,trusty,trusty-redis"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
@@ -23,20 +23,20 @@ envs:
     example: "http://localhost:6379"
     description: "The URL of the RediSearch cluster."
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.trusty.redis
-  - name: org.kie.kogito.trusty.common
-  - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.trusty.redis
+    - name: org.kie.kogito.trusty.common
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-trusty-ui-overrides.yaml b/kogito-trusty-ui-overrides.yaml
index 529ee90f432..164ce9a088d 100644
--- a/kogito-trusty-ui-overrides.yaml
+++ b/kogito-trusty-ui-overrides.yaml
@@ -4,16 +4,16 @@ name: "quay.io/kiegroup/kogito-trusty-ui"
 description: "Runtime image for Kogito Trusty UI"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Trusty UI, manage your Business Process easily."
-- name: "io.k8s.display-name"
-  value: "Kogito Trusty UI"
-- name: "io.openshift.tags"
-  value: "kogito,trusty,trusty-ui"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Trusty UI, manage your Business Process easily."
+  - name: "io.k8s.display-name"
+    value: "Kogito Trusty UI"
+  - name: "io.openshift.tags"
+    value: "kogito,trusty,trusty-ui"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
   - name: "SCRIPT_DEBUG"
@@ -24,19 +24,19 @@ envs:
     description: "Trusty service address, defaults to http://localhost:8180."
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
-  install: 
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.trusty.ui
-  - name: org.kie.kogito.security.custom.truststores
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.trusty.ui
+    - name: org.kie.kogito.security.custom.truststores
 
 run:
   workdir: "/home/kogito"
diff --git a/modules/kogito-custom-truststore/module.yaml b/modules/kogito-custom-truststore/module.yaml
index 32868cb5c6f..da19011e03c 100644
--- a/modules/kogito-custom-truststore/module.yaml
+++ b/modules/kogito-custom-truststore/module.yaml
@@ -5,7 +5,7 @@ description: "Adds the capability of configuring a custom Java Truststore to rep
 
 envs:
   - name: "CUSTOM_TRUSTORE"
-    description: ^ Custom JVM Truststore certificate (JKS format) that will replace the original cacerts file when executing the JVM process within the image. 
+    description: ^ Custom JVM Truststore certificate (JKS format) that will replace the original cacerts file when executing the JVM process within the image.
     example: "my-own-cacerts.jks"
   - name: "CUSTOM_TRUSTSTORE_PASSWORD"
     description: ^ Password to for the custom JKS Truststore certificate. Ideally defined on containers platforms using Secrets.
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 037c9f5d46f..46a69af7d75 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/data-index-service-infinispan/data-index-service-infinispan-quarkus-app.zip
-  name: data-index-service-infinispan-quarkus-app.zip
+  - path: /tmp/build/data-index-service-infinispan/data-index-service-infinispan-quarkus-app.zip
+    name: data-index-service-infinispan-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 9ccc0746f87..2a818e8b648 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/data-index-service-mongodb/data-index-service-mongodb-quarkus-app.zip
-  name: data-index-service-mongodb-quarkus-app.zip
+  - path: /tmp/build/data-index-service-mongodb/data-index-service-mongodb-quarkus-app.zip
+    name: data-index-service-mongodb-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 858ba49111b..9e6821b579e 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/data-index-service-oracle/data-index-service-oracle-quarkus-app.zip
-  name: data-index-service-oracle-quarkus-app.zip
+  - path: /tmp/build/data-index-service-oracle/data-index-service-oracle-quarkus-app.zip
+    name: data-index-service-oracle-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 9612d41f906..c3be5d2e77b 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/data-index-service-postgresql/data-index-service-postgresql-quarkus-app.zip
-  name: data-index-service-postgresql-quarkus-app.zip
+  - path: /tmp/build/data-index-service-postgresql/data-index-service-postgresql-quarkus-app.zip
+    name: data-index-service-postgresql-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml
index 0410207ba1b..a8ae2692e6c 100644
--- a/modules/kogito-dynamic-resources/module.yaml
+++ b/modules/kogito-dynamic-resources/module.yaml
@@ -2,9 +2,7 @@ schema_version: 1
 name: org.kie.kogito.dynamic.resources
 version: "2.0.0-snapshot"
 
-description: -|
-  Module retrieved from https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash
-  However it contains a few customizations to fit Kogito needs.
+description: -| Module retrieved from https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash However it contains a few customizations to fit Kogito needs.
 
 execute:
   - script: configure
@@ -58,4 +56,4 @@ envs:
     example: "100"
   - name: GC_CONTAINER_OPTIONS
     description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelOldGC`.
-    example: -XX:+UseG1GC
\ No newline at end of file
+    example: -XX:+UseG1GC
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 3e710f3ec8d..66ecaaed73d 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -5,10 +5,10 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/explainability-service-rest/explainability-service-rest-quarkus-app.zip
-  name: explainability-service-rest-quarkus-app.zip
-- path: /tmp/build/explainability-service-messaging/explainability-service-messaging-quarkus-app.zip
-  name: explainability-service-messaging-quarkus-app.zip
+  - path: /tmp/build/explainability-service-rest/explainability-service-rest-quarkus-app.zip
+    name: explainability-service-rest-quarkus-app.zip
+  - path: /tmp/build/explainability-service-messaging/explainability-service-messaging-quarkus-app.zip
+    name: explainability-service-messaging-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml
index ae15a436e79..ea831afa2ba 100644
--- a/modules/kogito-graalvm-scripts/module.yaml
+++ b/modules/kogito-graalvm-scripts/module.yaml
@@ -3,4 +3,4 @@ name: org.kie.kogito.graalvm.scripts
 version: "21.3.1"
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 6f2d2ba56b9..eb2cbb4b0aa 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/jitexecutor-runner/jitexecutor-runner-quarkus-app.zip
-  name: jitexecutor-runner-quarkus-app.zip
+  - path: /tmp/build/jitexecutor-runner/jitexecutor-runner-quarkus-app.zip
+    name: jitexecutor-runner-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 26640033dbe..23c5a17e778 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/jobs-service-inmemory/jobs-service-inmemory-quarkus-app.zip
-  name: jobs-service-inmemory-quarkus-app.zip
+  - path: /tmp/build/jobs-service-inmemory/jobs-service-inmemory-quarkus-app.zip
+    name: jobs-service-inmemory-quarkus-app.zip
 
 packages:
   install:
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 99b44db97be..9a954763209 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/jobs-service-infinispan/jobs-service-infinispan-quarkus-app.zip
-  name: jobs-service-infinispan-quarkus-app.zip
+  - path: /tmp/build/jobs-service-infinispan/jobs-service-infinispan-quarkus-app.zip
+    name: jobs-service-infinispan-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 21d04c045b2..6bcf3e2cc5e 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/jobs-service-mongodb/jobs-service-mongodb-quarkus-app.zip
-  name: jobs-service-mongodb-quarkus-app.zip
+  - path: /tmp/build/jobs-service-mongodb/jobs-service-mongodb-quarkus-app.zip
+    name: jobs-service-mongodb-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 0e91fd3f0c7..4fdddb07c87 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/jobs-service-postgresql/jobs-service-postgresql-quarkus-app.zip
-  name: jobs-service-postgresql-quarkus-app.zip
+  - path: /tmp/build/jobs-service-postgresql/jobs-service-postgresql-quarkus-app.zip
+    name: jobs-service-postgresql-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-swf-builder/module.yaml b/modules/kogito-swf-builder/module.yaml
index 570b85b3809..9ba490537dc 100644
--- a/modules/kogito-swf-builder/module.yaml
+++ b/modules/kogito-swf-builder/module.yaml
@@ -14,7 +14,7 @@ envs:
     value: "1.0.0-SNAPSHOT"
     description: Please do not change
   - name: QUARKUS_VERSION
-    value: "2.13.0.Final"
+    value: "2.13.2.Final"
     description: Please do not change
   - name: QUARKUS_EXTENSIONS
     example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index dfeaf53bd31..1d8ebd5a81c 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/task-console/task-console-quarkus-app.zip
-  name: task-console-quarkus-app.zip
+  - path: /tmp/build/task-console/task-console-quarkus-app.zip
+    name: task-console-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index d091dc6710c..0338735d429 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/trusty-service-infinispan/trusty-service-infinispan-quarkus-app.zip
-  name: trusty-service-infinispan-quarkus-app.zip
+  - path: /tmp/build/trusty-service-infinispan/trusty-service-infinispan-quarkus-app.zip
+    name: trusty-service-infinispan-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index ff854b0ad35..0477bc4bb64 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/trusty-service-postgresql/trusty-service-postgresql-quarkus-app.zip
-  name: trusty-service-postgresql-quarkus-app.zip
+  - path: /tmp/build/trusty-service-postgresql/trusty-service-postgresql-quarkus-app.zip
+    name: trusty-service-postgresql-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 9b97aba54f5..20ebe8c8638 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/trusty-service-redis/trusty-service-redis-quarkus-app.zip
-  name: trusty-service-redis-quarkus-app.zip
+  - path: /tmp/build/trusty-service-redis/trusty-service-redis-quarkus-app.zip
+    name: trusty-service-redis-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 750d0ea2fc0..6ee43fbee47 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/trusty-ui/trusty-ui-quarkus-app.zip
-  name: trusty-ui-quarkus-app.zip
+  - path: /tmp/build/trusty-ui/trusty-ui-quarkus-app.zip
+    name: trusty-ui-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/scripts/common.py b/scripts/common.py
index 673ee509f3c..2aab7464968 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -20,6 +20,9 @@
 IMAGE_FILENAME = "image.yaml"
 ARTIFACTS_VERSION_ENV_KEY = "KOGITO_VERSION"
 
+QUARKUS_VERSION_ENV_KEY = "QUARKUS_VERSION"
+QUARKUS_VERSION_LABEL_NAME = "org.quarkus.version"
+
 # behave tests that needs to be updated
 BEHAVE_BASE_DIR = 'tests/features'
 
@@ -214,7 +217,7 @@ def update_modules_version(target_version, prod=False):
     if prod:
         modules = get_prod_module_dirs()
     else:
-        get_community_module_dirs()
+        modules = get_community_module_dirs()
 
     for module_dir in modules:
         update_module_version(module_dir, target_version)
@@ -240,6 +243,73 @@ def update_module_version(module_dir, target_version):
     except TypeError:
         raise
 
+def update_images_env_value(env_name, new_value, prod=False):
+    """
+    Update the given env name for all images with the given new value.
+    :param env_name: environment variable name to update
+    :param new_value: new value to set
+    :param prod: if the module to be updated is prod version.
+    """
+    images = []
+    if prod:
+        images = get_prod_images()
+    else:
+        images = get_community_images()
+
+    for image_name in images:
+        image_filename = "{}-overrides.yaml".format(image_name)
+        update_env_value(image_filename, env_name, new_value)
+
+def update_images_label_value(label_name, new_value, prod=False):
+    """
+    Update the given label name for all images with the given new value.
+    :param label_name: label name to update
+    :param new_value: new value to set
+    :param prod: if the module to be updated is prod version.
+    """
+    images = []
+    if prod:
+        images = get_prod_images()
+    else:
+        images = get_community_images()
+
+    for image_name in images:
+        image_filename = "{}-overrides.yaml".format(image_name)
+        update_label_value(image_filename, label_name, new_value)
+
+def update_modules_env_value(env_name, new_value, prod=False):
+    """
+    Update the given environment variable name for all Kogito modules with the given new value.
+    :param env_name: label name to update
+    :param new_value: new value to set
+    :param prod: if the module to be updated is prod version.
+    """
+    modules = []
+    if prod:
+        modules = get_prod_module_dirs()
+    else:
+        modules = get_community_module_dirs()
+
+    for module_dir in modules:
+        module_file = os.path.join(module_dir, "module.yaml")
+        update_env_value(module_file, env_name, new_value)
+
+def update_modules_label_value(label_name, new_value, prod=False):
+    """
+    Update the given label name for all Kogito modules with the given new value.
+    :param label_name: label name to update
+    :param new_value: new value to set
+    :param prod: if the module to be updated is prod version.
+    """
+    modules = []
+    if prod:
+        modules = get_prod_module_dirs()
+    else:
+        modules = get_community_module_dirs()
+
+    for module_dir in modules:
+        module_file = os.path.join(module_dir, "module.yaml")
+        update_label_value(module_file, label_name, new_value)
 
 def retrieve_artifacts_version():
     """
@@ -261,21 +331,7 @@ def update_artifacts_version_env_in_image(artifacts_version):
     Update `KOGITO_VERSION` env var in image.yaml.
     :param artifacts_version: kogito version used to update image.yaml which contains the `KOGITO_VERSION` env var
     """
-    try:
-        with open(IMAGE_FILENAME) as imageFile:
-            data = yaml_loader().load(imageFile)
-            for index, env in enumerate(data['envs'], start=0):
-                if env['name'] == ARTIFACTS_VERSION_ENV_KEY:
-                    print("Updating image.yaml env var {0} with value {1}".format(ARTIFACTS_VERSION_ENV_KEY,
-                                                                                  artifacts_version))
-                    data['envs'][index]['value'] = artifacts_version
-
-        with open(IMAGE_FILENAME, 'w') as imageFile:
-            yaml_loader().dump(data, imageFile)
-
-    except TypeError:
-        raise
-
+    update_env_value(IMAGE_FILENAME, ARTIFACTS_VERSION_ENV_KEY, artifacts_version)
 
 def update_examples_ref_in_behave_tests(examples_ref):
     """
@@ -422,6 +478,53 @@ def update_maven_repo_in_setup_maven(repo_url, replace_jboss_repository):
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
     update_in_file(SETUP_MAVEN_SCRIPT, pattern, replacement)
 
+def update_env_value(filename, env_name, env_value):
+    """
+    Update environment value into the given yaml module/image file
+    :param filename: filename to update
+    :param env_name: environment variable name to update
+    :param env_value: value to set
+    """
+    try:
+        with open(filename) as yaml_file:
+            data = yaml_loader().load(yaml_file)
+            if 'envs' in data:
+                for index, env in enumerate(data['envs'], start=0):
+                    if env['name'] == env_name:
+                        print("Updating {0} label {1} with value {2}".format(filename, env_name,
+                                                                                    env_value))
+                        if 'value' in data['envs'][index]: # Do not update if no value already defined
+                            data['envs'][index]['value'] = env_value
+
+        with open(filename, 'w') as yaml_file:
+            yaml_loader().dump(data, yaml_file)
+
+    except TypeError:
+        raise
+
+def update_label_value(filename, label_name, label_value):
+    """
+    Update label value into the given yaml module/image file
+    :param filename: filename to update
+    :param label_name: label name to update
+    :param label_value: value to set
+    """
+    try:
+        with open(filename) as yaml_file:
+            data = yaml_loader().load(yaml_file)
+            if 'labels' in data:
+                for index, env in enumerate(data['labels'], start=0):
+                    if env['name'] == label_name:
+                        print("Updating {0} label {1} with value {2}".format(filename, label_name,
+                                                                                    label_value))
+                        if 'value' in data['labels'][index]: # Do not update if no value already defined
+                            data['labels'][index]['value'] = label_value
+
+        with open(filename, 'w') as yaml_file:
+            yaml_loader().dump(data, yaml_file)
+
+    except TypeError:
+        raise
 
 def ignore_maven_self_signed_certificate_in_setup_maven():
     """
diff --git a/scripts/update-quarkus-version.py b/scripts/update-quarkus-version.py
new file mode 100644
index 00000000000..59701fad85d
--- /dev/null
+++ b/scripts/update-quarkus-version.py
@@ -0,0 +1,47 @@
+#!/usr/bin/python3
+# This script will be responsible to help to update the quarkus version in kogito images/modules
+# Example of usage:
+#   # move the current version to the next one or rcX
+#   python scripts/update-quarkus-version.py --bump-to 2.13.0.Final
+#
+# Dependencies:
+#  ruamel.yaml
+
+import sys
+import argparse
+import common
+import re
+
+sys.dont_write_bytecode = True
+
+def update_quarkus_version_in_behave_tests_repository_paths(quarkus_version):
+    """
+    Update quarkus version into behave tests
+    :param quarkus_version: quarkus version to set
+    """
+    print("Set quarkus_version {} in behave tests as repository path".format(quarkus_version))
+    # pattern to change the KOGITO_VERSION
+    pattern = re.compile(
+        'io/quarkus/platform/quarkus-bom/([\d.]+.Final)/quarkus-bom-([\d.]+.Final).pom')
+    replacement = 'io/quarkus/platform/quarkus-bom/{}/quarkus-bom-{}.pom'.format(quarkus_version, quarkus_version)
+    common.update_in_behave_tests(pattern, replacement)
+
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Quarkus version updater')
+    parser.add_argument('--bump-to', dest='bump_to', help='bump everything to the given version')
+    parser.add_argument('--prod', default=False, action='store_true', help='Update product modules/images')
+
+    args = parser.parse_args()
+
+    if args.bump_to:
+        common.update_images_env_value(common.QUARKUS_VERSION_ENV_KEY, args.bump_to, args.prod)
+        common.update_modules_env_value(common.QUARKUS_VERSION_ENV_KEY, args.bump_to, args.prod)
+
+        common.update_images_label_value(common.QUARKUS_VERSION_LABEL_NAME, args.bump_to, args.prod)
+        common.update_modules_label_value(common.QUARKUS_VERSION_LABEL_NAME, args.bump_to, args.prod)
+
+        update_quarkus_version_in_behave_tests_repository_paths(args.bump_to)
+    else:
+        print(parser.print_usage())
\ No newline at end of file
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 83e6df772ba..3e97ea064e6 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.13.0.Final/quarkus-bom-2.13.0.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.13.2.Final/quarkus-bom-2.13.2.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
 

From 6fdf8266c8bb2a85783e6c4e93768b74af955a85 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Fri, 21 Oct 2022 06:04:52 -0300
Subject: [PATCH 481/709] =?UTF-8?q?[KOGITO-7697]=20-=20Group=20all=20Jobs?=
 =?UTF-8?q?=20service=20jdbc=20flavors=20on=20one=20container=20=E2=80=A6?=
 =?UTF-8?q?=20(#1335)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-7697] - Group all Jobs service jdbc flavors on one container image

Signed-off-by: spolti <fspolti@redhat.com>

* review and improvements

Signed-off-by: spolti <fspolti@redhat.com>

review changes and remove leftovers

Signed-off-by: spolti <fspolti@redhat.com>

Update build-kogito-apps-components.sh

Update build-kogito-apps-components.sh

update script

* make the all in one module independent

Signed-off-by: spolti <fspolti@redhat.com>

* Apply suggestions from code review

Signed-off-by: spolti <fspolti@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 README.md                                     | 10 ++-
 RELEASE_NOTES.md                              |  2 +-
 kogito-imagestream.yaml                       | 21 +++++
 kogito-jobs-service-allinone-overrides.yaml   | 49 +++++++++++
 kogito-jobs-service-ephemeral-overrides.yaml  |  1 +
 kogito-jobs-service-infinispan-overrides.yaml |  1 +
 kogito-jobs-service-mongodb-overrides.yaml    |  1 +
 kogito-jobs-service-postgresql-overrides.yaml |  1 +
 kogito-runtime-jvm-overrides.yaml             |  2 +-
 kogito-runtime-native-overrides.yaml          |  2 +-
 modules/kogito-image-dependencies/module.yaml |  1 -
 .../added/kogito-app-launch.sh                | 39 +++++++++
 .../kogito-jobs-service-all-in-one/configure  | 34 ++++++++
 .../module.yaml                               | 20 +++++
 modules/kogito-jobs-service-common/configure  |  1 -
 .../kogito-jobs-service-common/module.yaml    |  1 +
 .../added/kogito-app-launch.sh                |  2 +-
 .../kogito-jobs-service-ephemeral/configure   |  6 +-
 .../kogito-jobs-service-ephemeral/module.yaml |  4 -
 .../added/kogito-app-launch.sh                |  2 +-
 .../kogito-jobs-service-infinispan/configure  |  6 +-
 .../module.yaml                               |  3 -
 .../added/kogito-app-launch.sh                |  2 +-
 modules/kogito-jobs-service-mongodb/configure |  8 +-
 .../kogito-jobs-service-mongodb/module.yaml   |  4 -
 .../added/kogito-app-launch.sh                |  2 +-
 .../kogito-jobs-service-postgresql/configure  |  8 +-
 .../module.yaml                               |  3 -
 ...kogito-runtime-native-rhel8-overrides.yaml |  2 +-
 scripts/build-kogito-apps-components.sh       | 22 +++--
 scripts/common.py                             |  8 +-
 .../kogito-jobs-service-all-in-one.feature    | 82 +++++++++++++++++++
 .../kogito-jobs-service-common.feature        |  1 +
 .../kogito-jobs-service-ephemeral.feature     |  6 +-
 .../kogito-jobs-service-infinispan.feature    | 10 ++-
 .../kogito-jobs-service-mongodb.feature       |  8 +-
 .../kogito-jobs-service-postgresql.feature    | 20 +++++
 .../kogito-common-postresql-services.feature  |  1 -
 .../supporting-services-common.feature        |  4 -
 39 files changed, 334 insertions(+), 66 deletions(-)
 create mode 100644 kogito-jobs-service-allinone-overrides.yaml
 create mode 100644 modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
 create mode 100644 modules/kogito-jobs-service-all-in-one/configure
 create mode 100644 modules/kogito-jobs-service-all-in-one/module.yaml
 create mode 100644 tests/features/jobs-service/kogito-jobs-service-all-in-one.feature

diff --git a/README.md b/README.md
index 93982776300..10eb7db3570 100644
--- a/README.md
+++ b/README.md
@@ -600,6 +600,7 @@ Today we have 16 Kogito Component Images:
 * [quay.io/kiegroup/kogito-jobs-service-infinispan](https://quay.io/kiegroup/kogito-jobs-service-infinispan)
 * [quay.io/kiegroup/kogito-jobs-service-mongodb](https://quay.io/kiegroup/kogito-jobs-service-mongodb)
 * [quay.io/kiegroup/kogito-jobs-service-postgresql](https://quay.io/kiegroup/kogito-jobs-service-postgresql)
+* [quay.io/kiegroup/kogito-jobs-service-allinone](https://quay.io/kiegroup/kogito-jobs-service-allinone)
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
 * [quay.io/kiegroup/kogito-task-console](https://quay.io/kiegroup/kogito-task-console)
 * [quay.io/kiegroup/kogito-trusty-ui](https://quay.io/kiegroup/kogito-trusty-ui)
@@ -745,6 +746,7 @@ Today, the Jobs service contains four images:
 - [infinispan](kogito-jobs-service-infinispan-overrides.yaml)
 - [mongodb](kogito-jobs-service-mongodb-overrides.yaml)
 - [postgresql](kogito-jobs-service-postgresql-overrides.yaml)
+- [all-in-one](kogito-jobs-service-allinone-overrides.yaml)
 
 Basic usage:
 
@@ -761,7 +763,7 @@ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-infi
 You should notice a few debug messages being printed in the system output.
 
 The ephemeral image does not have external dependencies like a backend persistence provider, it uses in-memory persistence
-while working with Jobs Services `infinispan`, `mongodb` and `postgresql` variants, it will need to have an Infinispan, MongoDB or PostgreSQL server,
+while working with Jobs Services `allinone`, `infinispan`, `mongodb` and `postgresql` variants, it will need to have an Infinispan, MongoDB or PostgreSQL server,
 respectively, previously running.
 
 
@@ -907,6 +909,7 @@ imagestream.image.openshift.io/kogito-jobs-service-ephemeral created
 imagestream.image.openshift.io/kogito-jobs-service-infinispan created
 imagestream.image.openshift.io/kogito-jobs-service-mongodb created
 imagestream.image.openshift.io/kogito-jobs-service-postgresql created
+imagestream.image.openshift.io/kogito-jobs-service-allinone created
 imagestream.image.openshift.io/kogito-management-console created
 
 # performing a new build
@@ -1102,6 +1105,7 @@ With this Makefile you can:
      $ make build-image image_name=kogito-jobs-service-infinispan
      $ make build-image image_name=kogito-jobs-service-mongodb
      $ make build-image image_name=kogito-jobs-service-postgresql
+     $ make build-image image_name=kogito-jobs-service-allinone
      $ make build-image image_name=kogito-management-console
      $ make build-image image_name=kogito-trusty-ui
      $ make build-image image_name=kogito-jit-runner
@@ -1178,6 +1182,7 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-jobs-service-infinispan](modules/kogito-jobs-service-infinispan): Installs and Configure the infinispan jobs-service jar inside the image
 - [kogito-jobs-service-mongodb](modules/kogito-jobs-service-mongodb): Installs and Configure the mongodb jobs-service jar inside the image
 - [kogito-jobs-service-postgresql](modules/kogito-jobs-service-postgresql): Installs and Configure the postgresql jobs-service jar inside the image
+- [kogito-jobs-service-allinone](modules/kogito-jobs-service-all-in-one): Provides the runner script that supports all jobs-service flavors
 - [kogito-kubernetes-client](modules/kogito-kubernetes-client): Provides a simple wrapper to interact with Kubernetes API.
 - [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
 - [kogito-logging](modules/kogito-logging): Provides common logging functions.
@@ -1208,7 +1213,8 @@ Please inspect the images overrides files to learn which modules are being insta
 - [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-infinispan](kogito-jobs-service-infinispan-overrides.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-mongodb](kogito-jobs-service-mongodb-overrides.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-overrides.yaml)  
+- [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-overrides.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-overrides.yaml) 
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
 - [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-overrides.yaml)
 - [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-overrides.yaml)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index da5faf99334..d88f385021e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,6 @@
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-[KOGITO-7891](KOGITO-7891) - SInce 1.28 the legacy builder based on s2i is renamed kogito-s2-builder and the new builder will be a jvm and maven builder
+[KOGITO-7697](https://issues.redhat.com/browse/KOGITO-7697) - Group all Jobs service jdbc flavors on one container image
 
 ## Bug Fixes
 
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index f49f8ee32e7..6aa1d573e27 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -405,6 +405,27 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-jobs-service-postgresql:2.0.0-snapshot
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-jobs-service-allinone
+      annotations:
+        openshift.io/display-name: All in One Runtime image for Kogito Jobs Service
+        openshift.io/provider-display-name: Kie Group.
+    spec:
+      tags:
+        - name: '2.0.0-snapshot'
+          annotations:
+            description: All in One Runtime image for Kogito Jobs Service
+            iconClass: icon-jbpm
+            tags: kogito,jobs-service, all-in-one
+            supports: out-of-box process timers
+            version: '2.0.0-snapshot'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-jobs-service-allinone:2.0.0-snapshot
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-jobs-service-allinone-overrides.yaml b/kogito-jobs-service-allinone-overrides.yaml
new file mode 100644
index 00000000000..e1b28bbb305
--- /dev/null
+++ b/kogito-jobs-service-allinone-overrides.yaml
@@ -0,0 +1,49 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-jobs-service-allinone"
+description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
+
+labels:
+- name: "maintainer"
+  value: "kogito <bsig-cloud@redhat.com>"
+- name: "io.k8s.description"
+  value: "Runtime image for Kogito Jobs Service with all available jdbc providers"
+- name: "io.k8s.display-name"
+  value: "Kogito Jobs Service All-in-One"
+- name: "io.openshift.tags"
+  value: "kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral"
+- name: "io.openshift.expose-services"
+  value: "8080:http"
+
+envs:
+- name: "SCRIPT_DEBUG"
+  example: "true"
+  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+- name: "ENABLE_EVENTS"
+  example: "true"
+  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+- name: "JOBS_SERVICE_PERSISTENCE"
+  example: "mongodb"
+  description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral, infinispan, mongodb and infinispan, if empty, defaults to ephemeral"
+
+ports:
+- value: 8080
+
+modules:
+  install:
+  - name: org.kie.kogito.image.dependencies
+  - name: org.kie.kogito.system.user
+  - name: org.kie.kogito.logging
+  - name: org.kie.kogito.openjdk
+    version: "11-headless"
+  - name: org.kie.kogito.dynamic.resources
+  - name: org.kie.kogito.launch.scripts
+  - name: org.kie.kogito.jobs.service.allinone
+  - name: org.kie.kogito.security.custom.truststores
+  - name: org.kie.kogito.jobs.service.common
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd:
+    - "/home/kogito/kogito-app-launch.sh"
diff --git a/kogito-jobs-service-ephemeral-overrides.yaml b/kogito-jobs-service-ephemeral-overrides.yaml
index ccd38724e54..c9cdf94a660 100644
--- a/kogito-jobs-service-ephemeral-overrides.yaml
+++ b/kogito-jobs-service-ephemeral-overrides.yaml
@@ -37,6 +37,7 @@ modules:
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.ephemeral
     - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.jobs.service.common
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jobs-service-infinispan-overrides.yaml b/kogito-jobs-service-infinispan-overrides.yaml
index 526ec6fb0fe..ab4f4fc688e 100644
--- a/kogito-jobs-service-infinispan-overrides.yaml
+++ b/kogito-jobs-service-infinispan-overrides.yaml
@@ -37,6 +37,7 @@ modules:
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.infinispan
     - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.jobs.service.common
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jobs-service-mongodb-overrides.yaml b/kogito-jobs-service-mongodb-overrides.yaml
index 1e0ab551f60..05390eaf78b 100644
--- a/kogito-jobs-service-mongodb-overrides.yaml
+++ b/kogito-jobs-service-mongodb-overrides.yaml
@@ -37,6 +37,7 @@ modules:
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.mongodb
     - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.jobs.service.common
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-jobs-service-postgresql-overrides.yaml b/kogito-jobs-service-postgresql-overrides.yaml
index a79405a3051..d0f20163cef 100644
--- a/kogito-jobs-service-postgresql-overrides.yaml
+++ b/kogito-jobs-service-postgresql-overrides.yaml
@@ -37,6 +37,7 @@ modules:
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.postgresql
     - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.jobs.service.common
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-overrides.yaml
index eb3c9a91385..835c32e0e14 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-overrides.yaml
@@ -43,6 +43,6 @@ modules:
     - name: org.kie.kogito.security.custom.truststores
 
 ## s2i build . quay.io/kiegroup/kogito-s2i-builder:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
+## where "." is the sources dir, ie: /home/user/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-overrides.yaml
index 52f8b5bf99d..e1a35bb3e37 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-overrides.yaml
@@ -39,7 +39,7 @@ modules:
     - name: org.kie.kogito.runtime.native
 
 ## s2i build . quay.io/kiegroup/kogito-s2i-builder:latest kogitotest:10.0 -e RUNTIME_TYPE=quarkus -e NATIVE=true --runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
+## where "." is the sources dir, ie: /home/user/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
 
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index ab33358c3d2..ce03a19fd75 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -13,4 +13,3 @@ packages:
     - tar
     - gzip
     - unzip
-
diff --git a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
new file mode 100644
index 00000000000..655a58a5d04
--- /dev/null
+++ b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+#import
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    SHOW_JVM_SETTINGS="-XshowSettings:properties"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "JVM settings debug is enabled."
+    printenv
+fi
+
+allowed_jobs_service_flavors=("ephemeral" "mongodb" "infinispan" "postgresql")
+jobs_service_flavor="ephemeral"
+if [[ ! "${allowed_jobs_service_flavors[*]}" =~ ${JOBS_SERVICE_PERSISTENCE,,} ]]; then
+  log_warning "${JOBS_SERVICE_PERSISTENCE,,} is not supported, the allowed flavors are [${allowed_jobs_service_flavors[*]}], defaulting to ${jobs_service_flavor}"
+  unset JOBS_SERVICE_PERSISTENCE
+
+elif [ "x${JOBS_SERVICE_PERSISTENCE}" != "x" ]; then
+  jobs_service_flavor=${JOBS_SERVICE_PERSISTENCE,,}
+fi
+
+# Configuration scripts
+# Any configuration script that needs to run on image startup must be added here.
+CONFIGURE_SCRIPTS=(
+  "${KOGITO_HOME}"/launch/kogito-jobs-service-common.sh
+  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
+)
+source "${KOGITO_HOME}"/launch/configure.sh
+#############################################
+
+DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
+
+# shellcheck disable=SC2086
+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/${jobs_service_flavor}/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-all-in-one/configure b/modules/kogito-jobs-service-all-in-one/configure
new file mode 100644
index 00000000000..eac87292dc6
--- /dev/null
+++ b/modules/kogito-jobs-service-all-in-one/configure
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+
+unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ephemeral
+unzip "${SOURCES_DIR}"/jobs-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/infinispan
+unzip "${SOURCES_DIR}"/jobs-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/mongodb
+unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/postgresql
+
+
+mkdir "${KOGITO_HOME}"/bin/shared-libs/
+
+mv "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
+rm -rf "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib
+ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib
+
+cp -r "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
+rm -rf "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib
+ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib
+
+cp -r "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
+rm -rf "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib
+ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib
+
+cp -r "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
+rm -rf "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib
+ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib
+
+
+cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml
new file mode 100644
index 00000000000..f110eb95218
--- /dev/null
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -0,0 +1,20 @@
+schema_version: 1
+name: org.kie.kogito.jobs.service.allinone
+version: "2.0.0-snapshot"
+
+artifacts:
+  - path: /tmp/build/jobs-service-inmemory-all-in-one/jobs-service-inmemory-quarkus-app.zip
+    name: jobs-service-inmemory-quarkus-app.zip
+  - path: /tmp/build/jobs-service-mongodb-all-in-one/jobs-service-mongodb-quarkus-app.zip
+    name: jobs-service-mongodb-quarkus-app.zip
+  - path: /tmp/build/jobs-service-infinispan-all-in-one/jobs-service-infinispan-quarkus-app.zip
+    name: jobs-service-infinispan-quarkus-app.zip
+  - path: /tmp/build/jobs-service-postgresql-all-in-one/jobs-service-postgresql-quarkus-app.zip
+    name: jobs-service-postgresql-quarkus-app.zip
+
+packages:
+  install:
+    - pam.x86_64
+
+execute:
+  - script: configure
diff --git a/modules/kogito-jobs-service-common/configure b/modules/kogito-jobs-service-common/configure
index 4ad232ed090..033b6cb996a 100644
--- a/modules/kogito-jobs-service-common/configure
+++ b/modules/kogito-jobs-service-common/configure
@@ -9,4 +9,3 @@ cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
-
diff --git a/modules/kogito-jobs-service-common/module.yaml b/modules/kogito-jobs-service-common/module.yaml
index ed510d77527..c423842dbd4 100644
--- a/modules/kogito-jobs-service-common/module.yaml
+++ b/modules/kogito-jobs-service-common/module.yaml
@@ -1,6 +1,7 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.common
 version: "2.0.0-snapshot"
+description: "This module needs to be run last, if adding it, add in the last position."
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
index 0404ab50c69..75d6ec88294 100644
--- a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
@@ -26,4 +26,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/quarkus-app/quarkus-run.jar
+    -jar "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-ephemeral/configure b/modules/kogito-jobs-service-ephemeral/configure
index e3ed8783d72..e0d10a7961d 100644
--- a/modules/kogito-jobs-service-ephemeral/configure
+++ b/modules/kogito-jobs-service-ephemeral/configure
@@ -5,11 +5,7 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ephemeral
 
 cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 23c5a17e778..4c0917ee0db 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -14,7 +14,3 @@ packages:
 
 execute:
   - script: configure
-
-modules:
-  install:
-    - name: org.kie.kogito.jobs.service.common
diff --git a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
index 0404ab50c69..d2991896275 100644
--- a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
@@ -26,4 +26,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/quarkus-app/quarkus-run.jar
+    -jar "${KOGITO_HOME}"/bin/infinispan/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-infinispan/configure b/modules/kogito-jobs-service-infinispan/configure
index 36cdb38990e..da71b7c3344 100644
--- a/modules/kogito-jobs-service-infinispan/configure
+++ b/modules/kogito-jobs-service-infinispan/configure
@@ -5,11 +5,9 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/jobs-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/jobs-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/infinispan
 
 cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
 
+
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 9a954763209..23b09619017 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -11,6 +11,3 @@ artifacts:
 execute:
   - script: configure
 
-modules:
-  install:
-    - name: org.kie.kogito.jobs.service.common
diff --git a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
index 0404ab50c69..b46d90c1706 100644
--- a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
@@ -26,4 +26,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/quarkus-app/quarkus-run.jar
+    -jar "${KOGITO_HOME}"/bin/mongodb/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-mongodb/configure b/modules/kogito-jobs-service-mongodb/configure
index 73ca03f66fd..8ecd954a5e6 100644
--- a/modules/kogito-jobs-service-mongodb/configure
+++ b/modules/kogito-jobs-service-mongodb/configure
@@ -5,10 +5,8 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/jobs-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/jobs-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/mongodb
 
 cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
+
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 6bcf3e2cc5e..e3402a6aae8 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -10,7 +10,3 @@ artifacts:
 
 execute:
   - script: configure
-
-modules:
-  install:
-    - name: org.kie.kogito.jobs.service.common
diff --git a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
index 0404ab50c69..35aa6253e26 100644
--- a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
@@ -26,4 +26,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/quarkus-app/quarkus-run.jar
+    -jar "${KOGITO_HOME}"/bin/postgresql/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-postgresql/configure b/modules/kogito-jobs-service-postgresql/configure
index 3e8752902fd..314d7c6e8b0 100644
--- a/modules/kogito-jobs-service-postgresql/configure
+++ b/modules/kogito-jobs-service-postgresql/configure
@@ -5,10 +5,8 @@ SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/postgresql
 
 cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
+chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
+
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 4fdddb07c87..6731266938b 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -11,6 +11,3 @@ artifacts:
 execute:
   - script: configure
 
-modules:
-  install:
-    - name: org.kie.kogito.jobs.service.common
diff --git a/rhpam-kogito-runtime-native-rhel8-overrides.yaml b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
index e99c26005ba..19f9f4ef4d1 100644
--- a/rhpam-kogito-runtime-native-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
@@ -54,7 +54,7 @@ osbs:
     branch: rhba-7-rhel-8
 
 ## s2i build . -e BINARY=true registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8:latest
-## where "." is the sources dir, ie: /data/dev/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
+## where "." is the sources dir, ie: /home/user/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
 run:
   workdir: "/home/kogito"
 
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 5b846723b70..713e0b503df 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -20,6 +20,8 @@ shift $#
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
 
 MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
+# used for all-in-one image
+extended_context=""
 
 case ${imageName} in
     "kogito-management-console")
@@ -55,6 +57,13 @@ case ${imageName} in
     "kogito-jobs-service-postgresql")
         contextDir="jobs-service/jobs-service-postgresql"
         ;;
+    "kogito-jobs-service-allinone")
+        extended_context="-all-in-one"
+        contextDir="jobs-service/jobs-service-inmemory"
+        contextDir="${contextDir} jobs-service/jobs-service-infinispan"
+        contextDir="${contextDir} jobs-service/jobs-service-postgresql"
+        contextDir="${contextDir} jobs-service/jobs-service-mongodb"
+        ;;
     "kogito-trusty-infinispan")
         contextDir="trusty/trusty-service/trusty-service-infinispan"
         ;;
@@ -80,16 +89,17 @@ case ${imageName} in
 esac
 
 for ctx in ${contextDir}; do
-    target_tmp_dir="/tmp/build/$(basename ${ctx})"
-    build_target_dir="/tmp/$(basename ${ctx})"
-    mvn_local_repo="/tmp/temp_maven/$(basename ${ctx})"
+    target_tmp_dir="/tmp/build/$(basename ${ctx})${extended_context}"
+    build_target_dir="/tmp/$(basename ${ctx})${extended_context}"
+    mvn_local_repo="/tmp/temp_maven/$(basename ${ctx})${extended_context}"
+
     rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
     rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
-    rm -rf ${mvn_local_repo} && mkdir -p ${mvn_local_repo}
+    mkdir -p ${mvn_local_repo}
 
     . ${script_dir_path}/setup-maven.sh "${build_target_dir}"/settings.xml
 
-    echo "Copy current maven repo to maven context local repo"
+    echo "Copy current maven repo to maven context local repo ${mvn_local_repo}"
     cp -r ${HOME}/.m2/repository/* "${mvn_local_repo}"
 
     cd ${build_target_dir}
@@ -101,7 +111,7 @@ for ctx in ${contextDir}; do
         eval ${git_command}
     fi
     cd ${KOGITO_APPS_REPO_NAME} && echo "working dir `pwd`"
-    mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS} -Dmaven.repo.local=${mvn_local_repo}"
+    mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS} -Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false"
     echo "Building component(s) ${contextDir} with the following maven command [${mvn_command}]"
     export YARN_CACHE_FOLDER=/tmp/cache/yarn/${ctx} # Fix for building yarn apps in parallel
     export CYPRESS_CACHE_FOLDER=/tmp/cache/cypress/${ctx} # https://docs.cypress.io/guides/getting-started/installing-cypress#Advanced
diff --git a/scripts/common.py b/scripts/common.py
index 2aab7464968..6900e5e3c2d 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -34,10 +34,10 @@
                               "kogito-data-index-postgresql", "kogito-explainability",
                               "kogito-jit-runner", "kogito-jobs-service-ephemeral",
                               "kogito-jobs-service-infinispan", "kogito-jobs-service-mongodb",
-                              "kogito-jobs-service-postgresql", "kogito-management-console",
-                              "kogito-task-console", "kogito-trusty-infinispan",
-                              "kogito-trusty-postgresql", "kogito-trusty-redis",
-                              "kogito-trusty-ui"}
+                              "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone",
+                              "kogito-management-console", "kogito-task-console",
+                              "kogito-trusty-infinispan", "kogito-trusty-postgresql",
+                              "kogito-trusty-redis", "kogito-trusty-ui"}
 
 PROD_SUPPORTING_SERVICES_IMAGES = {"logic-data-index-ephemeral-rhel8"}
 
diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
new file mode 100644
index 00000000000..194c80b5a9e
--- /dev/null
+++ b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
@@ -0,0 +1,82 @@
+@quay.io/kiegroup/kogito-jobs-service-allinone
+Feature: Kogito-jobs-service-all-in-one feature.
+
+  Scenario: verify if all labels are correctly set kogito-jobs-service image image
+    Given image is built
+    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
+    And the image should contain label io.openshift.s2i.destination with value /tmp
+    And the image should contain label io.openshift.expose-services with value 8080:http
+    And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service with all available jdbc providers
+    And the image should contain label io.k8s.display-name with value Kogito Jobs Service All-in-One
+    And the image should contain label io.openshift.tags with value kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral
+
+  Scenario: Verify if all jobs-service flavors are in the image
+    When container is started with command bash
+    Then file /home/kogito/bin/ephemeral/quarkus-app/quarkus-run.jar should exist
+    And file /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar should exist
+    And file /home/kogito/bin/postgresql/quarkus-app/quarkus-run.jar should exist
+    And file /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar should exist
+
+  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
+    And container log should contain started in
+    And container log should not contain Application failed to start
+
+  Scenario: Infinispan - verify if auth is correctly set
+    When container is started with env
+      | variable                                  | value             |
+      | SCRIPT_DEBUG                              | true              |
+      | JOBS_SERVICE_PERSISTENCE                  | infinispan        |
+      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
+      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
+      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
+      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
+    And container log should not contain Application failed to start
+
+  Scenario: verify if the container is correctly started with mongo parameters
+    When container is started with env
+      | variable                          | value                                          |
+      | SCRIPT_DEBUG                      | true                                           |
+      | JOBS_SERVICE_PERSISTENCE          | mongodb                                        |
+      | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://user:password@localhost:27017/admin  |
+      | QUARKUS_MONGODB_DATABASE          | kogito                                         |
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar
+    And container log should not contain Application failed to start
+
+  Scenario: verify if the container is started with invalid jobs-service flavor
+    When container is started with env
+      | variable                          | value      |
+      | SCRIPT_DEBUG                      | true       |
+      | JOBS_SERVICE_PERSISTENCE          | something  |
+    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
+    And container log should contain something is not supported, the allowed flavors are [ephemeral mongodb infinispan postgresql], defaulting to ephemeral
+
+  Scenario: verify if container starts as expected
+    When container is started with env
+      | variable                    | value                                                 |
+      | SCRIPT_DEBUG                | true                                                  |
+      | QUARKUS_LOG_LEVEL           | DEBUG                                                 |
+      | JOBS_SERVICE_PERSISTENCE    | postgresql                                            |
+      | QUARKUS_DATASOURCE_DB_KIND  | postgresql                                            |
+      | QUARKUS_DATASOURCE_USERNAME | test                                                  |
+      | QUARKUS_DATASOURCE_PASSWORD | 123456                                                |
+      | QUARKUS_DATASOURCE_JDBC_URL | jdbc:postgresql://10.11.12.13:5432/hibernate_orm_test |
+    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
+    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
+    And container log should contain QUARKUS_DATASOURCE_JDBC_URL=jdbc:postgresql://10.11.12.13:5432/hibernate_orm_test
+    And container log should contain  Trying to establish a protocol version 3 connection to 10.11.12.13:5432
diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature
index d071023ff1f..432fcddcb40 100644
--- a/tests/features/jobs-service/kogito-jobs-service-common.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-common.feature
@@ -2,6 +2,7 @@
 @quay.io/kiegroup/kogito-jobs-service-mongodb
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
 @quay.io/kiegroup/kogito-jobs-service-postgresql
+@quay.io/kiegroup/kogito-jobs-service-allinone
 Feature: Kogito-jobs-service common feature.
 
   Scenario: verify if the events is correctly enabled
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index d1916da29ad..467bed436bc 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -11,11 +11,15 @@ Feature: Kogito-jobs-service-ephemeral feature.
     And the image should contain label io.k8s.display-name with value Kogito in memory Jobs Service
     And the image should contain label io.openshift.tags with value kogito,jobs-service-ephemeral
 
+  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
+
   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/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/ephemeral/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/tests/features/jobs-service/kogito-jobs-service-infinispan.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
index fd620195634..eb77f6214e2 100644
--- a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
@@ -11,17 +11,21 @@ Feature: Kogito-jobs-service-infinispan feature.
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Infinispan
     And the image should contain label io.openshift.tags with value kogito,jobs-service-infinispan
 
+  Scenario: Verify if the application jar exists
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar
+
   Scenario: verify if auth is correctly set
     When container is started with env
-      | variable                      | value           |
-      | SCRIPT_DEBUG                  | true            |
+      | variable                                  | value             |
+      | SCRIPT_DEBUG                              | true              |
       | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
       | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    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
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar
     And container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
     And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
index 8ad10b190bb..ab7f56e806f 100644
--- a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
@@ -11,11 +11,15 @@ Feature: Kogito-jobs-service-mongodb feature.
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on MongoDB
     And the image should contain label io.openshift.tags with value kogito,jobs-service-mongodb
 
-  Scenario: verify if of container is correctly started with mongo parameters
+  Scenario: Verify if the application jar exists
+    When container is started with command bash
+    Then run sh -c 'ls /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar
+
+  Scenario: verify if the container is correctly started with mongo parameters
     When container is started with env
       | variable                          | value                                          |
       | SCRIPT_DEBUG                      | true                                           |
       | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://user:password@localhost:27017/admin  |
       | QUARKUS_MONGODB_DATABASE          | kogito                                         |
-    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
+    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar
     And container log should not contain Application failed to start
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index 9f5815c154d..ec8ca0dc246 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -10,3 +10,23 @@ Feature: Kogito-jobs-service-postgresql feature.
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Postgresql
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Postgresql
     And the image should contain label io.openshift.tags with value kogito,jobs-service-postgresql
+
+  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
+
+  Scenario: verify if container starts as expected
+    When container is started with env
+      | variable                    | value                                                 |
+      | SCRIPT_DEBUG                | true                                                  |
+      | QUARKUS_LOG_LEVEL           | DEBUG                                                 |
+      | QUARKUS_DATASOURCE_DB_KIND  | postgresql                                            |
+      | QUARKUS_DATASOURCE_USERNAME | test                                                  |
+      | QUARKUS_DATASOURCE_PASSWORD | 123456                                                |
+      | QUARKUS_DATASOURCE_JDBC_URL | jdbc:postgresql://10.11.12.13:5432/hibernate_orm_test |
+    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
+    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
+    And container log should contain QUARKUS_DATASOURCE_JDBC_URL=jdbc:postgresql://10.11.12.13:5432/hibernate_orm_test
+    And container log should contain  Trying to establish a protocol version 3 connection to 10.11.12.13:5432
diff --git a/tests/features/kogito-common-postresql-services.feature b/tests/features/kogito-common-postresql-services.feature
index 9e165720913..da0754237bb 100644
--- a/tests/features/kogito-common-postresql-services.feature
+++ b/tests/features/kogito-common-postresql-services.feature
@@ -1,4 +1,3 @@
-@quay.io/kiegroup/kogito-jobs-service-postgresql
 @quay.io/kiegroup/kogito-trusty-postgresql
 @quay.io/kiegroup/kogito-data-index-postgresql
 Feature: Kogito-data-index postgresql feature.
diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature
index 0ffeeb9c133..d2e73b03ecc 100644
--- a/tests/features/supporting-services-common.feature
+++ b/tests/features/supporting-services-common.feature
@@ -5,10 +5,6 @@
 @quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-oracle
 @quay.io/kiegroup/kogito-data-index-postgresql
-@quay.io/kiegroup/kogito-jobs-service-ephemeral
-@quay.io/kiegroup/kogito-jobs-service-infinispan
-@quay.io/kiegroup/kogito-jobs-service-mongodb
-@quay.io/kiegroup/kogito-jobs-service-postgresql
 @quay.io/kiegroup/kogito-trusty-infinispan
 @quay.io/kiegroup/kogito-trusty-postgresql
 @quay.io/kiegroup/kogito-trusty-redis

From b7bcd180b170437160c77888e268da31d49b60df Mon Sep 17 00:00:00 2001
From: kie-ci <kie-ci0@redhat.com>
Date: Fri, 21 Oct 2022 14:55:52 +0200
Subject: [PATCH 482/709] [main] Bump Quarkus version to 2.13.3.Final (#1356)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 kogito-swf-builder-overrides.yaml         | 2 +-
 modules/kogito-swf-builder/module.yaml    | 2 +-
 tests/features/kogito-swf-builder.feature | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
index 66f93c2575f..5d900d0d19d 100644
--- a/kogito-swf-builder-overrides.yaml
+++ b/kogito-swf-builder-overrides.yaml
@@ -5,7 +5,7 @@ description: "Kogito Serverless Workflow base builder with Quarkus extensions li
 
 labels:
   - name: "org.quarkus.version"
-    value: "2.13.2.Final"
+    value: "2.13.3.Final"
 
 modules:
   install:
diff --git a/modules/kogito-swf-builder/module.yaml b/modules/kogito-swf-builder/module.yaml
index 9ba490537dc..0bc381c37b0 100644
--- a/modules/kogito-swf-builder/module.yaml
+++ b/modules/kogito-swf-builder/module.yaml
@@ -14,7 +14,7 @@ envs:
     value: "1.0.0-SNAPSHOT"
     description: Please do not change
   - name: QUARKUS_VERSION
-    value: "2.13.2.Final"
+    value: "2.13.3.Final"
     description: Please do not change
   - name: QUARKUS_EXTENSIONS
     example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 3e97ea064e6..878512ed5a6 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.13.2.Final/quarkus-bom-2.13.2.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.13.3.Final/quarkus-bom-2.13.3.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
 

From 3446f7eaacacb18fc6d6e5f4fc7008e06af5cca6 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 31 Oct 2022 08:05:10 -0400
Subject: [PATCH 483/709] [main] Update version to 2.0.0-snapshot

---
 modules/kogito-graalvm-scripts/module.yaml       | 2 +-
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml
index ea831afa2ba..b29ae4316a6 100644
--- a/modules/kogito-graalvm-scripts/module.yaml
+++ b/modules/kogito-graalvm-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
-version: "21.3.1"
+version: "2.0.0-snapshot"
 
 execute:
   - script: configure
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 09c83ddfbcb..0db08c69186 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 57447a9fc85..94e40cfe9d5 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index a9477051ed9..ff21b490177 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From a71b87cb567ab6d030496c61a8fcc1220576ee29 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 10 Nov 2022 15:27:54 +0100
Subject: [PATCH 484/709] Promote pipeline: Correct install of gh-release cli
 (#1369)

---
 .ci/jenkins/Jenkinsfile.promote | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 054cd268cc4..84916f4c48e 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -219,7 +219,7 @@ String getNotificationSubject() {
 }
 
 void installGitHubReleaseCLI() {
-    sh 'go get github.com/github-release/github-release'
+    sh 'go install github.com/github-release/github-release@latest'
 }
 
 void checkoutRepo() {

From a038c7d0dc5947f52b53fe85b0f39cdc692c12ac Mon Sep 17 00:00:00 2001
From: kie-ci <kie-ci0@redhat.com>
Date: Mon, 14 Nov 2022 14:46:42 +0100
Subject: [PATCH 485/709] [main] Bump Quarkus version to 2.14.0.Final (#1361)

* [main] Bump Quarkus version to 2.14.0.Final

* Update GraalVM module to 22.2.0

Co-authored-by: Jenkins CI <noreply@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
---
 README.md                                     | 21 +++----
 kogito-jobs-service-allinone-overrides.yaml   | 60 +++++++++----------
 kogito-s2i-builder-overrides.yaml             |  2 +-
 kogito-swf-builder-overrides.yaml             |  2 +-
 .../22.x-java-11/configure                    | 19 ++++++
 .../22.x-java-11/module.yaml                  | 25 ++++++++
 modules/kogito-swf-builder/module.yaml        |  2 +-
 rhpam-kogito-builder-rhel8-overrides.yaml     |  2 +-
 .../kogito-s2i-builder-native.feature         |  2 +-
 tests/features/kogito-swf-builder.feature     |  2 +-
 10 files changed, 91 insertions(+), 46 deletions(-)
 create mode 100644 modules/kogito-graalvm-installer/22.x-java-11/configure
 create mode 100644 modules/kogito-graalvm-installer/22.x-java-11/module.yaml

diff --git a/README.md b/README.md
index 10eb7db3570..717ce124ccc 100644
--- a/README.md
+++ b/README.md
@@ -28,11 +28,12 @@ Table of Contents
   - [Kogito Images Requirements](#kogito-images-requirements)
   - [Kogito Images JVM Memory Management](#kogito-images-jvm-memory-management)
   - [Kogito Runtime and Builder Images](#kogito-runtime-and-builder-images)
-    - [Kogito s2i Builder Images](#kogito-s2i-builder-images)
+    - [Kogito Builder Images](#kogito-builder-images)
+      - [Kogito swf Builder Image usage](#kogito-swf-builder-image-usage)
       - [Kogito s2i Builder Image usage](#kogito-s2i-builder-image-usage)
       - [Kogito s2i Builder Image example](#kogito-s2i-builder-image-example)
-        - [Builder Image Examples with Quarkus](#builder-image-example-with-quarkus)
-        - [Builder Image Examples with Springboot](#builder-image-example-with-springboot)
+        - [S2i Builder Image Example with Quarkus](#s2i-builder-image-example-with-quarkus)
+        - [S2i Builder Image Example with Springboot](#s2i-builder-image-example-with-springboot)
       - [Improving Build Time](#improving-build-time)
         - [Using incremental builds](#using-incremental-builds)
         - [Using a Maven mirror](#using-a-maven-mirror)
@@ -44,13 +45,13 @@ Table of Contents
         - [Kogito Runtime JVM Image usage](#kogito-runtime-jvm-image-usage)
         - [Kogito Runtime JVM Image examples](#kogito-runtime-jvm-image-examples)
       - [Kogito Runtime Native Image](#kogito-runtime-native-image)
-        - [Kogito Runtime Native Image usage](#kogito-runtime-native-image-usage)
-        - [Kogito Runtime Native Image example](#kogito-runtime-native-image-example)
+        - [Kogito Runtime Native Image Usage](#kogito-runtime-native-image-usage)
+        - [Kogito Runtime Native Image Example](#kogito-runtime-native-image-example)
   - [Kogito Component Images](#kogito-component-images)
     - [Kogito Data Index Component Images](#kogito-data-index-component-images)
-    - [Kogito Trusty Component Image](#kogito-trusty-component-image)
     - [Kogito Explainability Component Image](#kogito-explainability-component-image)
-    - [Kogito Jobs Service Component Image](#kogito-jobs-service-component-image)
+    - [Kogito Trusty Component Image](#kogito-trusty-component-image)
+    - [Kogito Jobs Service Component Images](#kogito-jobs-service-component-images)
     - [Kogito Management Console Component Image](#kogito-management-console-component-image)
     - [Kogito Task Console Component Image](#kogito-task-console-component-image)
     - [Kogito Trusty UI Component Image](#kogito-trusty-ui-component-image)
@@ -100,7 +101,7 @@ To interact with Kogito images, you would need to install the needed dependencie
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
         * used to perform local s2i images using some of the [builder images](#builder-images)
-    * [GraalVM 21.3.1](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-21.3.1) Java 11 or higher
+    * [GraalVM 22.2.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-22.2.0) Java 11 or higher
         * Useful to test Kogito apps on native mode before create a Container image with it.
     * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
         
@@ -166,8 +167,8 @@ When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a
 
 The Kogito s2i Builder Image is equipped with the following components:
 
- * GraalVM 21.3.1-java11
- * OpenJDK 11.0.6
+ * GraalVM 22.2.0-java11
+ * OpenJDK 11+
  * Maven 3.8.6
  
 For more information about what is installed on this image, take a look [here](kogito-s2i-builder-overrides.yaml) in the
diff --git a/kogito-jobs-service-allinone-overrides.yaml b/kogito-jobs-service-allinone-overrides.yaml
index e1b28bbb305..aa302abfa3d 100644
--- a/kogito-jobs-service-allinone-overrides.yaml
+++ b/kogito-jobs-service-allinone-overrides.yaml
@@ -4,43 +4,43 @@ name: "quay.io/kiegroup/kogito-jobs-service-allinone"
 description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
 
 labels:
-- name: "maintainer"
-  value: "kogito <bsig-cloud@redhat.com>"
-- name: "io.k8s.description"
-  value: "Runtime image for Kogito Jobs Service with all available jdbc providers"
-- name: "io.k8s.display-name"
-  value: "Kogito Jobs Service All-in-One"
-- name: "io.openshift.tags"
-  value: "kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Runtime image for Kogito Jobs Service with all available jdbc providers"
+  - name: "io.k8s.display-name"
+    value: "Kogito Jobs Service All-in-One"
+  - name: "io.openshift.tags"
+    value: "kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
 
 envs:
-- name: "SCRIPT_DEBUG"
-  example: "true"
-  description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-- name: "ENABLE_EVENTS"
-  example: "true"
-  description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
-- name: "JOBS_SERVICE_PERSISTENCE"
-  example: "mongodb"
-  description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral, infinispan, mongodb and infinispan, if empty, defaults to ephemeral"
+  - name: "SCRIPT_DEBUG"
+    example: "true"
+    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "ENABLE_EVENTS"
+    example: "true"
+    description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
+  - name: "JOBS_SERVICE_PERSISTENCE"
+    example: "mongodb"
+    description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral, infinispan, mongodb and infinispan, if empty, defaults to ephemeral"
 
 ports:
-- value: 8080
+  - value: 8080
 
 modules:
   install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.jobs.service.allinone
-  - name: org.kie.kogito.security.custom.truststores
-  - name: org.kie.kogito.jobs.service.common
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.openjdk
+      version: "11-headless"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.jobs.service.allinone
+    - name: org.kie.kogito.security.custom.truststores
+    - name: org.kie.kogito.jobs.service.common
 
 run:
   workdir: "/home/kogito"
diff --git a/kogito-s2i-builder-overrides.yaml b/kogito-s2i-builder-overrides.yaml
index 4aafa4850f2..6063111be7d 100644
--- a/kogito-s2i-builder-overrides.yaml
+++ b/kogito-s2i-builder-overrides.yaml
@@ -43,7 +43,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.graalvm.installer
-      version: "21.3.1-java-11"
+      version: "22.2.0-java-11"
     - name: org.kie.kogito.graalvm.scripts
     - name: org.kie.kogito.openjdk
       version: "11"
diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
index 5d900d0d19d..9ea0082da48 100644
--- a/kogito-swf-builder-overrides.yaml
+++ b/kogito-swf-builder-overrides.yaml
@@ -5,7 +5,7 @@ description: "Kogito Serverless Workflow base builder with Quarkus extensions li
 
 labels:
   - name: "org.quarkus.version"
-    value: "2.13.3.Final"
+    value: "2.14.0.Final"
 
 modules:
   install:
diff --git a/modules/kogito-graalvm-installer/22.x-java-11/configure b/modules/kogito-graalvm-installer/22.x-java-11/configure
new file mode 100644
index 00000000000..b16cd087e26
--- /dev/null
+++ b/modules/kogito-graalvm-installer/22.x-java-11/configure
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+architecture=$(uname -i)
+
+if [ "$architecture" != x86_64 ]; then
+    exit 0;
+fi
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+
+tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".tar.gz -C /usr/share
+mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr/share/graalvm
+
+#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
+mkdir -p "${KOGITO_HOME}"/ssl-libs
+cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
+cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
diff --git a/modules/kogito-graalvm-installer/22.x-java-11/module.yaml b/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
new file mode 100644
index 00000000000..468c552a726
--- /dev/null
+++ b/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
@@ -0,0 +1,25 @@
+schema_version: 1
+name: org.kie.kogito.graalvm.installer
+version: "22.2.0-java-11"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/usr/share/graalvm"
+  #version without prefix ce
+  - name: "GRAALVM_VERSION"
+    value: "22.2.0"
+  - name: "GRAALVM_JAVA_VERSION"
+    value: "11"
+
+artifacts:
+- name: graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
+  md5: 41a1653fcdee605a21d8e03763a861c4
+- name: native-image-installable-svm-java11-linux-amd64-22.2.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-amd64-22.2.0.jar
+  md5: 120c14c5db31732d4e1751c79b6dc8a8
+
+execute:
+- script: configure
\ No newline at end of file
diff --git a/modules/kogito-swf-builder/module.yaml b/modules/kogito-swf-builder/module.yaml
index 0bc381c37b0..23a443b4a40 100644
--- a/modules/kogito-swf-builder/module.yaml
+++ b/modules/kogito-swf-builder/module.yaml
@@ -14,7 +14,7 @@ envs:
     value: "1.0.0-SNAPSHOT"
     description: Please do not change
   - name: QUARKUS_VERSION
-    value: "2.13.3.Final"
+    value: "2.14.0.Final"
     description: Please do not change
   - name: QUARKUS_EXTENSIONS
     example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 77169934608..9eae18ce480 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -47,7 +47,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.graalvm.installer
-      version: "21.3.1-java-11"
+      version: "22.2.0-java-11"
     - name: org.kie.kogito.graalvm.scripts
     - name: org.kie.kogito.openjdk
       version: "11"
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 0db08c69186..08e8cd3c8ae 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -12,7 +12,7 @@ Feature: kogito-s2i-builder image native build tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 21.3.1
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.2.0
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 878512ed5a6..1a44f82ca8c 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.13.3.Final/quarkus-bom-2.13.3.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.14.0.Final/quarkus-bom-2.14.0.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
 

From 22df4d037825c86c7bb5a0ec82bbd6b2f366c385 Mon Sep 17 00:00:00 2001
From: kie-ci <kie-ci0@redhat.com>
Date: Thu, 17 Nov 2022 20:57:52 +0100
Subject: [PATCH 486/709] [main] Bump Quarkus version to 2.14.1.Final (#1373)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 kogito-swf-builder-overrides.yaml         | 2 +-
 modules/kogito-swf-builder/module.yaml    | 2 +-
 tests/features/kogito-swf-builder.feature | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
index 9ea0082da48..d567b82fac1 100644
--- a/kogito-swf-builder-overrides.yaml
+++ b/kogito-swf-builder-overrides.yaml
@@ -5,7 +5,7 @@ description: "Kogito Serverless Workflow base builder with Quarkus extensions li
 
 labels:
   - name: "org.quarkus.version"
-    value: "2.14.0.Final"
+    value: "2.14.1.Final"
 
 modules:
   install:
diff --git a/modules/kogito-swf-builder/module.yaml b/modules/kogito-swf-builder/module.yaml
index 23a443b4a40..bacb98c63b9 100644
--- a/modules/kogito-swf-builder/module.yaml
+++ b/modules/kogito-swf-builder/module.yaml
@@ -14,7 +14,7 @@ envs:
     value: "1.0.0-SNAPSHOT"
     description: Please do not change
   - name: QUARKUS_VERSION
-    value: "2.14.0.Final"
+    value: "2.14.1.Final"
     description: Please do not change
   - name: QUARKUS_EXTENSIONS
     example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 1a44f82ca8c..8f6df605bae 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.14.0.Final/quarkus-bom-2.14.0.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.14.1.Final/quarkus-bom-2.14.1.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
 

From 84bf54b9eef97f4cb7bbe80418d4bc22fa1e8eb4 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 21 Nov 2022 05:49:46 -0500
Subject: [PATCH 487/709] [main] Update version to 2.0.0-snapshot

---
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 08e8cd3c8ae..268ee1cdecb 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 94e40cfe9d5..57319495b8b 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index ff21b490177..66e02d8fb4a 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 299f8000818489328953d9984b0ba43d13cf9377 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Mon, 21 Nov 2022 10:10:43 -0300
Subject: [PATCH 488/709] [SRVLOGIC-58] - Cekit Image validator does not know
 about image osbs configuration container field (#1374)

Signed-off-by: spolti <fspolti@redhat.com>
---
 .ci/jenkins/Jenkinsfile                      | 2 +-
 .ci/jenkins/Jenkinsfile.deploy               | 2 +-
 .ci/jenkins/Jenkinsfile.setup-branch         | 2 +-
 .github/workflows/kogito-images-pr-check.yml | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index f9554fecbc4..3d76d6d839a 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.1/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index e440d3be3d3..841b356569b 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -134,7 +134,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.1/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 33387b584aa..44ad7b95f18 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -85,7 +85,7 @@ pipeline {
                 script {
                     dir(getRepoName()) {
                         sh '''
-                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.1/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                             tar -xzvf cekit-image-validator-runner.tgz
                             chmod +x cekit-image-validator-runner
                         '''
diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
index 1c3cab42d48..19d58b7bc7e 100644
--- a/.github/workflows/kogito-images-pr-check.yml
+++ b/.github/workflows/kogito-images-pr-check.yml
@@ -35,9 +35,12 @@ jobs:
         run: |
           chmod +x openshift-template-validator-linux-amd64
           mv openshift-template-validator-linux-amd64 ${HOME} 	
-      - name: validate imagestream
+      - name: validate kogito imagestream
         run: |
           ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
+      - name: validate logic imagestream
+        run: |
+          ${HOME}/openshift-template-validator-linux-amd64 validate -f logic-imagestream.yaml
 
   shellcheck:
     name: ShellCheck

From e6af9a197b4c05b0fe7001047dd8546c45ffa157 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 22 Nov 2022 15:35:07 +0100
Subject: [PATCH 489/709] Build `kogito-swf-builder` quarkus app locally
 (#1364)

* Build `kogito-swf-builder` quarkus app locally

* review comments
---
 .ci/jenkins/Jenkinsfile                       | 24 ++++---
 Makefile                                      |  2 +
 image.yaml                                    |  4 ++
 modules/kogito-maven/3.8.x/module.yaml        |  2 +-
 modules/kogito-s2i-core/module.yaml           |  4 --
 .../kogito-swf-builder/added/add-extension.sh | 13 ++--
 modules/kogito-swf-builder/added/build-app.sh | 13 ++--
 .../kogito-swf-builder/added/create-app.sh    | 15 ++--
 modules/kogito-swf-builder/configure.sh       |  5 ++
 modules/kogito-swf-builder/module.yaml        | 25 ++++---
 scripts/build-quarkus-app.sh                  | 69 +++++++++++++++++++
 11 files changed, 131 insertions(+), 45 deletions(-)
 create mode 100755 scripts/build-quarkus-app.sh

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 3d76d6d839a..848b458f383 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -1,5 +1,7 @@
 @Library('jenkins-pipeline-shared-libraries')_
 
+import org.kie.jenkins.MavenCommand
+
 changeAuthor = env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepoGitUrl) : (env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR)
 changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
 changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
@@ -7,7 +9,9 @@ changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 BUILD_FAILED_IMAGES = []
 
 pipeline {
-    agent { label 'kogito-image-slave && !built-in' }
+    agent { 
+        label 'kogito-image-slave && !built-in' 
+    }
     tools {
         jdk 'kie-jdk11'
     }
@@ -27,14 +31,9 @@ pipeline {
                     if (env.MAVEN_MIRROR_REPOSITORY != null
                             && env.MAVEN_MIRROR_REPOSITORY != '') {
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
-                            }
+                    }
 
                     githubscm.checkoutIfExists('kogito-images', changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
-
-                    //Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                    if (env.MAVEN_MIRROR_URL != '') {
-                        sh 'python3 scripts/update-tests.py --ignore-self-signed-cert'
-                    }
                 }
             }
         }
@@ -52,9 +51,16 @@ pipeline {
                 }
             }
         }
-        stage('Prepare offline kogito-examples') {
+        stage('Prepare for tests') {
             steps {
-                sh 'make clone-repos'
+                script {
+                    //Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
+                    if (env.MAVEN_MIRROR_URL != '') {
+                        sh 'python3 scripts/update-tests.py --ignore-self-signed-cert'
+                    }
+
+                    sh 'make clone-repos'
+                }
             }
         }
         stage('Build & Test Images') {
diff --git a/Makefile b/Makefile
index 129d0e61cd4..103e46b2bde 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
+QUARKUS_VERSION := $(shell awk '/- name: "QUARKUS_VERSION"/,/description/' image.yaml | grep value | awk -F'"' '{print $$2}')
 SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
 KOGITO_APPS_TARGET_BRANCH ?= main
 KOGITO_APPS_TARGET_URI ?= https://github.com/kiegroup/kogito-apps.git
@@ -36,6 +37,7 @@ build-image: clone-repos _build-image
 _build-image:
 ifneq ($(ignore_build),true)
 	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
+	scripts/build-quarkus-app.sh ${image_name} $(QUARKUS_VERSION)
 	${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
 endif
 # if ignore_test is set to true, ignore the tests
diff --git a/image.yaml b/image.yaml
index e06f9b8b3b5..4b50dee03ba 100644
--- a/image.yaml
+++ b/image.yaml
@@ -19,6 +19,10 @@ modules:
 envs:
   - name: "KOGITO_VERSION"
     value: "2.0.0-SNAPSHOT"
+    description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
+  - name: "QUARKUS_VERSION"
+    value: "2.14.1.Final"
+    description: Defines the Quarkus version to be used by the builder images. Not intended to be changed by end user.
 
 packages:
   manager: microdnf
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 97fb20d38b9..8fda7b9e10a 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -5,7 +5,7 @@ version: "3.8.6"
 envs:
   - name: "MAVEN_VERSION"
     value: "3.8.6"
-  - name: " MAVEN_HOME"
+  - name: "MAVEN_HOME"
     value: "/usr/share/maven"
   - name: "MAVEN_SETTINGS_PATH"
     description: "The location of the settings.xml file"
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index d57761cb564..c2b2948539c 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -42,10 +42,6 @@ envs:
     description: ^ Defines the maven artifact for Quarkus Maven plugin, defaults to io.quarkus:quarkus-maven-plugin. If no version specified it will be detected automatically based on the current Kogito version.
     example: "io.quarkus:custom-plugin:custom.version"
 
-  - name: QUARKUS_VERSION
-    description: ^ Defines the Quarkus version to ve using during normal or from assets maven builds.
-    example: "2.23.0.Final"
-
   - name: QUARKUS_PLATFORM_GROUP_ID
     description: ^ Defines the Quarkus platform group id, defaults to io.quarkus.platform for community and com.redhat.quarkus.platform for product.
     example: "io.quarkus.custom"
diff --git a/modules/kogito-swf-builder/added/add-extension.sh b/modules/kogito-swf-builder/added/add-extension.sh
index 2b6c4101d1f..2010a345711 100755
--- a/modules/kogito-swf-builder/added/add-extension.sh
+++ b/modules/kogito-swf-builder/added/add-extension.sh
@@ -4,19 +4,20 @@ set -e
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 extensions="$1"
 
-# Call the configure-maven here
-source "${KOGITO_HOME}"/launch/configure-maven.sh
-configure
-
-source "${KOGITO_HOME}"/launch/logging.sh
+source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
+    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
     printenv
 fi
 
-cd "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+# Call the configure-maven here
+source "${script_dir_path}"/configure-maven.sh
+configure
+
+cd "${PROJECT_ARTIFACT_ID}"
 
 "${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
 io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":add-extension ${QUARKUS_ADD_EXTENSION_ARGS}\
diff --git a/modules/kogito-swf-builder/added/build-app.sh b/modules/kogito-swf-builder/added/build-app.sh
index 8c71c9f5a89..2f382b3057d 100755
--- a/modules/kogito-swf-builder/added/build-app.sh
+++ b/modules/kogito-swf-builder/added/build-app.sh
@@ -7,19 +7,20 @@ if [ ! -z "${resources_path}" ]; then
   resources_path="$(realpath "${resources_path}")"
 fi
 
-# Call the configure-maven here
-source "${KOGITO_HOME}"/launch/configure-maven.sh
-configure
-
-source "${KOGITO_HOME}"/launch/logging.sh
+source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
+    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
     printenv
 fi
 
-cd "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+# Call the configure-maven here
+source "${script_dir_path}"/configure-maven.sh
+configure
+
+cd "${PROJECT_ARTIFACT_ID}"
 
 if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
   ${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}"
diff --git a/modules/kogito-swf-builder/added/create-app.sh b/modules/kogito-swf-builder/added/create-app.sh
index 38385330ccd..f5b90e4ad88 100755
--- a/modules/kogito-swf-builder/added/create-app.sh
+++ b/modules/kogito-swf-builder/added/create-app.sh
@@ -3,27 +3,26 @@ set -e
 
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 
-cd "${KOGITO_HOME}"
-
-# Call the configure-maven here
-source "${KOGITO_HOME}"/launch/configure-maven.sh
-configure
-
-source "${KOGITO_HOME}"/launch/logging.sh
+source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
+    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
     printenv
 fi
 
+# Call the configure-maven here
+source "${script_dir_path}"/configure-maven.sh
+configure
+
 "${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
 io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":create ${QUARKUS_CREATE_ARGS} \
 -DprojectGroupId="${PROJECT_GROUP_ID}" \
 -DprojectArtifactId="${PROJECT_ARTIFACT_ID}" \
 -DprojectVersionId="${PROJECT_VERSION}" \
 -DplatformVersion="${QUARKUS_VERSION}" \
--Dextensions="${quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing}"
+-Dextensions="${QUARKUS_EXTENSIONS}"
 
 cd "${PROJECT_ARTIFACT_ID}"
 
diff --git a/modules/kogito-swf-builder/configure.sh b/modules/kogito-swf-builder/configure.sh
index 064d64b71d9..730884548d3 100644
--- a/modules/kogito-swf-builder/configure.sh
+++ b/modules/kogito-swf-builder/configure.sh
@@ -2,6 +2,7 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SOURCES_DIR=/tmp/artifacts
 ADDED_DIR="${SCRIPT_DIR}"/added
 LAUNCH_DIR="${KOGITO_HOME}"/launch
 
@@ -9,5 +10,9 @@ cp -v "${ADDED_DIR}"/create-app.sh "${LAUNCH_DIR}"
 cp -v "${ADDED_DIR}"/add-extension.sh "${LAUNCH_DIR}"
 cp -v "${ADDED_DIR}"/build-app.sh "${LAUNCH_DIR}"
 
+# Unzip Quarkus app and Maven repository
+unzip "${SOURCES_DIR}"/kogito-swf-builder-quarkus-app.zip -d "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/kogito-swf-builder-maven-repo.zip -d "${KOGITO_HOME}"/.m2/repository
+
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf-builder/module.yaml b/modules/kogito-swf-builder/module.yaml
index bacb98c63b9..224c81f8434 100644
--- a/modules/kogito-swf-builder/module.yaml
+++ b/modules/kogito-swf-builder/module.yaml
@@ -4,28 +4,31 @@ version: "2.0.0-snapshot"
 description: "Kogito Serverless Workflow builder with required extensions"
 
 envs:
+  - name: QUARKUS_EXTENSIONS
+    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
+    description: To add extension to your application
   - name: PROJECT_GROUP_ID
     value: "org.acme"
-    description: Please do not change
+    description: Please do not change. To change only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
   - name: PROJECT_ARTIFACT_ID
     value: "serverless-workflow-project"
-    description: Please do not change
+    description: Please do not change. To change only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
   - name: PROJECT_VERSION
     value: "1.0.0-SNAPSHOT"
-    description: Please do not change
-  - name: QUARKUS_VERSION
-    value: "2.14.1.Final"
-    description: Please do not change
-  - name: QUARKUS_EXTENSIONS
-    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
-    description: To add extension to your application
+    description: Please do not change. To change only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
   - name: QUARKUS_CREATE_ARGS
     example: -DnoCode
     description: To use only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
   - name: QUARKUS_ADD_EXTENSION_ARGS
     description: To use only if you plan to use the ${KOGITO_HOME}/launch/add-extension.sh
 
+# see build-quarkus-app.sh script, responsible for building those artifacts.
+# called by the Makefile before builds
+artifacts:
+  - path: /tmp/build/kogito-swf-builder/kogito-swf-builder-quarkus-app.zip
+    name: kogito-swf-builder-quarkus-app.zip
+  - path: /tmp/build/kogito-swf-builder/kogito-swf-builder-maven-repo.zip
+    name: kogito-swf-builder-maven-repo.zip
+
 execute:
   - script: configure.sh
-  - script: added/create-app.sh
-    user: kogito
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
new file mode 100755
index 00000000000..4e4a98fb456
--- /dev/null
+++ b/scripts/build-quarkus-app.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+# Parameters:
+#   1 - image name - can't  be empty.
+#   2 - git target branch - defaults to main
+#   3 - git target uri - defaults to https://github.com/kiegroup/kogito-apps.git
+
+# fast fail
+set -e
+set -o pipefail
+
+# Read entries before sourcing
+image_name="${1}"
+quarkus_version="${2}"
+
+if [ -z ${quarkus_version} ]; then
+    echo "Please provide the quarkus version"
+    exit 1
+fi
+
+case ${image_name} in
+    "kogito-swf-builder")        ;;
+    *)
+        echo "${image_name} is not a quarkus app image, exiting..."
+        exit 0
+        ;;
+esac
+
+
+script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
+
+target_tmp_dir="/tmp/build/kogito-swf-builder"
+build_target_dir="/tmp/kogito-swf-builder"
+mvn_local_repo="/tmp/temp_maven/kogito-swf-builder"
+
+rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
+rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
+mkdir -p ${mvn_local_repo}
+
+. ${script_dir_path}/setup-maven.sh "${build_target_dir}"/settings.xml
+
+echo "Copy current maven repo to maven context local repo ${mvn_local_repo}"
+cp -r ${HOME}/.m2/repository/* "${mvn_local_repo}"
+
+set -x
+
+echo "Create quarkus project to path ${build_target_dir}"
+cd ${build_target_dir}
+mvn -U "${MAVEN_OPTIONS}" \
+    io.quarkus.platform:quarkus-maven-plugin:"${quarkus_version}":create \
+    -Dmaven.repo.local=${mvn_local_repo} \
+    -DprojectGroupId="org.acme" \
+    -DprojectArtifactId="serverless-workflow-project" \
+    -DprojectVersionId="1.0.0-SNAPSHOT" \
+    -DplatformVersion="${quarkus_version}" \
+    -Dextensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing"
+
+echo "Build quarkus app"
+cd "serverless-workflow-project"
+mvn ${MAVEN_OPTIONS} -U clean install -DskipTests -Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false
+
+cd ${build_target_dir}
+echo "Zip and copy scaffold project"
+cd ${build_target_dir}/
+zip -r kogito-swf-builder-quarkus-app.zip serverless-workflow-project/ 
+cp -v kogito-swf-builder-quarkus-app.zip ${target_tmp_dir}/
+echo "Zip and copy maven repo"
+cd ${mvn_local_repo}
+zip -r kogito-swf-builder-maven-repo.zip *
+cp -v kogito-swf-builder-maven-repo.zip ${target_tmp_dir}/

From bb3d75e70b48cf3bbb756cf6733c044a9892313e Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 28 Nov 2022 16:31:33 +0100
Subject: [PATCH 490/709] KOGITO-8291 Setup Prod Jenkins check (#1372)

* update

* correction
---
 .ci/jenkins/Jenkinsfile          | 25 +++++++++++++++++++------
 .ci/jenkins/dsl/jobs.groovy      | 11 +++++++++--
 .github/pull_request_template.md | 14 +++++++++++++-
 Makefile                         |  6 ++++--
 scripts/common.py                |  8 ++++----
 5 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 848b458f383..d416fbd7bfe 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -9,8 +9,8 @@ changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
 BUILD_FAILED_IMAGES = []
 
 pipeline {
-    agent { 
-        label 'kogito-image-slave && !built-in' 
+    agent {
+        label 'kogito-image-slave && !built-in'
     }
     tools {
         jdk 'kie-jdk11'
@@ -34,6 +34,11 @@ pipeline {
                     }
 
                     githubscm.checkoutIfExists('kogito-images', changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
+
+                    if (isProdCI()) {
+                        // Prod fix to be able to build the image as a community one
+                        sh "echo '' > content_sets.yaml"
+                    }
                 }
             }
         }
@@ -113,7 +118,7 @@ pipeline {
         unsuccessful {
             script {
                 def additionalInfo = ''
-                if (getBuildFailedImages()){
+                if (getBuildFailedImages()) {
                     additionalInfo += 'Build failures on those images:\n'
                     getBuildFailedImages().each {
                         additionalInfo += "- ${it}\n"
@@ -151,11 +156,11 @@ void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
 }
 
 void buildImage(String imageName) {
-    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true"
+    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true ignore_tag=${isProdCI()}"
 }
 
 void testImage(String imageName) {
-    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true"
+    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true ignore_tag=${isProdCI()}"
 }
 
 String getMakeBuildImageArgs() {
@@ -192,5 +197,13 @@ String getWorkspacePath(String image) {
 }
 
 String[] getImages() {
-    return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
+    String listCmd = 'make list'
+    if (isProdCI()) {
+        listCmd += ' arg=--prod'
+    }
+    return sh(script: "${listCmd} | tr '\\n' ','", returnStdout: true).trim().split(',')
+}
+
+boolean isProdCI() {
+    return env.PROD_CI ? env.PROD_CI.toBoolean() : false
 }
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index d829fa49d7b..60142b9ac2e 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -30,6 +30,7 @@ setupDeployJob(Folder.RELEASE)
 setupPromoteJob(Folder.RELEASE)
 
 if (Utils.isProductizedBranch(this)) {
+    setupPrJob(true) // Prod CI job
     setupProdUpdateVersionJob()
 }
 
@@ -37,18 +38,24 @@ KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [],
     'python3 scripts/update-quarkus-version.py --bump-to %new_version%'
 ])
 
-
 /////////////////////////////////////////////////////////////////
 // Methods
 /////////////////////////////////////////////////////////////////
 
-void setupPrJob() {
+void setupPrJob(boolean isProdCI = false) {
     def jobParams = KogitoJobUtils.getDefaultJobParams(this)
     jobParams.pr.putAll([
         run_only_for_branches: [ "${GIT_BRANCH}" ],
         disable_status_message_error: true,
         disable_status_message_failure: true,
     ])
+    if (isProdCI) {
+        jobParams.job.name += '.prod'
+        jobParams.pr.trigger_phrase = '.*[j|J]enkins,?.*(re)run [prod|Prod|PROD].*'
+        jobParams.pr.trigger_phrase_only = true
+        jobParams.pr.commitContext = 'Prod'
+        jobParams.env.put('PROD_CI', true)
+    }
     KogitoJobTemplate.createPRJob(this, jobParams)
 }
 
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 89e499ab01c..16aa1014533 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,4 +9,16 @@ Please make sure your PR meets the following requirements:
 - [ ] Pull Request does not include fixes for issues other than the main ticket
 - [ ] Your feature/bug fix has a testcase that verifies it
 - [ ] You've tested the new feature/bug fix in an actual OpenShift cluster
-- [ ] You've added a [RELEASE_NOTES.md](RELEASE_NOTES.md) entry regarding this change
\ No newline at end of file
+- [ ] You've added a [RELEASE_NOTES.md](RELEASE_NOTES.md) entry regarding this change
+
+<details>
+<summary>
+How to retest this PR or trigger a specific build:
+</summary>
+
+- <b>(Re)run Jenkins tests</b>  
+  Please add comment: <b>Jenkins [test|retest] this</b>
+
+- <b>Prod tests</b>  
+  Please add comment: <b>Jenkins (re)run [prod|Prod|PROD]</b>
+</details>
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 103e46b2bde..0710204e86b 100644
--- a/Makefile
+++ b/Makefile
@@ -45,8 +45,10 @@ ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave ${test_options}
 	tests/shell/run.sh ${image_name}
 endif
-ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
-	${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
+ifneq ($(ignore_tag),true)
+    ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
+	    ${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
+    endif
 endif
 
 
diff --git a/scripts/common.py b/scripts/common.py
index 6900e5e3c2d..9c741e5bd70 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -11,11 +11,11 @@
 MODULES_DIR = "modules"
 
 COMMUNITY_PREFIX = 'kogito-'
-PRODUCT_PREFIX = 'rhpam-'
+PRODUCT_PREFIX = 'logic-'
 
 # imagestream file that contains all images, this file aldo needs to be updated.
 IMAGE_STREAM_FILENAME = "kogito-imagestream.yaml"
-PROD_IMAGE_STREAM_FILENAME = "rhpam-kogito-imagestream.yaml"
+PROD_IMAGE_STREAM_FILENAME = "logic-imagestream.yaml"
 # image.yaml file definition that needs to be updated
 IMAGE_FILENAME = "image.yaml"
 ARTIFACTS_VERSION_ENV_KEY = "KOGITO_VERSION"
@@ -64,7 +64,7 @@ def update_community_image_version(target_version):
 
 def update_prod_image_version(target_version):
     """
-    Update rhpam-*-overrides.yaml files version tag.
+    Update logic-*-overrides.yaml files version tag.
     :param target_version: version used to update the files
     """
     for img in sorted(get_prod_images()):
@@ -150,7 +150,7 @@ def get_community_module_dirs():
 
 def get_prod_module_dirs():
     """
-    Retrieve the RHPAM module directories
+    Retrieve the Logic module directories
     """
     return get_all_module_dirs(PRODUCT_PREFIX)
 

From 2caa530fc85d046ab95fd108dbe2b57d5680dadd Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 7 Dec 2022 12:10:30 -0300
Subject: [PATCH 491/709] [KOGITO-8304] - Document the usage of all-in-one
 jobs-service image (#1381)

* [KOGITO-8304] - Document the usage of all-in-one jobs-service image

Signed-off-by: spolti <fspolti@redhat.com>

* Update README.md

* Update README.md

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* Update README.md

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* Update README.md

Signed-off-by: spolti <fspolti@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 README.md                                     | 41 ++++++++++++++++++-
 .../container-compose-infinispan.yaml         | 28 +++++++++++++
 .../container-compose-mongodb.yaml            | 36 ++++++++++++++++
 .../container-compose-postgresql.yaml         | 30 ++++++++++++++
 .../jobs-service/infinispan/infinispan.xml    | 19 +++++++++
 contrib/jobs-service/sql/init.sql             | 20 +++++++++
 kogito-jobs-service-allinone-overrides.yaml   |  2 +-
 7 files changed, 173 insertions(+), 3 deletions(-)
 create mode 100644 contrib/jobs-service/container-compose-infinispan.yaml
 create mode 100644 contrib/jobs-service/container-compose-mongodb.yaml
 create mode 100644 contrib/jobs-service/container-compose-postgresql.yaml
 create mode 100644 contrib/jobs-service/infinispan/infinispan.xml
 create mode 100644 contrib/jobs-service/sql/init.sql

diff --git a/README.md b/README.md
index 717ce124ccc..574bd94a305 100644
--- a/README.md
+++ b/README.md
@@ -764,9 +764,46 @@ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-infi
 You should notice a few debug messages being printed in the system output.
 
 The ephemeral image does not have external dependencies like a backend persistence provider, it uses in-memory persistence
-while working with Jobs Services `allinone`, `infinispan`, `mongodb` and `postgresql` variants, it will need to have an Infinispan, MongoDB or PostgreSQL server,
-respectively, previously running.
+while working with Jobs Services `allinone`, `infinispan`, `mongodb` and `postgresql` variants, it will need to 
+have an Infinispan, MongoDB or PostgreSQL server, respectively, previously running.
 
+#### Jobs Services All-in-one 
+
+The Jobs Services All in One image provides the option to run any supported variant that we have at disposal, which are:
+
+- PostgreSQL
+- Infinispan
+- MongoDB
+- Ephemeral (default if no variant is specified)
+
+There are 3 exposed environment variables that can be used to configure the behaviour, which are:
+
+- SCRIPT_DEBUG: enable debug level of the image and its operations
+- ENABLE_EVENTS: enable the events add-on
+- JOBS_SERVICE_PERSISTENCE: select which persistence variant to use
+
+Note: As the Jobs Services are built on top of Quarkus, we can also set any configuration supported by Quarkus
+using either environment variables or system properties.
+
+Using environment variables:
+```bash
+podman run -it -e VARIABLE_NAME=value quay.io/kiegroup/kogito-jobs-service-allinone:latest
+```
+
+Using system properties:
+```bash
+podman run -it -e JAVA_OPTIONS='-Dmy.sys.prop1=value1 -Dmy.sys.prop2=value2' \
+  quay.io/kiegroup/kogito-jobs-service-allinone:latest
+```
+
+For convenience there are `container-compose` files that can be used to start the Jobs Service with the desired
+persistence variant, to use execute the following command:
+
+```bash
+podman-compose -f contrib/jobs-service/container-compose-<variant>.yaml up
+```
+
+The above command will spinup the Jobs-service so you can connect your application.
 
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Jobs Service
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications
diff --git a/contrib/jobs-service/container-compose-infinispan.yaml b/contrib/jobs-service/container-compose-infinispan.yaml
new file mode 100644
index 00000000000..11267f89e22
--- /dev/null
+++ b/contrib/jobs-service/container-compose-infinispan.yaml
@@ -0,0 +1,28 @@
+services:
+  infinispan:
+    image: infinispan/server:13.0.2.Final
+    container_name: infinispan
+    ports:
+      - "11222:11222"
+    command: "-c infinispan-demo.xml"
+    volumes:
+      - ./infinispan/infinispan.xml:/opt/infinispan/server/conf/infinispan-demo.xml
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:11222/rest/v2/cache-managers/default/health/status" ]
+      interval: 1s
+      timeout: 1s
+      retries: 50
+
+  jobs-service-all-in-one:
+    image: quay.io/kiegroup/kogito-jobs-service-allinone:latest
+    container_name: jobs-service
+    ports:
+      - "8080:8080"
+    depends_on:
+      infinispan:
+        condition: service_healthy
+    environment:
+      JOBS_SERVICE_PERSISTENCE: infinispan
+      KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false"
+      QUARKUS_INFINISPAN_CLIENT_SERVER_LIST: infinispan:11222
+      QUARKUS_INFINISPAN_CLIENT_USE_AUTH: "false"
\ No newline at end of file
diff --git a/contrib/jobs-service/container-compose-mongodb.yaml b/contrib/jobs-service/container-compose-mongodb.yaml
new file mode 100644
index 00000000000..bad8f3e97d3
--- /dev/null
+++ b/contrib/jobs-service/container-compose-mongodb.yaml
@@ -0,0 +1,36 @@
+services:
+  mongo:
+    image: mongo
+    container_name: mongo
+    restart: always
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: example
+
+  mongo-express:
+    image: mongo-express
+    container_name: mongo-express
+    restart: always
+    ports:
+      - 8081:8081
+    environment:
+      ME_CONFIG_MONGODB_ADMINUSERNAME: root
+      ME_CONFIG_MONGODB_ADMINPASSWORD: example
+      ME_CONFIG_MONGODB_URL: mongodb://root:example@mongo:27017/
+
+  jobs-service-all-in-one:
+    image: quay.io/kiegroup/kogito-jobs-service-allinone:latest
+    container_name: jobs-service
+    ports:
+      - "8080:8080"
+    depends_on:
+      - mongo
+    environment:
+      JOBS_SERVICE_PERSISTENCE: mongodb
+      QUARKUS_MONGODB_CONNECTION_STRING: mongodb://mongo:27017
+      QUARKUS_MONGODB_DATABASE: kogito
+      MONGODB_HOST: mongodb:27017
+      QUARKUS_MONGODB_CREDENTIALS_USERNAME: root
+      QUARKUS_MONGODB_CREDENTIALS_PASSWORD: example
+      QUARKUS_MONGODB_CREDENTIALS_AUTH_SOURCE: admin
+      KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false"
\ No newline at end of file
diff --git a/contrib/jobs-service/container-compose-postgresql.yaml b/contrib/jobs-service/container-compose-postgresql.yaml
new file mode 100644
index 00000000000..d3e022c1482
--- /dev/null
+++ b/contrib/jobs-service/container-compose-postgresql.yaml
@@ -0,0 +1,30 @@
+services:
+  postgres:
+    image: postgres:13.4-alpine3.14
+    container_name: postgres
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./sql:/docker-entrypoint-initdb.d/
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-q", "-d", "kogito", "-U", "kogito-user" ]
+      timeout: 45s
+      interval: 10s
+      retries: 50
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+
+  jobs-service-all-in-one:
+    image: quay.io/kiegroup/kogito-jobs-service-allinone:latest
+    container_name: jobs-service
+    ports:
+      - "8080:8080"
+    depends_on:
+      - postgres
+    environment:
+      JOBS_SERVICE_PERSISTENCE: postgresql
+      QUARKUS_DATASOURCE_JDBC_URL: "jdbc:postgresql://postgres:5432/kogito"
+      QUARKUS_DATASOURCE_USERNAME: kogito-user
+      QUARKUS_DATASOURCE_PASSWORD: kogito-pass
+      KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false"
\ No newline at end of file
diff --git a/contrib/jobs-service/infinispan/infinispan.xml b/contrib/jobs-service/infinispan/infinispan.xml
new file mode 100644
index 00000000000..726675509af
--- /dev/null
+++ b/contrib/jobs-service/infinispan/infinispan.xml
@@ -0,0 +1,19 @@
+<infinispan>
+  <cache-container name="default"/>
+  <server>
+    <interfaces>
+      <interface name='public'>
+        <inet-address value='${infinispan.bind.address:0.0.0.0}'/>
+      </interface>
+    </interfaces>
+    <socket-bindings default-interface='public' port-offset='0'>
+      <socket-binding name='default' port='11222'/>
+    </socket-bindings>
+    <endpoints>
+      <endpoint socket-binding='default'>
+        <hotrod-connector name="hotrod"/>
+        <rest-connector name="rest"/>
+      </endpoint>
+    </endpoints>
+  </server>
+</infinispan>
\ No newline at end of file
diff --git a/contrib/jobs-service/sql/init.sql b/contrib/jobs-service/sql/init.sql
new file mode 100644
index 00000000000..ee1a94650d7
--- /dev/null
+++ b/contrib/jobs-service/sql/init.sql
@@ -0,0 +1,20 @@
+CREATE ROLE "kogito-user" WITH
+    LOGIN
+    SUPERUSER
+    INHERIT
+    CREATEDB
+    CREATEROLE
+    NOREPLICATION
+    PASSWORD 'kogito-pass';
+
+CREATE DATABASE kogito
+    WITH
+    OWNER = "kogito-user"
+    ENCODING = 'UTF8'
+    LC_COLLATE = 'en_US.utf8'
+    LC_CTYPE = 'en_US.utf8'
+    TABLESPACE = pg_default
+    CONNECTION LIMIT = -1;
+
+GRANT ALL PRIVILEGES ON DATABASE kogito TO "kogito-user";
+GRANT ALL PRIVILEGES ON DATABASE kogito TO postgres;
diff --git a/kogito-jobs-service-allinone-overrides.yaml b/kogito-jobs-service-allinone-overrides.yaml
index aa302abfa3d..72311696201 100644
--- a/kogito-jobs-service-allinone-overrides.yaml
+++ b/kogito-jobs-service-allinone-overrides.yaml
@@ -24,7 +24,7 @@ envs:
     description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
   - name: "JOBS_SERVICE_PERSISTENCE"
     example: "mongodb"
-    description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral, infinispan, mongodb and infinispan, if empty, defaults to ephemeral"
+    description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral, postgresql, mongodb and infinispan, if empty, defaults to ephemeral"
 
 ports:
   - value: 8080

From c0f52db6e6fd3dce518983bacfa77ed3c464b919 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 15 Dec 2022 10:09:54 +0100
Subject: [PATCH 492/709] KOGITO-8062 DSL: Refactor environments and export to
 config (#1350)

---
 .ci/jenkins/dsl/jobs.groovy | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 60142b9ac2e..8567bec312a 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -8,7 +8,8 @@
 * https://github.com/kiegroup/kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
 */
 
-import org.kie.jenkins.jobdsl.model.Folder
+import org.kie.jenkins.jobdsl.model.JobType
+import org.kie.jenkins.jobdsl.utils.JobParamsUtils
 import org.kie.jenkins.jobdsl.KogitoJobTemplate
 import org.kie.jenkins.jobdsl.KogitoJobUtils
 import org.kie.jenkins.jobdsl.Utils
@@ -17,17 +18,17 @@ jenkins_path = '.ci/jenkins'
 
 // PR checks
 setupPrJob()
-setupDeployJob(Folder.PULLREQUEST_RUNTIMES_BDD)
+setupDeployJob(JobType.PULL_REQUEST, 'kogito-bdd')
 
 // Init branch
 createSetupBranchJob()
 
 // Nightly jobs
-setupDeployJob(Folder.NIGHTLY)
+setupDeployJob(JobType.NIGHTLY)
 
 // Release jobs
-setupDeployJob(Folder.RELEASE)
-setupPromoteJob(Folder.RELEASE)
+setupDeployJob(JobType.RELEASE)
+setupPromoteJob(JobType.RELEASE)
 
 if (Utils.isProductizedBranch(this)) {
     setupPrJob(true) // Prod CI job
@@ -43,7 +44,7 @@ KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [],
 /////////////////////////////////////////////////////////////////
 
 void setupPrJob(boolean isProdCI = false) {
-    def jobParams = KogitoJobUtils.getDefaultJobParams(this)
+    def jobParams = JobParamsUtils.getDefaultJobParams(this)
     jobParams.pr.putAll([
         run_only_for_branches: [ "${GIT_BRANCH}" ],
         disable_status_message_error: true,
@@ -60,7 +61,7 @@ void setupPrJob(boolean isProdCI = false) {
 }
 
 void createSetupBranchJob() {
-    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images', Folder.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
+    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
     jobParams.env.putAll([
         CI: true,
         REPO_NAME: 'kogito-images',
@@ -104,9 +105,9 @@ void createSetupBranchJob() {
     }
 }
 
-void setupDeployJob(Folder jobFolder) {
-    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images-deploy', jobFolder, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
-    if (jobFolder.isPullRequest()) {
+void setupDeployJob(JobType jobType, String envName = '') {
+    def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-images-deploy', jobType, envName, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
+    if (jobType == JobType.PULL_REQUEST) {
         jobParams.git.branch = '${BUILD_BRANCH_NAME}'
         jobParams.git.author = '${GIT_AUTHOR}'
         jobParams.git.project_url = Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository)
@@ -122,7 +123,7 @@ void setupDeployJob(Folder jobFolder) {
 
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
     ])
-    if (jobFolder.isPullRequest()) {
+    if (jobType == JobType.PULL_REQUEST) {
         jobParams.env.putAll([
             MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_PR_CHECKS_REPOSITORY_URL}",
         ])
@@ -144,7 +145,7 @@ void setupDeployJob(Folder jobFolder) {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
 
             stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
-            if (jobFolder.isPullRequest()) {
+            if (jobType == JobType.PULL_REQUEST) {
                 // author can be changed as param only for PR behavior, due to source branch/target, else it is considered as an env
                 stringParam('GIT_AUTHOR', "${GIT_AUTHOR_NAME}", 'Set the Git author to checkout')
             }
@@ -177,8 +178,8 @@ void setupDeployJob(Folder jobFolder) {
     }
 }
 
-void setupPromoteJob(Folder jobFolder) {
-    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images-promote', jobFolder, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote')
+void setupPromoteJob(JobType jobType) {
+    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-promote', jobType, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote')
     jobParams.env.putAll([
         CI: true,
         REPO_NAME: 'kogito-images',
@@ -239,7 +240,7 @@ void setupPromoteJob(Folder jobFolder) {
 }
 
 void setupProdUpdateVersionJob() {
-    def jobParams = KogitoJobUtils.getBasicJobParams(this, 'kogito-images-update-prod-version', Folder.TOOLS, "${jenkins_path}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images')
+    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-update-prod-version', JobType.TOOLS, "${jenkins_path}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images')
     jobParams.env.putAll([
         REPO_NAME: 'kogito-images',
 

From dcb82820eae736774dedc43bfbb324a008ec7e9a Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 15 Dec 2022 15:56:57 +0100
Subject: [PATCH 493/709] Automated pull request backporting workflow (#1390)

---
 .github/pull_request_template.md     | 16 +++++++++++
 .github/workflows/pr-backporting.yml | 43 ++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 .github/workflows/pr-backporting.yml

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 16aa1014533..f554a992c35 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -21,4 +21,20 @@ How to retest this PR or trigger a specific build:
 
 - <b>Prod tests</b>  
   Please add comment: <b>Jenkins (re)run [prod|Prod|PROD]</b>
+</details>
+
+<details>
+<summary>
+How to backport a pull request to a different branch?
+</summary>
+
+In order to automatically create a **backporting pull request** please add one or more labels having the following format `backport-<branch-name>`, where `<branch-name>` is the name of the branch where the pull request must be backported to (e.g., `backport-7.67.x` to backport the original PR to the `7.67.x` branch).
+
+> **NOTE**: **backporting** is an action aiming to move a change (usually a commit) from a branch (usually the main one) to another one, which is generally referring to a still maintained release branch. Keeping it simple: it is about to move a specific change or a set of them from one branch to another.
+
+Once the original pull request is successfully merged, the automated action will create one backporting pull request per each label (with the previous format) that has been added.
+
+If something goes wrong, the author will be notified and at this point a manual backporting is needed.
+
+> **NOTE**: this automated backporting is triggered whenever a pull request on `main` branch is labeled or closed, but both conditions must be satisfied to get the new PR created.
 </details>
\ No newline at end of file
diff --git a/.github/workflows/pr-backporting.yml b/.github/workflows/pr-backporting.yml
new file mode 100644
index 00000000000..e028a852b72
--- /dev/null
+++ b/.github/workflows/pr-backporting.yml
@@ -0,0 +1,43 @@
+name: Pull Request Backporting
+
+on:
+  pull_request_target:
+    types: [closed, labeled]
+    branches:
+      - main
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  compute-targets:
+    if: ${{ github.event.pull_request.state == 'closed' && github.event.pull_request.merged }}
+    runs-on: ubuntu-latest
+    outputs:
+      target-branches: ${{ steps.set-targets.outputs.targets }}
+    env:
+      LABELS: ${{ toJSON(github.event.pull_request.labels) }}
+    steps:
+      - name: Set target branches
+        id: set-targets
+        uses: kiegroup/kogito-pipelines/.ci/actions/parse-labels@main
+        with:
+          labels: ${LABELS}
+  
+  backporting:
+    if: ${{ github.event.pull_request.state == 'closed' && github.event.pull_request.merged && needs.compute-targets.outputs.target-branches != '[]' }}
+    name: "[${{ matrix.target-branch }}] - Backporting"
+    runs-on: ubuntu-latest
+    needs: compute-targets
+    strategy:
+      matrix: 
+        target-branch: ${{ fromJSON(needs.compute-targets.outputs.target-branches) }}
+      fail-fast: true
+    env:
+      REVIEWERS: ${{ toJSON(github.event.pull_request.requested_reviewers) }}
+    steps:
+      - name: Backporting
+        uses: kiegroup/kogito-pipelines/.ci/actions/backporting@main
+        with:
+          target-branch: ${{ matrix.target-branch }}
+          additional-reviewers: ${REVIEWERS}
\ No newline at end of file

From 022c970c9592e9674d5e81eaf3adcaba921a8216 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Thu, 15 Dec 2022 16:17:59 +0100
Subject: [PATCH 494/709] set logic-data-index-ephemeral image version to
 1.27.0 (#1389)

---
 logic-data-index-ephemeral-rhel8-overrides.yaml      | 6 +++---
 logic-imagestream.yaml                               | 6 +++---
 modules/kogito-data-index-ephemeral/prod/module.yaml | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/logic-data-index-ephemeral-rhel8-overrides.yaml b/logic-data-index-ephemeral-rhel8-overrides.yaml
index e3d1d089922..2b773d6d520 100644
--- a/logic-data-index-ephemeral-rhel8-overrides.yaml
+++ b/logic-data-index-ephemeral-rhel8-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8"
-version: "1.24.0"
+version: "1.27.0"
 description: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
@@ -33,7 +33,7 @@ modules:
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.ephemeral
-    version: "1.24.0"
+    version: "1.27.0"
   - name: org.kie.kogito.dataindex.common
   - name: org.kie.kogito.security.custom.truststores
 
@@ -52,7 +52,7 @@ osbs:
   extra_dir: osbs-extra/logic-data-index-ephemeral-rhel8
   repository:
     name: containers/openshift-serverless-1-logic-data-index-ephemeral
-    branch: openshift-serverless-1.24-rhel-8
+    branch: openshift-serverless-1.27-rhel-8
 
 run:
   workdir: "/home/kogito"
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
index c276821247c..fd3fe381fe2 100644
--- a/logic-imagestream.yaml
+++ b/logic-imagestream.yaml
@@ -15,15 +15,15 @@ items:
         openshift.io/provider-display-name: Kie Group
     spec:
       tags:
-      - name: '1.24.0'
+      - name: '1.27.0'
         annotations:
           description: Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
           iconClass: icon-jbpm
           tags: logic-data-index,kogito,data-index,data-index-ephemeral
           supports: quarkus
-          version: '1.24.0'
+          version: '1.27.0'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.24.0
+          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.27.0
diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml
index a4e4407b11f..41580e847ff 100644
--- a/modules/kogito-data-index-ephemeral/prod/module.yaml
+++ b/modules/kogito-data-index-ephemeral/prod/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.ephemeral
-version: "1.24.0"
+version: "1.27.0"
 
 artifacts:
   # data-index-service-inmemory-1.24.0.Final-redhat-00011-image-build.zip

From a4428c80105f49424c574045cb7b2bccf76f2ada Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Thu, 15 Dec 2022 20:55:57 +0100
Subject: [PATCH 495/709] [KIECLOUD-672] add kogito-pkg-update module (#1392)

---
 logic-data-index-ephemeral-rhel8-overrides.yaml |  1 +
 modules/kogito-pkg-update/configure             | 14 ++++++++++++++
 modules/kogito-pkg-update/module.yaml           |  7 +++++++
 3 files changed, 22 insertions(+)
 create mode 100644 modules/kogito-pkg-update/configure
 create mode 100644 modules/kogito-pkg-update/module.yaml

diff --git a/logic-data-index-ephemeral-rhel8-overrides.yaml b/logic-data-index-ephemeral-rhel8-overrides.yaml
index 2b773d6d520..c1bf097134e 100644
--- a/logic-data-index-ephemeral-rhel8-overrides.yaml
+++ b/logic-data-index-ephemeral-rhel8-overrides.yaml
@@ -36,6 +36,7 @@ modules:
     version: "1.27.0"
   - name: org.kie.kogito.dataindex.common
   - name: org.kie.kogito.security.custom.truststores
+  - name: org.kie.kogito.pkg-update
 
 packages:
   content_sets_file: content_sets.yaml
diff --git a/modules/kogito-pkg-update/configure b/modules/kogito-pkg-update/configure
new file mode 100644
index 00000000000..ef7ae411ca7
--- /dev/null
+++ b/modules/kogito-pkg-update/configure
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -euo pipefail
+
+for candidate in yum dnf microdnf; do
+    if command -v "$candidate"; then
+        mgr="$(command -v "$candidate")"
+        "$mgr" update -y
+        "$mgr" -y clean all
+        exit
+    fi
+done
+
+echo "cannot find a package manager" >&2
+exit 1
diff --git a/modules/kogito-pkg-update/module.yaml b/modules/kogito-pkg-update/module.yaml
new file mode 100644
index 00000000000..8ae2c1aa574
--- /dev/null
+++ b/modules/kogito-pkg-update/module.yaml
@@ -0,0 +1,7 @@
+schema_version: 1
+name: org.kie.kogito.pkg-update
+version: "2.0.0-snapshot"
+description: "Perform a system update via the package manager."
+
+execute:
+- script: configure

From b5e55ff476cfa84c6b3061cf5331539a5caab82f Mon Sep 17 00:00:00 2001
From: kie-ci <kie-ci0@redhat.com>
Date: Fri, 16 Dec 2022 09:22:43 +0100
Subject: [PATCH 496/709] [main] Bump quarkus version to 2.15.0.Final (#1383)

* [main] Bump Quarkus version to 2.15.0.CR1

* [main] Bump Quarkus version to 2.15.0.Final

* Update tests/features/kogito-swf-builder.feature

* update

* added backporting

* Revert "added backporting"

This reverts commit 7d28f58bf908136f0c33b4e4716284bdc9a09c49.

Co-authored-by: Jenkins CI <noreply@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
---
 image.yaml                                | 2 +-
 kogito-swf-builder-overrides.yaml         | 2 +-
 tests/features/kogito-swf-builder.feature | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/image.yaml b/image.yaml
index 4b50dee03ba..3f6b8f29a54 100644
--- a/image.yaml
+++ b/image.yaml
@@ -21,7 +21,7 @@ envs:
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_VERSION"
-    value: "2.14.1.Final"
+    value: "2.15.0.Final"
     description: Defines the Quarkus version to be used by the builder images. Not intended to be changed by end user.
 
 packages:
diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
index d567b82fac1..203e3754ed5 100644
--- a/kogito-swf-builder-overrides.yaml
+++ b/kogito-swf-builder-overrides.yaml
@@ -5,7 +5,7 @@ description: "Kogito Serverless Workflow base builder with Quarkus extensions li
 
 labels:
   - name: "org.quarkus.version"
-    value: "2.14.1.Final"
+    value: "2.15.0.Final"
 
 modules:
   install:
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 8f6df605bae..6117cb485f3 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.14.1.Final/quarkus-bom-2.14.1.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.15.0.Final/quarkus-bom-2.15.0.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
 

From 7d60095c65f4fb46851dc9dc3a8346f38ae9c2aa Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 19 Dec 2022 13:09:24 +0100
Subject: [PATCH 497/709] Correct update quarkus version script (#1398)

---
 scripts/common.py                 | 6 ++++++
 scripts/update-quarkus-version.py | 1 +
 2 files changed, 7 insertions(+)

diff --git a/scripts/common.py b/scripts/common.py
index 9c741e5bd70..dd54860432e 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -325,6 +325,12 @@ def retrieve_artifacts_version():
     except TypeError:
         raise
 
+def update_quarkus_version_env_in_image(quarkus_version):
+    """
+    Update `QUARKUS_VERSION` env var in image.yaml.
+    :param quarkus_version: quarkus version used to update image.yaml which contains the `QUARKUS_VERSION` env var
+    """
+    update_env_value(IMAGE_FILENAME, QUARKUS_VERSION_ENV_KEY, quarkus_version)
 
 def update_artifacts_version_env_in_image(artifacts_version):
     """
diff --git a/scripts/update-quarkus-version.py b/scripts/update-quarkus-version.py
index 59701fad85d..83166a9097c 100644
--- a/scripts/update-quarkus-version.py
+++ b/scripts/update-quarkus-version.py
@@ -36,6 +36,7 @@ def update_quarkus_version_in_behave_tests_repository_paths(quarkus_version):
     args = parser.parse_args()
 
     if args.bump_to:
+        common.update_quarkus_version_env_in_image(args.bump_to)
         common.update_images_env_value(common.QUARKUS_VERSION_ENV_KEY, args.bump_to, args.prod)
         common.update_modules_env_value(common.QUARKUS_VERSION_ENV_KEY, args.bump_to, args.prod)
 

From 779dbd2a693ffb92ba0350808ea57c882f925f67 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Mon, 9 Jan 2023 11:29:36 -0300
Subject: [PATCH 498/709] [KOGITO-8420/8421] - auto configure jvm and few
 tweaks (#1400)

- fixes KOGITO-8420
- fixes KOGITO-8421
- remove unnecessary files from builder image

Signed-off-by: Your Name <fspolti@redhat.com>
---
 Makefile                                      | 20 +++----
 README.md                                     | 15 ++---
 modules/kogito-base-builder/module.yaml       |  4 --
 .../added/java-default-options                |  2 +-
 .../kogito-swf-builder/added/add-extension.sh |  8 +--
 modules/kogito-swf-builder/added/build-app.sh |  4 ++
 .../kogito-swf-builder/added/create-app.sh    | 14 +++--
 .../kogito-swf-builder/added/jvm-settings.sh  | 29 ++++++++++
 modules/kogito-swf-builder/configure.sh       |  4 +-
 .../bats/kogito-swf-builder-jvm-settings.bats | 58 +++++++++++++++++++
 scripts/build-quarkus-app.sh                  | 14 +++--
 scripts/common.py                             | 14 ++++-
 scripts/list-images.py                        | 11 ++--
 scripts/run-bats.sh                           |  7 ++-
 tests/features/kogito-swf-builder.feature     |  8 +--
 .../shell/kogito-swf-builder/build-and-run.sh | 22 ++++---
 .../kogito-swf-builder/resources/Dockerfile   |  2 +
 tests/test-apps/clone-repo.sh                 |  7 ++-
 18 files changed, 172 insertions(+), 71 deletions(-)
 delete mode 100644 modules/kogito-base-builder/module.yaml
 create mode 100755 modules/kogito-swf-builder/added/jvm-settings.sh
 create mode 100644 modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats

diff --git a/Makefile b/Makefile
index 0710204e86b..3ac22b4221d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ QUARKUS_VERSION := $(shell awk '/- name: "QUARKUS_VERSION"/,/description/' image
 SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
 KOGITO_APPS_TARGET_BRANCH ?= main
 KOGITO_APPS_TARGET_URI ?= https://github.com/kiegroup/kogito-apps.git
-BUILD_ENGINE := docker
+BUILD_ENGINE ?= docker
 .DEFAULT_GOAL := build
 CEKIT_CMD := cekit -v ${cekit_option}
 NATIVE := true
@@ -40,17 +40,17 @@ ifneq ($(ignore_build),true)
 	scripts/build-quarkus-app.sh ${image_name} $(QUARKUS_VERSION)
 	${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
 endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave ${test_options}
-	tests/shell/run.sh ${image_name}
-endif
+# tag with shortened version
 ifneq ($(ignore_tag),true)
     ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
 	    ${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
     endif
 endif
-
+# if ignore_test is set to true, ignore the tests
+ifneq ($(ignore_test),true)
+	${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave ${test_options}
+	tests/shell/run.sh ${image_name}
+endif
 
 # Build all images
 .PHONY: build-prod
@@ -83,11 +83,11 @@ _push:
 .PHONY: push-image
 image_name=
 push-image:
-	docker push quay.io/kiegroup/${image_name}:${IMAGE_VERSION}
-	docker push quay.io/kiegroup/${image_name}:latest
+	${BUILD_ENGINE} push quay.io/kiegroup/${image_name}:${IMAGE_VERSION}
+	${BUILD_ENGINE} push quay.io/kiegroup/${image_name}:latest
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	@echo "${SHORTENED_LATEST_VERSION} will be pushed"
-	docker push quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
+	${BUILD_ENGINE} push quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
 endif
 
 
diff --git a/README.md b/README.md
index 574bd94a305..126128dff94 100644
--- a/README.md
+++ b/README.md
@@ -174,31 +174,26 @@ The Kogito s2i Builder Image is equipped with the following components:
 For more information about what is installed on this image, take a look [here](kogito-s2i-builder-overrides.yaml) in the
 **modules.install** section. 
 
+
 #### Kogito swf Builder Image usage
 
-The main purpose is the use in the Kogito Serverless operator as a builder
+The main purpose of this image is to be used within the Kogito Serverless Operator as a builder image, below you can find
+an example on how to use it:
 
 ```bash
 FROM quay.io/kiegroup/kogito-swf-builder:latest AS builder
 
-# Copy from build context to resources directory
+# Copy all files from current directory to the builder context
 COPY * ./resources/
 
 # Build app with given resources
 RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
 #=============================
 # Runtime Run
+ENTRYPOINT ['java', '-jar', 'target/quarkus-app/quarkus-run.jar']
 #=============================
-...
 ```
-but obvioulsy can be used to create other swf "flavours" images installing the org.kie.kogito.swf.builder and 
-adding in the configure script the addition of other extensions
-to reuse the scaffolding and the pom created byt the swf builder
 
-```bash
-"${MAVEN_HOME}"/bin/mvn -Dmaven.repo.local="${KOGITO_HOME}"/.m2/repository -U -B -s "${MAVEN_SETTINGS_PATH:-/home/kogito/.m2/settings.xml}" \
-quarkus:add-extension -Dextensions="${QUARKUS_EXTENSIONS:-my-other-kogito-quarkus-extension,my-custom-kogito-addons-quarkus-extension}"
-```
 
 #### Kogito s2i Builder Image usage
 
diff --git a/modules/kogito-base-builder/module.yaml b/modules/kogito-base-builder/module.yaml
deleted file mode 100644
index db2f97e83fa..00000000000
--- a/modules/kogito-base-builder/module.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.base.builder
-version: "2.0.0-snapshot"
-description: "Kogito base builder"
diff --git a/modules/kogito-dynamic-resources/added/java-default-options b/modules/kogito-dynamic-resources/added/java-default-options
index d4c1900ffc3..5b4c78aa065 100644
--- a/modules/kogito-dynamic-resources/added/java-default-options
+++ b/modules/kogito-dynamic-resources/added/java-default-options
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # =================================================================
 # Detect whether running in a container and set appropriate options
 # for limiting Java VM resources
diff --git a/modules/kogito-swf-builder/added/add-extension.sh b/modules/kogito-swf-builder/added/add-extension.sh
index 2010a345711..7ab934bfea7 100755
--- a/modules/kogito-swf-builder/added/add-extension.sh
+++ b/modules/kogito-swf-builder/added/add-extension.sh
@@ -18,8 +18,8 @@ source "${script_dir_path}"/configure-maven.sh
 configure
 
 cd "${PROJECT_ARTIFACT_ID}"
-
+export MAVEN_OPTS="$("${KOGITO_HOME}"/launch/jvm-settings.sh $(pwd))"
 "${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
-io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":add-extension ${QUARKUS_ADD_EXTENSION_ARGS}\
--DplatformVersion="${QUARKUS_VERSION}" \
--Dextensions="${extensions}"
+  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":add-extension ${QUARKUS_ADD_EXTENSION_ARGS}\
+  -DplatformVersion="${QUARKUS_VERSION}" \
+  -Dextensions="${extensions}"
diff --git a/modules/kogito-swf-builder/added/build-app.sh b/modules/kogito-swf-builder/added/build-app.sh
index 2f382b3057d..a47245560dd 100755
--- a/modules/kogito-swf-builder/added/build-app.sh
+++ b/modules/kogito-swf-builder/added/build-app.sh
@@ -27,12 +27,16 @@ if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
 fi
 
 # Copy resources if exists
+log_info "-> Copying files from ${resources_path}, if any..."
 if [ ! -z "${resources_path}" ]; then
   if [ -d "${resources_path}" ]; then
     cp -rv "${resources_path}"/* src/main/resources/
   else
     cp -rv "${resources_path}" src/main/resources/
   fi
+else
+  log_warn "-> Nothing to copy from ${resources_path}..."
 fi
 
+export MAVEN_OPTS="$("${KOGITO_HOME}"/launch/jvm-settings.sh ${resources_path})"
 "${MAVEN_HOME}"/bin/mvn ${MAVEN_ARGS_APPEND} -U -B clean install -DskipTests -s "${MAVEN_SETTINGS_PATH}" -Dquarkus.container-image.build=false
diff --git a/modules/kogito-swf-builder/added/create-app.sh b/modules/kogito-swf-builder/added/create-app.sh
index f5b90e4ad88..b3808a0b0d6 100755
--- a/modules/kogito-swf-builder/added/create-app.sh
+++ b/modules/kogito-swf-builder/added/create-app.sh
@@ -16,13 +16,15 @@ fi
 source "${script_dir_path}"/configure-maven.sh
 configure
 
+export MAVEN_OPTS="$("${KOGITO_HOME}"/launch/jvm-settings.sh)"
+
 "${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
-io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":create ${QUARKUS_CREATE_ARGS} \
--DprojectGroupId="${PROJECT_GROUP_ID}" \
--DprojectArtifactId="${PROJECT_ARTIFACT_ID}" \
--DprojectVersionId="${PROJECT_VERSION}" \
--DplatformVersion="${QUARKUS_VERSION}" \
--Dextensions="${QUARKUS_EXTENSIONS}"
+  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":create ${QUARKUS_CREATE_ARGS} \
+  -DprojectGroupId="${PROJECT_GROUP_ID}" \
+  -DprojectArtifactId="${PROJECT_ARTIFACT_ID}" \
+  -DprojectVersionId="${PROJECT_VERSION}" \
+  -DplatformVersion="${QUARKUS_VERSION}" \
+  -Dextensions="${QUARKUS_EXTENSIONS}"
 
 cd "${PROJECT_ARTIFACT_ID}"
 
diff --git a/modules/kogito-swf-builder/added/jvm-settings.sh b/modules/kogito-swf-builder/added/jvm-settings.sh
new file mode 100755
index 00000000000..280069db23b
--- /dev/null
+++ b/modules/kogito-swf-builder/added/jvm-settings.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Calculate the java memory for the given maven build.
+# It is based in the container-limits that can be found in
+# https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash/artifacts/opt/jboss/container/java/jvm/container-limits
+#
+# It respects the jvm.config of ${maven.projectBasedir}/.mvn/jvm.config
+# Parameters:
+#  $1 - resource directory, base dir or maven.projectBasedir
+script_name=`basename "$0" | cut -d"." -f1`
+set -e
+
+source "${KOGITO_HOME}"/launch/logging.sh
+
+base_dir=$1
+
+if [ "${base_dir}x" = "x" ]; then
+  log_info "{$script_name} resource directory is empty..."
+else
+  log_info "{$script_name} checking if .mvn/jvm.config exists."
+  if [ -f "${base_dir}/.mvn/jvm.config" ]; then
+    log_info "{$script_name} .mvn/jvm.config exists."
+    export JAVA_OPTIONS=$(cat ${base_dir}/.mvn/jvm.config)
+  else
+    log_info "{$script_name} .mvn/jvm.config does not exists, memory will be calculated based on container limits."
+  fi
+fi
+
+
+echo ${JAVA_OPTIONS} $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)
\ No newline at end of file
diff --git a/modules/kogito-swf-builder/configure.sh b/modules/kogito-swf-builder/configure.sh
index 730884548d3..1efc01840fa 100644
--- a/modules/kogito-swf-builder/configure.sh
+++ b/modules/kogito-swf-builder/configure.sh
@@ -6,9 +6,7 @@ SOURCES_DIR=/tmp/artifacts
 ADDED_DIR="${SCRIPT_DIR}"/added
 LAUNCH_DIR="${KOGITO_HOME}"/launch
 
-cp -v "${ADDED_DIR}"/create-app.sh "${LAUNCH_DIR}"
-cp -v "${ADDED_DIR}"/add-extension.sh "${LAUNCH_DIR}"
-cp -v "${ADDED_DIR}"/build-app.sh "${LAUNCH_DIR}"
+cp -v "${ADDED_DIR}"/* "${LAUNCH_DIR}"
 
 # Unzip Quarkus app and Maven repository
 unzip "${SOURCES_DIR}"/kogito-swf-builder-quarkus-app.zip -d "${KOGITO_HOME}"
diff --git a/modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats
new file mode 100644
index 00000000000..600587480f8
--- /dev/null
+++ b/modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats
@@ -0,0 +1,58 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME="${KOGITO_HOME}"
+export JBOSS_CONTAINER_JAVA_JVM_MODULE=/tmp/container/java/jvm
+mkdir -p "${KOGITO_HOME}"/launch
+mkdir -p "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+cp -r $BATS_TEST_DIRNAME/../../../kogito-dynamic-resources/added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
+chmod -R +x "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
+cp $BATS_TEST_DIRNAME/../../added/jvm-settings.sh "${KOGITO_HOME}"/launch/
+
+teardown() {
+    rm -rf "${KOGITO_HOME}"
+    rm -rf "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
+}
+
+@test "run jvm-settings with no custom conf" {
+    expected_status_code=0
+    mkdir -p $KOGITO_HOME/my-app
+
+    run ${KOGITO_HOME}/launch/jvm-settings.sh $KOGITO_HOME/my-app
+
+    echo "Output is: ${lines[@]}"
+    [[ "${lines[0]}" == *"INFO {jvm-settings} checking if .mvn/jvm.config exists."* ]]
+    [[ "${lines[1]}" == *"INFO {jvm-settings} .mvn/jvm.config does not exists, memory will be calculated based on container limits."* ]]
+    [[ "${lines[2]}" == *"-XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
+    [ "$status" = "${expected_status_code}" ]
+    echo "Result is [$status] and expected is [${expected_status_code}]" >&2
+}
+
+@test "run jvm-settings with no custom conf with no resource path parameter" {
+    expected_status_code=0
+    mkdir -p $KOGITO_HOME/my-app
+
+    run ${KOGITO_HOME}/launch/jvm-settings.sh
+
+    echo "Output is: ${lines[@]}"
+    [[ "${lines[0]}" == *"INFO {jvm-settings} resource directory is empty..."* ]]
+    [[ "${lines[1]}" == *"-XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
+    [ "$status" = "${expected_status_code}" ]
+    echo "Result is [$status] and expected is [${expected_status_code}]" >&2
+}
+
+@test "run jvm-settings with custom conf" {
+    expected_status_code=0
+    mkdir -p $KOGITO_HOME/my-app/.mvn
+    echo "-Xmx1024m -Xms512m -Xotherthing" > $KOGITO_HOME/my-app/.mvn/jvm.config
+
+    run ${KOGITO_HOME}/launch/jvm-settings.sh $KOGITO_HOME/my-app
+
+    echo "Output is: ${lines[@]}"
+    [[ "${lines[0]}" == *"INFO {jvm-settings} checking if .mvn/jvm.config exists."* ]]
+    [[ "${lines[1]}" == *"INFO {jvm-settings} .mvn/jvm.config exists."* ]]
+    [[ "${lines[2]}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
+    [ "$status" = "${expected_status_code}" ]
+    echo "Result is [$status] and expected is [${expected_status_code}]" >&2
+}
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index 4e4a98fb456..39525906f90 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -38,11 +38,7 @@ mkdir -p ${mvn_local_repo}
 
 . ${script_dir_path}/setup-maven.sh "${build_target_dir}"/settings.xml
 
-echo "Copy current maven repo to maven context local repo ${mvn_local_repo}"
-cp -r ${HOME}/.m2/repository/* "${mvn_local_repo}"
-
 set -x
-
 echo "Create quarkus project to path ${build_target_dir}"
 cd ${build_target_dir}
 mvn -U "${MAVEN_OPTIONS}" \
@@ -59,8 +55,16 @@ cd "serverless-workflow-project"
 mvn ${MAVEN_OPTIONS} -U clean install -DskipTests -Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false
 
 cd ${build_target_dir}
+
+#remove unnecessary files
+rm -rfv serverless-workflow-project/target
+rm -rfv serverless-workflow-project/src/main/resources/*
+rm -rfv serverless-workflow-project/src/main/docker
+rm -rfv serverless-workflow-project/.mvn/wrapper
+rm -rfv serverless-workflow-project/mvnw*
+rm -rfv serverless-workflow-project/src/test
+
 echo "Zip and copy scaffold project"
-cd ${build_target_dir}/
 zip -r kogito-swf-builder-quarkus-app.zip serverless-workflow-project/ 
 cp -v kogito-swf-builder-quarkus-app.zip ${target_tmp_dir}/
 echo "Zip and copy maven repo"
diff --git a/scripts/common.py b/scripts/common.py
index dd54860432e..224ffe622d6 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -40,6 +40,7 @@
                               "kogito-trusty-redis", "kogito-trusty-ui"}
 
 PROD_SUPPORTING_SERVICES_IMAGES = {"logic-data-index-ephemeral-rhel8"}
+SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-base-builder"}
 
 
 def yaml_loader():
@@ -194,7 +195,7 @@ def get_supporting_services_images(is_prod_image):
     return SUPPORTING_SERVICES_IMAGES
 
 
-def is_supporting_services_image(image_name, prod=False):
+def is_supporting_services_or_swf_builder(image_name, prod=False):
     """
     Raise an error if the given image is not a supporting service
     """
@@ -203,8 +204,15 @@ def is_supporting_services_image(image_name, prod=False):
         if image_name not in PROD_SUPPORTING_SERVICES_IMAGES:
             raise RuntimeError('{} is not a productized supporting service'.format(image_name))
     else:
-        if image_name not in SUPPORTING_SERVICES_IMAGES:
-            raise RuntimeError('{} is not a supporting service'.format(image_name))
+        if image_name not in SUPPORTING_SERVICES_IMAGES and image_name not in SWF_BUILDER_IMAGES:
+            raise RuntimeError('{} is not a supporting service or a swf builder image.'.format(image_name))
+
+
+def get_swf_builder_images():
+    """
+    Raise an error if the given image is not a supporting service
+    """
+    return SWF_BUILDER_IMAGES
 
 
 def update_modules_version(target_version, prod=False):
diff --git a/scripts/list-images.py b/scripts/list-images.py
index 47d17a0c10b..935ccf5b8cd 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -15,20 +15,23 @@
     parser = argparse.ArgumentParser(
         description='Kogito Version Manager - List Images by Community and Product version')
     parser.add_argument('--prod', default=False, action='store_true', help='List product images')
+    parser.add_argument('--swf-builder', default=False, action='store_true', help='List swf builder images')
     parser.add_argument('-s', '--supporting-services', default=False, action='store_true',
                         help='List Supporting Services images')
-    parser.add_argument('-is', '--is-supporting-services', default=False, type=str,
-                        help='Query the given image, if not found raise exception.')
+    parser.add_argument('-is', '--is_supporting_services_or_swf_builder', default=False, type=str,
+                        help='Query the given supporting service or swf builder image, if not found raise exception.')
 
     args = parser.parse_args()
 
     images = []
-    if args.is_supporting_services:
-        common.is_supporting_services_image(args.is_supporting_services, args.prod)
+    if args.is_supporting_services_or_swf_builder:
+        common.is_supporting_services_or_swf_builder(args.is_supporting_services_or_swf_builder, args.prod)
     elif args.supporting_services:
         images = common.get_supporting_services_images(args.prod)
     elif args.prod:
         images = common.get_prod_images()
+    elif args.swf_builder:
+        images = common.get_swf_builder_images()
     else:
         images = common.get_community_images()
 
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 1b9bf8eb416..084ec35264d 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -8,7 +8,7 @@ else
     git clone https://github.com/bats-core/bats-core.git
     ./bats-core/install.sh bats
     rm -rf bats-core
-fi 
+fi
 
 echo  "----> running bats on kogito-trusty-common"
 ./bats/bin/bats modules/kogito-trusty-common/tests/bats
@@ -41,4 +41,7 @@ echo "----> running bats on kogito-persistence"
 ./bats/bin/bats modules/kogito-persistence/tests/bats
 
 echo "----> running bats on kogito-s2i-core"
-./bats/bin/bats modules/kogito-s2i-core/tests/bats
\ No newline at end of file
+./bats/bin/bats modules/kogito-s2i-core/tests/bats
+
+echo "----> running bats on kogito-swf-builder"
+./bats/bin/bats modules/kogito-swf-builder/tests/bats
\ No newline at end of file
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 6117cb485f3..f5f389acaeb 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -7,10 +7,6 @@ Feature: SWF and Quarkus installation
       And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.15.0.Final/quarkus-bom-2.15.0.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
-
-  Scenario: Verify if a build run correctly
+  Scenario: verify if there is no dependencies with multiple versions in /home/kogito/.m2/repository
     When container is started with command bash
-    Then file /home/kogito/serverless-workflow-project/target/quarkus-app/quarkus-run.jar should exist
-      And file /home/kogito/serverless-workflow-project/target/classes/greet.sw.json should exist
-
-
+    Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-arc  | wc -l' in container and immediately check its output for 1
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/build-and-run.sh b/tests/shell/kogito-swf-builder/build-and-run.sh
index 29bc2dec83d..e436c467e18 100755
--- a/tests/shell/kogito-swf-builder/build-and-run.sh
+++ b/tests/shell/kogito-swf-builder/build-and-run.sh
@@ -1,27 +1,25 @@
 #!/usr/bin/env bash
 set -e
 
-script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+_BUILDER=${BUILD_ENGINE:-docker}
 
-docker build "${script_dir_path}"/resources -t quay.io/kiegroup/swf-test:latest
+script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-docker run -d -p 8080:8080 quay.io/kiegroup/swf-test:latest
+${_BUILDER} build --build-arg=SCRIPT_DEBUG=${SCRIPT_DEBUG:-false} "${script_dir_path}"/resources -t quay.io/kiegroup/swf-test:latest
 
-container_name=$(docker ps -n 1 --format '{{.Names}}')
-container_id=$(docker ps -n 1 --format '{{.ID}}')
-echo "Got container name ${container_name}"
-echo "Got container id ${container_id}"
+container_name="swf-test-$(echo $RANDOM | md5sum | head -c 5; echo;)"
+${_BUILDER} run -d --name ${container_name} -p 8080:8080 quay.io/kiegroup/swf-test:latest
 
 set -x
-CONTAINER_NAME="${container_name}" timeout 10s bash -c 'while [[ "$(docker inspect -f {{.State.Health.Status}} ${CONTAINER_NAME})" != "healthy" ]] ; do sleep 2 &&  docker inspect -f {{.State.Health.Status}} ${CONTAINER_NAME}; done'
-status_code=$? 
-if [[ "${status_code}" != 0 ]]; then
-  echo "ERROR: Container status: $(docker inspect -f {{.State.Health.Status}} ${container_name})"
+export _BUILDER; export container_name && timeout 10s bash -c 'result="unhealthy"; while [[ "$result" != "healthy" ]]; \
+ do sleep 2 && echo "status: $result"; result=$(${_BUILDER} inspect -f {{.State.Health.Status}} ${container_name}); done'
+if [[ "$?" != 0 ]]; then
+  echo "ERROR: Container status: $(${_BUILDER} inspect -f {{.State.Health.Status}} ${container_name})"
 else
   curl -X POST -H 'Content-Type:application/json' -H 'Accept:application/json' -d '{"workflowdata" : {"name": "John", "language": "English"}}' http://localhost:8080/jsongreet
   status_code=$?
 fi
 
-docker kill ${container_id}
+${_BUILDER} kill ${container_name}
 
 exit ${status_code}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/resources/Dockerfile b/tests/shell/kogito-swf-builder/resources/Dockerfile
index ae2a9ed147c..1c34bd1331f 100644
--- a/tests/shell/kogito-swf-builder/resources/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/Dockerfile
@@ -3,6 +3,8 @@ FROM quay.io/kiegroup/kogito-swf-builder:2.0 AS builder
 # Copy from build context to resources directory
 COPY * ./resources/
 
+ARG SCRIPT_DEBUG=false
+
 # Build app with given resources
 RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
 
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 4cf8028a89d..277be585936 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -16,7 +16,12 @@ if [ -n "${IMAGE_NAME}" ]; then
 fi
 
 set -e
-base_dir=`dirname $(realpath -s $0)`
+realPath="realpath"
+if [[ $OSTYPE == 'darwin'* ]]; then
+  realPath="grealpath"
+fi
+base_dir=`dirname $(${realPath} -s $0)`
+echo $base_dir
 . ${base_dir}/../../scripts/setup-maven.sh "$(mktemp)"
 
 MAVEN_OPTIONS="-U ${MAVEN_OPTIONS}"

From 785dafcb1be4f462ca51cfa6d57559a241fd161b Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Tue, 10 Jan 2023 09:42:35 -0300
Subject: [PATCH 499/709] [KOGITO-8429] - [SWF-Builder] Copy only the supported
 files into the builder context (#1401)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 RELEASE_NOTES.md                                     |  4 +++-
 modules/kogito-swf-builder/added/build-app.sh        | 12 +++++-------
 .../kogito-swf-builder/resources/.mvn/jvm.config     |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 tests/shell/kogito-swf-builder/resources/.mvn/jvm.config

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d88f385021e..63dcaa396ac 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,8 +1,10 @@
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-[KOGITO-7697](https://issues.redhat.com/browse/KOGITO-7697) - Group all Jobs service jdbc flavors on one container image
+[KOGITO-8420](https://issues.redhat.com/browse/KOGITO-8420) - [SW] Enable the JVM dynamic-resources configuration in the swf builder image
+[KOGITO-8429](https://issues.redhat.com/browse/KOGITO-8429) - [SW] Copy only the supported files into the builder context
 
 ## Bug Fixes
+[KOGITO-8421](https://issues.redhat.com/browse/KOGITO-8421) - [SW] Ensure that the Kogito SW builder image has the correct Quarkus version
 
 ## Known Issues
 
diff --git a/modules/kogito-swf-builder/added/build-app.sh b/modules/kogito-swf-builder/added/build-app.sh
index a47245560dd..b0631c9f6c8 100755
--- a/modules/kogito-swf-builder/added/build-app.sh
+++ b/modules/kogito-swf-builder/added/build-app.sh
@@ -27,16 +27,14 @@ if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
 fi
 
 # Copy resources if exists
+SUPPORTED_FILES=(".yaml" ".yml" ".json" ".properties" ".mvn/jvm.config")
 log_info "-> Copying files from ${resources_path}, if any..."
 if [ ! -z "${resources_path}" ]; then
-  if [ -d "${resources_path}" ]; then
-    cp -rv "${resources_path}"/* src/main/resources/
-  else
-    cp -rv "${resources_path}" src/main/resources/
-  fi
+  find "${resources_path}" -regex '.*\.\(yaml\|yml\|json\|properties\)$' -exec cp -v {} src/main/resources/ \;
+  find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
 else
-  log_warn "-> Nothing to copy from ${resources_path}..."
+  log_warn "-> Nothing to copy from ${resources_path}"
 fi
 
-export MAVEN_OPTS="$("${KOGITO_HOME}"/launch/jvm-settings.sh ${resources_path})"
+export MAVEN_OPTS="$("${KOGITO_HOME}"/launch/jvm-settings.sh `pwd`)"
 "${MAVEN_HOME}"/bin/mvn ${MAVEN_ARGS_APPEND} -U -B clean install -DskipTests -s "${MAVEN_SETTINGS_PATH}" -Dquarkus.container-image.build=false
diff --git a/tests/shell/kogito-swf-builder/resources/.mvn/jvm.config b/tests/shell/kogito-swf-builder/resources/.mvn/jvm.config
new file mode 100644
index 00000000000..df7809fac1f
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/resources/.mvn/jvm.config
@@ -0,0 +1 @@
+-Xms1024m
\ No newline at end of file

From 63d7eeb151d7875efb4b3d9b7470205813a03548 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Thu, 12 Jan 2023 05:22:01 -0300
Subject: [PATCH 500/709] =?UTF-8?q?[KOGITO-8421]=20-=20[SW]=20Ensure=20tha?=
 =?UTF-8?q?t=20the=20Kogito=20SW=20builder=20image=20has=20the=20=E2=80=A6?=
 =?UTF-8?q?=20(#1402)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-8421] - [SW] Ensure that the Kogito SW builder image has the correct Quarkus version

- Apply review suggestions

Signed-off-by: Spolti <fspolti@redhat.com>

* Update scripts/build-quarkus-app.sh

* Update modules/kogito-swf-builder/added/create-app.sh

Signed-off-by: Spolti <fspolti@redhat.com>
---
 .../kogito-swf-builder/added/add-extension.sh |  4 ++-
 modules/kogito-swf-builder/added/build-app.sh |  5 ++-
 .../kogito-swf-builder/added/create-app.sh    |  7 ++--
 .../kogito-swf-builder/added/jvm-settings.sh  | 27 ++++++---------
 .../bats/kogito-swf-builder-jvm-settings.bats | 34 ++++---------------
 scripts/build-quarkus-app.sh                  |  4 ++-
 tests/features/kogito-swf-builder.feature     |  2 +-
 .../shell/kogito-swf-builder/build-and-run.sh |  2 +-
 8 files changed, 35 insertions(+), 50 deletions(-)

diff --git a/modules/kogito-swf-builder/added/add-extension.sh b/modules/kogito-swf-builder/added/add-extension.sh
index 7ab934bfea7..3be8d83ca8c 100755
--- a/modules/kogito-swf-builder/added/add-extension.sh
+++ b/modules/kogito-swf-builder/added/add-extension.sh
@@ -18,7 +18,9 @@ source "${script_dir_path}"/configure-maven.sh
 configure
 
 cd "${PROJECT_ARTIFACT_ID}"
-export MAVEN_OPTS="$("${KOGITO_HOME}"/launch/jvm-settings.sh $(pwd))"
+# auto configure JVM settings
+source "${KOGITO_HOME}"/launch/jvm-settings.sh
+
 "${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
   io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":add-extension ${QUARKUS_ADD_EXTENSION_ARGS}\
   -DplatformVersion="${QUARKUS_VERSION}" \
diff --git a/modules/kogito-swf-builder/added/build-app.sh b/modules/kogito-swf-builder/added/build-app.sh
index b0631c9f6c8..13e77cbf50a 100755
--- a/modules/kogito-swf-builder/added/build-app.sh
+++ b/modules/kogito-swf-builder/added/build-app.sh
@@ -9,6 +9,7 @@ fi
 
 source "${script_dir_path}"/logging.sh
 
+
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
     export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
@@ -36,5 +37,7 @@ else
   log_warn "-> Nothing to copy from ${resources_path}"
 fi
 
-export MAVEN_OPTS="$("${KOGITO_HOME}"/launch/jvm-settings.sh `pwd`)"
+# auto configure JVM settings
+source "${KOGITO_HOME}"/launch/jvm-settings.sh
+
 "${MAVEN_HOME}"/bin/mvn ${MAVEN_ARGS_APPEND} -U -B clean install -DskipTests -s "${MAVEN_SETTINGS_PATH}" -Dquarkus.container-image.build=false
diff --git a/modules/kogito-swf-builder/added/create-app.sh b/modules/kogito-swf-builder/added/create-app.sh
index b3808a0b0d6..197e466d08e 100755
--- a/modules/kogito-swf-builder/added/create-app.sh
+++ b/modules/kogito-swf-builder/added/create-app.sh
@@ -16,7 +16,8 @@ fi
 source "${script_dir_path}"/configure-maven.sh
 configure
 
-export MAVEN_OPTS="$("${KOGITO_HOME}"/launch/jvm-settings.sh)"
+# auto configure JVM settings
+source "${KOGITO_HOME}"/launch/jvm-settings.sh
 
 "${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
   io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":create ${QUARKUS_CREATE_ARGS} \
@@ -28,4 +29,6 @@ export MAVEN_OPTS="$("${KOGITO_HOME}"/launch/jvm-settings.sh)"
 
 cd "${PROJECT_ARTIFACT_ID}"
 
-"${MAVEN_HOME}"/bin/mvn ${MAVEN_ARGS_APPEND} -U -B clean install -DskipTests -s "${MAVEN_SETTINGS_PATH}" -Dquarkus.container-image.build=false
+# Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
+# This avoids to have, for example, Quarkus BOMs or orther artifacts with multiple versions.
+"${MAVEN_HOME}"/bin/mvn ${MAVEN_ARGS_APPEND} -Dquarkus.version="${QUARKUS_VERSION}" -U -B clean install -DskipTests -s "${MAVEN_SETTINGS_PATH}" -Dquarkus.container-image.build=false
diff --git a/modules/kogito-swf-builder/added/jvm-settings.sh b/modules/kogito-swf-builder/added/jvm-settings.sh
index 280069db23b..b2c3e4ce9bf 100755
--- a/modules/kogito-swf-builder/added/jvm-settings.sh
+++ b/modules/kogito-swf-builder/added/jvm-settings.sh
@@ -4,26 +4,21 @@
 # https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash/artifacts/opt/jboss/container/java/jvm/container-limits
 #
 # It respects the jvm.config of ${maven.projectBasedir}/.mvn/jvm.config
-# Parameters:
-#  $1 - resource directory, base dir or maven.projectBasedir
-script_name=`basename "$0" | cut -d"." -f1`
+# Usage: add the following line in the desired script:
+#   source "${KOGITO_HOME}"/launch/jvm-settings.sh
+# If you want to provide the jvm.config, be sure to access the target directory before sourcing this script.
+
+
 set -e
 
 source "${KOGITO_HOME}"/launch/logging.sh
 
-base_dir=$1
-
-if [ "${base_dir}x" = "x" ]; then
-  log_info "{$script_name} resource directory is empty..."
+log_info "--> checking if .mvn/jvm.config exists."
+if [ -f ".mvn/jvm.config" ]; then
+  log_info "---> .mvn/jvm.config exists."
+  export JAVA_OPTIONS=$(cat .mvn/jvm.config)
 else
-  log_info "{$script_name} checking if .mvn/jvm.config exists."
-  if [ -f "${base_dir}/.mvn/jvm.config" ]; then
-    log_info "{$script_name} .mvn/jvm.config exists."
-    export JAVA_OPTIONS=$(cat ${base_dir}/.mvn/jvm.config)
-  else
-    log_info "{$script_name} .mvn/jvm.config does not exists, memory will be calculated based on container limits."
-  fi
+  log_info "---> .mvn/jvm.config does not exists, memory will be calculated based on container limits."
 fi
 
-
-echo ${JAVA_OPTIONS} $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)
\ No newline at end of file
+export MAVEN_OPTS="${JAVA_OPTIONS} $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
\ No newline at end of file
diff --git a/modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats
index 600587480f8..e00af2e8b90 100644
--- a/modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats
+++ b/modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats
@@ -19,40 +19,20 @@ teardown() {
     expected_status_code=0
     mkdir -p $KOGITO_HOME/my-app
 
-    run ${KOGITO_HOME}/launch/jvm-settings.sh $KOGITO_HOME/my-app
-
-    echo "Output is: ${lines[@]}"
-    [[ "${lines[0]}" == *"INFO {jvm-settings} checking if .mvn/jvm.config exists."* ]]
-    [[ "${lines[1]}" == *"INFO {jvm-settings} .mvn/jvm.config does not exists, memory will be calculated based on container limits."* ]]
-    [[ "${lines[2]}" == *"-XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
-    [ "$status" = "${expected_status_code}" ]
-    echo "Result is [$status] and expected is [${expected_status_code}]" >&2
-}
-
-@test "run jvm-settings with no custom conf with no resource path parameter" {
-    expected_status_code=0
-    mkdir -p $KOGITO_HOME/my-app
-
-    run ${KOGITO_HOME}/launch/jvm-settings.sh
+    source ${KOGITO_HOME}/launch/jvm-settings.sh
 
-    echo "Output is: ${lines[@]}"
-    [[ "${lines[0]}" == *"INFO {jvm-settings} resource directory is empty..."* ]]
-    [[ "${lines[1]}" == *"-XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
-    [ "$status" = "${expected_status_code}" ]
-    echo "Result is [$status] and expected is [${expected_status_code}]" >&2
+    echo "MAVEN_OPTS is: ${MAVEN_OPTS}"
+    [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
 }
 
 @test "run jvm-settings with custom conf" {
     expected_status_code=0
     mkdir -p $KOGITO_HOME/my-app/.mvn
+    cd $KOGITO_HOME/my-app
     echo "-Xmx1024m -Xms512m -Xotherthing" > $KOGITO_HOME/my-app/.mvn/jvm.config
 
-    run ${KOGITO_HOME}/launch/jvm-settings.sh $KOGITO_HOME/my-app
+    source ${KOGITO_HOME}/launch/jvm-settings.sh
 
-    echo "Output is: ${lines[@]}"
-    [[ "${lines[0]}" == *"INFO {jvm-settings} checking if .mvn/jvm.config exists."* ]]
-    [[ "${lines[1]}" == *"INFO {jvm-settings} .mvn/jvm.config exists."* ]]
-    [[ "${lines[2]}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
-    [ "$status" = "${expected_status_code}" ]
-    echo "Result is [$status] and expected is [${expected_status_code}]" >&2
+    echo "MAVEN_OPTS is: ${MAVEN_OPTS}"
+    [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
 }
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index 39525906f90..a96f87b4338 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -52,7 +52,9 @@ mvn -U "${MAVEN_OPTIONS}" \
 
 echo "Build quarkus app"
 cd "serverless-workflow-project"
-mvn ${MAVEN_OPTIONS} -U clean install -DskipTests -Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false
+# Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
+# This avoids to have, for example, Quarkus BOMs or orther artifacts with multiple versions.
+mvn ${MAVEN_OPTIONS} -U clean install -DskipTests -Dquarkus.version="${quarkus_version}" -Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false
 
 cd ${build_target_dir}
 
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index f5f389acaeb..d2fc9c7ea62 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -9,4 +9,4 @@ Feature: SWF and Quarkus installation
 
   Scenario: verify if there is no dependencies with multiple versions in /home/kogito/.m2/repository
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-arc  | wc -l' in container and immediately check its output for 1
\ No newline at end of file
+    Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/build-and-run.sh b/tests/shell/kogito-swf-builder/build-and-run.sh
index e436c467e18..b2c6bd55aeb 100755
--- a/tests/shell/kogito-swf-builder/build-and-run.sh
+++ b/tests/shell/kogito-swf-builder/build-and-run.sh
@@ -12,7 +12,7 @@ ${_BUILDER} run -d --name ${container_name} -p 8080:8080 quay.io/kiegroup/swf-te
 
 set -x
 export _BUILDER; export container_name && timeout 10s bash -c 'result="unhealthy"; while [[ "$result" != "healthy" ]]; \
- do sleep 2 && echo "status: $result"; result=$(${_BUILDER} inspect -f {{.State.Health.Status}} ${container_name}); done'
+ do sleep 2 && result=$(${_BUILDER} inspect -f {{.State.Health.Status}} ${container_name}); echo "status: $result"; done'
 if [[ "$?" != 0 ]]; then
   echo "ERROR: Container status: $(${_BUILDER} inspect -f {{.State.Health.Status}} ${container_name})"
 else

From 6273e9e7cc0c214ce19cd032be011aa0e13a1878 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 16 Jan 2023 06:27:05 -0500
Subject: [PATCH 501/709] [main] Update version to 2.0.0-snapshot

---
 modules/kogito-pkg-update/module.yaml            | 2 +-
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/kogito-pkg-update/module.yaml b/modules/kogito-pkg-update/module.yaml
index 8ae2c1aa574..48d86464e69 100644
--- a/modules/kogito-pkg-update/module.yaml
+++ b/modules/kogito-pkg-update/module.yaml
@@ -4,4 +4,4 @@ version: "2.0.0-snapshot"
 description: "Perform a system update via the package manager."
 
 execute:
-- script: configure
+  - script: configure
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 268ee1cdecb..6ac0ea37190 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 57319495b8b..1b65066e6b2 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 66e02d8fb4a..4017e218cb1 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 7155066ab5f7eaa3793d7a9c2836adf829b40e2e Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Thu, 19 Jan 2023 12:21:08 -0300
Subject: [PATCH 502/709] [KOGITO-8472] - CeKit Validator Unrecognized field
 entrypoint (#1405)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 .ci/jenkins/Jenkinsfile              | 2 +-
 .ci/jenkins/Jenkinsfile.deploy       | 2 +-
 .ci/jenkins/Jenkinsfile.setup-branch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index d416fbd7bfe..096a8a43659 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -46,7 +46,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.3/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 841b356569b..4a7967d17fe 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -134,7 +134,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.3/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 44ad7b95f18..dbac26bda65 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -85,7 +85,7 @@ pipeline {
                 script {
                     dir(getRepoName()) {
                         sh '''
-                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.2/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.3/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                             tar -xzvf cekit-image-validator-runner.tgz
                             chmod +x cekit-image-validator-runner
                         '''

From 6b14ff59c42c9404cef19cd1562066e6d073c5ff Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Fri, 20 Jan 2023 13:52:39 -0300
Subject: [PATCH 503/709] [KOGITO-8509] - CeKit Validator Unrecognized field
 service (#1406)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 .ci/jenkins/Jenkinsfile              | 2 +-
 .ci/jenkins/Jenkinsfile.deploy       | 2 +-
 .ci/jenkins/Jenkinsfile.setup-branch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 096a8a43659..d30c4af0d91 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -46,7 +46,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.3/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.4/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 4a7967d17fe..d8201098c9c 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -134,7 +134,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.3/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.4/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index dbac26bda65..af84e17fd60 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -85,7 +85,7 @@ pipeline {
                 script {
                     dir(getRepoName()) {
                         sh '''
-                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.3/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.4/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                             tar -xzvf cekit-image-validator-runner.tgz
                             chmod +x cekit-image-validator-runner
                         '''

From d75c32eae1c9d40a2062cc29b312af409b6acf45 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 20 Jan 2023 17:54:54 +0100
Subject: [PATCH 504/709] KOGITO-8510 Solve kogito-swf-builder long builds
 (#1408)

* KOGITO-8510 Solve kogito-swf-builder long builds
---
 .../kogito-swf-builder/added/add-extension.sh |  9 ++++++---
 modules/kogito-swf-builder/added/build-app.sh |  8 +++++++-
 .../kogito-swf-builder/added/create-app.sh    |  7 ++++++-
 scripts/build-quarkus-app.sh                  | 19 +++++++++++++++----
 .../shell/kogito-swf-builder/build-and-run.sh | 10 ++++++++--
 .../kogito-swf-builder/resources/Dockerfile   | 13 ++++++++++---
 6 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/modules/kogito-swf-builder/added/add-extension.sh b/modules/kogito-swf-builder/added/add-extension.sh
index 3be8d83ca8c..e3a252003a3 100755
--- a/modules/kogito-swf-builder/added/add-extension.sh
+++ b/modules/kogito-swf-builder/added/add-extension.sh
@@ -21,7 +21,10 @@ cd "${PROJECT_ARTIFACT_ID}"
 # auto configure JVM settings
 source "${KOGITO_HOME}"/launch/jvm-settings.sh
 
-"${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
-  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":add-extension ${QUARKUS_ADD_EXTENSION_ARGS}\
+"${MAVEN_HOME}"/bin/mvn -U -B ${MAVEN_ARGS_APPEND} \
+  -s "${MAVEN_SETTINGS_PATH}" \
+  -Dquarkus.version="${QUARKUS_VERSION}" \
   -DplatformVersion="${QUARKUS_VERSION}" \
-  -Dextensions="${extensions}"
+  -Dextensions="${extensions}" \
+  ${QUARKUS_ADD_EXTENSION_ARGS} \
+  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":add-extension
diff --git a/modules/kogito-swf-builder/added/build-app.sh b/modules/kogito-swf-builder/added/build-app.sh
index 13e77cbf50a..3404ac8c481 100755
--- a/modules/kogito-swf-builder/added/build-app.sh
+++ b/modules/kogito-swf-builder/added/build-app.sh
@@ -24,6 +24,7 @@ configure
 cd "${PROJECT_ARTIFACT_ID}"
 
 if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
+  log_info "Adding extensions '${QUARKUS_EXTENSIONS}'"
   ${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}"
 fi
 
@@ -40,4 +41,9 @@ fi
 # auto configure JVM settings
 source "${KOGITO_HOME}"/launch/jvm-settings.sh
 
-"${MAVEN_HOME}"/bin/mvn ${MAVEN_ARGS_APPEND} -U -B clean install -DskipTests -s "${MAVEN_SETTINGS_PATH}" -Dquarkus.container-image.build=false
+"${MAVEN_HOME}"/bin/mvn -U -B ${MAVEN_ARGS_APPEND} \
+  -s "${MAVEN_SETTINGS_PATH}" \
+  -Dquarkus.version="${QUARKUS_VERSION}" \
+  -DskipTests \
+  -Dquarkus.container-image.build=false \
+  clean install
diff --git a/modules/kogito-swf-builder/added/create-app.sh b/modules/kogito-swf-builder/added/create-app.sh
index 197e466d08e..6c27f4d1a1c 100755
--- a/modules/kogito-swf-builder/added/create-app.sh
+++ b/modules/kogito-swf-builder/added/create-app.sh
@@ -31,4 +31,9 @@ cd "${PROJECT_ARTIFACT_ID}"
 
 # Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
 # This avoids to have, for example, Quarkus BOMs or orther artifacts with multiple versions.
-"${MAVEN_HOME}"/bin/mvn ${MAVEN_ARGS_APPEND} -Dquarkus.version="${QUARKUS_VERSION}" -U -B clean install -DskipTests -s "${MAVEN_SETTINGS_PATH}" -Dquarkus.container-image.build=false
+"${MAVEN_HOME}"/bin/mvn -U -B ${MAVEN_ARGS_APPEND} \
+  -s "${MAVEN_SETTINGS_PATH}" \
+  -Dquarkus.version="${QUARKUS_VERSION}" \
+  -DskipTests \
+  -Dquarkus.container-image.build=false \
+   clean install
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index a96f87b4338..0a0fff3fbca 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -41,20 +41,25 @@ mkdir -p ${mvn_local_repo}
 set -x
 echo "Create quarkus project to path ${build_target_dir}"
 cd ${build_target_dir}
-mvn -U "${MAVEN_OPTIONS}" \
-    io.quarkus.platform:quarkus-maven-plugin:"${quarkus_version}":create \
+mvn -U ${MAVEN_OPTIONS} \
     -Dmaven.repo.local=${mvn_local_repo} \
     -DprojectGroupId="org.acme" \
     -DprojectArtifactId="serverless-workflow-project" \
     -DprojectVersionId="1.0.0-SNAPSHOT" \
     -DplatformVersion="${quarkus_version}" \
-    -Dextensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing"
+    -Dextensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing" \
+    io.quarkus.platform:quarkus-maven-plugin:"${quarkus_version}":create
 
 echo "Build quarkus app"
 cd "serverless-workflow-project"
 # Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
 # This avoids to have, for example, Quarkus BOMs or orther artifacts with multiple versions.
-mvn ${MAVEN_OPTIONS} -U clean install -DskipTests -Dquarkus.version="${quarkus_version}" -Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false
+mvn -U ${MAVEN_OPTIONS} \
+    -DskipTests \
+    -Dquarkus.version="${quarkus_version}" \
+    -Dmaven.repo.local=${mvn_local_repo} \
+    -Dquarkus.container-image.build=false \
+    clean install
 
 cd ${build_target_dir}
 
@@ -66,6 +71,12 @@ rm -rfv serverless-workflow-project/.mvn/wrapper
 rm -rfv serverless-workflow-project/mvnw*
 rm -rfv serverless-workflow-project/src/test
 
+# Maven useless files
+# Needed to avoid Maven to automatically redownload from original Maven repository ...
+find ${mvn_local_repo} -name _remote.repositories -type f -delete
+find ${mvn_local_repo} -name _maven.repositories -type f -delete
+find ${mvn_local_repo} -name *.lastUpdated -type f -delete
+
 echo "Zip and copy scaffold project"
 zip -r kogito-swf-builder-quarkus-app.zip serverless-workflow-project/ 
 cp -v kogito-swf-builder-quarkus-app.zip ${target_tmp_dir}/
diff --git a/tests/shell/kogito-swf-builder/build-and-run.sh b/tests/shell/kogito-swf-builder/build-and-run.sh
index b2c6bd55aeb..64a9d8efe38 100755
--- a/tests/shell/kogito-swf-builder/build-and-run.sh
+++ b/tests/shell/kogito-swf-builder/build-and-run.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 set -e
 
 _BUILDER=${BUILD_ENGINE:-docker}
@@ -11,10 +12,15 @@ container_name="swf-test-$(echo $RANDOM | md5sum | head -c 5; echo;)"
 ${_BUILDER} run -d --name ${container_name} -p 8080:8080 quay.io/kiegroup/swf-test:latest
 
 set -x
-export _BUILDER; export container_name && timeout 10s bash -c 'result="unhealthy"; while [[ "$result" != "healthy" ]]; \
+set +e
+export _BUILDER; export container_name && timeout 20s bash -c 'result="not started"; while [[ "$result" != "healthy" ]]; \
  do sleep 2 && result=$(${_BUILDER} inspect -f {{.State.Health.Status}} ${container_name}); echo "status: $result"; done'
-if [[ "$?" != 0 ]]; then
+status_code=$?
+echo "Got status from timeout -> ${status_code}"
+set -e
+if [[ "${status_code}" != 0 ]]; then
   echo "ERROR: Container status: $(${_BUILDER} inspect -f {{.State.Health.Status}} ${container_name})"
+  ${_BUILDER} logs ${container_name}
 else
   curl -X POST -H 'Content-Type:application/json' -H 'Accept:application/json' -d '{"workflowdata" : {"name": "John", "language": "English"}}' http://localhost:8080/jsongreet
   status_code=$?
diff --git a/tests/shell/kogito-swf-builder/resources/Dockerfile b/tests/shell/kogito-swf-builder/resources/Dockerfile
index 1c34bd1331f..16741bdf4b1 100644
--- a/tests/shell/kogito-swf-builder/resources/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/Dockerfile
@@ -1,17 +1,24 @@
 FROM quay.io/kiegroup/kogito-swf-builder:2.0 AS builder
 
+# Kogito user
+USER 1001
+
+ARG QUARKUS_PACKAGE_TYPE="jar"
+ARG SCRIPT_DEBUG="true"
+ARG MAVEN_DOWNLOAD_OUTPUT="true"
+
 # Copy from build context to resources directory
 COPY * ./resources/
 
-ARG SCRIPT_DEBUG=false
-
 # Build app with given resources
 RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
 
 #=============================
 # Runtime Run
 #=============================
-FROM registry.access.redhat.com/ubi8/openjdk-11:latest
+FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:latest
+
+ARG QUARKUS_LAUNCH_DEVMODE=false
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
 # Default name is 'serverless-workflow-project'

From 0009444a9ee276eaa4665f49f61c7b738e310780 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 24 Jan 2023 10:04:53 +0100
Subject: [PATCH 505/709] Pipelines: Update Cekit path (#1407)

---
 .ci/jenkins/Jenkinsfile              | 14 +++++---
 .ci/jenkins/Jenkinsfile.deploy       | 50 +++++++++-------------------
 .ci/jenkins/Jenkinsfile.setup-branch | 10 ++++--
 3 files changed, 31 insertions(+), 43 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index d30c4af0d91..926550035da 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -61,10 +61,10 @@ pipeline {
                 script {
                     //Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
                     if (env.MAVEN_MIRROR_URL != '') {
-                        sh 'python3 scripts/update-tests.py --ignore-self-signed-cert'
+                        runPythonCommand('python3 scripts/update-tests.py --ignore-self-signed-cert')
                     }
 
-                    sh 'make clone-repos'
+                    runPythonCommand('make clone-repos')
                 }
             }
         }
@@ -156,11 +156,11 @@ void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
 }
 
 void buildImage(String imageName) {
-    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true ignore_tag=${isProdCI()}"
+    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true ignore_tag=${isProdCI()}")
 }
 
 void testImage(String imageName) {
-    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true ignore_tag=${isProdCI()}"
+    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true ignore_tag=${isProdCI()}")
 }
 
 String getMakeBuildImageArgs() {
@@ -201,9 +201,13 @@ String[] getImages() {
     if (isProdCI()) {
         listCmd += ' arg=--prod'
     }
-    return sh(script: "${listCmd} | tr '\\n' ','", returnStdout: true).trim().split(',')
+    return runPythonCommand("${listCmd} | tr '\\n' ','", true).trim().split(',')
 }
 
 boolean isProdCI() {
     return env.PROD_CI ? env.PROD_CI.toBoolean() : false
 }
+
+void runPythonCommand(String cmd, boolean stdout = false) {
+    return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
+}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index d8201098c9c..f9f6cad8f09 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -101,35 +101,12 @@ pipeline {
                     if (getKogitoArtifactsVersion()) {
                         versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
                     }
-                    sh versionCmd
+                    runPythonCommand(versionCmd)
 
                     commitChanges("Update project version to ${getProjectVersion()}")
                 }
             }
         }
-        // stage('Update Maven information') {
-        //     steps {
-        //         script {
-        //             // Update artifacts
-        //             updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
-        //             if (getMavenArtifactRepository() != '') {
-        //                 updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()} --ignore-self-signed-cert"
-        //             }
-        //
-        //             try {
-        //                 sh updateArtifactCmd
-        //             } catch (err) {
-        //                 unstable('Error while updating Maven artifacts. Please check logs.')
-        //             } finally {
-        //                 if (isThereAnyChanges()) {
-        //                     commitChanges('Updated Maven artifacts')
-        //                 } else {
-        //                     echo 'No changes to commit'
-        //                 }
-        //             }
-        //         }
-        //     }
-        // }
         stage('Validate CeKit Image and Modules descriptors') {
             steps {
                 script {
@@ -174,7 +151,7 @@ pipeline {
                         updateTestsCommand += ' --ignore-self-signed-cert'
                     }
                     // Launch update tests
-                    sh updateTestsCommand
+                    runPythonCommand(updateTestsCommand)
 
                     // Debug purpose in case of issue
                     sh 'cat tests/test-apps/clone-repo.sh'
@@ -182,7 +159,7 @@ pipeline {
                     sh 'cat tests/features/kogito-s2i-builder.feature'
 
                     // Prepare local examples
-                    sh 'make clone-repos'
+                    runPythonCommand('make clone-repos')
                 }
             }
         }
@@ -190,10 +167,10 @@ pipeline {
             steps {
                 script {
                     parallelStages = [:]
-                    getImages().each { image -> 
+                    getImages().each { image ->
                         initWorkspace(image)
                         String workspacePath = getWorkspacePath(image)
-                        parallelStages["Build&Test ${image}"] = { 
+                        parallelStages["Build&Test ${image}"] = {
                             stage("Build/Test ${image}") {
                                 dir(workspacePath) {
                                     try {
@@ -204,7 +181,7 @@ pipeline {
                                         util.archiveConsoleLog(image, 400)
                                         throw err
                                     }
-                                    if(!shouldSkipTests()) {
+                                    if (!shouldSkipTests()) {
                                         try {
                                             testImage(image)
                                         } catch (err) {
@@ -286,7 +263,7 @@ pipeline {
                         getBuiltImages().each {
                             prBody += "- ${it}\n"
                         }
-                        if (getBuildFailedImages()){
+                        if (getBuildFailedImages()) {
                             prBody += '\nBuild failures on those images:\n'
                             getBuildFailedImages().each {
                                 prBody += "- ${it}\n"
@@ -294,7 +271,7 @@ pipeline {
                         } else {
                             prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
                         }
-                        if (getTestFailedImages()){
+                        if (getTestFailedImages()) {
                             prBody += '\nTest failures on those images:\n'
                             getTestFailedImages().each {
                                 prBody += "- ${it}\n"
@@ -383,11 +360,11 @@ void cleanImages() {
 }
 
 void buildImage(String imageName) {
-    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true"
+    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true")
 }
 
 void testImage(String imageName) {
-    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true"
+    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true")
 }
 
 String getMakeBuildImageArgs() {
@@ -573,7 +550,6 @@ boolean isDeployLatestTag() {
     return params.DEPLOY_WITH_LATEST_TAG
 }
 
-
 ////////////////////////////////////////////////////////////////////////
 // Workspaces
 ////////////////////////////////////////////////////////////////////////
@@ -662,9 +638,13 @@ void setDeployPropertyIfNeeded(String key, def value) {
 }
 
 String[] getImages() {
-    return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
+    return runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
 }
 
 boolean isThereAnyChanges() {
     return sh(script: 'git status --porcelain', returnStdout: true).trim() != ''
 }
+
+void runPythonCommand(String cmd, boolean stdout = false) {
+    return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
+}
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index af84e17fd60..acbe0fbc683 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -75,7 +75,7 @@ pipeline {
                         if (getKogitoArtifactsVersion()) {
                             versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
                         }
-                        sh versionCmd
+                        runPythonCommand(versionCmd)
                     }
                 }
             }
@@ -220,7 +220,7 @@ void cleanImages() {
 }
 
 void buildImage(String imageName) {
-    sh "make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true"
+    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true")
 }
 
 String getMakeBuildImageArgs() {
@@ -444,7 +444,7 @@ String getMavenArtifactRepository() {
 }
 
 String[] getImages() {
-    return sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
+    return runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
 }
 
 MavenCommand getMavenCommand(String directory) {
@@ -456,3 +456,7 @@ MavenCommand getMavenCommand(String directory) {
 String getDroolsTargetBranch() {
     return util.calculateTargetReleaseBranch(getBuildBranch(), 7)
 }
+
+void runPythonCommand(String cmd, boolean stdout = false) {
+    return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
+}
\ No newline at end of file

From 2000d33af2609da9831ed2e6c0b0cffe17a3ae90 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 24 Jan 2023 10:51:41 +0100
Subject: [PATCH 506/709] KOGITO-8393 Clean release notes on branching (#1410)

* KOGITO-8393 Clean release notes on branching

* Update .ci/jenkins/Jenkinsfile.setup-branch
---
 .ci/jenkins/Jenkinsfile.setup-branch | 60 +++++++++++++++++++++-------
 RELEASE_NOTES.md                     |  1 -
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index acbe0fbc683..9178cc43ed9 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -103,6 +103,34 @@ pipeline {
                 }
             }
         }
+        stage('Clean release notes') {
+            when {
+                expression { isMainBranch() }
+            }
+            steps {
+                script {
+                    String releaseNotesFilename = 'RELEASE_NOTES.md'
+                    dir(getRepoName()) {
+                        sh "rm -rf ${releaseNotesFilename}"
+                        writeFile(file: releaseNotesFilename, text: getCleanedReleaseNotes())
+                    }
+                }
+            }
+        }
+        stage('Update branch') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        if (githubscm.isThereAnyChanges()) {
+                            githubscm.commitChanges("[${getBuildBranch()}] Update version to ${getKogitoVersion()}")
+                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
+                        } else {
+                            println '[WARN] no changes to commit'
+                        }
+                    }
+                }
+            }
+        }
         stage('Build Images') {
             steps {
                 script {
@@ -165,20 +193,6 @@ pipeline {
                 }
             }
         }
-        stage('Update branch') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        if (githubscm.isThereAnyChanges()) {
-                            githubscm.commitChanges("[${getBuildBranch()}] Update version to ${getKogitoVersion()}")
-                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
-                        } else {
-                            println '[WARN] no changes to commit'
-                        }
-                    }
-                }
-            }
-        }
     }
     post {
         unsuccessful {
@@ -447,6 +461,10 @@ String[] getImages() {
     return runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
 }
 
+boolean isMainBranch() {
+    return env.IS_MAIN_BRANCH?.toBoolean()
+}
+
 MavenCommand getMavenCommand(String directory) {
     return new MavenCommand(this, ['-fae', '-ntp'])
                 .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
@@ -457,6 +475,18 @@ String getDroolsTargetBranch() {
     return util.calculateTargetReleaseBranch(getBuildBranch(), 7)
 }
 
+String getCleanedReleaseNotes() {
+    return '''
+<!-- Keep them in alphabetical order -->
+## Enhancements
+
+## Bug Fixes
+
+## Known Issues
+
+'''
+}
+
 void runPythonCommand(String cmd, boolean stdout = false) {
     return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
-}
\ No newline at end of file
+}
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 63dcaa396ac..0192c08fd55 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -7,4 +7,3 @@
 [KOGITO-8421](https://issues.redhat.com/browse/KOGITO-8421) - [SW] Ensure that the Kogito SW builder image has the correct Quarkus version
 
 ## Known Issues
-

From 9e714fce830c76aab2671b68ee2ac1353fab41c8 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 27 Jan 2023 10:02:49 -0300
Subject: [PATCH 507/709] [KOGITO-8469] Adapt Kogito SWF Builder image to run
 quarkus devmode by default (#1404)

* [KOGITO-8469] Adapt Kogito SWF Builder image to run quarkus devmode by default

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Add RELEASE NOTES

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Add behave tests for running the app in devmode

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Remove service description from ports

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Forcing quarkus version to the runner

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Formatting runner command

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* Updating docs

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Apply suggestions from code review

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 README.md                                     | 17 +++++++++-
 RELEASE_NOTES.md                              |  6 +---
 kogito-swf-builder-overrides.yaml             |  6 ++++
 .../added/run-app-devmode.sh                  | 31 +++++++++++++++++++
 modules/kogito-swf-builder/module.yaml        |  6 ++++
 tests/features/kogito-swf-builder.feature     | 12 ++++++-
 6 files changed, 71 insertions(+), 7 deletions(-)
 create mode 100755 modules/kogito-swf-builder/added/run-app-devmode.sh

diff --git a/README.md b/README.md
index 126128dff94..21051bfa423 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,9 @@ For more information about what is installed on this image, take a look [here](k
 **modules.install** section. 
 
 
-#### Kogito swf Builder Image usage
+#### Kogito SWF (Serverless Workflow) Builder Image usage
+
+##### Using as a builder
 
 The main purpose of this image is to be used within the Kogito Serverless Operator as a builder image, below you can find
 an example on how to use it:
@@ -194,6 +196,19 @@ ENTRYPOINT ['java', '-jar', 'target/quarkus-app/quarkus-run.jar']
 #=============================
 ```
 
+##### Using for application development
+
+If you run the image, it will start an empty [Kogito Serverless Workflow](https://kiegroup.github.io/kogito-docs/serverlessworkflow/latest/index.html) application with [Quarkus Devmode](https://quarkus.io/guides/maven-tooling#dev-mode). This allows you to develop and to run quick tests locally without having to setup Maven or Java on your machine. You can have your workflows in your local file system mounted in the image so that you can see test the application live.
+
+To run the image for testing your local workflow files, run:
+
+```shell
+docker run -it --rm -p 8080:8080 -v <local_workflow_path>:/home/kogito/serverless-workflow-project/src/main/resources/workflows quay.io/kiegroup/kogito-swf-builder:latest
+```
+
+Replace `<local_workflow_path>` with your local filesystem containing your workflow files. You can test with the [example application](https://kiegroup.github.io/kogito-docs/serverlessworkflow/latest/getting-started/create-your-first-workflow-service.html#proc-creating-workflow).
+
+After the image bootstrap, you can access [http://localhost:8080/q/swagger-ui](http://localhost:8080/q/swagger-ui) and test the workflow application right away!
 
 #### Kogito s2i Builder Image usage
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0192c08fd55..b8ecc3091f1 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,9 +1,5 @@
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-[KOGITO-8420](https://issues.redhat.com/browse/KOGITO-8420) - [SW] Enable the JVM dynamic-resources configuration in the swf builder image
-[KOGITO-8429](https://issues.redhat.com/browse/KOGITO-8429) - [SW] Copy only the supported files into the builder context
-
-## Bug Fixes
-[KOGITO-8421](https://issues.redhat.com/browse/KOGITO-8421) - [SW] Ensure that the Kogito SW builder image has the correct Quarkus version
+[KOGITO-8469](https://issues.redhat.com/browse/KOGITO-8469) - [SW] Let Kogito Serverless Workflow Image Builder default to quarkus dev mode
 
 ## Known Issues
diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
index 203e3754ed5..a2476b80764 100644
--- a/kogito-swf-builder-overrides.yaml
+++ b/kogito-swf-builder-overrides.yaml
@@ -23,3 +23,9 @@ modules:
 run:
   workdir: "/home/kogito"
   user: 1001
+  entrypoint: 
+    - "/home/kogito/launch/run-app-devmode.sh"
+
+ports:
+  - value: 8080
+  - value: 5005
diff --git a/modules/kogito-swf-builder/added/run-app-devmode.sh b/modules/kogito-swf-builder/added/run-app-devmode.sh
new file mode 100755
index 00000000000..abe5898c772
--- /dev/null
+++ b/modules/kogito-swf-builder/added/run-app-devmode.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -e
+
+source "${KOGITO_HOME}"/launch/logging.sh
+
+if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+    set -x
+    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    printenv
+fi
+
+# Call the configure-maven here
+source "${KOGITO_HOME}"/launch/configure-maven.sh
+configure
+
+cd "${PROJECT_ARTIFACT_ID}"
+
+if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
+  ${KOGITO_HOME}/launch/add-extension.sh "${QUARKUS_EXTENSIONS}"
+fi
+
+# auto configure JVM settings
+source "${KOGITO_HOME}"/launch/jvm-settings.sh
+
+"${MAVEN_HOME}"/bin/mvn -U -B ${MAVEN_ARGS_APPEND} \
+  -s "${MAVEN_SETTINGS_PATH}" \
+  -DskipTests \
+  -Dquarkus.http.host=0.0.0.0 \
+  -Dquarkus.version="${QUARKUS_VERSION}" \
+  clean compile quarkus:dev
diff --git a/modules/kogito-swf-builder/module.yaml b/modules/kogito-swf-builder/module.yaml
index 224c81f8434..a4090503fe8 100644
--- a/modules/kogito-swf-builder/module.yaml
+++ b/modules/kogito-swf-builder/module.yaml
@@ -21,6 +21,12 @@ envs:
     description: To use only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
   - name: QUARKUS_ADD_EXTENSION_ARGS
     description: To use only if you plan to use the ${KOGITO_HOME}/launch/add-extension.sh
+  - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
+    description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
+    value: "false"
+  - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
+    description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
+    value: "false"
 
 # see build-quarkus-app.sh script, responsible for building those artifacts.
 # called by the Makefile before builds
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index d2fc9c7ea62..9c1f5e59352 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -9,4 +9,14 @@ Feature: SWF and Quarkus installation
 
   Scenario: verify if there is no dependencies with multiple versions in /home/kogito/.m2/repository
     When container is started with command bash
-    Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
\ No newline at end of file
+    Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
+
+  Scenario: verify if container starts in devmode by default
+    When container is ready
+    Then check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /q/swagger-ui                                                                 |
+      | wait                 | 480                                                                           |
+      | request_method       | GET                                                                           |
+      | expected_status_code | 200                                                                           |

From a1f434d7491c056320bd3020774dbadf0f0b9bb7 Mon Sep 17 00:00:00 2001
From: kie-ci <kie-ci0@redhat.com>
Date: Mon, 30 Jan 2023 17:05:43 +0100
Subject: [PATCH 508/709] [main] [KOGITO-8495] Bump quarkus version to
 2.16.0.Final (#1403)

* [main] Bump Quarkus version to 2.16.0.CR1

* [main] Bump Quarkus version to 2.16.0.Final

* Update tests/features/kogito-swf-builder.feature

* correction

* update

---------

Co-authored-by: Jenkins CI <noreply@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
---
 image.yaml                                |  2 +-
 kogito-swf-builder-overrides.yaml         |  2 +-
 tests/features/kogito-swf-builder.feature | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/image.yaml b/image.yaml
index 3f6b8f29a54..dffd9522acf 100644
--- a/image.yaml
+++ b/image.yaml
@@ -21,7 +21,7 @@ envs:
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_VERSION"
-    value: "2.15.0.Final"
+    value: "2.16.0.Final"
     description: Defines the Quarkus version to be used by the builder images. Not intended to be changed by end user.
 
 packages:
diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
index a2476b80764..40a82ff37ba 100644
--- a/kogito-swf-builder-overrides.yaml
+++ b/kogito-swf-builder-overrides.yaml
@@ -5,7 +5,7 @@ description: "Kogito Serverless Workflow base builder with Quarkus extensions li
 
 labels:
   - name: "org.quarkus.version"
-    value: "2.15.0.Final"
+    value: "2.16.0.Final"
 
 modules:
   install:
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 9c1f5e59352..5055a055823 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,12 +4,15 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.15.0.Final/quarkus-bom-2.15.0.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.0.Final/quarkus-bom-2.16.0.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
-  Scenario: verify if there is no dependencies with multiple versions in /home/kogito/.m2/repository
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
+  # This check should be enabled again once a similar check is done on runtimes
+  # to make sure we only have one version of quarkus bom ...
+  # See https://issues.redhat.com/browse/KOGITO-8555 to enable again
+  # Scenario: verify if there is no dependencies with multiple versions in /home/kogito/.m2/repository
+  #   When container is started with command bash
+  #   Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
 
   Scenario: verify if container starts in devmode by default
     When container is ready

From 14f2a433278765f004faf53ed813b847c8e72bc4 Mon Sep 17 00:00:00 2001
From: Cristiano Nicolai <570894+cristianonicolai@users.noreply.github.com>
Date: Tue, 31 Jan 2023 04:00:29 +1000
Subject: [PATCH 509/709] KOGITO-8532 - Remove usage of deprecated Infinispan
 properties (#1418)

* KOGITO-8532 - Remove usage of deprecated Infinispan properties

* update tests

* update

---------

Co-authored-by: radtriste <tradisso@redhat.com>
---
 README.md                                      |  8 ++++----
 .../container-compose-infinispan.yaml          |  4 ++--
 kogito-data-index-infinispan-overrides.yaml    |  6 +++---
 kogito-trusty-infinispan-overrides.yaml        |  6 +++---
 .../kogito-data-index-infinispan.feature       | 12 ++++++------
 .../kogito-jobs-service-all-in-one.feature     | 12 ++++++------
 .../kogito-jobs-service-infinispan.feature     | 12 ++++++------
 .../trusty/kogito-trusty-infinispan.feature    | 18 +++++++++---------
 8 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 21051bfa423..bf679688d08 100644
--- a/README.md
+++ b/README.md
@@ -639,7 +639,7 @@ The Persistence service can be switched by using its corresponding image
 
 Basic usage with Infinispan:
 ```bash
-$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
+$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
 ```
 
 Basic usage with Ephemeral PostgreSQL:
@@ -671,7 +671,7 @@ $ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:
 To enable debug just use this env while running this image:
 
 ```bash
-$ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
+$ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
 ```
 You should notice a few debug messages present in the system output.
 
@@ -716,7 +716,7 @@ The Trusty service can be switched by using its corresponding image
 
 Basic usage with Infinispan:
 ```bash
-$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty-infinispan:latest
+$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty-infinispan:latest
 ```
 
 Basic usage with Redis:
@@ -735,7 +735,7 @@ $ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:
 To enable debug just use this env while running this image:
 
 ```bash
-docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty:latest
+docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty:latest
 ```
 You should notice a few debug messages being printed in the system output.
 
diff --git a/contrib/jobs-service/container-compose-infinispan.yaml b/contrib/jobs-service/container-compose-infinispan.yaml
index 11267f89e22..9e2258d552b 100644
--- a/contrib/jobs-service/container-compose-infinispan.yaml
+++ b/contrib/jobs-service/container-compose-infinispan.yaml
@@ -1,6 +1,6 @@
 services:
   infinispan:
-    image: infinispan/server:13.0.2.Final
+    image: infinispan/server:14.0.4.Final
     container_name: infinispan
     ports:
       - "11222:11222"
@@ -24,5 +24,5 @@ services:
     environment:
       JOBS_SERVICE_PERSISTENCE: infinispan
       KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false"
-      QUARKUS_INFINISPAN_CLIENT_SERVER_LIST: infinispan:11222
+      QUARKUS_INFINISPAN_CLIENT_HOSTS: infinispan:11222
       QUARKUS_INFINISPAN_CLIENT_USE_AUTH: "false"
\ No newline at end of file
diff --git a/kogito-data-index-infinispan-overrides.yaml b/kogito-data-index-infinispan-overrides.yaml
index bf6b2bfbbf9..fdbb1417fb2 100644
--- a/kogito-data-index-infinispan-overrides.yaml
+++ b/kogito-data-index-infinispan-overrides.yaml
@@ -19,16 +19,16 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "QUARKUS_INFINISPAN_CLIENT_SERVER_LIST"
+  - name: "QUARKUS_INFINISPAN_CLIENT_HOSTS"
     example: "172.18.0.1:11222"
     description: "Sets the host name/port to connect to. Each one is separated by a semicolon (eg. host1:11222;host2:11222)."
   - name: "QUARKUS_INFINISPAN_CLIENT_USE_AUTH"
     example: "true"
     description: "Enables or disables authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME"
+  - name: "QUARKUS_INFINISPAN_CLIENT_USERNAME"
     example: "myUsername"
     description: "Sets user name used by authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD"
+  - name: "QUARKUS_INFINISPAN_CLIENT_PASSWORD"
     example: "hard2guess"
     description: "Sets password used by authentication"
   - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_REALM"
diff --git a/kogito-trusty-infinispan-overrides.yaml b/kogito-trusty-infinispan-overrides.yaml
index af4662c7b4b..017cb84ffb9 100644
--- a/kogito-trusty-infinispan-overrides.yaml
+++ b/kogito-trusty-infinispan-overrides.yaml
@@ -19,16 +19,16 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "QUARKUS_INFINISPAN_CLIENT_SERVER_LIST"
+  - name: "QUARKUS_INFINISPAN_CLIENT_HOSTS"
     example: "172.18.0.1:11222"
     description: "Sets the host name/port to connect to. Each one is separated by a semicolon (eg. host1:11222;host2:11222)."
   - name: "QUARKUS_INFINISPAN_CLIENT_USE_AUTH"
     example: "true"
     description: "Enables or disables authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME"
+  - name: "QUARKUS_INFINISPAN_CLIENT_USERNAME"
     example: "myUsername"
     description: "Sets user name used by authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD"
+  - name: "QUARKUS_INFINISPAN_CLIENT_PASSWORD"
     example: "hard2guess"
     description: "Sets password used by authentication"
   - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_REALM"
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index a4c72bb3b90..6041c7d3705 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -15,16 +15,16 @@ Feature: Kogito-data-index infinispan feature.
     When container is started with env
       | variable                                  | value             |
       | SCRIPT_DEBUG                              | true              |
-      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
+      | QUARKUS_INFINISPAN_CLIENT_HOSTS           | 172.18.0.1:11222  |
       | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
+      | QUARKUS_INFINISPAN_CLIENT_USERNAME        | IamNotExist       |
+      | QUARKUS_INFINISPAN_CLIENT_PASSWORD        | hard2guess        |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+    Then container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222
      And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
-     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
-     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
+     And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess
+     And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist
      And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
      And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
 
diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
index 194c80b5a9e..52a0ebf0db9 100644
--- a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
@@ -31,17 +31,17 @@ Feature: Kogito-jobs-service-all-in-one feature.
       | variable                                  | value             |
       | SCRIPT_DEBUG                              | true              |
       | JOBS_SERVICE_PERSISTENCE                  | infinispan        |
-      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
+      | QUARKUS_INFINISPAN_CLIENT_HOSTS           | 172.18.0.1:11222  |
       | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
+      | QUARKUS_INFINISPAN_CLIENT_USERNAME        | IamNotExist       |
+      | QUARKUS_INFINISPAN_CLIENT_PASSWORD        | hard2guess        |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
     Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222
     And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
     And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
     And container log should not contain Application failed to start
diff --git a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
index eb77f6214e2..1ec729dec70 100644
--- a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
@@ -19,17 +19,17 @@ Feature: Kogito-jobs-service-infinispan feature.
     When container is started with env
       | variable                                  | value             |
       | SCRIPT_DEBUG                              | true              |
-      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
+      | QUARKUS_INFINISPAN_CLIENT_HOSTS           | 172.18.0.1:11222  |
       | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
+      | QUARKUS_INFINISPAN_CLIENT_USERNAME        | IamNotExist       |
+      | QUARKUS_INFINISPAN_CLIENT_PASSWORD        | hard2guess        |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
     Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222
     And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
     And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
     And container log should not contain Application failed to start
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
index 5a67c049f88..36eddfc7437 100644
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -20,19 +20,19 @@ Feature: Kogito-trusty infinispan feature.
 
   Scenario: verify if auth is correctly set
     When container is started with env
-      | variable                      | value           |
-      | SCRIPT_DEBUG                  | true            |
-      | ENABLE_PERSISTENCE            | true            |
-      | QUARKUS_INFINISPAN_CLIENT_SERVER_LIST     | 172.18.0.1:11222  |
+      | variable                                  | value             |
+      | SCRIPT_DEBUG                              | true              |
+      | ENABLE_PERSISTENCE                        | true              |
+      | QUARKUS_INFINISPAN_CLIENT_HOSTS           | 172.18.0.1:11222  |
       | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME   | IamNotExist       |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD   | hard2guess        |
+      | QUARKUS_INFINISPAN_CLIENT_USERNAME        | IamNotExist       |
+      | QUARKUS_INFINISPAN_CLIENT_PASSWORD        | hard2guess        |
       | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
       | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain QUARKUS_INFINISPAN_CLIENT_SERVER_LIST=172.18.0.1:11222
+    Then container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222
     Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_PASSWORD=hard2guess
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_USERNAME=IamNotExist
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess
+    And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist
     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
     And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
     And container log should not contain Application failed to start

From 6ef1777189ebc2935f35ce61b647878829a730bd Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 1 Feb 2023 21:01:23 +0100
Subject: [PATCH 510/709] Correct update quarkus command (#1424)

---
 .ci/jenkins/dsl/jobs.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 8567bec312a..eed104ce4d7 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -36,7 +36,7 @@ if (Utils.isProductizedBranch(this)) {
 }
 
 KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
-    'python3 scripts/update-quarkus-version.py --bump-to %new_version%'
+    'source ~/virtenvs/cekit/bin/activate && python3 scripts/update-quarkus-version.py --bump-to %new_version%'
 ])
 
 /////////////////////////////////////////////////////////////////

From 36fd8576645e05c54b7ecdbf4b4872066058d126 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 1 Feb 2023 21:38:53 +0100
Subject: [PATCH 511/709] Fix Clone repos (#1421)

---
 scripts/common.py             | 2 +-
 tests/test-apps/clone-repo.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/common.py b/scripts/common.py
index 224ffe622d6..090c1415f95 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -460,7 +460,7 @@ def update_examples_ref_in_clone_repo(examples_ref):
     pattern = re.compile(r'(git checkout.*)')
     replacement = "git checkout main"
     if examples_ref != 'main':
-        replacement = "git checkout -b {0} origin/{1}".format(examples_ref, examples_ref)
+        replacement = "git checkout -b {0}".format(examples_ref)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
 
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 277be585936..86cf633fecf 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -41,8 +41,9 @@ cd /tmp
 rm -rf kogito-examples/
 git clone https://github.com/kiegroup/kogito-examples.git
 cd kogito-examples/
+git fetch origin
 git fetch origin --tags
-git checkout -b nightly-main origin/nightly-main
+git checkout -b nightly-main
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/

From c94b615da2c5d8399bff2a1724793148a04e543b Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 6 Feb 2023 15:49:04 -0500
Subject: [PATCH 512/709] [main] Update version to 2.0.0-snapshot

---
 RELEASE_NOTES.md                                 | 5 ++++-
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b8ecc3091f1..42c9735b6a5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,8 @@
+
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-[KOGITO-8469](https://issues.redhat.com/browse/KOGITO-8469) - [SW] Let Kogito Serverless Workflow Image Builder default to quarkus dev mode
+
+## Bug Fixes
 
 ## Known Issues
+
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 6ac0ea37190..a06ea068866 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 1b65066e6b2..0da2eb7b61e 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 4017e218cb1..e5928284d75 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 9ddc9667e2fe2bf7c224cc26e0f36f7abb010805 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 9 Feb 2023 09:35:04 +0100
Subject: [PATCH 513/709] Correct promote pipeline (#1426)

---
 .ci/jenkins/Jenkinsfile.promote | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 84916f4c48e..83e8eb75f32 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -172,7 +172,7 @@ pipeline {
                         if (getBuildBranch() != 'main') {
                             versionCmd += " --examples-ref ${getBuildBranch()}"
                         }
-                        sh versionCmd
+                        runPythonCommand(versionCmd)
 
                         def commitMsg = "[${getBuildBranch()}] Update snapshot version to ${nextVersion}"
                         def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}"
@@ -544,5 +544,9 @@ String getNewImageTag() {
 
 String[] getImages() {
     String oldImageNames = getOldImageNames()
-    return oldImageNames ? oldImageNames.split(',') : sh(script: "make list | tr '\\n' ','", returnStdout: true).trim().split(',')
+    return oldImageNames ? oldImageNames.split(',') : runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
+}
+
+void runPythonCommand(String cmd, boolean stdout = false) {
+    return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
 }

From 268c1f9a2ed80e541fed641919767cba57c94cbd Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 9 Feb 2023 16:31:21 +0100
Subject: [PATCH 514/709] Remove CI env var (#1430)

Already provided by Jenkins

This will avoid useless warnings in logs
```
ERROR: Not all environment variables could be successfully injected. Check for similarly-named environment variables.
```
---
 .ci/jenkins/dsl/jobs.groovy | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index eed104ce4d7..1d57d9f1e07 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -63,7 +63,6 @@ void setupPrJob(boolean isProdCI = false) {
 void createSetupBranchJob() {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
     jobParams.env.putAll([
-        CI: true,
         REPO_NAME: 'kogito-images',
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
 
@@ -113,7 +112,6 @@ void setupDeployJob(JobType jobType, String envName = '') {
         jobParams.git.project_url = Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository)
     }
     jobParams.env.putAll([
-        CI: true,
         REPO_NAME: 'kogito-images',
         PROPERTIES_FILE_NAME: 'deployment.properties',
 
@@ -181,7 +179,6 @@ void setupDeployJob(JobType jobType, String envName = '') {
 void setupPromoteJob(JobType jobType) {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-promote', jobType, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote')
     jobParams.env.putAll([
-        CI: true,
         REPO_NAME: 'kogito-images',
         PROPERTIES_FILE_NAME: 'deployment.properties',
 

From f306115c024c47cd0a557c44449da80f1dfb7e94 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Mon, 13 Feb 2023 09:16:43 +0100
Subject: [PATCH 515/709] set logic-data-index-ephemeral image version to
 1.28.0 (#1431)

---
 logic-data-index-ephemeral-rhel8-overrides.yaml      | 6 +++---
 logic-imagestream.yaml                               | 6 +++---
 modules/kogito-data-index-ephemeral/prod/module.yaml | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/logic-data-index-ephemeral-rhel8-overrides.yaml b/logic-data-index-ephemeral-rhel8-overrides.yaml
index c1bf097134e..2b2605b092a 100644
--- a/logic-data-index-ephemeral-rhel8-overrides.yaml
+++ b/logic-data-index-ephemeral-rhel8-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8"
-version: "1.27.0"
+version: "1.28.0"
 description: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
@@ -33,7 +33,7 @@ modules:
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.ephemeral
-    version: "1.27.0"
+    version: "1.28.0"
   - name: org.kie.kogito.dataindex.common
   - name: org.kie.kogito.security.custom.truststores
   - name: org.kie.kogito.pkg-update
@@ -53,7 +53,7 @@ osbs:
   extra_dir: osbs-extra/logic-data-index-ephemeral-rhel8
   repository:
     name: containers/openshift-serverless-1-logic-data-index-ephemeral
-    branch: openshift-serverless-1.27-rhel-8
+    branch: openshift-serverless-1.28-rhel-8
 
 run:
   workdir: "/home/kogito"
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
index fd3fe381fe2..eabbf1d442b 100644
--- a/logic-imagestream.yaml
+++ b/logic-imagestream.yaml
@@ -15,15 +15,15 @@ items:
         openshift.io/provider-display-name: Kie Group
     spec:
       tags:
-      - name: '1.27.0'
+      - name: '1.28.0'
         annotations:
           description: Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
           iconClass: icon-jbpm
           tags: logic-data-index,kogito,data-index,data-index-ephemeral
           supports: quarkus
-          version: '1.27.0'
+          version: '1.28.0'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.27.0
+          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.28.0
diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml
index 41580e847ff..aa4a535b2da 100644
--- a/modules/kogito-data-index-ephemeral/prod/module.yaml
+++ b/modules/kogito-data-index-ephemeral/prod/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.ephemeral
-version: "1.27.0"
+version: "1.28.0"
 
 artifacts:
   # data-index-service-inmemory-1.24.0.Final-redhat-00011-image-build.zip

From ebf5ab87d5ec84ea2cf481fea9a1b180cdafb170 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 14 Feb 2023 13:14:48 +0100
Subject: [PATCH 516/709] KOGITO-8514 Retrieve results from shell checks
 (#1429)

---
 .ci/jenkins/Jenkinsfile                       |  4 +-
 tests/shell/kogito-swf-builder/RunTests.java  | 84 +++++++++++++++++++
 .../shell/kogito-swf-builder/build-and-run.sh | 31 -------
 .../kogito-swf-builder/resources/Dockerfile   |  2 -
 tests/shell/kogito-swf-builder/run.sh         |  7 --
 tests/shell/run.sh                            |  2 +-
 6 files changed, 87 insertions(+), 43 deletions(-)
 create mode 100644 tests/shell/kogito-swf-builder/RunTests.java
 delete mode 100755 tests/shell/kogito-swf-builder/build-and-run.sh
 delete mode 100755 tests/shell/kogito-swf-builder/run.sh

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 926550035da..94510c5e5d7 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -90,8 +90,8 @@ pipeline {
                                     } catch (err) {
                                         echo "Testing error(s) for image ${image}"
                                     } finally {
-                                        junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
-                                        archiveArtifacts artifacts: 'target/test/results/*.xml', allowEmptyArchive: true
+                                        junit testResults: 'target/**/*.xml', allowEmptyResults: true
+                                        archiveArtifacts artifacts: 'target/**/*.xml', allowEmptyArchive: true
                                     }
                                 }
                             }
diff --git a/tests/shell/kogito-swf-builder/RunTests.java b/tests/shell/kogito-swf-builder/RunTests.java
new file mode 100644
index 00000000000..9d769d1841b
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/RunTests.java
@@ -0,0 +1,84 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+
+//DEPS org.slf4j:slf4j-simple:2.0.6
+
+// Junit console to start the test engine:
+//DEPS org.junit.platform:junit-platform-console:1.8.2
+
+// engine to run the tests (tests are written with Junit5):
+//DEPS org.junit.jupiter:junit-jupiter-engine:5.8.2
+
+// testcontainers
+//DEPS org.testcontainers:testcontainers:1.17.6
+//DEPS org.testcontainers:junit-jupiter:1.17.6
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.console.options.CommandLineOptions;
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.ImageFromDockerfile;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+@Testcontainers
+public class RunTests {
+
+    private static Logger LOGGER = LoggerFactory.getLogger(RunTests.class);
+
+    private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
+
+    @Container
+    private GenericContainer builtImage = new GenericContainer(
+            new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
+                    .withDockerfile(Paths.get("tests/shell/kogito-swf-builder/", "resources", "Dockerfile"))
+                    .withBuildArg("SCRIPT_DEBUG", "true"))
+            .withExposedPorts(8080)
+            .waitingFor(Wait.forHttp("/jsongreet"))
+            .withLogConsumer(logConsumer);
+
+    @Test
+    public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
+        builtImage.start();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(new URI("http://" + builtImage.getHost() + ":" + builtImage.getFirstMappedPort() + "/jsongreet"))
+                .header("Content-Type", "application/json")
+                .header("Accept", "application/json")
+                .timeout(Duration.ofSeconds(10))
+                .POST(HttpRequest.BodyPublishers
+                        .ofString("{\"workflowdata\" : {\"name\": \"John\", \"language\": \"English\"}}"))
+                .build();
+        HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
+        assertEquals(201, response.statusCode());
+    }
+
+    public static void main(String... args) throws Exception {
+        if (args == null || args.length != 1) {
+            System.err.println("Output directory is not specified. Usage:");
+            System.err.println(RunTests.class.getSimpleName() + ".java <reports output directory>");
+            System.exit(1);
+            throw new IllegalStateException("Unreachable code");
+        }
+        CommandLineOptions options = new CommandLineOptions();
+        options.setSelectedClasses(Collections.singletonList(RunTests.class.getName()));
+        options.setReportsDir(Paths.get(args[0]));
+        new ConsoleTestExecutor(options).execute(new PrintWriter(System.out));
+    }
+}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/build-and-run.sh b/tests/shell/kogito-swf-builder/build-and-run.sh
deleted file mode 100755
index 64a9d8efe38..00000000000
--- a/tests/shell/kogito-swf-builder/build-and-run.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-_BUILDER=${BUILD_ENGINE:-docker}
-
-script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-${_BUILDER} build --build-arg=SCRIPT_DEBUG=${SCRIPT_DEBUG:-false} "${script_dir_path}"/resources -t quay.io/kiegroup/swf-test:latest
-
-container_name="swf-test-$(echo $RANDOM | md5sum | head -c 5; echo;)"
-${_BUILDER} run -d --name ${container_name} -p 8080:8080 quay.io/kiegroup/swf-test:latest
-
-set -x
-set +e
-export _BUILDER; export container_name && timeout 20s bash -c 'result="not started"; while [[ "$result" != "healthy" ]]; \
- do sleep 2 && result=$(${_BUILDER} inspect -f {{.State.Health.Status}} ${container_name}); echo "status: $result"; done'
-status_code=$?
-echo "Got status from timeout -> ${status_code}"
-set -e
-if [[ "${status_code}" != 0 ]]; then
-  echo "ERROR: Container status: $(${_BUILDER} inspect -f {{.State.Health.Status}} ${container_name})"
-  ${_BUILDER} logs ${container_name}
-else
-  curl -X POST -H 'Content-Type:application/json' -H 'Accept:application/json' -d '{"workflowdata" : {"name": "John", "language": "English"}}' http://localhost:8080/jsongreet
-  status_code=$?
-fi
-
-${_BUILDER} kill ${container_name}
-
-exit ${status_code}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/resources/Dockerfile b/tests/shell/kogito-swf-builder/resources/Dockerfile
index 16741bdf4b1..6b756a9bf7c 100644
--- a/tests/shell/kogito-swf-builder/resources/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/Dockerfile
@@ -30,8 +30,6 @@ COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quark
 COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/app/ /deployments/app/
 COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/quarkus/ /deployments/quarkus/
 
-HEALTHCHECK --interval=2s --timeout=4s CMD curl --fail http://localhost:8080 || exit 1
-
 EXPOSE 8080
 USER 185
 ENV AB_JOLOKIA_OFF=""
diff --git a/tests/shell/kogito-swf-builder/run.sh b/tests/shell/kogito-swf-builder/run.sh
deleted file mode 100755
index 71e14b69c50..00000000000
--- a/tests/shell/kogito-swf-builder/run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-echo "--- Test: Build And Run"
-"${script_dir_path}"/build-and-run.sh
\ No newline at end of file
diff --git a/tests/shell/run.sh b/tests/shell/run.sh
index f174fc5b69a..a62fa70faf0 100755
--- a/tests/shell/run.sh
+++ b/tests/shell/run.sh
@@ -11,7 +11,7 @@ if [ -z "${image_name}" ]; then
 fi
 
 if [ -d  "${script_dir_path}/${image_name}" ]; then
-  "${script_dir_path}/${image_name}"/run.sh
+  curl -Ls https://sh.jbang.dev | bash -s - "${script_dir_path}/${image_name}/RunTests.java" "${script_dir_path}/../../target/shell/${image_name}"
 else
   echo "No shell test to run for image ${image_name}"
 fi
\ No newline at end of file

From 52bc1df8c70300f5e3e3882aa5f0bf140f3d0123 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 14 Feb 2023 21:16:43 +0100
Subject: [PATCH 517/709] Update native env handling (#1434)

---
 README.md                              | 16 +++++-----------
 modules/kogito-s2i-core/added/s2i-core |  2 +-
 tests/test-apps/clone-repo.sh          |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index bf679688d08..8cea29a83ad 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,9 @@ Table of Contents
   - [Kogito Images JVM Memory Management](#kogito-images-jvm-memory-management)
   - [Kogito Runtime and Builder Images](#kogito-runtime-and-builder-images)
     - [Kogito Builder Images](#kogito-builder-images)
-      - [Kogito swf Builder Image usage](#kogito-swf-builder-image-usage)
+      - [Kogito SWF (Serverless Workflow) Builder Image usage](#kogito-swf-serverless-workflow-builder-image-usage)
+        - [Using as a builder](#using-as-a-builder)
+        - [Using for application development](#using-for-application-development)
       - [Kogito s2i Builder Image usage](#kogito-s2i-builder-image-usage)
       - [Kogito s2i Builder Image example](#kogito-s2i-builder-image-example)
         - [S2i Builder Image Example with Quarkus](#s2i-builder-image-example-with-quarkus)
@@ -52,6 +54,7 @@ Table of Contents
     - [Kogito Explainability Component Image](#kogito-explainability-component-image)
     - [Kogito Trusty Component Image](#kogito-trusty-component-image)
     - [Kogito Jobs Service Component Images](#kogito-jobs-service-component-images)
+      - [Jobs Services All-in-one](#jobs-services-all-in-one)
     - [Kogito Management Console Component Image](#kogito-management-console-component-image)
     - [Kogito Task Console Component Image](#kogito-task-console-component-image)
     - [Kogito Trusty UI Component Image](#kogito-trusty-ui-component-image)
@@ -70,15 +73,6 @@ Table of Contents
         - [Running Bats tests](#running-bats-tests)
         - [Writing Bats tests](#writing-bats-tests)
     - [Reporting new issues](#reporting-new-issues)
-            [Image Modules](#image-modules)
-        * [Testing Images](#testing-images)
-            * [Behave tests](#behave-tests)
-                * [Running Behave tests](#running-behave-tests)
-                * [Writing Behave tests](#writing-behave-tests)
-            * [Bats tests](#bats-tests)
-                * [Running Bats tests](#running-bats-tests)
-                * [Writing Bats tests](#writing-bats-tests)
-        * [Reporting new issues](#reporting-new-issues)
 
          
 ## Kogito Images Requirements 
@@ -566,7 +560,7 @@ For this example, let's use the same as the previous one (process-quarkus-exampl
 But this time, let's perform a native build:
 
 ```bash
-$ mvn clean package -Pnative
+$ mvn clean package -Dnative
 ```
 
 A binary has been generated into the **target directory**.
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 1afc637fd0a..d24ecea267d 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -89,7 +89,7 @@ function build_kogito_app() {
 
     nativeBuild=""
     if [ "${NATIVE^^}" == "TRUE" ]; then
-        nativeBuild="-Pnative"
+        nativeBuild="-Dnative"
     fi
 
     if [ "${SCRIPT_DEBUG}" != "true" ]; then
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 86cf633fecf..5047aae950b 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -55,7 +55,7 @@ mvn -f kogito-quarkus-examples/rules-quarkus-helloworld clean package ${MAVEN_OP
 mvn -f kogito-springboot-examples/process-springboot-example clean package ${MAVEN_OPTIONS}
 
 if [ "$NATIVE_BUILD" = 'true' ]; then
-    mvn -f kogito-quarkus-examples/rules-quarkus-helloworld-native -Pnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
+    mvn -f kogito-quarkus-examples/rules-quarkus-helloworld-native -Dnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
     ls -lah /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/target/
 fi
 

From 54a1ed991bd34f18277e9c0bdc4d2f9d2934c9c2 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 15 Feb 2023 15:07:01 +0100
Subject: [PATCH 518/709] Correct shell tests to have image version (#1439)

---
 Makefile                                            | 2 +-
 tests/shell/kogito-swf-builder/RunTests.java        | 1 +
 tests/shell/kogito-swf-builder/resources/Dockerfile | 4 +++-
 tests/shell/run.sh                                  | 8 ++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3ac22b4221d..2f8d9b8dbe6 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ endif
 # if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave ${test_options}
-	tests/shell/run.sh ${image_name}
+	tests/shell/run.sh ${image_name} ${SHORTENED_LATEST_VERSION}
 endif
 
 # Build all images
diff --git a/tests/shell/kogito-swf-builder/RunTests.java b/tests/shell/kogito-swf-builder/RunTests.java
index 9d769d1841b..8f58a517e42 100644
--- a/tests/shell/kogito-swf-builder/RunTests.java
+++ b/tests/shell/kogito-swf-builder/RunTests.java
@@ -49,6 +49,7 @@ public class RunTests {
     private GenericContainer builtImage = new GenericContainer(
             new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
                     .withDockerfile(Paths.get("tests/shell/kogito-swf-builder/", "resources", "Dockerfile"))
+                    .withBuildArg("BUILDER_VERSION", System.getProperty("IMAGE_VERSION"))
                     .withBuildArg("SCRIPT_DEBUG", "true"))
             .withExposedPorts(8080)
             .waitingFor(Wait.forHttp("/jsongreet"))
diff --git a/tests/shell/kogito-swf-builder/resources/Dockerfile b/tests/shell/kogito-swf-builder/resources/Dockerfile
index 6b756a9bf7c..11d3184e47a 100644
--- a/tests/shell/kogito-swf-builder/resources/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/Dockerfile
@@ -1,4 +1,6 @@
-FROM quay.io/kiegroup/kogito-swf-builder:2.0 AS builder
+ARG BUILDER_VERSION="2.0"
+
+FROM quay.io/kiegroup/kogito-swf-builder:${BUILDER_VERSION} AS builder
 
 # Kogito user
 USER 1001
diff --git a/tests/shell/run.sh b/tests/shell/run.sh
index a62fa70faf0..b3d842e3fae 100755
--- a/tests/shell/run.sh
+++ b/tests/shell/run.sh
@@ -4,12 +4,20 @@ set -e
 script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 image_name=$1
+image_version=$2
 
 if [ -z "${image_name}" ]; then
   echo "Please provide the image name"
   exit 1
 fi
 
+if [ -z "${image_version}" ]; then
+  echo "Please provide the X.Y version"
+  exit 1
+fi
+
+export IMAGE_VERSION=${image_version}
+
 if [ -d  "${script_dir_path}/${image_name}" ]; then
   curl -Ls https://sh.jbang.dev | bash -s - "${script_dir_path}/${image_name}/RunTests.java" "${script_dir_path}/../../target/shell/${image_name}"
 else

From 52a33d44e505a8f517ce5d9a91ac35cf968c5fdb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 16 Feb 2023 08:48:05 +0100
Subject: [PATCH 519/709] Correct shell tests on release branch (#1442)

---
 tests/shell/kogito-swf-builder/RunTests.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/shell/kogito-swf-builder/RunTests.java b/tests/shell/kogito-swf-builder/RunTests.java
index 8f58a517e42..61e4f5bcd63 100644
--- a/tests/shell/kogito-swf-builder/RunTests.java
+++ b/tests/shell/kogito-swf-builder/RunTests.java
@@ -49,7 +49,7 @@ public class RunTests {
     private GenericContainer builtImage = new GenericContainer(
             new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
                     .withDockerfile(Paths.get("tests/shell/kogito-swf-builder/", "resources", "Dockerfile"))
-                    .withBuildArg("BUILDER_VERSION", System.getProperty("IMAGE_VERSION"))
+                    .withBuildArg("BUILDER_VERSION", System.getenv("IMAGE_VERSION"))
                     .withBuildArg("SCRIPT_DEBUG", "true"))
             .withExposedPorts(8080)
             .waitingFor(Wait.forHttp("/jsongreet"))
@@ -77,6 +77,7 @@ public static void main(String... args) throws Exception {
             System.exit(1);
             throw new IllegalStateException("Unreachable code");
         }
+        System.out.println("Got IMAGE_VERSION = " + System.getenv("IMAGE_VERSION"));
         CommandLineOptions options = new CommandLineOptions();
         options.setSelectedClasses(Collections.singletonList(RunTests.class.getName()));
         options.setReportsDir(Paths.get(args[0]));

From 97d98cb66da855d024b85af4636d62eb6d83696c Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 17 Feb 2023 15:39:04 +0100
Subject: [PATCH 520/709] KIECLOUD-688 Use rhel8 for podman jobs (#1443)

* KIECLOUD-688 Use rhel8 for podman jobs

* Update Jenkinsfile.promote
---
 .ci/jenkins/Jenkinsfile.promote | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 83e8eb75f32..a0a6af6dae8 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -5,7 +5,7 @@ deployProperties = [:]
 
 pipeline {
     agent {
-        label 'kogito-image-slave && !built-in'
+        label 'rhel8 && podman && !built-in'
     }
 
     options {

From 0c0cd9ed7488cdf754afc98a18a2e4b1f09a46a4 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 22 Feb 2023 15:34:23 -0300
Subject: [PATCH 521/709] [RHPAM-4560] - Install maven from rpm (#1446)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 .../3.8.x-rpm/added/configure-maven.sh        | 233 ++++++++++++++++++
 modules/kogito-maven/3.8.x-rpm/configure      |   9 +
 .../kogito-maven/3.8.x-rpm/maven/settings.xml |  60 +++++
 modules/kogito-maven/3.8.x-rpm/module.yaml    |  82 ++++++
 .../maven-dnf-module/artifacts/maven.module   |   5 +
 .../kogito-maven/maven-dnf-module/configure   |   7 +
 .../kogito-maven/maven-dnf-module/module.yaml |   8 +
 rhpam-kogito-builder-rhel8-overrides.yaml     |   2 +-
 8 files changed, 405 insertions(+), 1 deletion(-)
 create mode 100644 modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
 create mode 100644 modules/kogito-maven/3.8.x-rpm/configure
 create mode 100644 modules/kogito-maven/3.8.x-rpm/maven/settings.xml
 create mode 100644 modules/kogito-maven/3.8.x-rpm/module.yaml
 create mode 100644 modules/kogito-maven/maven-dnf-module/artifacts/maven.module
 create mode 100644 modules/kogito-maven/maven-dnf-module/configure
 create mode 100644 modules/kogito-maven/maven-dnf-module/module.yaml

diff --git a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
new file mode 100644
index 00000000000..288c75b956a
--- /dev/null
+++ b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
@@ -0,0 +1,233 @@
+#!/usr/bin/env bash
+
+#Please keep them in alphabetical order
+function prepareEnv() {
+    unset HTTP_PROXY_HOST
+    unset HTTP_PROXY_PORT
+    unset HTTP_PROXY_PASSWORD
+    unset HTTP_PROXY_USERNAME
+    unset HTTP_PROXY_NONPROXYHOSTS
+    unset HTTPS_PROXY
+    unset MAVEN_DOWNLOAD_OUTPUT
+    unset MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE
+    unset MAVEN_MIRROR_URL
+    unset MAVEN_REPO_ID
+    unset MAVEN_REPO_LAYOUT
+    unset MAVEN_REPO_RELEASES_ENABLED
+    unset MAVEN_REPO_RELEASES_UPDATE_POLICY
+    unset MAVEN_REPO_RELEASES_CHECKSUM_POLICY
+    unset MAVEN_REPO_SNAPSHOTS_ENABLED
+    unset MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY
+    unset MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY
+    unset MAVEN_REPO_URL
+    unset MAVEN_REPOS
+}
+
+function configure() {
+    configure_proxy
+    configure_mirrors
+    configure_maven_download_output
+    ignore_maven_self_signed_certificates
+    set_kogito_maven_repo
+    add_maven_repo
+
+    if [ "${SCRIPT_DEBUG}" = "true" ] ; then
+        cat "${MAVEN_SETTINGS_PATH}"
+    fi
+}
+
+# insert settings for HTTP proxy into maven settings.xml if supplied
+function configure_proxy() {
+    # prefer old http_proxy_ format for username/password, but
+    # also allow proxy_ format.
+    HTTP_PROXY_USERNAME=${HTTP_PROXY_USERNAME:-$PROXY_USERNAME}
+    HTTP_PROXY_PASSWORD=${HTTP_PROXY_PASSWORD:-$PROXY_PASSWORD}
+
+    proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}}
+    # if http_proxy_host/port is set, prefer that (oldest mechanism)
+    # before looking at HTTP(S)_PROXY
+    proxyhost=${HTTP_PROXY_HOST:-$(echo "${proxy}" | cut -d : -f 1,2)}
+    proxyport=${HTTP_PROXY_PORT:-$(echo "${proxy}" | cut -d : -f 3)}
+
+    if [ -n "$proxyhost" ]; then
+        if echo "${proxyhost}" | grep -q -i https://; then
+          proxyport=${proxyport:-443}
+          proxyprotocol="https"
+        else
+          proxyport=${proxyport:-80}
+          proxyprotocol="http"
+        fi
+
+        xml="<proxy>\
+         <id>genproxy</id>\
+         <active>true</active>\
+         <protocol>$proxyprotocol</protocol>\
+         <host>$proxyhost</host>\
+         <port>$proxyport</port>"
+
+        if [ -n "$HTTP_PROXY_USERNAME" ] && [ -n "$HTTP_PROXY_PASSWORD" ]; then
+            xml="$xml\
+         <username>$HTTP_PROXY_USERNAME</username>\
+         <password>$HTTP_PROXY_PASSWORD</password>"
+        fi
+        if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then
+            nonproxyhosts="${HTTP_PROXY_NONPROXYHOSTS//|/\\|}"
+            xml="$xml\
+         <nonProxyHosts>$nonproxyhosts</nonProxyHosts>"
+        fi
+        xml="$xml\
+       </proxy>"
+        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
+    fi
+}
+
+# insert settings for mirrors/repository managers into settings.xml if supplied
+function configure_mirrors() {
+    if [ -n "$MAVEN_MIRROR_URL" ]; then
+        xml="    <mirror>\
+      <id>mirror.default</id>\
+      <url>$MAVEN_MIRROR_URL</url>\
+      <mirrorOf>external:*</mirrorOf>\
+    </mirror>"
+        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
+    fi
+}
+
+function configure_maven_download_output() {
+    if [ "${MAVEN_DOWNLOAD_OUTPUT}" != "true" ]; then
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --no-transfer-progress"
+    fi
+}
+
+function ignore_maven_self_signed_certificates() {
+    if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
+    fi
+}
+
+function set_kogito_maven_repo() {
+    local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
+    if [ -n "${kogito_maven_repo_url}" ]; then
+        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
+    fi
+}
+
+function add_maven_repo() {
+    # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service
+    local single_repo_url="${MAVEN_REPO_URL}"
+    if [ -n "$single_repo_url" ]; then
+        single_repo_id=$(_maven_find_env "MAVEN_REPO_ID" "repo-$(_generate_random_id)")
+        _add_maven_repo "$single_repo_url" "$single_repo_id" ""
+    fi
+
+    # multiple remote repositories scenario: respect fully qualified url(s) if specified, otherwise find and use service(s); can be used together with "single repo scenario" above
+    local multi_repo_counter=1
+    IFS=',' read -r -a multi_repo_prefixes <<<"${MAVEN_REPOS}"
+    for multi_repo_prefix in "${multi_repo_prefixes[@]}"; do
+        multi_repo_url=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_URL")
+        multi_repo_id=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_ID" "repo${multi_repo_counter}-$(_generate_random_id)")
+        _add_maven_repo "$multi_repo_url" "$multi_repo_id" "$multi_repo_prefix"
+        multi_repo_counter=$((multi_repo_counter + 1))
+    done
+}
+# add maven repositories
+# Parameters:
+#   $1 - repo url
+#   $2 - repo id
+#   $3 - repo prefix
+function _add_maven_repo() {
+    local repo_url=$1
+    local repo_id=$2
+    local prefix=$3
+
+    repo_name=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_NAME" "${repo_id}")
+    repo_layout=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_LAYOUT" "default")
+    releases_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_ENABLED" "true")
+    releases_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_UPDATE_POLICY" "always")
+    releases_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" "warn")
+    snapshots_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_ENABLED" "true")
+    snapshots_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" "always")
+    snapshots_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" "warn")
+
+    local repo="\n\
+                <repository>\n\
+                    <id>${repo_id}</id>\n\
+                    <name>${repo_name}</name>\n\
+                    <url>${repo_url}</url>\n\
+                    <layout>${repo_layout}</layout>\n\
+                    <releases>\n\
+                        <enabled>${releases_enabled}</enabled>\n\
+                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
+                    </releases>\n\
+                    <snapshots>\n\
+                        <enabled>${snapshots_enabled}</enabled>\n\
+                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
+                    </snapshots>\n\
+                </repository>\n\
+                <!-- ### configured repositories ### -->"
+    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
+
+    local pluginRepo="\n\
+                <pluginRepository>\n\
+                    <id>${repo_id}</id>\n\
+                    <name>${repo_name}</name>\n\
+                    <url>${repo_url}</url>\n\
+                    <layout>${repo_layout}</layout>\n\
+                    <releases>\n\
+                        <enabled>${releases_enabled}</enabled>\n\
+                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
+                    </releases>\n\
+                    <snapshots>\n\
+                        <enabled>${snapshots_enabled}</enabled>\n\
+                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
+                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
+                    </snapshots>\n\
+                </pluginRepository>\n\
+                <!-- ### configured plugin repositories ### -->"
+
+    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
+
+    # new repo should be skipped by mirror if exists
+    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
+}
+
+# Finds the environment variable  and returns its value if found.
+# Otherwise returns the default value if provided.
+#
+# Arguments:
+# $1 env variable name to check
+# $2 default value if environment variable was not set
+function _maven_find_env() {
+    local var=${!1}
+    echo "${var:-$2}"
+}
+
+# Finds the environment variable with the given prefix. If not found
+# the default value will be returned. If no prefix is provided will
+# rely on _maven_find_env
+#
+# Arguments
+#  - $1 prefix. Transformed to uppercase and replace - by _
+#  - $2 variable name. Prepended by "prefix_"
+#  - $3 default value if the variable is not defined
+function _maven_find_prefixed_env() {
+    local prefix=$1
+
+    if [[ -z $prefix ]]; then
+        _maven_find_env "${2}" "${3}"
+    else
+        prefix=${prefix^^} # uppercase
+        prefix=${prefix//-/_} #replace - by _
+
+        local var_name="${prefix}_${2}"
+        echo "${!var_name:-${3}}"
+      fi
+}
+
+# private
+function _generate_random_id() {
+    env LC_CTYPE=C < /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
+}
diff --git a/modules/kogito-maven/3.8.x-rpm/configure b/modules/kogito-maven/3.8.x-rpm/configure
new file mode 100644
index 00000000000..7b92f84d23f
--- /dev/null
+++ b/modules/kogito-maven/3.8.x-rpm/configure
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+
+mkdir "${KOGITO_HOME}"/.m2
+cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
diff --git a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
new file mode 100644
index 00000000000..5fe723c3e7e
--- /dev/null
+++ b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
@@ -0,0 +1,60 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+  <mirrors>
+    <!-- ### configured mirrors ### -->
+  </mirrors>
+
+  <proxies>
+    <!-- ### configured http proxy ### -->
+  </proxies>
+
+  <profiles>
+    <!-- ### extra maven repositories ### -->
+
+    <profile>
+      <id>kogito-images</id>
+      <repositories>
+        <repository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Repository Group</name>
+          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </repository>
+        <!-- ### configured repositories ### -->
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Repository Group</name>
+          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </pluginRepository>
+        <!-- ### configured plugin repositories ### -->
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <!-- ### extra maven profile ### -->
+    <activeProfile>kogito-images</activeProfile>
+  </activeProfiles>
+</settings>
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
new file mode 100644
index 00000000000..5e8426e49bc
--- /dev/null
+++ b/modules/kogito-maven/3.8.x-rpm/module.yaml
@@ -0,0 +1,82 @@
+schema_version: 1
+name: org.kie.kogito.maven
+version: "3.8-rpm"
+
+envs:
+  - name: "MAVEN_VERSION"
+    value: "3.8"
+  - name: "MAVEN_HOME"
+    value: "/usr/share/maven"
+  - name: "MAVEN_SETTINGS_PATH"
+    description: "The location of the settings.xml file"
+    value: '${KOGITO_HOME}/.m2/settings.xml'
+  - name: "HTTP_PROXY"
+    description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
+    example: "http://127.0.0.1:8080"
+  - name: "HTTP_PROXY_HOST"
+    description: "Proxy Host, don't need to be set if HTTP_PROXY is used."
+    example: "127.0.0.1"
+  - name: "HTTP_PROXY_PORT"
+    description: "Proxy Port, don't need to be set if HTTP_PROXY is used."
+    example: "8181"
+  - name: "HTTP_PROXY_PASSWORD"
+    description: "Proxy Password"
+  - name: "HTTP_PROXY_USERNAME"
+    description: "Proxy Username"
+  - name: "HTTP_PROXY_NONPROXYHOSTS"
+    description: "Non proxy hosts, list of hosts that will ot be proxied."
+    example: "localhost"
+  - name: "MAVEN_MIRROR_URL"
+    description: "The base URL of a mirror used for retrieving artifacts."
+    example: "http://10.0.0.1:8080/repository/internal/"
+  - name: "MAVEN_DOWNLOAD_OUTPUT"
+    description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
+    example: "true"
+  - name: "JBOSS_MAVEN_REPO_URL"
+    value: "https://repository.jboss.org/nexus/content/groups/public/"
+    description: "Defines the Jboss Maven repository for Kogito artifacts."
+  - name: "MAVEN_REPO_URL"
+    description: "Defines an extra Maven repository."
+    example: "https://nexus.test.com/group/public"
+  - name: "MAVEN_REPO_ID"
+    description: "Defines the id of the new Repository"
+    example: "nexus-test"
+  - name: "MAVEN_REPO_LAYOUT"
+    description: "The type of layout this repository uses for locating and storing artifacts - can be 'legacy' or 'default'.Defaults to 'default'."
+    example: "legacy"
+  - name: "MAVEN_REPO_RELEASES_ENABLED"
+    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
+    example: "false"
+  - name: "MAVEN_REPO_RELEASES_UPDATE_POLICY"
+    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
+    example: "never"
+  - name: "MAVEN_REPO_RELEASES_CHECKSUM_POLICY"
+    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
+    example: "fail"
+  - name: "MAVEN_REPO_SNAPSHOTS_ENABLED"
+    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
+    example: "false"
+  - name: "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY"
+    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
+    example: "never"
+  - name: "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY"
+    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
+    example: "fail"
+  - name: "MAVEN_REPOS"
+    description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories."
+    example: "CENTRAL,INTERNAL"
+  - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
+    description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
+    example: "true"
+
+modules:
+  install:
+    - name: org.kie.kogito.maven.dnf.module
+
+packages:
+  install:
+    - maven
+
+
+execute:
+  - script: configure
\ No newline at end of file
diff --git a/modules/kogito-maven/maven-dnf-module/artifacts/maven.module b/modules/kogito-maven/maven-dnf-module/artifacts/maven.module
new file mode 100644
index 00000000000..386b70bd684
--- /dev/null
+++ b/modules/kogito-maven/maven-dnf-module/artifacts/maven.module
@@ -0,0 +1,5 @@
+[maven]
+name=maven
+stream=3.8
+profiles=
+state=enabled
\ No newline at end of file
diff --git a/modules/kogito-maven/maven-dnf-module/configure b/modules/kogito-maven/maven-dnf-module/configure
new file mode 100644
index 00000000000..3b0c90a3e94
--- /dev/null
+++ b/modules/kogito-maven/maven-dnf-module/configure
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+cp ${ARTIFACTS_DIR}/maven.module /etc/dnf/modules.d/maven.module
\ No newline at end of file
diff --git a/modules/kogito-maven/maven-dnf-module/module.yaml b/modules/kogito-maven/maven-dnf-module/module.yaml
new file mode 100644
index 00000000000..2a9f15e117d
--- /dev/null
+++ b/modules/kogito-maven/maven-dnf-module/module.yaml
@@ -0,0 +1,8 @@
+schema_version: 1
+name: org.kie.kogito.maven.dnf.module
+version: "3.8"
+description: ^
+  Enables the AppStream RPM Module for Maven 3.8 packages.
+
+execute:
+  - script: configure
\ No newline at end of file
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 9eae18ce480..1b89a93c167 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -53,7 +53,7 @@ modules:
       version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
-      version: "3.8.6"
+      version: "3.8-rpm"
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.s2i.builder
     - name: org.kie.kogito.rhpam.prod.profile

From cbdbd257c2fd36fed0adc84fde7721fd356d0ca5 Mon Sep 17 00:00:00 2001
From: nmirasch <neus.miras@gmail.com>
Date: Thu, 23 Feb 2023 13:45:38 +0100
Subject: [PATCH 522/709] KOGITO-8526: Data Index Adds quarkus profile
 'kafka-events-support' by default (#1415)

* KOGITO-8526:Add quarkus profile 'kafka-events-support' by default to data index images

* created an env variable to pass the active quarkus profile

* Add behave tests to data index common feature

* Move behave tests to each data index DB distribution feature

* Move behave tests to data index common feature and added script to ephemeral data index image

* changed log_info message when unvalid value passed

* Add the default kafka-events-support only when no KOGITO_DATA_INDEX_QUARKUS_PROFILE is provided

* Only define a default value for KOGITO_DATA_INDEX_QUARKUS_PROFILE, no checking if it's empty

* Fix data-index common script not found

* Added reference in release notes

---------

Co-authored-by: radtriste <tradisso@redhat.com>
---
 RELEASE_NOTES.md                              |  1 +
 .../added/kogito-data-index-common.sh         | 16 ++++++++++
 modules/kogito-data-index-common/configure    |  8 +++--
 modules/kogito-data-index-common/module.yaml  |  5 ++++
 .../tests/bats/kogito-data-index-common.bats  | 30 +++++++++++++++++++
 .../community/added/kogito-app-launch.sh      |  1 +
 .../added/kogito-app-launch.sh                |  1 +
 .../added/kogito-app-launch.sh                |  1 +
 .../added/kogito-app-launch.sh                |  1 +
 .../added/kogito-app-launch.sh                |  1 +
 .../kogito-data-index-common.feature          | 16 +++++++++-
 11 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 modules/kogito-data-index-common/added/kogito-data-index-common.sh
 create mode 100644 modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 42c9735b6a5..5ca7f3b8208 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,7 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
+[KOGITO-8526](https://issues.redhat.com/browse/KOGITO-8526) - Add quarkus profile 'kafka-events-support' to data index images by default
 
 ## Bug Fixes
 
diff --git a/modules/kogito-data-index-common/added/kogito-data-index-common.sh b/modules/kogito-data-index-common/added/kogito-data-index-common.sh
new file mode 100644
index 00000000000..99e1537f7db
--- /dev/null
+++ b/modules/kogito-data-index-common/added/kogito-data-index-common.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source "${KOGITO_HOME}"/launch/logging.sh
+
+function prepareEnv() {
+    # keep it on alphabetical order
+    unset KOGITO_DATA_INDEX_QUARKUS_PROFILE
+}
+function configure() {
+    configure_data_index_quarkus_profile
+}
+
+function configure_data_index_quarkus_profile() {
+    local quarkusProfile=${KOGITO_DATA_INDEX_QUARKUS_PROFILE}
+    KOGITO_DATA_INDEX_PROPS="${KOGITO_DATA_INDEX_PROPS} -Dquarkus.profile=${quarkusProfile}"
+}
\ No newline at end of file
diff --git a/modules/kogito-data-index-common/configure b/modules/kogito-data-index-common/configure
index 02e69e573b3..e7a63ea169c 100644
--- a/modules/kogito-data-index-common/configure
+++ b/modules/kogito-data-index-common/configure
@@ -1,7 +1,11 @@
 #!/bin/sh
 set -e
 
+SCRIPT_DIR=$(dirname "${0}")
+ADDED_DIR="${SCRIPT_DIR}"/added
+mkdir -p "${KOGITO_HOME}"/launch
+
 mkdir -p "${KOGITO_HOME}"/data/protobufs/
 
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
\ No newline at end of file
+cp -v "${ADDED_DIR}"/kogito-data-index-common.sh "${KOGITO_HOME}"/launch
+chmod +x-w "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
\ No newline at end of file
diff --git a/modules/kogito-data-index-common/module.yaml b/modules/kogito-data-index-common/module.yaml
index 84de2749c6e..9a23ada0485 100644
--- a/modules/kogito-data-index-common/module.yaml
+++ b/modules/kogito-data-index-common/module.yaml
@@ -3,5 +3,10 @@ name: org.kie.kogito.dataindex.common
 version: "2.0.0-snapshot"
 description: "Common modules for data-index persistence provider images, any addition that is common must be added in this module"
 
+envs:
+  - name: "KOGITO_DATA_INDEX_QUARKUS_PROFILE"
+    value: "kafka-events-support"
+    description: "Allows to change the event connection type. The possible values are :`kafka-events-support`(default) or `http-events-support`"
+
 execute:
   - script: configure
diff --git a/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats b/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
new file mode 100644
index 00000000000..73c57f50bbf
--- /dev/null
+++ b/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
@@ -0,0 +1,30 @@
+#!/usr/bin/env bats
+
+export KOGITO_HOME=/tmp/kogito
+export HOME="${KOGITO_HOME}"
+mkdir -p "${KOGITO_HOME}"/launch
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+
+# imports
+load $BATS_TEST_DIRNAME/../../added/launch/kogito-data-index-common.sh
+
+
+teardown() {
+    rm -rf "${KOGITO_HOME}"
+}
+
+@test "check if the default quarkus profile is correctly set on data index" {
+    local expected=" -Dquarkus.profile=kafka-events-support"
+    configure_data_index_quarkus_profile
+    echo "Result is [${KOGITO_DATA_INDEX_PROPS}] and expected is [${expected}]"
+    [ "${expected}" = "${KOGITO_DATA_INDEX_PROPS}" ]
+}
+
+@test "check if a provided data index quarkus profile is correctly set on data index" {
+    export KOGITO_DATA_INDEX_QUARKUS_PROFILE="http-events-support"
+    local expected=" -Dquarkus.profile=http-events-support"
+    configure_data_index_quarkus_profile
+    echo "Result is [${KOGITO_DATA_INDEX_PROPS}] and expected is [${expected}]"
+    [ "${expected}" = "${KOGITO_DATA_INDEX_PROPS}" ]
+}
+
diff --git a/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh
index 4e847a99d2d..c7cb1665e13 100644
--- a/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh
@@ -14,6 +14,7 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
     "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
index df50ceaccdf..e82e98ae5d5 100644
--- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
@@ -14,6 +14,7 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
     "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index df50ceaccdf..e82e98ae5d5 100644
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -14,6 +14,7 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
     "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
diff --git a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
index 05fa13ccac7..2210fc5ce98 100644
--- a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
@@ -14,6 +14,7 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
     "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
diff --git a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
index df50ceaccdf..e82e98ae5d5 100644
--- a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
@@ -14,6 +14,7 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
     "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index 9e9ff110e43..61679e6de37 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -4,8 +4,22 @@
 @quay.io/kiegroup/kogito-data-index-postgresql
 @openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Kogito-data-index common feature.
-  Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
+
+  Scenario: Verify if the debug is correctly enabled and test default http port
     When container is started with env
       | variable               | value   |
       | SCRIPT_DEBUG           | true    |
     Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
+
+  Scenario: check if the default quarkus profile is correctly set on data index
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+    Then container log should contain -Dquarkus.profile=kafka-events-support
+
+  Scenario: check if a provided data index quarkus profile is correctly set on data index
+    When container is started with env
+      | variable                           | value               |
+      | SCRIPT_DEBUG                       | true                |
+      | KOGITO_DATA_INDEX_QUARKUS_PROFILE  | http-events-support |
+    Then container log should contain -Dquarkus.profile=http-events-support
\ No newline at end of file

From c34af0f9a4d69d7f4d5cd64654c72b55ae026dbf Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 27 Feb 2023 08:02:06 -0500
Subject: [PATCH 523/709] [main] Update version to 2.0.0-snapshot

---
 RELEASE_NOTES.md                                 | 1 -
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 5ca7f3b8208..42c9735b6a5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,7 +1,6 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-[KOGITO-8526](https://issues.redhat.com/browse/KOGITO-8526) - Add quarkus profile 'kafka-events-support' to data index images by default
 
 ## Bug Fixes
 
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index a06ea068866..1f24fcddc81 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 0da2eb7b61e..1e746e2018f 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index e5928284d75..9d2847e5163 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 94818a3b65f54b71ac9eee434ea1bda3dd6c1f06 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 27 Feb 2023 16:35:39 +0100
Subject: [PATCH 524/709] KOGITO-5784 Use nightly Quarkus platform in PR /
 nightlies (#1365)

* Use local Quarkus platform

* correction

* Update README.md

Co-authored-by: Filippe Spolti <filippespolti@gmail.com>

* updates

---------

Co-authored-by: Filippe Spolti <filippespolti@gmail.com>
---
 .ci/jenkins/Jenkinsfile                       |  35 ++-
 .ci/jenkins/Jenkinsfile.deploy                |  47 +++-
 .ci/jenkins/Jenkinsfile.setup-branch          |  24 ++
 .ci/jenkins/dsl/jobs.groovy                   |  12 +-
 Makefile                                      |  17 +-
 README.md                                     |  11 +
 image.yaml                                    |  10 +-
 kogito-swf-builder-overrides.yaml             |   6 +-
 .../3.6.x/added/configure-maven.sh            |  10 +
 modules/kogito-maven/3.6.x/module.yaml        |   3 +
 .../3.8.x-rpm/added/configure-maven.sh        |   9 +
 modules/kogito-maven/3.8.x-rpm/module.yaml    |   3 +
 .../3.8.x/added/configure-maven.sh            |  10 +
 modules/kogito-maven/3.8.x/module.yaml        |   3 +
 modules/kogito-s2i-core/added/s2i-core        |  46 ++--
 .../kogito-s2i-core/tests/bats/s2i-core.bats  |   6 +-
 .../kogito-swf-builder/added/add-extension.sh |   8 +-
 modules/kogito-swf-builder/added/build-app.sh |   4 +-
 .../kogito-swf-builder/added/create-app.sh    |  13 +-
 .../added/run-app-devmode.sh                  |   5 +-
 scripts/README.md                             |  26 ++-
 scripts/build-quarkus-app.sh                  |  17 +-
 scripts/common.py                             | 212 ++++++++++--------
 scripts/manage-kogito-version.py              |   2 +-
 scripts/setup-maven.sh                        |  58 ++---
 scripts/update-quarkus-version.py             |  48 ----
 .../{update-tests.py => update-repository.py} |  42 ++--
 tests/features/kogito-s2i-builder.feature     |   2 +-
 tests/shell/kogito-swf-builder/RunTests.java  |   3 +-
 .../kogito-swf-builder/resources/Dockerfile   |   1 +
 tests/test-apps/clone-repo.sh                 |   2 -
 31 files changed, 404 insertions(+), 291 deletions(-)
 delete mode 100644 scripts/update-quarkus-version.py
 rename scripts/{update-tests.py => update-repository.py} (75%)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 94510c5e5d7..34b3c399f12 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -1,7 +1,5 @@
 @Library('jenkins-pipeline-shared-libraries')_
 
-import org.kie.jenkins.MavenCommand
-
 changeAuthor = env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepoGitUrl) : (env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR)
 changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
 changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
@@ -27,12 +25,6 @@ pipeline {
                 script {
                     clean()
 
-                    // Set the mirror url only if exist
-                    if (env.MAVEN_MIRROR_REPOSITORY != null
-                            && env.MAVEN_MIRROR_REPOSITORY != '') {
-                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
-                    }
-
                     githubscm.checkoutIfExists('kogito-images', changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
 
                     if (isProdCI()) {
@@ -56,14 +48,33 @@ pipeline {
                 }
             }
         }
-        stage('Prepare for tests') {
+        stage('Prepare environment') {
             steps {
                 script {
-                    //Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                    if (env.MAVEN_MIRROR_URL != '') {
-                        runPythonCommand('python3 scripts/update-tests.py --ignore-self-signed-cert')
+                    // Set the mirror url only if exist
+                    if (env.MAVEN_MIRROR_REPOSITORY) {
+                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
+                        
+                        // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
+                        runPythonCommand("python3 scripts/update-repository.py --ignore-self-signed-cert")
                     }
+                }
+            }
+        }
+        stage('Setup Quarkus platform') {
+            steps {
+                script {
+                    String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
+                    String quarkusPlatformVersion = "kogito-${kogitoVersion}"
 
+                    // Setup quarkus platform repo configuration
+                    runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
+                }
+            }
+        }
+        stage('Prepare offline kogito-examples') {
+            steps {
+                script {
                     runPythonCommand('make clone-repos')
                 }
             }
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index f9f6cad8f09..c8c0c1e9fb8 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -50,12 +50,6 @@ pipeline {
                         currentBuild.displayName = params.DISPLAY_NAME
                     }
 
-                    // Set the mirror url only if no artifact repository is given
-                    if (env.MAVEN_MIRROR_REPOSITORY) {
-                        echo 'Set Maven mirror url'
-                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
-                    }
-
                     checkoutRepo()
 
                     if (isRelease()) {
@@ -126,13 +120,48 @@ pipeline {
                 }
             }
         }
+        stage('Prepare environment') {
+            steps {
+                script {
+                    // Set the mirror url only if exist
+                    if (env.MAVEN_MIRROR_REPOSITORY) {
+                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
+
+                        // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
+                        runPythonCommand("python3 scripts/update-repository.py --ignore-self-signed-cert")
+                    }
+                }
+            }
+        }
+        stage('Setup Quarkus platform') {
+            steps {
+                script {
+                    String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
+                    String quarkusPlatformVersion = "kogito-${kogitoVersion}"
+
+                    if (isRelease()) {
+                        if (params.QUARKUS_PLATFORM_VERSION) {
+                            runPythonCommand("python3 scripts/update-repository.py quarkus-platform-version ${params.QUARKUS_PLATFORM_VERSION}")
+                        } else {
+                            echo "No new quarkus version given for the release. Statu quo ..."
+                        }
+                    } else {
+                        if (getMavenArtifactRepository()) {
+                            echo "[WARN] Artifacts repository defined in env will override the quarkus platform URL in tests. Make sure the platform artifacts are available on that artifacts repository (you can use a maven group)"
+                        }
+                        // Setup quarkus platform repo configuration
+                        runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert quarkus-platform-version ${quarkusPlatformVersion}")
+                    }
+                }
+            }
+        }
         stage('Setup for testing') {
             when {
                 expression { return !shouldSkipTests() }
             }
             steps {
                 script {
-                    updateTestsCommand = 'python3 scripts/update-tests.py'
+                    updateTestsCommand = 'python3 scripts/update-repository.py --tests-only'
                     if (getMavenArtifactRepository()) {
                         // Update repo in tests
                         updateTestsCommand += " --repo-url ${getMavenArtifactRepository()}"
@@ -146,10 +175,6 @@ pipeline {
                         updateTestsCommand += " --examples-uri ${params.EXAMPLES_URI}"
                     }
 
-                    //Ignore self-signed certificates if MAVEN_MIRROR_URL and/or artifact repo is defined
-                    if (env.MAVEN_MIRROR_URL || getMavenArtifactRepository()) {
-                        updateTestsCommand += ' --ignore-self-signed-cert'
-                    }
                     // Launch update tests
                     runPythonCommand(updateTestsCommand)
 
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 9178cc43ed9..ab930ebc956 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -131,6 +131,30 @@ pipeline {
                 }
             }
         }
+        stage('Prepare environment') {
+            steps {
+                script {
+                    // Set the mirror url only if exist
+                    if (env.MAVEN_MIRROR_REPOSITORY) {
+                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
+
+                        // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
+                        runPythonCommand("python3 scripts/update-build.py --ignore-self-signed-cert")
+                    }
+                }
+            }
+        }
+        stage('Setup Quarkus platform') {
+            steps {
+                script {
+                    String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
+                    String quarkusPlatformVersion = "kogito-${kogitoVersion}"
+
+                    // Setup quarkus platform repo configuration
+                    runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert quarkus-platform-version ${quarkusPlatformVersion}")
+                }
+            }
+        }
         stage('Build Images') {
             steps {
                 script {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 1d57d9f1e07..9d8e228f78c 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -36,7 +36,7 @@ if (Utils.isProductizedBranch(this)) {
 }
 
 KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
-    'source ~/virtenvs/cekit/bin/activate && python3 scripts/update-quarkus-version.py --bump-to %new_version%'
+    'source ~/virtenvs/cekit/bin/activate && python3 scripts/update-repository.py --quarkus-platform-version %new_version%'
 ])
 
 /////////////////////////////////////////////////////////////////
@@ -50,6 +50,9 @@ void setupPrJob(boolean isProdCI = false) {
         disable_status_message_error: true,
         disable_status_message_failure: true,
     ])
+    jobParams.env.putAll([
+        QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
+    ])
     if (isProdCI) {
         jobParams.job.name += '.prod'
         jobParams.pr.trigger_phrase = '.*[j|J]enkins,?.*(re)run [prod|Prod|PROD].*'
@@ -72,6 +75,8 @@ void createSetupBranchJob() {
 
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
 
+        QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
+
         AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
 
         MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
@@ -136,6 +141,8 @@ void setupDeployJob(JobType jobType, String envName = '') {
 
             MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
             DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
+
+            QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
         ])
     }
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
@@ -168,6 +175,9 @@ void setupDeployJob(JobType jobType, String envName = '') {
             // Release information
             stringParam('PROJECT_VERSION', '', 'Optional if not RELEASE. If RELEASE, cannot be empty.')
             stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
+            if (jobType == JobType.RELEASE) {
+                stringParam('QUARKUS_PLATFORM_VERSION', '', 'Allow to override the Quarkus Platform version')
+            }
 
             booleanParam('CREATE_PR', false, 'In case of not releasing, you can ask to create a PR with the changes')
 
diff --git a/Makefile b/Makefile
index 2f8d9b8dbe6..9be2f97a871 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
-QUARKUS_VERSION := $(shell awk '/- name: "QUARKUS_VERSION"/,/description/' image.yaml | grep value | awk -F'"' '{print $$2}')
+QUARKUS_PLATFORM_VERSION := $(shell awk '/- name: "QUARKUS_PLATFORM_VERSION"/,/description/' image.yaml | grep value | awk -F'"' '{print $$2}')
+KOGITO_VERSION := $(shell awk '/- name: "KOGITO_VERSION"/,/description/' image.yaml | grep value | awk -F'"' '{print $$2}')
 SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
 KOGITO_APPS_TARGET_BRANCH ?= main
 KOGITO_APPS_TARGET_URI ?= https://github.com/kiegroup/kogito-apps.git
@@ -21,6 +22,18 @@ endif
 list:
 	@python3 scripts/list-images.py $(arg)
 
+.PHONY: display-image-version
+display-image-version:
+	@echo $(IMAGE_VERSION)
+
+.PHONY: display-kogito-version
+display-kogito-version:
+	@echo $(KOGITO_VERSION)
+
+.PHONY: display-quarkus-platform-version
+display-quarkus-version:
+	@echo $(QUARKUS_PLATFORM_VERSION)
+
 # Build all images
 .PHONY: build
 # start to build the images
@@ -37,7 +50,7 @@ build-image: clone-repos _build-image
 _build-image:
 ifneq ($(ignore_build),true)
 	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
-	scripts/build-quarkus-app.sh ${image_name} $(QUARKUS_VERSION)
+	scripts/build-quarkus-app.sh ${image_name} $(QUARKUS_PLATFORM_VERSION)
 	${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
 endif
 # tag with shortened version
diff --git a/README.md b/README.md
index 8cea29a83ad..45ab7e8e137 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ Table of Contents
       - [Kogito SWF (Serverless Workflow) Builder Image usage](#kogito-swf-serverless-workflow-builder-image-usage)
         - [Using as a builder](#using-as-a-builder)
         - [Using for application development](#using-for-application-development)
+        - [Using the Kogito SWF Builder Image nightly image](#using-the-kogito-swf-builder-image-nightly-image)
       - [Kogito s2i Builder Image usage](#kogito-s2i-builder-image-usage)
       - [Kogito s2i Builder Image example](#kogito-s2i-builder-image-example)
         - [S2i Builder Image Example with Quarkus](#s2i-builder-image-example-with-quarkus)
@@ -204,6 +205,16 @@ Replace `<local_workflow_path>` with your local filesystem containing your workf
 
 After the image bootstrap, you can access [http://localhost:8080/q/swagger-ui](http://localhost:8080/q/swagger-ui) and test the workflow application right away!
 
+##### Using the Kogito SWF Builder Image nightly image
+
+The nightly builder image has been built and optimized with an internal nightly build of the Quarkus Platform.  
+There are 2 environment variables that should not be changed when using it:
+
+- QUARKUS_PLATFORM_VERSION = kogito-${KOGITO_VERSION}
+- MAVEN_REPO_URL = https://repository.jboss.org/nexus/content/repositories/kogito-internal-repository/
+
+That way, no new artifacts will be downloaded and you can directly use it.
+
 #### Kogito s2i Builder Image usage
 
 This image contains a helper option to better understand how to use it:
diff --git a/image.yaml b/image.yaml
index dffd9522acf..dc4f13b0af4 100644
--- a/image.yaml
+++ b/image.yaml
@@ -4,13 +4,17 @@ name: "kogito-image-real-name-on-overrides-file"
 version: "2.0.0-snapshot"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 
-labels:
+labels:  
   - name: "io.openshift.s2i.scripts-url"
     value: "image:///usr/local/s2i"
   - name: "io.openshift.s2i.destination"
     value: "/tmp"
   - name: "io.openshift.expose-services"
     value: "8080:http"
+  - name: "io.quarkus.platform.version"
+    value: "2.16.0.Final"
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
 
 modules:
   repositories:
@@ -20,9 +24,9 @@ envs:
   - name: "KOGITO_VERSION"
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
-  - name: "QUARKUS_VERSION"
+  - name: "QUARKUS_PLATFORM_VERSION"
     value: "2.16.0.Final"
-    description: Defines the Quarkus version to be used by the builder images. Not intended to be changed by end user.
+    description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
 
 packages:
   manager: microdnf
diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
index 40a82ff37ba..9190b42f70b 100644
--- a/kogito-swf-builder-overrides.yaml
+++ b/kogito-swf-builder-overrides.yaml
@@ -3,10 +3,6 @@ schema_version: 1
 name: "quay.io/kiegroup/kogito-swf-builder"
 description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
 
-labels:
-  - name: "org.quarkus.version"
-    value: "2.16.0.Final"
-
 modules:
   install:
     - name: org.kie.kogito.image.dependencies
@@ -23,7 +19,7 @@ modules:
 run:
   workdir: "/home/kogito"
   user: 1001
-  entrypoint: 
+  cmd: 
     - "/home/kogito/launch/run-app-devmode.sh"
 
 ports:
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
index 288c75b956a..99cecd0fb8f 100644
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.6.x/added/configure-maven.sh
@@ -24,9 +24,12 @@ function prepareEnv() {
 }
 
 function configure() {
+    log_info "Configure Maven"
+    
     configure_proxy
     configure_mirrors
     configure_maven_download_output
+    configure_maven_offline_mode
     ignore_maven_self_signed_certificates
     set_kogito_maven_repo
     add_maven_repo
@@ -99,6 +102,13 @@ function configure_maven_download_output() {
     fi
 }
 
+function configure_maven_offline_mode() {
+    if [ "${MAVEN_OFFLINE_MODE}" = "true" ]; then
+        log_info "Setup Maven offline mode. No artifact will be downloaded !!!"
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -o"
+    fi
+}
+
 function ignore_maven_self_signed_certificates() {
     if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
         export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
diff --git a/modules/kogito-maven/3.6.x/module.yaml b/modules/kogito-maven/3.6.x/module.yaml
index 6cce677771f..2291aaf8b23 100644
--- a/modules/kogito-maven/3.6.x/module.yaml
+++ b/modules/kogito-maven/3.6.x/module.yaml
@@ -68,6 +68,9 @@ envs:
   - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
     description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
     example: "true"
+  - name: "MAVEN_OFFLINE_MODE"
+    description: "When set to true, tells Maven to work in offline mode. See Maven `-o` option for more information."
+    example: "true"
 # unfortunately by now the version needs to be hardcoded.
 artifacts:
   - name: apache-maven-3.6.2-bin.tar.gz
diff --git a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
index 288c75b956a..c8df6ad5177 100644
--- a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
@@ -24,6 +24,8 @@ function prepareEnv() {
 }
 
 function configure() {
+    log_info "Configure Maven"
+
     configure_proxy
     configure_mirrors
     configure_maven_download_output
@@ -99,6 +101,13 @@ function configure_maven_download_output() {
     fi
 }
 
+function configure_maven_offline_mode() {
+    if [ "${MAVEN_OFFLINE_MODE}" = "true" ]; then
+        log_info "Setup Maven offline mode. No artifact will be downloaded !!!"
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -o"
+    fi
+}
+
 function ignore_maven_self_signed_certificates() {
     if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
         export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
index 5e8426e49bc..4ec5fad80bb 100644
--- a/modules/kogito-maven/3.8.x-rpm/module.yaml
+++ b/modules/kogito-maven/3.8.x-rpm/module.yaml
@@ -68,6 +68,9 @@ envs:
   - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
     description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
     example: "true"
+  - name: "MAVEN_OFFLINE_MODE"
+    description: "When set to true, tells Maven to work in offline mode. See Maven `-o` option for more information."
+    example: "true"
 
 modules:
   install:
diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/3.8.x/added/configure-maven.sh
index 288c75b956a..3662f60352a 100644
--- a/modules/kogito-maven/3.8.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x/added/configure-maven.sh
@@ -24,9 +24,12 @@ function prepareEnv() {
 }
 
 function configure() {
+    log_info "Configure Maven"
+
     configure_proxy
     configure_mirrors
     configure_maven_download_output
+    configure_maven_offline_mode
     ignore_maven_self_signed_certificates
     set_kogito_maven_repo
     add_maven_repo
@@ -99,6 +102,13 @@ function configure_maven_download_output() {
     fi
 }
 
+function configure_maven_offline_mode() {
+    if [ "${MAVEN_OFFLINE_MODE}" = "true" ]; then
+        log_info "Setup Maven offline mode. No artifact will be downloaded !!!"
+        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -o"
+    fi
+}
+
 function ignore_maven_self_signed_certificates() {
     if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
         export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 8fda7b9e10a..e9d8f571447 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -68,6 +68,9 @@ envs:
   - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
     description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
     example: "true"
+  - name: "MAVEN_OFFLINE_MODE"
+    description: "When set to true, tells Maven to work in offline mode. See Maven `-o` option for more information."
+    example: "true"
 # unfortunately by now the version needs to be hardcoded.
 artifacts:
   - name: apache-maven-3.8.6-bin.tar.gz
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index d24ecea267d..a86cec060a3 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -106,10 +106,10 @@ function build_kogito_app() {
 
     else
         log_info "---> Generating $RUNTIME_TYPE project structure for $PROJECT_ARTIFACT_ID..."
-        local quarkus_version
+        local quarkus_platform_version
         if [ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]; then
 
-            local quarkus_plugin="${QUARKUS_PLUGIN:-io.quarkus:quarkus-maven-plugin}"
+            local quarkus_plugin="${QUARKUS_PLUGIN:-io.quarkus.platform:quarkus-maven-plugin}"
             if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
                 quarkus_plugin="${QUARKUS_PLUGIN:-com.redhat.quarkus.platform:quarkus-maven-plugin}"
             fi
@@ -118,16 +118,16 @@ function build_kogito_app() {
             for i in "${GAV[@]}"; do
                 if [[ "$i" =~ ^[0-9]{0,2}\.[0-9]{0,3} ]]; then
                     log_info "version [${i}] provided through QUARKUS_PLUGIN env."
-                    quarkus_version=${i}
+                    quarkus_platform_version=${i}
                 else
-                    quarkus_version=$(get_quarkus_version) || exit 1
+                    quarkus_platform_version=${QUARKUS_PLATFORM_VERSION} || exit 1
                 fi
             done
 
-            log_info "----> Using Quarkus ${quarkus_plugin}:${quarkus_version} to bootstrap the application."
+            log_info "----> Using Quarkus ${quarkus_plugin}:${quarkus_platform_version} to bootstrap the application."
 
-            $MAVEN_HOME/bin/mvn -U -B ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
-                "${quarkus_plugin}":"${quarkus_version}":create  \
+            $MAVEN_HOME/bin/mvn -B ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
+                "${quarkus_plugin}":"${quarkus_platform_version}":create  \
                     -DprojectGroupId=$PROJECT_GROUP_ID \
                     -DprojectArtifactId=$PROJECT_ARTIFACT_ID \
                     -DprojectVersion=$PROJECT_VERSION \
@@ -137,13 +137,13 @@ function build_kogito_app() {
                 log_info "----> Adding extra Quarkus extensions: ${QUARKUS_EXTRA_EXTENSIONS}"
                 $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
 				-f $PROJECT_ARTIFACT_ID/pom.xml \
-                                "${quarkus_plugin}":"${quarkus_version}":add-extension \
+                                "${quarkus_plugin}":"${quarkus_platform_version}":add-extension \
                                 -Dextensions="${QUARKUS_EXTRA_EXTENSIONS}"
             fi
 
         elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
             log_info "----> Using Spring Boot to bootstrap the application."
-            $MAVEN_HOME/bin/mvn archetype:generate -U -B -DinteractiveMode=false -DarchetypeGroupId=org.kie.kogito \
+            $MAVEN_HOME/bin/mvn archetype:generate -B -DinteractiveMode=false -DarchetypeGroupId=org.kie.kogito \
                 -DarchetypeArtifactId=kogito-spring-boot-archetype -DarchetypeVersion=$KOGITO_VERSION \
                 -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
                 ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}"
@@ -186,12 +186,12 @@ function build_kogito_app() {
             log_info "--> Adding Kogito Quarkus Workflows extension to the generated project."
 
             # we must set the evaluate version since forceStdout is not available in previous versions
-            local quarkus_version
-            quarkus_version=$(get_quarkus_version) || exit 1
-            log_info "--> Quarkus version is '$quarkus_version'"
+            local quarkus_platform_version
+            quarkus_platform_version=${QUARKUS_PLATFORM_VERSION} || exit 1
+            log_info "--> Quarkus version is '$quarkus_platform_version'"
 
             $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
-                "${quarkus_plugin}":"${quarkus_version}":add-extension \
+                "${quarkus_plugin}":"${quarkus_platform_version}":add-extension \
                 -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow"
         fi
 
@@ -275,23 +275,5 @@ function get_quarkus_platform_properties() {
         quarkus_platform_artifact_id="${QUARKUS_PLATFORM_ARTIFACT_ID:-quarkus-bom}"
     fi
 
-    echo " -DplatformGroupId=${quarkus_platform_group_id} -DplatformArtifactId=${quarkus_platform_artifact_id} -DplatformVersion=$(get_quarkus_version)"
-}
-
-function get_quarkus_version() {
-    local quarkus_version="${QUARKUS_VERSION}"
-    if [ "${QUARKUS_VERSION}x" = "x" ]; then
-        log_info "----> Trying to retrieve Quarkus version from org.kie.kogito:kogito-build-parent:${KOGITO_VERSION}"
-        ver=$($MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" help:evaluate -q \
-            -Dartifact=org.kie.kogito:kogito-build-parent:"${KOGITO_VERSION}" \
-            -Dexpression=version.io.quarkus \
-            -DforceStdout)
-
-        if [[ ! "$ver" =~ ^[0-9]{0,2}\.[0-9]{0,3}\.[0-9]{0,2} ]]; then
-            log_error "----> Impossible to get Quarkus version from the generated Maven project (output: '$ver'), failing build"
-            exit 1
-        fi
-	    quarkus_version=$ver
-    fi
-    echo $quarkus_version
+    echo " -DplatformGroupId=${quarkus_platform_group_id} -DplatformArtifactId=${quarkus_platform_artifact_id} -DplatformVersion=${QUARKUS_PLATFORM_VERSION}"
 }
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index e79a0ca938d..d34e10eca41 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -430,7 +430,7 @@ teardown() {
 
 
 @test "test if the Quarkus platform properties are correctly returned for community version" {
-    QUARKUS_VERSION=1.2.3.4
+    QUARKUS_PLATFORM_VERSION=1.2.3.4
 
     result=$(get_quarkus_platform_properties)
 
@@ -443,7 +443,7 @@ teardown() {
 
 
 @test "test if the Quarkus platform properties are correctly returned for prod version" {
-    QUARKUS_VERSION="1.2.3.4"
+    QUARKUS_PLATFORM_VERSION="1.2.3.4"
     JBOSS_IMAGE_NAME="rhpam-7/kogito-builder"
 
     result=$(get_quarkus_platform_properties)
@@ -457,7 +457,7 @@ teardown() {
 
 
 @test "test if the Quarkus platform properties are correctly returned for using custom values" {
-    QUARKUS_VERSION="12"
+    QUARKUS_PLATFORM_VERSION="12"
     QUARKUS_PLATFORM_GROUP_ID="groupId-1"
     QUARKUS_PLATFORM_ARTIFACT_ID="artifactId-2"
 
diff --git a/modules/kogito-swf-builder/added/add-extension.sh b/modules/kogito-swf-builder/added/add-extension.sh
index e3a252003a3..3b18ebdd8a0 100755
--- a/modules/kogito-swf-builder/added/add-extension.sh
+++ b/modules/kogito-swf-builder/added/add-extension.sh
@@ -21,10 +21,10 @@ cd "${PROJECT_ARTIFACT_ID}"
 # auto configure JVM settings
 source "${KOGITO_HOME}"/launch/jvm-settings.sh
 
-"${MAVEN_HOME}"/bin/mvn -U -B ${MAVEN_ARGS_APPEND} \
+"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
+  -nsu \
   -s "${MAVEN_SETTINGS_PATH}" \
-  -Dquarkus.version="${QUARKUS_VERSION}" \
-  -DplatformVersion="${QUARKUS_VERSION}" \
+  -DplatformVersion="${QUARKUS_PLATFORM_VERSION}" \
   -Dextensions="${extensions}" \
   ${QUARKUS_ADD_EXTENSION_ARGS} \
-  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":add-extension
+  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":add-extension
diff --git a/modules/kogito-swf-builder/added/build-app.sh b/modules/kogito-swf-builder/added/build-app.sh
index 3404ac8c481..758e724f169 100755
--- a/modules/kogito-swf-builder/added/build-app.sh
+++ b/modules/kogito-swf-builder/added/build-app.sh
@@ -41,9 +41,9 @@ fi
 # auto configure JVM settings
 source "${KOGITO_HOME}"/launch/jvm-settings.sh
 
-"${MAVEN_HOME}"/bin/mvn -U -B ${MAVEN_ARGS_APPEND} \
+"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
+  -nsu \
   -s "${MAVEN_SETTINGS_PATH}" \
-  -Dquarkus.version="${QUARKUS_VERSION}" \
   -DskipTests \
   -Dquarkus.container-image.build=false \
   clean install
diff --git a/modules/kogito-swf-builder/added/create-app.sh b/modules/kogito-swf-builder/added/create-app.sh
index 6c27f4d1a1c..effd0da73be 100755
--- a/modules/kogito-swf-builder/added/create-app.sh
+++ b/modules/kogito-swf-builder/added/create-app.sh
@@ -19,21 +19,20 @@ configure
 # auto configure JVM settings
 source "${KOGITO_HOME}"/launch/jvm-settings.sh
 
-"${MAVEN_HOME}"/bin/mvn -U -B -s "${MAVEN_SETTINGS_PATH}" \
-  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_VERSION}":create ${QUARKUS_CREATE_ARGS} \
+"${MAVEN_HOME}"/bin/mvn -B -s "${MAVEN_SETTINGS_PATH}" \
+  -nsu \
+  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":create ${QUARKUS_CREATE_ARGS} \
   -DprojectGroupId="${PROJECT_GROUP_ID}" \
   -DprojectArtifactId="${PROJECT_ARTIFACT_ID}" \
   -DprojectVersionId="${PROJECT_VERSION}" \
-  -DplatformVersion="${QUARKUS_VERSION}" \
+  -DplatformVersion="${QUARKUS_PLATFORM_VERSION}" \
   -Dextensions="${QUARKUS_EXTENSIONS}"
 
 cd "${PROJECT_ARTIFACT_ID}"
 
-# Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
-# This avoids to have, for example, Quarkus BOMs or orther artifacts with multiple versions.
-"${MAVEN_HOME}"/bin/mvn -U -B ${MAVEN_ARGS_APPEND} \
+"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
+  -nsu \
   -s "${MAVEN_SETTINGS_PATH}" \
-  -Dquarkus.version="${QUARKUS_VERSION}" \
   -DskipTests \
   -Dquarkus.container-image.build=false \
    clean install
diff --git a/modules/kogito-swf-builder/added/run-app-devmode.sh b/modules/kogito-swf-builder/added/run-app-devmode.sh
index abe5898c772..de4ef92c8f3 100755
--- a/modules/kogito-swf-builder/added/run-app-devmode.sh
+++ b/modules/kogito-swf-builder/added/run-app-devmode.sh
@@ -23,9 +23,10 @@ fi
 # auto configure JVM settings
 source "${KOGITO_HOME}"/launch/jvm-settings.sh
 
-"${MAVEN_HOME}"/bin/mvn -U -B ${MAVEN_ARGS_APPEND} \
+# `-o` means offline mode
+"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
+  -o \
   -s "${MAVEN_SETTINGS_PATH}" \
   -DskipTests \
   -Dquarkus.http.host=0.0.0.0 \
-  -Dquarkus.version="${QUARKUS_VERSION}" \
   clean compile quarkus:dev
diff --git a/scripts/README.md b/scripts/README.md
index 0a209f45060..d0d016991a8 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -11,7 +11,7 @@ Today we have these scripts:
 - [push-local-registry.sh](push-local-registry.sh)
 - [push-staging.py](push-staging.py)
 - [run-bats.sh](run-bats.sh)
-- [update-tests.py](update-tests.py)
+- [update-repository.py](update-repository.py)
 
 
 
@@ -158,11 +158,11 @@ If there is no need to update the tag, there is the option to override it, just
 
 ### Update tests script
 
-The `update-tests` script allows you to change some information in order to perform some testing.
+The `update-repository` script allows you to change some build & test information in the repository.
 
 #### Script dependencies
 
-The `update-tests.py` has some dependencies that needs to be manually installed:
+The `update-repository.py` has some dependencies that needs to be manually installed:
 
 ```bash
 $ pip install -U ruamel.yaml
@@ -173,7 +173,7 @@ $ pip install -U ruamel.yaml
 ##### Update repository url
 
 ```bash
-$ python update-tests.py --repo-url 'https://maven-repository.mirror.com/public'
+$ python update-repository.py --repo-url 'https://maven-repository.mirror.com/public'
 ```
 
 This will add this repository as an extra repository for artifacts to be retrieved from into the behave tests, next to the default JBoss repository.
@@ -181,23 +181,29 @@ This will add this repository as an extra repository for artifacts to be retriev
 You can also completely replace the main Jboss repository:
 
 ```bash
-$ python update-tests.py --repo-url 'https://maven-repository.mirror.com/public' --replace-jboss-repo
+$ python update-repository.py --repo-url 'https://maven-repository.mirror.com/public' --replace-jboss-repo
 ```
 
 ##### Update artifacts version
 
 ```bash
-$ python update-tests.py --artifacts-version 1.0.0
+$ python update-repository.py --artifacts-version 1.0.0
 ```
 
-This will set the default artifacts version to 1.0.0 into the behave tests.
+This will set the default artifacts version.
 
-##### Update Examples URI and Ref
+##### Update quarkus version
 
 ```bash
-$ python update-tests.py --examples-uri https://github.com/<yournamespace>/kogito-examples --examples-ref 1.0.0
+$ python update-repository.py quarkus-platform-version 2.16.0.Final
 ```
 
-This will update the examples uri and/or the ref for the tests.
+This will set the image quarkus version to 2.16.0.Final.
 
+##### Update Examples URI and Ref
 
+```bash
+$ python update-repository.py --examples-uri https://github.com/<yournamespace>/kogito-examples --examples-ref 1.0.0
+```
+
+This will update the examples uri and/or the ref for the tests.
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index 0a0fff3fbca..caa4bfbc3c1 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -10,9 +10,9 @@ set -o pipefail
 
 # Read entries before sourcing
 image_name="${1}"
-quarkus_version="${2}"
+quarkus_platform_version="${2}"
 
-if [ -z ${quarkus_version} ]; then
+if [ -z ${quarkus_platform_version} ]; then
     echo "Please provide the quarkus version"
     exit 1
 fi
@@ -34,6 +34,10 @@ mvn_local_repo="/tmp/temp_maven/kogito-swf-builder"
 
 rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
 rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
+if [ "${CI}" = "true" ]; then
+    # On CI we want to make sure we remove all artifacts from maven repo
+    rm -rf ${mvn_local_repo}
+fi
 mkdir -p ${mvn_local_repo}
 
 . ${script_dir_path}/setup-maven.sh "${build_target_dir}"/settings.xml
@@ -41,22 +45,21 @@ mkdir -p ${mvn_local_repo}
 set -x
 echo "Create quarkus project to path ${build_target_dir}"
 cd ${build_target_dir}
-mvn -U ${MAVEN_OPTIONS} \
+mvn ${MAVEN_OPTIONS} \
     -Dmaven.repo.local=${mvn_local_repo} \
     -DprojectGroupId="org.acme" \
     -DprojectArtifactId="serverless-workflow-project" \
     -DprojectVersionId="1.0.0-SNAPSHOT" \
-    -DplatformVersion="${quarkus_version}" \
+    -DplatformVersion="${quarkus_platform_version}" \
     -Dextensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing" \
-    io.quarkus.platform:quarkus-maven-plugin:"${quarkus_version}":create
+    io.quarkus.platform:quarkus-maven-plugin:"${quarkus_platform_version}":create
 
 echo "Build quarkus app"
 cd "serverless-workflow-project"
 # Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
 # This avoids to have, for example, Quarkus BOMs or orther artifacts with multiple versions.
-mvn -U ${MAVEN_OPTIONS} \
+mvn ${MAVEN_OPTIONS} \
     -DskipTests \
-    -Dquarkus.version="${quarkus_version}" \
     -Dmaven.repo.local=${mvn_local_repo} \
     -Dquarkus.container-image.build=false \
     clean install
diff --git a/scripts/common.py b/scripts/common.py
index 090c1415f95..0ee0a03aab7 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -18,10 +18,11 @@
 PROD_IMAGE_STREAM_FILENAME = "logic-imagestream.yaml"
 # image.yaml file definition that needs to be updated
 IMAGE_FILENAME = "image.yaml"
-ARTIFACTS_VERSION_ENV_KEY = "KOGITO_VERSION"
+KOGITO_VERSION_ENV_KEY = "KOGITO_VERSION"
+KOGITO_VERSION_LABEL_NAME = "org.kie.kogito.version"
 
-QUARKUS_VERSION_ENV_KEY = "QUARKUS_VERSION"
-QUARKUS_VERSION_LABEL_NAME = "org.quarkus.version"
+QUARKUS_PLATFORM_VERSION_ENV_KEY = "QUARKUS_PLATFORM_VERSION"
+QUARKUS_PLATFORM_VERSION_LABEL_NAME = "io.quarkus.platform.version"
 
 # behave tests that needs to be updated
 BEHAVE_BASE_DIR = 'tests/features'
@@ -125,7 +126,7 @@ def update_image_stream(target_version, prod=False):
         raise
 
 
-def get_all_module_dirs(prefix):
+def get_all_module_dirs():
     """
     Retrieve the module directories
     """
@@ -135,9 +136,7 @@ def get_all_module_dirs(prefix):
     for r, d, f in os.walk(MODULES_DIR):
         for item in f:
             if MODULE_FILENAME == item:
-                path = os.path.dirname(os.path.join(r, item))
-                if os.path.basename(path).startswith(prefix):
-                    modules.append(path)
+                modules.append(os.path.dirname(os.path.join(r, item)))
 
     return modules
 
@@ -146,14 +145,25 @@ def get_community_module_dirs():
     """
     Retrieve the Kogito module directories
     """
-    return get_all_module_dirs(COMMUNITY_PREFIX)
+    community_modules = []
+    for module_path in get_all_module_dirs():
+        if "{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(COMMUNITY_PREFIX) and os.path.basename(module_path) != "prod":
+            community_modules.append(module_path)
+
+    return community_modules
+
 
 
 def get_prod_module_dirs():
     """
     Retrieve the Logic module directories
     """
-    return get_all_module_dirs(PRODUCT_PREFIX)
+    prod_modules = []
+    for module_path in get_all_module_dirs():
+        if "{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(PRODUCT_PREFIX) or ("{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(COMMUNITY_PREFIX) and os.path.basename(module_path) == "prod"):
+            prod_modules.append(module_path)
+
+    return prod_modules
 
 
 def get_images(prefix):
@@ -251,74 +261,6 @@ def update_module_version(module_dir, target_version):
     except TypeError:
         raise
 
-def update_images_env_value(env_name, new_value, prod=False):
-    """
-    Update the given env name for all images with the given new value.
-    :param env_name: environment variable name to update
-    :param new_value: new value to set
-    :param prod: if the module to be updated is prod version.
-    """
-    images = []
-    if prod:
-        images = get_prod_images()
-    else:
-        images = get_community_images()
-
-    for image_name in images:
-        image_filename = "{}-overrides.yaml".format(image_name)
-        update_env_value(image_filename, env_name, new_value)
-
-def update_images_label_value(label_name, new_value, prod=False):
-    """
-    Update the given label name for all images with the given new value.
-    :param label_name: label name to update
-    :param new_value: new value to set
-    :param prod: if the module to be updated is prod version.
-    """
-    images = []
-    if prod:
-        images = get_prod_images()
-    else:
-        images = get_community_images()
-
-    for image_name in images:
-        image_filename = "{}-overrides.yaml".format(image_name)
-        update_label_value(image_filename, label_name, new_value)
-
-def update_modules_env_value(env_name, new_value, prod=False):
-    """
-    Update the given environment variable name for all Kogito modules with the given new value.
-    :param env_name: label name to update
-    :param new_value: new value to set
-    :param prod: if the module to be updated is prod version.
-    """
-    modules = []
-    if prod:
-        modules = get_prod_module_dirs()
-    else:
-        modules = get_community_module_dirs()
-
-    for module_dir in modules:
-        module_file = os.path.join(module_dir, "module.yaml")
-        update_env_value(module_file, env_name, new_value)
-
-def update_modules_label_value(label_name, new_value, prod=False):
-    """
-    Update the given label name for all Kogito modules with the given new value.
-    :param label_name: label name to update
-    :param new_value: new value to set
-    :param prod: if the module to be updated is prod version.
-    """
-    modules = []
-    if prod:
-        modules = get_prod_module_dirs()
-    else:
-        modules = get_community_module_dirs()
-
-    for module_dir in modules:
-        module_file = os.path.join(module_dir, "module.yaml")
-        update_label_value(module_file, label_name, new_value)
-
 def retrieve_artifacts_version():
     """
     Retrieve the artifacts version from envs in main image.yaml
@@ -327,25 +269,31 @@ def retrieve_artifacts_version():
         with open(IMAGE_FILENAME) as imageFile:
             data = yaml_loader().load(imageFile)
             for index, env in enumerate(data['envs'], start=0):
-                if env['name'] == ARTIFACTS_VERSION_ENV_KEY:
+                if env['name'] == KOGITO_VERSION_ENV_KEY:
                     return data['envs'][index]['value']
 
     except TypeError:
         raise
 
-def update_quarkus_version_env_in_image(quarkus_version):
+def update_quarkus_platform_version_in_build(quarkus_platform_version, prod=False):
     """
-    Update `QUARKUS_VERSION` env var in image.yaml.
-    :param quarkus_version: quarkus version used to update image.yaml which contains the `QUARKUS_VERSION` env var
+    Update quarkus_platform_version version into images/modules
+    :param quarkus_platform_version: quarkus version to set
     """
-    update_env_value(IMAGE_FILENAME, QUARKUS_VERSION_ENV_KEY, quarkus_version)
+    update_env_value(QUARKUS_PLATFORM_VERSION_ENV_KEY, quarkus_platform_version, prod)
+    update_label_value(QUARKUS_PLATFORM_VERSION_LABEL_NAME, quarkus_platform_version, prod)
 
-def update_artifacts_version_env_in_image(artifacts_version):
+def update_quarkus_platform_version_in_behave_tests_repository_paths(quarkus_platform_version):
     """
-    Update `KOGITO_VERSION` env var in image.yaml.
-    :param artifacts_version: kogito version used to update image.yaml which contains the `KOGITO_VERSION` env var
+    Update quarkus_platform_version version into behave tests repository paths
+    :param quarkus_platform_version: quarkus version to set
     """
-    update_env_value(IMAGE_FILENAME, ARTIFACTS_VERSION_ENV_KEY, artifacts_version)
+    print("Set quarkus_platform_version {} in behave tests as repository path".format(quarkus_platform_version))
+    # pattern to change the KOGITO_VERSION
+    pattern = re.compile(
+        'io/quarkus/platform/quarkus-bom/([\d.]+.Final)/quarkus-bom-([\d.]+.Final).pom')
+    replacement = 'io/quarkus/platform/quarkus-bom/{}/quarkus-bom-{}.pom'.format(quarkus_platform_version, quarkus_platform_version)
+    update_in_behave_tests(pattern, replacement)
 
 def update_examples_ref_in_behave_tests(examples_ref):
     """
@@ -370,6 +318,13 @@ def update_examples_uri_in_behave_tests(examples_uri):
     replacement = examples_uri
     update_in_behave_tests(pattern, replacement)
 
+def update_artifacts_version_in_build(artifacts_version, prod=False):
+    """
+    Update artifacts version into modules / images
+    :param artifacts_version: artifacts version to set
+    """
+    update_env_value(KOGITO_VERSION_ENV_KEY, artifacts_version, prod)
+    update_label_value(KOGITO_VERSION_LABEL_NAME, artifacts_version, prod)
 
 def update_artifacts_version_in_behave_tests(artifacts_version):
     """
@@ -429,6 +384,18 @@ def update_maven_mirror_url_in_quarkus_plugin_behave_tests(repo_url):
         "MAVEN_MIRROR_URL", repo_url)
     update_in_behave_tests(pattern, replacement)
 
+def update_maven_repo_env_value(repo_url, replace_jboss_repository, prod=False):
+    """
+    Update the given maven repository value for all images/modules.
+    :param repo_url: Maven repository url
+    :param replace_jboss_repository: Set to true if default Jboss repository needs to be ove
+    :param prod: if the module to be updated is prod version.
+    """
+    env_name = "MAVEN_REPO_URL"
+    if replace_jboss_repository:
+        env_name = "JBOSS_MAVEN_REPO_URL"
+    update_env_value(env_name, repo_url, prod)
+
 
 def ignore_maven_self_signed_certificate_in_behave_tests():
     """
@@ -492,7 +459,33 @@ def update_maven_repo_in_setup_maven(repo_url, replace_jboss_repository):
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
     update_in_file(SETUP_MAVEN_SCRIPT, pattern, replacement)
 
-def update_env_value(filename, env_name, env_value):
+def update_env_value(env_name, env_value, prod=False):
+    """
+    Update environment value into the given yaml module/image file
+    :param env_name: environment variable name to update
+    :param env_value: value to set
+    """
+
+    images = []
+    modules = []
+    if prod:
+        images = get_prod_images()
+        modules = get_prod_module_dirs()
+    else:
+        images = get_community_images()
+        modules = get_community_module_dirs()
+
+    update_env_value_in_file(IMAGE_FILENAME, env_name, env_value)
+
+    for image_name in images:
+        image_filename = "{}-overrides.yaml".format(image_name)
+        update_env_value_in_file(image_filename, env_name, env_value)
+    
+    for module_dir in modules:
+        module_file = os.path.join(module_dir, "module.yaml")
+        update_env_value_in_file(module_file, env_name, env_value)
+
+def update_env_value_in_file(filename, env_name, env_value):
     """
     Update environment value into the given yaml module/image file
     :param filename: filename to update
@@ -500,6 +493,7 @@ def update_env_value(filename, env_name, env_value):
     :param env_value: value to set
     """
     try:
+        file_updated = False
         with open(filename) as yaml_file:
             data = yaml_loader().load(yaml_file)
             if 'envs' in data:
@@ -507,16 +501,43 @@ def update_env_value(filename, env_name, env_value):
                     if env['name'] == env_name:
                         print("Updating {0} label {1} with value {2}".format(filename, env_name,
                                                                                     env_value))
-                        if 'value' in data['envs'][index]: # Do not update if no value already defined
-                            data['envs'][index]['value'] = env_value
+                        data['envs'][index]['value'] = env_value
+                        file_updated = True
 
-        with open(filename, 'w') as yaml_file:
-            yaml_loader().dump(data, yaml_file)
+        if file_updated:
+            with open(filename, 'w') as yaml_file:
+                yaml_loader().dump(data, yaml_file)
 
     except TypeError:
         raise
 
-def update_label_value(filename, label_name, label_value):
+def update_label_value(label_name, label_value, prod=False):
+    """
+    Update label value in all module / image files 
+    :param label_name: label name to update
+    :param label_value: value to set
+    """
+
+    images = []
+    modules = []
+    if prod:
+        images = get_prod_images()
+        modules = get_prod_module_dirs()
+    else:
+        images = get_community_images()
+        modules = get_community_module_dirs()
+
+    update_label_value_in_file(IMAGE_FILENAME, label_name, label_value)
+
+    for image_name in images:
+        image_filename = "{}-overrides.yaml".format(image_name)
+        update_label_value_in_file(image_filename, label_name, label_value)
+    
+    for module_dir in modules:
+        module_file = os.path.join(module_dir, "module.yaml")
+        update_label_value_in_file(module_file, label_name, label_name)
+
+def update_label_value_in_file(filename, label_name, label_value):
     """
     Update label value into the given yaml module/image file
     :param filename: filename to update
@@ -524,6 +545,7 @@ def update_label_value(filename, label_name, label_value):
     :param label_value: value to set
     """
     try:
+        file_updated = False
         with open(filename) as yaml_file:
             data = yaml_loader().load(yaml_file)
             if 'labels' in data:
@@ -533,9 +555,11 @@ def update_label_value(filename, label_name, label_value):
                                                                                     label_value))
                         if 'value' in data['labels'][index]: # Do not update if no value already defined
                             data['labels'][index]['value'] = label_value
+                            file_updated = True
 
-        with open(filename, 'w') as yaml_file:
-            yaml_loader().dump(data, yaml_file)
+        if file_updated:
+            with open(filename, 'w') as yaml_file:
+                yaml_loader().dump(data, yaml_file)
 
     except TypeError:
         raise
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 21f7594f78c..1da4a467ca9 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -68,7 +68,7 @@
                 common.update_community_image_version(args.bump_to)
                 common.update_image_stream(args.bump_to)
                 common.update_modules_version(args.bump_to)
-                common.update_artifacts_version_env_in_image(artifacts_version)
+                common.update_artifacts_version_in_build(artifacts_version)
 
                 # tests default values
                 common.update_examples_ref_in_behave_tests(examples_ref)
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
index 0ceb203dda0..7242876cde6 100755
--- a/scripts/setup-maven.sh
+++ b/scripts/setup-maven.sh
@@ -3,7 +3,6 @@
 # Usage: . setup-maven.sh
 
 MAVEN_VERSION="3.8.x"
-
 MVN_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-maven/${MAVEN_VERSION}"
 MAVEN_OPTIONS="-DskipTests"
 # Do not remove below, this can be updated by the python scripts
@@ -14,41 +13,42 @@ if [ -z "${maven_settings_path}" ]; then
     maven_settings_path="${HOME}"/.m2/settings.xml
 fi
 
-if [ "${CI}" ]; then
-    echo "Updating settings file ${maven_settings_path}"
-
-    # setup maven env
-    # Do not remove below, this can be updated by the python scripts
-    export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
-    # export MAVEN_REPO_URL=
-    cp "${MVN_MODULE}"/maven/settings.xml "${maven_settings_path}"
-    export MAVEN_SETTINGS_PATH="${maven_settings_path}"
-    source "${MVN_MODULE}"/added/configure-maven.sh
-    configure
+LOGGING_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-logging/"
+source "${LOGGING_MODULE}"/added/logging.sh
 
-    export MAVEN_OPTIONS="${MAVEN_OPTIONS} -s ${maven_settings_path}"
+echo "Updating settings file ${maven_settings_path}"
 
-    # Add NPM registry if needed
-    if [ ! -z "${NPM_REGISTRY_URL}" ]; then
-        echo "enabling npm repository: ${NPM_REGISTRY_URL}"
-        npm_profile="\
+# setup maven env
+# Do not remove below, this can be updated by the python scripts
+export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
+# export MAVEN_REPO_URL=
+cp "${MVN_MODULE}"/maven/settings.xml "${maven_settings_path}"
+export MAVEN_SETTINGS_PATH="${maven_settings_path}"
+source "${MVN_MODULE}"/added/configure-maven.sh
+configure
+
+export MAVEN_OPTIONS="${MAVEN_OPTIONS} -s ${maven_settings_path}"
+
+# Add NPM registry if needed
+if [ ! -z "${NPM_REGISTRY_URL}" ]; then
+    echo "enabling npm repository: ${NPM_REGISTRY_URL}"
+    npm_profile="\
 <profile>\
-  <id>internal-npm-registry</id>\
-  <properties>\
-  <npmRegistryURL>${NPM_REGISTRY_URL}</npmRegistryURL>\
-  <yarnDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/yarn/</yarnDownloadRoot>\
-  <nodeDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/node/</nodeDownloadRoot>\
-  <npmDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/npm/</npmDownloadRoot>\
-  </properties>\
+<id>internal-npm-registry</id>\
+<properties>\
+<npmRegistryURL>${NPM_REGISTRY_URL}</npmRegistryURL>\
+<yarnDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/yarn/</yarnDownloadRoot>\
+<nodeDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/node/</nodeDownloadRoot>\
+<npmDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/npm/</npmDownloadRoot>\
+</properties>\
 </profile>\
 "   
-        sed -i -E "s|(<!-- ### extra maven repositories ### -->)|\1\n${npm_profile}|" "${MAVEN_SETTINGS_PATH}"
-        sed -i -E "s|(<!-- ### extra maven profile ### -->)|\1\n<activeProfile>internal-npm-registry</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
-    fi
-
-    cat "${maven_settings_path}"
+    sed -i -E "s|(<!-- ### extra maven repositories ### -->)|\1\n${npm_profile}|" "${MAVEN_SETTINGS_PATH}"
+    sed -i -E "s|(<!-- ### extra maven profile ### -->)|\1\n<activeProfile>internal-npm-registry</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
 fi
 
+cat "${maven_settings_path}"
+
 if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" = "true" ]; then
     export MAVEN_OPTIONS="${MAVEN_OPTIONS} -Denforcer.skip"
 fi
diff --git a/scripts/update-quarkus-version.py b/scripts/update-quarkus-version.py
deleted file mode 100644
index 83166a9097c..00000000000
--- a/scripts/update-quarkus-version.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/python3
-# This script will be responsible to help to update the quarkus version in kogito images/modules
-# Example of usage:
-#   # move the current version to the next one or rcX
-#   python scripts/update-quarkus-version.py --bump-to 2.13.0.Final
-#
-# Dependencies:
-#  ruamel.yaml
-
-import sys
-import argparse
-import common
-import re
-
-sys.dont_write_bytecode = True
-
-def update_quarkus_version_in_behave_tests_repository_paths(quarkus_version):
-    """
-    Update quarkus version into behave tests
-    :param quarkus_version: quarkus version to set
-    """
-    print("Set quarkus_version {} in behave tests as repository path".format(quarkus_version))
-    # pattern to change the KOGITO_VERSION
-    pattern = re.compile(
-        'io/quarkus/platform/quarkus-bom/([\d.]+.Final)/quarkus-bom-([\d.]+.Final).pom')
-    replacement = 'io/quarkus/platform/quarkus-bom/{}/quarkus-bom-{}.pom'.format(quarkus_version, quarkus_version)
-    common.update_in_behave_tests(pattern, replacement)
-
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Quarkus version updater')
-    parser.add_argument('--bump-to', dest='bump_to', help='bump everything to the given version')
-    parser.add_argument('--prod', default=False, action='store_true', help='Update product modules/images')
-
-    args = parser.parse_args()
-
-    if args.bump_to:
-        common.update_quarkus_version_env_in_image(args.bump_to)
-        common.update_images_env_value(common.QUARKUS_VERSION_ENV_KEY, args.bump_to, args.prod)
-        common.update_modules_env_value(common.QUARKUS_VERSION_ENV_KEY, args.bump_to, args.prod)
-
-        common.update_images_label_value(common.QUARKUS_VERSION_LABEL_NAME, args.bump_to, args.prod)
-        common.update_modules_label_value(common.QUARKUS_VERSION_LABEL_NAME, args.bump_to, args.prod)
-
-        update_quarkus_version_in_behave_tests_repository_paths(args.bump_to)
-    else:
-        print(parser.print_usage())
\ No newline at end of file
diff --git a/scripts/update-tests.py b/scripts/update-repository.py
similarity index 75%
rename from scripts/update-tests.py
rename to scripts/update-repository.py
index 8b5b701a634..a1bf8fbc4f8 100644
--- a/scripts/update-tests.py
+++ b/scripts/update-repository.py
@@ -16,24 +16,41 @@
     parser.add_argument('--repo-url', dest='repo_url', help='Defines the url of the repository to setup into the tests')
     parser.add_argument('--replace-jboss-repo', dest='replace_jboss_repo', default=False, action='store_true',
                         help='Enable if repo-url should replace the main JBoss repository')
+    parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False,
+                        action='store_true',
+                        help='If set to true will relax the SSL for user-generated self-signed certificates')
+    parser.add_argument('--archetype-maven-mirror-url', dest='archetype_maven_mirror_url',
+                        help='Maven mirror URL to be used for archetype generation')
+
     parser.add_argument('--examples-uri', dest='examples_uri', help='To update the examples uri for testing')
     parser.add_argument('--examples-ref', dest='examples_ref', help='To update the examples ref for testing')
+
     parser.add_argument('--artifacts-version', dest='artifacts_version',
                         help='To update the artifacts version for testing')
-    parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False,
-                        action='store_true',
-                        help='If set to true will relax the SSL for user-generated self-signed certificates')
+    parser.add_argument('--quarkus-platform-version', dest='quarkus_platform_version', help='Update Quarkus version for the tests')
+
     parser.add_argument('--runtime-image-jvm', dest='runtime_image_jvm',
                         help='To update the runtime jvm image name in behave tests\'s steps')
     parser.add_argument('--runtime-image-native', dest='runtime_image_native',
                         help='To update the runtime native image name in behave tests\'s steps')
-    parser.add_argument('--archetype-maven-mirror-url', dest='archetype_maven_mirror_url',
-                        help='Maven mirror URL to be used for archetype generation')
+
+    parser.add_argument('--tests-only', dest='tests_only', default=False, action='store_true', help='Update product modules/images')
+    parser.add_argument('--prod', default=False, action='store_true', help='Update product modules/images')
     args = parser.parse_args()
 
     if args.repo_url:
-        common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_jboss_repo)
         common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_jboss_repo)
+        if args.tests_only:
+            common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_jboss_repo)
+        else:
+            common.update_maven_repo_env_value(args.repo_url, args.replace_jboss_repo, args.prod)
+    
+    if args.ignore_self_signed_cert:
+        common.ignore_maven_self_signed_certificate_in_setup_maven()
+        common.ignore_maven_self_signed_certificate_in_behave_tests()
+
+    if args.archetype_maven_mirror_url:
+        common.update_maven_mirror_url_in_quarkus_plugin_behave_tests(args.archetype_maven_mirror_url)
 
     if args.examples_uri:
         common.update_examples_uri_in_behave_tests(args.examples_uri)
@@ -44,17 +61,16 @@
         common.update_examples_ref_in_clone_repo(args.examples_ref)
 
     if args.artifacts_version:
-        common.update_artifacts_version_in_behave_tests(args.artifacts_version)
+        common.update_artifacts_version_in_build(args.artifacts_version, args.prod)
     
-    if args.ignore_self_signed_cert:
-        common.ignore_maven_self_signed_certificate_in_behave_tests()
-        common.ignore_maven_self_signed_certificate_in_setup_maven()
+    if args.quarkus_platform_version:
+        if not args.tests_only:
+            common.update_quarkus_platform_version_in_build(args.quarkus_platform_version, args.prod)
+        
+        common.update_quarkus_platform_version_in_behave_tests_repository_paths(args.quarkus_platform_version)
     
     if args.runtime_image_jvm:
         common.update_runtime_image_in_behave_tests(args.runtime_image_jvm, 'jvm')
     
     if args.runtime_image_native:
         common.update_runtime_image_in_behave_tests(args.runtime_image_native, 'native')
-    
-    if args.archetype_maven_mirror_url:
-        common.update_maven_mirror_url_in_quarkus_plugin_behave_tests(args.archetype_maven_mirror_url)
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 1e746e2018f..60ae5b47162 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -49,7 +49,7 @@ Feature: kogito-s2i-builder image tests
       | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
-    And s2i build log should contain Using Quarkus io.quarkus:quarkus-maven-plugin:
+    And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
     And check that page is served
       | property        | value                                                                                            |
       | port            | 8080                                                                                             |
diff --git a/tests/shell/kogito-swf-builder/RunTests.java b/tests/shell/kogito-swf-builder/RunTests.java
index 61e4f5bcd63..dc5085b909a 100644
--- a/tests/shell/kogito-swf-builder/RunTests.java
+++ b/tests/shell/kogito-swf-builder/RunTests.java
@@ -49,8 +49,7 @@ public class RunTests {
     private GenericContainer builtImage = new GenericContainer(
             new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
                     .withDockerfile(Paths.get("tests/shell/kogito-swf-builder/", "resources", "Dockerfile"))
-                    .withBuildArg("BUILDER_VERSION", System.getenv("IMAGE_VERSION"))
-                    .withBuildArg("SCRIPT_DEBUG", "true"))
+                    .withBuildArg("BUILDER_VERSION", System.getenv("IMAGE_VERSION")))
             .withExposedPorts(8080)
             .waitingFor(Wait.forHttp("/jsongreet"))
             .withLogConsumer(logConsumer);
diff --git a/tests/shell/kogito-swf-builder/resources/Dockerfile b/tests/shell/kogito-swf-builder/resources/Dockerfile
index 11d3184e47a..5b38530f626 100644
--- a/tests/shell/kogito-swf-builder/resources/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/Dockerfile
@@ -8,6 +8,7 @@ USER 1001
 ARG QUARKUS_PACKAGE_TYPE="jar"
 ARG SCRIPT_DEBUG="true"
 ARG MAVEN_DOWNLOAD_OUTPUT="true"
+ARG MAVEN_OFFLINE_MODE="true"
 
 # Copy from build context to resources directory
 COPY * ./resources/
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 5047aae950b..2eed9c0ac7c 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -24,8 +24,6 @@ base_dir=`dirname $(${realPath} -s $0)`
 echo $base_dir
 . ${base_dir}/../../scripts/setup-maven.sh "$(mktemp)"
 
-MAVEN_OPTIONS="-U ${MAVEN_OPTIONS}"
-
 CONTAINER_ENGINE="docker"
 MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS="-Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=${CONTAINER_ENGINE}"
 

From 44a698a0219690a525d6f38035fb8964d31bcd7c Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 28 Feb 2023 14:37:43 -0300
Subject: [PATCH 525/709] [KOGITO-8642] Add Smallrye Health Checks to SW
 Builder (#1444)

* [KOGITO-8642] Add Smallrye Health Checks to SW Builder, enable kogito version to hack scripts

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Fix a small typo

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Improve testing and docs

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Remove wip

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Remove  attribute from sed commands

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Remove maven hack for snapshots

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Fix sed E command arg

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Fixing sourcing and cd'ing

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Update release notes

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

---------

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 RELEASE_NOTES.md                                   |  3 ++-
 .../kogito-maven/3.8.x/added/configure-maven.sh    | 14 ++++++++------
 modules/kogito-swf-builder/added/add-extension.sh  |  8 ++------
 modules/kogito-swf-builder/added/build-app.sh      |  9 ++-------
 .../kogito-swf-builder/added/configure-jvm-mvn.sh  | 11 +++++++++++
 modules/kogito-swf-builder/added/create-app.sh     |  7 +------
 .../kogito-swf-builder/added/run-app-devmode.sh    | 10 ++++------
 scripts/build-quarkus-app.sh                       |  3 ++-
 scripts/setup-maven.sh                             |  7 +++++--
 tests/features/kogito-swf-builder.feature          |  2 +-
 10 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100755 modules/kogito-swf-builder/added/configure-jvm-mvn.sh

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 42c9735b6a5..7edc7b9a1d1 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -2,7 +2,8 @@
 <!-- Keep them in alphabetical order -->
 ## Enhancements
 
+- [KOGITO-8642](https://issues.redhat.com/browse/KOGITO-8642) - Add Smallrye Health Checks to SW Builder
+
 ## Bug Fixes
 
 ## Known Issues
-
diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/3.8.x/added/configure-maven.sh
index 3662f60352a..2942cfb3971 100644
--- a/modules/kogito-maven/3.8.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x/added/configure-maven.sh
@@ -37,6 +37,8 @@ function configure() {
     if [ "${SCRIPT_DEBUG}" = "true" ] ; then
         cat "${MAVEN_SETTINGS_PATH}"
     fi
+
+    rm -rf *.bak
 }
 
 # insert settings for HTTP proxy into maven settings.xml if supplied
@@ -80,7 +82,7 @@ function configure_proxy() {
         fi
         xml="$xml\
        </proxy>"
-        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
+        sed -i.bak "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -92,7 +94,7 @@ function configure_mirrors() {
       <url>$MAVEN_MIRROR_URL</url>\
       <mirrorOf>external:*</mirrorOf>\
     </mirror>"
-        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
+        sed -i.bak "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -118,7 +120,7 @@ function ignore_maven_self_signed_certificates() {
 function set_kogito_maven_repo() {
     local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
     if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
+        sed -i.bak "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -177,7 +179,7 @@ function _add_maven_repo() {
                     </snapshots>\n\
                 </repository>\n\
                 <!-- ### configured repositories ### -->"
-    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
+    sed -i.bak "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
 
     local pluginRepo="\n\
                 <pluginRepository>\n\
@@ -198,10 +200,10 @@ function _add_maven_repo() {
                 </pluginRepository>\n\
                 <!-- ### configured plugin repositories ### -->"
 
-    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
+    sed -i.bak "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
 
     # new repo should be skipped by mirror if exists
-    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
+    sed -i.bak "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
 }
 
 # Finds the environment variable  and returns its value if found.
diff --git a/modules/kogito-swf-builder/added/add-extension.sh b/modules/kogito-swf-builder/added/add-extension.sh
index 3b18ebdd8a0..ba505693359 100755
--- a/modules/kogito-swf-builder/added/add-extension.sh
+++ b/modules/kogito-swf-builder/added/add-extension.sh
@@ -13,13 +13,9 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
-# Call the configure-maven here
-source "${script_dir_path}"/configure-maven.sh
-configure
-
 cd "${PROJECT_ARTIFACT_ID}"
-# auto configure JVM settings
-source "${KOGITO_HOME}"/launch/jvm-settings.sh
+
+source "${script_dir_path}"/configure-jvm-mvn.sh
 
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
   -nsu \
diff --git a/modules/kogito-swf-builder/added/build-app.sh b/modules/kogito-swf-builder/added/build-app.sh
index 758e724f169..da9a0719d5a 100755
--- a/modules/kogito-swf-builder/added/build-app.sh
+++ b/modules/kogito-swf-builder/added/build-app.sh
@@ -17,12 +17,10 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
-# Call the configure-maven here
-source "${script_dir_path}"/configure-maven.sh
-configure
-
 cd "${PROJECT_ARTIFACT_ID}"
 
+source "${script_dir_path}"/configure-jvm-mvn.sh
+
 if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
   log_info "Adding extensions '${QUARKUS_EXTENSIONS}'"
   ${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}"
@@ -38,9 +36,6 @@ else
   log_warn "-> Nothing to copy from ${resources_path}"
 fi
 
-# auto configure JVM settings
-source "${KOGITO_HOME}"/launch/jvm-settings.sh
-
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
   -nsu \
   -s "${MAVEN_SETTINGS_PATH}" \
diff --git a/modules/kogito-swf-builder/added/configure-jvm-mvn.sh b/modules/kogito-swf-builder/added/configure-jvm-mvn.sh
new file mode 100755
index 00000000000..bad548b6cbf
--- /dev/null
+++ b/modules/kogito-swf-builder/added/configure-jvm-mvn.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -e
+
+export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Dmaven.compiler.release=${JAVA_VERSION}"
+
+# Call the configure-maven here
+source "${KOGITO_HOME}"/launch/configure-maven.sh
+configure
+
+# auto configure JVM settings
+source "${KOGITO_HOME}"/launch/jvm-settings.sh
\ No newline at end of file
diff --git a/modules/kogito-swf-builder/added/create-app.sh b/modules/kogito-swf-builder/added/create-app.sh
index effd0da73be..376e0ae2888 100755
--- a/modules/kogito-swf-builder/added/create-app.sh
+++ b/modules/kogito-swf-builder/added/create-app.sh
@@ -12,12 +12,7 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
-# Call the configure-maven here
-source "${script_dir_path}"/configure-maven.sh
-configure
-
-# auto configure JVM settings
-source "${KOGITO_HOME}"/launch/jvm-settings.sh
+source "${script_dir_path}"/configure-jvm-mvn.sh
 
 "${MAVEN_HOME}"/bin/mvn -B -s "${MAVEN_SETTINGS_PATH}" \
   -nsu \
diff --git a/modules/kogito-swf-builder/added/run-app-devmode.sh b/modules/kogito-swf-builder/added/run-app-devmode.sh
index de4ef92c8f3..13a590493b0 100755
--- a/modules/kogito-swf-builder/added/run-app-devmode.sh
+++ b/modules/kogito-swf-builder/added/run-app-devmode.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
-source "${KOGITO_HOME}"/launch/logging.sh
+script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+
+source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
@@ -10,9 +12,7 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
-# Call the configure-maven here
-source "${KOGITO_HOME}"/launch/configure-maven.sh
-configure
+source "${script_dir_path}"/configure-jvm-mvn.sh
 
 cd "${PROJECT_ARTIFACT_ID}"
 
@@ -20,8 +20,6 @@ if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
   ${KOGITO_HOME}/launch/add-extension.sh "${QUARKUS_EXTENSIONS}"
 fi
 
-# auto configure JVM settings
-source "${KOGITO_HOME}"/launch/jvm-settings.sh
 
 # `-o` means offline mode
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index caa4bfbc3c1..b2fc81a8586 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -51,7 +51,7 @@ mvn ${MAVEN_OPTIONS} \
     -DprojectArtifactId="serverless-workflow-project" \
     -DprojectVersionId="1.0.0-SNAPSHOT" \
     -DplatformVersion="${quarkus_platform_version}" \
-    -Dextensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing" \
+    -Dextensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health" \
     io.quarkus.platform:quarkus-maven-plugin:"${quarkus_platform_version}":create
 
 echo "Build quarkus app"
@@ -73,6 +73,7 @@ rm -rfv serverless-workflow-project/src/main/docker
 rm -rfv serverless-workflow-project/.mvn/wrapper
 rm -rfv serverless-workflow-project/mvnw*
 rm -rfv serverless-workflow-project/src/test
+rm -rfv serverless-workflow-project/*.bak
 
 # Maven useless files
 # Needed to avoid Maven to automatically redownload from original Maven repository ...
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
index 7242876cde6..ee00579b295 100755
--- a/scripts/setup-maven.sh
+++ b/scripts/setup-maven.sh
@@ -11,6 +11,7 @@ MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true
 maven_settings_path=$1
 if [ -z "${maven_settings_path}" ]; then
     maven_settings_path="${HOME}"/.m2/settings.xml
+    echo "Maven settings path argument is empty, using ${maven_settings_path}"
 fi
 
 LOGGING_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-logging/"
@@ -43,8 +44,10 @@ if [ ! -z "${NPM_REGISTRY_URL}" ]; then
 </properties>\
 </profile>\
 "   
-    sed -i -E "s|(<!-- ### extra maven repositories ### -->)|\1\n${npm_profile}|" "${MAVEN_SETTINGS_PATH}"
-    sed -i -E "s|(<!-- ### extra maven profile ### -->)|\1\n<activeProfile>internal-npm-registry</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
+    sed -i.bak -E "s|(<!-- ### extra maven repositories ### -->)|\1\n${npm_profile}|" "${MAVEN_SETTINGS_PATH}"
+    sed -i.bak -E "s|(<!-- ### extra maven profile ### -->)|\1\n<activeProfile>internal-npm-registry</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
+    
+    rm -rf "${MAVEN_SETTINGS_PATH}/*.bak"
 fi
 
 cat "${maven_settings_path}"
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 5055a055823..7f3189ac1a4 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -19,7 +19,7 @@ Feature: SWF and Quarkus installation
     Then check that page is served
       | property             | value                                                                         |
       | port                 | 8080                                                                          |
-      | path                 | /q/swagger-ui                                                                 |
+      | path                 | /q/health/ready                                                               |
       | wait                 | 480                                                                           |
       | request_method       | GET                                                                           |
       | expected_status_code | 200                                                                           |

From 448cd94b3158d7318a12c7a83b59b9298c201f0b Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Tue, 28 Feb 2023 15:28:56 -0300
Subject: [PATCH 526/709] [KOGITO-8741] - Kogito Images: Remove Maven 3.6.x
 module (#1451)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 RELEASE_NOTES.md                              |   1 +
 .../3.6.x/added/configure-maven.sh            | 243 ------------------
 modules/kogito-maven/3.6.x/configure          |  13 -
 modules/kogito-maven/3.6.x/maven/settings.xml |  60 -----
 modules/kogito-maven/3.6.x/module.yaml        |  81 ------
 .../tests/bats/maven-settings.bats            |   4 +-
 6 files changed, 3 insertions(+), 399 deletions(-)
 delete mode 100644 modules/kogito-maven/3.6.x/added/configure-maven.sh
 delete mode 100644 modules/kogito-maven/3.6.x/configure
 delete mode 100644 modules/kogito-maven/3.6.x/maven/settings.xml
 delete mode 100644 modules/kogito-maven/3.6.x/module.yaml

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7edc7b9a1d1..46671c7f893 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,7 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
+- [KOGITO-8741](https://issues.redhat.com/browse/KOGITO-8741) - Kogito Images: Remove Maven 3.6.x module
 
 - [KOGITO-8642](https://issues.redhat.com/browse/KOGITO-8642) - Add Smallrye Health Checks to SW Builder
 
diff --git a/modules/kogito-maven/3.6.x/added/configure-maven.sh b/modules/kogito-maven/3.6.x/added/configure-maven.sh
deleted file mode 100644
index 99cecd0fb8f..00000000000
--- a/modules/kogito-maven/3.6.x/added/configure-maven.sh
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/usr/bin/env bash
-
-#Please keep them in alphabetical order
-function prepareEnv() {
-    unset HTTP_PROXY_HOST
-    unset HTTP_PROXY_PORT
-    unset HTTP_PROXY_PASSWORD
-    unset HTTP_PROXY_USERNAME
-    unset HTTP_PROXY_NONPROXYHOSTS
-    unset HTTPS_PROXY
-    unset MAVEN_DOWNLOAD_OUTPUT
-    unset MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE
-    unset MAVEN_MIRROR_URL
-    unset MAVEN_REPO_ID
-    unset MAVEN_REPO_LAYOUT
-    unset MAVEN_REPO_RELEASES_ENABLED
-    unset MAVEN_REPO_RELEASES_UPDATE_POLICY
-    unset MAVEN_REPO_RELEASES_CHECKSUM_POLICY
-    unset MAVEN_REPO_SNAPSHOTS_ENABLED
-    unset MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY
-    unset MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY
-    unset MAVEN_REPO_URL
-    unset MAVEN_REPOS
-}
-
-function configure() {
-    log_info "Configure Maven"
-    
-    configure_proxy
-    configure_mirrors
-    configure_maven_download_output
-    configure_maven_offline_mode
-    ignore_maven_self_signed_certificates
-    set_kogito_maven_repo
-    add_maven_repo
-
-    if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-        cat "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-# insert settings for HTTP proxy into maven settings.xml if supplied
-function configure_proxy() {
-    # prefer old http_proxy_ format for username/password, but
-    # also allow proxy_ format.
-    HTTP_PROXY_USERNAME=${HTTP_PROXY_USERNAME:-$PROXY_USERNAME}
-    HTTP_PROXY_PASSWORD=${HTTP_PROXY_PASSWORD:-$PROXY_PASSWORD}
-
-    proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}}
-    # if http_proxy_host/port is set, prefer that (oldest mechanism)
-    # before looking at HTTP(S)_PROXY
-    proxyhost=${HTTP_PROXY_HOST:-$(echo "${proxy}" | cut -d : -f 1,2)}
-    proxyport=${HTTP_PROXY_PORT:-$(echo "${proxy}" | cut -d : -f 3)}
-
-    if [ -n "$proxyhost" ]; then
-        if echo "${proxyhost}" | grep -q -i https://; then
-          proxyport=${proxyport:-443}
-          proxyprotocol="https"
-        else
-          proxyport=${proxyport:-80}
-          proxyprotocol="http"
-        fi
-
-        xml="<proxy>\
-         <id>genproxy</id>\
-         <active>true</active>\
-         <protocol>$proxyprotocol</protocol>\
-         <host>$proxyhost</host>\
-         <port>$proxyport</port>"
-
-        if [ -n "$HTTP_PROXY_USERNAME" ] && [ -n "$HTTP_PROXY_PASSWORD" ]; then
-            xml="$xml\
-         <username>$HTTP_PROXY_USERNAME</username>\
-         <password>$HTTP_PROXY_PASSWORD</password>"
-        fi
-        if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then
-            nonproxyhosts="${HTTP_PROXY_NONPROXYHOSTS//|/\\|}"
-            xml="$xml\
-         <nonProxyHosts>$nonproxyhosts</nonProxyHosts>"
-        fi
-        xml="$xml\
-       </proxy>"
-        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-# insert settings for mirrors/repository managers into settings.xml if supplied
-function configure_mirrors() {
-    if [ -n "$MAVEN_MIRROR_URL" ]; then
-        xml="    <mirror>\
-      <id>mirror.default</id>\
-      <url>$MAVEN_MIRROR_URL</url>\
-      <mirrorOf>external:*</mirrorOf>\
-    </mirror>"
-        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-function configure_maven_download_output() {
-    if [ "${MAVEN_DOWNLOAD_OUTPUT}" != "true" ]; then
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --no-transfer-progress"
-    fi
-}
-
-function configure_maven_offline_mode() {
-    if [ "${MAVEN_OFFLINE_MODE}" = "true" ]; then
-        log_info "Setup Maven offline mode. No artifact will be downloaded !!!"
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -o"
-    fi
-}
-
-function ignore_maven_self_signed_certificates() {
-    if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
-    fi
-}
-
-function set_kogito_maven_repo() {
-    local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
-    if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-function add_maven_repo() {
-    # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service
-    local single_repo_url="${MAVEN_REPO_URL}"
-    if [ -n "$single_repo_url" ]; then
-        single_repo_id=$(_maven_find_env "MAVEN_REPO_ID" "repo-$(_generate_random_id)")
-        _add_maven_repo "$single_repo_url" "$single_repo_id" ""
-    fi
-
-    # multiple remote repositories scenario: respect fully qualified url(s) if specified, otherwise find and use service(s); can be used together with "single repo scenario" above
-    local multi_repo_counter=1
-    IFS=',' read -r -a multi_repo_prefixes <<<"${MAVEN_REPOS}"
-    for multi_repo_prefix in "${multi_repo_prefixes[@]}"; do
-        multi_repo_url=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_URL")
-        multi_repo_id=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_ID" "repo${multi_repo_counter}-$(_generate_random_id)")
-        _add_maven_repo "$multi_repo_url" "$multi_repo_id" "$multi_repo_prefix"
-        multi_repo_counter=$((multi_repo_counter + 1))
-    done
-}
-# add maven repositories
-# Parameters:
-#   $1 - repo url
-#   $2 - repo id
-#   $3 - repo prefix
-function _add_maven_repo() {
-    local repo_url=$1
-    local repo_id=$2
-    local prefix=$3
-
-    repo_name=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_NAME" "${repo_id}")
-    repo_layout=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_LAYOUT" "default")
-    releases_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_ENABLED" "true")
-    releases_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_UPDATE_POLICY" "always")
-    releases_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" "warn")
-    snapshots_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_ENABLED" "true")
-    snapshots_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" "always")
-    snapshots_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" "warn")
-
-    local repo="\n\
-                <repository>\n\
-                    <id>${repo_id}</id>\n\
-                    <name>${repo_name}</name>\n\
-                    <url>${repo_url}</url>\n\
-                    <layout>${repo_layout}</layout>\n\
-                    <releases>\n\
-                        <enabled>${releases_enabled}</enabled>\n\
-                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
-                    </releases>\n\
-                    <snapshots>\n\
-                        <enabled>${snapshots_enabled}</enabled>\n\
-                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
-                    </snapshots>\n\
-                </repository>\n\
-                <!-- ### configured repositories ### -->"
-    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
-
-    local pluginRepo="\n\
-                <pluginRepository>\n\
-                    <id>${repo_id}</id>\n\
-                    <name>${repo_name}</name>\n\
-                    <url>${repo_url}</url>\n\
-                    <layout>${repo_layout}</layout>\n\
-                    <releases>\n\
-                        <enabled>${releases_enabled}</enabled>\n\
-                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
-                    </releases>\n\
-                    <snapshots>\n\
-                        <enabled>${snapshots_enabled}</enabled>\n\
-                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
-                    </snapshots>\n\
-                </pluginRepository>\n\
-                <!-- ### configured plugin repositories ### -->"
-
-    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
-
-    # new repo should be skipped by mirror if exists
-    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
-}
-
-# Finds the environment variable  and returns its value if found.
-# Otherwise returns the default value if provided.
-#
-# Arguments:
-# $1 env variable name to check
-# $2 default value if environment variable was not set
-function _maven_find_env() {
-    local var=${!1}
-    echo "${var:-$2}"
-}
-
-# Finds the environment variable with the given prefix. If not found
-# the default value will be returned. If no prefix is provided will
-# rely on _maven_find_env
-#
-# Arguments
-#  - $1 prefix. Transformed to uppercase and replace - by _
-#  - $2 variable name. Prepended by "prefix_"
-#  - $3 default value if the variable is not defined
-function _maven_find_prefixed_env() {
-    local prefix=$1
-
-    if [[ -z $prefix ]]; then
-        _maven_find_env "${2}" "${3}"
-    else
-        prefix=${prefix^^} # uppercase
-        prefix=${prefix//-/_} #replace - by _
-
-        local var_name="${prefix}_${2}"
-        echo "${!var_name:-${3}}"
-      fi
-}
-
-# private
-function _generate_random_id() {
-    env LC_CTYPE=C < /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
-}
diff --git a/modules/kogito-maven/3.6.x/configure b/modules/kogito-maven/3.6.x/configure
deleted file mode 100644
index 1c590fd9a6d..00000000000
--- a/modules/kogito-maven/3.6.x/configure
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-tar xzf "${SOURCES_DIR}"/apache-maven-"${MAVEN_VERSION}"-bin.tar.gz -C /usr/share
-mv /usr/share/apache-maven-"${MAVEN_VERSION}" /usr/share/maven
-
-mkdir "${KOGITO_HOME}"/.m2
-cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
-
diff --git a/modules/kogito-maven/3.6.x/maven/settings.xml b/modules/kogito-maven/3.6.x/maven/settings.xml
deleted file mode 100644
index 5fe723c3e7e..00000000000
--- a/modules/kogito-maven/3.6.x/maven/settings.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-  <mirrors>
-    <!-- ### configured mirrors ### -->
-  </mirrors>
-
-  <proxies>
-    <!-- ### configured http proxy ### -->
-  </proxies>
-
-  <profiles>
-    <!-- ### extra maven repositories ### -->
-
-    <profile>
-      <id>kogito-images</id>
-      <repositories>
-        <repository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </repository>
-        <!-- ### configured repositories ### -->
-      </repositories>
-
-      <pluginRepositories>
-        <pluginRepository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </pluginRepository>
-        <!-- ### configured plugin repositories ### -->
-      </pluginRepositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <!-- ### extra maven profile ### -->
-    <activeProfile>kogito-images</activeProfile>
-  </activeProfiles>
-</settings>
diff --git a/modules/kogito-maven/3.6.x/module.yaml b/modules/kogito-maven/3.6.x/module.yaml
deleted file mode 100644
index 2291aaf8b23..00000000000
--- a/modules/kogito-maven/3.6.x/module.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.maven
-version: "3.6.2"
-
-envs:
-  - name: "MAVEN_VERSION"
-    value: "3.6.2"
-  - name: " MAVEN_HOME"
-    value: "/usr/share/maven"
-  - name: "MAVEN_SETTINGS_PATH"
-    description: "The location of the settings.xml file"
-    value: '${KOGITO_HOME}/.m2/settings.xml'
-  - name: "HTTP_PROXY"
-    description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
-    example: "http://127.0.0.1:8080"
-  - name: "HTTP_PROXY_HOST"
-    description: "Proxy Host, don't need to be set if HTTP_PROXY is used."
-    example: "127.0.0.1"
-  - name: "HTTP_PROXY_PORT"
-    description: "Proxy Port, don't need to be set if HTTP_PROXY is used."
-    example: "8181"
-  - name: "HTTP_PROXY_PASSWORD"
-    description: "Proxy Password"
-  - name: "HTTP_PROXY_USERNAME"
-    description: "Proxy Username"
-  - name: "HTTP_PROXY_NONPROXYHOSTS"
-    description: "Non proxy hosts, list of hosts that will ot be proxied."
-    example: "localhost"
-  - name: "MAVEN_MIRROR_URL"
-    description: "The base URL of a mirror used for retrieving artifacts."
-    example: "http://10.0.0.1:8080/repository/internal/"
-  - name: "MAVEN_DOWNLOAD_OUTPUT"
-    description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
-    example: "true"
-  - name: "JBOSS_MAVEN_REPO_URL"
-    value: "https://repository.jboss.org/nexus/content/groups/public/"
-    description: "Defines the Jboss Maven repository for Kogito artifacts."
-  - name: "MAVEN_REPO_URL"
-    description: "Defines an extra Maven repository."
-    example: "https://nexus.test.com/group/public"
-  - name: "MAVEN_REPO_ID"
-    description: "Defines the id of the new Repository"
-    example: "nexus-test"
-  - name: "MAVEN_REPO_LAYOUT"
-    description: "The type of layout this repository uses for locating and storing artifacts - can be 'legacy' or 'default'.Defaults to 'default'."
-    example: "legacy"
-  - name: "MAVEN_REPO_RELEASES_ENABLED"
-    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
-    example: "false"
-  - name: "MAVEN_REPO_RELEASES_UPDATE_POLICY"
-    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
-    example: "never"
-  - name: "MAVEN_REPO_RELEASES_CHECKSUM_POLICY"
-    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
-    example: "fail"
-  - name: "MAVEN_REPO_SNAPSHOTS_ENABLED"
-    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
-    example: "false"
-  - name: "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY"
-    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
-    example: "never"
-  - name: "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY"
-    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
-    example: "fail"
-  - name: "MAVEN_REPOS"
-    description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories."
-    example: "CENTRAL,INTERNAL"
-  - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
-    description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
-    example: "true"
-  - name: "MAVEN_OFFLINE_MODE"
-    description: "When set to true, tells Maven to work in offline mode. See Maven `-o` option for more information."
-    example: "true"
-# unfortunately by now the version needs to be hardcoded.
-artifacts:
-  - name: apache-maven-3.6.2-bin.tar.gz
-    url: https://archive.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz
-    md5: f1d40d252a4e09429297567a66324db7
-
-execute:
-  - script: configure
\ No newline at end of file
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index a17ad163101..27b75cacd76 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -1,13 +1,13 @@
 #!/usr/bin/env bats
 
 # imports
-source $BATS_TEST_DIRNAME/../../3.6.x/added/configure-maven.sh
+source $BATS_TEST_DIRNAME/../../3.8.x/added/configure-maven.sh
 
 
 setup() {
     export HOME=$BATS_TMPDIR/maven
     mkdir -p ${HOME}/.m2/
-    cp $BATS_TEST_DIRNAME/../../3.6.x/maven/settings.xml ${HOME}/.m2/
+    cp $BATS_TEST_DIRNAME/../../3.8.x/maven/settings.xml ${HOME}/.m2/
     export MAVEN_SETTINGS_PATH="${HOME}/.m2/settings.xml"
 }
 

From de0cdfcae637f656e2c78b75ca4bce039412d7cb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 28 Feb 2023 20:35:08 +0100
Subject: [PATCH 527/709] Fix Nightly quarkus platform (#1452)

---
 .ci/jenkins/Jenkinsfile.deploy       | 4 ++--
 .ci/jenkins/Jenkinsfile.setup-branch | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index c8c0c1e9fb8..2f297df5611 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -141,7 +141,7 @@ pipeline {
 
                     if (isRelease()) {
                         if (params.QUARKUS_PLATFORM_VERSION) {
-                            runPythonCommand("python3 scripts/update-repository.py quarkus-platform-version ${params.QUARKUS_PLATFORM_VERSION}")
+                            runPythonCommand("python3 scripts/update-repository.py --quarkus-platform-version ${params.QUARKUS_PLATFORM_VERSION}")
                         } else {
                             echo "No new quarkus version given for the release. Statu quo ..."
                         }
@@ -150,7 +150,7 @@ pipeline {
                             echo "[WARN] Artifacts repository defined in env will override the quarkus platform URL in tests. Make sure the platform artifacts are available on that artifacts repository (you can use a maven group)"
                         }
                         // Setup quarkus platform repo configuration
-                        runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert quarkus-platform-version ${quarkusPlatformVersion}")
+                        runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
                     }
                 }
             }
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index ab930ebc956..97ffe1bd11e 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -151,7 +151,7 @@ pipeline {
                     String quarkusPlatformVersion = "kogito-${kogitoVersion}"
 
                     // Setup quarkus platform repo configuration
-                    runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert quarkus-platform-version ${quarkusPlatformVersion}")
+                    runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
                 }
             }
         }

From 34171e691dc227c9c56717904392c41421f9ca8d Mon Sep 17 00:00:00 2001
From: nmirasch <neus.miras@gmail.com>
Date: Thu, 2 Mar 2023 23:01:35 +0100
Subject: [PATCH 528/709] KOGITO-8778: Set http connector as default for
 data-index-ephemeral image (#1453)

---
 RELEASE_NOTES.md                                            | 1 +
 kogito-data-index-ephemeral-overrides.yaml                  | 4 ++++
 tests/features/data-index/kogito-data-index-common.feature  | 6 ------
 .../features/data-index/kogito-data-index-ephemeral.feature | 5 +++++
 .../data-index/kogito-data-index-infinispan.feature         | 5 +++++
 tests/features/data-index/kogito-data-index-mongodb.feature | 5 +++++
 tests/features/data-index/kogito-data-index-oracle.feature  | 6 ++++++
 .../data-index/kogito-data-index-postgresql.feature         | 5 +++++
 8 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 46671c7f893..f2bbc76081a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -6,5 +6,6 @@
 - [KOGITO-8642](https://issues.redhat.com/browse/KOGITO-8642) - Add Smallrye Health Checks to SW Builder
 
 ## Bug Fixes
+- [KOGITO-8778](https://issues.redhat.com/browse/KOGITO-8778) - Modify data-index-ephemeral image to set http connector as default
 
 ## Known Issues
diff --git a/kogito-data-index-ephemeral-overrides.yaml b/kogito-data-index-ephemeral-overrides.yaml
index a94b26f602e..b5089c1ba1e 100644
--- a/kogito-data-index-ephemeral-overrides.yaml
+++ b/kogito-data-index-ephemeral-overrides.yaml
@@ -19,6 +19,10 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "KOGITO_DATA_INDEX_QUARKUS_PROFILE"
+    value: "http-events-support"
+    description: "Allows to change the event connection type. The possible values are :`kafka-events-support` or `http-events-support`(default)"
+
 ports:
   - value: 8080
 
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index 61679e6de37..6ed0ec81051 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -11,12 +11,6 @@ Feature: Kogito-data-index common feature.
       | SCRIPT_DEBUG           | true    |
     Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
 
-  Scenario: check if the default quarkus profile is correctly set on data index
-    When container is started with env
-      | variable               | value   |
-      | SCRIPT_DEBUG           | true    |
-    Then container log should contain -Dquarkus.profile=kafka-events-support
-
   Scenario: check if a provided data index quarkus profile is correctly set on data index
     When container is started with env
       | variable                           | value               |
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
index e3c799b3554..015e2fc9197 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -19,3 +19,8 @@ Feature: Kogito-data-index ephemeral postgresql feature.
     And container log should contain Embedded Postgres started at port
     And container log should not contain Application failed to start
 
+  Scenario: check if the default quarkus profile is correctly set on data index
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+    Then container log should contain -Dquarkus.profile=http-events-support
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index 6041c7d3705..49cf900318c 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -28,3 +28,8 @@ Feature: Kogito-data-index infinispan feature.
      And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
      And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
 
+  Scenario: check if the default quarkus profile is correctly set on data index
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+    Then container log should contain -Dquarkus.profile=kafka-events-support
\ No newline at end of file
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
index 4a587ca0d28..0d3ce7e48fe 100644
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -26,3 +26,8 @@ Feature: Kogito-data-index mongodb feature.
      And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_PASSWORD=SecretRealm
      And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_MECHANISM=MONGODB-X509
 
+  Scenario: check if the default quarkus profile is correctly set on data index
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+    Then container log should contain -Dquarkus.profile=kafka-events-support
\ No newline at end of file
diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature
index e2d734a99d9..d8c380903c3 100644
--- a/tests/features/data-index/kogito-data-index-oracle.feature
+++ b/tests/features/data-index/kogito-data-index-oracle.feature
@@ -22,3 +22,9 @@ Feature: Kogito-data-index oracle feature.
     Then container log should contain -Djava.library.path=/home/kogito/lib -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>': IO Error: The Network Adapter could not establish the connection
     And container log should not contain Application failed to start
+
+  Scenario: check if the default quarkus profile is correctly set on data index
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+    Then container log should contain -Dquarkus.profile=kafka-events-support
\ No newline at end of file
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
index 334d344d1ac..e2e5bbce377 100644
--- a/tests/features/data-index/kogito-data-index-postgresql.feature
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -11,3 +11,8 @@ Feature: Kogito-data-index postgresql feature.
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - PostgreSQL
       And the image should contain label io.openshift.tags with value kogito,data-index,data-index-postgresql
 
+  Scenario: check if the default quarkus profile is correctly set on data index
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+    Then container log should contain -Dquarkus.profile=kafka-events-support
\ No newline at end of file

From bbf39543383664a8c36e4825bc85756a79de0368 Mon Sep 17 00:00:00 2001
From: Andrea Lamparelli <a.lamparelli95@gmail.com>
Date: Fri, 3 Mar 2023 13:41:45 +0100
Subject: [PATCH 529/709] [BXMSPROD-1976] enable backporting from all branches
 (#1455)

---
 .github/workflows/pr-backporting.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/pr-backporting.yml b/.github/workflows/pr-backporting.yml
index e028a852b72..c4b93fde933 100644
--- a/.github/workflows/pr-backporting.yml
+++ b/.github/workflows/pr-backporting.yml
@@ -3,9 +3,6 @@ name: Pull Request Backporting
 on:
   pull_request_target:
     types: [closed, labeled]
-    branches:
-      - main
-
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -32,7 +29,7 @@ jobs:
     strategy:
       matrix: 
         target-branch: ${{ fromJSON(needs.compute-targets.outputs.target-branches) }}
-      fail-fast: true
+      fail-fast: false
     env:
       REVIEWERS: ${{ toJSON(github.event.pull_request.requested_reviewers) }}
     steps:

From 98c4dae4480bfac5e240493495a0b7d6e4e491d5 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 9 Mar 2023 15:42:24 +0100
Subject: [PATCH 530/709] DSL: Fix Prod PR check trigger phrase (#1461)

---
 .ci/jenkins/dsl/jobs.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 9d8e228f78c..23c38d0dd9b 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -55,7 +55,7 @@ void setupPrJob(boolean isProdCI = false) {
     ])
     if (isProdCI) {
         jobParams.job.name += '.prod'
-        jobParams.pr.trigger_phrase = '.*[j|J]enkins,?.*(re)run [prod|Prod|PROD].*'
+        jobParams.pr.trigger_phrase = '.*[j|J]enkins,?.*(rerun|run) [prod|Prod|PROD].*'
         jobParams.pr.trigger_phrase_only = true
         jobParams.pr.commitContext = 'Prod'
         jobParams.env.put('PROD_CI', true)

From 9d4efc34b2af74dc528e2fbcf7e54eb5d55588bc Mon Sep 17 00:00:00 2001
From: Davide Salerno <davide.salerno@gmail.com>
Date: Thu, 9 Mar 2023 17:18:25 +0100
Subject: [PATCH 531/709] =?UTF-8?q?[SRVLOGIC-76]=20Data-index=20prod=20eph?=
 =?UTF-8?q?emeral=20image=20is=20missing=20the=20KOGITO=5FD=E2=80=A6=20(#1?=
 =?UTF-8?q?460)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [SRVLOGIC-76] Data-index prod ephemeral image is missing the KOGITO_DATA_INDEX_QUARKUS_PROFILE

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* SRVLOGIC-76 - Data-index prod ephemeral image is missing the  - add common.sh

---------

Signed-off-by: Davide Salerno <dsalerno@redhat.com>
Co-authored-by: Marián Macik <mmacik@redhat.com>
---
 logic-data-index-ephemeral-rhel8-overrides.yaml             | 3 +++
 .../prod/added/kogito-app-launch.sh                         | 1 +
 .../logic-data-index-ephemeral.feature                      | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/logic-data-index-ephemeral-rhel8-overrides.yaml b/logic-data-index-ephemeral-rhel8-overrides.yaml
index 2b2605b092a..6c35a79a27c 100644
--- a/logic-data-index-ephemeral-rhel8-overrides.yaml
+++ b/logic-data-index-ephemeral-rhel8-overrides.yaml
@@ -20,6 +20,9 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+  - name: "KOGITO_DATA_INDEX_QUARKUS_PROFILE"
+    value: "http-events-support"
+    description: "Allows to change the event connection type. The possible values are :`kafka-events-support` or `http-events-support`(default)"
 ports:
 - value: 8080
 
diff --git a/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
index 4e847a99d2d..c7cb1665e13 100644
--- a/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
@@ -14,6 +14,7 @@ fi
 # Configuration scripts
 # Any configuration script that needs to run on image startup must be added here.
 CONFIGURE_SCRIPTS=(
+    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
     "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
 )
 source "${KOGITO_HOME}"/launch/configure.sh
diff --git a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
index 61e18d059f6..4f944a5eb17 100644
--- a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
+++ b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
@@ -17,3 +17,9 @@ Feature: logic-data-index-ephemeral-rhel8 feature.
     And container log should contain Embedded Postgres started at port
     And container log should not contain Application failed to start
 
+  Scenario: check if the default quarkus profile is correctly set on data index
+    When container is started with env
+      | variable                           | value               |
+      | SCRIPT_DEBUG                       | true                |
+    Then container log should contain -Dquarkus.profile=http-events-support
+

From 64cde9174d88115c8754802e53fafb364a1199c3 Mon Sep 17 00:00:00 2001
From: kie-ci3 <106377484+kie-ci3@users.noreply.github.com>
Date: Fri, 10 Mar 2023 15:02:13 +0100
Subject: [PATCH 532/709] [main] Bump Quarkus version to 2.16.4.Final (#1456)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 image.yaml                                | 6 +++---
 tests/features/kogito-swf-builder.feature | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/image.yaml b/image.yaml
index dc4f13b0af4..93c8c3b5d46 100644
--- a/image.yaml
+++ b/image.yaml
@@ -4,7 +4,7 @@ name: "kogito-image-real-name-on-overrides-file"
 version: "2.0.0-snapshot"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 
-labels:  
+labels:
   - name: "io.openshift.s2i.scripts-url"
     value: "image:///usr/local/s2i"
   - name: "io.openshift.s2i.destination"
@@ -12,7 +12,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.0.Final"
+    value: "2.16.4.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
 
@@ -25,7 +25,7 @@ envs:
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "2.16.0.Final"
+    value: "2.16.4.Final"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
 
 packages:
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 7f3189ac1a4..e879514b070 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.0.Final/quarkus-bom-2.16.0.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.4.Final/quarkus-bom-2.16.4.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From 9f01043aa8e1129e3ff728f0128112e9f4174548 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Tue, 14 Mar 2023 16:19:43 -0300
Subject: [PATCH 533/709] [KIECLOUD-661] - Create pipeline for rhpam-kogito
 images (#1463)

* [KIECLOUD-661] - Create pipeline for rhpam-kogito images

Signed-off-by: Spolti <fspolti@redhat.com>

* Update Makefile

Co-authored-by: Andrea Lamparelli <a.lamparelli95@gmail.com>

---------

Signed-off-by: Spolti <fspolti@redhat.com>
Co-authored-by: Andrea Lamparelli <a.lamparelli95@gmail.com>
---
 Makefile              |   6 ++
 scripts/build-osbs.sh | 213 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 219 insertions(+)
 create mode 100755 scripts/build-osbs.sh

diff --git a/Makefile b/Makefile
index 9be2f97a871..370a6995b5b 100644
--- a/Makefile
+++ b/Makefile
@@ -126,3 +126,9 @@ push-local-registry:
 .PHONY: bats
 bats:
 	./scripts/run-bats.sh
+
+.PHONY: container-build-osbs
+prod_component=
+container-build-osbs:
+	echo "calling RHPAM container-build-osbs......................................"
+	$(CEKIT_CMD) --redhat --overrides-file $(prod_component)-overrides.yaml build osbs
\ No newline at end of file
diff --git a/scripts/build-osbs.sh b/scripts/build-osbs.sh
new file mode 100755
index 00000000000..62b49880573
--- /dev/null
+++ b/scripts/build-osbs.sh
@@ -0,0 +1,213 @@
+#!/bin/bash
+# Copyright 2020 Red Hat, Inc. and/or its affiliates
+#
+# Licensed 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.
+
+set -e
+
+DEBUG=
+GIT_USER=${GIT_USER:-"Your Name"}
+GIT_EMAIL=${GIT_EMAIL:-"yourname@email.com"}
+WORK_DIR=$(pwd)/build-temp
+
+function help()
+{
+    echo "usage: build-osbs.sh [options]"
+    echo
+    echo "Run a cekit osbs build of an rhpam ba operator image with bundle"
+    echo
+    echo "For each of the options below, the names of the arguments are environment variables that may be set"
+    echo "instead of using the particular option on the invocation"
+    echo ""
+    echo "Required:"
+    echo "  -v PROD_VERSION           Version being built. Passed to the build-overrides.sh -v option"
+    echo "  -t OSBS_BUILD_TARGET      Build target for osbs, for example rhba-7.3-openshift-containers-candidate"
+    echo ""
+    echo "Optional:"
+    echo "  -h                        Print this help message"
+    echo "  -p KERBEROS_PRINCIPAL     Kerberos principal to use with to access build systems. If not specified,"
+    echo "                            the script assumes there is a valid kerberos ticket in force. If it is specified"
+    echo "                            then one of KERBEROS_KEYTAB or KERBEROS_PASSWORD is required."
+    echo "  -k KERBEROS_KEYTAB        Path to a keytab file for KERBEROS_PRINCIPAL if no KERBEROS_PASSWORD is specified."
+    echo "  -s KERBEROS_PASSWORD      Password for KERBEROS_PRINCIPAL (a keytab file may be used instead via KERBEROS_KEYTAB)"
+    echo "  -i OSBS_BUILD_USER        Maps to the build-osbs-user option for cekit (ie the user for rhpkg commands)"
+    echo "                            The default will be KERBEROS_PRINCIPAL if this is not set"
+    echo "  -b BUILD_DATE             The date of the nightly build to access. Passed to the build-overrides.sh -b option if set"
+    echo "  -w WORK_DIR               The working directory used for generating overrides, cekit cache, etc. Default is ./build-temp."
+    echo "  -u GIT_USER               User config for git commits to internal repositories. Default is 'Your Name'"
+    echo "  -e GIT_EMAIL              Email config for git commits to internal repositories. Default is 'yourname@email.com'"
+    echo "  -o CEKIT_BUILD_OPTIONS    Additional options to pass through to the cekit build command, should be quoted"
+    echo "  -l CEKIT_CACHE_LOCAL      Comma-separated list of urls to download and add to the local cekit cache"
+    echo "  -c PROD_COMPONENT         Prod Component or image name that will be built."
+    echo "  -g                        Debug setting, currently sets verbose flag on cekit commands"
+}
+
+
+function get_short_version() {
+  local version_array
+  local short_version=$1
+  IFS='.' read -r -a version_array <<< "$1"
+  if [ ${#version_array[@]} -gt 1 ]; then
+      short_version="${version_array[0]}.${version_array[1]}"
+  fi
+  echo $short_version
+}
+
+function check_for_required_envs()
+{
+    if [ -z "$GIT_EMAIL" ]; then
+        echo "No git email specified with GIT_EMAIL"
+        exit -1
+    fi
+    if [ -z "$GIT_USER" ]; then
+        echo "No git user specified with GIT_USER"
+        exit -1
+    fi
+    if [ -z "$PROD_VERSION" ]; then
+        echo "No version specified with PROD_VERSION"
+        exit -1
+    fi
+    if [ -z "$OSBS_BUILD_TARGET" ]; then
+        echo "No build target specified with OSBS_BUILD_TARGET"
+        exit -1
+    fi
+    if [ -z "PROD_COMPONENT" ]; then
+        echo "No prod component specified with PROD_COMPONENT"
+        exit -1
+    fi
+}
+
+function get_kerb_ticket() {
+    set +e
+    if [ -n "$KERBEROS_PASSWORD" ]; then
+        echo "$KERBEROS_PASSWORD" | kinit "$KERBEROS_PRINCIPAL"
+        _klist
+        if [ "$?" -ne 0 ]; then
+            echo "Failed to get kerberos token for $KERBEROS_PRINCIPAL with password"
+            exit -1
+        fi
+    elif [ -n "$KERBEROS_KEYTAB" ]; then
+        kinit -k -t "$KERBEROS_KEYTAB" "$KERBEROS_PRINCIPAL"
+        _klist
+        if [ "$?" -ne 0 ]; then
+            echo "Failed to get kerberos token for $KERBEROS_PRINCIPAL with $KERBEROS_KEYTAB"
+            exit -1
+        fi
+    else
+        echo "No kerberos password or keytab specified with KERBEROS_PASSWORD or KERBEROS_KEYTAB"
+        exit -1
+    fi
+    set -e
+}
+
+# _klist will help to indentify if the kerberos ticket, prints when debug is enabled
+function _klist() {
+    if [ -n "$DEBUG" ]; then
+        klist
+    fi
+}
+
+
+function set_git_config() {
+    git config --global user.email "$GIT_EMAIL"
+    git config --global user.name  "$GIT_USER"
+    git config --global core.pager ""
+}
+
+
+while getopts gu:e:v:c:t:o:r:n:d:p:k:s:b:l:i:w:h option; do
+    case $option in
+        g)
+            DEBUG=true
+            ;;
+        u)
+            GIT_USER=$OPTARG
+            ;;
+        e)
+            GIT_EMAIL=$OPTARG
+            ;;
+        v)
+            PROD_VERSION=$OPTARG
+            ;;
+        c)
+            PROD_COMPONENT=$OPTARG
+            ;;
+        t)
+            OSBS_BUILD_TARGET=$OPTARG
+            ;;
+        o)
+            CEKIT_BUILD_OPTIONS=$OPTARG
+            ;;
+        p)
+            KERBEROS_PRINCIPAL=$OPTARG
+            ;;
+        k)
+            KERBEROS_KEYTAB=$OPTARG
+            ;;
+        s)
+            KERBEROS_PASSWORD=$OPTARG
+            ;;
+        b)
+            BUILD_DATE=$OPTARG
+            ;;
+        l)
+            CEKIT_CACHE_LOCAL=$OPTARG
+            ;;
+        i)
+            OSBS_BUILD_USER=$OPTARG
+            ;;
+        w)
+            WORK_DIR=$OPTARG
+            ;;
+        h)
+            help
+            exit 0
+            ;;
+        *)
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+mkdir -p $WORK_DIR
+bo_options=" --no-color"
+
+check_for_required_envs
+set_git_config
+
+if [ -n "$KERBEROS_PRINCIPAL" ]; then
+    get_kerb_ticket
+    # overrides the OSBS_BUILD_USER if it is not set and KERBEROS principal is in use
+    if [ ! -n "$OSBS_BUILD_USER" ]; then
+      echo "setting OSBS_BUILD_USER to KERBEROS_PRINCIPAL"
+      # need to catch only the first part of the principal, before the / otherwise 'rhpkg' will fail
+      OSBS_BUILD_USER=$(echo ${KERBEROS_PRINCIPAL} | awk -F"/" '{print $1}')
+    fi
+else
+    echo No kerberos principal specified, assuming there is a current kerberos ticket
+fi
+
+debug=
+if [ -n "$DEBUG" ]; then
+    debug="--verbose"
+fi
+
+builduser=
+if [ -n "$OSBS_BUILD_USER" ]; then
+    builduser="$OSBS_BUILD_USER"
+fi
+
+cd ../
+# hack to replace the branch overrides as cekit detects two osbs sections and don't know which one to override.
+sed -i 's/rhba-7-rhel-8/rhba-7-rhel-8-nightly/g' ${PROD_COMPONENT}.yaml
+make container-build-osbs prod_component=${PROD_COMPONENT}

From ff044312701db702cb8b690c22c761de843098d8 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Thu, 16 Mar 2023 16:24:37 -0300
Subject: [PATCH 534/709] [KIECLOUD-661] - small fix (#1465)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 Makefile              | 2 +-
 scripts/build-osbs.sh | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 370a6995b5b..f3beed2656b 100644
--- a/Makefile
+++ b/Makefile
@@ -131,4 +131,4 @@ bats:
 prod_component=
 container-build-osbs:
 	echo "calling RHPAM container-build-osbs......................................"
-	$(CEKIT_CMD) --redhat --overrides-file $(prod_component)-overrides.yaml build osbs
\ No newline at end of file
+	$(CEKIT_CMD) --redhat build --overrides-file $(prod_component).yaml osbs
\ No newline at end of file
diff --git a/scripts/build-osbs.sh b/scripts/build-osbs.sh
index 62b49880573..72894af563c 100755
--- a/scripts/build-osbs.sh
+++ b/scripts/build-osbs.sh
@@ -208,6 +208,9 @@ if [ -n "$OSBS_BUILD_USER" ]; then
 fi
 
 cd ../
+set -x
+PROD_C="${PROD_COMPONENT}-overrides"
 # hack to replace the branch overrides as cekit detects two osbs sections and don't know which one to override.
-sed -i 's/rhba-7-rhel-8/rhba-7-rhel-8-nightly/g' ${PROD_COMPONENT}.yaml
-make container-build-osbs prod_component=${PROD_COMPONENT}
+sed -i 's/rhba-7-rhel-8/rhba-7-rhel-8-nightly/g' ${PROD_C}.yaml
+make container-build-osbs prod_component=${PROD_C}
+set +x

From df063a7f6626b446c901e92c63f09e794c12e985 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Fri, 17 Mar 2023 18:17:53 -0300
Subject: [PATCH 535/709] [KIECLOUD-661] - add --assume-yues flag to the osbs
 builder (#1467)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f3beed2656b..0ad0c0c95b9 100644
--- a/Makefile
+++ b/Makefile
@@ -131,4 +131,4 @@ bats:
 prod_component=
 container-build-osbs:
 	echo "calling RHPAM container-build-osbs......................................"
-	$(CEKIT_CMD) --redhat build --overrides-file $(prod_component).yaml osbs
\ No newline at end of file
+	$(CEKIT_CMD) --redhat build --overrides-file $(prod_component).yaml osbs --assume-yes
\ No newline at end of file

From 8a07f3787085e8d940823f53e8a31119ffc39aa7 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Wed, 22 Mar 2023 14:59:14 -0400
Subject: [PATCH 536/709] [main] Update version to 2.0.0-snapshot

---
 RELEASE_NOTES.md                                 |  5 +----
 .../community/module.yaml                        |  4 ++--
 modules/kogito-epel/7/module.yaml                |  4 ++--
 .../20.x-java-1.8/module.yaml                    | 16 ++++++++--------
 .../20.x-java-11/module.yaml                     | 16 ++++++++--------
 .../21.x-java-11/module.yaml                     | 16 ++++++++--------
 .../22.x-java-11/module.yaml                     | 16 ++++++++--------
 modules/kogito-maven/3.8.x-rpm/module.yaml       |  4 ++--
 modules/kogito-maven/3.8.x/module.yaml           |  4 ++--
 .../kogito-maven/maven-dnf-module/module.yaml    |  7 +++----
 .../kogito-openjdk/1.8.0-headless/module.yaml    |  4 ++--
 modules/kogito-openjdk/1.8.0/module.yaml         |  4 ++--
 modules/kogito-openjdk/11-headless/module.yaml   |  4 ++--
 modules/kogito-openjdk/11/module.yaml            |  4 ++--
 tests/features/kogito-s2i-builder-native.feature |  2 +-
 tests/features/kogito-s2i-builder.feature        |  8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  |  6 +++---
 17 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index f2bbc76081a..42c9735b6a5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,11 +1,8 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-- [KOGITO-8741](https://issues.redhat.com/browse/KOGITO-8741) - Kogito Images: Remove Maven 3.6.x module
-
-- [KOGITO-8642](https://issues.redhat.com/browse/KOGITO-8642) - Add Smallrye Health Checks to SW Builder
 
 ## Bug Fixes
-- [KOGITO-8778](https://issues.redhat.com/browse/KOGITO-8778) - Modify data-index-ephemeral image to set http connector as default
 
 ## Known Issues
+
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
index 733867b8670..c9cb5f0567a 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/data-index-service-inmemory/data-index-service-inmemory-quarkus-app.zip
-  name: data-index-service-inmemory-quarkus-app.zip
+  - path: /tmp/build/data-index-service-inmemory/data-index-service-inmemory-quarkus-app.zip
+    name: data-index-service-inmemory-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-epel/7/module.yaml b/modules/kogito-epel/7/module.yaml
index 30be99b5314..63f3e7ed708 100644
--- a/modules/kogito-epel/7/module.yaml
+++ b/modules/kogito-epel/7/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.epel
-version: "7"
+version: "2.0.0-snapshot"
 
 execute:
-  - script: configure.sh
\ No newline at end of file
+  - script: configure.sh
diff --git a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
index b4bbab16d65..9fdab83009c 100644
--- a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "20.2.0-java-1.8"
+version: "2.0.0-snapshot"
 
 envs:
   - name: "JAVA_HOME"
@@ -14,12 +14,12 @@ envs:
     value: "8"
 
 artifacts:
-- name: graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
-  md5: 1bde5d9638c13c5b50e7628eb045b6f7
-- name: native-image-installable-svm-java8-linux-amd64-20.2.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java8-linux-amd64-20.2.0.jar
-  md5: 7b41bbd2c7ba5e731167348df31765d5
+  - name: graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
+    md5: 1bde5d9638c13c5b50e7628eb045b6f7
+  - name: native-image-installable-svm-java8-linux-amd64-20.2.0.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java8-linux-amd64-20.2.0.jar
+    md5: 7b41bbd2c7ba5e731167348df31765d5
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
index 386698de769..c1c593dbe26 100644
--- a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "20.2.0-java-11"
+version: "2.0.0-snapshot"
 
 envs:
   - name: "JAVA_HOME"
@@ -14,12 +14,12 @@ envs:
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
-  md5: 17669cb10b439c0522b4d56a6b277e85
-- name: native-image-installable-svm-java11-linux-amd64-20.2.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java11-linux-amd64-20.2.0.jar
-  md5: 574dc13cde215d1098f349a07b0e6592
+  - name: graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
+    md5: 17669cb10b439c0522b4d56a6b277e85
+  - name: native-image-installable-svm-java11-linux-amd64-20.2.0.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java11-linux-amd64-20.2.0.jar
+    md5: 574dc13cde215d1098f349a07b0e6592
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
index 01bc632bbbf..cad5d9925c9 100644
--- a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "21.3.1-java-11"
+version: "2.0.0-snapshot"
 
 envs:
   - name: "JAVA_HOME"
@@ -14,12 +14,12 @@ envs:
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
-  md5: 6dee8a2f8c81c974f8a7d782c4d78b81
-- name: native-image-installable-svm-java11-linux-amd64-21.3.1.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/native-image-installable-svm-java11-linux-amd64-21.3.1.jar
-  md5: aa5a819fba0fbaeea7d77e989f53fdc5
+  - name: graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
+    md5: 6dee8a2f8c81c974f8a7d782c4d78b81
+  - name: native-image-installable-svm-java11-linux-amd64-21.3.1.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/native-image-installable-svm-java11-linux-amd64-21.3.1.jar
+    md5: aa5a819fba0fbaeea7d77e989f53fdc5
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-graalvm-installer/22.x-java-11/module.yaml b/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
index 468c552a726..67712f829dd 100644
--- a/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "22.2.0-java-11"
+version: "2.0.0-snapshot"
 
 envs:
   - name: "JAVA_HOME"
@@ -14,12 +14,12 @@ envs:
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
-  md5: 41a1653fcdee605a21d8e03763a861c4
-- name: native-image-installable-svm-java11-linux-amd64-22.2.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-amd64-22.2.0.jar
-  md5: 120c14c5db31732d4e1751c79b6dc8a8
+  - name: graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
+    md5: 41a1653fcdee605a21d8e03763a861c4
+  - name: native-image-installable-svm-java11-linux-amd64-22.2.0.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-amd64-22.2.0.jar
+    md5: 120c14c5db31732d4e1751c79b6dc8a8
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
index 4ec5fad80bb..3aadbebb599 100644
--- a/modules/kogito-maven/3.8.x-rpm/module.yaml
+++ b/modules/kogito-maven/3.8.x-rpm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.maven
-version: "3.8-rpm"
+version: "2.0.0-snapshot"
 
 envs:
   - name: "MAVEN_VERSION"
@@ -82,4 +82,4 @@ packages:
 
 
 execute:
-  - script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index e9d8f571447..d619f7c82d7 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.maven
-version: "3.8.6"
+version: "2.0.0-snapshot"
 
 envs:
   - name: "MAVEN_VERSION"
@@ -78,4 +78,4 @@ artifacts:
     md5: 0e07de4a7b5c84ebed737a2002f52019
 
 execute:
-  - script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-maven/maven-dnf-module/module.yaml b/modules/kogito-maven/maven-dnf-module/module.yaml
index 2a9f15e117d..db0d0d70aa5 100644
--- a/modules/kogito-maven/maven-dnf-module/module.yaml
+++ b/modules/kogito-maven/maven-dnf-module/module.yaml
@@ -1,8 +1,7 @@
 schema_version: 1
 name: org.kie.kogito.maven.dnf.module
-version: "3.8"
-description: ^
-  Enables the AppStream RPM Module for Maven 3.8 packages.
+version: "2.0.0-snapshot"
+description: ^ Enables the AppStream RPM Module for Maven 3.8 packages.
 
 execute:
-  - script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-openjdk/1.8.0-headless/module.yaml b/modules/kogito-openjdk/1.8.0-headless/module.yaml
index 1747f223366..6b8c4242e6e 100644
--- a/modules/kogito-openjdk/1.8.0-headless/module.yaml
+++ b/modules/kogito-openjdk/1.8.0-headless/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.openjdk
-version: "1.8.0-headless"
+version: "2.0.0-snapshot"
 
 labels:
   - name: "com.redhat.component"
@@ -22,4 +22,4 @@ envs:
 
 packages:
   install:
-  - java-1.8.0-openjdk-headless
\ No newline at end of file
+    - java-1.8.0-openjdk-headless
diff --git a/modules/kogito-openjdk/1.8.0/module.yaml b/modules/kogito-openjdk/1.8.0/module.yaml
index 5687dda4c2e..2366b4b2d5e 100644
--- a/modules/kogito-openjdk/1.8.0/module.yaml
+++ b/modules/kogito-openjdk/1.8.0/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.openjdk
-version: "1.8.0"
+version: "2.0.0-snapshot"
 
 labels:
   - name: "com.redhat.component"
@@ -25,5 +25,5 @@ execute:
 
 packages:
   install:
-  - java-1.8.0-openjdk-devel
+    - java-1.8.0-openjdk-devel
 
diff --git a/modules/kogito-openjdk/11-headless/module.yaml b/modules/kogito-openjdk/11-headless/module.yaml
index ebfb5f79e90..22fef5b7548 100644
--- a/modules/kogito-openjdk/11-headless/module.yaml
+++ b/modules/kogito-openjdk/11-headless/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.openjdk
-version: "11-headless"
+version: "2.0.0-snapshot"
 
 labels:
   - name: "com.redhat.component"
@@ -22,4 +22,4 @@ envs:
 
 packages:
   install:
-  - java-11-openjdk-headless
\ No newline at end of file
+    - java-11-openjdk-headless
diff --git a/modules/kogito-openjdk/11/module.yaml b/modules/kogito-openjdk/11/module.yaml
index c57600c3ee8..6234dd4dbaf 100644
--- a/modules/kogito-openjdk/11/module.yaml
+++ b/modules/kogito-openjdk/11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.openjdk
-version: "11"
+version: "2.0.0-snapshot"
 
 labels:
   - name: "com.redhat.component"
@@ -25,5 +25,5 @@ execute:
 
 packages:
   install:
-  - java-11-openjdk-devel
+    - java-11-openjdk-devel
 
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 1f24fcddc81..a88602491af 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 60ae5b47162..db422e66c49 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 9d2847e5163..88fadccbe29 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 85d53091d334ede03c42a2918533f2ba317b7bcf Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 27 Mar 2023 04:28:45 -0400
Subject: [PATCH 537/709] [main] Update version to 2.0.0-snapshot

---
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index a88602491af..eb3c0a89af0 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index db422e66c49..ed07f74be48 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 88fadccbe29..4a003631e00 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From fd85b36fd19b521430dd28436aaab3761d614f52 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 27 Mar 2023 04:43:00 -0400
Subject: [PATCH 538/709] [main] Update version to 2.0.0-snapshot

---
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index eb3c0a89af0..2b039724461 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |            
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index ed07f74be48..0f5eb585208 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 4a003631e00..171ebc0e006 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 19cb793ec4e504c9f542c0ff94a2e8ca8ad1eff4 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 27 Mar 2023 04:57:10 -0400
Subject: [PATCH 539/709] [main] Update version to 2.0.0-snapshot

---
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 2b039724461..4b5e5d55912 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |            
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |             
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 0f5eb585208..69372755892 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 171ebc0e006..77e689ed60c 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 39204cb356226b814d48e69a88de301822c84558 Mon Sep 17 00:00:00 2001
From: radtriste <tradisso@redhat.com>
Date: Mon, 27 Mar 2023 11:54:47 +0200
Subject: [PATCH 540/709] Revert "[main] Update version to 2.0.0-snapshot"

---
 RELEASE_NOTES.md                                 |  5 ++++-
 .../community/module.yaml                        |  4 ++--
 modules/kogito-epel/7/module.yaml                |  4 ++--
 .../20.x-java-1.8/module.yaml                    | 16 ++++++++--------
 .../20.x-java-11/module.yaml                     | 16 ++++++++--------
 .../21.x-java-11/module.yaml                     | 16 ++++++++--------
 .../22.x-java-11/module.yaml                     | 16 ++++++++--------
 modules/kogito-maven/3.8.x-rpm/module.yaml       |  4 ++--
 modules/kogito-maven/3.8.x/module.yaml           |  4 ++--
 .../kogito-maven/maven-dnf-module/module.yaml    |  7 ++++---
 .../kogito-openjdk/1.8.0-headless/module.yaml    |  4 ++--
 modules/kogito-openjdk/1.8.0/module.yaml         |  4 ++--
 modules/kogito-openjdk/11-headless/module.yaml   |  4 ++--
 modules/kogito-openjdk/11/module.yaml            |  4 ++--
 tests/features/kogito-s2i-builder-native.feature |  2 +-
 tests/features/kogito-s2i-builder.feature        |  8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  |  6 +++---
 17 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 42c9735b6a5..f2bbc76081a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,8 +1,11 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
+- [KOGITO-8741](https://issues.redhat.com/browse/KOGITO-8741) - Kogito Images: Remove Maven 3.6.x module
+
+- [KOGITO-8642](https://issues.redhat.com/browse/KOGITO-8642) - Add Smallrye Health Checks to SW Builder
 
 ## Bug Fixes
+- [KOGITO-8778](https://issues.redhat.com/browse/KOGITO-8778) - Modify data-index-ephemeral image to set http connector as default
 
 ## Known Issues
-
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
index c9cb5f0567a..733867b8670 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-  - path: /tmp/build/data-index-service-inmemory/data-index-service-inmemory-quarkus-app.zip
-    name: data-index-service-inmemory-quarkus-app.zip
+- path: /tmp/build/data-index-service-inmemory/data-index-service-inmemory-quarkus-app.zip
+  name: data-index-service-inmemory-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/modules/kogito-epel/7/module.yaml b/modules/kogito-epel/7/module.yaml
index 63f3e7ed708..30be99b5314 100644
--- a/modules/kogito-epel/7/module.yaml
+++ b/modules/kogito-epel/7/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.epel
-version: "2.0.0-snapshot"
+version: "7"
 
 execute:
-  - script: configure.sh
+  - script: configure.sh
\ No newline at end of file
diff --git a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
index 9fdab83009c..b4bbab16d65 100644
--- a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "2.0.0-snapshot"
+version: "20.2.0-java-1.8"
 
 envs:
   - name: "JAVA_HOME"
@@ -14,12 +14,12 @@ envs:
     value: "8"
 
 artifacts:
-  - name: graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
-    md5: 1bde5d9638c13c5b50e7628eb045b6f7
-  - name: native-image-installable-svm-java8-linux-amd64-20.2.0.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java8-linux-amd64-20.2.0.jar
-    md5: 7b41bbd2c7ba5e731167348df31765d5
+- name: graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
+  md5: 1bde5d9638c13c5b50e7628eb045b6f7
+- name: native-image-installable-svm-java8-linux-amd64-20.2.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java8-linux-amd64-20.2.0.jar
+  md5: 7b41bbd2c7ba5e731167348df31765d5
 
 execute:
-  - script: configure
+- script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
index c1c593dbe26..386698de769 100644
--- a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "2.0.0-snapshot"
+version: "20.2.0-java-11"
 
 envs:
   - name: "JAVA_HOME"
@@ -14,12 +14,12 @@ envs:
     value: "11"
 
 artifacts:
-  - name: graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
-    md5: 17669cb10b439c0522b4d56a6b277e85
-  - name: native-image-installable-svm-java11-linux-amd64-20.2.0.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java11-linux-amd64-20.2.0.jar
-    md5: 574dc13cde215d1098f349a07b0e6592
+- name: graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
+  md5: 17669cb10b439c0522b4d56a6b277e85
+- name: native-image-installable-svm-java11-linux-amd64-20.2.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java11-linux-amd64-20.2.0.jar
+  md5: 574dc13cde215d1098f349a07b0e6592
 
 execute:
-  - script: configure
+- script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
index cad5d9925c9..01bc632bbbf 100644
--- a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "2.0.0-snapshot"
+version: "21.3.1-java-11"
 
 envs:
   - name: "JAVA_HOME"
@@ -14,12 +14,12 @@ envs:
     value: "11"
 
 artifacts:
-  - name: graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
-    md5: 6dee8a2f8c81c974f8a7d782c4d78b81
-  - name: native-image-installable-svm-java11-linux-amd64-21.3.1.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/native-image-installable-svm-java11-linux-amd64-21.3.1.jar
-    md5: aa5a819fba0fbaeea7d77e989f53fdc5
+- name: graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
+  md5: 6dee8a2f8c81c974f8a7d782c4d78b81
+- name: native-image-installable-svm-java11-linux-amd64-21.3.1.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/native-image-installable-svm-java11-linux-amd64-21.3.1.jar
+  md5: aa5a819fba0fbaeea7d77e989f53fdc5
 
 execute:
-  - script: configure
+- script: configure
\ No newline at end of file
diff --git a/modules/kogito-graalvm-installer/22.x-java-11/module.yaml b/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
index 67712f829dd..468c552a726 100644
--- a/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "2.0.0-snapshot"
+version: "22.2.0-java-11"
 
 envs:
   - name: "JAVA_HOME"
@@ -14,12 +14,12 @@ envs:
     value: "11"
 
 artifacts:
-  - name: graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
-    md5: 41a1653fcdee605a21d8e03763a861c4
-  - name: native-image-installable-svm-java11-linux-amd64-22.2.0.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-amd64-22.2.0.jar
-    md5: 120c14c5db31732d4e1751c79b6dc8a8
+- name: graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
+  md5: 41a1653fcdee605a21d8e03763a861c4
+- name: native-image-installable-svm-java11-linux-amd64-22.2.0.jar
+  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-amd64-22.2.0.jar
+  md5: 120c14c5db31732d4e1751c79b6dc8a8
 
 execute:
-  - script: configure
+- script: configure
\ No newline at end of file
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
index 3aadbebb599..4ec5fad80bb 100644
--- a/modules/kogito-maven/3.8.x-rpm/module.yaml
+++ b/modules/kogito-maven/3.8.x-rpm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.maven
-version: "2.0.0-snapshot"
+version: "3.8-rpm"
 
 envs:
   - name: "MAVEN_VERSION"
@@ -82,4 +82,4 @@ packages:
 
 
 execute:
-  - script: configure
+  - script: configure
\ No newline at end of file
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index d619f7c82d7..e9d8f571447 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.maven
-version: "2.0.0-snapshot"
+version: "3.8.6"
 
 envs:
   - name: "MAVEN_VERSION"
@@ -78,4 +78,4 @@ artifacts:
     md5: 0e07de4a7b5c84ebed737a2002f52019
 
 execute:
-  - script: configure
+  - script: configure
\ No newline at end of file
diff --git a/modules/kogito-maven/maven-dnf-module/module.yaml b/modules/kogito-maven/maven-dnf-module/module.yaml
index db0d0d70aa5..2a9f15e117d 100644
--- a/modules/kogito-maven/maven-dnf-module/module.yaml
+++ b/modules/kogito-maven/maven-dnf-module/module.yaml
@@ -1,7 +1,8 @@
 schema_version: 1
 name: org.kie.kogito.maven.dnf.module
-version: "2.0.0-snapshot"
-description: ^ Enables the AppStream RPM Module for Maven 3.8 packages.
+version: "3.8"
+description: ^
+  Enables the AppStream RPM Module for Maven 3.8 packages.
 
 execute:
-  - script: configure
+  - script: configure
\ No newline at end of file
diff --git a/modules/kogito-openjdk/1.8.0-headless/module.yaml b/modules/kogito-openjdk/1.8.0-headless/module.yaml
index 6b8c4242e6e..1747f223366 100644
--- a/modules/kogito-openjdk/1.8.0-headless/module.yaml
+++ b/modules/kogito-openjdk/1.8.0-headless/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.openjdk
-version: "2.0.0-snapshot"
+version: "1.8.0-headless"
 
 labels:
   - name: "com.redhat.component"
@@ -22,4 +22,4 @@ envs:
 
 packages:
   install:
-    - java-1.8.0-openjdk-headless
+  - java-1.8.0-openjdk-headless
\ No newline at end of file
diff --git a/modules/kogito-openjdk/1.8.0/module.yaml b/modules/kogito-openjdk/1.8.0/module.yaml
index 2366b4b2d5e..5687dda4c2e 100644
--- a/modules/kogito-openjdk/1.8.0/module.yaml
+++ b/modules/kogito-openjdk/1.8.0/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.openjdk
-version: "2.0.0-snapshot"
+version: "1.8.0"
 
 labels:
   - name: "com.redhat.component"
@@ -25,5 +25,5 @@ execute:
 
 packages:
   install:
-    - java-1.8.0-openjdk-devel
+  - java-1.8.0-openjdk-devel
 
diff --git a/modules/kogito-openjdk/11-headless/module.yaml b/modules/kogito-openjdk/11-headless/module.yaml
index 22fef5b7548..ebfb5f79e90 100644
--- a/modules/kogito-openjdk/11-headless/module.yaml
+++ b/modules/kogito-openjdk/11-headless/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.openjdk
-version: "2.0.0-snapshot"
+version: "11-headless"
 
 labels:
   - name: "com.redhat.component"
@@ -22,4 +22,4 @@ envs:
 
 packages:
   install:
-    - java-11-openjdk-headless
+  - java-11-openjdk-headless
\ No newline at end of file
diff --git a/modules/kogito-openjdk/11/module.yaml b/modules/kogito-openjdk/11/module.yaml
index 6234dd4dbaf..c57600c3ee8 100644
--- a/modules/kogito-openjdk/11/module.yaml
+++ b/modules/kogito-openjdk/11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.openjdk
-version: "2.0.0-snapshot"
+version: "11"
 
 labels:
   - name: "com.redhat.component"
@@ -25,5 +25,5 @@ execute:
 
 packages:
   install:
-    - java-11-openjdk-devel
+  - java-11-openjdk-devel
 
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 4b5e5d55912..1f24fcddc81 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |             
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 69372755892..60ae5b47162 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 77e689ed60c..9d2847e5163 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 60368f83f35ff9cdb9351aa18801d3c3fc2c6a66 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 27 Mar 2023 14:09:21 +0200
Subject: [PATCH 541/709] Fix Setup Branch (#1471)

* Fix Setup Branch

* Update Jenkinsfile.setup-branch

* Update Jenkinsfile.setup-branch

* Update scripts
---
 .ci/jenkins/Jenkinsfile.setup-branch | 22 ++++++++++--------
 scripts/common.py                    | 34 ++++++++++++++++++++--------
 scripts/manage-kogito-version.py     |  4 ++--
 scripts/push-staging.py              |  2 +-
 4 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 97ffe1bd11e..8f268bea0b4 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -134,12 +134,14 @@ pipeline {
         stage('Prepare environment') {
             steps {
                 script {
-                    // Set the mirror url only if exist
-                    if (env.MAVEN_MIRROR_REPOSITORY) {
-                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
+                    dir(getRepoName()) {
+                        // Set the mirror url only if exist
+                        if (env.MAVEN_MIRROR_REPOSITORY) {
+                            env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
 
-                        // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                        runPythonCommand("python3 scripts/update-build.py --ignore-self-signed-cert")
+                            // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
+                            runPythonCommand("python3 scripts/update-repository.py --ignore-self-signed-cert")
+                        }
                     }
                 }
             }
@@ -147,11 +149,13 @@ pipeline {
         stage('Setup Quarkus platform') {
             steps {
                 script {
-                    String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
-                    String quarkusPlatformVersion = "kogito-${kogitoVersion}"
+                    dir(getRepoName()) {
+                        String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
+                        String quarkusPlatformVersion = "kogito-${kogitoVersion}"
 
-                    // Setup quarkus platform repo configuration
-                    runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
+                        // Setup quarkus platform repo configuration
+                        runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
+                    }
                 }
             }
         }
diff --git a/scripts/common.py b/scripts/common.py
index 0ee0a03aab7..7731a61bbf0 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -140,7 +140,6 @@ def get_all_module_dirs():
 
     return modules
 
-
 def get_community_module_dirs():
     """
     Retrieve the Kogito module directories
@@ -225,7 +224,7 @@ def get_swf_builder_images():
     return SWF_BUILDER_IMAGES
 
 
-def update_modules_version(target_version, prod=False):
+def update_kogito_modules_version(target_version, prod=False):
     """
     Update every Kogito module.yaml to the given version.
     :param prod: if the module to be updated is prod version.
@@ -238,25 +237,30 @@ def update_modules_version(target_version, prod=False):
         modules = get_community_module_dirs()
 
     for module_dir in modules:
-        update_module_version(module_dir, target_version)
+        update_kogito_module_version(module_dir, target_version)
 
 
-def update_module_version(module_dir, target_version):
+def update_kogito_module_version(module_dir, target_version):
     """
     Set Kogito module.yaml to given version.
     :param module_dir: directory where cekit modules are hold
     :param target_version: version to set into the module
     """
+    image_version = retrieve_image_version()
+    file_updated = False
     try:
         module_file = os.path.join(module_dir, "module.yaml")
         with open(module_file) as module:
             data = yaml_loader().load(module)
-            print(
-                "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
-            data['version'] = target_version
+            if data['version'] == image_version:
+                print(
+                    "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
+                data['version'] = target_version
+                file_updated = True
 
-        with open(module_file, 'w') as module:
-            yaml_loader().dump(data, module)
+        if file_updated:
+            with open(module_file, 'w') as module:
+                yaml_loader().dump(data, module)
 
     except TypeError:
         raise
@@ -275,6 +279,18 @@ def retrieve_artifacts_version():
     except TypeError:
         raise
 
+def retrieve_image_version():
+    """
+    Retrieve the image version from main image.yaml
+    """
+    try:
+        with open(IMAGE_FILENAME) as imageFile:
+            data = yaml_loader().load(imageFile)
+            return data['version']
+
+    except TypeError:
+        raise
+
 def update_quarkus_platform_version_in_build(quarkus_platform_version, prod=False):
     """
     Update quarkus_platform_version version into images/modules
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 1da4a467ca9..bd318ddc91d 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -61,13 +61,13 @@
 
             # modules
             if args.prod:
+                common.update_kogito_modules_version(args.bump_to, args.prod)
                 common.update_prod_image_version(args.bump_to)
                 common.update_image_stream(args.bump_to, args.prod)
-                common.update_modules_version(args.bump_to, args.prod)
             else:
+                common.update_kogito_modules_version(args.bump_to) # Need to be done before updating the main image version
                 common.update_community_image_version(args.bump_to)
                 common.update_image_stream(args.bump_to)
-                common.update_modules_version(args.bump_to)
                 common.update_artifacts_version_in_build(artifacts_version)
 
                 # tests default values
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 92e633f2d12..d2df6fe2142 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -147,7 +147,7 @@ def get_next_rc_version(current_rc_version, override_tags):
     version = get_next_rc_version(find_current_rc_version(), args.override_tags)
     common.update_community_image_version(version)
     common.update_image_stream(version)
-    common.update_modules_version(version)
+    common.update_kogito_modules_version(version)
     common.update_artifacts_version_env_in_modules(version)
 
     find_next_tag(args.override_tags)

From 5caff0a95bcbd321b92bbd71d0ace10eefd9eb3f Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 27 Mar 2023 09:50:52 -0400
Subject: [PATCH 542/709] [main] Update version to 2.0.0-snapshot

---
 RELEASE_NOTES.md                                          | 5 +----
 modules/kogito-data-index-ephemeral/community/module.yaml | 4 ++--
 tests/features/kogito-s2i-builder-native.feature          | 2 +-
 tests/features/kogito-s2i-builder.feature                 | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature           | 6 +++---
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index f2bbc76081a..42c9735b6a5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,11 +1,8 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-- [KOGITO-8741](https://issues.redhat.com/browse/KOGITO-8741) - Kogito Images: Remove Maven 3.6.x module
-
-- [KOGITO-8642](https://issues.redhat.com/browse/KOGITO-8642) - Add Smallrye Health Checks to SW Builder
 
 ## Bug Fixes
-- [KOGITO-8778](https://issues.redhat.com/browse/KOGITO-8778) - Modify data-index-ephemeral image to set http connector as default
 
 ## Known Issues
+
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
index 733867b8670..c9cb5f0567a 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -5,8 +5,8 @@ version: "2.0.0-snapshot"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-- path: /tmp/build/data-index-service-inmemory/data-index-service-inmemory-quarkus-app.zip
-  name: data-index-service-inmemory-quarkus-app.zip
+  - path: /tmp/build/data-index-service-inmemory/data-index-service-inmemory-quarkus-app.zip
+    name: data-index-service-inmemory-quarkus-app.zip
 
 execute:
   - script: configure
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 1f24fcddc81..a88602491af 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 60ae5b47162..db422e66c49 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 9d2847e5163..88fadccbe29 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -56,7 +56,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -77,7 +77,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 6e9b1e4126bf6c2de028b4ccf4e9da61726e4c62 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 27 Mar 2023 18:18:41 +0200
Subject: [PATCH 543/709] correction (#1474)

---
 kogito-data-index-ephemeral-overrides.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kogito-data-index-ephemeral-overrides.yaml b/kogito-data-index-ephemeral-overrides.yaml
index b5089c1ba1e..4721d3d0b8d 100644
--- a/kogito-data-index-ephemeral-overrides.yaml
+++ b/kogito-data-index-ephemeral-overrides.yaml
@@ -36,7 +36,6 @@ modules:
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.ephemeral
-      version: "2.0.0-snapshot"
     - name: org.kie.kogito.dataindex.common
     - name: org.kie.kogito.security.custom.truststores
 

From 94aa00ecd5af95ff01231389e7dd21fc7a78983c Mon Sep 17 00:00:00 2001
From: kie-ci3 <106377484+kie-ci3@users.noreply.github.com>
Date: Tue, 28 Mar 2023 15:39:57 +0200
Subject: [PATCH 544/709] [main] Bump Quarkus version to 2.16.5.Final (#1473)

Co-authored-by: Jenkins CI <noreply@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
---
 image.yaml                                | 4 ++--
 tests/features/kogito-swf-builder.feature | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/image.yaml b/image.yaml
index 93c8c3b5d46..44520b4613a 100644
--- a/image.yaml
+++ b/image.yaml
@@ -12,7 +12,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.4.Final"
+    value: "2.16.5.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
 
@@ -25,7 +25,7 @@ envs:
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "2.16.4.Final"
+    value: "2.16.5.Final"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
 
 packages:
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index e879514b070..c7708a47bae 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.4.Final/quarkus-bom-2.16.4.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.5.Final/quarkus-bom-2.16.5.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From 6194ca4bf0b32812093c720131e4755d627c62ab Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 29 Mar 2023 13:37:04 -0300
Subject: [PATCH 545/709] =?UTF-8?q?[KOGITO-8805]=20-=20[KSW-Operator]=20Wo?=
 =?UTF-8?q?rkflow=20Dev=20Profile=20Builder=20Image=20lac=E2=80=A6=20(#147?=
 =?UTF-8?q?5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-8805] - [KSW-Operator] Workflow Dev Profile Builder Image lacking permissions to write on mvn dir on OpenShift

Signed-off-by: Spolti <fspolti@redhat.com>

* Update modules/kogito-maven/3.8.x/added/configure-maven.sh

---------

Signed-off-by: Spolti <fspolti@redhat.com>
---
 RELEASE_NOTES.md                              |  1 +
 .../3.8.x-rpm/added/configure-maven.sh        | 23 ++++++++++++++-----
 .../3.8.x/added/configure-maven.sh            |  8 +++++++
 .../tests/bats/maven-settings.bats            | 12 ++++++++++
 scripts/build-quarkus-app.sh                  |  4 ++--
 tests/features/kogito-swf-builder.feature     |  7 ++++--
 6 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 42c9735b6a5..308bacbfc6a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -3,6 +3,7 @@
 ## Enhancements
 
 ## Bug Fixes
+[KOGITO-8805](https://issues.redhat.com/browse/KOGITO-8805) - [KSW-Operator] Workflow Dev Profile Builder Image lacking permissions to write on mvn dir on OpenShift
 
 ## Known Issues
 
diff --git a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
index c8df6ad5177..84997daec4e 100644
--- a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
@@ -29,13 +29,24 @@ function configure() {
     configure_proxy
     configure_mirrors
     configure_maven_download_output
+    configure_maven_offline_mode
     ignore_maven_self_signed_certificates
     set_kogito_maven_repo
     add_maven_repo
+    configureMavenHome
 
     if [ "${SCRIPT_DEBUG}" = "true" ] ; then
         cat "${MAVEN_SETTINGS_PATH}"
     fi
+
+    rm -rf *.bak
+}
+
+# When Running on OpenShift with AnyUID the HOME environment variable gets overridden to "/"
+# Maven build main fail with this issue Could not create local repository at /.m2/repository
+# Set the property maven.home to $KOGITO_HOME so the HOME env is ignored.
+function configureMavenHome() {
+  export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Duser.home=${KOGITO_HOME}"
 }
 
 # insert settings for HTTP proxy into maven settings.xml if supplied
@@ -79,7 +90,7 @@ function configure_proxy() {
         fi
         xml="$xml\
        </proxy>"
-        sed -i "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
+        sed -i.bak "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -91,7 +102,7 @@ function configure_mirrors() {
       <url>$MAVEN_MIRROR_URL</url>\
       <mirrorOf>external:*</mirrorOf>\
     </mirror>"
-        sed -i "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
+        sed -i.bak "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -117,7 +128,7 @@ function ignore_maven_self_signed_certificates() {
 function set_kogito_maven_repo() {
     local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
     if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
+        sed -i.bak "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
@@ -176,7 +187,7 @@ function _add_maven_repo() {
                     </snapshots>\n\
                 </repository>\n\
                 <!-- ### configured repositories ### -->"
-    sed -i "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
+    sed -i.bak "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
 
     local pluginRepo="\n\
                 <pluginRepository>\n\
@@ -197,10 +208,10 @@ function _add_maven_repo() {
                 </pluginRepository>\n\
                 <!-- ### configured plugin repositories ### -->"
 
-    sed -i "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
+    sed -i.bak "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
 
     # new repo should be skipped by mirror if exists
-    sed -i "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
+    sed -i.bak "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
 }
 
 # Finds the environment variable  and returns its value if found.
diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/3.8.x/added/configure-maven.sh
index 2942cfb3971..f53617daf00 100644
--- a/modules/kogito-maven/3.8.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x/added/configure-maven.sh
@@ -33,6 +33,7 @@ function configure() {
     ignore_maven_self_signed_certificates
     set_kogito_maven_repo
     add_maven_repo
+    configureMavenHome
 
     if [ "${SCRIPT_DEBUG}" = "true" ] ; then
         cat "${MAVEN_SETTINGS_PATH}"
@@ -41,6 +42,13 @@ function configure() {
     rm -rf *.bak
 }
 
+# When Running on OpenShift with AnyUID the HOME environment variable gets overridden to "/"
+# Maven build might fail with this issue:  'Could not create local repository at /.m2/repository'
+# Set the property maven.home to $KOGITO_HOME so the HOME env is ignored.
+function configureMavenHome() {
+  export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Duser.home=${KOGITO_HOME}"
+}
+
 # insert settings for HTTP proxy into maven settings.xml if supplied
 function configure_proxy() {
     # prefer old http_proxy_ format for username/password, but
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index 27b75cacd76..f1dcec0ab60 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -413,3 +413,15 @@ function _generate_random_id() {
     echo "company_plugin_repository_result  =${company_plugin_repository_result}"
     [ "${company_plugin_repository_expected}" = "${company_plugin_repository_result}" ]
 }
+
+@test "test maven args if it contains the user.home pointing to /home/kogito" {
+    # it is expected that KOGITO_HOME is already set.
+    export KOGITO_HOME=/home/kogito
+    prepareEnv
+    configureMavenHome
+    expected=" -Duser.home=/home/kogito"
+    result="${MAVEN_ARGS_APPEND}"
+    echo "expected=${expected}"
+    echo "result=${result}"
+    [ "${expected}" = "${result}" ]
+}
\ No newline at end of file
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index b2fc81a8586..b1c52cc1a69 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -57,7 +57,7 @@ mvn ${MAVEN_OPTIONS} \
 echo "Build quarkus app"
 cd "serverless-workflow-project"
 # Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
-# This avoids to have, for example, Quarkus BOMs or orther artifacts with multiple versions.
+# This avoids to have, for example, Quarkus BOMs or other artifacts with multiple versions.
 mvn ${MAVEN_OPTIONS} \
     -DskipTests \
     -Dmaven.repo.local=${mvn_local_repo} \
@@ -76,7 +76,7 @@ rm -rfv serverless-workflow-project/src/test
 rm -rfv serverless-workflow-project/*.bak
 
 # Maven useless files
-# Needed to avoid Maven to automatically redownload from original Maven repository ...
+# Needed to avoid Maven to automatically re-download from original Maven repository ...
 find ${mvn_local_repo} -name _remote.repositories -type f -delete
 find ${mvn_local_repo} -name _maven.repositories -type f -delete
 find ${mvn_local_repo} -name *.lastUpdated -type f -delete
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index c7708a47bae..4560b55ab97 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -15,8 +15,11 @@ Feature: SWF and Quarkus installation
   #   Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
 
   Scenario: verify if container starts in devmode by default
-    When container is ready
-    Then check that page is served
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain -Duser.home=/home/kogito
+    And check that page is served
       | property             | value                                                                         |
       | port                 | 8080                                                                          |
       | path                 | /q/health/ready                                                               |

From 941a7446b4d14dc153d24b5b2296b580ec55190b Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Thu, 30 Mar 2023 06:15:14 -0300
Subject: [PATCH 546/709] [RHPAM-4560] - Adjust rhpam-kogito-builder-rhel8
 image to enable license compliance via publication of source containers
 (#1470)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 .../added/kogito-app-launch.sh                |  4 ++++
 modules/kogito-s2i-builder/s2i/bin/assemble   | 24 +++++++++----------
 modules/kogito-s2i-core/added/s2i-core        |  7 +++++-
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 13 ++++++++++
 rhpam-kogito-builder-rhel8-overrides.yaml     |  9 +++----
 rhpam-kogito-imagestream.yaml                 | 18 +++++++-------
 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml |  2 +-
 ...kogito-runtime-native-rhel8-overrides.yaml |  2 +-
 scripts/common.py                             |  2 ++
 .../features/rhpam-kogito-builder-jvm.feature | 10 +++++++-
 10 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/modules/kogito-s2i-builder/added/kogito-app-launch.sh b/modules/kogito-s2i-builder/added/kogito-app-launch.sh
index 46d47dba1d2..71a1766e83b 100644
--- a/modules/kogito-s2i-builder/added/kogito-app-launch.sh
+++ b/modules/kogito-s2i-builder/added/kogito-app-launch.sh
@@ -30,6 +30,10 @@ DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-option
 case ${runtime_type} in 
     "quarkus")  
         if [ "${NATIVE^^}" == "TRUE" ]; then
+            if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+                log_warning "Container Image ${JBOSS_IMAGE_NAME} does not supports native builds, please refer to the documentation."
+                exit 10
+            fi
             # shellcheck disable=SC2086
             exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
                 -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
diff --git a/modules/kogito-s2i-builder/s2i/bin/assemble b/modules/kogito-s2i-builder/s2i/bin/assemble
index 31c816fc209..488029f176b 100644
--- a/modules/kogito-s2i-builder/s2i/bin/assemble
+++ b/modules/kogito-s2i-builder/s2i/bin/assemble
@@ -21,25 +21,25 @@ log_info "----> RUNTIME_TYPE has been set to $runtime_type"
 
 case ${runtime_type} in 
     "quarkus")
-	if [ "${NATIVE^^}" == "TRUE" ]; then
-	      CONFIGURE_SCRIPTS=(
+        if [ "${NATIVE^^}" == "TRUE" ] && [[ ! "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+            CONFIGURE_SCRIPTS=(
                 "${KOGITO_HOME}"/launch/configure-maven.sh
                 "${KOGITO_HOME}"/launch/memory-limit.sh
-              )
-	else
-	      CONFIGURE_SCRIPTS=(
+            )
+        else
+            CONFIGURE_SCRIPTS=(
                 "${KOGITO_HOME}"/launch/configure-maven.sh
-              )
-	fi
+            )
+        fi
     ;;
     "springboot") 
-              CONFIGURE_SCRIPTS=(
-                "${KOGITO_HOME}"/launch/configure-maven.sh
-              )
+        CONFIGURE_SCRIPTS=(
+            "${KOGITO_HOME}"/launch/configure-maven.sh
+        )
     ;;
     *)
-              log_error "${runtime_type} is not supported."
-              exit 1
+        log_error "${runtime_type} is not supported."
+        exit 1
 esac
 
 
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index a86cec060a3..bda3164367e 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -89,7 +89,12 @@ function build_kogito_app() {
 
     nativeBuild=""
     if [ "${NATIVE^^}" == "TRUE" ]; then
-        nativeBuild="-Dnative"
+        if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
+            log_warning "Container Image ${JBOSS_IMAGE_NAME} does not supports native builds, please refer to the documentation."
+            exit 10
+        else
+            nativeBuild="-Dnative"
+        fi
     fi
 
     if [ "${SCRIPT_DEBUG}" != "true" ]; then
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index d34e10eca41..714ed4c9cda 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -347,6 +347,8 @@ teardown() {
     echo "result= ${lines[@]}"
     echo "status= $status"
 
+    echo "${lines[1]}"
+
     [ "$status" -eq 0 ]
     [ "${lines[0]}" = "---> Installing native application binaries" ]
     [ "${lines[1]}" = "'target/app-runner' -> '"${KOGITO_HOME}"/bin/app-runner'" ]
@@ -455,6 +457,17 @@ teardown() {
     [ "${result}" = "${expected}" ]
 }
 
+@test "Check if the expected message is printed if native build is enabled" {
+    QUARKUS_PLATFORM_VERSION="1.2.3.4"
+    JBOSS_IMAGE_NAME="rhpam-7/kogito-builder"
+    NATIVE=true
+    mkdir /tmp/src
+    run build_kogito_app
+    echo "result   = $(echo ${lines[0]} |  sed -r 's/\x1B\[(;?[0-9]{1,3})+[mGK]//g')"
+    [ "$status" -eq 10 ]
+    # remove color from the log_warning func
+    [ "$(echo ${lines[0]} |  sed -r 's/\x1B\[(;?[0-9]{1,3})+[mGK]//g')" = "WARN Container Image rhpam-7/kogito-builder does not supports native builds, please refer to the documentation." ]
+}
 
 @test "test if the Quarkus platform properties are correctly returned for using custom values" {
     QUARKUS_PLATFORM_VERSION="12"
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
index 1b89a93c167..3baac36cbfd 100644
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ b/rhpam-kogito-builder-rhel8-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "rhpam-7/rhpam-kogito-builder-rhel8"
-version: "7.11.0"
+version: "7.13.3"
 from: "registry.redhat.io/ubi8/ubi-minimal:latest"
 description: "RHPAM Platform for building Kogito based on Quarkus or SpringBoot"
 
@@ -25,8 +25,8 @@ envs:
     example: "springboot"
     description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
   - name: NATIVE
-    example: true
-    description: If set to true, perform a native build. Only supported for RUNTIME_TYPE is 'quarkus'.
+    value: false
+    description: Not supported on RHPAM Kogito builder image, please refer the documentation.
   - name: JAVA_OPTIONS
     example: "-Dquarkus.log.level=DEBUG"
     description: JVM options passed to the Java command.
@@ -46,9 +46,6 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.graalvm.installer
-      version: "22.2.0-java-11"
-    - name: org.kie.kogito.graalvm.scripts
     - name: org.kie.kogito.openjdk
       version: "11"
     - name: org.kie.kogito.dynamic.resources
diff --git a/rhpam-kogito-imagestream.yaml b/rhpam-kogito-imagestream.yaml
index 3d176295ab4..934d2a77dca 100644
--- a/rhpam-kogito-imagestream.yaml
+++ b/rhpam-kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '7.11.0'
+        - name: '7.13.3'
           annotations:
             description: RHPAM Runtime image for Kogito based on Quarkus or SpringBoot JVM image
             iconClass: icon-jbpm
             tags: rhpam-kogito,runtime,kogito,quarkus,springboot,jvm
             supports: quarkus
-            version: '7.11.0'
+            version: '7.13.3'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8:7.11.0
+            name: registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8:7.13.3
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '7.11.0'
+        - name: '7.13.3'
           annotations:
             description: RHPAM Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: rhpam-kogito,runtime,kogito,quarkus,native
             supports: quarkus
-            version: '7.11.0'
+            version: '7.13.3'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8:7.11.0
+            name: registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8:7.13.3
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,16 +57,16 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '7.11.0'
+        - name: '7.13.3'
           annotations:
             description: RHPAM Platform for building Kogito based on Quarkus or SpringBoot
             iconClass: icon-jbpm
             tags: rhpam-kogito,builder,kogito,quarkus,springboot
             supports: quarkus
-            version: '7.11.0'
+            version: '7.13.3'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: registry.redhat.io/rhpam-7/rhpam-kogito-builder-rhel8:7.11.0
+            name: registry.redhat.io/rhpam-7/rhpam-kogito-builder-rhel8:7.13.3
 
diff --git a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
index 248841c687d..299e0590df6 100644
--- a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "rhpam-7/rhpam-kogito-runtime-jvm-rhel8"
-version: "7.11.0"
+version: "7.13.3"
 from: "registry.redhat.io/ubi8/ubi-minimal:latest"
 description: "RHPAM Runtime image for Kogito based on Quarkus or SpringBoot JVM image"
 
diff --git a/rhpam-kogito-runtime-native-rhel8-overrides.yaml b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
index 19f9f4ef4d1..51b506859e2 100644
--- a/rhpam-kogito-runtime-native-rhel8-overrides.yaml
+++ b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "rhpam-7/rhpam-kogito-runtime-native-rhel8"
-version: "7.11.0"
+version: "7.13.3"
 from: "registry.redhat.io/ubi8/ubi-minimal:latest"
 description: "RHPAM Runtime image for Kogito based on Quarkus native image"
 
diff --git a/scripts/common.py b/scripts/common.py
index 7731a61bbf0..320571d25b8 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -246,8 +246,10 @@ def update_kogito_module_version(module_dir, target_version):
     :param module_dir: directory where cekit modules are hold
     :param target_version: version to set into the module
     """
+
     image_version = retrieve_image_version()
     file_updated = False
+
     try:
         module_file = os.path.join(module_dir, "module.yaml")
         with open(module_file) as module:
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 88fadccbe29..4b074b1fb83 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -24,6 +24,14 @@ Feature: rhpam-kogito-builder-rhel8 feature.
     And file /home/kogito/.m2/settings.xml should contain <id>redhat-techpreview-repository</id>
     And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
+  Scenario: Check if the expected message is printed if native build is enabled
+    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
+      | variable       | value          |
+      | RUNTIME_TYPE   | quarkus        |
+      | NATIVE         | true           |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+    Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
+
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
@@ -56,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION      | 2.0.0-SNAPSHOT |
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |

From 48543f2dea614455bacee55cb5ce6e67718f5b7b Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 5 Apr 2023 06:53:56 +0200
Subject: [PATCH 547/709] Solve build of Data Index Ephemeral nightly (#1480)

---
 kogito-data-index-ephemeral-overrides.yaml                | 2 +-
 logic-data-index-ephemeral-rhel8-overrides.yaml           | 2 +-
 modules/kogito-data-index-ephemeral/community/module.yaml | 2 +-
 modules/kogito-data-index-ephemeral/prod/module.yaml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kogito-data-index-ephemeral-overrides.yaml b/kogito-data-index-ephemeral-overrides.yaml
index 4721d3d0b8d..c629aec1bc2 100644
--- a/kogito-data-index-ephemeral-overrides.yaml
+++ b/kogito-data-index-ephemeral-overrides.yaml
@@ -35,7 +35,7 @@ modules:
       version: "11-headless"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.dataindex.ephemeral
+    - name: org.kie.kogito.dataindex.community.ephemeral
     - name: org.kie.kogito.dataindex.common
     - name: org.kie.kogito.security.custom.truststores
 
diff --git a/logic-data-index-ephemeral-rhel8-overrides.yaml b/logic-data-index-ephemeral-rhel8-overrides.yaml
index 6c35a79a27c..454cc1ce4b2 100644
--- a/logic-data-index-ephemeral-rhel8-overrides.yaml
+++ b/logic-data-index-ephemeral-rhel8-overrides.yaml
@@ -35,7 +35,7 @@ modules:
     version: "11-headless"
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.dataindex.ephemeral
+  - name: org.kie.kogito.dataindex.prod.ephemeral
     version: "1.28.0"
   - name: org.kie.kogito.dataindex.common
   - name: org.kie.kogito.security.custom.truststores
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
index c9cb5f0567a..165e87c2aa3 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: org.kie.kogito.dataindex.ephemeral
+name: org.kie.kogito.dataindex.community.ephemeral
 version: "2.0.0-snapshot"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml
index aa4a535b2da..def069ae4f7 100644
--- a/modules/kogito-data-index-ephemeral/prod/module.yaml
+++ b/modules/kogito-data-index-ephemeral/prod/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: org.kie.kogito.dataindex.ephemeral
+name: org.kie.kogito.dataindex.prod.ephemeral
 version: "1.28.0"
 
 artifacts:

From 673aeaf7685edfd8b1b4fc695319e5c26e75116c Mon Sep 17 00:00:00 2001
From: kie-ci3 <106377484+kie-ci3@users.noreply.github.com>
Date: Wed, 5 Apr 2023 14:27:41 +0200
Subject: [PATCH 548/709] [main] Bump Quarkus version to 2.16.6.Final (#1477)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 image.yaml                                | 4 ++--
 tests/features/kogito-swf-builder.feature | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/image.yaml b/image.yaml
index 44520b4613a..20ab5ab0cc1 100644
--- a/image.yaml
+++ b/image.yaml
@@ -12,7 +12,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.5.Final"
+    value: "2.16.6.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
 
@@ -25,7 +25,7 @@ envs:
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "2.16.5.Final"
+    value: "2.16.6.Final"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
 
 packages:
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 4560b55ab97..a6f1caf6509 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.5.Final/quarkus-bom-2.16.5.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.6.Final/quarkus-bom-2.16.6.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From 34318b374b8b1f1ed19d345ea1fae204a0a977ed Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Thu, 6 Apr 2023 14:49:29 -0300
Subject: [PATCH 549/709] [KIECLOUD-711] - Add retry mechanism when trying to
 create the kerberos ticket (#1483)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 scripts/build-osbs.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/build-osbs.sh b/scripts/build-osbs.sh
index 72894af563c..27b8fc25368 100755
--- a/scripts/build-osbs.sh
+++ b/scripts/build-osbs.sh
@@ -89,6 +89,8 @@ function check_for_required_envs()
 
 function get_kerb_ticket() {
     set +e
+    retries=10
+    delay=5
     if [ -n "$KERBEROS_PASSWORD" ]; then
         echo "$KERBEROS_PASSWORD" | kinit "$KERBEROS_PRINCIPAL"
         _klist
@@ -97,8 +99,13 @@ function get_kerb_ticket() {
             exit -1
         fi
     elif [ -n "$KERBEROS_KEYTAB" ]; then
-        kinit -k -t "$KERBEROS_KEYTAB" "$KERBEROS_PRINCIPAL"
-        _klist
+        for i in `seq 1 $retries`; do
+            kinit -k -t "$KERBEROS_KEYTAB" "$KERBEROS_PRINCIPAL"
+            [ $? -eq 0 ] && break
+            echo "Failed to acquire Kerberos ticket, retrying (try $i of $retries)..."
+            _klist
+            sleep $delay
+        done
         if [ "$?" -ne 0 ]; then
             echo "Failed to get kerberos token for $KERBEROS_PRINCIPAL with $KERBEROS_KEYTAB"
             exit -1

From 75d570a513851863948838631d170d754185d63e Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Tue, 11 Apr 2023 12:14:33 -0400
Subject: [PATCH 550/709] [main] Update version to 2.0.0-snapshot

---
 RELEASE_NOTES.md                                 | 1 -
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 308bacbfc6a..42c9735b6a5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -3,7 +3,6 @@
 ## Enhancements
 
 ## Bug Fixes
-[KOGITO-8805](https://issues.redhat.com/browse/KOGITO-8805) - [KSW-Operator] Workflow Dev Profile Builder Image lacking permissions to write on mvn dir on OpenShift
 
 ## Known Issues
 
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index a88602491af..eb3c0a89af0 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index db422e66c49..ed07f74be48 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 4b074b1fb83..b0deffe9b47 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION      | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From cd7a9972c4260059e3c8edcd783aadb61d2be0d8 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 12 Apr 2023 13:42:23 +0200
Subject: [PATCH 551/709] KOGITO-8981 Setup branch should not deploy (#1487)

---
 .ci/jenkins/Jenkinsfile.setup-branch | 342 +--------------------------
 .ci/jenkins/dsl/jobs.groovy          |  19 --
 2 files changed, 4 insertions(+), 357 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 8f268bea0b4..0570c5fafd5 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -1,18 +1,9 @@
 import org.jenkinsci.plugins.workflow.libs.Library
 @Library('jenkins-pipeline-shared-libraries')_
 
-import org.kie.jenkins.MavenCommand
-
-BUILT_IMAGES = []
-BUILD_FAILED_IMAGES = []
-
-droolsRepo = 'drools'
-kogitoRuntimesRepo = 'kogito-runtimes'
-kogitoAppsRepo = 'kogito-apps'
-
 pipeline {
     agent {
-        label 'kogito-image-slave && !built-in'
+        label 'kie-rhel8 && !built-in'
     }
 
     // Needed for local build
@@ -34,38 +25,22 @@ pipeline {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
         JAVA_HOME = "${GRAALVM_HOME}"
-
-        OPENSHIFT_API = credentials('OPENSHIFT_API')
-        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
-        OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
     }
 
     stages {
         stage('Initialization') {
             steps {
                 script {
-                    clean()
+                    cleanWs()
 
                     if (params.DISPLAY_NAME) {
                         currentBuild.displayName = params.DISPLAY_NAME
                     }
 
-                    checkoutRepo(droolsRepo, getDroolsTargetBranch())
-                    checkoutRepo(kogitoRuntimesRepo, getBuildBranch())
-                    checkoutRepo(kogitoAppsRepo, getBuildBranch())
                     checkoutRepo(getRepoName(), getBuildBranch())
                 }
             }
         }
-        stage('Build upstream projects') {
-            steps {
-                script {
-                    getMavenCommand(droolsRepo).withProperty('quickly').run('clean install')
-                    getMavenCommand(kogitoRuntimesRepo).withProperty('quickly').run('clean install')
-                    getMavenCommand(kogitoAppsRepo).withProperty('quickly').run('clean install')
-                }
-            }
-        }
         stage('Update project version') {
             steps {
                 script {
@@ -131,103 +106,13 @@ pipeline {
                 }
             }
         }
-        stage('Prepare environment') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        // Set the mirror url only if exist
-                        if (env.MAVEN_MIRROR_REPOSITORY) {
-                            env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
-
-                            // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                            runPythonCommand("python3 scripts/update-repository.py --ignore-self-signed-cert")
-                        }
-                    }
-                }
-            }
-        }
-        stage('Setup Quarkus platform') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
-                        String quarkusPlatformVersion = "kogito-${kogitoVersion}"
-
-                        // Setup quarkus platform repo configuration
-                        runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
-                    }
-                }
-            }
-        }
-        stage('Build Images') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        parallelStages = [:]
-                        getImages().each { image ->
-                            initWorkspace(image)
-                            String workspacePath = getWorkspacePath(image)
-                            parallelStages["Build ${image}"] = {
-                                stage("Build ${image}") {
-                                    dir(workspacePath) {
-                                        try {
-                                            buildImage(image)
-                                            registerBuiltImage(image)
-                                        } catch (err) {
-                                            registerBuildFailedImage(image)
-                                            util.archiveConsoleLog(image, 400)
-                                            throw err
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        parallel parallelStages
-                    }
-                }
-            }
-            post {
-                always {
-                    script {
-                        cleanWorkspaces()
-                    }
-                }
-            }
-        }
-        stage('Tagging') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        tagImages()
-                    }
-                }
-            }
-        }
-        stage('Pushing') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        if (isDeployImageInOpenshiftRegistry()) {
-                            loginOpenshiftRegistry()
-                        } else if (getDeployImageRegistryCredentials()) {
-                            loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials())
-                        }
-                        pushImages()
-
-                        if (isQuayRegistry()) {
-                            makeQuayImagesPublic()
-                        }
-                    }
-                }
-            }
-        }
     }
     post {
         unsuccessful {
             sendUnsuccessfulNotification()
         }
         cleanup {
-            clean()
+            cleanWs()
         }
     }
 }
@@ -248,203 +133,6 @@ void checkoutRepo(String repository, String branch) {
     }
 }
 
-void clean() {
-    cleanWs()
-    cleanImages()
-
-    // Clean Cekit cache, in case we reuse an old node
-    sh 'rm -rf \$HOME/.cekit/cache'
-}
-
-void cleanImages() {
-    sh "${env.CONTAINER_ENGINE} rm -f \$(${env.CONTAINER_ENGINE} ps -a -q) || date"
-    sh "${env.CONTAINER_ENGINE} rmi -f \$(${env.CONTAINER_ENGINE} images -q) || date"
-}
-
-void buildImage(String imageName) {
-    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true")
-}
-
-String getMakeBuildImageArgs() {
-    List args = [ "cekit_option='--work-dir .'" ]
-    args.add("KOGITO_APPS_TARGET_BRANCH=${getKogitoAppsRef()}")
-    if (getKogitoAppsUri()) {
-        args.add("KOGITO_APPS_TARGET_URI=${getKogitoAppsUri()}")
-    }
-    return args.join(' ')
-}
-
-void registerBuiltImage(String imageName) {
-    lock("${BUILD_URL} build success") {
-        BUILT_IMAGES.add(imageName)
-    }
-}
-
-void registerBuildFailedImage(String imageName) {
-    lock("${BUILD_URL} build failed") {
-        BUILD_FAILED_IMAGES.add(imageName)
-    }
-}
-
-void removeBuiltImage (String imageName) {
-    lock("${BUILD_URL}") {
-        BUILT_IMAGES = BUILT_IMAGES.findAll { it != imageName }
-    }
-}
-
-List getBuiltImages() {
-    return BUILT_IMAGES
-}
-
-List getBuildFailedImages() {
-    return BUILD_FAILED_IMAGES
-}
-
-boolean isBuildFailedImage(String imageName) {
-    return BUILD_FAILED_IMAGES.contains(imageName)
-}
-
-void tagImages() {
-    for (String imageName : getBuiltImages()) {
-        String builtImageFullTag = "quay.io/kiegroup/${imageName}:latest"
-        tagImage(builtImageFullTag, buildImageName(imageName))
-
-        String reducedTag = getReducedTag()
-        if (reducedTag) {
-            tagImage(builtImageFullTag, buildImageName(imageName, reducedTag))
-        }
-    }
-}
-
-void tagImage(String oldImageName, String newImageName) {
-    sh "${env.CONTAINER_ENGINE} tag ${oldImageName} ${newImageName}"
-}
-
-void pushImages() {
-    for (String imageName : getBuiltImages()) {
-        pushImage(buildImageName(imageName))
-
-        String reducedTag = getReducedTag()
-        if (reducedTag) {
-            pushImage(buildImageName(imageName, reducedTag))
-        }
-    }
-}
-
-void pushImage(String fullImageName) {
-    retry(env.MAX_REGISTRY_RETRIES) {
-        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_TLS_OPTIONS} ${fullImageName}"
-    }
-}
-
-// Set images public on quay. Useful when new images are introduced.
-void makeQuayImagesPublic() {
-    String namespace = getDeployImageNamespace()
-    for (String imageName : getBuiltImages()) {
-        String repository = getFinalImageName(imageName)
-        echo "Check and set public if needed Quay repository ${namespace}/${repository}"
-        try {
-            cloud.makeQuayImagePublic(namespace, repository, [ usernamePassword: getDeployImageRegistryCredentials()])
-        } catch (err) {
-            echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
-        }
-    }
-}
-
-String buildImageName(String imageName, String imageTag = '') {
-    return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName(imageName)}:${imageTag ?: getDeployImageTag()}"
-}
-
-String getFinalImageName(String imageName) {
-    return getDeployImageNameSuffix() ? "${imageName}-${getDeployImageNameSuffix()}" : imageName
-}
-
-String getReducedTag() {
-    try {
-        String version = getDeployImageTag()
-        String[] versionSplit = version.split("\\.")
-        return "${versionSplit[0]}.${versionSplit[1]}"
-    } catch (error) {
-        echo "${getDeployImageTag()} cannot be reduced to the format X.Y"
-    }
-    return ''
-}
-
-void loginOpenshift() {
-    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]) {
-        sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
-    }
-}
-
-void loginOpenshiftRegistry() {
-    loginOpenshift()
-    // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
-    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_TLS_OPTIONS} ${env.OPENSHIFT_REGISTRY}"
-}
-
-void loginContainerRegistry(String registry, String credsId) {
-    withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
-        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_TLS_OPTIONS} ${registry}"
-    }
-}
-
-////////////////////////////////////////////////////////////////////////
-// Deploy image information
-////////////////////////////////////////////////////////////////////////
-
-boolean isDeployImageInOpenshiftRegistry() {
-    return params.IMAGE_USE_OPENSHIFT_REGISTRY
-}
-
-String getDeployImageRegistryCredentials() {
-    return params.IMAGE_REGISTRY_CREDENTIALS
-}
-
-String getDeployImageRegistry() {
-    return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.IMAGE_REGISTRY
-}
-
-String getDeployImageNamespace() {
-    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
-}
-
-String getDeployImageNameSuffix() {
-    return params.IMAGE_NAME_SUFFIX
-}
-
-String getDeployImageTag() {
-    if (params.IMAGE_TAG != '') {
-        return params.IMAGE_TAG
-    } else {
-        return sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-    }
-}
-
-boolean isQuayRegistry() {
-    return getDeployImageRegistry() == 'quay.io'
-}
-
-////////////////////////////////////////////////////////////////////////
-// Workspaces
-////////////////////////////////////////////////////////////////////////
-
-void initWorkspace(String image) {
-    sh "mkdir -p ${getWorkspacePath(image)}"
-    sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
-}
-
-void cleanWorkspaces() {
-    sh "rm -rf ${getWorkspacesPath()}"
-}
-
-String getWorkspacesPath() {
-    return "${WORKSPACE}/workspaces"
-}
-
-String getWorkspacePath(String image) {
-    return "${getWorkspacesPath()}/${image}"
-}
-
 ////////////////////////////////////////////////////////////////////////
 // utils
 ////////////////////////////////////////////////////////////////////////
@@ -457,14 +145,6 @@ String getBuildBranch() {
     return params.BUILD_BRANCH_NAME
 }
 
-String getKogitoAppsRef() {
-    return params.APPS_REF ?: getBuildBranch()
-}
-
-String getKogitoAppsUri() {
-    return params.APPS_URI
-}
-
 String getGitAuthor() {
     return "${GIT_AUTHOR}"
 }
@@ -481,10 +161,6 @@ String getKogitoArtifactsVersion() {
     return params.KOGITO_ARTIFACTS_VERSION
 }
 
-String getMavenArtifactRepository() {
-    return env.MAVEN_ARTIFACT_REPOSITORY
-}
-
 String[] getImages() {
     return runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
 }
@@ -493,16 +169,6 @@ boolean isMainBranch() {
     return env.IS_MAIN_BRANCH?.toBoolean()
 }
 
-MavenCommand getMavenCommand(String directory) {
-    return new MavenCommand(this, ['-fae', '-ntp'])
-                .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
-                .inDirectory(directory)
-}
-
-String getDroolsTargetBranch() {
-    return util.calculateTargetReleaseBranch(getBuildBranch(), 7)
-}
-
 String getCleanedReleaseNotes() {
     return '''
 <!-- Keep them in alphabetical order -->
@@ -517,4 +183,4 @@ String getCleanedReleaseNotes() {
 
 void runPythonCommand(String cmd, boolean stdout = false) {
     return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 23c38d0dd9b..27b31ab8631 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -69,18 +69,10 @@ void createSetupBranchJob() {
         REPO_NAME: 'kogito-images',
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
 
-        CONTAINER_ENGINE: 'docker',
-        CONTAINER_TLS_OPTIONS: '',
-        MAX_REGISTRY_RETRIES: 3,
-
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
 
-        QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
-
         AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
 
-        MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
-
         IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}"
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
@@ -89,17 +81,6 @@ void createSetupBranchJob() {
 
             stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
 
-            stringParam('APPS_URI', '', 'Git uri to the kogito-apps repository to use for tests.')
-            stringParam('APPS_REF', '', 'Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
-
-            // Deploy information
-            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-            stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
-            stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
-            stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
-            stringParam('IMAGE_TAG', '', 'Image tag to use to deploy images')
-
             // Release information
             stringParam('KOGITO_VERSION', '', 'Kogito version to set.')
             stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Kogito Artifacts version to set')

From b626b911e70f3757b19f1e2306fb776a02376e18 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 12 Apr 2023 17:34:54 -0300
Subject: [PATCH 552/709] [KOGITO-8975] - Update GraalVM main branch to 22.3.0
 (#1488)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 RELEASE_NOTES.md                              |  1 +
 kogito-s2i-builder-overrides.yaml             |  2 +-
 .../22.x-java-11/module.yaml                  | 19 ++++++++++---------
 .../kogito-s2i-builder-native.feature         |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 42c9735b6a5..525aeb90b20 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,7 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
+- [KOGITO-8975](https://issues.redhat.com/browse/KOGITO-8975) - Update GraalVM main branch to 22.3.0
 
 ## Bug Fixes
 
diff --git a/kogito-s2i-builder-overrides.yaml b/kogito-s2i-builder-overrides.yaml
index 6063111be7d..cf2d6099e80 100644
--- a/kogito-s2i-builder-overrides.yaml
+++ b/kogito-s2i-builder-overrides.yaml
@@ -43,7 +43,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.graalvm.installer
-      version: "22.2.0-java-11"
+      version: "22.3.0-java-11"
     - name: org.kie.kogito.graalvm.scripts
     - name: org.kie.kogito.openjdk
       version: "11"
diff --git a/modules/kogito-graalvm-installer/22.x-java-11/module.yaml b/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
index 468c552a726..dc786df6c8e 100644
--- a/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.installer
-version: "22.2.0-java-11"
+version: "22.3.0-java-11"
 
 envs:
   - name: "JAVA_HOME"
@@ -9,17 +9,18 @@ envs:
     value: "/usr/share/graalvm"
   #version without prefix ce
   - name: "GRAALVM_VERSION"
-    value: "22.2.0"
+    value: "22.3.0"
   - name: "GRAALVM_JAVA_VERSION"
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz
-  md5: 41a1653fcdee605a21d8e03763a861c4
-- name: native-image-installable-svm-java11-linux-amd64-22.2.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-amd64-22.2.0.jar
-  md5: 120c14c5db31732d4e1751c79b6dc8a8
+  - name: graalvm-ce-java11-linux-amd64-22.3.0.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-linux-amd64-22.3.0.tar.gz
+    md5: 176480a02899aa6d13220c64a8931c57
+  - name: native-image-installable-svm-java11-linux-amd64-22.3.0.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-linux-amd64-22.3.0.jar
+    md5: 89bd4beb457cf3f338b3767d8ff16e4a
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
+
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index eb3c0a89af0..ca37030702a 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -12,7 +12,7 @@ Feature: kogito-s2i-builder image native build tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.2.0
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.3.0
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest

From d6a145748cca93dfeb626a60554e9d3c29318823 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 24 Apr 2023 16:16:02 +0200
Subject: [PATCH 553/709] CI: correct default Maven/Jdk versions (#1493)

---
 .ci/jenkins/Jenkinsfile              | 3 ++-
 .ci/jenkins/Jenkinsfile.deploy       | 3 ++-
 .ci/jenkins/Jenkinsfile.setup-branch | 3 ++-
 .ci/jenkins/dsl/jobs.groovy          | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 34b3c399f12..2b9b2c84e2b 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -11,7 +11,8 @@ pipeline {
         label 'kogito-image-slave && !built-in'
     }
     tools {
-        jdk 'kie-jdk11'
+        maven env.BUILD_MAVEN_TOOL
+        jdk env.BUILD_JDK_TOOL
     }
     options {
         timeout(time: 120, unit: 'MINUTES')
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 2f297df5611..e53d6e6526f 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -15,7 +15,8 @@ pipeline {
 
     // Needed for local build
     tools {
-        jdk 'kie-jdk11'
+        maven env.BUILD_MAVEN_TOOL
+        jdk env.BUILD_JDK_TOOL
     }
 
     options {
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 0570c5fafd5..743499fd73c 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -8,7 +8,8 @@ pipeline {
 
     // Needed for local build
     tools {
-        jdk 'kie-jdk11'
+        maven env.BUILD_MAVEN_TOOL
+        jdk env.BUILD_JDK_TOOL
     }
 
     options {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 27b31ab8631..eba064e771c 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -45,6 +45,7 @@ KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [],
 
 void setupPrJob(boolean isProdCI = false) {
     def jobParams = JobParamsUtils.getDefaultJobParams(this)
+    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
     jobParams.pr.putAll([
         run_only_for_branches: [ "${GIT_BRANCH}" ],
         disable_status_message_error: true,
@@ -65,6 +66,7 @@ void setupPrJob(boolean isProdCI = false) {
 
 void createSetupBranchJob() {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
+    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
     jobParams.env.putAll([
         REPO_NAME: 'kogito-images',
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
@@ -92,6 +94,7 @@ void createSetupBranchJob() {
 
 void setupDeployJob(JobType jobType, String envName = '') {
     def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-images-deploy', jobType, envName, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
+    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
     if (jobType == JobType.PULL_REQUEST) {
         jobParams.git.branch = '${BUILD_BRANCH_NAME}'
         jobParams.git.author = '${GIT_AUTHOR}'

From 332dec9306bb7bca5d029c78c7822a5a93b739c4 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 24 Apr 2023 16:45:21 +0200
Subject: [PATCH 554/709] fix dsl (#1494)

---
 .ci/jenkins/dsl/jobs.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index eba064e771c..52c0feb7a4a 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -44,7 +44,7 @@ KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [],
 /////////////////////////////////////////////////////////////////
 
 void setupPrJob(boolean isProdCI = false) {
-    def jobParams = JobParamsUtils.getDefaultJobParams(this)
+    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.PULL_REQUEST, "${jenkins_path}/Jenkinsfile", "Kogito Images${isProdCI ? ' Prod' : ''} PR check")
     JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
     jobParams.pr.putAll([
         run_only_for_branches: [ "${GIT_BRANCH}" ],

From 399dac2492e3034de2c47c239a1f5d20b8634aa6 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Wed, 26 Apr 2023 08:49:42 +0200
Subject: [PATCH 555/709] set logic-data-index-ephemeral image version to
 1.29.0 (#1495)

---
 logic-data-index-ephemeral-rhel8-overrides.yaml      | 6 +++---
 logic-imagestream.yaml                               | 6 +++---
 modules/kogito-data-index-ephemeral/prod/module.yaml | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/logic-data-index-ephemeral-rhel8-overrides.yaml b/logic-data-index-ephemeral-rhel8-overrides.yaml
index 454cc1ce4b2..1c69363bd9e 100644
--- a/logic-data-index-ephemeral-rhel8-overrides.yaml
+++ b/logic-data-index-ephemeral-rhel8-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8"
-version: "1.28.0"
+version: "1.29.0"
 description: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
@@ -36,7 +36,7 @@ modules:
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.prod.ephemeral
-    version: "1.28.0"
+    version: "1.29.0"
   - name: org.kie.kogito.dataindex.common
   - name: org.kie.kogito.security.custom.truststores
   - name: org.kie.kogito.pkg-update
@@ -56,7 +56,7 @@ osbs:
   extra_dir: osbs-extra/logic-data-index-ephemeral-rhel8
   repository:
     name: containers/openshift-serverless-1-logic-data-index-ephemeral
-    branch: openshift-serverless-1.28-rhel-8
+    branch: openshift-serverless-1.29-rhel-8
 
 run:
   workdir: "/home/kogito"
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
index eabbf1d442b..73e722eea03 100644
--- a/logic-imagestream.yaml
+++ b/logic-imagestream.yaml
@@ -15,15 +15,15 @@ items:
         openshift.io/provider-display-name: Kie Group
     spec:
       tags:
-      - name: '1.28.0'
+      - name: '1.29.0'
         annotations:
           description: Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
           iconClass: icon-jbpm
           tags: logic-data-index,kogito,data-index,data-index-ephemeral
           supports: quarkus
-          version: '1.28.0'
+          version: '1.29.0'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.28.0
+          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.29.0
diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml
index def069ae4f7..a37947e23f6 100644
--- a/modules/kogito-data-index-ephemeral/prod/module.yaml
+++ b/modules/kogito-data-index-ephemeral/prod/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.prod.ephemeral
-version: "1.28.0"
+version: "1.29.0"
 
 artifacts:
   # data-index-service-inmemory-1.24.0.Final-redhat-00011-image-build.zip

From 27adae55f926b2f60218a4958e32ee84fc8e06d7 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Thu, 27 Apr 2023 10:03:08 -0400
Subject: [PATCH 556/709] [main] Update version to 2.0.0-snapshot

---
 RELEASE_NOTES.md                                 | 1 -
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 525aeb90b20..42c9735b6a5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,7 +1,6 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-- [KOGITO-8975](https://issues.redhat.com/browse/KOGITO-8975) - Update GraalVM main branch to 22.3.0
 
 ## Bug Fixes
 
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index ca37030702a..eac59690d8b 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |            
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index ed07f74be48..0f5eb585208 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index b0deffe9b47..1678f51e606 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 0143ab0783bc3cfab8a914e4325e537576ed4cfe Mon Sep 17 00:00:00 2001
From: kie-ci3 <106377484+kie-ci3@users.noreply.github.com>
Date: Sat, 6 May 2023 08:36:20 +0200
Subject: [PATCH 557/709] [main] Bump Quarkus version to 2.16.7.Final (#1514)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 image.yaml                                | 4 ++--
 tests/features/kogito-swf-builder.feature | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/image.yaml b/image.yaml
index 20ab5ab0cc1..ca9b5d85c2d 100644
--- a/image.yaml
+++ b/image.yaml
@@ -12,7 +12,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.6.Final"
+    value: "2.16.7.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
 
@@ -25,7 +25,7 @@ envs:
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "2.16.6.Final"
+    value: "2.16.7.Final"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
 
 packages:
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index a6f1caf6509..cbf2105c250 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: SWF and Quarkus installation
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.6.Final/quarkus-bom-2.16.6.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.7.Final/quarkus-bom-2.16.7.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From 530cf7c617587ff1d7b63a636c9574ca57c142ce Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 10 May 2023 16:03:44 +0200
Subject: [PATCH 558/709] [1.13.x] RHPAM-4680 maven rpm module should include
 Red Hat repositories (#1502) (#1527)

* RHPAM-4680 maven rpm module should include Red Hat repositories

* correct after review
---
 modules/kogito-maven/3.8.x-rpm/configure      | 80 +++++++++++++++++++
 .../kogito-maven/3.8.x-rpm/maven/settings.xml |  4 +-
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-maven/3.8.x-rpm/configure b/modules/kogito-maven/3.8.x-rpm/configure
index 7b92f84d23f..12edfbf4c94 100644
--- a/modules/kogito-maven/3.8.x-rpm/configure
+++ b/modules/kogito-maven/3.8.x-rpm/configure
@@ -7,3 +7,83 @@ SCRIPT_DIR=$(dirname "${0}")
 mkdir "${KOGITO_HOME}"/.m2
 cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
 cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
+
+# configure Red Hat repositories on the maven settings.xml for product builds
+if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
+    echo "enabling red hat repositories"
+    rh_repos="    <!-- JBoss EAP Maven repository -->\
+<profile>\
+  <id>redhat-maven-repositories</id>\
+  <repositories>\
+    <repository>\
+      <id>redhat-ga-repository</id>\
+      <url>https://maven.repository.redhat.com/ga/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+    <repository>\
+      <id>redhat-ea-repository</id>\
+      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+    <repository>\
+      <id>redhat-techpreview-repository</id>\
+      <url>https://maven.repository.redhat.com/techpreview/all</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </repository>\
+  </repositories>\
+  <pluginRepositories>\
+    <pluginRepository>\
+      <id>redhat-ga-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/ga/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+    <pluginRepository>\
+      <id>redhat-ea-plugin-repository</id>\
+      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+    <pluginRepository>\
+      <id>redhat-techpreview-repository</id>\
+      <url>https://maven.repository.redhat.com/techpreview/all</url>\
+      <releases>\
+        <enabled>true</enabled>\
+      </releases>\
+      <snapshots>\
+        <enabled>false</enabled>\
+      </snapshots>\
+    </pluginRepository>\
+  </pluginRepositories>\
+</profile>\
+"
+    sed -i "s|<!-- ### redhat maven repositories ### -->|$rh_repos|" "${KOGITO_HOME}"/.m2/settings.xml
+    sed -i "s|<!-- ### redhat maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
+
+    mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp
+    #format and write the new file
+    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${KOGITO_HOME}"/.m2/settings.xml
+fi
diff --git a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
index 5fe723c3e7e..826461aa861 100644
--- a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
+++ b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
@@ -12,7 +12,7 @@
   </proxies>
 
   <profiles>
-    <!-- ### extra maven repositories ### -->
+    <!-- ### redhat maven repositories ### -->
 
     <profile>
       <id>kogito-images</id>
@@ -54,7 +54,7 @@
     </profile>
   </profiles>
   <activeProfiles>
-    <!-- ### extra maven profile ### -->
+    <!-- ### redhat maven profile ### -->
     <activeProfile>kogito-images</activeProfile>
   </activeProfiles>
 </settings>

From 6ac188af54d2f7f6db3b55c752f8fd0519518332 Mon Sep 17 00:00:00 2001
From: radtriste <tradisso@redhat.com>
Date: Wed, 10 May 2023 16:22:37 +0200
Subject: [PATCH 559/709] swf-builder: Update base extensions

---
 modules/kogito-swf-builder/module.yaml | 2 +-
 scripts/build-quarkus-app.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-swf-builder/module.yaml b/modules/kogito-swf-builder/module.yaml
index a4090503fe8..8aa306f39c9 100644
--- a/modules/kogito-swf-builder/module.yaml
+++ b/modules/kogito-swf-builder/module.yaml
@@ -5,7 +5,7 @@ description: "Kogito Serverless Workflow builder with required extensions"
 
 envs:
   - name: QUARKUS_EXTENSIONS
-    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
+    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,source-files'
     description: To add extension to your application
   - name: PROJECT_GROUP_ID
     value: "org.acme"
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index b1c52cc1a69..e81af0db529 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -51,7 +51,7 @@ mvn ${MAVEN_OPTIONS} \
     -DprojectArtifactId="serverless-workflow-project" \
     -DprojectVersionId="1.0.0-SNAPSHOT" \
     -DplatformVersion="${quarkus_platform_version}" \
-    -Dextensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health" \
+    -Dextensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,source-files" \
     io.quarkus.platform:quarkus-maven-plugin:"${quarkus_platform_version}":create
 
 echo "Build quarkus app"

From 26e8ca7b1d72a096f15df68abd2f9734fdf0ed2c Mon Sep 17 00:00:00 2001
From: radtriste <tradisso@redhat.com>
Date: Wed, 10 May 2023 20:55:00 +0200
Subject: [PATCH 560/709] split kogito-swf into builder and devmode

---
 kogito-swf-builder-overrides.yaml             |  7 +----
 kogito-swf-devmode-overrides.yaml             | 28 +++++++++++++++++++
 .../builder}/added/build-app.sh               |  0
 .../builder}/added/create-app.sh              | 21 ++++++++++++++
 .../builder}/configure.sh                     |  0
 .../builder}/module.yaml                      | 10 +------
 .../common}/added/add-extension.sh            |  0
 .../common}/added/configure-jvm-mvn.sh        |  0
 .../common}/added/jvm-settings.sh             |  0
 modules/kogito-swf/common/configure.sh        | 12 ++++++++
 modules/kogito-swf/common/module.yaml         | 11 ++++++++
 .../bats/kogito-swf-builder-jvm-settings.bats |  0
 .../devmode}/added/run-app-devmode.sh         |  0
 modules/kogito-swf/devmode/configure.sh       | 16 +++++++++++
 modules/kogito-swf/devmode/module.yaml        | 26 +++++++++++++++++
 scripts/build-quarkus-app.sh                  | 21 ++++++++------
 16 files changed, 129 insertions(+), 23 deletions(-)
 create mode 100644 kogito-swf-devmode-overrides.yaml
 rename modules/{kogito-swf-builder => kogito-swf/builder}/added/build-app.sh (100%)
 rename modules/{kogito-swf-builder => kogito-swf/builder}/added/create-app.sh (53%)
 rename modules/{kogito-swf-builder => kogito-swf/builder}/configure.sh (100%)
 rename modules/{kogito-swf-builder => kogito-swf/builder}/module.yaml (67%)
 rename modules/{kogito-swf-builder => kogito-swf/common}/added/add-extension.sh (100%)
 rename modules/{kogito-swf-builder => kogito-swf/common}/added/configure-jvm-mvn.sh (100%)
 rename modules/{kogito-swf-builder => kogito-swf/common}/added/jvm-settings.sh (100%)
 create mode 100644 modules/kogito-swf/common/configure.sh
 create mode 100644 modules/kogito-swf/common/module.yaml
 rename modules/{kogito-swf-builder => kogito-swf/common}/tests/bats/kogito-swf-builder-jvm-settings.bats (100%)
 rename modules/{kogito-swf-builder => kogito-swf/devmode}/added/run-app-devmode.sh (100%)
 create mode 100644 modules/kogito-swf/devmode/configure.sh
 create mode 100644 modules/kogito-swf/devmode/module.yaml

diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
index 9190b42f70b..dfc8fba9a7a 100644
--- a/kogito-swf-builder-overrides.yaml
+++ b/kogito-swf-builder-overrides.yaml
@@ -14,14 +14,9 @@ modules:
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
       version: "3.8.6"
+    - name: org.kie.kogito.swf.common
     - name: org.kie.kogito.swf.builder
 
 run:
   workdir: "/home/kogito"
   user: 1001
-  cmd: 
-    - "/home/kogito/launch/run-app-devmode.sh"
-
-ports:
-  - value: 8080
-  - value: 5005
diff --git a/kogito-swf-devmode-overrides.yaml b/kogito-swf-devmode-overrides.yaml
new file mode 100644
index 00000000000..edcc7c07241
--- /dev/null
+++ b/kogito-swf-devmode-overrides.yaml
@@ -0,0 +1,28 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-swf-devmode"
+description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
+
+modules:
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven
+      version: "3.8.6"
+    - name: org.kie.kogito.swf.common
+    - name: org.kie.kogito.swf.devmode
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
+  cmd: 
+    - "/home/kogito/launch/run-app-devmode.sh"
+
+ports:
+  - value: 8080
+  - value: 5005
diff --git a/modules/kogito-swf-builder/added/build-app.sh b/modules/kogito-swf/builder/added/build-app.sh
similarity index 100%
rename from modules/kogito-swf-builder/added/build-app.sh
rename to modules/kogito-swf/builder/added/build-app.sh
diff --git a/modules/kogito-swf-builder/added/create-app.sh b/modules/kogito-swf/builder/added/create-app.sh
similarity index 53%
rename from modules/kogito-swf-builder/added/create-app.sh
rename to modules/kogito-swf/builder/added/create-app.sh
index 376e0ae2888..0de953c7c49 100755
--- a/modules/kogito-swf-builder/added/create-app.sh
+++ b/modules/kogito-swf/builder/added/create-app.sh
@@ -25,6 +25,27 @@ source "${script_dir_path}"/configure-jvm-mvn.sh
 
 cd "${PROJECT_ARTIFACT_ID}"
 
+# Fix as we cannot rely on Quarkus platform
+# Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented
+if [ ! -z ${KOGITO_VERSION} ]; then
+    echo "Replacing Kogito Platform BOM with version ${KOGITO_VERSION}"
+    # [ ]* -> is a regexp pattern to match any number of spaces
+    pattern_1="[ ]*<groupId>.*<\/groupId>"
+    pattern_2="[ ]*<artifactId>quarkus-kogito-bom<\/artifactId>\n"
+    pattern_3="[ ]*<version>.*<\/version>\n"
+    complete_pattern="$pattern_1\n$pattern_2$pattern_3"
+
+    replace_1="        <groupId>org.kie.kogito<\/groupId>\n"
+    replace_2="        <artifactId>kogito-bom<\/artifactId>\n"
+    replace_3="        <version>${KOGITO_VERSION}<\/version>\n"
+    complete_replace="$replace_1$replace_2$replace_3"
+
+    sed -i.bak -e "/$pattern_1/{
+        N;N;N
+        s/$complete_pattern/$complete_replace/
+        }" serverless-workflow-project/pom.xml
+fi
+
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
   -nsu \
   -s "${MAVEN_SETTINGS_PATH}" \
diff --git a/modules/kogito-swf-builder/configure.sh b/modules/kogito-swf/builder/configure.sh
similarity index 100%
rename from modules/kogito-swf-builder/configure.sh
rename to modules/kogito-swf/builder/configure.sh
diff --git a/modules/kogito-swf-builder/module.yaml b/modules/kogito-swf/builder/module.yaml
similarity index 67%
rename from modules/kogito-swf-builder/module.yaml
rename to modules/kogito-swf/builder/module.yaml
index 8aa306f39c9..c65580c2177 100644
--- a/modules/kogito-swf-builder/module.yaml
+++ b/modules/kogito-swf/builder/module.yaml
@@ -5,7 +5,7 @@ description: "Kogito Serverless Workflow builder with required extensions"
 
 envs:
   - name: QUARKUS_EXTENSIONS
-    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,source-files'
+    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
     description: To add extension to your application
   - name: PROJECT_GROUP_ID
     value: "org.acme"
@@ -19,14 +19,6 @@ envs:
   - name: QUARKUS_CREATE_ARGS
     example: -DnoCode
     description: To use only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
-  - name: QUARKUS_ADD_EXTENSION_ARGS
-    description: To use only if you plan to use the ${KOGITO_HOME}/launch/add-extension.sh
-  - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
-    description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
-    value: "false"
-  - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
-    description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
-    value: "false"
 
 # see build-quarkus-app.sh script, responsible for building those artifacts.
 # called by the Makefile before builds
diff --git a/modules/kogito-swf-builder/added/add-extension.sh b/modules/kogito-swf/common/added/add-extension.sh
similarity index 100%
rename from modules/kogito-swf-builder/added/add-extension.sh
rename to modules/kogito-swf/common/added/add-extension.sh
diff --git a/modules/kogito-swf-builder/added/configure-jvm-mvn.sh b/modules/kogito-swf/common/added/configure-jvm-mvn.sh
similarity index 100%
rename from modules/kogito-swf-builder/added/configure-jvm-mvn.sh
rename to modules/kogito-swf/common/added/configure-jvm-mvn.sh
diff --git a/modules/kogito-swf-builder/added/jvm-settings.sh b/modules/kogito-swf/common/added/jvm-settings.sh
similarity index 100%
rename from modules/kogito-swf-builder/added/jvm-settings.sh
rename to modules/kogito-swf/common/added/jvm-settings.sh
diff --git a/modules/kogito-swf/common/configure.sh b/modules/kogito-swf/common/configure.sh
new file mode 100644
index 00000000000..2beff0e3f87
--- /dev/null
+++ b/modules/kogito-swf/common/configure.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SOURCES_DIR=/tmp/artifacts
+ADDED_DIR="${SCRIPT_DIR}"/added
+LAUNCH_DIR="${KOGITO_HOME}"/launch
+
+cp -v "${ADDED_DIR}"/* "${LAUNCH_DIR}"
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/common/module.yaml b/modules/kogito-swf/common/module.yaml
new file mode 100644
index 00000000000..a4fdb004e0a
--- /dev/null
+++ b/modules/kogito-swf/common/module.yaml
@@ -0,0 +1,11 @@
+schema_version: 1
+name: org.kie.kogito.swf.common
+version: "2.0.0-snapshot"
+description: "Kogito Serverless Workflow image common scripts"
+
+envs:
+  - name: QUARKUS_ADD_EXTENSION_ARGS
+    description: To use only if you plan to use the ${KOGITO_HOME}/launch/add-extension.sh
+
+execute:
+  - script: configure.sh
diff --git a/modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf/common/tests/bats/kogito-swf-builder-jvm-settings.bats
similarity index 100%
rename from modules/kogito-swf-builder/tests/bats/kogito-swf-builder-jvm-settings.bats
rename to modules/kogito-swf/common/tests/bats/kogito-swf-builder-jvm-settings.bats
diff --git a/modules/kogito-swf-builder/added/run-app-devmode.sh b/modules/kogito-swf/devmode/added/run-app-devmode.sh
similarity index 100%
rename from modules/kogito-swf-builder/added/run-app-devmode.sh
rename to modules/kogito-swf/devmode/added/run-app-devmode.sh
diff --git a/modules/kogito-swf/devmode/configure.sh b/modules/kogito-swf/devmode/configure.sh
new file mode 100644
index 00000000000..7e62eee7995
--- /dev/null
+++ b/modules/kogito-swf/devmode/configure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SOURCES_DIR=/tmp/artifacts
+ADDED_DIR="${SCRIPT_DIR}"/added
+LAUNCH_DIR="${KOGITO_HOME}"/launch
+
+cp -v "${ADDED_DIR}"/* "${LAUNCH_DIR}"
+
+# Unzip Quarkus app and Maven repository
+unzip "${SOURCES_DIR}"/kogito-swf-devmode-quarkus-app.zip -d "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/kogito-swf-devmode-maven-repo.zip -d "${KOGITO_HOME}"/.m2/repository
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/module.yaml b/modules/kogito-swf/devmode/module.yaml
new file mode 100644
index 00000000000..dcf64f142e9
--- /dev/null
+++ b/modules/kogito-swf/devmode/module.yaml
@@ -0,0 +1,26 @@
+schema_version: 1
+name: org.kie.kogito.swf.devmode
+version: "2.0.0-snapshot"
+description: "Kogito Serverless Workflow builder with required extensions"
+
+envs:
+  - name: QUARKUS_EXTENSIONS
+    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
+    description: To add extension to your application
+  - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
+    description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
+    value: "false"
+  - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
+    description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
+    value: "false"
+
+# see build-quarkus-app.sh script, responsible for building those artifacts.
+# called by the Makefile before builds
+artifacts:
+  - path: /tmp/build/kogito-swf-devmode/kogito-swf-devmode-quarkus-app.zip
+    name: kogito-swf-devmode-quarkus-app.zip
+  - path: /tmp/build/kogito-swf-devmode/kogito-swf-devmode-maven-repo.zip
+    name: kogito-swf-devmode-maven-repo.zip
+
+execute:
+  - script: configure.sh
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index e81af0db529..59edca2e3c4 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -12,6 +12,8 @@ set -o pipefail
 image_name="${1}"
 quarkus_platform_version="${2}"
 
+quarkus_extensions='quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health'
+
 if [ -z ${quarkus_platform_version} ]; then
     echo "Please provide the quarkus version"
     exit 1
@@ -19,6 +21,9 @@ fi
 
 case ${image_name} in
     "kogito-swf-builder")        ;;
+    "kogito-swf-devmode")        
+        quarkus_extensions="${quarkus_extensions},kogito-quarkus-serverless-workflow-devui,source-files"
+        ;;
     *)
         echo "${image_name} is not a quarkus app image, exiting..."
         exit 0
@@ -28,9 +33,9 @@ esac
 
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
 
-target_tmp_dir="/tmp/build/kogito-swf-builder"
-build_target_dir="/tmp/kogito-swf-builder"
-mvn_local_repo="/tmp/temp_maven/kogito-swf-builder"
+target_tmp_dir="/tmp/build/${image_name}"
+build_target_dir="/tmp/${image_name}"
+mvn_local_repo="/tmp/temp_maven/${image_name}"
 
 rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
 rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
@@ -51,7 +56,7 @@ mvn ${MAVEN_OPTIONS} \
     -DprojectArtifactId="serverless-workflow-project" \
     -DprojectVersionId="1.0.0-SNAPSHOT" \
     -DplatformVersion="${quarkus_platform_version}" \
-    -Dextensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,source-files" \
+    -Dextensions="${quarkus_extensions}" \
     io.quarkus.platform:quarkus-maven-plugin:"${quarkus_platform_version}":create
 
 echo "Build quarkus app"
@@ -82,9 +87,9 @@ find ${mvn_local_repo} -name _maven.repositories -type f -delete
 find ${mvn_local_repo} -name *.lastUpdated -type f -delete
 
 echo "Zip and copy scaffold project"
-zip -r kogito-swf-builder-quarkus-app.zip serverless-workflow-project/ 
-cp -v kogito-swf-builder-quarkus-app.zip ${target_tmp_dir}/
+zip -r ${image_name}-quarkus-app.zip serverless-workflow-project/ 
+cp -v ${image_name}-quarkus-app.zip ${target_tmp_dir}/
 echo "Zip and copy maven repo"
 cd ${mvn_local_repo}
-zip -r kogito-swf-builder-maven-repo.zip *
-cp -v kogito-swf-builder-maven-repo.zip ${target_tmp_dir}/
+zip -r ${image_name}-maven-repo.zip *
+cp -v ${image_name}-maven-repo.zip ${target_tmp_dir}/

From 8dc21b2bdd0186f250719f2b775f5571d3efc4b1 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Wed, 10 May 2023 16:30:53 +0200
Subject: [PATCH 561/709] Apply suggestions from code review

---
 modules/kogito-swf/devmode/module.yaml | 2 +-
 scripts/build-quarkus-app.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-swf/devmode/module.yaml b/modules/kogito-swf/devmode/module.yaml
index dcf64f142e9..3f98ff130aa 100644
--- a/modules/kogito-swf/devmode/module.yaml
+++ b/modules/kogito-swf/devmode/module.yaml
@@ -5,7 +5,7 @@ description: "Kogito Serverless Workflow builder with required extensions"
 
 envs:
   - name: QUARKUS_EXTENSIONS
-    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
+    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files'
     description: To add extension to your application
   - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
     description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index 59edca2e3c4..3b8456864ea 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -22,7 +22,7 @@ fi
 case ${image_name} in
     "kogito-swf-builder")        ;;
     "kogito-swf-devmode")        
-        quarkus_extensions="${quarkus_extensions},kogito-quarkus-serverless-workflow-devui,source-files"
+        quarkus_extensions="${quarkus_extensions},kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files"
         ;;
     *)
         echo "${image_name} is not a quarkus app image, exiting..."

From f96f3cc979cda976c5d99750fa5360287ce01918 Mon Sep 17 00:00:00 2001
From: radtriste <tradisso@redhat.com>
Date: Thu, 11 May 2023 09:52:18 +0200
Subject: [PATCH 562/709] updated tests

---
 ...-builder.feature => kogito-swf-common.feature} | 14 +-------------
 tests/features/kogito-swf-devmode.feature         | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)
 rename tests/features/{kogito-swf-builder.feature => kogito-swf-common.feature} (54%)
 create mode 100644 tests/features/kogito-swf-devmode.feature

diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-common.feature
similarity index 54%
rename from tests/features/kogito-swf-builder.feature
rename to tests/features/kogito-swf-common.feature
index cbf2105c250..57806f8f719 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -1,4 +1,5 @@
 @quay.io/kiegroup/kogito-swf-builder
+@quay.io/kiegroup/kogito-swf-devmode
 Feature: SWF and Quarkus installation
 
   Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
@@ -13,16 +14,3 @@ Feature: SWF and Quarkus installation
   # Scenario: verify if there is no dependencies with multiple versions in /home/kogito/.m2/repository
   #   When container is started with command bash
   #   Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
-
-  Scenario: verify if container starts in devmode by default
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then container log should contain -Duser.home=/home/kogito
-    And check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /q/health/ready                                                               |
-      | wait                 | 480                                                                           |
-      | request_method       | GET                                                                           |
-      | expected_status_code | 200                                                                           |
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
new file mode 100644
index 00000000000..b80ec305ded
--- /dev/null
+++ b/tests/features/kogito-swf-devmode.feature
@@ -0,0 +1,15 @@
+@quay.io/kiegroup/kogito-swf-devmode
+Feature: SWF and Quarkus installation
+
+  Scenario: verify if container starts in devmode by default
+    When container is started with env
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then container log should contain -Duser.home=/home/kogito
+    And check that page is served
+      | property             | value                                                                         |
+      | port                 | 8080                                                                          |
+      | path                 | /q/health/ready                                                               |
+      | wait                 | 480                                                                           |
+      | request_method       | GET                                                                           |
+      | expected_status_code | 200                                                                           |

From c5dccc7184fbd57c5f516d8c16e8fcbe7dea2b34 Mon Sep 17 00:00:00 2001
From: radtriste <tradisso@redhat.com>
Date: Thu, 11 May 2023 14:09:33 +0200
Subject: [PATCH 563/709] correct bats tests

---
 .../common/tests/bats/kogito-swf-builder-jvm-settings.bats    | 4 ++--
 scripts/run-bats.sh                                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/kogito-swf/common/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf/common/tests/bats/kogito-swf-builder-jvm-settings.bats
index e00af2e8b90..ed5697000b9 100644
--- a/modules/kogito-swf/common/tests/bats/kogito-swf-builder-jvm-settings.bats
+++ b/modules/kogito-swf/common/tests/bats/kogito-swf-builder-jvm-settings.bats
@@ -5,8 +5,8 @@ export HOME="${KOGITO_HOME}"
 export JBOSS_CONTAINER_JAVA_JVM_MODULE=/tmp/container/java/jvm
 mkdir -p "${KOGITO_HOME}"/launch
 mkdir -p "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-cp -r $BATS_TEST_DIRNAME/../../../kogito-dynamic-resources/added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
+cp $BATS_TEST_DIRNAME/../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+cp -r $BATS_TEST_DIRNAME/../../../../kogito-dynamic-resources/added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
 chmod -R +x "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
 cp $BATS_TEST_DIRNAME/../../added/jvm-settings.sh "${KOGITO_HOME}"/launch/
 
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 084ec35264d..e7cdbea38fa 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -44,4 +44,4 @@ echo "----> running bats on kogito-s2i-core"
 ./bats/bin/bats modules/kogito-s2i-core/tests/bats
 
 echo "----> running bats on kogito-swf-builder"
-./bats/bin/bats modules/kogito-swf-builder/tests/bats
\ No newline at end of file
+./bats/bin/bats modules/kogito-swf/common/tests/bats
\ No newline at end of file

From fb29f58677cdc622b7cc4d097c9eab606ffba663 Mon Sep 17 00:00:00 2001
From: radtriste <tradisso@redhat.com>
Date: Thu, 11 May 2023 15:45:21 +0200
Subject: [PATCH 564/709] fix env var

---
 modules/kogito-swf/devmode/added/run-app-devmode.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kogito-swf/devmode/added/run-app-devmode.sh b/modules/kogito-swf/devmode/added/run-app-devmode.sh
index 13a590493b0..fb16b7685fb 100755
--- a/modules/kogito-swf/devmode/added/run-app-devmode.sh
+++ b/modules/kogito-swf/devmode/added/run-app-devmode.sh
@@ -14,7 +14,7 @@ fi
 
 source "${script_dir_path}"/configure-jvm-mvn.sh
 
-cd "${PROJECT_ARTIFACT_ID}"
+cd serverless-workflow-project
 
 if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
   ${KOGITO_HOME}/launch/add-extension.sh "${QUARKUS_EXTENSIONS}"

From b176b191a2a499d67d4fa9a7cfb30d0dd0889011 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 16 May 2023 09:23:41 +0200
Subject: [PATCH 565/709] KOGITO-9058 Remove full quarkus platform dependency
 (#1517)

* KOGITO-9058 Remove full quarkus platform dependency

* update swf-builder

* s2i change for kogito version

* fix
---
 .ci/jenkins/Jenkinsfile                       | 24 +++++-----
 .ci/jenkins/Jenkinsfile.deploy                | 46 ++++++++++---------
 Makefile                                      |  2 +-
 modules/kogito-s2i-core/added/s2i-core        | 21 +++++++++
 .../kogito-swf/builder/added/create-app.sh    |  2 +-
 scripts/build-quarkus-app.sh                  | 22 +++++++++
 6 files changed, 82 insertions(+), 35 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 2b9b2c84e2b..947c93fd348 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -62,17 +62,19 @@ pipeline {
                 }
             }
         }
-        stage('Setup Quarkus platform') {
-            steps {
-                script {
-                    String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
-                    String quarkusPlatformVersion = "kogito-${kogitoVersion}"
-
-                    // Setup quarkus platform repo configuration
-                    runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
-                }
-            }
-        }
+        // Commented as we cannot fully rely on Quarkus platform
+        // Should be uncommmented once https://issues.redhat.com/browse/KOGITO-9120 is implemented
+        // stage('Setup Quarkus platform') {
+        //     steps {
+        //         script {
+        //             String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
+        //             String quarkusPlatformVersion = "kogito-${kogitoVersion}"
+
+        //             // Setup quarkus platform repo configuration
+        //             runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
+        //         }
+        //     }
+        // }
         stage('Prepare offline kogito-examples') {
             steps {
                 script {
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index e53d6e6526f..b584019090d 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -134,28 +134,30 @@ pipeline {
                 }
             }
         }
-        stage('Setup Quarkus platform') {
-            steps {
-                script {
-                    String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
-                    String quarkusPlatformVersion = "kogito-${kogitoVersion}"
-
-                    if (isRelease()) {
-                        if (params.QUARKUS_PLATFORM_VERSION) {
-                            runPythonCommand("python3 scripts/update-repository.py --quarkus-platform-version ${params.QUARKUS_PLATFORM_VERSION}")
-                        } else {
-                            echo "No new quarkus version given for the release. Statu quo ..."
-                        }
-                    } else {
-                        if (getMavenArtifactRepository()) {
-                            echo "[WARN] Artifacts repository defined in env will override the quarkus platform URL in tests. Make sure the platform artifacts are available on that artifacts repository (you can use a maven group)"
-                        }
-                        // Setup quarkus platform repo configuration
-                        runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
-                    }
-                }
-            }
-        }
+        // Commented as we cannot fully rely on Quarkus platform
+        // Should be uncommmented once https://issues.redhat.com/browse/KOGITO-9120 is implemented
+        // stage('Setup Quarkus platform') {
+        //     steps {
+        //         script {
+        //             String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
+        //             String quarkusPlatformVersion = "kogito-${kogitoVersion}"
+
+        //             if (isRelease()) {
+        //                 if (params.QUARKUS_PLATFORM_VERSION) {
+        //                     runPythonCommand("python3 scripts/update-repository.py --quarkus-platform-version ${params.QUARKUS_PLATFORM_VERSION}")
+        //                 } else {
+        //                     echo "No new quarkus version given for the release. Statu quo ..."
+        //                 }
+        //             } else {
+        //                 if (getMavenArtifactRepository()) {
+        //                     echo "[WARN] Artifacts repository defined in env will override the quarkus platform URL in tests. Make sure the platform artifacts are available on that artifacts repository (you can use a maven group)"
+        //                 }
+        //                 // Setup quarkus platform repo configuration
+        //                 runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
+        //             }
+        //         }
+        //     }
+        // }
         stage('Setup for testing') {
             when {
                 expression { return !shouldSkipTests() }
diff --git a/Makefile b/Makefile
index 0ad0c0c95b9..6e456f97441 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ build-image: clone-repos _build-image
 _build-image:
 ifneq ($(ignore_build),true)
 	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
-	scripts/build-quarkus-app.sh ${image_name} $(QUARKUS_PLATFORM_VERSION)
+	scripts/build-quarkus-app.sh ${image_name} $(QUARKUS_PLATFORM_VERSION) $(KOGITO_VERSION)
 	${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
 endif
 # tag with shortened version
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index bda3164367e..d25870f82d4 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -146,6 +146,27 @@ function build_kogito_app() {
                                 -Dextensions="${QUARKUS_EXTRA_EXTENSIONS}"
             fi
 
+            # Fix as we cannot rely on Quarkus platform
+            # Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented
+            if [ ! -z ${KOGITO_VERSION} ]; then
+                echo "Replacing Kogito Platform BOM with version ${KOGITO_VERSION}"
+                # [ ]* -> is a regexp pattern to match any number of spaces
+                pattern_1="[ ]*<groupId>.*<\/groupId>"
+                pattern_2="[ ]*<artifactId>quarkus-kogito-bom<\/artifactId>\n"
+                pattern_3="[ ]*<version>.*<\/version>\n"
+                complete_pattern="$pattern_1\n$pattern_2$pattern_3"
+
+                replace_1="        <groupId>org.kie.kogito<\/groupId>\n"
+                replace_2="        <artifactId>kogito-bom<\/artifactId>\n"
+                replace_3="        <version>${KOGITO_VERSION}<\/version>\n"
+                complete_replace="$replace_1$replace_2$replace_3"
+
+                sed -i.bak -e "/$pattern_1/{
+                    N;N;N
+                    s/$complete_pattern/$complete_replace/
+                    }" ${PROJECT_ARTIFACT_ID}/pom.xml
+            fi
+
         elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
             log_info "----> Using Spring Boot to bootstrap the application."
             $MAVEN_HOME/bin/mvn archetype:generate -B -DinteractiveMode=false -DarchetypeGroupId=org.kie.kogito \
diff --git a/modules/kogito-swf/builder/added/create-app.sh b/modules/kogito-swf/builder/added/create-app.sh
index 0de953c7c49..97890d31617 100755
--- a/modules/kogito-swf/builder/added/create-app.sh
+++ b/modules/kogito-swf/builder/added/create-app.sh
@@ -43,7 +43,7 @@ if [ ! -z ${KOGITO_VERSION} ]; then
     sed -i.bak -e "/$pattern_1/{
         N;N;N
         s/$complete_pattern/$complete_replace/
-        }" serverless-workflow-project/pom.xml
+        }" pom.xml
 fi
 
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index 3b8456864ea..a54ca0cb252 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -11,6 +11,7 @@ set -o pipefail
 # Read entries before sourcing
 image_name="${1}"
 quarkus_platform_version="${2}"
+kogito_version="${KOGITO_VERSION:-${3}}"
 
 quarkus_extensions='quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health'
 
@@ -59,6 +60,27 @@ mvn ${MAVEN_OPTIONS} \
     -Dextensions="${quarkus_extensions}" \
     io.quarkus.platform:quarkus-maven-plugin:"${quarkus_platform_version}":create
 
+# Fix as we cannot rely on Quarkus platform
+# Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented
+if [ ! -z ${kogito_version} ]; then
+    echo "Replacing Kogito Platform BOM with version ${kogito_version}"
+    # [ ]* -> is a regexp pattern to match any number of spaces
+    pattern_1="[ ]*<groupId>.*<\/groupId>"
+    pattern_2="[ ]*<artifactId>quarkus-kogito-bom<\/artifactId>\n"
+    pattern_3="[ ]*<version>.*<\/version>\n"
+    complete_pattern="$pattern_1\n$pattern_2$pattern_3"
+
+    replace_1="        <groupId>org.kie.kogito<\/groupId>\n"
+    replace_2="        <artifactId>kogito-bom<\/artifactId>\n"
+    replace_3="        <version>${kogito_version}<\/version>\n"
+    complete_replace="$replace_1$replace_2$replace_3"
+
+    sed -i.bak -e "/$pattern_1/{
+        N;N;N
+        s/$complete_pattern/$complete_replace/
+        }" serverless-workflow-project/pom.xml
+fi
+
 echo "Build quarkus app"
 cd "serverless-workflow-project"
 # Quarkus version is enforced if some dependency pulled has older version of Quarkus set.

From 2ef10b5cff6c3283f0024984e46b3ab385e68ec6 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Fri, 12 May 2023 16:21:39 -0300
Subject: [PATCH 566/709] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 42c9735b6a5..9fbd11ae83e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,7 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
+- [KOGITO-9138](https://issues.redhat.com/browse/KOGITO-9138): Split SWF Builder image into builder and devmode
 
 ## Bug Fixes
 

From 04080218519c95364d9c396169f48001e6e6b639 Mon Sep 17 00:00:00 2001
From: Lucas Bacciotti <lbaciotti@gmail.com>
Date: Thu, 18 May 2023 14:52:19 +0100
Subject: [PATCH 567/709] Updating references to the new kie-ci actions folder.
 (#1503)

* [BXMSPROD-2016] Updating references to the new kie-ci actions folder.

* [BXMSPROD-2016] Updating references to the new kie-ci actions folder.
---
 .github/workflows/jenkins-tests-PR.yml | 2 +-
 .github/workflows/pr-backporting.yml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index 0c0b62636fc..535c1aac462 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: DSL tests
-      uses: kiegroup/kogito-pipelines/.ci/actions/dsl-tests@main
+      uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main
       with:
         main-config-file-repo: kiegroup/kogito-pipelines
         main-config-file-path: dsl/config/main.yaml
diff --git a/.github/workflows/pr-backporting.yml b/.github/workflows/pr-backporting.yml
index c4b93fde933..ae52e051d97 100644
--- a/.github/workflows/pr-backporting.yml
+++ b/.github/workflows/pr-backporting.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Set target branches
         id: set-targets
-        uses: kiegroup/kogito-pipelines/.ci/actions/parse-labels@main
+        uses: kiegroup/kie-ci/.ci/actions/parse-labels@main
         with:
           labels: ${LABELS}
   
@@ -34,7 +34,7 @@ jobs:
       REVIEWERS: ${{ toJSON(github.event.pull_request.requested_reviewers) }}
     steps:
       - name: Backporting
-        uses: kiegroup/kogito-pipelines/.ci/actions/backporting@main
+        uses: kiegroup/kie-ci/.ci/actions/backporting@main
         with:
           target-branch: ${{ matrix.target-branch }}
           additional-reviewers: ${REVIEWERS}
\ No newline at end of file

From bed22c2d2fdd4c7461d3e6e89bdef426be5fc9a5 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Mon, 22 May 2023 04:37:53 -0300
Subject: [PATCH 568/709] Update image validator version in CI (#1541)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 .ci/jenkins/Jenkinsfile              | 2 +-
 .ci/jenkins/Jenkinsfile.deploy       | 2 +-
 .ci/jenkins/Jenkinsfile.setup-branch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 947c93fd348..a597bca2958 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.4/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.5/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index b584019090d..b33b4a05313 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -106,7 +106,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.4/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.5/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 743499fd73c..243e95a512f 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -61,7 +61,7 @@ pipeline {
                 script {
                     dir(getRepoName()) {
                         sh '''
-                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.4/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.5/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                             tar -xzvf cekit-image-validator-runner.tgz
                             chmod +x cekit-image-validator-runner
                         '''

From 2e95415ed0d6e09d81c01b30c3b373d9c796fd04 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 22 May 2023 04:45:19 -0400
Subject: [PATCH 569/709] [main] Update version to 2.0.0-snapshot

---
 RELEASE_NOTES.md                                 | 1 -
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 9fbd11ae83e..42c9735b6a5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,7 +1,6 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-- [KOGITO-9138](https://issues.redhat.com/browse/KOGITO-9138): Split SWF Builder image into builder and devmode
 
 ## Bug Fixes
 
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index eac59690d8b..4cced310ecb 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |            
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |             
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 0f5eb585208..69372755892 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 1678f51e606..d7f6708acc7 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 7cffea191d287f06c41f47b93f344e9a474d0c65 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Mon, 22 May 2023 12:17:42 -0300
Subject: [PATCH 570/709] =?UTF-8?q?[KOGITO-9182]=20-=20[Dev-mode]=20Unset?=
 =?UTF-8?q?=20the=20maven=20offline=20property=20if=20the=20QU=E2=80=A6=20?=
 =?UTF-8?q?(#1542)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-9182] - [Dev-mode] Unset the maven offline property if the QUARKUS_EXTENSION env is set

Signed-off-by: Spolti <fspolti@redhat.com>

* Update tests/features/kogito-swf-devmode.feature

---------

Signed-off-by: Spolti <fspolti@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 RELEASE_NOTES.md                              |  1 +
 .../devmode/added/run-app-devmode.sh          |  4 ++-
 scripts/common.py                             |  2 +-
 tests/features/kogito-swf-devmode.feature     | 29 +++++++++++++++----
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 42c9735b6a5..63b3cb7c31e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -3,6 +3,7 @@
 ## Enhancements
 
 ## Bug Fixes
+- [KOGITO-9182](https://issues.redhat.com/browse/KOGITO-9182): [Dev-mode] Unset the maven offline property if the QUARKUS_EXTENSION env is set
 
 ## Known Issues
 
diff --git a/modules/kogito-swf/devmode/added/run-app-devmode.sh b/modules/kogito-swf/devmode/added/run-app-devmode.sh
index fb16b7685fb..a62d73382d1 100755
--- a/modules/kogito-swf/devmode/added/run-app-devmode.sh
+++ b/modules/kogito-swf/devmode/added/run-app-devmode.sh
@@ -16,14 +16,16 @@ source "${script_dir_path}"/configure-jvm-mvn.sh
 
 cd serverless-workflow-project
 
+offline_param="-o"
 if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
   ${KOGITO_HOME}/launch/add-extension.sh "${QUARKUS_EXTENSIONS}"
+  offline_param=""
 fi
 
 
 # `-o` means offline mode
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-  -o \
+  ${offline_param} \
   -s "${MAVEN_SETTINGS_PATH}" \
   -DskipTests \
   -Dquarkus.http.host=0.0.0.0 \
diff --git a/scripts/common.py b/scripts/common.py
index 320571d25b8..816562bcd10 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -41,7 +41,7 @@
                               "kogito-trusty-redis", "kogito-trusty-ui"}
 
 PROD_SUPPORTING_SERVICES_IMAGES = {"logic-data-index-ephemeral-rhel8"}
-SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-base-builder"}
+SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-base-builder", "kogito-swf-devmode"}
 
 
 def yaml_loader():
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index b80ec305ded..2c2d7d0c11b 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -5,11 +5,28 @@ Feature: SWF and Quarkus installation
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
+    Then container log should contain --no-transfer-progress
+    And container log should contain -Duser.home=/home/kogito -o
+    And check that page is served
+      | property             | value             |
+      | port                 | 8080              |
+      | path                 | /q/health/ready   |
+      | wait                 | 480               |
+      | request_method       | GET               |
+      | expected_status_code | 200               |
+
+  Scenario: verify if container starts correctly when QUARKUS_EXTENSIONS env is used
+    When container is started with env
+      | variable            | value                                    |
+      | SCRIPT_DEBUG        | true                                     |
+      | QUARKUS_EXTENSIONS  | io.quarkus:quarkus-elytron-security-jdbc |
     Then container log should contain -Duser.home=/home/kogito
+    And container log should not contain /bin/mvn -B -X --batch-mode -o
+    And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
     And check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /q/health/ready                                                               |
-      | wait                 | 480                                                                           |
-      | request_method       | GET                                                                           |
-      | expected_status_code | 200                                                                           |
+      | property             | value             |
+      | port                 | 8080              |
+      | path                 | /q/health/ready   |
+      | wait                 | 480               |
+      | request_method       | GET               |
+      | expected_status_code | 200               |
\ No newline at end of file

From 17ea541f06ac9d333467bde5c7f46fc5b96e59e1 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Mon, 22 May 2023 18:22:27 -0300
Subject: [PATCH 571/709] update cekit-image-validator to 1.3.6 (#1545)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 .ci/jenkins/Jenkinsfile              | 2 +-
 .ci/jenkins/Jenkinsfile.deploy       | 2 +-
 .ci/jenkins/Jenkinsfile.setup-branch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index a597bca2958..71bf4416549 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.5/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index b33b4a05313..aa7597c7d90 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -106,7 +106,7 @@ pipeline {
             steps {
                 script {
                     sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.5/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                         tar -xzvf cekit-image-validator-runner.tgz
                         chmod +x cekit-image-validator-runner
                     '''
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 243e95a512f..3989db70603 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -61,7 +61,7 @@ pipeline {
                 script {
                     dir(getRepoName()) {
                         sh '''
-                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.5/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
                             tar -xzvf cekit-image-validator-runner.tgz
                             chmod +x cekit-image-validator-runner
                         '''

From 8ca0fe2572a3791b6e82d1c8b0bc8c581e2f719c Mon Sep 17 00:00:00 2001
From: Walter Medvedeo <wmedvedeo@gmail.com>
Date: Wed, 24 May 2023 09:07:53 +0200
Subject: [PATCH 572/709] KOGITO-8866: Ensure that Jobs Service is embedded in
 the workflow dev profile (#1546)

* KOGITO-8866: Ensure that Jobs Service is embedded in the workflow dev profile
    - Incorporates the kogito-addons-quarkus-jobs-service-embedded and kogito-addons-quarkus-data-index-inmemory to the kogito_swf_devmode image

* KOGITO-8866: Ensure that Jobs Service is embedded in the workflow dev profile
    - Remove the kogito-addons-quarkus-data-index-inmemory by now
---
 modules/kogito-swf/devmode/module.yaml | 3 +++
 scripts/build-quarkus-app.sh           | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/kogito-swf/devmode/module.yaml b/modules/kogito-swf/devmode/module.yaml
index 3f98ff130aa..e72e43856ab 100644
--- a/modules/kogito-swf/devmode/module.yaml
+++ b/modules/kogito-swf/devmode/module.yaml
@@ -10,6 +10,9 @@ envs:
   - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
     description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
     value: "false"
+  - name: QUARKUS_DEVSERVICES_ENABLED
+    description: Whether to enable Quarkus Devservices or not. Default to "false" since the Kafka broker needs Docker.
+    value: "false"
   - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
     description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
     value: "false"
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index a54ca0cb252..7bcfe66410f 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -13,7 +13,10 @@ image_name="${1}"
 quarkus_platform_version="${2}"
 kogito_version="${KOGITO_VERSION:-${3}}"
 
+# common extensions used by the kogito-swf-builder and kogito-swf-devmode
 quarkus_extensions='quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health'
+# dev mode purpose extensions used only by the kogito-swf-devmode
+kogito_swf_devmode_extensions='kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded'
 
 if [ -z ${quarkus_platform_version} ]; then
     echo "Please provide the quarkus version"
@@ -23,7 +26,7 @@ fi
 case ${image_name} in
     "kogito-swf-builder")        ;;
     "kogito-swf-devmode")        
-        quarkus_extensions="${quarkus_extensions},kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files"
+        quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions}"
         ;;
     *)
         echo "${image_name} is not a quarkus app image, exiting..."

From a805d4afa8074ab57a0fd086964fbed007969642 Mon Sep 17 00:00:00 2001
From: Walter Medvedeo <wmedvedeo@gmail.com>
Date: Thu, 25 May 2023 14:28:41 +0200
Subject: [PATCH 573/709] KOGITO-8866: Ensure that Jobs Service is embedded in
 the workflow dev profile (#1547)

- incoporates the kogito-addons-quarkus-data-index-inmemory
    - and behave tests for the jobs-service, data-index and dev-ui
---
 scripts/build-quarkus-app.sh              |  2 +-
 tests/features/kogito-swf-devmode.feature | 65 ++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
index 7bcfe66410f..627a074cfdc 100755
--- a/scripts/build-quarkus-app.sh
+++ b/scripts/build-quarkus-app.sh
@@ -16,7 +16,7 @@ kogito_version="${KOGITO_VERSION:-${3}}"
 # common extensions used by the kogito-swf-builder and kogito-swf-devmode
 quarkus_extensions='quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health'
 # dev mode purpose extensions used only by the kogito-swf-devmode
-kogito_swf_devmode_extensions='kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded'
+kogito_swf_devmode_extensions='kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory'
 
 if [ -z ${quarkus_platform_version} ]; then
     echo "Please provide the quarkus version"
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 2c2d7d0c11b..2056a1f8aa1 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -29,4 +29,67 @@ Feature: SWF and Quarkus installation
       | path                 | /q/health/ready   |
       | wait                 | 480               |
       | request_method       | GET               |
-      | expected_status_code | 200               |
\ No newline at end of file
+      | expected_status_code | 200               |
+
+  Scenario: verify that the embedded jobs-service is running
+    When container is started with env
+      | variable                    | value |
+      | QUARKUS_DEVSERVICES_ENABLED | false |
+    Then container log should contain Embedded Postgres started at port
+    And container log should contain SET Leader
+    And check that page is served
+      | property             | value             |
+      | port                 | 8080              |
+      | path                 | /q/health/ready   |
+      | wait                 | 480               |
+      | request_method       | GET               |
+      | expected_status_code | 200               |
+    And check that page is served
+      | property             | value             |
+      | port                 | 8080              |
+      | path                 | /v2/jobs/1234     |
+      | wait                 | 480               |
+      | request_method       | GET               |
+      | expected_status_code | 404               |
+      | expected_phrase      | Job not found     |
+
+  Scenario: verify that the embedded data-index service is running
+    When container is started with env
+      | variable                    | value |
+      | QUARKUS_DEVSERVICES_ENABLED | false |
+    Then container log should contain Embedded Postgres started at port
+    And check that page is served
+      | property             | value             |
+      | port                 | 8080              |
+      | path                 | /q/health/ready   |
+      | request_method       | GET               |
+      | wait                 | 480               |
+      | expected_status_code | 200               |
+    And check that page is served
+      | property             | value                                    |
+      | port                 | 8080                                     |
+      | path                 | /graphql                                 |
+      | request_method       | POST                                     |
+      | request_body         | { "query": "{ProcessInstances{ id } }" } |
+      | wait                 | 480                                      |
+      | expected_status_code | 200                                      |
+      | expected_phrase      | {"data":{"ProcessInstances":[]}}         |
+
+  Scenario: verify that the serverless workflow devui is running
+    When container is started with env
+      | variable                    | value |
+      | QUARKUS_DEVSERVICES_ENABLED | false |
+    Then check that page is served
+      | property             | value                                                              |
+      | port                 | 8080                                                               |
+      | path                 | /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow/dataindex |
+      | request_method       | GET                                                                |
+      | wait                 | 480                                                                |
+      | expected_status_code | 200                                                                |
+    And check that page is served
+      | property             | value                                                                            |
+      | port                 | 8080                                                                             |
+      | path                 | /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/workflowInstances |
+      | request_method       | GET                                                                              |
+      | wait                 | 480                                                                              |
+      | expected_status_code | 200                                                                              |

From 4b8ff6e2a65420ad3bf3b43fb7d3ad363d6fed71 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 25 May 2023 20:37:12 +0200
Subject: [PATCH 574/709] KOGITO-9079 SWF images with multistage builds (#1539)

* KOGITO-9079 SWF images with multistage builds
* Update scripts/README.md
* rebase with data-index inmemory changes
---
 .ci/jenkins/Jenkinsfile                       |   5 +-
 .ci/jenkins/Jenkinsfile.deploy                |   5 +-
 .ci/jenkins/Jenkinsfile.setup-branch          |   3 +-
 Makefile                                      |  19 +-
 README.md                                     |  86 +++---
 image.yaml                                    |  35 ---
 kogito-base-builder-overrides.yaml            |  30 --
 ... => kogito-data-index-ephemeral-image.yaml |  13 +-
 ...=> kogito-data-index-infinispan-image.yaml |  13 +-
 ...ml => kogito-data-index-mongodb-image.yaml |  14 +-
 ...aml => kogito-data-index-oracle-image.yaml |  14 +-
 ...=> kogito-data-index-postgresql-image.yaml |  10 +
 ...s.yaml => kogito-explainability-image.yaml |  14 +-
 ...rides.yaml => kogito-jit-runner-image.yaml |  13 +-
 ...=> kogito-jobs-service-allinone-image.yaml |  13 +-
 ...> kogito-jobs-service-ephemeral-image.yaml |  13 +-
 ... kogito-jobs-service-infinispan-image.yaml |  13 +-
 ... => kogito-jobs-service-mongodb-image.yaml |  13 +-
 ... kogito-jobs-service-postgresql-image.yaml |  13 +-
 ...ml => kogito-management-console-image.yaml |  13 +-
 ...ides.yaml => kogito-runtime-jvm-image.yaml |  25 +-
 ...s.yaml => kogito-runtime-native-image.yaml |  25 +-
 ...ides.yaml => kogito-s2i-builder-image.yaml |  35 ++-
 kogito-swf-builder-image.yaml                 |  70 +++++
 kogito-swf-builder-overrides.yaml             |  22 --
 kogito-swf-devmode-image.yaml                 |  74 +++++
 kogito-swf-devmode-overrides.yaml             |  28 --
 ...des.yaml => kogito-task-console-image.yaml |  13 +-
 ...aml => kogito-trusty-infinispan-image.yaml |  13 +-
 ...aml => kogito-trusty-postgresql-image.yaml |  14 +-
 ...des.yaml => kogito-trusty-redis-image.yaml |  14 +-
 ...rrides.yaml => kogito-trusty-ui-image.yaml |  13 +-
 ...ogic-data-index-ephemeral-rhel8-image.yaml |  11 +-
 modules/kogito-epel/7/module.yaml             |   2 +-
 .../20.x-java-1.8/module.yaml                 |  14 +-
 .../20.x-java-11/module.yaml                  |  14 +-
 .../21.x-java-11/module.yaml                  |  14 +-
 modules/kogito-maven/3.8.x-rpm/module.yaml    |   2 +-
 modules/kogito-maven/3.8.x/module.yaml        |   2 +-
 .../kogito-maven/maven-dnf-module/module.yaml |   5 +-
 .../kogito-openjdk/1.8.0-headless/module.yaml |   2 +-
 modules/kogito-openjdk/1.8.0/module.yaml      |   2 +-
 .../kogito-openjdk/11-headless/module.yaml    |   2 +-
 modules/kogito-openjdk/11/module.yaml         |   2 +-
 modules/kogito-project-versions/module.yaml   |  12 +
 .../builder/build-config/module.yaml          |  10 +
 .../kogito-swf/builder/runtime/configure.sh   |  13 +
 .../kogito-swf/builder/runtime/module.yaml    |  13 +
 .../common/build/added/cleanup_project.sh     |  19 ++
 .../common/build/added/zip_files.sh           |  15 +
 modules/kogito-swf/common/build/configure.sh  |  24 ++
 modules/kogito-swf/common/build/module.yaml   |  11 +
 modules/kogito-swf/common/module.yaml         |  11 -
 .../{ => scripts}/added/add-extension.sh      |   0
 .../scripts}/added/build-app.sh               |  11 +-
 .../{ => scripts}/added/configure-jvm-mvn.sh  |   0
 .../scripts}/added/create-app.sh              |   5 +-
 .../{ => scripts}/added/jvm-settings.sh       |   0
 .../common/{ => scripts}/configure.sh         |   0
 .../{builder => common/scripts}/module.yaml   |  15 +-
 .../bats/kogito-swf-builder-jvm-settings.bats |   4 +-
 .../devmode/build-config/module.yaml          |  10 +
 modules/kogito-swf/devmode/configure.sh       |  16 --
 modules/kogito-swf/devmode/module.yaml        |  29 --
 .../{ => runtime}/added/run-app-devmode.sh    |   7 +-
 .../{builder => devmode/runtime}/configure.sh |   4 +-
 .../kogito-swf/devmode/runtime/module.yaml    |  24 ++
 rhpam-kogito-builder-rhel8-overrides.yaml     |  82 ------
 rhpam-kogito-imagestream.yaml                 |  72 -----
 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml |  65 -----
 ...kogito-runtime-native-rhel8-overrides.yaml |  60 ----
 scripts/README.md                             |  12 +-
 scripts/build-osbs.sh                         |   2 +-
 scripts/build-product-image.sh                |   4 +-
 scripts/build-quarkus-app.sh                  | 120 --------
 scripts/common.py                             | 256 ++++++++++++------
 scripts/manage-kogito-version.py              |   4 +-
 scripts/push-staging.py                       |  20 +-
 scripts/retrieve_version.py                   |  14 +
 scripts/run-bats.sh                           |   2 +-
 scripts/update-repository.py                  |  13 +-
 .../kogito-data-index-ephemeral.feature       |   2 -
 .../kogito-data-index-infinispan.feature      |   2 -
 .../kogito-data-index-mongodb.feature         |   2 -
 .../kogito-data-index-oracle.feature          |   2 -
 .../kogito-data-index-postgresql.feature      |   2 -
 .../kogito-jobs-service-all-in-one.feature    |   2 -
 .../kogito-jobs-service-ephemeral.feature     |   2 -
 .../kogito-jobs-service-infinispan.feature    |   2 -
 .../kogito-jobs-service-mongodb.feature       |   2 -
 .../kogito-jobs-service-postgresql.feature    |   2 -
 tests/features/kogito-explainability.feature  |   2 -
 tests/features/kogito-jit-runner.feature      |   2 -
 .../kogito-management-console.feature         |   2 -
 .../kogito-s2i-builder-native.feature         |   2 +-
 tests/features/kogito-s2i-builder.feature     |   8 +-
 tests/features/kogito-swf-builder.feature     |  40 +++
 tests/features/kogito-swf-common.feature      |   4 +-
 tests/features/kogito-swf-devmode.feature     |  47 +++-
 tests/features/kogito-task-console.feature    |   2 -
 .../features/rhpam-kogito-builder-jvm.feature |   8 +-
 .../trusty/kogito-trusty-infinispan.feature   |   2 -
 .../trusty/kogito-trusty-postgresql.feature   |   2 -
 .../trusty/kogito-trusty-redis.feature        |   2 -
 .../features/trusty/kogito-trusty-ui.feature  |   2 -
 tests/shell/kogito-swf-devmode/RunTests.java  |  84 ++++++
 .../resources/greet.sw.json                   |  67 +++++
 107 files changed, 1115 insertions(+), 930 deletions(-)
 delete mode 100644 image.yaml
 delete mode 100644 kogito-base-builder-overrides.yaml
 rename kogito-data-index-ephemeral-overrides.yaml => kogito-data-index-ephemeral-image.yaml (88%)
 rename kogito-data-index-infinispan-overrides.yaml => kogito-data-index-infinispan-image.yaml (91%)
 rename kogito-data-index-mongodb-overrides.yaml => kogito-data-index-mongodb-image.yaml (86%)
 rename kogito-data-index-oracle-overrides.yaml => kogito-data-index-oracle-image.yaml (86%)
 rename kogito-data-index-postgresql-overrides.yaml => kogito-data-index-postgresql-image.yaml (86%)
 rename kogito-explainability-overrides.yaml => kogito-explainability-image.yaml (86%)
 rename kogito-jit-runner-overrides.yaml => kogito-jit-runner-image.yaml (84%)
 rename kogito-jobs-service-allinone-overrides.yaml => kogito-jobs-service-allinone-image.yaml (89%)
 rename kogito-jobs-service-ephemeral-overrides.yaml => kogito-jobs-service-ephemeral-image.yaml (87%)
 rename kogito-jobs-service-infinispan-overrides.yaml => kogito-jobs-service-infinispan-image.yaml (87%)
 rename kogito-jobs-service-mongodb-overrides.yaml => kogito-jobs-service-mongodb-image.yaml (87%)
 rename kogito-jobs-service-postgresql-overrides.yaml => kogito-jobs-service-postgresql-image.yaml (87%)
 rename kogito-management-console-overrides.yaml => kogito-management-console-image.yaml (87%)
 rename kogito-runtime-jvm-overrides.yaml => kogito-runtime-jvm-image.yaml (75%)
 rename kogito-runtime-native-overrides.yaml => kogito-runtime-native-image.yaml (72%)
 rename kogito-s2i-builder-overrides.yaml => kogito-s2i-builder-image.yaml (81%)
 create mode 100644 kogito-swf-builder-image.yaml
 delete mode 100644 kogito-swf-builder-overrides.yaml
 create mode 100644 kogito-swf-devmode-image.yaml
 delete mode 100644 kogito-swf-devmode-overrides.yaml
 rename kogito-task-console-overrides.yaml => kogito-task-console-image.yaml (86%)
 rename kogito-trusty-infinispan-overrides.yaml => kogito-trusty-infinispan-image.yaml (91%)
 rename kogito-trusty-postgresql-overrides.yaml => kogito-trusty-postgresql-image.yaml (86%)
 rename kogito-trusty-redis-overrides.yaml => kogito-trusty-redis-image.yaml (87%)
 rename kogito-trusty-ui-overrides.yaml => kogito-trusty-ui-image.yaml (86%)
 rename logic-data-index-ephemeral-rhel8-overrides.yaml => logic-data-index-ephemeral-rhel8-image.yaml (91%)
 create mode 100644 modules/kogito-project-versions/module.yaml
 create mode 100644 modules/kogito-swf/builder/build-config/module.yaml
 create mode 100644 modules/kogito-swf/builder/runtime/configure.sh
 create mode 100644 modules/kogito-swf/builder/runtime/module.yaml
 create mode 100755 modules/kogito-swf/common/build/added/cleanup_project.sh
 create mode 100755 modules/kogito-swf/common/build/added/zip_files.sh
 create mode 100644 modules/kogito-swf/common/build/configure.sh
 create mode 100644 modules/kogito-swf/common/build/module.yaml
 delete mode 100644 modules/kogito-swf/common/module.yaml
 rename modules/kogito-swf/common/{ => scripts}/added/add-extension.sh (100%)
 rename modules/kogito-swf/{builder => common/scripts}/added/build-app.sh (95%)
 rename modules/kogito-swf/common/{ => scripts}/added/configure-jvm-mvn.sh (100%)
 rename modules/kogito-swf/{builder => common/scripts}/added/create-app.sh (93%)
 rename modules/kogito-swf/common/{ => scripts}/added/jvm-settings.sh (100%)
 rename modules/kogito-swf/common/{ => scripts}/configure.sh (100%)
 rename modules/kogito-swf/{builder => common/scripts}/module.yaml (66%)
 rename modules/kogito-swf/common/{ => scripts}/tests/bats/kogito-swf-builder-jvm-settings.bats (86%)
 create mode 100644 modules/kogito-swf/devmode/build-config/module.yaml
 delete mode 100644 modules/kogito-swf/devmode/configure.sh
 delete mode 100644 modules/kogito-swf/devmode/module.yaml
 rename modules/kogito-swf/devmode/{ => runtime}/added/run-app-devmode.sh (99%)
 rename modules/kogito-swf/{builder => devmode/runtime}/configure.sh (66%)
 create mode 100644 modules/kogito-swf/devmode/runtime/module.yaml
 delete mode 100644 rhpam-kogito-builder-rhel8-overrides.yaml
 delete mode 100644 rhpam-kogito-imagestream.yaml
 delete mode 100644 rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
 delete mode 100644 rhpam-kogito-runtime-native-rhel8-overrides.yaml
 delete mode 100755 scripts/build-quarkus-app.sh
 create mode 100644 scripts/retrieve_version.py
 create mode 100644 tests/features/kogito-swf-builder.feature
 create mode 100644 tests/shell/kogito-swf-devmode/RunTests.java
 create mode 100644 tests/shell/kogito-swf-devmode/resources/greet.sw.json

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 71bf4416549..832b799eb00 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -44,8 +44,7 @@ pipeline {
                         chmod +x cekit-image-validator-runner
                     '''
                     sh './cekit-image-validator-runner modules/'
-                    sh './cekit-image-validator-runner image.yaml'
-                    getImages().each { image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }
+                    getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
                 }
             }
         }
@@ -57,7 +56,7 @@ pipeline {
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
                         
                         // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                        runPythonCommand("python3 scripts/update-repository.py --ignore-self-signed-cert")
+                        runPythonCommand("python3 scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
                     }
                 }
             }
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index aa7597c7d90..009133453ab 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -111,8 +111,7 @@ pipeline {
                         chmod +x cekit-image-validator-runner
                     '''
                     sh './cekit-image-validator-runner modules/'
-                    sh './cekit-image-validator-runner image.yaml'
-                    getImages().each { image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }
+                    getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
                 }
             }
             post {
@@ -129,7 +128,7 @@ pipeline {
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
 
                         // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                        runPythonCommand("python3 scripts/update-repository.py --ignore-self-signed-cert")
+                        runPythonCommand("python3 scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
                     }
                 }
             }
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 3989db70603..9d54a7d8b5c 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -66,8 +66,7 @@ pipeline {
                             chmod +x cekit-image-validator-runner
                         '''
                         sh './cekit-image-validator-runner modules/'
-                        sh './cekit-image-validator-runner image.yaml'
-                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-overrides.yaml" }
+                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
                     }
                 }
             }
diff --git a/Makefile b/Makefile
index 6e456f97441..bf115fe7d4f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
-IMAGE_VERSION := $(shell cat image.yaml | egrep ^version  | cut -d"\"" -f2)
-QUARKUS_PLATFORM_VERSION := $(shell awk '/- name: "QUARKUS_PLATFORM_VERSION"/,/description/' image.yaml | grep value | awk -F'"' '{print $$2}')
-KOGITO_VERSION := $(shell awk '/- name: "KOGITO_VERSION"/,/description/' image.yaml | grep value | awk -F'"' '{print $$2}')
+IMAGE_VERSION := $(shell python3 scripts/retrieve_version.py)
 SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
 KOGITO_APPS_TARGET_BRANCH ?= main
 KOGITO_APPS_TARGET_URI ?= https://github.com/kiegroup/kogito-apps.git
@@ -26,14 +24,6 @@ list:
 display-image-version:
 	@echo $(IMAGE_VERSION)
 
-.PHONY: display-kogito-version
-display-kogito-version:
-	@echo $(KOGITO_VERSION)
-
-.PHONY: display-quarkus-platform-version
-display-quarkus-version:
-	@echo $(QUARKUS_PLATFORM_VERSION)
-
 # Build all images
 .PHONY: build
 # start to build the images
@@ -50,8 +40,7 @@ build-image: clone-repos _build-image
 _build-image:
 ifneq ($(ignore_build),true)
 	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
-	scripts/build-quarkus-app.sh ${image_name} $(QUARKUS_PLATFORM_VERSION) $(KOGITO_VERSION)
-	${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
+	${CEKIT_CMD} --descriptor ${image_name}-image.yaml build ${BUILD_ENGINE}
 endif
 # tag with shortened version
 ifneq ($(ignore_tag),true)
@@ -61,7 +50,7 @@ ifneq ($(ignore_tag),true)
 endif
 # if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
-	${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave ${test_options}
+	${CEKIT_CMD} --descriptor ${image_name}-image.yaml test behave ${test_options}
 	tests/shell/run.sh ${image_name} ${SHORTENED_LATEST_VERSION}
 endif
 
@@ -131,4 +120,4 @@ bats:
 prod_component=
 container-build-osbs:
 	echo "calling RHPAM container-build-osbs......................................"
-	$(CEKIT_CMD) --redhat build --overrides-file $(prod_component).yaml osbs --assume-yes
\ No newline at end of file
+	$(CEKIT_CMD) --descriptor $(prod_component).yaml --redhat build osbs --assume-yes
\ No newline at end of file
diff --git a/README.md b/README.md
index 45ab7e8e137..440f5d768f1 100644
--- a/README.md
+++ b/README.md
@@ -166,7 +166,7 @@ The Kogito s2i Builder Image is equipped with the following components:
  * OpenJDK 11+
  * Maven 3.8.6
  
-For more information about what is installed on this image, take a look [here](kogito-s2i-builder-overrides.yaml) in the
+For more information about what is installed on this image, take a look [here](kogito-s2i-builder-image.yaml) in the
 **modules.install** section. 
 
 
@@ -631,15 +631,15 @@ The Data Index Service depends on a running Infinispan, MongoDB or PostgreSQL.
 The Persistence service can be switched by using its corresponding image
 
 - Infinispan: quay.io/kiegroup/kogito-data-index-infinispan
-  [image.yaml](kogito-data-index-infinispan-overrides.yaml)
+  [image.yaml](kogito-data-index-infinispan-image.yaml)
 - Ephemeral PostgreSQL: quay.io/kiegroup/kogito-data-index-ephemeral
-  [image.yaml](kogito-data-index-ephemeral-overrides.yaml)
+  [image.yaml](kogito-data-index-ephemeral-image.yaml)
 - Mongodb: quay.io/kiegroup/kogito-data-index-mongodb 
-  [image.yaml](kogito-data-index-mongodb-overrides.yaml)
+  [image.yaml](kogito-data-index-mongodb-image.yaml)
 - Oracle: quay.io/kiegroup/kogito-data-index-oracle
-  [image.yaml](kogito-data-index-oracle-overrides.yaml)
+  [image.yaml](kogito-data-index-oracle-image.yaml)
 - PostgreSQL: quay.io/kiegroup/kogito-data-index-postgresql
-  [image.yaml](kogito-data-index-postgresql-overrides.yaml)
+  [image.yaml](kogito-data-index-postgresql-image.yaml)
 
 
 Basic usage with Infinispan:
@@ -700,7 +700,7 @@ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-explainability:la
 ```
 You should notice a few debug messages being printed in the system output.
 
-To know what configurations this image accepts please take a look [here](kogito-explainability-overrides.yaml) on the **envs** section.
+To know what configurations this image accepts please take a look [here](kogito-explainability-image.yaml) on the **envs** section.
 
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Explainability Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
@@ -713,11 +713,11 @@ The Trusty Service depends on a running Infinispan, Redis Server or PostgreSQL R
 The Trusty service can be switched by using its corresponding image
 
 - Infinispan: quay.io/kiegroup/kogito-trusty-infinispan
-    [image.yaml](kogito-trusty-infinispan-overrides.yaml)
+    [image.yaml](kogito-trusty-infinispan-image.yaml)
 - Redis: quay.io/kiegroup/kogito-trusty-redis
-    [image.yaml](kogito-trusty-redis-overrides.yaml)
+    [image.yaml](kogito-trusty-redis-image.yaml)
 - PostgreSQL: quay.io/kiegroup/kogito-trusty-postgresql
-    [image.yaml](kogito-trusty-postgresql-overrides.yaml)
+    [image.yaml](kogito-trusty-postgresql-image.yaml)
 
 Basic usage with Infinispan:
 ```bash
@@ -744,7 +744,7 @@ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-
 ```
 You should notice a few debug messages being printed in the system output.
 
-To know what configurations this image accepts please take a look [here](kogito-trusty-overrides.yaml) on the **envs** section.
+To know what configurations this image accepts please take a look [here](kogito-trusty-image.yaml) on the **envs** section.
 
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
@@ -758,11 +758,11 @@ For more information please visit this [link](https://github.com/kiegroup/kogito
 
 Today, the Jobs service contains four images:
 
-- [ephemeral](kogito-jobs-service-ephemeral-overrides.yaml)
-- [infinispan](kogito-jobs-service-infinispan-overrides.yaml)
-- [mongodb](kogito-jobs-service-mongodb-overrides.yaml)
-- [postgresql](kogito-jobs-service-postgresql-overrides.yaml)
-- [all-in-one](kogito-jobs-service-allinone-overrides.yaml)
+- [ephemeral](kogito-jobs-service-ephemeral-image.yaml)
+- [infinispan](kogito-jobs-service-infinispan-image.yaml)
+- [mongodb](kogito-jobs-service-mongodb-image.yaml)
+- [postgresql](kogito-jobs-service-postgresql-image.yaml)
+- [all-in-one](kogito-jobs-service-allinone-image.yaml)
 
 Basic usage:
 
@@ -847,7 +847,7 @@ docker run -it --env SCRIPT_DEBUG=true --env KOGITO_DATAINDEX_HTTP_URL=data-inde
 ```
 You should notice a few debug messages being printed in the system output.
 
-To know what configurations this image accepts please take a look [here](kogito-management-console-overrides.yaml) on the **envs** section.
+To know what configurations this image accepts please take a look [here](kogito-management-console-image.yaml) on the **envs** section.
 
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Management Console 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
@@ -872,7 +872,7 @@ docker run -it --env SCRIPT_DEBUG=true --env KOGITO_DATAINDEX_HTTP_URL=data-inde
 ```
 You should notice a few debug messages being printed in the system output.
 
-To know what configurations this image accepts please take a look [here](kogito-task-console-overrides.yaml) on the **envs** section.
+To know what configurations this image accepts please take a look [here](kogito-task-console-image.yaml) on the **envs** section.
 
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Task Console
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
@@ -897,7 +897,7 @@ docker run -it --env SCRIPT_DEBUG=true --env KOGITO_TRUSTY_ENDPOINT=trusty-servi
 ```
 You should notice a few debug messages being printed in the system output.
 
-To know what configurations this image accepts please take a look [here](kogito-trusty-ui-overrides.yaml) on the **envs** section.
+To know what configurations this image accepts please take a look [here](kogito-trusty-ui-image.yaml) on the **envs** section.
 
 The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty UI 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
@@ -919,7 +919,7 @@ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jit-runner:latest
 ```
 You should notice a few debug messages being printed in the system output. You can then visit `localhost:8080/index.html` to test the service.
 
-To know what configurations this image accepts please take a look [here](kogito-jit-runner-overrides.yaml) on the **envs** section.
+To know what configurations this image accepts please take a look [here](kogito-jit-runner-image.yaml) on the **envs** section.
 
 ## Using Kogito Images to Deploy Apps on OpenShift
 
@@ -1251,29 +1251,29 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-s2i-core](modules/kogito-s2i-core): Provides the source-to-image needed scripts and configurations.
 
 
-For each image, we use a specific *-overrides.yaml file which will specific the modules needed.
-Please inspect the images overrides files to learn which modules are being installed on each image:
-
-- [quay.io/kiegroup/kogito-data-index-infinispan](kogito-data-index-infinispan-overrides.yaml)
-- [quay.io/kiegroup/kogito-data-index-ephemeral](kogito-data-index-ephemeral-overrides.yaml)
-- [quay.io/kiegroup/kogito-data-index-mongodb](kogito-data-index-mongodb-overrides.yaml)
-- [quay.io/kiegroup/kogito-data-index-oracle](kogito-data-index-oracle-overrides.yaml)
-- [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-overrides.yaml)
-- [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-overrides.yaml)
-- [quay.io/kiegroup/kogito-trusty-redis](kogito-trusty-redis-overrides.yaml)
-- [quay.io/kiegroup/kogito-trusty-postgresql](kogito-trusty-postgresql-overrides.yaml)
-- [quay.io/kiegroup/kogito-explainability](kogito-explainability-overrides.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-overrides.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-infinispan](kogito-jobs-service-infinispan-overrides.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-mongodb](kogito-jobs-service-mongodb-overrides.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-overrides.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-overrides.yaml) 
-- [quay.io/kiegroup/kogito-management-console](kogito-management-console-overrides.yaml)
-- [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-overrides.yaml)
-- [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-overrides.yaml)
-- [quay.io/kiegroup/kogito-runtime-jvm](kogito-runtime-jvm-overrides.yaml)
-- [quay.io/kiegroup/kogito-runtime-native](kogito-runtime-native-overrides.yaml)
-- [quay.io/kiegroup/kogito-s2i-builder](kogito-s2i-builder-overrides.yaml)
+For each image, we use a specific *-image.yaml file.
+Please inspect the image files to learn which modules are being installed on each image:
+
+- [quay.io/kiegroup/kogito-data-index-infinispan](kogito-data-index-infinispan-image.yaml)
+- [quay.io/kiegroup/kogito-data-index-ephemeral](kogito-data-index-ephemeral-image.yaml)
+- [quay.io/kiegroup/kogito-data-index-mongodb](kogito-data-index-mongodb-image.yaml)
+- [quay.io/kiegroup/kogito-data-index-oracle](kogito-data-index-oracle-image.yaml)
+- [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml)
+- [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-image.yaml)
+- [quay.io/kiegroup/kogito-trusty-redis](kogito-trusty-redis-image.yaml)
+- [quay.io/kiegroup/kogito-trusty-postgresql](kogito-trusty-postgresql-image.yaml)
+- [quay.io/kiegroup/kogito-explainability](kogito-explainability-image.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-infinispan](kogito-jobs-service-infinispan-image.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-mongodb](kogito-jobs-service-mongodb-image.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml) 
+- [quay.io/kiegroup/kogito-management-console](kogito-management-console-image.yaml)
+- [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-image.yaml)
+- [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-image.yaml)
+- [quay.io/kiegroup/kogito-runtime-jvm](kogito-runtime-jvm-image.yaml)
+- [quay.io/kiegroup/kogito-runtime-native](kogito-runtime-native-image.yaml)
+- [quay.io/kiegroup/kogito-s2i-builder](kogito-s2i-builder-image.yaml)
 
 
 ### Testing Images
diff --git a/image.yaml b/image.yaml
deleted file mode 100644
index ca9b5d85c2d..00000000000
--- a/image.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-schema_version: 1
-
-name: "kogito-image-real-name-on-overrides-file"
-version: "2.0.0-snapshot"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-
-labels:
-  - name: "io.openshift.s2i.scripts-url"
-    value: "image:///usr/local/s2i"
-  - name: "io.openshift.s2i.destination"
-    value: "/tmp"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-  - name: "io.quarkus.platform.version"
-    value: "2.16.7.Final"
-  - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
-
-modules:
-  repositories:
-    - path: modules
-
-envs:
-  - name: "KOGITO_VERSION"
-    value: "2.0.0-SNAPSHOT"
-    description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
-  - name: "QUARKUS_PLATFORM_VERSION"
-    value: "2.16.7.Final"
-    description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
-
-packages:
-  manager: microdnf
-
-run:
-  user: 1001
diff --git a/kogito-base-builder-overrides.yaml b/kogito-base-builder-overrides.yaml
deleted file mode 100644
index 777fc15a2d8..00000000000
--- a/kogito-base-builder-overrides.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-base-builder"
-description: "Image with JDK and Maven, used as a base image"
-
-labels:
-  - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
-  - name: "io.k8s.description"
-    value: "Platform for building Kogito based on JDK and Maven"
-  - name: "io.k8s.display-name"
-    value: "Kogito based on JDK and Maven"
-  - name: "io.openshift.tags"
-    value: "base-builder,kogito"
-
-modules:
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "11"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.maven
-      version: "3.8.6"
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
diff --git a/kogito-data-index-ephemeral-overrides.yaml b/kogito-data-index-ephemeral-image.yaml
similarity index 88%
rename from kogito-data-index-ephemeral-overrides.yaml
rename to kogito-data-index-ephemeral-image.yaml
index c629aec1bc2..d8ef86070b7 100644
--- a/kogito-data-index-ephemeral-overrides.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-ephemeral"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -23,10 +27,12 @@ envs:
     value: "http-events-support"
     description: "Allows to change the event connection type. The possible values are :`kafka-events-support` or `http-events-support`(default)"
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -39,6 +45,9 @@ modules:
     - name: org.kie.kogito.dataindex.common
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-data-index-infinispan-overrides.yaml b/kogito-data-index-infinispan-image.yaml
similarity index 91%
rename from kogito-data-index-infinispan-overrides.yaml
rename to kogito-data-index-infinispan-image.yaml
index fdbb1417fb2..75335c199a8 100644
--- a/kogito-data-index-infinispan-overrides.yaml
+++ b/kogito-data-index-infinispan-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-infinispan"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -38,10 +42,12 @@ envs:
     example: "COOLGSSAPI"
     description: "Sets SASL mechanism used by authentication"
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -54,6 +60,9 @@ modules:
     - name: org.kie.kogito.dataindex.common
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-data-index-mongodb-overrides.yaml b/kogito-data-index-mongodb-image.yaml
similarity index 86%
rename from kogito-data-index-mongodb-overrides.yaml
rename to kogito-data-index-mongodb-image.yaml
index cdc06602fb7..58e006edc86 100644
--- a/kogito-data-index-mongodb-overrides.yaml
+++ b/kogito-data-index-mongodb-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-mongodb"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -19,10 +23,13 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-ports:
-  - value: 8080
+
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -35,6 +42,9 @@ modules:
     - name: org.kie.kogito.dataindex.common
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-data-index-oracle-overrides.yaml b/kogito-data-index-oracle-image.yaml
similarity index 86%
rename from kogito-data-index-oracle-overrides.yaml
rename to kogito-data-index-oracle-image.yaml
index 6432f60ae92..1ab7c158403 100644
--- a/kogito-data-index-oracle-overrides.yaml
+++ b/kogito-data-index-oracle-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-oracle"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -19,10 +23,13 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-ports:
-  - value: 8080
+
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -35,6 +42,9 @@ modules:
     - name: org.kie.kogito.dataindex.common
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-data-index-postgresql-overrides.yaml b/kogito-data-index-postgresql-image.yaml
similarity index 86%
rename from kogito-data-index-postgresql-overrides.yaml
rename to kogito-data-index-postgresql-image.yaml
index f0e924a483c..e1b417d8be3 100644
--- a/kogito-data-index-postgresql-overrides.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-postgresql"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -19,10 +23,16 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
+
+packages:
+  manager: microdnf
+
 ports:
   - value: 8080
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
diff --git a/kogito-explainability-overrides.yaml b/kogito-explainability-image.yaml
similarity index 86%
rename from kogito-explainability-overrides.yaml
rename to kogito-explainability-image.yaml
index 2f086172092..a5c427d9d33 100644
--- a/kogito-explainability-overrides.yaml
+++ b/kogito-explainability-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-explainability"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Explainability Service"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -22,10 +26,13 @@ envs:
   - name: "EXPLAINABILITY_COMMUNICATION"
     example: "REST"
     description: "Defines which kind of communication should be used by the Explainability Container: rest api or kafka events."
-ports:
-  - value: 8080
+
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -37,6 +44,9 @@ modules:
     - name: org.kie.kogito.explainability
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-jit-runner-overrides.yaml b/kogito-jit-runner-image.yaml
similarity index 84%
rename from kogito-jit-runner-overrides.yaml
rename to kogito-jit-runner-image.yaml
index b44a38886f1..e54461bf4a0 100644
--- a/kogito-jit-runner-overrides.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jit-runner"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito JIT Runner"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -20,10 +24,12 @@ envs:
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -35,6 +41,9 @@ modules:
     - name: org.kie.kogito.jit-runner
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-jobs-service-allinone-overrides.yaml b/kogito-jobs-service-allinone-image.yaml
similarity index 89%
rename from kogito-jobs-service-allinone-overrides.yaml
rename to kogito-jobs-service-allinone-image.yaml
index 72311696201..f8807d0dded 100644
--- a/kogito-jobs-service-allinone-overrides.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-allinone"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -26,10 +30,12 @@ envs:
     example: "mongodb"
     description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral, postgresql, mongodb and infinispan, if empty, defaults to ephemeral"
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -42,6 +48,9 @@ modules:
     - name: org.kie.kogito.security.custom.truststores
     - name: org.kie.kogito.jobs.service.common
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-jobs-service-ephemeral-overrides.yaml b/kogito-jobs-service-ephemeral-image.yaml
similarity index 87%
rename from kogito-jobs-service-ephemeral-overrides.yaml
rename to kogito-jobs-service-ephemeral-image.yaml
index c9cdf94a660..edd129de21a 100644
--- a/kogito-jobs-service-ephemeral-overrides.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito in memory Jobs Service"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -23,10 +27,12 @@ envs:
     example: "true"
     description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -39,6 +45,9 @@ modules:
     - name: org.kie.kogito.security.custom.truststores
     - name: org.kie.kogito.jobs.service.common
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-jobs-service-infinispan-overrides.yaml b/kogito-jobs-service-infinispan-image.yaml
similarity index 87%
rename from kogito-jobs-service-infinispan-overrides.yaml
rename to kogito-jobs-service-infinispan-image.yaml
index ab4f4fc688e..016865ee680 100644
--- a/kogito-jobs-service-infinispan-overrides.yaml
+++ b/kogito-jobs-service-infinispan-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-infinispan"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Jobs Service based on Infinispan"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -23,10 +27,12 @@ envs:
     example: "true"
     description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -39,6 +45,9 @@ modules:
     - name: org.kie.kogito.security.custom.truststores
     - name: org.kie.kogito.jobs.service.common
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-jobs-service-mongodb-overrides.yaml b/kogito-jobs-service-mongodb-image.yaml
similarity index 87%
rename from kogito-jobs-service-mongodb-overrides.yaml
rename to kogito-jobs-service-mongodb-image.yaml
index 05390eaf78b..0e05ac87234 100644
--- a/kogito-jobs-service-mongodb-overrides.yaml
+++ b/kogito-jobs-service-mongodb-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-mongodb"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Jobs Service based on MongoDB"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -23,10 +27,12 @@ envs:
     example: "true"
     description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -39,6 +45,9 @@ modules:
     - name: org.kie.kogito.security.custom.truststores
     - name: org.kie.kogito.jobs.service.common
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-jobs-service-postgresql-overrides.yaml b/kogito-jobs-service-postgresql-image.yaml
similarity index 87%
rename from kogito-jobs-service-postgresql-overrides.yaml
rename to kogito-jobs-service-postgresql-image.yaml
index d0f20163cef..f24afbdfc69 100644
--- a/kogito-jobs-service-postgresql-overrides.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Jobs Service based on Postgresql"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -23,10 +27,12 @@ envs:
     example: "true"
     description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -39,6 +45,9 @@ modules:
     - name: org.kie.kogito.security.custom.truststores
     - name: org.kie.kogito.jobs.service.common
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-management-console-overrides.yaml b/kogito-management-console-image.yaml
similarity index 87%
rename from kogito-management-console-overrides.yaml
rename to kogito-management-console-image.yaml
index 5b0b0f68308..21e8762af28 100644
--- a/kogito-management-console-overrides.yaml
+++ b/kogito-management-console-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-management-console"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Management Console"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -23,10 +27,12 @@ envs:
     example: "http://data-index.service:8080"
     description: "Data Index service address, defaults to http://localhost:8180."
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -38,6 +44,9 @@ modules:
     - name: org.kie.kogito.management.console
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-runtime-jvm-overrides.yaml b/kogito-runtime-jvm-image.yaml
similarity index 75%
rename from kogito-runtime-jvm-overrides.yaml
rename to kogito-runtime-jvm-image.yaml
index 835c32e0e14..f56cdee0a75 100644
--- a/kogito-runtime-jvm-overrides.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -1,9 +1,21 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-runtime-jvm"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito based on Quarkus or Springboot JVM image"
 
 labels:
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
+  - name: "io.quarkus.platform.version"
+    value: "2.16.7.Final"
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -26,10 +38,12 @@ envs:
     example: "-Dquarkus.log.level=DEBUG"
     description: JVM options passed to the Java command.
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -38,11 +52,14 @@ modules:
     - name: org.kie.kogito.openjdk
       version: "11-headless"
     - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.runtime.jvm
     - name: org.kie.kogito.security.custom.truststores
 
-## s2i build . quay.io/kiegroup/kogito-s2i-builder:latest kogitotest:10.0 --runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-## where "." is the sources dir, ie: /home/user/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
+  user: 1001
diff --git a/kogito-runtime-native-overrides.yaml b/kogito-runtime-native-image.yaml
similarity index 72%
rename from kogito-runtime-native-overrides.yaml
rename to kogito-runtime-native-image.yaml
index e1a35bb3e37..9646b2eeb79 100644
--- a/kogito-runtime-native-overrides.yaml
+++ b/kogito-runtime-native-image.yaml
@@ -1,9 +1,21 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-runtime-native"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito based on Quarkus native image"
 
 labels:
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
+  - name: "io.quarkus.platform.version"
+    value: "2.16.7.Final"
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -26,20 +38,25 @@ envs:
     example: "true"
     description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.runtime.native
 
-## s2i build . quay.io/kiegroup/kogito-s2i-builder:latest kogitotest:10.0 -e RUNTIME_TYPE=quarkus -e NATIVE=true --runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-## where "." is the sources dir, ie: /home/user/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
+  user: 1001
 
diff --git a/kogito-s2i-builder-overrides.yaml b/kogito-s2i-builder-image.yaml
similarity index 81%
rename from kogito-s2i-builder-overrides.yaml
rename to kogito-s2i-builder-image.yaml
index cf2d6099e80..042689f1629 100644
--- a/kogito-s2i-builder-overrides.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -1,9 +1,21 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-s2i-builder"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Platform for building Kogito based on Quarkus or Springboot"
 
 labels:
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
+  - name: "io.quarkus.platform.version"
+    value: "2.16.7.Final"
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -33,10 +45,18 @@ envs:
     example: mymodule/target
     description: Path to target/ where the jar files are created for multi-module builds
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
+  install:
+    - bc
+    - gcc
+    - gcc-c++
+    - glibc-devel
+    - zlib-devel
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -50,16 +70,13 @@ modules:
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
       version: "3.8.6"
+    - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.s2i.builder
 
-packages:
-  install:
-    - bc
-    - gcc
-    - gcc-c++
-    - glibc-devel
-    - zlib-devel
+ports:
+  - value: 8080
 
 run:
   workdir: "/home/kogito"
+  user: 1001
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
new file mode 100644
index 00000000000..9f15b3b1fa1
--- /dev/null
+++ b/kogito-swf-builder-image.yaml
@@ -0,0 +1,70 @@
+  - name: builder
+    from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+    version: "2.0.0-snapshot"
+    modules:
+      repositories:
+        - path: modules
+      install:
+        - name: org.kie.kogito.image.dependencies
+        - name: org.kie.kogito.system.user
+        - name: org.kie.kogito.logging
+        - name: org.kie.kogito.launch.scripts
+        - name: org.kie.kogito.openjdk
+          version: "11"
+        - name: org.kie.kogito.dynamic.resources
+        - name: org.kie.kogito.maven
+          version: "3.8.6"
+        - name: org.kie.kogito.project.versions
+        - name: org.kie.kogito.swf.common.scripts
+        - name: org.kie.kogito.swf.builder.build-config
+        - name: org.kie.kogito.swf.common.build
+
+    packages:
+      manager: microdnf
+
+  - name: "quay.io/kiegroup/kogito-swf-builder"
+    from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+    version: "2.0.0-snapshot"
+    description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
+
+    labels:
+      - name: "io.openshift.s2i.scripts-url"
+        value: "image:///usr/local/s2i"
+      - name: "io.openshift.s2i.destination"
+        value: "/tmp"
+      - name: "io.quarkus.platform.version"
+        value: "2.16.7.Final"
+      - name: "org.kie.kogito.version"
+        value: "2.0.0-SNAPSHOT"
+      - name: "maintainer"
+        value: "kogito <bsig-cloud@redhat.com>"
+      - name: "io.k8s.description"
+        value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled."
+      - name: "io.k8s.display-name"
+        value: "Kogito SWF Builder"
+      - name: "io.openshift.tags"
+        value: "kogito,builder,serverless,workflow"
+
+    packages:
+      manager: microdnf
+
+    modules:
+      repositories:
+        - path: modules
+      install:
+        - name: org.kie.kogito.image.dependencies
+        - name: org.kie.kogito.system.user
+        - name: org.kie.kogito.logging
+        - name: org.kie.kogito.launch.scripts
+        - name: org.kie.kogito.openjdk
+          version: "11"
+        - name: org.kie.kogito.dynamic.resources
+        - name: org.kie.kogito.maven
+          version: "3.8.6"
+        - name: org.kie.kogito.project.versions
+        - name: org.kie.kogito.swf.common.scripts
+        - name: org.kie.kogito.swf.builder.runtime
+
+    run:
+      workdir: "/home/kogito"
+      user: 1001
diff --git a/kogito-swf-builder-overrides.yaml b/kogito-swf-builder-overrides.yaml
deleted file mode 100644
index dfc8fba9a7a..00000000000
--- a/kogito-swf-builder-overrides.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-swf-builder"
-description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
-
-modules:
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "11"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.maven
-      version: "3.8.6"
-    - name: org.kie.kogito.swf.common
-    - name: org.kie.kogito.swf.builder
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
new file mode 100644
index 00000000000..65b9cf49f5d
--- /dev/null
+++ b/kogito-swf-devmode-image.yaml
@@ -0,0 +1,74 @@
+  - name: builder
+    from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+    version: "2.0.0-snapshot"
+    modules:
+      repositories:
+        - path: modules
+      install:
+        - name: org.kie.kogito.image.dependencies
+        - name: org.kie.kogito.system.user
+        - name: org.kie.kogito.logging
+        - name: org.kie.kogito.launch.scripts
+        - name: org.kie.kogito.openjdk
+          version: "11"
+        - name: org.kie.kogito.dynamic.resources
+        - name: org.kie.kogito.maven
+          version: "3.8.6"
+        - name: org.kie.kogito.project.versions
+        - name: org.kie.kogito.swf.common.scripts
+        - name: org.kie.kogito.swf.devmode.build-config
+        - name: org.kie.kogito.swf.common.build
+
+    packages:
+      manager: microdnf
+
+  - name: "quay.io/kiegroup/kogito-swf-devmode"
+    from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+    version: "2.0.0-snapshot"
+    description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
+
+    labels:
+      - name: "io.quarkus.platform.version"
+        value: "2.16.7.Final"
+      - name: "org.kie.kogito.version"
+        value: "2.0.0-SNAPSHOT"
+      - name: "maintainer"
+        value: "kogito <bsig-cloud@redhat.com>"
+      - name: "io.k8s.description"
+        value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled."
+      - name: "io.k8s.display-name"
+        value: "Kogito SWF Builder"
+      - name: "io.openshift.tags"
+        value: "kogito,development,serverless,workflow"
+      - name: "io.openshift.expose-services"
+        value: "8080:http,5005:http"
+
+    packages:
+      manager: microdnf
+
+    modules:
+      repositories:
+        - path: modules
+      install:
+        - name: org.kie.kogito.image.dependencies
+        - name: org.kie.kogito.system.user
+        - name: org.kie.kogito.logging
+        - name: org.kie.kogito.launch.scripts
+        - name: org.kie.kogito.openjdk
+          version: "11"
+        - name: org.kie.kogito.dynamic.resources
+        - name: org.kie.kogito.maven
+          version: "3.8.6"
+        - name: org.kie.kogito.project.versions
+        - name: org.kie.kogito.swf.common.scripts
+        - name: org.kie.kogito.swf.devmode.runtime
+
+    ports:
+      - value: 8080
+      - value: 5005
+
+    run:
+      workdir: "/home/kogito"
+      user: 1001
+      cmd:
+        - "/home/kogito/launch/run-app-devmode.sh"
diff --git a/kogito-swf-devmode-overrides.yaml b/kogito-swf-devmode-overrides.yaml
deleted file mode 100644
index edcc7c07241..00000000000
--- a/kogito-swf-devmode-overrides.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-swf-devmode"
-description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
-
-modules:
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "11"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.maven
-      version: "3.8.6"
-    - name: org.kie.kogito.swf.common
-    - name: org.kie.kogito.swf.devmode
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd: 
-    - "/home/kogito/launch/run-app-devmode.sh"
-
-ports:
-  - value: 8080
-  - value: 5005
diff --git a/kogito-task-console-overrides.yaml b/kogito-task-console-image.yaml
similarity index 86%
rename from kogito-task-console-overrides.yaml
rename to kogito-task-console-image.yaml
index 8f5bb150397..bca64292ad1 100644
--- a/kogito-task-console-overrides.yaml
+++ b/kogito-task-console-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-task-console"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Task Console"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -23,10 +27,12 @@ envs:
     example: "http://data-index.service:8080"
     description: "Data Index service address, defaults to http://localhost:8180."
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -38,6 +44,9 @@ modules:
     - name: org.kie.kogito.task.console
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-trusty-infinispan-overrides.yaml b/kogito-trusty-infinispan-image.yaml
similarity index 91%
rename from kogito-trusty-infinispan-overrides.yaml
rename to kogito-trusty-infinispan-image.yaml
index 017cb84ffb9..59aa0424486 100644
--- a/kogito-trusty-infinispan-overrides.yaml
+++ b/kogito-trusty-infinispan-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-infinispan"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -38,10 +42,12 @@ envs:
     example: "COOLGSSAPI"
     description: "Sets SASL mechanism used by authentication"
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -54,6 +60,9 @@ modules:
     - name: org.kie.kogito.trusty.common
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-trusty-postgresql-overrides.yaml b/kogito-trusty-postgresql-image.yaml
similarity index 86%
rename from kogito-trusty-postgresql-overrides.yaml
rename to kogito-trusty-postgresql-image.yaml
index c99a670a05a..f55f14992be 100644
--- a/kogito-trusty-postgresql-overrides.yaml
+++ b/kogito-trusty-postgresql-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-postgresql"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -19,10 +23,13 @@ envs:
   - name: "SCRIPT_DEBUG"
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-ports:
-  - value: 8080
+
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -35,6 +42,9 @@ modules:
     - name: org.kie.kogito.trusty.common
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-trusty-redis-overrides.yaml b/kogito-trusty-redis-image.yaml
similarity index 87%
rename from kogito-trusty-redis-overrides.yaml
rename to kogito-trusty-redis-image.yaml
index bbde66b9e0f..9e2815f2580 100644
--- a/kogito-trusty-redis-overrides.yaml
+++ b/kogito-trusty-redis-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-redis"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Trusty Service for Redis persistence provider"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -22,10 +26,13 @@ envs:
   - name: "KOGITO_PERSISTENCE_REDIS_URL"
     example: "http://localhost:6379"
     description: "The URL of the RediSearch cluster."
-ports:
-  - value: 8080
+
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -38,6 +45,9 @@ modules:
     - name: org.kie.kogito.trusty.common
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/kogito-trusty-ui-overrides.yaml b/kogito-trusty-ui-image.yaml
similarity index 86%
rename from kogito-trusty-ui-overrides.yaml
rename to kogito-trusty-ui-image.yaml
index 164ce9a088d..543c019906d 100644
--- a/kogito-trusty-ui-overrides.yaml
+++ b/kogito-trusty-ui-image.yaml
@@ -1,9 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-ui"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Trusty UI"
 
 labels:
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
     value: "kogito <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
@@ -23,10 +27,12 @@ envs:
     example: "http://trusty.service:8080"
     description: "Trusty service address, defaults to http://localhost:8180."
 
-ports:
-  - value: 8080
+packages:
+  manager: microdnf
 
 modules:
+  repositories:
+    - path: modules
   install:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
@@ -38,6 +44,9 @@ modules:
     - name: org.kie.kogito.trusty.ui
     - name: org.kie.kogito.security.custom.truststores
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/logic-data-index-ephemeral-rhel8-overrides.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
similarity index 91%
rename from logic-data-index-ephemeral-rhel8-overrides.yaml
rename to logic-data-index-ephemeral-rhel8-image.yaml
index 1c69363bd9e..949614930ef 100644
--- a/logic-data-index-ephemeral-rhel8-overrides.yaml
+++ b/logic-data-index-ephemeral-rhel8-image.yaml
@@ -2,6 +2,7 @@ schema_version: 1
 
 name: "openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8"
 version: "1.29.0"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
@@ -15,6 +16,8 @@ labels:
   value: "logic-data-index,kogito,data-index,data-index-ephemeral"
 - name: "io.openshift.expose-services"
   value: "8080:http"
+- name: "org.kie.kogito.version"
+  value: "2.0.0-SNAPSHOT"
 
 envs:
   - name: "SCRIPT_DEBUG"
@@ -23,10 +26,10 @@ envs:
   - name: "KOGITO_DATA_INDEX_QUARKUS_PROFILE"
     value: "http-events-support"
     description: "Allows to change the event connection type. The possible values are :`kafka-events-support` or `http-events-support`(default)"
-ports:
-- value: 8080
 
 modules:
+  repositories:
+    - path: modules
   install:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
@@ -42,6 +45,7 @@ modules:
   - name: org.kie.kogito.pkg-update
 
 packages:
+  manager: microdnf
   content_sets_file: content_sets.yaml
 
 osbs:
@@ -58,6 +62,9 @@ osbs:
     name: containers/openshift-serverless-1-logic-data-index-ephemeral
     branch: openshift-serverless-1.29-rhel-8
 
+ports:
+  - value: 8080
+
 run:
   workdir: "/home/kogito"
   user: 1001
diff --git a/modules/kogito-epel/7/module.yaml b/modules/kogito-epel/7/module.yaml
index 30be99b5314..8354aa9d94d 100644
--- a/modules/kogito-epel/7/module.yaml
+++ b/modules/kogito-epel/7/module.yaml
@@ -3,4 +3,4 @@ name: org.kie.kogito.epel
 version: "7"
 
 execute:
-  - script: configure.sh
\ No newline at end of file
+  - script: configure.sh
diff --git a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
index b4bbab16d65..b303983fffd 100644
--- a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
@@ -14,12 +14,12 @@ envs:
     value: "8"
 
 artifacts:
-- name: graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
-  md5: 1bde5d9638c13c5b50e7628eb045b6f7
-- name: native-image-installable-svm-java8-linux-amd64-20.2.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java8-linux-amd64-20.2.0.jar
-  md5: 7b41bbd2c7ba5e731167348df31765d5
+  - name: graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
+    md5: 1bde5d9638c13c5b50e7628eb045b6f7
+  - name: native-image-installable-svm-java8-linux-amd64-20.2.0.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java8-linux-amd64-20.2.0.jar
+    md5: 7b41bbd2c7ba5e731167348df31765d5
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
index 386698de769..0e7ece6254e 100644
--- a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
@@ -14,12 +14,12 @@ envs:
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
-  md5: 17669cb10b439c0522b4d56a6b277e85
-- name: native-image-installable-svm-java11-linux-amd64-20.2.0.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java11-linux-amd64-20.2.0.jar
-  md5: 574dc13cde215d1098f349a07b0e6592
+  - name: graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
+    md5: 17669cb10b439c0522b4d56a6b277e85
+  - name: native-image-installable-svm-java11-linux-amd64-20.2.0.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java11-linux-amd64-20.2.0.jar
+    md5: 574dc13cde215d1098f349a07b0e6592
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
index 01bc632bbbf..11755a670a6 100644
--- a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
@@ -14,12 +14,12 @@ envs:
     value: "11"
 
 artifacts:
-- name: graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
-  md5: 6dee8a2f8c81c974f8a7d782c4d78b81
-- name: native-image-installable-svm-java11-linux-amd64-21.3.1.jar
-  url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/native-image-installable-svm-java11-linux-amd64-21.3.1.jar
-  md5: aa5a819fba0fbaeea7d77e989f53fdc5
+  - name: graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
+    md5: 6dee8a2f8c81c974f8a7d782c4d78b81
+  - name: native-image-installable-svm-java11-linux-amd64-21.3.1.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/native-image-installable-svm-java11-linux-amd64-21.3.1.jar
+    md5: aa5a819fba0fbaeea7d77e989f53fdc5
 
 execute:
-- script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
index 4ec5fad80bb..e4a777d79d5 100644
--- a/modules/kogito-maven/3.8.x-rpm/module.yaml
+++ b/modules/kogito-maven/3.8.x-rpm/module.yaml
@@ -82,4 +82,4 @@ packages:
 
 
 execute:
-  - script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index e9d8f571447..0e19e6d46b1 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -78,4 +78,4 @@ artifacts:
     md5: 0e07de4a7b5c84ebed737a2002f52019
 
 execute:
-  - script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-maven/maven-dnf-module/module.yaml b/modules/kogito-maven/maven-dnf-module/module.yaml
index 2a9f15e117d..e3fde534b31 100644
--- a/modules/kogito-maven/maven-dnf-module/module.yaml
+++ b/modules/kogito-maven/maven-dnf-module/module.yaml
@@ -1,8 +1,7 @@
 schema_version: 1
 name: org.kie.kogito.maven.dnf.module
 version: "3.8"
-description: ^
-  Enables the AppStream RPM Module for Maven 3.8 packages.
+description: Enables the AppStream RPM Module for Maven 3.8 packages.
 
 execute:
-  - script: configure
\ No newline at end of file
+  - script: configure
diff --git a/modules/kogito-openjdk/1.8.0-headless/module.yaml b/modules/kogito-openjdk/1.8.0-headless/module.yaml
index 1747f223366..ea9cbd7451b 100644
--- a/modules/kogito-openjdk/1.8.0-headless/module.yaml
+++ b/modules/kogito-openjdk/1.8.0-headless/module.yaml
@@ -22,4 +22,4 @@ envs:
 
 packages:
   install:
-  - java-1.8.0-openjdk-headless
\ No newline at end of file
+    - java-1.8.0-openjdk-headless
diff --git a/modules/kogito-openjdk/1.8.0/module.yaml b/modules/kogito-openjdk/1.8.0/module.yaml
index 5687dda4c2e..575fc8184e6 100644
--- a/modules/kogito-openjdk/1.8.0/module.yaml
+++ b/modules/kogito-openjdk/1.8.0/module.yaml
@@ -25,5 +25,5 @@ execute:
 
 packages:
   install:
-  - java-1.8.0-openjdk-devel
+    - java-1.8.0-openjdk-devel
 
diff --git a/modules/kogito-openjdk/11-headless/module.yaml b/modules/kogito-openjdk/11-headless/module.yaml
index ebfb5f79e90..be734f40357 100644
--- a/modules/kogito-openjdk/11-headless/module.yaml
+++ b/modules/kogito-openjdk/11-headless/module.yaml
@@ -22,4 +22,4 @@ envs:
 
 packages:
   install:
-  - java-11-openjdk-headless
\ No newline at end of file
+    - java-11-openjdk-headless
diff --git a/modules/kogito-openjdk/11/module.yaml b/modules/kogito-openjdk/11/module.yaml
index c57600c3ee8..4a1c377e2f7 100644
--- a/modules/kogito-openjdk/11/module.yaml
+++ b/modules/kogito-openjdk/11/module.yaml
@@ -25,5 +25,5 @@ execute:
 
 packages:
   install:
-  - java-11-openjdk-devel
+    - java-11-openjdk-devel
 
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
new file mode 100644
index 00000000000..382ff1336df
--- /dev/null
+++ b/modules/kogito-project-versions/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: org.kie.kogito.project.versions
+version: "2.0.0-snapshot"
+description: "Kogito Project versions information"
+
+envs:
+  - name: "KOGITO_VERSION"
+    value: "2.0.0-SNAPSHOT"
+    description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
+  - name: "QUARKUS_PLATFORM_VERSION"
+    value: "2.16.7.Final"
+    description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
new file mode 100644
index 00000000000..b621011448d
--- /dev/null
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -0,0 +1,10 @@
+schema_version: 1
+name: org.kie.kogito.swf.builder.build-config
+version: "2.0.0-snapshot"
+description: "Kogito Serverless Workflow builder image build configuration"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    value: "true"
+  - name: QUARKUS_EXTENSIONS
+    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health
diff --git a/modules/kogito-swf/builder/runtime/configure.sh b/modules/kogito-swf/builder/runtime/configure.sh
new file mode 100644
index 00000000000..0f0bc8e916c
--- /dev/null
+++ b/modules/kogito-swf/builder/runtime/configure.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+
+mkdir -p "${KOGITO_HOME}"/.m2/repository
+
+# Unzip Quarkus app and Maven repository
+unzip "${SOURCES_DIR}"/kogito-swf-quarkus-app.zip -d "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/kogito-swf-maven-repo.zip -d "${KOGITO_HOME}"/.m2/repository
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/builder/runtime/module.yaml b/modules/kogito-swf/builder/runtime/module.yaml
new file mode 100644
index 00000000000..243e349362c
--- /dev/null
+++ b/modules/kogito-swf/builder/runtime/module.yaml
@@ -0,0 +1,13 @@
+schema_version: 1
+name: org.kie.kogito.swf.builder.runtime
+version: "2.0.0-snapshot"
+description: "Kogito Serverless Workflow builder runtime module"
+
+artifacts:
+  - image: builder
+    path: /home/kogito/build_output/kogito-swf-quarkus-app.zip
+  - image: builder
+    path: /home/kogito/build_output/kogito-swf-maven-repo.zip
+
+execute:
+  - script: configure.sh
diff --git a/modules/kogito-swf/common/build/added/cleanup_project.sh b/modules/kogito-swf/common/build/added/cleanup_project.sh
new file mode 100755
index 00000000000..2a2309248b7
--- /dev/null
+++ b/modules/kogito-swf/common/build/added/cleanup_project.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+
+#remove unnecessary files
+echo 'Clean unnecessary files'
+rm -rfv "${PROJECT_ARTIFACT_ID}"/target
+rm -rfv "${PROJECT_ARTIFACT_ID}"/src/main/resources/*
+rm -rfv "${PROJECT_ARTIFACT_ID}"/src/main/docker
+rm -rfv "${PROJECT_ARTIFACT_ID}"/.mvn/wrapper
+rm -rfv "${PROJECT_ARTIFACT_ID}"/mvnw*
+rm -rfv "${PROJECT_ARTIFACT_ID}"/src/test
+rm -rfv "${PROJECT_ARTIFACT_ID}"/*.bak
+
+# Maven useless files
+# Needed to avoid Maven to automatically re-download from original Maven repository ...
+echo 'Clean Maven useless files'
+find "${KOGITO_HOME}"/.m2/repository -name _remote.repositories -type f -delete
+find "${KOGITO_HOME}"/.m2/repository -name _maven.repositories -type f -delete
+find "${KOGITO_HOME}"/.m2/repository -name *.lastUpdated -type f -delete
\ No newline at end of file
diff --git a/modules/kogito-swf/common/build/added/zip_files.sh b/modules/kogito-swf/common/build/added/zip_files.sh
new file mode 100755
index 00000000000..f6ef2559cd9
--- /dev/null
+++ b/modules/kogito-swf/common/build/added/zip_files.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -e
+
+BUILD_OUTPUT="${KOGITO_HOME}"/build_output/
+
+mkdir -p "${BUILD_OUTPUT}"
+
+echo "Zip and copy scaffold project"
+zip -r kogito-swf-quarkus-app.zip "${PROJECT_ARTIFACT_ID}"/ 
+cp -v kogito-swf-quarkus-app.zip "${BUILD_OUTPUT}"
+
+echo "Zip and copy maven repo"
+cd "${KOGITO_HOME}"/.m2/repository/
+zip -r kogito-swf-maven-repo.zip *
+cp -v kogito-swf-maven-repo.zip "${BUILD_OUTPUT}"
\ No newline at end of file
diff --git a/modules/kogito-swf/common/build/configure.sh b/modules/kogito-swf/common/build/configure.sh
new file mode 100644
index 00000000000..30c62f5ea1b
--- /dev/null
+++ b/modules/kogito-swf/common/build/configure.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ADDED_DIR="${SCRIPT_DIR}"/added
+LAUNCH_DIR="${KOGITO_HOME}"/launch
+BUILD_DIR="${KOGITO_HOME}"/build
+
+mkdir -p "${BUILD_DIR}"
+cp -v "${ADDED_DIR}"/* "${BUILD_DIR}"
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
+
+cd "${KOGITO_HOME}"
+
+# Create app
+"${LAUNCH_DIR}"/create-app.sh
+
+"${BUILD_DIR}"/cleanup_project.sh
+"${BUILD_DIR}"/zip_files.sh
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
\ No newline at end of file
diff --git a/modules/kogito-swf/common/build/module.yaml b/modules/kogito-swf/common/build/module.yaml
new file mode 100644
index 00000000000..ad782c42a84
--- /dev/null
+++ b/modules/kogito-swf/common/build/module.yaml
@@ -0,0 +1,11 @@
+schema_version: 1
+name: org.kie.kogito.swf.common.build
+version: "2.0.0-snapshot"
+description: "Kogito Serverless Workflow image build process"
+
+packages:
+  install:
+    - zip
+
+execute:
+  - script: configure.sh
diff --git a/modules/kogito-swf/common/module.yaml b/modules/kogito-swf/common/module.yaml
deleted file mode 100644
index a4fdb004e0a..00000000000
--- a/modules/kogito-swf/common/module.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.swf.common
-version: "2.0.0-snapshot"
-description: "Kogito Serverless Workflow image common scripts"
-
-envs:
-  - name: QUARKUS_ADD_EXTENSION_ARGS
-    description: To use only if you plan to use the ${KOGITO_HOME}/launch/add-extension.sh
-
-execute:
-  - script: configure.sh
diff --git a/modules/kogito-swf/common/added/add-extension.sh b/modules/kogito-swf/common/scripts/added/add-extension.sh
similarity index 100%
rename from modules/kogito-swf/common/added/add-extension.sh
rename to modules/kogito-swf/common/scripts/added/add-extension.sh
diff --git a/modules/kogito-swf/builder/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
similarity index 95%
rename from modules/kogito-swf/builder/added/build-app.sh
rename to modules/kogito-swf/common/scripts/added/build-app.sh
index da9a0719d5a..be85de00cb7 100755
--- a/modules/kogito-swf/builder/added/build-app.sh
+++ b/modules/kogito-swf/common/scripts/added/build-app.sh
@@ -9,7 +9,6 @@ fi
 
 source "${script_dir_path}"/logging.sh
 
-
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
     export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
@@ -17,15 +16,15 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
-cd "${PROJECT_ARTIFACT_ID}"
-
-source "${script_dir_path}"/configure-jvm-mvn.sh
-
 if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
   log_info "Adding extensions '${QUARKUS_EXTENSIONS}'"
   ${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}"
 fi
 
+cd "${PROJECT_ARTIFACT_ID}"
+
+source "${script_dir_path}"/configure-jvm-mvn.sh
+
 # Copy resources if exists
 SUPPORTED_FILES=(".yaml" ".yml" ".json" ".properties" ".mvn/jvm.config")
 log_info "-> Copying files from ${resources_path}, if any..."
@@ -33,7 +32,7 @@ if [ ! -z "${resources_path}" ]; then
   find "${resources_path}" -regex '.*\.\(yaml\|yml\|json\|properties\)$' -exec cp -v {} src/main/resources/ \;
   find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
 else
-  log_warn "-> Nothing to copy from ${resources_path}"
+  log_warning "-> Nothing to copy from ${resources_path}"
 fi
 
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
diff --git a/modules/kogito-swf/common/added/configure-jvm-mvn.sh b/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh
similarity index 100%
rename from modules/kogito-swf/common/added/configure-jvm-mvn.sh
rename to modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh
diff --git a/modules/kogito-swf/builder/added/create-app.sh b/modules/kogito-swf/common/scripts/added/create-app.sh
similarity index 93%
rename from modules/kogito-swf/builder/added/create-app.sh
rename to modules/kogito-swf/common/scripts/added/create-app.sh
index 97890d31617..be396019a91 100755
--- a/modules/kogito-swf/builder/added/create-app.sh
+++ b/modules/kogito-swf/common/scripts/added/create-app.sh
@@ -14,8 +14,9 @@ fi
 
 source "${script_dir_path}"/configure-jvm-mvn.sh
 
-"${MAVEN_HOME}"/bin/mvn -B -s "${MAVEN_SETTINGS_PATH}" \
+"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
   -nsu \
+  -s "${MAVEN_SETTINGS_PATH}" \
   io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":create ${QUARKUS_CREATE_ARGS} \
   -DprojectGroupId="${PROJECT_GROUP_ID}" \
   -DprojectArtifactId="${PROJECT_ARTIFACT_ID}" \
@@ -25,6 +26,8 @@ source "${script_dir_path}"/configure-jvm-mvn.sh
 
 cd "${PROJECT_ARTIFACT_ID}"
 
+source "${script_dir_path}"/configure-jvm-mvn.sh
+
 # Fix as we cannot rely on Quarkus platform
 # Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented
 if [ ! -z ${KOGITO_VERSION} ]; then
diff --git a/modules/kogito-swf/common/added/jvm-settings.sh b/modules/kogito-swf/common/scripts/added/jvm-settings.sh
similarity index 100%
rename from modules/kogito-swf/common/added/jvm-settings.sh
rename to modules/kogito-swf/common/scripts/added/jvm-settings.sh
diff --git a/modules/kogito-swf/common/configure.sh b/modules/kogito-swf/common/scripts/configure.sh
similarity index 100%
rename from modules/kogito-swf/common/configure.sh
rename to modules/kogito-swf/common/scripts/configure.sh
diff --git a/modules/kogito-swf/builder/module.yaml b/modules/kogito-swf/common/scripts/module.yaml
similarity index 66%
rename from modules/kogito-swf/builder/module.yaml
rename to modules/kogito-swf/common/scripts/module.yaml
index c65580c2177..46b0e37ca22 100644
--- a/modules/kogito-swf/builder/module.yaml
+++ b/modules/kogito-swf/common/scripts/module.yaml
@@ -1,12 +1,13 @@
 schema_version: 1
-name: org.kie.kogito.swf.builder
+name: org.kie.kogito.swf.common.scripts
 version: "2.0.0-snapshot"
-description: "Kogito Serverless Workflow builder with required extensions"
+description: "Kogito Serverless Workflow image common scripts"
 
 envs:
   - name: QUARKUS_EXTENSIONS
     example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
     description: To add extension to your application
+
   - name: PROJECT_GROUP_ID
     value: "org.acme"
     description: Please do not change. To change only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
@@ -19,14 +20,8 @@ envs:
   - name: QUARKUS_CREATE_ARGS
     example: -DnoCode
     description: To use only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
-
-# see build-quarkus-app.sh script, responsible for building those artifacts.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/kogito-swf-builder/kogito-swf-builder-quarkus-app.zip
-    name: kogito-swf-builder-quarkus-app.zip
-  - path: /tmp/build/kogito-swf-builder/kogito-swf-builder-maven-repo.zip
-    name: kogito-swf-builder-maven-repo.zip
+  - name: QUARKUS_ADD_EXTENSION_ARGS
+    description: To use only if you plan to use the ${KOGITO_HOME}/launch/add-extension.sh
 
 execute:
   - script: configure.sh
diff --git a/modules/kogito-swf/common/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
similarity index 86%
rename from modules/kogito-swf/common/tests/bats/kogito-swf-builder-jvm-settings.bats
rename to modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
index ed5697000b9..3c67ff1eccb 100644
--- a/modules/kogito-swf/common/tests/bats/kogito-swf-builder-jvm-settings.bats
+++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
@@ -5,8 +5,8 @@ export HOME="${KOGITO_HOME}"
 export JBOSS_CONTAINER_JAVA_JVM_MODULE=/tmp/container/java/jvm
 mkdir -p "${KOGITO_HOME}"/launch
 mkdir -p "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
-cp $BATS_TEST_DIRNAME/../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-cp -r $BATS_TEST_DIRNAME/../../../../kogito-dynamic-resources/added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
+cp $BATS_TEST_DIRNAME/../../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+cp -r $BATS_TEST_DIRNAME/../../../../../kogito-dynamic-resources/added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
 chmod -R +x "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
 cp $BATS_TEST_DIRNAME/../../added/jvm-settings.sh "${KOGITO_HOME}"/launch/
 
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
new file mode 100644
index 00000000000..1f3dbf63b46
--- /dev/null
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -0,0 +1,10 @@
+schema_version: 1
+name: org.kie.kogito.swf.devmode.build-config
+version: "2.0.0-snapshot"
+description: "Kogito Serverless Workflow devmode image build configuration"
+
+envs:
+  - name: "SCRIPT_DEBUG"
+    value: "true"
+  - name: QUARKUS_EXTENSIONS
+    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory
diff --git a/modules/kogito-swf/devmode/configure.sh b/modules/kogito-swf/devmode/configure.sh
deleted file mode 100644
index 7e62eee7995..00000000000
--- a/modules/kogito-swf/devmode/configure.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SOURCES_DIR=/tmp/artifacts
-ADDED_DIR="${SCRIPT_DIR}"/added
-LAUNCH_DIR="${KOGITO_HOME}"/launch
-
-cp -v "${ADDED_DIR}"/* "${LAUNCH_DIR}"
-
-# Unzip Quarkus app and Maven repository
-unzip "${SOURCES_DIR}"/kogito-swf-devmode-quarkus-app.zip -d "${KOGITO_HOME}"
-unzip "${SOURCES_DIR}"/kogito-swf-devmode-maven-repo.zip -d "${KOGITO_HOME}"/.m2/repository
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/module.yaml b/modules/kogito-swf/devmode/module.yaml
deleted file mode 100644
index e72e43856ab..00000000000
--- a/modules/kogito-swf/devmode/module.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.swf.devmode
-version: "2.0.0-snapshot"
-description: "Kogito Serverless Workflow builder with required extensions"
-
-envs:
-  - name: QUARKUS_EXTENSIONS
-    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files'
-    description: To add extension to your application
-  - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
-    description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
-    value: "false"
-  - name: QUARKUS_DEVSERVICES_ENABLED
-    description: Whether to enable Quarkus Devservices or not. Default to "false" since the Kafka broker needs Docker.
-    value: "false"
-  - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
-    description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
-    value: "false"
-
-# see build-quarkus-app.sh script, responsible for building those artifacts.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/kogito-swf-devmode/kogito-swf-devmode-quarkus-app.zip
-    name: kogito-swf-devmode-quarkus-app.zip
-  - path: /tmp/build/kogito-swf-devmode/kogito-swf-devmode-maven-repo.zip
-    name: kogito-swf-devmode-maven-repo.zip
-
-execute:
-  - script: configure.sh
diff --git a/modules/kogito-swf/devmode/added/run-app-devmode.sh b/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
similarity index 99%
rename from modules/kogito-swf/devmode/added/run-app-devmode.sh
rename to modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
index a62d73382d1..5b8a5fef938 100755
--- a/modules/kogito-swf/devmode/added/run-app-devmode.sh
+++ b/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
@@ -12,16 +12,15 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
-source "${script_dir_path}"/configure-jvm-mvn.sh
-
-cd serverless-workflow-project
-
 offline_param="-o"
 if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
   ${KOGITO_HOME}/launch/add-extension.sh "${QUARKUS_EXTENSIONS}"
   offline_param=""
 fi
 
+cd serverless-workflow-project
+
+source "${script_dir_path}"/configure-jvm-mvn.sh
 
 # `-o` means offline mode
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
diff --git a/modules/kogito-swf/builder/configure.sh b/modules/kogito-swf/devmode/runtime/configure.sh
similarity index 66%
rename from modules/kogito-swf/builder/configure.sh
rename to modules/kogito-swf/devmode/runtime/configure.sh
index 1efc01840fa..b6e41db437f 100644
--- a/modules/kogito-swf/builder/configure.sh
+++ b/modules/kogito-swf/devmode/runtime/configure.sh
@@ -9,8 +9,8 @@ LAUNCH_DIR="${KOGITO_HOME}"/launch
 cp -v "${ADDED_DIR}"/* "${LAUNCH_DIR}"
 
 # Unzip Quarkus app and Maven repository
-unzip "${SOURCES_DIR}"/kogito-swf-builder-quarkus-app.zip -d "${KOGITO_HOME}"
-unzip "${SOURCES_DIR}"/kogito-swf-builder-maven-repo.zip -d "${KOGITO_HOME}"/.m2/repository
+unzip "${SOURCES_DIR}"/kogito-swf-quarkus-app.zip -d "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/kogito-swf-maven-repo.zip -d "${KOGITO_HOME}"/.m2/repository
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/runtime/module.yaml b/modules/kogito-swf/devmode/runtime/module.yaml
new file mode 100644
index 00000000000..b828ea6c48f
--- /dev/null
+++ b/modules/kogito-swf/devmode/runtime/module.yaml
@@ -0,0 +1,24 @@
+schema_version: 1
+name: org.kie.kogito.swf.devmode.runtime
+version: "2.0.0-snapshot"
+description: "Kogito Serverless Workflow devmode with required extensions"
+
+envs:
+  - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
+    description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
+    value: "false"
+  - name: QUARKUS_DEVSERVICES_ENABLED
+    description: Whether to enable Quarkus Devservices or not. Default to "false" since the Kafka broker needs Docker.
+    value: "false"
+  - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
+    description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
+    value: "false"
+
+artifacts:
+  - image: builder
+    path: /home/kogito/build_output/kogito-swf-quarkus-app.zip
+  - image: builder
+    path: /home/kogito/build_output/kogito-swf-maven-repo.zip
+
+execute:
+  - script: configure.sh
diff --git a/rhpam-kogito-builder-rhel8-overrides.yaml b/rhpam-kogito-builder-rhel8-overrides.yaml
deleted file mode 100644
index 3baac36cbfd..00000000000
--- a/rhpam-kogito-builder-rhel8-overrides.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-schema_version: 1
-
-name: "rhpam-7/rhpam-kogito-builder-rhel8"
-version: "7.13.3"
-from: "registry.redhat.io/ubi8/ubi-minimal:latest"
-description: "RHPAM Platform for building Kogito based on Quarkus or SpringBoot"
-
-labels:
-  - name: "com.redhat.component"
-    value: "rhpam-7-kogito-builder-rhel8-container"
-  - name: "io.k8s.description"
-    value: "RHPAM Platform for building Kogito based on Quarkus or Spring Boot"
-  - name: "io.k8s.display-name"
-    value: "Red Hat build of Kogito builder based on Quarkus or SpringBoot"
-  - name: "io.openshift.tags"
-    value: "rhpam-kogito,builder,kogito,quarkus,springboot"
-  - name: "io.openshift.s2i.assemble-input-files"
-    value: "/home/kogito/bin"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "RUNTIME_TYPE"
-    example: "springboot"
-    description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
-  - name: NATIVE
-    value: false
-    description: Not supported on RHPAM Kogito builder image, please refer the documentation.
-  - name: JAVA_OPTIONS
-    example: "-Dquarkus.log.level=DEBUG"
-    description: JVM options passed to the Java command.
-  - name: MAVEN_ARGS_APPEND
-    example: "-pl mymodule -am"
-    description: Additional Maven arguments
-  - name: ARTIFACT_DIR
-    example: mymodule/target
-    description: Path to target/ where the jar files are created for multi-module builds
-
-ports:
-  - value: 8080
-
-modules:
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "11"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.maven
-      version: "3.8-rpm"
-    - name: org.kie.kogito.s2i.core
-    - name: org.kie.kogito.s2i.builder
-    - name: org.kie.kogito.rhpam.prod.profile
-
-packages:
-  content_sets_file: content_sets.yaml
-  install:
-    - bc
-    - gcc
-    - gcc-c++
-    - glibc-devel
-    - zlib-devel
-
-osbs:
-  configuration:
-    container:
-      platforms:
-        only:
-          - x86_64
-          - ppc64le
-      compose:
-        pulp_repos: true
-  extra_dir: osbs-extra/rhpam-kogito-builder-rhel8
-  repository:
-    name: containers/rhpam-7-kogito-builder
-    branch: rhba-7-rhel-8
-
-run:
-  workdir: "/home/kogito"
diff --git a/rhpam-kogito-imagestream.yaml b/rhpam-kogito-imagestream.yaml
deleted file mode 100644
index 934d2a77dca..00000000000
--- a/rhpam-kogito-imagestream.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-kind: ImageStreamList
-apiVersion: v1
-metadata:
-  name: rhpam-kogito-image-streams
-  annotations:
-    description: ImageStream definitions for Red Hat build of Kogito images
-    openshift.io/provider-display-name: Kie Group.
-items:
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: rhpam-kogito-runtime-jvm-rhel8
-      annotations:
-        openshift.io/display-name: RHPAM Runtime image for Kogito based on Quarkus or SpringBoot JVM image
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '7.13.3'
-          annotations:
-            description: RHPAM Runtime image for Kogito based on Quarkus or SpringBoot JVM image
-            iconClass: icon-jbpm
-            tags: rhpam-kogito,runtime,kogito,quarkus,springboot,jvm
-            supports: quarkus
-            version: '7.13.3'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8:7.13.3
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: rhpam-kogito-runtime-native-rhel8
-      annotations:
-        openshift.io/display-name: RHPAM Runtime image for Kogito based on Quarkus native image
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '7.13.3'
-          annotations:
-            description: RHPAM Runtime image for Kogito based on Quarkus native image
-            iconClass: icon-jbpm
-            tags: rhpam-kogito,runtime,kogito,quarkus,native
-            supports: quarkus
-            version: '7.13.3'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8:7.13.3
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: rhpam-kogito-builder-rhel8
-      annotations:
-        openshift.io/display-name: RHPAM Platform for building Kogito based on Quarkus or SpringBoot
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '7.13.3'
-          annotations:
-            description: RHPAM Platform for building Kogito based on Quarkus or SpringBoot
-            iconClass: icon-jbpm
-            tags: rhpam-kogito,builder,kogito,quarkus,springboot
-            supports: quarkus
-            version: '7.13.3'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: registry.redhat.io/rhpam-7/rhpam-kogito-builder-rhel8:7.13.3
-
diff --git a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml b/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
deleted file mode 100644
index 299e0590df6..00000000000
--- a/rhpam-kogito-runtime-jvm-rhel8-overrides.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-schema_version: 1
-
-name: "rhpam-7/rhpam-kogito-runtime-jvm-rhel8"
-version: "7.13.3"
-from: "registry.redhat.io/ubi8/ubi-minimal:latest"
-description: "RHPAM Runtime image for Kogito based on Quarkus or SpringBoot JVM image"
-
-labels:
-  - name: "com.redhat.component"
-    value: "rhpam-7-kogito-runtime-jvm-rhel8-container"
-  - name: "io.k8s.description"
-    value: "RHPAM Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
-  - name: "io.k8s.display-name"
-    value: "RHPAM Kogito Runtime based on Quarkus or Spring Boot JVM image"
-  - name: "io.openshift.tags"
-    value: "rhpam-kogito,runtime,kogito,quarkus,springboot,jvm"
-  - name: "io.openshift.s2i.assemble-input-files"
-    value: "/home/kogito/bin"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "RUNTIME_TYPE"
-    example: "springboot"
-    description: "Defines the runtime type of your Kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
-  - name: JAVA_OPTIONS
-    example: "-Dquarkus.log.level=DEBUG"
-    description: JVM options passed to the Java command.
-
-ports:
-  - value: 8080
-
-modules:
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.s2i.core
-    - name: org.kie.kogito.runtime.jvm
-    - name: org.kie.kogito.security.custom.truststores
-
-packages:
-  content_sets_file: content_sets.yaml
-
-osbs:
-  configuration:
-    container:
-      platforms:
-        only:
-          - x86_64
-          - ppc64le
-      compose:
-        pulp_repos: true
-  extra_dir: osbs-extra/rhpam-kogito-runtime-jvm-rhel8
-  repository:
-    name: containers/rhpam-7-kogito-runtime-jvm
-    branch: rhba-7-rhel-8
-
-run:
-  workdir: "/home/kogito"
diff --git a/rhpam-kogito-runtime-native-rhel8-overrides.yaml b/rhpam-kogito-runtime-native-rhel8-overrides.yaml
deleted file mode 100644
index 51b506859e2..00000000000
--- a/rhpam-kogito-runtime-native-rhel8-overrides.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-schema_version: 1
-
-name: "rhpam-7/rhpam-kogito-runtime-native-rhel8"
-version: "7.13.3"
-from: "registry.redhat.io/ubi8/ubi-minimal:latest"
-description: "RHPAM Runtime image for Kogito based on Quarkus native image"
-
-labels:
-  - name: "com.redhat.component"
-    value: "rhpam-7-kogito-runtime-native-rhel8-container"
-  - name: "io.k8s.description"
-    value: "RHPAM Runtime image for Kogito based on Quarkus native image"
-  - name: "io.k8s.display-name"
-    value: "Red Hat build of Kogito runtime based on Quarkus native image"
-  - name: "io.openshift.tags"
-    value: "rhpam-kogito,runtime,kogito,quarkus,native"
-  - name: "io.openshift.s2i.assemble-input-files"
-    value: "/home/kogito/bin"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: JAVA_OPTIONS
-    example: "-Dquarkus.log.level=DEBUG"
-    description: JVM options passed to the Java command.
-  - name: BINARY_BUILD
-    example: "true"
-    description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
-
-ports:
-  - value: 8080
-
-modules:
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.s2i.core
-    - name: org.kie.kogito.runtime.native
-
-packages:
-  content_sets_file: content_sets.yaml
-  install:
-    - glibc
-
-osbs:
-  configuration:
-    container_file: container.yaml
-  extra_dir: osbs-extra/rhpam-kogito-runtime-native-rhel8
-  repository:
-    name: containers/rhpam-7-kogito-runtime-native
-    branch: rhba-7-rhel-8
-
-## s2i build . -e BINARY=true registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8:latest
-## where "." is the sources dir, ie: /home/user/sources/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld
-run:
-  workdir: "/home/kogito"
-
diff --git a/scripts/README.md b/scripts/README.md
index d0d016991a8..b11e68cfb7e 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -28,14 +28,10 @@ make BUILD_ENGINE=osbs build-prod
 
 It receives the Product image name to build the images.
 
-The build works in the follow CEKit build hierarchy:
-
- - image.yaml -> kogito-community-image-name-overrides.yaml -> kogito-product-image-name-overrides.yaml
-
 Example: 
 
 ```bash 
-cekit --verbose --redhat build --overrides-file kogito-runtime-jvm-overrides.yaml --overrides-file rhpam-kogito-runtime-jvm-rhel8-overrides.yaml docker
+cekit --verbose --redhat --descriptor logic-data-index-ephemeral-rhel8-image.yaml build docker
 ```
 
 The product image name must respect the community image name:
@@ -98,7 +94,7 @@ The command above will update all the needed files to the given version(s).
 These changes include updates on
 
  - all cekit modules
- - image.yaml file descriptor
+ - *-image.yaml files descriptor for each container image
  - kogito-imagestream.yaml
  - tests files for default values
  
@@ -134,7 +130,7 @@ the images will behave and also when new functionality is added.
 The script updates the version on:
 
 - all cekit modules
-- image.yaml file descriptor
+- *-image.yaml files descriptor for each container image
 - kogito-imagestream.yaml
 
 
@@ -195,7 +191,7 @@ This will set the default artifacts version.
 ##### Update quarkus version
 
 ```bash
-$ python update-repository.py quarkus-platform-version 2.16.0.Final
+$ python update-repository.py --quarkus-platform-version 2.16.7.Final
 ```
 
 This will set the image quarkus version to 2.16.0.Final.
diff --git a/scripts/build-osbs.sh b/scripts/build-osbs.sh
index 27b8fc25368..cd2ae0e7522 100755
--- a/scripts/build-osbs.sh
+++ b/scripts/build-osbs.sh
@@ -216,7 +216,7 @@ fi
 
 cd ../
 set -x
-PROD_C="${PROD_COMPONENT}-overrides"
+PROD_C="${PROD_COMPONENT}-image"
 # hack to replace the branch overrides as cekit detects two osbs sections and don't know which one to override.
 sed -i 's/rhba-7-rhel-8/rhba-7-rhel-8-nightly/g' ${PROD_C}.yaml
 make container-build-osbs prod_component=${PROD_C}
diff --git a/scripts/build-product-image.sh b/scripts/build-product-image.sh
index 5eddd86bc5a..0a007f7cb16 100755
--- a/scripts/build-product-image.sh
+++ b/scripts/build-product-image.sh
@@ -21,11 +21,11 @@ ACTION=${1}
 case ${ACTION} in
     "build")
         echo "Using ${BUILD_ENGINE} build engine"
-        ${CEKIT_CMD} build --overrides-file ${image_name}-overrides.yaml ${BUILD_ENGINE}
+        ${CEKIT_CMD} --descriptor ${image_name}-image.yaml build ${BUILD_ENGINE}
     ;;
 
     "test")
-        ${CEKIT_CMD} test --overrides-file ${image_name}-overrides.yaml behave $3
+        ${CEKIT_CMD} --descriptor ${image_name}-image.yaml test behave $3
     ;;
     *)
         echo "Please use build or test actions."
diff --git a/scripts/build-quarkus-app.sh b/scripts/build-quarkus-app.sh
deleted file mode 100755
index 627a074cfdc..00000000000
--- a/scripts/build-quarkus-app.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env bash
-# Parameters:
-#   1 - image name - can't  be empty.
-#   2 - git target branch - defaults to main
-#   3 - git target uri - defaults to https://github.com/kiegroup/kogito-apps.git
-
-# fast fail
-set -e
-set -o pipefail
-
-# Read entries before sourcing
-image_name="${1}"
-quarkus_platform_version="${2}"
-kogito_version="${KOGITO_VERSION:-${3}}"
-
-# common extensions used by the kogito-swf-builder and kogito-swf-devmode
-quarkus_extensions='quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health'
-# dev mode purpose extensions used only by the kogito-swf-devmode
-kogito_swf_devmode_extensions='kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory'
-
-if [ -z ${quarkus_platform_version} ]; then
-    echo "Please provide the quarkus version"
-    exit 1
-fi
-
-case ${image_name} in
-    "kogito-swf-builder")        ;;
-    "kogito-swf-devmode")        
-        quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions}"
-        ;;
-    *)
-        echo "${image_name} is not a quarkus app image, exiting..."
-        exit 0
-        ;;
-esac
-
-
-script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
-
-target_tmp_dir="/tmp/build/${image_name}"
-build_target_dir="/tmp/${image_name}"
-mvn_local_repo="/tmp/temp_maven/${image_name}"
-
-rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
-rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
-if [ "${CI}" = "true" ]; then
-    # On CI we want to make sure we remove all artifacts from maven repo
-    rm -rf ${mvn_local_repo}
-fi
-mkdir -p ${mvn_local_repo}
-
-. ${script_dir_path}/setup-maven.sh "${build_target_dir}"/settings.xml
-
-set -x
-echo "Create quarkus project to path ${build_target_dir}"
-cd ${build_target_dir}
-mvn ${MAVEN_OPTIONS} \
-    -Dmaven.repo.local=${mvn_local_repo} \
-    -DprojectGroupId="org.acme" \
-    -DprojectArtifactId="serverless-workflow-project" \
-    -DprojectVersionId="1.0.0-SNAPSHOT" \
-    -DplatformVersion="${quarkus_platform_version}" \
-    -Dextensions="${quarkus_extensions}" \
-    io.quarkus.platform:quarkus-maven-plugin:"${quarkus_platform_version}":create
-
-# Fix as we cannot rely on Quarkus platform
-# Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented
-if [ ! -z ${kogito_version} ]; then
-    echo "Replacing Kogito Platform BOM with version ${kogito_version}"
-    # [ ]* -> is a regexp pattern to match any number of spaces
-    pattern_1="[ ]*<groupId>.*<\/groupId>"
-    pattern_2="[ ]*<artifactId>quarkus-kogito-bom<\/artifactId>\n"
-    pattern_3="[ ]*<version>.*<\/version>\n"
-    complete_pattern="$pattern_1\n$pattern_2$pattern_3"
-
-    replace_1="        <groupId>org.kie.kogito<\/groupId>\n"
-    replace_2="        <artifactId>kogito-bom<\/artifactId>\n"
-    replace_3="        <version>${kogito_version}<\/version>\n"
-    complete_replace="$replace_1$replace_2$replace_3"
-
-    sed -i.bak -e "/$pattern_1/{
-        N;N;N
-        s/$complete_pattern/$complete_replace/
-        }" serverless-workflow-project/pom.xml
-fi
-
-echo "Build quarkus app"
-cd "serverless-workflow-project"
-# Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
-# This avoids to have, for example, Quarkus BOMs or other artifacts with multiple versions.
-mvn ${MAVEN_OPTIONS} \
-    -DskipTests \
-    -Dmaven.repo.local=${mvn_local_repo} \
-    -Dquarkus.container-image.build=false \
-    clean install
-
-cd ${build_target_dir}
-
-#remove unnecessary files
-rm -rfv serverless-workflow-project/target
-rm -rfv serverless-workflow-project/src/main/resources/*
-rm -rfv serverless-workflow-project/src/main/docker
-rm -rfv serverless-workflow-project/.mvn/wrapper
-rm -rfv serverless-workflow-project/mvnw*
-rm -rfv serverless-workflow-project/src/test
-rm -rfv serverless-workflow-project/*.bak
-
-# Maven useless files
-# Needed to avoid Maven to automatically re-download from original Maven repository ...
-find ${mvn_local_repo} -name _remote.repositories -type f -delete
-find ${mvn_local_repo} -name _maven.repositories -type f -delete
-find ${mvn_local_repo} -name *.lastUpdated -type f -delete
-
-echo "Zip and copy scaffold project"
-zip -r ${image_name}-quarkus-app.zip serverless-workflow-project/ 
-cp -v ${image_name}-quarkus-app.zip ${target_tmp_dir}/
-echo "Zip and copy maven repo"
-cd ${mvn_local_repo}
-zip -r ${image_name}-maven-repo.zip *
-cp -v ${image_name}-maven-repo.zip ${target_tmp_dir}/
diff --git a/scripts/common.py b/scripts/common.py
index 816562bcd10..cff436e6856 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -14,10 +14,9 @@
 PRODUCT_PREFIX = 'logic-'
 
 # imagestream file that contains all images, this file aldo needs to be updated.
+PROJECT_VERSIONS_MODULE = "modules/kogito-project-versions/module.yaml"
 IMAGE_STREAM_FILENAME = "kogito-imagestream.yaml"
 PROD_IMAGE_STREAM_FILENAME = "logic-imagestream.yaml"
-# image.yaml file definition that needs to be updated
-IMAGE_FILENAME = "image.yaml"
 KOGITO_VERSION_ENV_KEY = "KOGITO_VERSION"
 KOGITO_VERSION_LABEL_NAME = "org.kie.kogito.version"
 
@@ -56,22 +55,22 @@ def yaml_loader():
     return yaml
 
 
-def update_community_image_version(target_version):
+def update_community_images_version(target_version):
     """
-    Update image.yaml version tag.
-    :param target_version: version used to update the image.yaml file
+    Update image.yml files version tag.
+    :param target_version: version used to update
     """
-    update_image_version_tag_in_yaml_file(target_version, IMAGE_FILENAME)
+    for img in sorted(get_community_images()):
+        update_image_version_tag_in_yaml_file(target_version, "{}-image.yaml".format(img))
 
 
 def update_prod_image_version(target_version):
     """
-    Update logic-*-overrides.yaml files version tag.
+    Update logic-*-image.yaml files version tag.
     :param target_version: version used to update the files
     """
     for img in sorted(get_prod_images()):
-        file = "{}-overrides.yaml".format(img)
-        update_image_version_tag_in_yaml_file(target_version, file)
+        update_image_version_tag_in_yaml_file(target_version, "{}-image.yaml".format(img))
 
 
 def update_image_version_tag_in_yaml_file(target_version, yaml_file):
@@ -84,18 +83,13 @@ def update_image_version_tag_in_yaml_file(target_version, yaml_file):
     try:
         with open(yaml_file) as image:
             data = yaml_loader().load(image)
-            if 'version' in data:
-                data['version'] = target_version
-            else:
-                print("Field version not found, returning...")
-                return
+            update_field_in_dict(data, 'version', target_version)
 
         with open(yaml_file, 'w') as image:
             yaml_loader().dump(data, image)
     except TypeError as err:
         print("Unexpected error:", err)
 
-
 def update_image_stream(target_version, prod=False):
     """
     Update the imagestream file, it will update the tag name, version and image tag.
@@ -174,9 +168,9 @@ def get_images(prefix):
     # r=>root, d=>directories, f=>files
     for r, d, f in os.walk("."):
         for item in f:
-            if re.compile(r'.*-overrides.yaml').match(item):
+            if re.compile(r'.*-image.yaml').match(item):
                 if item.startswith(prefix):
-                    images.append(item.replace("-overrides.yaml", ''))
+                    images.append(item.replace("-image.yaml", ''))
 
     return images
 
@@ -224,6 +218,27 @@ def get_swf_builder_images():
     return SWF_BUILDER_IMAGES
 
 
+def retrieve_version():
+    """
+    Retrieve the project version from project data file
+    """
+    return get_project_versions_module_data()['version']
+
+
+def get_project_versions_module_data():
+    """
+    Get a specific field value from project versions module file
+    :param field_name: Field to search for
+    """
+    try:
+        project_versions_module_file = os.path.join(PROJECT_VERSIONS_MODULE)
+        with open(project_versions_module_file) as project_versions_data:
+            return yaml_loader().load(project_versions_data)
+
+    except TypeError:
+        raise
+
+
 def update_kogito_modules_version(target_version, prod=False):
     """
     Update every Kogito module.yaml to the given version.
@@ -231,64 +246,33 @@ def update_kogito_modules_version(target_version, prod=False):
     :param target_version: version used to update all Kogito module.yaml files
     """
     modules = []
+    current_version = retrieve_version()
     if prod:
         modules = get_prod_module_dirs()
     else:
         modules = get_community_module_dirs()
 
     for module_dir in modules:
-        update_kogito_module_version(module_dir, target_version)
+        update_kogito_module_version(module_dir, current_version, target_version)
 
 
-def update_kogito_module_version(module_dir, target_version):
+def update_kogito_module_version(module_dir, old_version, target_version):
     """
     Set Kogito module.yaml to given version.
     :param module_dir: directory where cekit modules are hold
     :param target_version: version to set into the module
     """
-
-    image_version = retrieve_image_version()
-    file_updated = False
-
     try:
         module_file = os.path.join(module_dir, "module.yaml")
         with open(module_file) as module:
             data = yaml_loader().load(module)
-            if data['version'] == image_version:
+            if data['version'] == old_version:
                 print(
                     "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
                 data['version'] = target_version
-                file_updated = True
-
-        if file_updated:
-            with open(module_file, 'w') as module:
-                yaml_loader().dump(data, module)
 
-    except TypeError:
-        raise
-
-def retrieve_artifacts_version():
-    """
-    Retrieve the artifacts version from envs in main image.yaml
-    """
-    try:
-        with open(IMAGE_FILENAME) as imageFile:
-            data = yaml_loader().load(imageFile)
-            for index, env in enumerate(data['envs'], start=0):
-                if env['name'] == KOGITO_VERSION_ENV_KEY:
-                    return data['envs'][index]['value']
-
-    except TypeError:
-        raise
-
-def retrieve_image_version():
-    """
-    Retrieve the image version from main image.yaml
-    """
-    try:
-        with open(IMAGE_FILENAME) as imageFile:
-            data = yaml_loader().load(imageFile)
-            return data['version']
+        with open(module_file, 'w') as module:
+            yaml_loader().dump(data, module)
 
     except TypeError:
         raise
@@ -390,16 +374,23 @@ def update_maven_repo_in_behave_tests(repo_url, replace_jboss_repository):
     update_in_behave_tests(pattern, replacement)
 
 
-def update_maven_mirror_url_in_quarkus_plugin_behave_tests(repo_url):
+def update_maven_mirror_url_in_build_config(mirror_url):
     """
-    Update maven repository into behave tests
-    :param repo_url: Maven repository url
+    Update maven mirror url into behave tests
+    :param repo_url: Maven mirror url
     """
-    print("Set maven repo {} in quarkus plugin behave tests".format(repo_url))
+    update_env_value_in_build_config_modules('MAVEN_MIRROR_URL', mirror_url, True)
+
+def update_maven_mirror_url_in_quarkus_plugin_behave_tests(mirror_url):
+    """
+    Update maven mirror url into behave tests
+    :param repo_url: Maven mirror url
+    """
+    print("Set maven repo {} in quarkus plugin behave tests".format(mirror_url))
     pattern = re.compile(
         '(Kogito Maven archetype.*(?<!springboot)\r?\n\s*Given.*\r?\n\s*)\|\s*variable[\s]*\|[\s]*value[\s]*\|')
     replacement = "\g<1>| variable | value |\n      | {} | {} |\n      | MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE | true |\n      | DEBUG | true |".format(
-        "MAVEN_MIRROR_URL", repo_url)
+        "MAVEN_MIRROR_URL", mirror_url)
     update_in_behave_tests(pattern, replacement)
 
 def update_maven_repo_env_value(repo_url, replace_jboss_repository, prod=False):
@@ -459,6 +450,16 @@ def update_examples_uri_in_clone_repo(examples_uri):
     replacement = "git clone {}".format(examples_uri)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
+def update_maven_repo_in_build_config(repo_url, replace_jboss_repository):
+    """
+    Update maven repository in build config modules
+    :param repo_url: Maven repository url
+    :param replace_jboss_repository: Set to true if default Jboss repository needs to be overridden
+    """
+    maven_env_name = 'MAVEN_REPO_URL'
+    if replace_jboss_repository:
+        maven_env_name = 'JBOSS_MAVEN_REPO_URL'
+    update_env_value_in_build_config_modules(maven_env_name, repo_url, True)
 
 def update_maven_repo_in_setup_maven(repo_url, replace_jboss_repository):
     """
@@ -493,10 +494,8 @@ def update_env_value(env_name, env_value, prod=False):
         images = get_community_images()
         modules = get_community_module_dirs()
 
-    update_env_value_in_file(IMAGE_FILENAME, env_name, env_value)
-
     for image_name in images:
-        image_filename = "{}-overrides.yaml".format(image_name)
+        image_filename = "{}-image.yaml".format(image_name)
         update_env_value_in_file(image_filename, env_name, env_value)
     
     for module_dir in modules:
@@ -510,25 +509,66 @@ def update_env_value_in_file(filename, env_name, env_value):
     :param env_name: environment variable name to update
     :param env_value: value to set
     """
+    print("Updating {0} label {1} with value {2}".format(filename, env_name, env_value))
     try:
-        file_updated = False
         with open(filename) as yaml_file:
             data = yaml_loader().load(yaml_file)
-            if 'envs' in data:
-                for index, env in enumerate(data['envs'], start=0):
-                    if env['name'] == env_name:
-                        print("Updating {0} label {1} with value {2}".format(filename, env_name,
-                                                                                    env_value))
-                        data['envs'][index]['value'] = env_value
-                        file_updated = True
-
-        if file_updated:
-            with open(filename, 'w') as yaml_file:
-                yaml_loader().dump(data, yaml_file)
+            update_env_value_in_data(data, env_name, env_value)
+
+        with open(filename, 'w') as yaml_file:
+            yaml_loader().dump(data, yaml_file)
 
     except TypeError:
         raise
 
+
+def update_env_value_in_data(data, env_name, env_value, ignore_empty = False):
+    """
+    Update environment variable value in data dict if exists
+    :param data: dict to update
+    :param env_name: environment variable name
+    :param env_value: environment variable value to set
+    :param ignore_empty: Whether previous value should be present to set the new value
+    """
+    if isinstance(data, list):
+        for data_item in data:
+            update_env_value_in_data(data_item, env_name, env_value, ignore_empty)
+    else:
+        if ignore_empty:
+            if 'envs' not in data:
+                data['envs'] = []
+            data['envs'] += [ dict(name=env_name, value=env_value) ]
+        elif 'envs' in data:
+            for _, env in enumerate(data['envs'], start=0):
+                if env['name'] == env_name:
+                    update_field_in_dict(env, 'value', env_value, ignore_empty)
+
+
+def update_env_value_in_build_config_modules(env_name, new_value, ignore_empty = False):
+    """
+    Update environment variable in build config modules
+    :param env_name: Environment variable to lookup
+    :param new_value: New value to set
+    :param ignore_empty: Whether previous value should be present to set the new value
+    """
+    print("Updating env value {0} into build config modules")
+    for module_dir in get_all_module_dirs():
+        try:
+            module_file = os.path.join(module_dir, "module.yaml")
+            with open(module_file) as module:
+                data = yaml_loader().load(module)
+                print(data['name'])
+                if data['name'].endswith('build-config'):
+                    print(
+                        "Updating module {0} maven repo env {1} to {2}".format(data['name'], env_name, new_value))
+                    update_env_value_in_data(data, env_name, new_value, ignore_empty)
+
+            with open(module_file, 'w') as module:
+                yaml_loader().dump(data, module)
+
+        except TypeError:
+            raise
+
 def update_label_value(label_name, label_value, prod=False):
     """
     Update label value in all module / image files 
@@ -545,10 +585,8 @@ def update_label_value(label_name, label_value, prod=False):
         images = get_community_images()
         modules = get_community_module_dirs()
 
-    update_label_value_in_file(IMAGE_FILENAME, label_name, label_value)
-
     for image_name in images:
-        image_filename = "{}-overrides.yaml".format(image_name)
+        image_filename = "{}-image.yaml".format(image_name)
         update_label_value_in_file(image_filename, label_name, label_value)
     
     for module_dir in modules:
@@ -562,26 +600,48 @@ 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))
     try:
-        file_updated = False
         with open(filename) as yaml_file:
             data = yaml_loader().load(yaml_file)
-            if 'labels' in data:
-                for index, env in enumerate(data['labels'], start=0):
-                    if env['name'] == label_name:
-                        print("Updating {0} label {1} with value {2}".format(filename, label_name,
-                                                                                    label_value))
-                        if 'value' in data['labels'][index]: # Do not update if no value already defined
-                            data['labels'][index]['value'] = label_value
-                            file_updated = True
-
-        if file_updated:
-            with open(filename, 'w') as yaml_file:
-                yaml_loader().dump(data, yaml_file)
+            update_label_value_in_data(data, label_name, label_value)            
+
+        with open(filename, 'w') as yaml_file:
+            yaml_loader().dump(data, yaml_file)
 
     except TypeError:
         raise
 
+
+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
+    :param label_name: label name
+    :param label_value: label value to set
+    :param ignore_empty: Whether previous value should be present to set the new value
+    """
+    if isinstance(data, list):
+        for data_item in data:
+            update_label_value_in_data(data_item, label_name, label_value, ignore_empty)
+    else:
+        if ignore_empty:
+            if 'labels' not in data:
+                data['labels'] = []
+            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:
+                    update_field_in_dict(label, 'value', label_value, ignore_empty)
+
+
+def ignore_maven_self_signed_certificate_in_build_config():
+    """
+    Sets the environment variable to ignore the self-signed certificates in build config modules
+    """
+    update_env_value_in_build_config_modules('MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE', 'true', True)
+
+
 def ignore_maven_self_signed_certificate_in_setup_maven():
     """
     Sets the environment variable to ignore the self-signed certificates in maven
@@ -604,6 +664,22 @@ def update_in_file(file, pattern, replacement):
     with open(file, 'w') as fe:
         fe.write(updated_value)
 
+def update_field_in_dict(data, key, new_value, ignore_empty = False):
+    """
+    Update version field in given data dict
+    :param data: dictionary to update
+    :param key: key to lookup
+    :param new_value: value to set
+    :param ignore_empty: Whether previous value should be present to set the new value
+    """
+    if isinstance(data, list):
+        for data_item in data:
+            update_field_in_dict(data_item, key, new_value, ignore_empty)
+    else:
+        if ignore_empty or key in data:
+            data[key] = new_value
+        else:
+            print("Field " + key + " not found, returning...")
 
 if __name__ == "__main__":
     print("Community modules:")
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index bd318ddc91d..ec344bc81d6 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -65,8 +65,8 @@
                 common.update_prod_image_version(args.bump_to)
                 common.update_image_stream(args.bump_to, args.prod)
             else:
-                common.update_kogito_modules_version(args.bump_to) # Need to be done before updating the main image version
-                common.update_community_image_version(args.bump_to)
+                common.update_kogito_modules_version(args.bump_to) # Need to be done before updating the project data version
+                common.update_community_images_version(args.bump_to)
                 common.update_image_stream(args.bump_to)
                 common.update_artifacts_version_in_build(artifacts_version)
 
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index d2df6fe2142..9a95c925f8f 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -63,7 +63,7 @@ def tag_and_push_images():
     tag and push the images to quay.io
     """
     cli = docker.client.from_env()
-    current_version = get_current_version()
+    current_version = common.retrieve_version()
     print("New rc tags %s" % IMAGES_NEXT_RC_TAG)
     if '-rc' not in current_version:
         for next_tag in IMAGES_NEXT_RC_TAG:
@@ -88,7 +88,7 @@ def tag_and_push_images():
             iname_tag = QUAY_KOGITO_ORG_PLACE_HOLDER.format(iname, current_version)
             cr_tag = QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG.format(iname)
             try:
-                if iversion_next_tag != get_current_version():
+                if iversion_next_tag != common.retrieve_version():
                     print("Tagging image %s as %s" % (iname_tag, iversion_next_tag))
                     cli.images.get(iname_tag).tag(cr_tag, iversion_next_tag)
 
@@ -97,24 +97,12 @@ def tag_and_push_images():
             except:
                 raise
 
-
-def get_current_version():
-    """
-    get the current image version from image.yaml. The version defined there will be considered
-    the point of truth, update it carefully.
-    :return: current image.yaml defined version
-    """
-    with open('image.yaml') as image_yaml:
-        data = yaml.load(image_yaml, Loader=yaml.FullLoader)
-        return data['version']
-
-
 def find_current_rc_version():
     """
     If the current version already includes the rc tag, keep it, otherwise add it -rc1 tag.
     :return: the current image tag version
     """
-    version = get_current_version()
+    version = common.retrieve_version()
     if '-rc' in version:
         current_image_version = version
     else:
@@ -145,7 +133,7 @@ def get_next_rc_version(current_rc_version, override_tags):
     args = parser.parse_args()
 
     version = get_next_rc_version(find_current_rc_version(), args.override_tags)
-    common.update_community_image_version(version)
+    common.update_community_images_version(version)
     common.update_image_stream(version)
     common.update_kogito_modules_version(version)
     common.update_artifacts_version_env_in_modules(version)
diff --git a/scripts/retrieve_version.py b/scripts/retrieve_version.py
new file mode 100644
index 00000000000..64e4274c023
--- /dev/null
+++ b/scripts/retrieve_version.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python3
+#Script responsible to update the tests with 
+#Should be run from root directory of the repository
+#Sample usage:  python3 scripts/retrieve_version.py
+
+import sys
+sys.dont_write_bytecode = True
+
+import common
+
+import argparse
+
+if __name__ == "__main__":
+    print(common.retrieve_version())
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index e7cdbea38fa..12e6684b397 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -44,4 +44,4 @@ echo "----> running bats on kogito-s2i-core"
 ./bats/bin/bats modules/kogito-s2i-core/tests/bats
 
 echo "----> running bats on kogito-swf-builder"
-./bats/bin/bats modules/kogito-swf/common/tests/bats
\ No newline at end of file
+./bats/bin/bats modules/kogito-swf/common/scripts/tests/bats
\ No newline at end of file
diff --git a/scripts/update-repository.py b/scripts/update-repository.py
index a1bf8fbc4f8..0c632d1ba0f 100644
--- a/scripts/update-repository.py
+++ b/scripts/update-repository.py
@@ -19,6 +19,8 @@
     parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False,
                         action='store_true',
                         help='If set to true will relax the SSL for user-generated self-signed certificates')
+    parser.add_argument('--build-maven-mirror-url', dest='build_maven_mirror_url',
+                        help='Maven mirror URL to be used for cekit build')
     parser.add_argument('--archetype-maven-mirror-url', dest='archetype_maven_mirror_url',
                         help='Maven mirror URL to be used for archetype generation')
 
@@ -39,17 +41,22 @@
     args = parser.parse_args()
 
     if args.repo_url:
+        common.update_maven_repo_in_build_config(args.repo_url, args.replace_jboss_repo)
         common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_jboss_repo)
-        if args.tests_only:
-            common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_jboss_repo)
-        else:
+        common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_jboss_repo)
+        if not args.tests_only:
             common.update_maven_repo_env_value(args.repo_url, args.replace_jboss_repo, args.prod)
     
     if args.ignore_self_signed_cert:
+        common.ignore_maven_self_signed_certificate_in_build_config()
         common.ignore_maven_self_signed_certificate_in_setup_maven()
         common.ignore_maven_self_signed_certificate_in_behave_tests()
 
+    if args.build_maven_mirror_url:
+        common.update_maven_mirror_url_in_build_config(args.build_maven_mirror_url)
+
     if args.archetype_maven_mirror_url:
+        common.update_maven_mirror_url_in_build_config(args.archetype_maven_mirror_url)
         common.update_maven_mirror_url_in_quarkus_plugin_behave_tests(args.archetype_maven_mirror_url)
 
     if args.examples_uri:
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
index 015e2fc9197..a57d1941a1d 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -4,8 +4,6 @@ Feature: Kogito-data-index ephemeral postgresql feature.
   Scenario: verify if all labels are correctly set on kogito-data-index-ephemeral image
     Given image is built
      Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-      And the image should contain label io.openshift.s2i.destination with value /tmp
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - ephemeral PostgreSQL
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index 49cf900318c..a33e5ac8763 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -4,8 +4,6 @@ Feature: Kogito-data-index infinispan feature.
   Scenario: verify if all labels are correctly set on kogito-data-index-infinispan image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-     And the image should contain label io.openshift.s2i.destination with value /tmp
      And the image should contain label io.openshift.expose-services with value 8080:http
      And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Infinispan persistence provider
      And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Infinispan
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
index 0d3ce7e48fe..d130b8c438e 100644
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -4,8 +4,6 @@ Feature: Kogito-data-index mongodb feature.
   Scenario: verify if all labels are correctly set on kogito-data-index-mongodb image
     Given image is built
      Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-      And the image should contain label io.openshift.s2i.destination with value /tmp
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Mongodb persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Mongodb
diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature
index d8c380903c3..b8fcfa4c6ac 100644
--- a/tests/features/data-index/kogito-data-index-oracle.feature
+++ b/tests/features/data-index/kogito-data-index-oracle.feature
@@ -4,8 +4,6 @@ Feature: Kogito-data-index oracle feature.
   Scenario: verify if all labels are correctly set on kogito-data-index-oracle image
     Given image is built
      Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-      And the image should contain label io.openshift.s2i.destination with value /tmp
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Oracle persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Oracle
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
index e2e5bbce377..ddd0b761854 100644
--- a/tests/features/data-index/kogito-data-index-postgresql.feature
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -4,8 +4,6 @@ Feature: Kogito-data-index postgresql feature.
   Scenario: verify if all labels are correctly set on kogito-data-index-postgresql image
     Given image is built
      Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-      And the image should contain label io.openshift.s2i.destination with value /tmp
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for PostgreSQL persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - PostgreSQL
diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
index 52a0ebf0db9..3693143e711 100644
--- a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
@@ -4,8 +4,6 @@ Feature: Kogito-jobs-service-all-in-one feature.
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service with all available jdbc providers
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service All-in-One
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index 467bed436bc..53cd99f1f77 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -4,8 +4,6 @@ Feature: Kogito-jobs-service-ephemeral feature.
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito in memory Jobs Service
     And the image should contain label io.k8s.display-name with value Kogito in memory Jobs Service
diff --git a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
index 1ec729dec70..68412264399 100644
--- a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
@@ -4,8 +4,6 @@ Feature: Kogito-jobs-service-infinispan feature.
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Infinispan
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Infinispan
diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
index ab7f56e806f..277e82602be 100644
--- a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
@@ -4,8 +4,6 @@ Feature: Kogito-jobs-service-mongodb feature.
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on MongoDB
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on MongoDB
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index ec8ca0dc246..bb05ad25431 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -4,8 +4,6 @@ Feature: Kogito-jobs-service-postgresql feature.
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Postgresql
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Postgresql
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index cb73a644386..b7a75697b1d 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -4,8 +4,6 @@ Feature: Kogito-explainability feature.
   Scenario: verify if all labels are correctly set on kogito-explainability image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Explainability Service
     And the image should contain label io.k8s.display-name with value Kogito Explainability Service
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index d4757313e15..a38ada64d9f 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -4,8 +4,6 @@ Feature: Kogito-jit-runner feature.
   Scenario: verify if all labels are correctly set on kogito-jit-runner image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito JIT Runner
     And the image should contain label io.k8s.display-name with value Kogito JIT Runner
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index e86b2869074..7be4652ce42 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -4,8 +4,6 @@ Feature: kogito-management-console feature
   Scenario: verify if all labels are correctly set kogito-management-console image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Management Console, manage your Business Process easily.
     And the image should contain label io.k8s.display-name with value Kogito Management Console
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 4cced310ecb..363c04fbbdc 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |             
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 69372755892..19ac340a547 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |             
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
new file mode 100644
index 00000000000..475e75d4d04
--- /dev/null
+++ b/tests/features/kogito-swf-builder.feature
@@ -0,0 +1,40 @@
+@quay.io/kiegroup/kogito-swf-builder
+Feature: Serverless Workflow builder images
+
+  Scenario: Verify that the application is built and started correctly
+    When container is started with command bash -c 'launch/build-app.sh && java -jar serverless-workflow-project/target/quarkus-app/quarkus-run.jar'
+      | variable     | value |
+      | SCRIPT_DEBUG | true  |
+    Then check that page is served
+      | property             | value             |
+      | port                 | 8080              |
+      | path                 | /q/health/ready   |
+      | wait                 | 480               |
+      | request_method       | GET               |
+      | expected_status_code | 200               |
+    And container log should contain --no-transfer-progress
+    And container log should contain -Duser.home=/home/kogito
+    And container log should match regex Installed features:.*kubernetes
+    And container log should match regex Installed features:.*kogito-serverless-workflow
+    And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
+    And container log should match regex Installed features:.*smallrye-health
+
+  Scenario: Verify that the application is built and started correctly when QUARKUS_EXTENSIONS env is used
+    When container is started with command bash -c 'launch/build-app.sh && java -jar serverless-workflow-project/target/quarkus-app/quarkus-run.jar'
+      | variable            | value                                    |
+      | SCRIPT_DEBUG        | true                                     |
+      | QUARKUS_EXTENSIONS  | io.quarkus:quarkus-elytron-security-jdbc |
+    Then check that page is served
+      | property             | value             |
+      | port                 | 8080              |
+      | path                 | /q/health/ready   |
+      | wait                 | 480               |
+      | request_method       | GET               |
+      | expected_status_code | 200               |
+    And container log should contain -Duser.home=/home/kogito
+    And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
+    And container log should match regex Installed features:.*kubernetes
+    And container log should match regex Installed features:.*kogito-serverless-workflow
+    And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
+    And container log should match regex Installed features:.*smallrye-health
+    And container log should match regex Installed features:.*security-jdbc
\ No newline at end of file
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 57806f8f719..fa0d5328179 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -1,8 +1,8 @@
 @quay.io/kiegroup/kogito-swf-builder
 @quay.io/kiegroup/kogito-swf-devmode
-Feature: SWF and Quarkus installation
+Feature: Serverless Workflow images common
 
-  Scenario: verify if the swf and quarkus files are under /home/kogito/.m2/repository
+  Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
       And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.7.Final/quarkus-bom-2.16.7.Final.pom should exist
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 2056a1f8aa1..8b686515d6f 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -1,49 +1,66 @@
 @quay.io/kiegroup/kogito-swf-devmode
-Feature: SWF and Quarkus installation
+Feature: Serverless Workflow devmode images
 
-  Scenario: verify if container starts in devmode by default
+  Scenario: Verify if container starts in devmode by default
     When container is started with env
       | variable     | value |
       | SCRIPT_DEBUG | true  |
-    Then container log should contain --no-transfer-progress
-    And container log should contain -Duser.home=/home/kogito -o
-    And check that page is served
+    Then check that page is served
       | property             | value             |
       | port                 | 8080              |
       | path                 | /q/health/ready   |
       | wait                 | 480               |
       | request_method       | GET               |
       | expected_status_code | 200               |
+    And container log should contain --no-transfer-progress
+    And container log should contain -Duser.home=/home/kogito -o
+    And container log should match regex Installed features:.*kubernetes
+    And container log should match regex Installed features:.*kogito-serverless-workflow
+    And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
+    And container log should match regex Installed features:.*smallrye-health
+    And container log should match regex Installed features:.*kogito-serverless-workflow-devui
+    And container log should match regex Installed features:.*kogito-addon-source-files-extension
+    And container log should match regex Installed features:.*kogito-addons-quarkus-jobs-service-embedded
+    And container log should match regex Installed features:.*kogito-addons-quarkus-data-index-inmemory
 
-  Scenario: verify if container starts correctly when QUARKUS_EXTENSIONS env is used
+  Scenario: Verify if container starts correctly when QUARKUS_EXTENSIONS env is used
     When container is started with env
       | variable            | value                                    |
       | SCRIPT_DEBUG        | true                                     |
       | QUARKUS_EXTENSIONS  | io.quarkus:quarkus-elytron-security-jdbc |
-    Then container log should contain -Duser.home=/home/kogito
-    And container log should not contain /bin/mvn -B -X --batch-mode -o
-    And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
-    And check that page is served
+    Then check that page is served
       | property             | value             |
       | port                 | 8080              |
       | path                 | /q/health/ready   |
       | wait                 | 480               |
       | request_method       | GET               |
       | expected_status_code | 200               |
+    And container log should contain -Duser.home=/home/kogito
+    And container log should not contain /bin/mvn -B -X --batch-mode -o
+    And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
+    And container log should match regex Installed features:.*kubernetes
+    And container log should match regex Installed features:.*kogito-serverless-workflow
+    And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
+    And container log should match regex Installed features:.*smallrye-health
+    And container log should match regex Installed features:.*kogito-serverless-workflow-devui
+    And container log should match regex Installed features:.*kogito-addon-source-files-extension
+    And container log should match regex Installed features:.*kogito-addons-quarkus-jobs-service-embedded
+    And container log should match regex Installed features:.*kogito-addons-quarkus-data-index-inmemory
+    And container log should match regex Installed features:.*security-jdbc
 
   Scenario: verify that the embedded jobs-service is running
     When container is started with env
       | variable                    | value |
       | QUARKUS_DEVSERVICES_ENABLED | false |
-    Then container log should contain Embedded Postgres started at port
-    And container log should contain SET Leader
-    And check that page is served
+    Then check that page is served
       | property             | value             |
       | port                 | 8080              |
       | path                 | /q/health/ready   |
       | wait                 | 480               |
       | request_method       | GET               |
       | expected_status_code | 200               |
+    And container log should contain Embedded Postgres started at port
+    And container log should contain SET Leader
     And check that page is served
       | property             | value             |
       | port                 | 8080              |
@@ -57,14 +74,14 @@ Feature: SWF and Quarkus installation
     When container is started with env
       | variable                    | value |
       | QUARKUS_DEVSERVICES_ENABLED | false |
-    Then container log should contain Embedded Postgres started at port
-    And check that page is served
+    Then check that page is served
       | property             | value             |
       | port                 | 8080              |
       | path                 | /q/health/ready   |
       | request_method       | GET               |
       | wait                 | 480               |
       | expected_status_code | 200               |
+    And container log should contain Embedded Postgres started at port
     And check that page is served
       | property             | value                                    |
       | port                 | 8080                                     |
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index b0fd321f733..86ce99f71b8 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -4,8 +4,6 @@ Feature: kogito-task-console feature
   Scenario: verify if all labels are correctly set on kogito-task-console image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Task Console, manage your Business Process easily.
     And the image should contain label io.k8s.display-name with value Kogito Task Console
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index d7f6708acc7..eaa1888e8b8 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
index 36eddfc7437..a5d8d140f0b 100644
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -4,8 +4,6 @@ Feature: Kogito-trusty infinispan feature.
   Scenario: verify if all labels are correctly set on kogito-trusty-infinispan image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Infinispan persistence provider
     And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Infinispan
diff --git a/tests/features/trusty/kogito-trusty-postgresql.feature b/tests/features/trusty/kogito-trusty-postgresql.feature
index 43e0e867ab2..829f255e8d3 100644
--- a/tests/features/trusty/kogito-trusty-postgresql.feature
+++ b/tests/features/trusty/kogito-trusty-postgresql.feature
@@ -4,8 +4,6 @@ Feature: Kogito-trusty postgresql feature.
   Scenario: verify if all labels are correctly set on kogito-trusty-postgresql image
     Given image is built
      Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-      And the image should contain label io.openshift.s2i.destination with value /tmp
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for PostgreSQL persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Trusty Service - PostgreSQL
diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature
index 8219f0eb2b8..a093a8862ec 100644
--- a/tests/features/trusty/kogito-trusty-redis.feature
+++ b/tests/features/trusty/kogito-trusty-redis.feature
@@ -4,8 +4,6 @@ Feature: Kogito-trusty redis feature.
   Scenario: verify if all labels are correctly set on kogito-trusty-redis image
     Given image is built
      Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-      And the image should contain label io.openshift.s2i.destination with value /tmp
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Redis persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Redis
diff --git a/tests/features/trusty/kogito-trusty-ui.feature b/tests/features/trusty/kogito-trusty-ui.feature
index e14f130438e..3d1e875d942 100644
--- a/tests/features/trusty/kogito-trusty-ui.feature
+++ b/tests/features/trusty/kogito-trusty-ui.feature
@@ -4,8 +4,6 @@ Feature: kogito-trusty-ui feature
   Scenario: verify if all labels are correctly set on kogito-trusty-ui image
     Given image is built
     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty UI, manage your Business Process easily.
     And the image should contain label io.k8s.display-name with value Kogito Trusty UI
diff --git a/tests/shell/kogito-swf-devmode/RunTests.java b/tests/shell/kogito-swf-devmode/RunTests.java
new file mode 100644
index 00000000000..eac8fba0564
--- /dev/null
+++ b/tests/shell/kogito-swf-devmode/RunTests.java
@@ -0,0 +1,84 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+
+//DEPS org.slf4j:slf4j-simple:2.0.6
+
+// Junit console to start the test engine:
+//DEPS org.junit.platform:junit-platform-console:1.8.2
+
+// engine to run the tests (tests are written with Junit5):
+//DEPS org.junit.jupiter:junit-jupiter-engine:5.8.2
+
+// testcontainers
+//DEPS org.testcontainers:testcontainers:1.17.6
+//DEPS org.testcontainers:junit-jupiter:1.17.6
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+import org.junit.platform.console.options.CommandLineOptions;
+import org.junit.platform.console.tasks.ConsoleTestExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.BindMode;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.ImageFromDockerfile;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+@Testcontainers
+public class RunTests {
+
+    private static Logger LOGGER = LoggerFactory.getLogger(RunTests.class);
+
+    private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
+
+    @Container
+    private GenericContainer devModeImage = new GenericContainer("quay.io/kiegroup/kogito-swf-devmode:" + System.getenv("IMAGE_VERSION"))
+            .withFileSystemBind("tests/shell/kogito-swf-devmode/resources", "/home/kogito/serverless-workflow-project/src/main/resources", BindMode.READ_ONLY)
+            .withExposedPorts(8080)
+            .waitingFor(Wait.forHttp("/jsongreet"))
+            .withLogConsumer(logConsumer);
+
+    @Test
+    public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
+        devModeImage.start();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(new URI("http://" + devModeImage.getHost() + ":" + devModeImage.getFirstMappedPort() + "/jsongreet"))
+                .header("Content-Type", "application/json")
+                .header("Accept", "application/json")
+                .timeout(Duration.ofSeconds(10))
+                .POST(HttpRequest.BodyPublishers
+                        .ofString("{\"workflowdata\" : {\"name\": \"John\", \"language\": \"English\"}}"))
+                .build();
+        HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
+        assertEquals(201, response.statusCode());
+    }
+
+    public static void main(String... args) throws Exception {
+        if (args == null || args.length != 1) {
+            System.err.println("Output directory is not specified. Usage:");
+            System.err.println(RunTests.class.getSimpleName() + ".java <reports output directory>");
+            System.exit(1);
+            throw new IllegalStateException("Unreachable code");
+        }
+        System.out.println("Got IMAGE_VERSION = " + System.getenv("IMAGE_VERSION"));
+        CommandLineOptions options = new CommandLineOptions();
+        options.setSelectedClasses(Collections.singletonList(RunTests.class.getName()));
+        options.setReportsDir(Paths.get(args[0]));
+        new ConsoleTestExecutor(options).execute(new PrintWriter(System.out));
+    }
+}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-devmode/resources/greet.sw.json b/tests/shell/kogito-swf-devmode/resources/greet.sw.json
new file mode 100644
index 00000000000..a619b3b8bc7
--- /dev/null
+++ b/tests/shell/kogito-swf-devmode/resources/greet.sw.json
@@ -0,0 +1,67 @@
+{
+  "id": "jsongreet",
+  "version": "1.0",
+  "name": "Greeting workflow",
+  "description": "JSON based greeting workflow",
+  "start": "ChooseOnLanguage",
+  "functions": [
+    {
+      "name": "greetFunction",
+      "type": "custom",
+      "operation": "sysout"
+    }
+  ],
+  "states": [
+    {
+      "name": "ChooseOnLanguage",
+      "type": "switch",
+      "dataConditions": [
+        {
+          "condition": "${ .language == \"English\" }",
+          "transition": "GreetInEnglish"
+        },
+        {
+          "condition": "${ .language == \"Spanish\" }",
+          "transition": "GreetInSpanish"
+        }
+      ],
+      "defaultCondition": {
+        "transition": "GreetInEnglish"
+      }
+    },
+    {
+      "name": "GreetInEnglish",
+      "type": "inject",
+      "data": {
+        "greeting": "Hello from JSON Workflow, "
+      },
+      "transition": "GreetPerson"
+    },
+    {
+      "name": "GreetInSpanish",
+      "type": "inject",
+      "data": {
+        "greeting": "Saludos desde JSON Workflow, "
+      },
+      "transition": "GreetPerson"
+    },
+    {
+      "name": "GreetPerson",
+      "type": "operation",
+      "actions": [
+        {
+          "name": "greetAction",
+          "functionRef": {
+            "refName": "greetFunction",
+            "arguments": {
+              "message": ".greeting+.name"
+            }
+          }
+        }
+      ],
+      "end": {
+        "terminate": true
+      }
+    }
+  ]
+}

From 8c8a628d07d78585cb5e969a9f8ce042bc846be6 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 31 May 2023 15:39:34 +0200
Subject: [PATCH 575/709] KOGITO-9259 CI: Update nodes to rhel8 (#1552)

* CI: Update nodes to rhel8

* set back older changes

* update engine

* updates

* update
---
 .ci/jenkins/Jenkinsfile                     | 17 ++++++++++++++---
 .ci/jenkins/Jenkinsfile.deploy              | 15 +++++++++++++--
 .ci/jenkins/Jenkinsfile.promote             |  4 ++++
 .ci/jenkins/Jenkinsfile.setup-branch        |  2 +-
 .ci/jenkins/Jenkinsfile.update-prod-version |  2 +-
 .ci/jenkins/dsl/jobs.groovy                 |  4 ----
 Makefile                                    |  7 ++++---
 tests/test-apps/clone-repo.sh               |  4 ++--
 8 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 832b799eb00..e656e06b767 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -8,7 +8,7 @@ BUILD_FAILED_IMAGES = []
 
 pipeline {
     agent {
-        label 'kogito-image-slave && !built-in'
+        label 'kie-rhel8 && docker && kie-mem24g && !built-in'
     }
     tools {
         maven env.BUILD_MAVEN_TOOL
@@ -19,6 +19,10 @@ pipeline {
     }
     environment {
         CI = true
+
+        // Linked to node label
+        CONTAINER_ENGINE='docker'
+        CONTAINER_ENGINE_TLS_OPTIONS=''
     }
     stages {
         stage('Initialization') {
@@ -179,6 +183,10 @@ void testImage(String imageName) {
 String getMakeBuildImageArgs() {
     List args = [ "cekit_option='--work-dir .'" ]
     args.add("KOGITO_APPS_TARGET_BRANCH=${changeTarget}")
+    args.add("BUILD_ENGINE=${CONTAINER_ENGINE}")
+    if (env.CONTAINER_ENGINE_TLS_OPTIONS) {
+        args.add("BUILD_ENGINE_TLS_OPTIONS=${CONTAINER_ENGINE_TLS_OPTIONS}")   
+    }
     return args.join(' ')
 }
 
@@ -222,5 +230,8 @@ boolean isProdCI() {
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
-}
+    return sh(returnStdout: stdout, script: """
+source ~/virtenvs/cekit/bin/activate 
+${cmd}
+""")
+}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 009133453ab..01acc60d23b 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -10,7 +10,7 @@ TEST_FAILED_IMAGES = []
 
 pipeline {
     agent {
-        label 'kogito-image-slave && !built-in'
+        label 'kie-rhel8 && docker && kie-mem24g && !built-in'
     }
 
     // Needed for local build
@@ -34,6 +34,10 @@ pipeline {
 
         JAVA_HOME = "${GRAALVM_HOME}"
 
+        // Linked to node label
+        CONTAINER_ENGINE='docker'
+        CONTAINER_TLS_OPTIONS=''
+
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
@@ -400,6 +404,10 @@ String getMakeBuildImageArgs() {
     if (getKogitoAppsUri()) {
         args.add("KOGITO_APPS_TARGET_URI=${getKogitoAppsUri()}")
     }
+    args.add("BUILD_ENGINE=${CONTAINER_ENGINE}")
+    if (env.CONTAINER_ENGINE_TLS_OPTIONS) {
+        args.add("BUILD_ENGINE_TLS_OPTIONS=${CONTAINER_ENGINE_TLS_OPTIONS}")   
+    }
     return args.join(' ')
 }
 
@@ -673,5 +681,8 @@ boolean isThereAnyChanges() {
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
+    return sh(returnStdout: stdout, script: """
+source ~/virtenvs/cekit/bin/activate 
+${cmd}
+""")
 }
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index a0a6af6dae8..7008d9864b0 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -20,6 +20,10 @@ pipeline {
 
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
+        // Linked to node label
+        CONTAINER_ENGINE='podman'
+        CONTAINER_TLS_OPTIONS='--tls-verify-false'
+
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 9d54a7d8b5c..ec93f174116 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -3,7 +3,7 @@ import org.jenkinsci.plugins.workflow.libs.Library
 
 pipeline {
     agent {
-        label 'kie-rhel8 && !built-in'
+        label 'rhel8 && podman && !built-in'
     }
 
     // Needed for local build
diff --git a/.ci/jenkins/Jenkinsfile.update-prod-version b/.ci/jenkins/Jenkinsfile.update-prod-version
index 6ec73f190a5..8715898b37b 100644
--- a/.ci/jenkins/Jenkinsfile.update-prod-version
+++ b/.ci/jenkins/Jenkinsfile.update-prod-version
@@ -2,7 +2,7 @@
 
 pipeline {
     agent {
-        label 'kie-rhel7 && !built-in'
+        label 'rhel8 && podman && !built-in'
     }
 
     options {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 52c0feb7a4a..301b1f23b92 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -104,8 +104,6 @@ void setupDeployJob(JobType jobType, String envName = '') {
         REPO_NAME: 'kogito-images',
         PROPERTIES_FILE_NAME: 'deployment.properties',
 
-        CONTAINER_ENGINE: 'docker',
-        CONTAINER_TLS_OPTIONS: '',
         MAX_REGISTRY_RETRIES: 3,
 
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
@@ -176,8 +174,6 @@ void setupPromoteJob(JobType jobType) {
         REPO_NAME: 'kogito-images',
         PROPERTIES_FILE_NAME: 'deployment.properties',
 
-        CONTAINER_ENGINE: 'podman',
-        CONTAINER_TLS_OPTIONS: '--tls-verify=false',
         MAX_REGISTRY_RETRIES: 3,
 
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
diff --git a/Makefile b/Makefile
index bf115fe7d4f..475e6bbf359 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"
 KOGITO_APPS_TARGET_BRANCH ?= main
 KOGITO_APPS_TARGET_URI ?= https://github.com/kiegroup/kogito-apps.git
 BUILD_ENGINE ?= docker
+BUILD_ENGINE_TLS_OPTIONS ?= ''
 .DEFAULT_GOAL := build
 CEKIT_CMD := cekit -v ${cekit_option}
 NATIVE := true
@@ -85,11 +86,11 @@ _push:
 .PHONY: push-image
 image_name=
 push-image:
-	${BUILD_ENGINE} push quay.io/kiegroup/${image_name}:${IMAGE_VERSION}
-	${BUILD_ENGINE} push quay.io/kiegroup/${image_name}:latest
+	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:${IMAGE_VERSION}
+	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:latest
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	@echo "${SHORTENED_LATEST_VERSION} will be pushed"
-	${BUILD_ENGINE} push quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
+	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
 endif
 
 
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 2eed9c0ac7c..262841d50c4 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -24,8 +24,8 @@ base_dir=`dirname $(${realPath} -s $0)`
 echo $base_dir
 . ${base_dir}/../../scripts/setup-maven.sh "$(mktemp)"
 
-CONTAINER_ENGINE="docker"
-MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS="-Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=${CONTAINER_ENGINE}"
+CONTAINER_ENGINE=${CONTAINER_ENGINE:-"docker"}
+MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS=${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS:-"-Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=${CONTAINER_ENGINE}"}
 
 NATIVE_BUILD=$1
 if [ -z $NATIVE_BUILD ]; then

From 78fffe0a0d4125660f43e78c4cc070844e860186 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 31 May 2023 21:19:38 -0300
Subject: [PATCH 576/709] [KOGITO-9225] - Disable continuous testing on dev
 images (#1549)

* [KOGITO-9225] - Disable continuous testing on dev images

Signed-off-by: Spolti <fspolti@redhat.com>

* review additions

Signed-off-by: Spolti <fspolti@redhat.com>

* review

Signed-off-by: Spolti <fspolti@redhat.com>

---------

Signed-off-by: Spolti <fspolti@redhat.com>
---
 RELEASE_NOTES.md                              |  2 ++
 .../devmode/runtime/added/run-app-devmode.sh  |  1 +
 .../kogito-swf/devmode/runtime/module.yaml    |  3 +++
 tests/features/kogito-swf-devmode.feature     | 25 ++++++++++++++++---
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 63b3cb7c31e..1bd62aa4f87 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,8 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
+- [KOGITO-9225](https://issues.redhat.com/browse/KOGITO-9225): [Dev-mode] Disable continuous testing on dev images
+- [KOGITO-9079](https://issues.redhat.com/browse/KOGITO-9079): Build the Quarkus app and the Maven repo zips during the build (Multi Stage builds)
 
 ## Bug Fixes
 - [KOGITO-9182](https://issues.redhat.com/browse/KOGITO-9182): [Dev-mode] Unset the maven offline property if the QUARKUS_EXTENSION env is set
diff --git a/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh b/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
index 5b8a5fef938..7a2e616e6a7 100755
--- a/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
+++ b/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
@@ -28,4 +28,5 @@ source "${script_dir_path}"/configure-jvm-mvn.sh
   -s "${MAVEN_SETTINGS_PATH}" \
   -DskipTests \
   -Dquarkus.http.host=0.0.0.0 \
+  -Dquarkus.test.continuous-testing=${QUARKUS_CONTINUOUS_TESTING:-disabled} \
   clean compile quarkus:dev
diff --git a/modules/kogito-swf/devmode/runtime/module.yaml b/modules/kogito-swf/devmode/runtime/module.yaml
index b828ea6c48f..3c700864b14 100644
--- a/modules/kogito-swf/devmode/runtime/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/module.yaml
@@ -13,6 +13,9 @@ envs:
   - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
     description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
     value: "false"
+  - name: QUARKUS_CONTINUOUS_TESTING
+    description: Whether to enable Quarkus continous testing on DevMode or not. Default to "disabled".
+    value: "disabled"
 
 artifacts:
   - image: builder
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 8b686515d6f..00c8b7edef8 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -14,6 +14,7 @@ Feature: Serverless Workflow devmode images
       | expected_status_code | 200               |
     And container log should contain --no-transfer-progress
     And container log should contain -Duser.home=/home/kogito -o
+    And container log should contain -Dquarkus.test.continuous-testing=disabled
     And container log should match regex Installed features:.*kubernetes
     And container log should match regex Installed features:.*kogito-serverless-workflow
     And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
@@ -23,11 +24,27 @@ Feature: Serverless Workflow devmode images
     And container log should match regex Installed features:.*kogito-addons-quarkus-jobs-service-embedded
     And container log should match regex Installed features:.*kogito-addons-quarkus-data-index-inmemory
 
+  Scenario: Verify if container starts correctly when continuous testing is enabled
+    When container is started with env
+      | variable                   | value    |
+      | SCRIPT_DEBUG               | true     |
+      | QUARKUS_CONTINUOUS_TESTING | enabled  |
+    Then check that page is served
+      | property             | value             |
+      | port                 | 8080              |
+      | path                 | /q/health/ready   |
+      | wait                 | 480               |
+      | request_method       | GET               |
+      | expected_status_code | 200               |
+    And container log should contain -Duser.home=/home/kogito
+    And container log should not contain /bin/mvn -B -X --batch-mode -o
+    And container log should contain -Dquarkus.test.continuous-testing=enabled
+
   Scenario: Verify if container starts correctly when QUARKUS_EXTENSIONS env is used
     When container is started with env
-      | variable            | value                                    |
-      | SCRIPT_DEBUG        | true                                     |
-      | QUARKUS_EXTENSIONS  | io.quarkus:quarkus-elytron-security-jdbc |
+      | variable                   | value                                    |
+      | SCRIPT_DEBUG               | true                                     |
+      | QUARKUS_EXTENSIONS         | io.quarkus:quarkus-elytron-security-jdbc |
     Then check that page is served
       | property             | value             |
       | port                 | 8080              |
@@ -109,4 +126,4 @@ Feature: Serverless Workflow devmode images
       | path                 | /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/workflowInstances |
       | request_method       | GET                                                                              |
       | wait                 | 480                                                                              |
-      | expected_status_code | 200                                                                              |
+      | expected_status_code | 200                                                                              |
\ No newline at end of file

From 7c792c587a66c064099d27c14ede61e7a8a9df9f Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 1 Jun 2023 11:58:50 +0200
Subject: [PATCH 577/709] KOGITO-9259 CI: Fix env variables missing (#1560)

* CI: Fix env variables missing

* corrections
---
 .ci/jenkins/Jenkinsfile.deploy  |  8 ++++----
 .ci/jenkins/Jenkinsfile.promote | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 01acc60d23b..fb918fd3114 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -36,7 +36,7 @@ pipeline {
 
         // Linked to node label
         CONTAINER_ENGINE='docker'
-        CONTAINER_TLS_OPTIONS=''
+        CONTAINER_ENGINE_TLS_OPTIONS=''
 
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
@@ -484,7 +484,7 @@ void pushImages() {
 
 void pushImage(String fullImageName) {
     retry(env.MAX_REGISTRY_RETRIES) {
-        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_TLS_OPTIONS} ${fullImageName}"
+        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${fullImageName}"
     }
 }
 
@@ -530,12 +530,12 @@ void loginOpenshift() {
 void loginOpenshiftRegistry() {
     loginOpenshift()
     // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
-    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_TLS_OPTIONS} ${env.OPENSHIFT_REGISTRY}"
+    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${env.OPENSHIFT_REGISTRY}"
 }
 
 void loginContainerRegistry(String registry, String credsId) {
     withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
-        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_TLS_OPTIONS} ${registry}"
+        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${registry}"
     }
 }
 
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 7008d9864b0..2d99181f06b 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -22,7 +22,7 @@ pipeline {
 
         // Linked to node label
         CONTAINER_ENGINE='podman'
-        CONTAINER_TLS_OPTIONS='--tls-verify-false'
+        CONTAINER_ENGINE_TLS_OPTIONS='--tls-verify-false'
 
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
@@ -251,7 +251,7 @@ void pullImages() {
 
 void pullImage(String fullImageName) {
     retry(env.MAX_REGISTRY_RETRIES) {
-        sh "${env.CONTAINER_ENGINE} pull ${env.CONTAINER_TLS_OPTIONS} ${fullImageName}"
+        sh "${env.CONTAINER_ENGINE} pull ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${fullImageName}"
     }
 }
 
@@ -287,7 +287,7 @@ void pushImages() {
 
 void pushImage(String fullImageName) {
     retry(env.MAX_REGISTRY_RETRIES) {
-        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_TLS_OPTIONS} ${fullImageName}"
+        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${fullImageName}"
     }
 }
 
@@ -381,12 +381,12 @@ void loginOpenshift() {
 void loginOpenshiftRegistry() {
     loginOpenshift()
     // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
-    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_TLS_OPTIONS} ${env.OPENSHIFT_REGISTRY}"
+    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${env.OPENSHIFT_REGISTRY}"
 }
 
 void loginContainerRegistry(String registry, String credsId) {
     withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
-        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_TLS_OPTIONS} ${registry}"
+        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${registry}"
     }
 }
 void readDeployProperties() {

From f1ee3ecd15c448785bd44946f46be95669a9c9cd Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Thu, 1 Jun 2023 15:39:52 +0200
Subject: [PATCH 578/709] update content_sets.yaml for aarch64 (#1550)

---
 content_sets.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/content_sets.yaml b/content_sets.yaml
index 73c13e114a0..1ec60cababa 100644
--- a/content_sets.yaml
+++ b/content_sets.yaml
@@ -19,3 +19,6 @@ ppc64le:
   - rhel-8-for-ppc64le-baseos-rpms
   - rhel-8-for-ppc64le-appstream-rpms
   - rhocp-4.7-for-rhel-8-ppc64le-rpms
+aarch64:
+  - rhel-8-for-aarch64-baseos-rpms
+  - rhel-8-for-aarch64-appstream-rpms

From 824dc1dccdd1588e3488b02f9f14d869b6f19485 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Fri, 2 Jun 2023 05:28:01 -0300
Subject: [PATCH 579/709] =?UTF-8?q?[KOGITO-9251]=20-=20[Dev-mode]=20KSW=20?=
 =?UTF-8?q?Discovery=20-=20You=20need=20to=20define=20a=20Kuber=E2=80=A6?=
 =?UTF-8?q?=20(#1554)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-9251] - [Dev-mode] KSW Discovery - You need to define a KubernetesServiceCatalog implementation

Signed-off-by: Spolti <fspolti@redhat.com>

* fix behave test

Signed-off-by: Spolti <fspolti@redhat.com>

---------

Signed-off-by: Spolti <fspolti@redhat.com>
---
 RELEASE_NOTES.md                                 |  1 +
 .../kogito-swf/devmode/build-config/module.yaml  |  2 +-
 tests/features/kogito-swf-devmode.feature        | 16 +++++++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1bd62aa4f87..5817bccda99 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -6,6 +6,7 @@
 
 ## Bug Fixes
 - [KOGITO-9182](https://issues.redhat.com/browse/KOGITO-9182): [Dev-mode] Unset the maven offline property if the QUARKUS_EXTENSION env is set
+- [KOGITO-9251](https://issues.redhat.com/browse/KOGITO-9251): [Dev-mode] KSW Discovery - You need to define a KubernetesServiceCatalog implementation
 
 ## Known Issues
 
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index 1f3dbf63b46..f57d2e41c57 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -7,4 +7,4 @@ envs:
   - name: "SCRIPT_DEBUG"
     value: "true"
   - name: QUARKUS_EXTENSIONS
-    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory
+    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION}
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 00c8b7edef8..5a4b9a4e05c 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -126,4 +126,18 @@ Feature: Serverless Workflow devmode images
       | path                 | /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/workflowInstances |
       | request_method       | GET                                                                              |
       | wait                 | 480                                                                              |
-      | expected_status_code | 200                                                                              |
\ No newline at end of file
+      | expected_status_code | 200                                                                              |
+
+  Scenario: Verify if container starts in devmode with service discovery property
+    When container is started with env
+      | variable          | value                                                                              |
+      | SCRIPT_DEBUG      | true                                                                               |
+      | MAVEN_ARGS_APPEND | -Dkogito.dataindex.ws.url=knative:services.v1.serving.knative.dev/namespace1/test2 |
+    Then check that page is served
+      | property             | value             |
+      | port                 | 8080              |
+      | path                 | /q/health/ready   |
+      | wait                 | 480               |
+      | request_method       | GET               |
+      | expected_status_code | 200               |
+    And container log should contain Service Discovery has failed on property [kogito.dataindex.ws.url

From de5815b7213f16d2da7790b6cd99352db198bc93 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 5 Jun 2023 10:56:54 +0200
Subject: [PATCH 580/709] KOGITO-9274 Cekit 4.6+ does not support some module
 version scheme (#1567)

---
 kogito-data-index-ephemeral-image.yaml        |  4 +--
 kogito-data-index-infinispan-image.yaml       |  4 +--
 kogito-data-index-mongodb-image.yaml          |  4 +--
 kogito-data-index-oracle-image.yaml           |  4 +--
 kogito-data-index-postgresql-image.yaml       |  4 +--
 kogito-explainability-image.yaml              |  4 +--
 kogito-jit-runner-image.yaml                  |  4 +--
 kogito-jobs-service-allinone-image.yaml       |  4 +--
 kogito-jobs-service-ephemeral-image.yaml      |  4 +--
 kogito-jobs-service-infinispan-image.yaml     |  4 +--
 kogito-jobs-service-mongodb-image.yaml        |  4 +--
 kogito-jobs-service-postgresql-image.yaml     |  4 +--
 kogito-management-console-image.yaml          |  4 +--
 kogito-runtime-jvm-image.yaml                 |  4 +--
 kogito-s2i-builder-image.yaml                 |  4 +--
 kogito-task-console-image.yaml                |  4 +--
 kogito-trusty-infinispan-image.yaml           |  4 +--
 kogito-trusty-postgresql-image.yaml           |  4 +--
 kogito-trusty-redis-image.yaml                |  4 +--
 kogito-trusty-ui-image.yaml                   |  4 +--
 logic-data-index-ephemeral-rhel8-image.yaml   |  4 +--
 .../20.x-java-1.8/configure                   | 19 ------------
 .../20.x-java-1.8/module.yaml                 | 25 ----------------
 .../20.x-java-11/module.yaml                  | 25 ----------------
 .../21.x-java-11/configure                    | 19 ------------
 .../21.x-java-11/module.yaml                  | 25 ----------------
 .../{20.x-java-11 => 22.3-java-11}/configure  |  0
 .../22.3-java-11/module.yaml                  | 26 +++++++++++++++++
 .../22.x-java-11/configure                    | 19 ------------
 .../22.x-java-11/module.yaml                  | 26 -----------------
 modules/kogito-maven/3.8.x-rpm/module.yaml    |  4 +--
 .../kogito-openjdk/1.8.0-headless/module.yaml | 25 ----------------
 modules/kogito-openjdk/1.8.0/module.yaml      | 29 -------------------
 .../{1.8.0 => 11-headless}/clean.sh           |  0
 .../kogito-openjdk/11-headless/module.yaml    |  7 +++--
 .../kogito-s2i-builder-native.feature         |  2 +-
 36 files changed, 76 insertions(+), 259 deletions(-)
 delete mode 100644 modules/kogito-graalvm-installer/20.x-java-1.8/configure
 delete mode 100644 modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
 delete mode 100644 modules/kogito-graalvm-installer/20.x-java-11/module.yaml
 delete mode 100644 modules/kogito-graalvm-installer/21.x-java-11/configure
 delete mode 100644 modules/kogito-graalvm-installer/21.x-java-11/module.yaml
 rename modules/kogito-graalvm-installer/{20.x-java-11 => 22.3-java-11}/configure (100%)
 create mode 100644 modules/kogito-graalvm-installer/22.3-java-11/module.yaml
 delete mode 100644 modules/kogito-graalvm-installer/22.x-java-11/configure
 delete mode 100644 modules/kogito-graalvm-installer/22.x-java-11/module.yaml
 delete mode 100644 modules/kogito-openjdk/1.8.0-headless/module.yaml
 delete mode 100644 modules/kogito-openjdk/1.8.0/module.yaml
 rename modules/kogito-openjdk/{1.8.0 => 11-headless}/clean.sh (100%)

diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index d8ef86070b7..ca4d1a1bcd7 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.community.ephemeral
diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml
index 75335c199a8..c0416aee7ab 100644
--- a/kogito-data-index-infinispan-image.yaml
+++ b/kogito-data-index-infinispan-image.yaml
@@ -52,8 +52,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.infinispan
diff --git a/kogito-data-index-mongodb-image.yaml b/kogito-data-index-mongodb-image.yaml
index 58e006edc86..fd091fc52a0 100644
--- a/kogito-data-index-mongodb-image.yaml
+++ b/kogito-data-index-mongodb-image.yaml
@@ -34,8 +34,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.mongodb
diff --git a/kogito-data-index-oracle-image.yaml b/kogito-data-index-oracle-image.yaml
index 1ab7c158403..f4f544ae395 100644
--- a/kogito-data-index-oracle-image.yaml
+++ b/kogito-data-index-oracle-image.yaml
@@ -34,8 +34,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.oracle
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index e1b417d8be3..546ebf9045a 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.postgresql
diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml
index a5c427d9d33..dab26f90266 100644
--- a/kogito-explainability-image.yaml
+++ b/kogito-explainability-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.explainability
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index e54461bf4a0..841a310395c 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -34,8 +34,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jit-runner
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index f8807d0dded..a83a110a8f9 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -40,8 +40,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.allinone
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index edd129de21a..497d8ef75ab 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.ephemeral
diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml
index 016865ee680..a772a679883 100644
--- a/kogito-jobs-service-infinispan-image.yaml
+++ b/kogito-jobs-service-infinispan-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.infinispan
diff --git a/kogito-jobs-service-mongodb-image.yaml b/kogito-jobs-service-mongodb-image.yaml
index 0e05ac87234..40577f658fe 100644
--- a/kogito-jobs-service-mongodb-image.yaml
+++ b/kogito-jobs-service-mongodb-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.mongodb
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index f24afbdfc69..98e2608b499 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.postgresql
diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml
index 21e8762af28..f604fdfaa75 100644
--- a/kogito-management-console-image.yaml
+++ b/kogito-management-console-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.management.console
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
index f56cdee0a75..17e630d6ca9 100644
--- a/kogito-runtime-jvm-image.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -49,8 +49,8 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.s2i.core
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
index 042689f1629..c72035d414e 100644
--- a/kogito-s2i-builder-image.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -62,8 +62,8 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.graalvm.installer
-      version: "22.3.0-java-11"
+    - name: org.kie.kogito.graalvm.java11.installer
+      version: "22.3"
     - name: org.kie.kogito.graalvm.scripts
     - name: org.kie.kogito.openjdk
       version: "11"
diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
index bca64292ad1..18ca8eaba93 100644
--- a/kogito-task-console-image.yaml
+++ b/kogito-task-console-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.task.console
diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml
index 59aa0424486..5e4807d8530 100644
--- a/kogito-trusty-infinispan-image.yaml
+++ b/kogito-trusty-infinispan-image.yaml
@@ -52,8 +52,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.infinispan
diff --git a/kogito-trusty-postgresql-image.yaml b/kogito-trusty-postgresql-image.yaml
index f55f14992be..d0e142566f7 100644
--- a/kogito-trusty-postgresql-image.yaml
+++ b/kogito-trusty-postgresql-image.yaml
@@ -34,8 +34,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.postgresql
diff --git a/kogito-trusty-redis-image.yaml b/kogito-trusty-redis-image.yaml
index 9e2815f2580..0964ab65963 100644
--- a/kogito-trusty-redis-image.yaml
+++ b/kogito-trusty-redis-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.redis
diff --git a/kogito-trusty-ui-image.yaml b/kogito-trusty-ui-image.yaml
index 543c019906d..b5d414945a5 100644
--- a/kogito-trusty-ui-image.yaml
+++ b/kogito-trusty-ui-image.yaml
@@ -37,8 +37,8 @@ modules:
     - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk
-      version: "11-headless"
+    - name: org.kie.kogito.openjdk.headless
+      version: "11"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.ui
diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
index 949614930ef..0269dbd5c5b 100644
--- a/logic-data-index-ephemeral-rhel8-image.yaml
+++ b/logic-data-index-ephemeral-rhel8-image.yaml
@@ -34,8 +34,8 @@ modules:
   - name: org.kie.kogito.image.dependencies
   - name: org.kie.kogito.system.user
   - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk
-    version: "11-headless"
+  - name: org.kie.kogito.openjdk.headless
+    version: "11"
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.prod.ephemeral
diff --git a/modules/kogito-graalvm-installer/20.x-java-1.8/configure b/modules/kogito-graalvm-installer/20.x-java-1.8/configure
deleted file mode 100644
index 40cb96d146a..00000000000
--- a/modules/kogito-graalvm-installer/20.x-java-1.8/configure
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-architecture=$(uname -i)
-
-if [ "$architecture" != x86_64 ]; then
-    exit 0;
-fi
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr/share/graalvm
-
-#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
-mkdir -p "${KOGITO_HOME}"/ssl-libs
-cp -v "$GRAALVM_HOME"/jre/lib/amd64/libsunec.so "${KOGITO_HOME}"/ssl-libs
-cp -v "$GRAALVM_HOME"/jre/lib/security/cacerts "${KOGITO_HOME}"/
diff --git a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml b/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
deleted file mode 100644
index b303983fffd..00000000000
--- a/modules/kogito-graalvm-installer/20.x-java-1.8/module.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.graalvm.installer
-version: "20.2.0-java-1.8"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_HOME"
-    value: "/usr/share/graalvm"
-  #version without prefix ce
-  - name: "GRAALVM_VERSION"
-    value: "20.2.0"
-  - name: "GRAALVM_JAVA_VERSION"
-    value: "8"
-
-artifacts:
-  - name: graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java8-linux-amd64-20.2.0.tar.gz
-    md5: 1bde5d9638c13c5b50e7628eb045b6f7
-  - name: native-image-installable-svm-java8-linux-amd64-20.2.0.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java8-linux-amd64-20.2.0.jar
-    md5: 7b41bbd2c7ba5e731167348df31765d5
-
-execute:
-  - script: configure
diff --git a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml b/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
deleted file mode 100644
index 0e7ece6254e..00000000000
--- a/modules/kogito-graalvm-installer/20.x-java-11/module.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.graalvm.installer
-version: "20.2.0-java-11"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_HOME"
-    value: "/usr/share/graalvm"
-  #version without prefix ce
-  - name: "GRAALVM_VERSION"
-    value: "20.2.0"
-  - name: "GRAALVM_JAVA_VERSION"
-    value: "11"
-
-artifacts:
-  - name: graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/graalvm-ce-java11-linux-amd64-20.2.0.tar.gz
-    md5: 17669cb10b439c0522b4d56a6b277e85
-  - name: native-image-installable-svm-java11-linux-amd64-20.2.0.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.2.0/native-image-installable-svm-java11-linux-amd64-20.2.0.jar
-    md5: 574dc13cde215d1098f349a07b0e6592
-
-execute:
-  - script: configure
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/configure b/modules/kogito-graalvm-installer/21.x-java-11/configure
deleted file mode 100644
index b16cd087e26..00000000000
--- a/modules/kogito-graalvm-installer/21.x-java-11/configure
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-architecture=$(uname -i)
-
-if [ "$architecture" != x86_64 ]; then
-    exit 0;
-fi
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr/share/graalvm
-
-#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
-mkdir -p "${KOGITO_HOME}"/ssl-libs
-cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
-cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
diff --git a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml b/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
deleted file mode 100644
index 11755a670a6..00000000000
--- a/modules/kogito-graalvm-installer/21.x-java-11/module.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.graalvm.installer
-version: "21.3.1-java-11"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_HOME"
-    value: "/usr/share/graalvm"
-  #version without prefix ce
-  - name: "GRAALVM_VERSION"
-    value: "21.3.1"
-  - name: "GRAALVM_JAVA_VERSION"
-    value: "11"
-
-artifacts:
-  - name: graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/graalvm-ce-java11-linux-amd64-21.3.1.tar.gz
-    md5: 6dee8a2f8c81c974f8a7d782c4d78b81
-  - name: native-image-installable-svm-java11-linux-amd64-21.3.1.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.1/native-image-installable-svm-java11-linux-amd64-21.3.1.jar
-    md5: aa5a819fba0fbaeea7d77e989f53fdc5
-
-execute:
-  - script: configure
diff --git a/modules/kogito-graalvm-installer/20.x-java-11/configure b/modules/kogito-graalvm-installer/22.3-java-11/configure
similarity index 100%
rename from modules/kogito-graalvm-installer/20.x-java-11/configure
rename to modules/kogito-graalvm-installer/22.3-java-11/configure
diff --git a/modules/kogito-graalvm-installer/22.3-java-11/module.yaml b/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
new file mode 100644
index 00000000000..4e4006faf6e
--- /dev/null
+++ b/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
@@ -0,0 +1,26 @@
+schema_version: 1
+name: org.kie.kogito.graalvm.java11.installer
+version: "22.3"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/usr/share/graalvm"
+  #version without prefix ce
+  - name: "GRAALVM_VERSION"
+    value: "22.3.2"
+  - name: "GRAALVM_JAVA_VERSION"
+    value: "11"
+
+artifacts:
+  - name: graalvm-ce-java11-linux-amd64-22.3.2.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java11-linux-amd64-22.3.2.tar.gz
+    md5: 68c9e14932ac6c8606953b88aff89cf4
+  - name: native-image-installable-svm-java11-linux-amd64-22.3.2.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/native-image-installable-svm-java11-linux-amd64-22.3.2.jar
+    md5: dae44733baf47ffaadf7ef98959b5653
+
+execute:
+  - script: configure
+
diff --git a/modules/kogito-graalvm-installer/22.x-java-11/configure b/modules/kogito-graalvm-installer/22.x-java-11/configure
deleted file mode 100644
index b16cd087e26..00000000000
--- a/modules/kogito-graalvm-installer/22.x-java-11/configure
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-architecture=$(uname -i)
-
-if [ "$architecture" != x86_64 ]; then
-    exit 0;
-fi
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr/share/graalvm
-
-#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
-mkdir -p "${KOGITO_HOME}"/ssl-libs
-cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
-cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
diff --git a/modules/kogito-graalvm-installer/22.x-java-11/module.yaml b/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
deleted file mode 100644
index dc786df6c8e..00000000000
--- a/modules/kogito-graalvm-installer/22.x-java-11/module.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.graalvm.installer
-version: "22.3.0-java-11"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_HOME"
-    value: "/usr/share/graalvm"
-  #version without prefix ce
-  - name: "GRAALVM_VERSION"
-    value: "22.3.0"
-  - name: "GRAALVM_JAVA_VERSION"
-    value: "11"
-
-artifacts:
-  - name: graalvm-ce-java11-linux-amd64-22.3.0.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/graalvm-ce-java11-linux-amd64-22.3.0.tar.gz
-    md5: 176480a02899aa6d13220c64a8931c57
-  - name: native-image-installable-svm-java11-linux-amd64-22.3.0.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.0/native-image-installable-svm-java11-linux-amd64-22.3.0.jar
-    md5: 89bd4beb457cf3f338b3767d8ff16e4a
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
index e4a777d79d5..843bc5c6543 100644
--- a/modules/kogito-maven/3.8.x-rpm/module.yaml
+++ b/modules/kogito-maven/3.8.x-rpm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
-name: org.kie.kogito.maven
-version: "3.8-rpm"
+name: org.kie.kogito.maven.rpm
+version: "3.8"
 
 envs:
   - name: "MAVEN_VERSION"
diff --git a/modules/kogito-openjdk/1.8.0-headless/module.yaml b/modules/kogito-openjdk/1.8.0-headless/module.yaml
deleted file mode 100644
index ea9cbd7451b..00000000000
--- a/modules/kogito-openjdk/1.8.0-headless/module.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.openjdk
-version: "1.8.0-headless"
-
-labels:
-  - name: "com.redhat.component"
-    value: "jboss-openjdk18-rhel7-container"
-  - name: "org.jboss.product"
-    value: "openjdk"
-  - name: "org.jboss.product.version"
-    value: "1.8.0"
-  - name: "org.jboss.product.openjdk.version"
-    value: "1.8.0"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/lib/jvm/java-1.8.0"
-  - name: "JAVA_VENDOR"
-    value: "openjdk"
-  - name: "JAVA_VERSION"
-    value: "1.8.0"
-
-packages:
-  install:
-    - java-1.8.0-openjdk-headless
diff --git a/modules/kogito-openjdk/1.8.0/module.yaml b/modules/kogito-openjdk/1.8.0/module.yaml
deleted file mode 100644
index 575fc8184e6..00000000000
--- a/modules/kogito-openjdk/1.8.0/module.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-schema_version: 1
-name: org.kie.kogito.openjdk
-version: "1.8.0"
-
-labels:
-  - name: "com.redhat.component"
-    value: "jboss-openjdk18-rhel7-container"
-  - name: "org.jboss.product"
-    value: "openjdk"
-  - name: "org.jboss.product.version"
-    value: "1.8.0"
-  - name: "org.jboss.product.openjdk.version"
-    value: "1.8.0"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/lib/jvm/java-1.8.0"
-  - name: "JAVA_VENDOR"
-    value: "openjdk"
-  - name: "JAVA_VERSION"
-    value: "1.8.0"
-
-execute:
-  - script: clean.sh
-
-packages:
-  install:
-    - java-1.8.0-openjdk-devel
-
diff --git a/modules/kogito-openjdk/1.8.0/clean.sh b/modules/kogito-openjdk/11-headless/clean.sh
similarity index 100%
rename from modules/kogito-openjdk/1.8.0/clean.sh
rename to modules/kogito-openjdk/11-headless/clean.sh
diff --git a/modules/kogito-openjdk/11-headless/module.yaml b/modules/kogito-openjdk/11-headless/module.yaml
index be734f40357..55a7daa4f55 100644
--- a/modules/kogito-openjdk/11-headless/module.yaml
+++ b/modules/kogito-openjdk/11-headless/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
-name: org.kie.kogito.openjdk
-version: "11-headless"
+name: org.kie.kogito.openjdk.headless
+version: "11"
 
 labels:
   - name: "com.redhat.component"
@@ -20,6 +20,9 @@ envs:
   - name: "JAVA_VERSION"
     value: "11"
 
+execute:
+  - script: clean.sh
+
 packages:
   install:
     - java-11-openjdk-headless
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 363c04fbbdc..6153a915699 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -12,7 +12,7 @@ Feature: kogito-s2i-builder image native build tests
     And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.3.0
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.3.2
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
     Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest

From 5deed9520581ff3c4142ed43d703cc3d54046cd2 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Thu, 8 Jun 2023 08:28:17 -0300
Subject: [PATCH 581/709] =?UTF-8?q?[KOGITO-9217]=20-=20Do=20not=20fail=20t?=
 =?UTF-8?q?he=20Dev=20mode=20Container=20Image=20if=20the=20workf=E2=80=A6?=
 =?UTF-8?q?=20(#1568)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-9217] - Do not fail the Dev mode Container Image if the workflow is invalid

Signed-off-by: Spolti <fspolti@redhat.com>

* Update tests/features/kogito-swf-devmode.feature

---------

Signed-off-by: Spolti <fspolti@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 RELEASE_NOTES.md                               | 1 +
 modules/kogito-swf/devmode/runtime/module.yaml | 3 +++
 tests/features/kogito-swf-devmode.feature      | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 5817bccda99..1c35924e63b 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -3,6 +3,7 @@
 ## Enhancements
 - [KOGITO-9225](https://issues.redhat.com/browse/KOGITO-9225): [Dev-mode] Disable continuous testing on dev images
 - [KOGITO-9079](https://issues.redhat.com/browse/KOGITO-9079): Build the Quarkus app and the Maven repo zips during the build (Multi Stage builds)
+- [KOGITO-9217](https://issues.redhat.com/browse/KOGITO-9217): Do not fail the Dev mode Container Image if the workflow is invalid
 
 ## Bug Fixes
 - [KOGITO-9182](https://issues.redhat.com/browse/KOGITO-9182): [Dev-mode] Unset the maven offline property if the QUARKUS_EXTENSION env is set
diff --git a/modules/kogito-swf/devmode/runtime/module.yaml b/modules/kogito-swf/devmode/runtime/module.yaml
index 3c700864b14..17f11b55449 100644
--- a/modules/kogito-swf/devmode/runtime/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/module.yaml
@@ -16,6 +16,9 @@ envs:
   - name: QUARKUS_CONTINUOUS_TESTING
     description: Whether to enable Quarkus continous testing on DevMode or not. Default to "disabled".
     value: "disabled"
+  - name: KOGITO_CODEGEN_PROCESS_FAILONERROR
+    description: Boolean flag that will prevent Dev Mode to crash if the provided workflow is wrong.
+    value: "false"
 
 artifacts:
   - image: builder
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 5a4b9a4e05c..40303920a0c 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -141,3 +141,7 @@ Feature: Serverless Workflow devmode images
       | request_method       | GET               |
       | expected_status_code | 200               |
     And container log should contain Service Discovery has failed on property [kogito.dataindex.ws.url
+    
+  Scenario: Verify if container have the KOGITO_CODEGEN_PROCESS_FAILONERROR env set to false
+    When container is started with command bash
+    Then run sh -c 'echo $KOGITO_CODEGEN_PROCESS_FAILONERROR' in container and immediately check its output for false
\ No newline at end of file

From 6855a4fb30a8c3b1566e58ea08b6b36fe95574e1 Mon Sep 17 00:00:00 2001
From: Walter Medvedeo <wmedvedeo@gmail.com>
Date: Thu, 8 Jun 2023 17:54:05 +0200
Subject: [PATCH 582/709] KOGITO-9300: operator dev mode image shouldn't
 generate the kogito.yaml file (#1570)

* KOGITO-9300: operator dev mode image shouldn't generate the kogito.yaml file

* KOGITO-9300: operator dev mode image shouldn't generate the kogito.yaml file
    - Review suggestions
---
 RELEASE_NOTES.md                                    | 1 +
 modules/kogito-swf/devmode/build-config/module.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1c35924e63b..8dd288bea76 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -4,6 +4,7 @@
 - [KOGITO-9225](https://issues.redhat.com/browse/KOGITO-9225): [Dev-mode] Disable continuous testing on dev images
 - [KOGITO-9079](https://issues.redhat.com/browse/KOGITO-9079): Build the Quarkus app and the Maven repo zips during the build (Multi Stage builds)
 - [KOGITO-9217](https://issues.redhat.com/browse/KOGITO-9217): Do not fail the Dev mode Container Image if the workflow is invalid
+- [KOGITO-9300](https://issues.redhat.com/browse/KOGITO-9300): [Dev-mode] Operator dev mode image shouldn't generate the kogito.yaml file
 
 ## Bug Fixes
 - [KOGITO-9182](https://issues.redhat.com/browse/KOGITO-9182): [Dev-mode] Unset the maven offline property if the QUARKUS_EXTENSION env is set
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index f57d2e41c57..1284b2454cd 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -7,4 +7,4 @@ envs:
   - name: "SCRIPT_DEBUG"
     value: "true"
   - name: QUARKUS_EXTENSIONS
-    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION}
+    value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION}

From 7163a7d2a10ea0545befde9f5ba4cd769dac2de9 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 9 Jun 2023 16:13:31 +0200
Subject: [PATCH 583/709] CI: Push successfully built images (#1571)

---
 .ci/jenkins/Jenkinsfile.deploy | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index fb918fd3114..776380e0614 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -210,7 +210,7 @@ pipeline {
                                     } catch (err) {
                                         registerBuildFailedImage(image)
                                         util.archiveConsoleLog(image, 400)
-                                        throw err
+                                        unstable("Error building the '${image}' image")
                                     }
                                     if (!shouldSkipTests()) {
                                         try {
@@ -331,6 +331,15 @@ pipeline {
                 }
             }
         }
+        stage('Finalize') {
+            steps {
+                script {
+                    if (getBuildFailedImages()) {
+                        currentBuild.currentResult = 'FAILURE'
+                    }
+                }
+            }
+        }
     }
     post {
         always {

From 159c6700feebaad2a6014dab59aed58b7611ea5a Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 12 Jun 2023 09:21:23 +0200
Subject: [PATCH 584/709] KOGITO-9181 Build multiplatform (#1569)

* KOGITO-9181 Build multiplatform

* correction

* update

* update for aarch64

* Updated deploy file

* set back cekit_options

* update deploy file

* update

* update

* update

* added squash

* use shared lib for Python

* fix if no testing

* use shared libs

* use shared libs

* use shared libs

* update

* correction

* Updated promote pipeline
---
 .ci/jenkins/Jenkinsfile                       |  51 +++++--
 .ci/jenkins/Jenkinsfile.deploy                | 114 +++++++-------
 .ci/jenkins/Jenkinsfile.promote               | 141 ++++--------------
 .ci/jenkins/Jenkinsfile.setup-branch          |   2 +-
 Makefile                                      |   6 +-
 container.yaml                                |   1 +
 logic-data-index-ephemeral-rhel8-image.yaml   |   1 +
 .../22.3-java-11/configure                    |  10 +-
 .../22.3-java-11/module.yaml                  |   6 +
 modules/kogito-graalvm-scripts/configure      |  11 +-
 .../module.yaml                               |   2 +-
 .../kogito-jobs-service-ephemeral/module.yaml |   2 +-
 scripts/build-kogito-apps-components.sh       |   6 +-
 13 files changed, 159 insertions(+), 194 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index e656e06b767..d08ce32b103 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -21,8 +21,11 @@ pipeline {
         CI = true
 
         // Linked to node label
+        // Use docker due to multiplatform build
         CONTAINER_ENGINE='docker'
         CONTAINER_ENGINE_TLS_OPTIONS=''
+
+        IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64'
     }
     stages {
         stage('Initialization') {
@@ -36,6 +39,9 @@ pipeline {
                         // Prod fix to be able to build the image as a community one
                         sh "echo '' > content_sets.yaml"
                     }
+
+                    cloud.prepareForDockerMultiplatformBuild()
+                    cloud.startLocalRegistry()
                 }
             }
         }
@@ -149,17 +155,15 @@ pipeline {
 
 void clean() {
     cleanWorkspaces()
-    cleanImages()
+    util.cleanNode(env.CONTAINER_ENGINE)
+    
+    cloud.cleanDockerMultiplatformBuild()
+    cloud.cleanLocalRegistry()
 
     // Clean Cekit cache, in case we reuse an old node
     sh "rm -rf \$HOME/.cekit/cache"
 }
 
-void cleanImages() {
-    sh "docker rm -f \$(docker ps -a -q) || date"
-    sh "docker rmi -f \$(docker images -q) || date"
-}
-
 void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
     parallelStages = [:]
     getImages().each { image ->
@@ -173,10 +177,23 @@ void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
 }
 
 void buildImage(String imageName) {
-    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true ignore_tag=${isProdCI()}")
+    // Generate the Dockerfile
+    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true ignore_tag=true build_options='--dry-run'")
+
+    // Build multiplatform from generated Dockerfile
+    dir('target/image') {
+        cloud.dockerBuildMultiPlatformImages(getTempBuiltImageTag(imageName), getImageBuildPlatforms(), false)
+    }
 }
 
 void testImage(String imageName) {
+    String testImageTag = "quay.io/kiegroup/${imageName}:${getImageVersion()}"
+    String tempBuiltImageTag = getTempBuiltImageTag(imageName)
+    // Pull and tag to test image
+    sh """
+        docker pull ${tempBuiltImageTag}
+        docker tag ${tempBuiltImageTag} ${testImageTag}
+    """
     runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true ignore_tag=${isProdCI()}")
 }
 
@@ -225,13 +242,23 @@ String[] getImages() {
     return runPythonCommand("${listCmd} | tr '\\n' ','", true).trim().split(',')
 }
 
+List getImageBuildPlatforms() {
+    return "${IMAGE_BUILD_PLATFORMS}".split(',') as List
+}
+
+String getImageVersion() {
+    return runPythonCommand('make display-image-version', true).trim()
+}
+
 boolean isProdCI() {
     return env.PROD_CI ? env.PROD_CI.toBoolean() : false
 }
 
+String getTempBuiltImageTag(String imageName) {
+    return "localhost:5000/${imageName}:${githubscm.getCommitHash()}"
+}
+
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(returnStdout: stdout, script: """
-source ~/virtenvs/cekit/bin/activate 
-${cmd}
-""")
-}
\ No newline at end of file
+    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
+}
+
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 776380e0614..b122f41e5f4 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -35,14 +35,17 @@ pipeline {
         JAVA_HOME = "${GRAALVM_HOME}"
 
         // Linked to node label
-        CONTAINER_ENGINE='docker'
-        CONTAINER_ENGINE_TLS_OPTIONS=''
+        // Use docker due to multiplatform build
+        CONTAINER_ENGINE = 'docker'
+        CONTAINER_ENGINE_TLS_OPTIONS = ''
 
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
 
         BOT_BRANCH_HASH = "${util.generateHash(10)}"
+
+        IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64'
     }
 
     stages {
@@ -62,6 +65,17 @@ pipeline {
                         assert getProjectVersion()
                         assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())
                     }
+
+                    // Login to final registry
+                    if (isDeployImageInOpenshiftRegistry()) {
+                        loginOpenshiftRegistry()
+                    } else if (getDeployImageRegistryCredentials()) {
+                        loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials())
+                    }
+
+                    cloud.prepareForDockerMultiplatformBuild()
+                    cloud.startLocalRegistry()
+                    cloud.installSkopeo()
                 }
             }
             post {
@@ -237,22 +251,10 @@ pipeline {
                 }
             }
         }
-        stage('Tagging') {
-            steps {
-                script {
-                    tagImages()
-                }
-            }
-        }
-        stage('Pushing') {
+        stage('Push to registry') {
             steps {
                 script {
-                    if (isDeployImageInOpenshiftRegistry()) {
-                        loginOpenshiftRegistry()
-                    } else if (getDeployImageRegistryCredentials()) {
-                        loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials())
-                    }
-                    pushImages()
+                    pushFinalImages()
 
                     if (isQuayRegistry()) {
                         makeQuayImagesPublic()
@@ -388,22 +390,36 @@ void commitChanges(String commitMsg) {
 
 void clean() {
     cleanWs()
-    cleanImages()
+    util.cleanNode(env.CONTAINER_ENGINE)
+
+    cloud.cleanDockerMultiplatformBuild()
+    cloud.cleanLocalRegistry()
+    cloud.cleanSkopeo()
 
     // Clean Cekit cache, in case we reuse an old node
     sh 'rm -rf \$HOME/.cekit/cache'
 }
 
-void cleanImages() {
-    sh "${env.CONTAINER_ENGINE} rm -f \$(${env.CONTAINER_ENGINE} ps -a -q) || date"
-    sh "${env.CONTAINER_ENGINE} rmi -f \$(${env.CONTAINER_ENGINE} images -q) || date"
-}
-
 void buildImage(String imageName) {
-    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true")
+    // Generate the Dockerfile
+    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true ignore_tag=true build_options='--dry-run'")
+
+    // Build multiplatform from generated Dockerfile
+    String tempBuiltImageTag = getTempBuiltImageTag(imageName)
+    String squashMessage = "${imageName}:${getImageVersion()} squashed"
+    dir('target/image') {
+        cloud.dockerBuildMultiPlatformImages(tempBuiltImageTag, getImageBuildPlatforms(), true, squashMessage)
+    }
 }
 
 void testImage(String imageName) {
+    String testImageTag = "quay.io/kiegroup/${imageName}:${getImageVersion()}"
+    String tempBuiltImageTag = getTempBuiltImageTag(imageName)
+    // Pull and tag to test image
+    sh """
+        docker pull ${tempBuiltImageTag}
+        docker tag ${tempBuiltImageTag} ${testImageTag}
+    """
     runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true")
 }
 
@@ -415,7 +431,7 @@ String getMakeBuildImageArgs() {
     }
     args.add("BUILD_ENGINE=${CONTAINER_ENGINE}")
     if (env.CONTAINER_ENGINE_TLS_OPTIONS) {
-        args.add("BUILD_ENGINE_TLS_OPTIONS=${CONTAINER_ENGINE_TLS_OPTIONS}")   
+        args.add("BUILD_ENGINE_TLS_OPTIONS=${CONTAINER_ENGINE_TLS_OPTIONS}")
     }
     return args.join(' ')
 }
@@ -460,41 +476,22 @@ List getTestFailedImages() {
     return TEST_FAILED_IMAGES
 }
 
-void tagImages() {
-    for (String imageName : getBuiltImages()) {
-        String builtImageFullTag = "quay.io/kiegroup/${imageName}:latest"
-        tagImage(builtImageFullTag, buildImageName(imageName))
-        if (isDeployLatestTag()) {
-            tagImage(builtImageFullTag, buildImageName(imageName, 'latest'))
-        }
-        String reducedTag = getReducedTag()
-        if (reducedTag) {
-            tagImage(builtImageFullTag, buildImageName(imageName, reducedTag))
-        }
-    }
-}
-
-void tagImage(String oldImageName, String newImageName) {
-    sh "${env.CONTAINER_ENGINE} tag ${oldImageName} ${newImageName}"
-}
-
-void pushImages() {
+void pushFinalImages() {
     for (String imageName : getBuiltImages()) {
-        pushImage(buildImageName(imageName))
+        String tempBuiltImageTag = getTempBuiltImageTag(imageName)
+        pushFinalImage(tempBuiltImageTag, buildImageName(imageName))
         if (isDeployLatestTag()) {
-            pushImage(buildImageName(imageName, 'latest'))
+            pushFinalImage(tempBuiltImageTag, buildImageName(imageName, 'latest'))
         }
         String reducedTag = getReducedTag()
         if (reducedTag) {
-            pushImage(buildImageName(imageName, reducedTag))
+            pushFinalImage(tempBuiltImageTag, buildImageName(imageName, reducedTag))
         }
     }
 }
 
-void pushImage(String fullImageName) {
-    retry(env.MAX_REGISTRY_RETRIES) {
-        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${fullImageName}"
-    }
+void pushFinalImage(String oldImageName, String newImageName) {
+    cloud.skopeoCopyRegistryImages(oldImageName, newImageName, Integer.parseInt(env.MAX_REGISTRY_RETRIES))
 }
 
 // Set images public on quay. Useful when new images are introduced.
@@ -519,6 +516,10 @@ String getFinalImageName(String imageName) {
     return getDeployImageNameSuffix() ? "${imageName}-${getDeployImageNameSuffix()}" : imageName
 }
 
+String getImageVersion() {
+    return runPythonCommand('make display-image-version', true).trim()
+}
+
 String getReducedTag() {
     try {
         String version = getDeployImageTag()
@@ -675,6 +676,10 @@ boolean shouldSkipTests() {
     return params.SKIP_TESTS
 }
 
+List getImageBuildPlatforms() {
+    return "${IMAGE_BUILD_PLATFORMS}".split(',') as List
+}
+
 void setDeployPropertyIfNeeded(String key, def value) {
     if (value) {
         deployProperties[key] = value
@@ -689,9 +694,10 @@ boolean isThereAnyChanges() {
     return sh(script: 'git status --porcelain', returnStdout: true).trim() != ''
 }
 
+String getTempBuiltImageTag(String imageName) {
+    return "localhost:5000/${imageName}:${getImageVersion()}"
+}
+
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(returnStdout: stdout, script: """
-source ~/virtenvs/cekit/bin/activate 
-${cmd}
-""")
+    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
 }
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 2d99181f06b..21540adf3f6 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -21,8 +21,8 @@ pipeline {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
         // Linked to node label
-        CONTAINER_ENGINE='podman'
-        CONTAINER_ENGINE_TLS_OPTIONS='--tls-verify-false'
+        CONTAINER_ENGINE = 'podman'
+        CONTAINER_ENGINE_TLS_OPTIONS = '--tls-verify=false'
 
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
@@ -51,86 +51,34 @@ pipeline {
                         assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())
                     }
 
-                    dir(getRepoName()) {
-                        checkoutRepo()
-                    }
-
-                    installGitHubReleaseCLI()
-                }
-            }
-        }
-        // stage('Update PR with released Maven artifacts') {
-        //     when {
-        //         expression { return isRelease() && getPRSourceBranch() != '' }
-        //     }
-        //     steps {
-        //         script {
-        //             // Update maven information with new artifacts from Maven central in the PR
-        //             dir('artifacts-update') {
-        //                 checkoutRepo()
-        //                 githubscm.forkRepo(getBotAuthorCredsID())
-        //
-        //                 // Get the working branch
-        //                 sh 'git fetch origin'
-        //                 sh "git checkout ${getPRSourceBranch()}"
-        //
-        //                 // Update artifacts
-        //                 updateArtifactCmd = 'python3 scripts/update-maven-artifacts.py'
-        //                 if (getMavenArtifactRepository() != '') {
-        //                     updateArtifactCmd += " --repo-url ${getMavenArtifactRepository()}"
-        //                 }
-        //                 sh updateArtifactCmd
-        //
-        //                 try {
-        //                     githubscm.commitChanges('Setup Maven artifacts to released ones')
-        //                     githubscm.pushObject('origin', getPRSourceBranch(), getBotAuthorCredsID())
-        //                 } catch (err) {
-        //                     String body = "Seems like no change is to be committed.\nPlease review in ${env.BUILD_URL}console.\n" +
-        //                             "And take your decision here: ${env.BUILD_URL}input"
-        //                     sendNotification(body, 'Release Pipeline')
-        //                    input message: 'Should the pipeline continue ?', ok: 'Yes'
-        //                }
-        //            }
-        //        }
-        //    }
-        // }
-        stage('Pull "old" images') {
-            steps {
-                script {
+                    // Login old registry
                     if (isOldImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
                     } else if (getOldImageRegistryCredentials() != '') {
                         loginContainerRegistry(getOldImageRegistry(), getOldImageRegistryCredentials())
                     }
-                    dir(getRepoName()) {
-                        pullImages()
+
+                    // Login new registry
+                    if (isNewImageInOpenshiftRegistry()) {
+                        loginOpenshiftRegistry()
+                    } else if (getNewImageRegistryCredentials() != '') {
+                        loginContainerRegistry(getNewImageRegistry(), getNewImageRegistryCredentials())
                     }
-                }
-            }
-        }
-        stage('Tag images') {
-            steps {
-                script {
+
                     dir(getRepoName()) {
-                        tagImages()
+                        checkoutRepo()
                     }
+
+                    installGitHubReleaseCLI()
+                    cloud.installSkopeo()
                 }
             }
         }
-        stage('Pushing "new" images') {
+        stage('Promote images') {
             steps {
                 script {
-                    if (isNewImageInOpenshiftRegistry()) {
-                        loginOpenshiftRegistry()
-                    } else if (getNewImageRegistryCredentials() != '') {
-                        loginContainerRegistry(getNewImageRegistry(), getNewImageRegistryCredentials())
-                    }
                     dir(getRepoName()) {
-                        pushImages()
-
-                        if (isQuayRegistry(getNewImageRegistry())) {
-                            makeQuayNewImagesPublic()
-                        }
+                        promoteImages()
                     }
                 }
             }
@@ -212,10 +160,10 @@ void sendUnsuccessfulNotification() {
     }
 }
 
-void sendNotification(String body, String subjectProject = 'Kogito Images') {
+void sendNotification(String body) {
     emailext body: body,
         subject: getNotificationSubject()
-        to: env.KOGITO_CI_EMAIL_TO
+    to: env.KOGITO_CI_EMAIL_TO
 }
 
 String getNotificationSubject() {
@@ -235,60 +183,25 @@ void checkoutRepo() {
 
 void clean() {
     cleanWs()
-    cleanImages()
-}
-
-void cleanImages() {
-    sh "${env.CONTAINER_ENGINE} rm -f \$(${env.CONTAINER_ENGINE} ps -a -q) || date"
-    sh "${env.CONTAINER_ENGINE} rmi -f \$(${env.CONTAINER_ENGINE} images -q) || date"
-}
-
-void pullImages() {
-    for (String imageName : getImages()) {
-        pullImage(getOldImageFullTag(imageName))
-    }
-}
-
-void pullImage(String fullImageName) {
-    retry(env.MAX_REGISTRY_RETRIES) {
-        sh "${env.CONTAINER_ENGINE} pull ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${fullImageName}"
-    }
+    util.cleanNode()
+    cloud.cleanSkopeo()
 }
 
-void tagImages() {
+void promoteImages() {
     for (String imageName : getImages()) {
-        tagImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, getNewImageTag()))
+        promoteImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, getNewImageTag()))
         if (isDeployLatestTag()) {
-            tagImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, 'latest'))
+            promoteImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, 'latest'))
         }
         String reducedTag = getReducedTag()
         if (reducedTag) {
-            tagImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, reducedTag))
+            promoteImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, reducedTag))
         }
     }
 }
 
-void tagImage(String oldImageName, String newImageName) {
-    sh "${env.CONTAINER_ENGINE} tag ${oldImageName} ${newImageName}"
-}
-
-void pushImages() {
-    for (String imageName : getImages()) {
-        pushImage(getNewImageFullTag(imageName, getNewImageTag()))
-        if (isDeployLatestTag()) {
-            pushImage(getNewImageFullTag(imageName, 'latest'))
-        }
-        String reducedTag = getReducedTag()
-        if (reducedTag) {
-            pushImage(getNewImageFullTag(imageName, reducedTag))
-        }
-    }
-}
-
-void pushImage(String fullImageName) {
-    retry(env.MAX_REGISTRY_RETRIES) {
-        sh "${env.CONTAINER_ENGINE} push ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${fullImageName}"
-    }
+void promoteImage(String oldImageName, String newImageName) {
+    cloud.skopeoCopyRegistryImages(oldImageName, newImageName, Integer.parseInt(env.MAX_REGISTRY_RETRIES))
 }
 
 // Set images public on quay. Useful when new images are introduced.
@@ -552,5 +465,5 @@ String[] getImages() {
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
+    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
 }
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index ec93f174116..9e0e4459c38 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -182,5 +182,5 @@ String getCleanedReleaseNotes() {
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(script: "source ~/virtenvs/cekit/bin/activate && ${cmd}", returnStdout: stdout)
+    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
 }
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 475e6bbf359..e50f92b093f 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ build-image: clone-repos _build-image
 _build-image:
 ifneq ($(ignore_build),true)
 	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
-	${CEKIT_CMD} --descriptor ${image_name}-image.yaml build ${BUILD_ENGINE}
+	${CEKIT_CMD} --descriptor ${image_name}-image.yaml build ${build_options} ${BUILD_ENGINE}
 endif
 # tag with shortened version
 ifneq ($(ignore_tag),true)
@@ -69,7 +69,7 @@ build-prod-image: clone-repos _build-prod-image
 _build-prod-image:
 ifneq ($(ignore_build),true)
 	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
-	scripts/build-product-image.sh "build" $(image_name) ${BUILD_ENGINE}
+	scripts/build-product-image.sh "build" $(image_name) ${build_options} ${BUILD_ENGINE}
 endif
 # if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
@@ -121,4 +121,4 @@ bats:
 prod_component=
 container-build-osbs:
 	echo "calling RHPAM container-build-osbs......................................"
-	$(CEKIT_CMD) --descriptor $(prod_component).yaml --redhat build osbs --assume-yes
\ No newline at end of file
+	$(CEKIT_CMD) --descriptor $(prod_component).yaml --redhat build ${build_options} osbs --assume-yes
\ No newline at end of file
diff --git a/container.yaml b/container.yaml
index 2c58dce28ac..deb7d3dad27 100644
--- a/container.yaml
+++ b/container.yaml
@@ -2,5 +2,6 @@
 platforms:
   only:
     - x86_64
+    - aarch64
 compose:
   pulp_repos: true
diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
index 0269dbd5c5b..d6f867357f7 100644
--- a/logic-data-index-ephemeral-rhel8-image.yaml
+++ b/logic-data-index-ephemeral-rhel8-image.yaml
@@ -54,6 +54,7 @@ osbs:
       platforms:
         only:
         - x86_64
+        - aarch64
         - ppc64le
       compose:
         pulp_repos: true
diff --git a/modules/kogito-graalvm-installer/22.3-java-11/configure b/modules/kogito-graalvm-installer/22.3-java-11/configure
index b16cd087e26..5155cecc1f5 100644
--- a/modules/kogito-graalvm-installer/22.3-java-11/configure
+++ b/modules/kogito-graalvm-installer/22.3-java-11/configure
@@ -3,14 +3,18 @@ set -e
 
 architecture=$(uname -i)
 
-if [ "$architecture" != x86_64 ]; then
-    exit 0;
+if [ "$architecture" = "x86_64" ]; then
+    arch='amd64'
+elif [ "$architecture" = "aarch64" ]; then
+    arch='aarch64'
+else
+    exit 0
 fi
 
 SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 
-tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".tar.gz -C /usr/share
+tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}".tar.gz -C /usr/share
 mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr/share/graalvm
 
 #KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
diff --git a/modules/kogito-graalvm-installer/22.3-java-11/module.yaml b/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
index 4e4006faf6e..551734f7498 100644
--- a/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
@@ -17,9 +17,15 @@ artifacts:
   - name: graalvm-ce-java11-linux-amd64-22.3.2.tar.gz
     url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java11-linux-amd64-22.3.2.tar.gz
     md5: 68c9e14932ac6c8606953b88aff89cf4
+  - name: graalvm-ce-java11-linux-aarch64-22.3.2.tar.gz
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java11-linux-aarch64-22.3.2.tar.gz
+    md5: 5cb31954ef5538057d83502c19492ad0
   - name: native-image-installable-svm-java11-linux-amd64-22.3.2.jar
     url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/native-image-installable-svm-java11-linux-amd64-22.3.2.jar
     md5: dae44733baf47ffaadf7ef98959b5653
+  - name: native-image-installable-svm-java11-linux-aarch64-22.3.2.jar
+    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/native-image-installable-svm-java11-linux-aarch64-22.3.2.jar
+    md5: 9d87d8650aa17e2ec375a587dc445651
 
 execute:
   - script: configure
diff --git a/modules/kogito-graalvm-scripts/configure b/modules/kogito-graalvm-scripts/configure
index 77f615b55b6..025dea6b93c 100644
--- a/modules/kogito-graalvm-scripts/configure
+++ b/modules/kogito-graalvm-scripts/configure
@@ -2,9 +2,14 @@
 set -e
 
 architecture=$(uname -i)
+arch=${architecture}
 
-if [ "$architecture" != x86_64 ]; then
-    exit 0;
+if [ "$architecture" = "x86_64" ]; then
+    arch='amd64'
+elif [ "$architecture" = "aarch64" ]; then
+    arch='aarch64'
+else
+    exit 0
 fi
 
 SOURCES_DIR=/tmp/artifacts
@@ -12,4 +17,4 @@ SCRIPT_DIR=$(dirname "${0}")
 
 cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
 
-/usr/share/graalvm/bin/gu -L install "${SOURCES_DIR}"/native-image-installable-svm-java"${GRAALVM_JAVA_VERSION}"-linux-amd64-"${GRAALVM_VERSION}".jar
+/usr/share/graalvm/bin/gu -L install "${SOURCES_DIR}"/native-image-installable-svm-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}".jar
diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml
index f110eb95218..56bdb28966b 100644
--- a/modules/kogito-jobs-service-all-in-one/module.yaml
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -14,7 +14,7 @@ artifacts:
 
 packages:
   install:
-    - pam.x86_64
+    - pam
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 4c0917ee0db..cb817ae3a9d 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -10,7 +10,7 @@ artifacts:
 
 packages:
   install:
-    - pam.x86_64
+    - pam
 
 execute:
   - script: configure
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 713e0b503df..b8b11d79ae9 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -99,8 +99,10 @@ for ctx in ${contextDir}; do
 
     . ${script_dir_path}/setup-maven.sh "${build_target_dir}"/settings.xml
 
-    echo "Copy current maven repo to maven context local repo ${mvn_local_repo}"
-    cp -r ${HOME}/.m2/repository/* "${mvn_local_repo}"
+    if stat ${HOME}/.m2/repository/ &> /dev/null; then
+        echo "Copy current maven repo to maven context local repo ${mvn_local_repo}"
+        cp -r ${HOME}/.m2/repository/* "${mvn_local_repo}"
+    fi
 
     cd ${build_target_dir}
     echo "Using branch/tag ${gitBranch}, checking out. Temporary build dir is ${build_target_dir} and target dist is ${target_tmp_dir}"

From 117da649c20171ff7cc229b3d4b3722b7db81568 Mon Sep 17 00:00:00 2001
From: Davide Salerno <dsalerno@redhat.com>
Date: Mon, 12 Jun 2023 16:56:43 +0200
Subject: [PATCH 585/709] [KOGITO-9077] Restoring build-quarkus-app.sh and
 creating maven project to execute it (#1573)

* Restoring build-quarkus-app.sh and creating maven project to execute it

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* move build-quarkus-app.sh and pom.xml to maven folder

* create modules for quarkus-app and maven-repo

* parametrize the quarkus platform groupId

* do not call setup-maven.sh to create settings.xml

* rename artifactId to devMode

* inject extensions not available in RHBQ 2.13.x in serverless-workflow-project/pom.xml

* use GAV of extensions not available in RHBA 2.13.x instead of injecting them in the pom.xml

* move files from maven folder to scripts/logic folder

* remove PME changes that was commited accidentally

* Apply suggestions from code review

Co-authored-by: Tristan Radisson <tradisso@redhat.com>

* update build-quarkus-app.sh parameters comment

---------

Signed-off-by: Davide Salerno <dsalerno@redhat.com>
Co-authored-by: Roberto Oliveira <rguimara@redhat.com>
Co-authored-by: Roberto Oliveira <robertoguimaraes8@gmail.com>
Co-authored-by: Tristan Radisson <tradisso@redhat.com>
---
 scripts/logic/build-quarkus-app.sh | 121 +++++++++++++++++++++++++++++
 scripts/logic/maven-repo/pom.xml   |  40 ++++++++++
 scripts/logic/pom.xml              |  66 ++++++++++++++++
 scripts/logic/quarkus-app/pom.xml  |  40 ++++++++++
 4 files changed, 267 insertions(+)
 create mode 100755 scripts/logic/build-quarkus-app.sh
 create mode 100644 scripts/logic/maven-repo/pom.xml
 create mode 100644 scripts/logic/pom.xml
 create mode 100644 scripts/logic/quarkus-app/pom.xml

diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
new file mode 100755
index 00000000000..e3bd9c8d2e0
--- /dev/null
+++ b/scripts/logic/build-quarkus-app.sh
@@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+# Parameters:
+#   1 - Image name
+#   2 - Quarkus platform group id
+#   3 - Quarkus platform version
+#   4 - Kogito version
+# Note that all parameters are required and can't be empty
+
+# fast fail
+set -e
+set -o pipefail
+
+# Read entries before sourcing
+image_name="${1}"
+quarkus_platform_groupid="${2}"
+quarkus_platform_version="${3}"
+kogito_version="${KOGITO_VERSION:-${4}}"
+
+# common extensions used by the kogito-swf-builder and kogito-swf-devmode
+quarkus_extensions='quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health'
+# dev mode purpose extensions used only by the kogito-swf-devmode
+kogito_swf_devmode_extensions='kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files'
+# devmode extensions that are not available in RHBQ 2.13.x
+kogito_swf_devmode_extensions_2_16="org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version},org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version}"
+
+if [ -z ${quarkus_platform_version} ]; then
+    echo "Please provide the quarkus version"
+    exit 1
+fi
+
+case ${image_name} in
+    "kogito-swf-builder")        ;;
+    "kogito-swf-devmode")
+        quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions},${kogito_swf_devmode_extensions_2_16}"
+        ;;
+    *)
+        echo "${image_name} is not a quarkus app image, exiting..."
+        exit 0
+        ;;
+esac
+
+
+target_tmp_dir="/tmp/build/${image_name}"
+build_target_dir="/tmp/${image_name}"
+mvn_local_repo="/tmp/temp_maven/${image_name}"
+
+rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
+rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
+if [ "${CI}" = "true" ]; then
+    # On CI we want to make sure we remove all artifacts from maven repo
+    rm -rf ${mvn_local_repo}
+fi
+mkdir -p ${mvn_local_repo}
+
+set -x
+echo "Create quarkus project to path ${build_target_dir}"
+cd ${build_target_dir}
+mvn ${MAVEN_OPTIONS} \
+    -Dmaven.repo.local=${mvn_local_repo} \
+    -DprojectGroupId="org.acme" \
+    -DprojectArtifactId="serverless-workflow-project" \
+    -DprojectVersionId="1.0.0-SNAPSHOT" \
+    -DplatformVersion="${quarkus_platform_version}" \
+    -Dextensions="${quarkus_extensions}" \
+    "${quarkus_platform_groupid}":quarkus-maven-plugin:"${quarkus_platform_version}":create
+
+# Fix as we cannot rely on Quarkus platform
+# Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented
+if [ ! -z ${kogito_version} ]; then
+    echo "Replacing Kogito Platform BOM with version ${kogito_version}"
+    # [ ]* -> is a regexp pattern to match any number of spaces
+    pattern_1="[ ]*<groupId>.*<\/groupId>"
+    pattern_2="[ ]*<artifactId>quarkus-kogito-bom<\/artifactId>\n"
+    pattern_3="[ ]*<version>.*<\/version>\n"
+    complete_pattern="$pattern_1\n$pattern_2$pattern_3"
+
+    replace_1="        <groupId>org.kie.kogito<\/groupId>\n"
+    replace_2="        <artifactId>kogito-bom<\/artifactId>\n"
+    replace_3="        <version>${kogito_version}<\/version>\n"
+    complete_replace="$replace_1$replace_2$replace_3"
+
+    sed -i.bak -e "/$pattern_1/{
+        N;N;N
+        s/$complete_pattern/$complete_replace/
+        }" serverless-workflow-project/pom.xml
+fi
+
+echo "Build quarkus app"
+cd "serverless-workflow-project"
+# Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
+# This avoids to have, for example, Quarkus BOMs or other artifacts with multiple versions.
+mvn ${MAVEN_OPTIONS} \
+    -DskipTests \
+    -Dmaven.repo.local=${mvn_local_repo} \
+    -Dquarkus.container-image.build=false \
+    clean install
+
+cd ${build_target_dir}
+
+#remove unnecessary files
+rm -rfv serverless-workflow-project/target
+rm -rfv serverless-workflow-project/src/main/resources/*
+rm -rfv serverless-workflow-project/src/main/docker
+rm -rfv serverless-workflow-project/.mvn/wrapper
+rm -rfv serverless-workflow-project/mvnw*
+rm -rfv serverless-workflow-project/src/test
+rm -rfv serverless-workflow-project/*.bak
+
+# Maven useless files
+# Needed to avoid Maven to automatically re-download from original Maven repository ...
+find ${mvn_local_repo} -name _remote.repositories -type f -delete
+find ${mvn_local_repo} -name _maven.repositories -type f -delete
+find ${mvn_local_repo} -name *.lastUpdated -type f -delete
+
+echo "Zip and copy scaffold project"
+zip -r ${image_name}-quarkus-app.zip serverless-workflow-project/
+cp -v ${image_name}-quarkus-app.zip ${target_tmp_dir}/
+echo "Zip and copy maven repo"
+cd ${mvn_local_repo}
+zip -r ${image_name}-maven-repo.zip *
+cp -v ${image_name}-maven-repo.zip ${target_tmp_dir}/
\ No newline at end of file
diff --git a/scripts/logic/maven-repo/pom.xml b/scripts/logic/maven-repo/pom.xml
new file mode 100644
index 00000000000..837ec8d9d94
--- /dev/null
+++ b/scripts/logic/maven-repo/pom.xml
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-devmode-quarkus-app-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>kogito-devmode-maven-repository</artifactId>
+    <name>Kogito Dev Mode Quarkus App - Maven repository zip</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>/tmp/build/${build.quarkusapp.argument.imagename}/${build.quarkusapp.argument.imagename}-maven-repo.zip</file>
+                                    <type>zip</type>
+                                    <classifier>image-build</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/scripts/logic/pom.xml b/scripts/logic/pom.xml
new file mode 100644
index 00000000000..82d391ae26a
--- /dev/null
+++ b/scripts/logic/pom.xml
@@ -0,0 +1,66 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.kie.kogito</groupId>
+    <artifactId>kogito-devmode-quarkus-app-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+
+    <name>Kogito Dev Mode Quarkus App</name>
+    <description>Maven project to build a Quarkus App with Kogito Serverless Worflow</description>
+    <packaging>pom</packaging>
+
+    <url>http://kogito.kie.org</url>
+    <inceptionYear>2019</inceptionYear>
+    <organization>
+        <name>JBoss by Red Hat</name>
+        <url>http://www.jboss.org/</url>
+    </organization>
+
+    <licenses>
+        <license>
+            <name>Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <properties>
+        <build.quarkusapp.argument.imagename>kogito-swf-devmode</build.quarkusapp.argument.imagename>
+        <build.quarkusapp.argument.quarkusplatform.groupid>io.quarkus.platform</build.quarkusapp.argument.quarkusplatform.groupid>
+        <build.quarkusapp.argument.quarkusplatform.version>2.16.7.Final</build.quarkusapp.argument.quarkusplatform.version>
+        <build.quarkusapp.argument.kogitoversion>1.39.0.Final</build.quarkusapp.argument.kogitoversion>
+    </properties>
+
+    <modules>
+        <module>quarkus-app</module>
+        <module>maven-repo</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>build-quarkus-app</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>${project.basedir}/build-quarkus-app.sh</executable>
+                    <arguments>
+                        <argument>${build.quarkusapp.argument.imagename}</argument>
+                        <argument>${build.quarkusapp.argument.quarkusplatform.groupid}</argument>
+                        <argument>${build.quarkusapp.argument.quarkusplatform.version}</argument>
+                        <argument>${build.quarkusapp.argument.kogitoversion}</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/scripts/logic/quarkus-app/pom.xml b/scripts/logic/quarkus-app/pom.xml
new file mode 100644
index 00000000000..7299bf7a70b
--- /dev/null
+++ b/scripts/logic/quarkus-app/pom.xml
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-devmode-quarkus-app-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>kogito-devmode-quarkus-app</artifactId>
+    <name>Kogito Dev Mode Quarkus App - Quarkus app zip</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>/tmp/build/${build.quarkusapp.argument.imagename}/${build.quarkusapp.argument.imagename}-quarkus-app.zip</file>
+                                    <type>zip</type>
+                                    <classifier>image-build</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

From bca284dad03b3ffd8aed46140f4bce61c1e1501f Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 12 Jun 2023 17:51:49 +0200
Subject: [PATCH 586/709] KOGITO-9333 Create Nightly quarkus-lts job (#1574)

This will only create
---
 .ci/jenkins/dsl/jobs.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 301b1f23b92..ba1f4a6029f 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -25,6 +25,7 @@ createSetupBranchJob()
 
 // Nightly jobs
 setupDeployJob(JobType.NIGHTLY)
+KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-lts')
 
 // Release jobs
 setupDeployJob(JobType.RELEASE)

From ee6fc0f46319f11adcb3fab8d8e437734d641eb5 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Tue, 13 Jun 2023 11:03:51 -0300
Subject: [PATCH 587/709] [KOGITO-9229] - Unify the jvm and mvn settings for
 devmode (#1551)

* [KOGITO-9229] - Unify the jvm and mvn settings for devmode

Signed-off-by: Spolti <fspolti@redhat.com>

* Update tests/features/kogito-swf-builder.feature

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* Update tests/features/kogito-swf-builder.feature

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* review changes

Signed-off-by: Spolti <fspolti@redhat.com>

* review

Signed-off-by: Spolti <fspolti@redhat.com>

* review additions

Signed-off-by: Spolti <fspolti@redhat.com>

* Update modules/kogito-swf/common/scripts/added/add-extension.sh

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* add back set -e

Signed-off-by: Spolti <fspolti@redhat.com>

---------

Signed-off-by: Spolti <fspolti@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 README.md                                     |  2 +-
 RELEASE_NOTES.md                              |  1 +
 kogito-swf-builder-image.yaml                 |  2 +-
 kogito-swf-devmode-image.yaml                 |  2 +-
 .../builder/build-config/module.yaml          |  2 +-
 .../common/scripts/added/add-extension.sh     | 23 +++++++------
 .../common/scripts/added/build-app.sh         | 34 +++++++++----------
 .../common/scripts/added/create-app.sh        |  1 +
 .../devmode/runtime/added/run-app-devmode.sh  | 26 +++++++-------
 tests/features/kogito-swf-builder.feature     |  4 +--
 10 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/README.md b/README.md
index 440f5d768f1..f7c8b91c7d0 100644
--- a/README.md
+++ b/README.md
@@ -187,7 +187,7 @@ COPY * ./resources/
 RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
 #=============================
 # Runtime Run
-ENTRYPOINT ['java', '-jar', 'target/quarkus-app/quarkus-run.jar']
+CMD /usr/bin/java -jar target/quarkus-app/quarkus-run.jar
 #=============================
 ```
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 8dd288bea76..739d1285ede 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -9,6 +9,7 @@
 ## Bug Fixes
 - [KOGITO-9182](https://issues.redhat.com/browse/KOGITO-9182): [Dev-mode] Unset the maven offline property if the QUARKUS_EXTENSION env is set
 - [KOGITO-9251](https://issues.redhat.com/browse/KOGITO-9251): [Dev-mode] KSW Discovery - You need to define a KubernetesServiceCatalog implementation
+- [KOGITO-9229](https://issues.redhat.com/browse/KOGITO-9229): Unify the jvm and mvn settings for devmode
 
 ## Known Issues
 
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 9f15b3b1fa1..04cd86fd562 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -66,5 +66,5 @@
         - name: org.kie.kogito.swf.builder.runtime
 
     run:
-      workdir: "/home/kogito"
+      workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
       user: 1001
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 65b9cf49f5d..e6e8f6aa084 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -68,7 +68,7 @@
       - value: 5005
 
     run:
-      workdir: "/home/kogito"
+      workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
       user: 1001
       cmd:
         - "/home/kogito/launch/run-app-devmode.sh"
diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index b621011448d..133eed56c1a 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -5,6 +5,6 @@ description: "Kogito Serverless Workflow builder image build configuration"
 
 envs:
   - name: "SCRIPT_DEBUG"
-    value: "true"
+    value: "false"
   - name: QUARKUS_EXTENSIONS
     value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health
diff --git a/modules/kogito-swf/common/scripts/added/add-extension.sh b/modules/kogito-swf/common/scripts/added/add-extension.sh
index ba505693359..2ef004a8cfa 100755
--- a/modules/kogito-swf/common/scripts/added/add-extension.sh
+++ b/modules/kogito-swf/common/scripts/added/add-extension.sh
@@ -2,25 +2,28 @@
 set -e
 
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+# extensions to be added, comma separated.
 extensions="$1"
+# parameter passed which will trigger or not the jvm/maven configuration.
+ignore_jvm_settings=${2:-false}
 
 source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
-    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
+    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode"
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
     printenv
 fi
 
-cd "${PROJECT_ARTIFACT_ID}"
-
-source "${script_dir_path}"/configure-jvm-mvn.sh
+if [ "${ignore_jvm_settings}" != "true" ]; then
+    source "${script_dir_path}"/configure-jvm-mvn.sh
+fi
 
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-  -nsu \
-  -s "${MAVEN_SETTINGS_PATH}" \
-  -DplatformVersion="${QUARKUS_PLATFORM_VERSION}" \
-  -Dextensions="${extensions}" \
-  ${QUARKUS_ADD_EXTENSION_ARGS} \
-  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":add-extension
+    -nsu \
+    -s "${MAVEN_SETTINGS_PATH}" \
+    -DplatformVersion="${QUARKUS_PLATFORM_VERSION}" \
+    -Dextensions="${extensions}" \
+    ${QUARKUS_ADD_EXTENSION_ARGS} \
+    io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":add-extension
diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
index be85de00cb7..fdc5fc24c66 100755
--- a/modules/kogito-swf/common/scripts/added/build-app.sh
+++ b/modules/kogito-swf/common/scripts/added/build-app.sh
@@ -4,7 +4,7 @@ set -e
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 resources_path="$1"
 if [ ! -z "${resources_path}" ]; then
-  resources_path="$(realpath "${resources_path}")"
+    resources_path="$(realpath "${resources_path}")"
 fi
 
 source "${script_dir_path}"/logging.sh
@@ -16,28 +16,26 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
-if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
-  log_info "Adding extensions '${QUARKUS_EXTENSIONS}'"
-  ${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}"
-fi
-
-cd "${PROJECT_ARTIFACT_ID}"
-
-source "${script_dir_path}"/configure-jvm-mvn.sh
-
 # Copy resources if exists
 SUPPORTED_FILES=(".yaml" ".yml" ".json" ".properties" ".mvn/jvm.config")
 log_info "-> Copying files from ${resources_path}, if any..."
 if [ ! -z "${resources_path}" ]; then
-  find "${resources_path}" -regex '.*\.\(yaml\|yml\|json\|properties\)$' -exec cp -v {} src/main/resources/ \;
-  find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
+    find "${resources_path}" -regex '.*\.\(yaml\|yml\|json\|properties\)$' -exec cp -v {} src/main/resources/ \;
+    find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
 else
-  log_warning "-> Nothing to copy from ${resources_path}"
+    log_warning "-> Nothing to copy from ${resources_path}"
+fi
+
+source "${script_dir_path}"/configure-jvm-mvn.sh
+
+if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
+    log_info "Adding extensions '${QUARKUS_EXTENSIONS}'"
+    ${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}" "true"
 fi
 
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-  -nsu \
-  -s "${MAVEN_SETTINGS_PATH}" \
-  -DskipTests \
-  -Dquarkus.container-image.build=false \
-  clean install
+    -nsu \
+    -s "${MAVEN_SETTINGS_PATH}" \
+    -DskipTests \
+    -Dquarkus.container-image.build=false \
+    clean install
diff --git a/modules/kogito-swf/common/scripts/added/create-app.sh b/modules/kogito-swf/common/scripts/added/create-app.sh
index be396019a91..4dd9134ebb5 100755
--- a/modules/kogito-swf/common/scripts/added/create-app.sh
+++ b/modules/kogito-swf/common/scripts/added/create-app.sh
@@ -49,6 +49,7 @@ if [ ! -z ${KOGITO_VERSION} ]; then
         }" pom.xml
 fi
 
+
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
   -nsu \
   -s "${MAVEN_SETTINGS_PATH}" \
diff --git a/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh b/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
index 7a2e616e6a7..7692dde4f83 100755
--- a/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
+++ b/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
@@ -12,21 +12,21 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
+# copy .mvn/jvm-config from resources to project's base dir.
+find . -maxdepth 5 -name  'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
+source "${script_dir_path}"/configure-jvm-mvn.sh
+
+# `-o` means offline mode
 offline_param="-o"
 if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
-  ${KOGITO_HOME}/launch/add-extension.sh "${QUARKUS_EXTENSIONS}"
-  offline_param=""
+    ${KOGITO_HOME}/launch/add-extension.sh "${QUARKUS_EXTENSIONS}" "true"
+    offline_param=""
 fi
 
-cd serverless-workflow-project
-
-source "${script_dir_path}"/configure-jvm-mvn.sh
-
-# `-o` means offline mode
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-  ${offline_param} \
-  -s "${MAVEN_SETTINGS_PATH}" \
-  -DskipTests \
-  -Dquarkus.http.host=0.0.0.0 \
-  -Dquarkus.test.continuous-testing=${QUARKUS_CONTINUOUS_TESTING:-disabled} \
-  clean compile quarkus:dev
+    ${offline_param} \
+    -s "${MAVEN_SETTINGS_PATH}" \
+    -DskipTests \
+    -Dquarkus.http.host=0.0.0.0 \
+    -Dquarkus.test.continuous-testing=${QUARKUS_CONTINUOUS_TESTING:-disabled} \
+    clean compile quarkus:dev
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 475e75d4d04..96c72b7073f 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -2,7 +2,7 @@
 Feature: Serverless Workflow builder images
 
   Scenario: Verify that the application is built and started correctly
-    When container is started with command bash -c 'launch/build-app.sh && java -jar serverless-workflow-project/target/quarkus-app/quarkus-run.jar'
+    When container is started with command bash -c '/home/kogito/launch/build-app.sh && java -jar target/quarkus-app/quarkus-run.jar'
       | variable     | value |
       | SCRIPT_DEBUG | true  |
     Then check that page is served
@@ -20,7 +20,7 @@ Feature: Serverless Workflow builder images
     And container log should match regex Installed features:.*smallrye-health
 
   Scenario: Verify that the application is built and started correctly when QUARKUS_EXTENSIONS env is used
-    When container is started with command bash -c 'launch/build-app.sh && java -jar serverless-workflow-project/target/quarkus-app/quarkus-run.jar'
+    When container is started with command bash -c '/home/kogito/launch/build-app.sh && java -jar target/quarkus-app/quarkus-run.jar'
       | variable            | value                                    |
       | SCRIPT_DEBUG        | true                                     |
       | QUARKUS_EXTENSIONS  | io.quarkus:quarkus-elytron-security-jdbc |

From 616a9b9c37432f6dc9275bd0b09348dbf7f69925 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Thu, 15 Jun 2023 04:30:07 -0400
Subject: [PATCH 588/709] [main] Update version to 2.0.0-snapshot

---
 RELEASE_NOTES.md                                 | 7 -------
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 8 ++++----
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 739d1285ede..42c9735b6a5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,15 +1,8 @@
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
-- [KOGITO-9225](https://issues.redhat.com/browse/KOGITO-9225): [Dev-mode] Disable continuous testing on dev images
-- [KOGITO-9079](https://issues.redhat.com/browse/KOGITO-9079): Build the Quarkus app and the Maven repo zips during the build (Multi Stage builds)
-- [KOGITO-9217](https://issues.redhat.com/browse/KOGITO-9217): Do not fail the Dev mode Container Image if the workflow is invalid
-- [KOGITO-9300](https://issues.redhat.com/browse/KOGITO-9300): [Dev-mode] Operator dev mode image shouldn't generate the kogito.yaml file
 
 ## Bug Fixes
-- [KOGITO-9182](https://issues.redhat.com/browse/KOGITO-9182): [Dev-mode] Unset the maven offline property if the QUARKUS_EXTENSION env is set
-- [KOGITO-9251](https://issues.redhat.com/browse/KOGITO-9251): [Dev-mode] KSW Discovery - You need to define a KubernetesServiceCatalog implementation
-- [KOGITO-9229](https://issues.redhat.com/browse/KOGITO-9229): Unify the jvm and mvn settings for devmode
 
 ## Known Issues
 
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 6153a915699..dc35587dea0 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 19ac340a547..3337992d5cf 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |             
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |              
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index eaa1888e8b8..a5184652ec5 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 6382783b600158a23f1b838c38576947c89c32f4 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Thu, 15 Jun 2023 11:08:29 +0200
Subject: [PATCH 589/709] [BXMSPROD-2063] build-quarkus-app.sh: allow to copy
 local deployed artifacts when running as part of nightly (#1576)

---
 scripts/logic/build-quarkus-app.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index e3bd9c8d2e0..eecee51eab1 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -52,6 +52,12 @@ if [ "${CI}" = "true" ]; then
 fi
 mkdir -p ${mvn_local_repo}
 
+if [ "${NIGHTLY}" = "true" ]; then
+    # In case of a nightly, the Kogito/Drools artifacts are not deployed anywhere, so they need to be copied
+    # inside the maven repo local folder
+    cp -rp ${NIGHTLY_DEPLOY_FOLDER}/* ${mvn_local_repo}
+fi
+
 set -x
 echo "Create quarkus project to path ${build_target_dir}"
 cd ${build_target_dir}

From 3ec20944375c0b586060b275b210942ee8547e85 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Thu, 15 Jun 2023 14:07:35 +0200
Subject: [PATCH 590/709] [KOGITO-9077] add maven modules for swf-builder image
 zip artifacts (#1578)

* add devmode prefix to modules and rename root pom to a generic name

* create builder-maven-repo and builder-quarkus-app modules and adjust root pom

* update kogito version to 1.40.0.Final

kogito-addons-quarkus-fabric8-kubernetes-service-catalog is only available from that version

* Updating build-quarkus-app.sh with quarkus_extensions for builder use case

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

---------

Signed-off-by: Davide Salerno <dsalerno@redhat.com>
Co-authored-by: Davide Salerno <dsalerno@redhat.com>
---
 .../builder/build-config/module.yaml          |  1 +
 .../devmode/build-config/module.yaml          |  1 +
 scripts/logic/build-quarkus-app.sh            |  4 +-
 scripts/logic/builder-maven-repo/pom.xml      | 40 +++++++++++++++
 scripts/logic/builder-quarkus-app/pom.xml     | 40 +++++++++++++++
 .../pom.xml                                   |  4 +-
 .../pom.xml                                   |  4 +-
 scripts/logic/pom.xml                         | 51 +++++++++++++------
 8 files changed, 124 insertions(+), 21 deletions(-)
 create mode 100644 scripts/logic/builder-maven-repo/pom.xml
 create mode 100644 scripts/logic/builder-quarkus-app/pom.xml
 rename scripts/logic/{maven-repo => devmode-maven-repo}/pom.xml (89%)
 rename scripts/logic/{quarkus-app => devmode-quarkus-app}/pom.xml (89%)

diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index 133eed56c1a..1d47bc81a01 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -7,4 +7,5 @@ envs:
   - name: "SCRIPT_DEBUG"
     value: "false"
   - name: QUARKUS_EXTENSIONS
+    # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index 1284b2454cd..79f6ac36bc3 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -7,4 +7,5 @@ envs:
   - name: "SCRIPT_DEBUG"
     value: "true"
   - name: QUARKUS_EXTENSIONS
+    # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION}
diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index eecee51eab1..3baceef0ff4 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -29,7 +29,9 @@ if [ -z ${quarkus_platform_version} ]; then
 fi
 
 case ${image_name} in
-    "kogito-swf-builder")        ;;
+    "kogito-swf-builder")
+        quarkus_extensions="${quarkus_extensions}"
+        ;;
     "kogito-swf-devmode")
         quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions},${kogito_swf_devmode_extensions_2_16}"
         ;;
diff --git a/scripts/logic/builder-maven-repo/pom.xml b/scripts/logic/builder-maven-repo/pom.xml
new file mode 100644
index 00000000000..a13ec8694a9
--- /dev/null
+++ b/scripts/logic/builder-maven-repo/pom.xml
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-image-build-artifacts-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>kogito-builder-maven-repository</artifactId>
+    <name>Kogito Builder Quarkus App - Maven repository zip</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>/tmp/build/${build.quarkusapp.argument.imagename.builder}/${build.quarkusapp.argument.imagename.builder}-maven-repo.zip</file>
+                                    <type>zip</type>
+                                    <classifier>image-build</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/scripts/logic/builder-quarkus-app/pom.xml b/scripts/logic/builder-quarkus-app/pom.xml
new file mode 100644
index 00000000000..a243f0883bc
--- /dev/null
+++ b/scripts/logic/builder-quarkus-app/pom.xml
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.kie.kogito</groupId>
+        <artifactId>kogito-image-build-artifacts-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>kogito-builder-quarkus-app</artifactId>
+    <name>Kogito Builder Quarkus App - Quarkus app zip</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>/tmp/build/${build.quarkusapp.argument.imagename.builder}/${build.quarkusapp.argument.imagename.builder}-quarkus-app.zip</file>
+                                    <type>zip</type>
+                                    <classifier>image-build</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/scripts/logic/maven-repo/pom.xml b/scripts/logic/devmode-maven-repo/pom.xml
similarity index 89%
rename from scripts/logic/maven-repo/pom.xml
rename to scripts/logic/devmode-maven-repo/pom.xml
index 837ec8d9d94..d666709f98d 100644
--- a/scripts/logic/maven-repo/pom.xml
+++ b/scripts/logic/devmode-maven-repo/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-devmode-quarkus-app-parent</artifactId>
+        <artifactId>kogito-image-build-artifacts-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
@@ -26,7 +26,7 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>/tmp/build/${build.quarkusapp.argument.imagename}/${build.quarkusapp.argument.imagename}-maven-repo.zip</file>
+                                    <file>/tmp/build/${build.quarkusapp.argument.imagename.devmode}/${build.quarkusapp.argument.imagename.devmode}-maven-repo.zip</file>
                                     <type>zip</type>
                                     <classifier>image-build</classifier>
                                 </artifact>
diff --git a/scripts/logic/quarkus-app/pom.xml b/scripts/logic/devmode-quarkus-app/pom.xml
similarity index 89%
rename from scripts/logic/quarkus-app/pom.xml
rename to scripts/logic/devmode-quarkus-app/pom.xml
index 7299bf7a70b..b059e3cffc4 100644
--- a/scripts/logic/quarkus-app/pom.xml
+++ b/scripts/logic/devmode-quarkus-app/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-devmode-quarkus-app-parent</artifactId>
+        <artifactId>kogito-image-build-artifacts-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
@@ -26,7 +26,7 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>/tmp/build/${build.quarkusapp.argument.imagename}/${build.quarkusapp.argument.imagename}-quarkus-app.zip</file>
+                                    <file>/tmp/build/${build.quarkusapp.argument.imagename.devmode}/${build.quarkusapp.argument.imagename.devmode}-quarkus-app.zip</file>
                                     <type>zip</type>
                                     <classifier>image-build</classifier>
                                 </artifact>
diff --git a/scripts/logic/pom.xml b/scripts/logic/pom.xml
index 82d391ae26a..724a80fa68f 100644
--- a/scripts/logic/pom.xml
+++ b/scripts/logic/pom.xml
@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-devmode-quarkus-app-parent</artifactId>
+    <artifactId>kogito-image-build-artifacts-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
-    <name>Kogito Dev Mode Quarkus App</name>
+    <name>Kogito image build artifacts</name>
     <description>Maven project to build a Quarkus App with Kogito Serverless Worflow</description>
     <packaging>pom</packaging>
 
@@ -25,15 +25,18 @@
         </license>
     </licenses>
     <properties>
-        <build.quarkusapp.argument.imagename>kogito-swf-devmode</build.quarkusapp.argument.imagename>
+        <build.quarkusapp.argument.imagename.devmode>kogito-swf-devmode</build.quarkusapp.argument.imagename.devmode>
+        <build.quarkusapp.argument.imagename.builder>kogito-swf-builder</build.quarkusapp.argument.imagename.builder>
         <build.quarkusapp.argument.quarkusplatform.groupid>io.quarkus.platform</build.quarkusapp.argument.quarkusplatform.groupid>
         <build.quarkusapp.argument.quarkusplatform.version>2.16.7.Final</build.quarkusapp.argument.quarkusplatform.version>
-        <build.quarkusapp.argument.kogitoversion>1.39.0.Final</build.quarkusapp.argument.kogitoversion>
+        <build.quarkusapp.argument.kogitoversion>1.40.0.Final</build.quarkusapp.argument.kogitoversion>
     </properties>
 
     <modules>
-        <module>quarkus-app</module>
-        <module>maven-repo</module>
+        <module>devmode-quarkus-app</module>
+        <module>devmode-maven-repo</module>
+        <module>builder-quarkus-app</module>
+        <module>builder-maven-repo</module>
     </modules>
 
     <build>
@@ -44,22 +47,38 @@
                 <inherited>false</inherited>
                 <executions>
                     <execution>
-                        <id>build-quarkus-app</id>
+                        <id>devmode-quarkus-app</id>
                         <phase>compile</phase>
                         <goals>
                             <goal>exec</goal>
                         </goals>
+                        <configuration>
+                            <executable>${project.basedir}/build-quarkus-app.sh</executable>
+                            <arguments>
+                                <argument>${build.quarkusapp.argument.imagename.devmode}</argument>
+                                <argument>${build.quarkusapp.argument.quarkusplatform.groupid}</argument>
+                                <argument>${build.quarkusapp.argument.quarkusplatform.version}</argument>
+                                <argument>${build.quarkusapp.argument.kogitoversion}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>builder-quarkus-app</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>${project.basedir}/build-quarkus-app.sh</executable>
+                            <arguments>
+                                <argument>${build.quarkusapp.argument.imagename.builder}</argument>
+                                <argument>${build.quarkusapp.argument.quarkusplatform.groupid}</argument>
+                                <argument>${build.quarkusapp.argument.quarkusplatform.version}</argument>
+                                <argument>${build.quarkusapp.argument.kogitoversion}</argument>
+                            </arguments>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <executable>${project.basedir}/build-quarkus-app.sh</executable>
-                    <arguments>
-                        <argument>${build.quarkusapp.argument.imagename}</argument>
-                        <argument>${build.quarkusapp.argument.quarkusplatform.groupid}</argument>
-                        <argument>${build.quarkusapp.argument.quarkusplatform.version}</argument>
-                        <argument>${build.quarkusapp.argument.kogitoversion}</argument>
-                    </arguments>
-                </configuration>
             </plugin>
         </plugins>
     </build>

From 21cb39255672b9eb8fbacf3d4a3346bf80737621 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Thu, 15 Jun 2023 16:07:30 -0300
Subject: [PATCH 591/709] [KOGITO-9315] Add Kogito Kubernetes extension to swf
 images (#1575)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 modules/kogito-swf/builder/build-config/module.yaml | 3 ++-
 modules/kogito-swf/devmode/build-config/module.yaml | 3 ++-
 scripts/logic/build-quarkus-app.sh                  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index 1d47bc81a01..cd08da1afbe 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -8,4 +8,5 @@ envs:
     value: "false"
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
-    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health
+    # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
+    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index 79f6ac36bc3..5c72abf37ce 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -8,4 +8,5 @@ envs:
     value: "true"
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
-    value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION}
+    # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
+    value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 3baceef0ff4..aa8a562c5e9 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -17,11 +17,11 @@ quarkus_platform_version="${3}"
 kogito_version="${KOGITO_VERSION:-${4}}"
 
 # common extensions used by the kogito-swf-builder and kogito-swf-devmode
-quarkus_extensions='quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health'
+quarkus_extensions='quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}'
 # dev mode purpose extensions used only by the kogito-swf-devmode
 kogito_swf_devmode_extensions='kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files'
 # devmode extensions that are not available in RHBQ 2.13.x
-kogito_swf_devmode_extensions_2_16="org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version},org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version}"
+kogito_swf_devmode_extensions_2_16="org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version},org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
 
 if [ -z ${quarkus_platform_version} ]; then
     echo "Please provide the quarkus version"

From a4a7a3411a518d360a2bbd07861afc9a6a128761 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Fri, 16 Jun 2023 11:29:46 +0200
Subject: [PATCH 592/709] Fix kogito-apps UI gc overhead issue (#1581)

---
 scripts/build-kogito-apps-components.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index b8b11d79ae9..5efd049f781 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -19,6 +19,7 @@ shift $#
 
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
 
+NODE_OPTIONS="${NODE_OPTIONS} --max_old_space_size=4096"
 MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
 # used for all-in-one image
 extended_context=""

From b6193de669ebb9b09cb6611a8fd65b9b0e1e718f Mon Sep 17 00:00:00 2001
From: Davide Salerno <dsalerno@redhat.com>
Date: Fri, 16 Jun 2023 11:43:39 +0200
Subject: [PATCH 593/709] =?UTF-8?q?[KOGITO-9168]=20[KSW-Operator]=20Create?=
 =?UTF-8?q?=20the=20cekit=20image=20descriptor=20for=20SW=E2=80=A6=20(#156?=
 =?UTF-8?q?1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-9168] [KSW-Operator] Create the cekit image descriptor for SWF devmode image

Signed-off-by: Davide Salerno <dsalerno@redhat.com>
Co-authored-by: Roberto Oliveira <robertoguimaraes8@gmail.com>
---
 Makefile                                      |  2 +-
 kogito-swf-devmode-image.yaml                 |  3 +-
 logic-imagestream.yaml                        | 21 ++++++
 logic-swf-devmode-rhel8-image.yaml            | 68 +++++++++++++++++++
 .../{ => common}/added/run-app-devmode.sh     |  2 +-
 .../devmode/runtime/common/configure.sh       | 11 +++
 .../devmode/runtime/common/module.yaml        |  7 ++
 .../runtime/{ => community}/configure.sh      |  4 --
 .../runtime/{ => community}/module.yaml       |  2 +-
 .../devmode/runtime/osl/configure.sh          | 12 ++++
 .../devmode/runtime/osl/module.yaml           | 32 +++++++++
 .../logic-swf-devmode-rhel8/gating.yaml       |  7 ++
 scripts/common.py                             |  5 +-
 scripts/list-images.py                        |  2 +-
 tests/features/kogito-swf-common.feature      |  1 +
 tests/features/kogito-swf-devmode.feature     |  1 +
 .../logic-swf-devmode.feature                 | 13 ++++
 17 files changed, 183 insertions(+), 10 deletions(-)
 create mode 100644 logic-swf-devmode-rhel8-image.yaml
 rename modules/kogito-swf/devmode/runtime/{ => common}/added/run-app-devmode.sh (97%)
 create mode 100644 modules/kogito-swf/devmode/runtime/common/configure.sh
 create mode 100644 modules/kogito-swf/devmode/runtime/common/module.yaml
 rename modules/kogito-swf/devmode/runtime/{ => community}/configure.sh (77%)
 rename modules/kogito-swf/devmode/runtime/{ => community}/module.yaml (96%)
 create mode 100644 modules/kogito-swf/devmode/runtime/osl/configure.sh
 create mode 100644 modules/kogito-swf/devmode/runtime/osl/module.yaml
 create mode 100644 osbs-extra/logic-swf-devmode-rhel8/gating.yaml
 create mode 100644 tests/features/openshift-serverless-logic/logic-swf-devmode.feature

diff --git a/Makefile b/Makefile
index e50f92b093f..786102f7b5e 100644
--- a/Makefile
+++ b/Makefile
@@ -121,4 +121,4 @@ bats:
 prod_component=
 container-build-osbs:
 	echo "calling RHPAM container-build-osbs......................................"
-	$(CEKIT_CMD) --descriptor $(prod_component).yaml --redhat build ${build_options} osbs --assume-yes
\ No newline at end of file
+	$(CEKIT_CMD) --descriptor $(prod_component).yaml --redhat build ${build_options} osbs --assume-yes ${osbs_options}
\ No newline at end of file
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index e6e8f6aa084..074f0007a5d 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -61,7 +61,8 @@
           version: "3.8.6"
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
-        - name: org.kie.kogito.swf.devmode.runtime
+        - name: org.kie.kogito.swf.devmode.runtime.common
+        - name: org.kie.kogito.swf.devmode.runtime.community
 
     ports:
       - value: 8080
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
index 73e722eea03..4f1315e370b 100644
--- a/logic-imagestream.yaml
+++ b/logic-imagestream.yaml
@@ -27,3 +27,24 @@ items:
         from:
           kind: DockerImage
           name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.29.0
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: logic-devmode
+      annotations:
+        openshift.io/display-name: Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
+        openshift.io/provider-display-name: Kie Group
+    spec:
+      tags:
+        - name: '1.29.0'
+          annotations:
+            description: Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
+            iconClass: icon-jbpm
+            tags: logic,devmode,kogito,kogito,development,serverless,workflow
+            supports: quarkus
+            version: '1.29.0'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8:1.29.0
diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml
new file mode 100644
index 00000000000..005d8f9bffe
--- /dev/null
+++ b/logic-swf-devmode-rhel8-image.yaml
@@ -0,0 +1,68 @@
+schema_version: 1
+name: "openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+version: "1.29.0"
+description: "Red Hat build of Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
+
+labels:
+  - name: "io.quarkus.platform.version"
+    value: "2.16.7.Final"
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
+  - name: "io.k8s.description"
+    value: "Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled."
+  - name: "io.k8s.display-name"
+    value: "Red Hat OpenShift Serverless Logic SWF Devmode"
+  - name: "io.openshift.tags"
+    value: "logic,devmode,kogito,kogito,development,serverless,workflow"
+  - name: "io.openshift.expose-services"
+    value: "8080:http,5005:http"
+  - name: "com.redhat.component"
+    value: "openshift-serverless-1-logic-swf-devmode-rhel8-container"
+
+modules:
+  repositories:
+    - path: modules
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven.rpm
+      version: "3.8"
+    - name: org.kie.kogito.project.versions
+    - name: org.kie.kogito.swf.common.scripts
+    - name: org.kie.kogito.swf.devmode.runtime.common
+    - name: org.kie.kogito.swf.devmode.runtime.osl
+
+ports:
+  - value: 8080
+  - value: 5005
+
+run:
+  workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
+  user: 1001
+  cmd:
+    - "/home/kogito/launch/run-app-devmode.sh"
+
+packages:
+  manager: microdnf
+  content_sets_file: content_sets.yaml
+
+osbs:
+  configuration:
+    container:
+      platforms:
+        only:
+          - x86_64
+          - ppc64le
+          - aarch64
+      compose:
+        pulp_repos: true
+  extra_dir: osbs-extra/logic-swf-devmode-rhel8
+  repository:
+    name: containers/openshift-serverless-1-logic-swf-devmode
+    branch: openshift-serverless-1.29-rhel-8
diff --git a/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
similarity index 97%
rename from modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
rename to modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
index 7692dde4f83..295ce739f28 100755
--- a/modules/kogito-swf/devmode/runtime/added/run-app-devmode.sh
+++ b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
@@ -29,4 +29,4 @@ fi
     -DskipTests \
     -Dquarkus.http.host=0.0.0.0 \
     -Dquarkus.test.continuous-testing=${QUARKUS_CONTINUOUS_TESTING:-disabled} \
-    clean compile quarkus:dev
+    clean compile quarkus:dev
\ No newline at end of file
diff --git a/modules/kogito-swf/devmode/runtime/common/configure.sh b/modules/kogito-swf/devmode/runtime/common/configure.sh
new file mode 100644
index 00000000000..7eb338429c7
--- /dev/null
+++ b/modules/kogito-swf/devmode/runtime/common/configure.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ADDED_DIR="${SCRIPT_DIR}"/added
+LAUNCH_DIR="${KOGITO_HOME}"/launch
+
+cp -v "${ADDED_DIR}"/* "${LAUNCH_DIR}"
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/runtime/common/module.yaml b/modules/kogito-swf/devmode/runtime/common/module.yaml
new file mode 100644
index 00000000000..c99b9da2508
--- /dev/null
+++ b/modules/kogito-swf/devmode/runtime/common/module.yaml
@@ -0,0 +1,7 @@
+schema_version: 1
+name: org.kie.kogito.swf.devmode.runtime.common
+version: "2.0.0-snapshot"
+description: "Kogito Serverless Workflow devmode common module"
+
+execute:
+  - script: configure.sh
diff --git a/modules/kogito-swf/devmode/runtime/configure.sh b/modules/kogito-swf/devmode/runtime/community/configure.sh
similarity index 77%
rename from modules/kogito-swf/devmode/runtime/configure.sh
rename to modules/kogito-swf/devmode/runtime/community/configure.sh
index b6e41db437f..87cc1b18a11 100644
--- a/modules/kogito-swf/devmode/runtime/configure.sh
+++ b/modules/kogito-swf/devmode/runtime/community/configure.sh
@@ -3,10 +3,6 @@ set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 SOURCES_DIR=/tmp/artifacts
-ADDED_DIR="${SCRIPT_DIR}"/added
-LAUNCH_DIR="${KOGITO_HOME}"/launch
-
-cp -v "${ADDED_DIR}"/* "${LAUNCH_DIR}"
 
 # Unzip Quarkus app and Maven repository
 unzip "${SOURCES_DIR}"/kogito-swf-quarkus-app.zip -d "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/runtime/module.yaml b/modules/kogito-swf/devmode/runtime/community/module.yaml
similarity index 96%
rename from modules/kogito-swf/devmode/runtime/module.yaml
rename to modules/kogito-swf/devmode/runtime/community/module.yaml
index 17f11b55449..7c6026c8aa4 100644
--- a/modules/kogito-swf/devmode/runtime/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/community/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: org.kie.kogito.swf.devmode.runtime
+name: org.kie.kogito.swf.devmode.runtime.community
 version: "2.0.0-snapshot"
 description: "Kogito Serverless Workflow devmode with required extensions"
 
diff --git a/modules/kogito-swf/devmode/runtime/osl/configure.sh b/modules/kogito-swf/devmode/runtime/osl/configure.sh
new file mode 100644
index 00000000000..6c11bdb8d9b
--- /dev/null
+++ b/modules/kogito-swf/devmode/runtime/osl/configure.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SOURCES_DIR=/tmp/artifacts
+
+# Unzip Quarkus app and Maven repository
+unzip "${SOURCES_DIR}"/kogito-devmode-quarkus-app-image-build.zip -d "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/kogito-devmode-maven-repository-image-build.zip -d "${KOGITO_HOME}"/.m2/repository
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/runtime/osl/module.yaml b/modules/kogito-swf/devmode/runtime/osl/module.yaml
new file mode 100644
index 00000000000..a140dd955a3
--- /dev/null
+++ b/modules/kogito-swf/devmode/runtime/osl/module.yaml
@@ -0,0 +1,32 @@
+schema_version: 1
+name: org.kie.kogito.swf.devmode.runtime.osl
+version: "1.29.0"
+description: "OpenShift Serverless Logic devmode with required extensions"
+
+envs:
+  - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
+    description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
+    value: "false"
+  - name: QUARKUS_DEVSERVICES_ENABLED
+    description: Whether to enable Quarkus Devservices or not. Default to "false" since the Kafka broker needs Docker.
+    value: "false"
+  - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
+    description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
+    value: "false"
+  - name: QUARKUS_CONTINUOUS_TESTING
+    description: Whether to enable Quarkus continous testing on DevMode or not. Default to "disabled".
+    value: "disabled"
+  - name: KOGITO_CODEGEN_PROCESS_FAILONERROR
+    description: Boolean flag that will prevent Dev Mode to crash if the provided workflow is wrong.
+    value: "false"
+
+artifacts:
+  - name: kogito-devmode-quarkus-app-image-build.zip
+    # kogito-devmode-quarkus-app-1.38.0.Final-redhat-00001-image-build.zip
+    md5: c67fa5b0c78688023a5ac39877415dc7
+  - name: kogito-devmode-maven-repository-image-build.zip
+    # kogito-devmode-maven-repository-1.38.0.Final-redhat-00001-image-build.zip
+    md5: 5452062f247963d2ef7dbc35fbe29c3b
+
+execute:
+  - script: configure.sh
diff --git a/osbs-extra/logic-swf-devmode-rhel8/gating.yaml b/osbs-extra/logic-swf-devmode-rhel8/gating.yaml
new file mode 100644
index 00000000000..0369c3ed30f
--- /dev/null
+++ b/osbs-extra/logic-swf-devmode-rhel8/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+id: "cvp-logic-swf-devmode-rhel8"
+product_versions:
+  - cvp
+decision_context: cvp_default
+rules:
+  - !PassingTestCaseRule {test_case_name: logic-swf-devmode-rhel8.openshift.external}
\ No newline at end of file
diff --git a/scripts/common.py b/scripts/common.py
index cff436e6856..69602fe4694 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -41,6 +41,7 @@
 
 PROD_SUPPORTING_SERVICES_IMAGES = {"logic-data-index-ephemeral-rhel8"}
 SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-base-builder", "kogito-swf-devmode"}
+PROD_SWF_BUILDER_IMAGES = {"logic-swf-devmode-rhel8"}
 
 
 def yaml_loader():
@@ -211,10 +212,12 @@ def is_supporting_services_or_swf_builder(image_name, prod=False):
             raise RuntimeError('{} is not a supporting service or a swf builder image.'.format(image_name))
 
 
-def get_swf_builder_images():
+def get_swf_builder_images(is_prod_image):
     """
     Raise an error if the given image is not a supporting service
     """
+    if is_prod_image:
+            return PROD_SWF_BUILDER_IMAGES
     return SWF_BUILDER_IMAGES
 
 
diff --git a/scripts/list-images.py b/scripts/list-images.py
index 935ccf5b8cd..7cfa9edee7d 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -31,7 +31,7 @@
     elif args.prod:
         images = common.get_prod_images()
     elif args.swf_builder:
-        images = common.get_swf_builder_images()
+        images = common.get_swf_builder_images(args.prod)
     else:
         images = common.get_community_images()
 
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index fa0d5328179..f325d5ec829 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -1,5 +1,6 @@
 @quay.io/kiegroup/kogito-swf-builder
 @quay.io/kiegroup/kogito-swf-devmode
+@openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8
 Feature: Serverless Workflow images common
 
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 40303920a0c..d7dabbb52b9 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -1,4 +1,5 @@
 @quay.io/kiegroup/kogito-swf-devmode
+@openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8
 Feature: Serverless Workflow devmode images
 
   Scenario: Verify if container starts in devmode by default
diff --git a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
new file mode 100644
index 00000000000..0f8f7cf042d
--- /dev/null
+++ b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
@@ -0,0 +1,13 @@
+@openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8
+Feature: Serverless Workflow devmode images
+
+  Feature: logic-swf-devmode-rhel8 feature.
+
+    Scenario: verify if all labels are correctly set on logic-swf-devmode-rhel8 image
+      Given image is built
+        Then the image should contain label io.openshift.expose-services with value 8080:http,5005:http
+        AND the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+        And the image should contain label io.k8s.description with value Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
+        And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic SWF Devmode
+        And the image should contain label io.openshift.tags with value logic,devmode,kogito,kogito,development,serverless,workflow
+        And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-devmode-rhel8-container
\ No newline at end of file

From 684c6640dacc8358c58d945e2afe49fa9613e142 Mon Sep 17 00:00:00 2001
From: Davide Salerno <dsalerno@redhat.com>
Date: Fri, 16 Jun 2023 21:09:22 +0200
Subject: [PATCH 594/709] [KOGITO-9077] Create the cekit image descriptor for
 SWF builder image (#1526)

* [KOGITO-9077] Create the cekit image descriptor for SWF builder image

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* Update logic-swf-builder-rhel8-overrides.yaml

Co-authored-by: Roberto Oliveira <robertoguimaraes8@gmail.com>

* [KOGITO-9077] Create the cekit image descriptor for SWF builder image - behave tests

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* [KOGITO-9077] Create the cekit image descriptor for SWF builder image - Moved to multistage build

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* Update logic-imagestream.yaml

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* Restored Quarkus app bash script

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* Created new cekit module for retrieving artifacts in Prod OSL build

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* Cleaning up from old files to be removed

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

---------

Signed-off-by: Davide Salerno <dsalerno@redhat.com>
Co-authored-by: Roberto Oliveira <robertoguimaraes8@gmail.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 kogito-swf-builder-image.yaml                 |  2 +-
 logic-imagestream.yaml                        | 21 ++++++
 logic-swf-builder-rhel8-image.yaml            | 69 +++++++++++++++++++
 .../runtime/{ => community}/configure.sh      |  0
 .../runtime/{ => community}/module.yaml       |  2 +-
 .../builder/runtime/osl/configure.sh          | 13 ++++
 .../builder/runtime/osl/module.yaml           | 15 ++++
 .../logic-swf-builder-rhel8/gating.yaml       |  7 ++
 scripts/common.py                             |  2 +-
 tests/features/kogito-swf-common.feature      |  1 +
 .../logic-swf-builder.feature                 | 10 +++
 11 files changed, 139 insertions(+), 3 deletions(-)
 create mode 100644 logic-swf-builder-rhel8-image.yaml
 rename modules/kogito-swf/builder/runtime/{ => community}/configure.sh (100%)
 rename modules/kogito-swf/builder/runtime/{ => community}/module.yaml (86%)
 create mode 100644 modules/kogito-swf/builder/runtime/osl/configure.sh
 create mode 100644 modules/kogito-swf/builder/runtime/osl/module.yaml
 create mode 100644 osbs-extra/logic-swf-builder-rhel8/gating.yaml
 create mode 100644 tests/features/openshift-serverless-logic/logic-swf-builder.feature

diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 04cd86fd562..5f3abfab322 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -63,7 +63,7 @@
           version: "3.8.6"
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
-        - name: org.kie.kogito.swf.builder.runtime
+        - name: org.kie.kogito.swf.builder.runtime.community
 
     run:
       workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
index 4f1315e370b..f00ddd97d51 100644
--- a/logic-imagestream.yaml
+++ b/logic-imagestream.yaml
@@ -48,3 +48,24 @@ items:
           from:
             kind: DockerImage
             name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8:1.29.0
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: logic-builder
+      annotations:
+        openshift.io/display-name: Red Hat build of Runtime image for Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled
+        openshift.io/provider-display-name: Kie Group
+    spec:
+      tags:
+        - name: '1.29.0'
+          annotations:
+            description: Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
+            iconClass: icon-jbpm
+            tags: logic,builder,kogito,workflow,serverless
+            supports: quarkus
+            version: '1.29.0'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:1.29.0
diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml
new file mode 100644
index 00000000000..9ba703b7ae9
--- /dev/null
+++ b/logic-swf-builder-rhel8-image.yaml
@@ -0,0 +1,69 @@
+schema_version: 1
+name: "openshift-serverless-1-tech-preview/logic-swf-builder-rhel8"
+version: "1.29.0"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+description: "Red Hat build of Runtime image for Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
+
+labels:
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.quarkus.platform.version"
+    value: "2.16.7.Final"
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
+  - name: "com.redhat.component"
+    value: "openshift-serverless-1-logic-swf-builder-rhel8-container"
+  - name: "io.k8s.description"
+    value: "Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled"
+  - name: "io.k8s.display-name"
+    value: "Red Hat OpenShift Serverless Logic Builder image"
+  - name: "io.openshift.tags"
+    value: "logic-swf-builder,kogito,swf-builder"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
+
+modules:
+  repositories:
+    - path: modules
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven.rpm
+      version: "3.8"
+    - name: org.kie.kogito.project.versions
+    - name: org.kie.kogito.swf.common.scripts
+    - name: org.kie.kogito.swf.builder.runtime.osl
+
+run:
+  workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
+  user: 1001
+
+ports:
+  - value: 8080
+  - value: 5005
+
+packages:
+  manager: microdnf
+  content_sets_file: content_sets.yaml
+
+osbs:
+  configuration:
+    container:
+      platforms:
+        only:
+          - x86_64
+          - ppc64le
+          - aarch64
+      compose:
+        pulp_repos: true
+  extra_dir: osbs-extra/logic-swf-builder-rhel8
+  repository:
+    name: containers/openshift-serverless-1-logic-swf-builder
+    branch: openshift-serverless-1.29-rhel-8
\ No newline at end of file
diff --git a/modules/kogito-swf/builder/runtime/configure.sh b/modules/kogito-swf/builder/runtime/community/configure.sh
similarity index 100%
rename from modules/kogito-swf/builder/runtime/configure.sh
rename to modules/kogito-swf/builder/runtime/community/configure.sh
diff --git a/modules/kogito-swf/builder/runtime/module.yaml b/modules/kogito-swf/builder/runtime/community/module.yaml
similarity index 86%
rename from modules/kogito-swf/builder/runtime/module.yaml
rename to modules/kogito-swf/builder/runtime/community/module.yaml
index 243e349362c..fe19031ac0d 100644
--- a/modules/kogito-swf/builder/runtime/module.yaml
+++ b/modules/kogito-swf/builder/runtime/community/module.yaml
@@ -1,5 +1,5 @@
 schema_version: 1
-name: org.kie.kogito.swf.builder.runtime
+name: org.kie.kogito.swf.builder.runtime.community
 version: "2.0.0-snapshot"
 description: "Kogito Serverless Workflow builder runtime module"
 
diff --git a/modules/kogito-swf/builder/runtime/osl/configure.sh b/modules/kogito-swf/builder/runtime/osl/configure.sh
new file mode 100644
index 00000000000..d4c58e01df6
--- /dev/null
+++ b/modules/kogito-swf/builder/runtime/osl/configure.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+
+SOURCES_DIR=/tmp/artifacts
+
+mkdir -p "${KOGITO_HOME}"/.m2/repository
+
+# Unzip Quarkus app and Maven repository
+unzip "${SOURCES_DIR}"/kogito-builder-quarkus-app-image-build.zip -d "${KOGITO_HOME}"
+unzip "${SOURCES_DIR}"/kogito-builder-maven-repository-image-build.zip -d "${KOGITO_HOME}"/.m2/repository
+
+chown -R 1001:0 "${KOGITO_HOME}"
+chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/builder/runtime/osl/module.yaml b/modules/kogito-swf/builder/runtime/osl/module.yaml
new file mode 100644
index 00000000000..7774e53f40a
--- /dev/null
+++ b/modules/kogito-swf/builder/runtime/osl/module.yaml
@@ -0,0 +1,15 @@
+schema_version: 1
+name: org.kie.kogito.swf.builder.runtime.osl
+version: "1.29.0"
+description: "OpenShift Serverless Logic builder module with required extensions"
+
+artifacts:
+  - name: kogito-builder-quarkus-app-image-build.zip
+    # kogito-builder-quarkus-app-1.38.0.Final-redhat-00002-image-build.zip
+    md5: e55ce232900dc6ea089813eb8ffe8d93
+  - name: kogito-builder-maven-repository-image-build.zip
+    # kogito-builder-maven-repository-1.38.0.Final-redhat-00002-image-build.zip
+    md5: 1489b401aa0356ac79fd3aa0e62bacf3
+
+execute:
+  - script: configure.sh
diff --git a/osbs-extra/logic-swf-builder-rhel8/gating.yaml b/osbs-extra/logic-swf-builder-rhel8/gating.yaml
new file mode 100644
index 00000000000..f23861d007b
--- /dev/null
+++ b/osbs-extra/logic-swf-builder-rhel8/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+id: "cvp-logic-swf-builder-rhel8"
+product_versions:
+  - cvp
+decision_context: cvp_default
+rules:
+  - !PassingTestCaseRule {test_case_name: logic-swf-builder-rhel8.openshift.external}
\ No newline at end of file
diff --git a/scripts/common.py b/scripts/common.py
index 69602fe4694..eea855dc28a 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -41,7 +41,7 @@
 
 PROD_SUPPORTING_SERVICES_IMAGES = {"logic-data-index-ephemeral-rhel8"}
 SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-base-builder", "kogito-swf-devmode"}
-PROD_SWF_BUILDER_IMAGES = {"logic-swf-devmode-rhel8"}
+PROD_SWF_BUILDER_IMAGES = {"logic-swf-devmode-rhel8", "logic-swf-builder-rhel8"}
 
 
 def yaml_loader():
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index f325d5ec829..7efd4f9e189 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -1,5 +1,6 @@
 @quay.io/kiegroup/kogito-swf-builder
 @quay.io/kiegroup/kogito-swf-devmode
+@openshift-serverless-1-tech-preview/logic-swf-builder-rhel8
 @openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8
 Feature: Serverless Workflow images common
 
diff --git a/tests/features/openshift-serverless-logic/logic-swf-builder.feature b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
new file mode 100644
index 00000000000..d056fc92cad
--- /dev/null
+++ b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
@@ -0,0 +1,10 @@
+@openshift-serverless-1-tech-preview/logic-swf-builder-rhel8
+Feature: logic--swf-builder-rhel8 feature.
+
+  Scenario: verify if all labels are correctly set on logic-swf-builder-rhel8 image
+    Given image is built
+      Then the image should contain label io.openshift.expose-services with value 8080:http
+      And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled
+      And the image should contain label io.k8s.display-name with value Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
+      And the image should contain label io.openshift.tags with value logic-swf-builder,kogito,swf-builder
+      And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-builder-rhel8-container

From 5c92eb652d7342ef23cfadf7d8e2fe7363244fd1 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Mon, 19 Jun 2023 13:29:03 +0200
Subject: [PATCH 595/709] better organize quarkus-extensions variables in
 build-quarkus-app.sh (#1585)

* use double quotes for quarkus extensions in build-quarkus-app.sh

* better organize quarkus-extensions variables in build-quarkus-app.sh
---
 scripts/logic/build-quarkus-app.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index aa8a562c5e9..8fc21d6bac1 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -17,11 +17,9 @@ quarkus_platform_version="${3}"
 kogito_version="${KOGITO_VERSION:-${4}}"
 
 # common extensions used by the kogito-swf-builder and kogito-swf-devmode
-quarkus_extensions='quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}'
+quarkus_extensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
 # dev mode purpose extensions used only by the kogito-swf-devmode
-kogito_swf_devmode_extensions='kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files'
-# devmode extensions that are not available in RHBQ 2.13.x
-kogito_swf_devmode_extensions_2_16="org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version},org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
+kogito_swf_devmode_extensions="kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
 
 if [ -z ${quarkus_platform_version} ]; then
     echo "Please provide the quarkus version"
@@ -33,7 +31,7 @@ case ${image_name} in
         quarkus_extensions="${quarkus_extensions}"
         ;;
     "kogito-swf-devmode")
-        quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions},${kogito_swf_devmode_extensions_2_16}"
+        quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions}"
         ;;
     *)
         echo "${image_name} is not a quarkus app image, exiting..."

From 79eff0ad0198d936da4d37dea7842537a8eb3d59 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 20 Jun 2023 13:21:31 +0200
Subject: [PATCH 596/709] KOGITO-9351 CI: Deploy: Externalize build image job
 (#1572)

* KOGITO-9351 CI: Deploy: Externalize build image job

* Update kogito-data-index-infinispan-image.yaml

Co-authored-by: Filippe Spolti <filippespolti@gmail.com>

---------

Co-authored-by: Filippe Spolti <filippespolti@gmail.com>
---
 .ci/jenkins/Jenkinsfile                      | 220 ++-------
 .ci/jenkins/Jenkinsfile.build-image          | 349 +++++++++++++++
 .ci/jenkins/Jenkinsfile.deploy               | 442 ++++---------------
 .ci/jenkins/dsl/jobs.groovy                  |  54 ++-
 .github/workflows/kogito-images-pr-check.yml |   9 +
 scripts/build-kogito-apps-components.sh      |   2 +-
 tests/test-apps/clone-repo.sh                |   3 +-
 7 files changed, 520 insertions(+), 559 deletions(-)
 create mode 100644 .ci/jenkins/Jenkinsfile.build-image

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index d08ce32b103..9fcd81285d8 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -1,14 +1,8 @@
 @Library('jenkins-pipeline-shared-libraries')_
 
-changeAuthor = env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepoGitUrl) : (env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR)
-changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
-changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
-
-BUILD_FAILED_IMAGES = []
-
 pipeline {
     agent {
-        label 'kie-rhel8 && docker && kie-mem24g && !built-in'
+        label 'rhel8 && !built-in'
     }
     tools {
         maven env.BUILD_MAVEN_TOOL
@@ -17,31 +11,13 @@ pipeline {
     options {
         timeout(time: 120, unit: 'MINUTES')
     }
-    environment {
-        CI = true
-
-        // Linked to node label
-        // Use docker due to multiplatform build
-        CONTAINER_ENGINE='docker'
-        CONTAINER_ENGINE_TLS_OPTIONS=''
-
-        IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64'
-    }
     stages {
         stage('Initialization') {
             steps {
                 script {
                     clean()
 
-                    githubscm.checkoutIfExists('kogito-images', changeAuthor, changeBranch, 'kiegroup', changeTarget, true)
-
-                    if (isProdCI()) {
-                        // Prod fix to be able to build the image as a community one
-                        sh "echo '' > content_sets.yaml"
-                    }
-
-                    cloud.prepareForDockerMultiplatformBuild()
-                    cloud.startLocalRegistry()
+                    githubscm.checkoutIfExists('kogito-images', getChangeAuthor(), getChangeBranch(), 'kiegroup', getChangeTarget(), true)
                 }
             }
         }
@@ -58,78 +34,16 @@ pipeline {
                 }
             }
         }
-        stage('Prepare environment') {
-            steps {
-                script {
-                    // Set the mirror url only if exist
-                    if (env.MAVEN_MIRROR_REPOSITORY) {
-                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
-                        
-                        // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                        runPythonCommand("python3 scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
-                    }
-                }
-            }
-        }
-        // Commented as we cannot fully rely on Quarkus platform
-        // Should be uncommmented once https://issues.redhat.com/browse/KOGITO-9120 is implemented
-        // stage('Setup Quarkus platform') {
-        //     steps {
-        //         script {
-        //             String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
-        //             String quarkusPlatformVersion = "kogito-${kogitoVersion}"
-
-        //             // Setup quarkus platform repo configuration
-        //             runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
-        //         }
-        //     }
-        // }
-        stage('Prepare offline kogito-examples') {
-            steps {
-                script {
-                    runPythonCommand('make clone-repos')
-                }
-            }
-        }
         stage('Build & Test Images') {
             steps {
                 script {
                     parallelStages = [:]
-                    getImages().each { image ->
-                        initWorkspace(image)
-                        String workspacePath = getWorkspacePath(image)
-                        parallelStages["Build&Test ${image}"] = {
-                            stage("Build/Test ${image}") {
-                                dir(workspacePath) {
-                                    try {
-                                        buildImage(image)
-                                    } catch (err) {
-                                        registerBuildFailedImage(image)
-                                        util.archiveConsoleLog(image, 400)
-                                        throw err
-                                    }
-                                    try {
-                                        testImage(image)
-                                    } catch (err) {
-                                        echo "Testing error(s) for image ${image}"
-                                    } finally {
-                                        junit testResults: 'target/**/*.xml', allowEmptyResults: true
-                                        archiveArtifacts artifacts: 'target/**/*.xml', allowEmptyArchive: true
-                                    }
-                                }
-                            }
-                        }
+                    for(String image : getImages()){
+                        parallelStages[image] = createBuildAndTestStageClosure(image)
                     }
                     parallel parallelStages
                 }
             }
-            post {
-                always {
-                    script {
-                        cleanWorkspaces()
-                    }
-                }
-            }
         }
     }
     post {
@@ -140,98 +54,37 @@ pipeline {
         }
         unsuccessful {
             script {
-                def additionalInfo = ''
-                if (getBuildFailedImages()) {
-                    additionalInfo += 'Build failures on those images:\n'
-                    getBuildFailedImages().each {
-                        additionalInfo += "- ${it}\n"
-                    }
-                }
-                pullrequest.postComment(util.getMarkdownTestSummary('PR', additionalInfo, "${BUILD_URL}", 'GITHUB'))
+                pullrequest.postComment(util.getMarkdownTestSummary(isProdCI() ? 'Prod' : 'PR', '', "${BUILD_URL}", 'GITHUB'))
             }
         }
     }
 }
 
 void clean() {
-    cleanWorkspaces()
-    util.cleanNode(env.CONTAINER_ENGINE)
-    
-    cloud.cleanDockerMultiplatformBuild()
-    cloud.cleanLocalRegistry()
-
-    // Clean Cekit cache, in case we reuse an old node
-    sh "rm -rf \$HOME/.cekit/cache"
-}
-
-void launchParallelForEachImage(stageNamePrefix, executeOnImage) {
-    parallelStages = [:]
-    getImages().each { image ->
-        parallelStages["${stageNamePrefix} ${image}"] = {
-            dir(getWorkspacePath(image)) {
-                executeOnImage(image)
+    util.cleanNode()
+}
+
+Closure createBuildAndTestStageClosure(String image) {
+    return {
+        stage("Build&Test ${image}") {
+            List buildParams = []
+            buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${ghprbPullId} - ${image}: ${ghprbPullLink}"))
+            buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
+            buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
+            buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
+            buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
+            buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
+
+            def job = build(job: "kogito-images.build-image", wait: true, parameters: buildParams, propagate: false)
+            if (job.result != 'SUCCESS') {
+                if (job.result == 'UNSTABLE') {
+                    unstable("Tests on ${image} seems to have failed")
+                } else {
+                    error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
+                }
             }
         }
     }
-    parallel parallelStages
-}
-
-void buildImage(String imageName) {
-    // Generate the Dockerfile
-    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true ignore_tag=true build_options='--dry-run'")
-
-    // Build multiplatform from generated Dockerfile
-    dir('target/image') {
-        cloud.dockerBuildMultiPlatformImages(getTempBuiltImageTag(imageName), getImageBuildPlatforms(), false)
-    }
-}
-
-void testImage(String imageName) {
-    String testImageTag = "quay.io/kiegroup/${imageName}:${getImageVersion()}"
-    String tempBuiltImageTag = getTempBuiltImageTag(imageName)
-    // Pull and tag to test image
-    sh """
-        docker pull ${tempBuiltImageTag}
-        docker tag ${tempBuiltImageTag} ${testImageTag}
-    """
-    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true ignore_tag=${isProdCI()}")
-}
-
-String getMakeBuildImageArgs() {
-    List args = [ "cekit_option='--work-dir .'" ]
-    args.add("KOGITO_APPS_TARGET_BRANCH=${changeTarget}")
-    args.add("BUILD_ENGINE=${CONTAINER_ENGINE}")
-    if (env.CONTAINER_ENGINE_TLS_OPTIONS) {
-        args.add("BUILD_ENGINE_TLS_OPTIONS=${CONTAINER_ENGINE_TLS_OPTIONS}")   
-    }
-    return args.join(' ')
-}
-
-void registerBuildFailedImage(String imageName) {
-    lock("${BUILD_URL} build failed") {
-        BUILD_FAILED_IMAGES.add(imageName)
-    }
-}
-
-List getBuildFailedImages() {
-    return BUILD_FAILED_IMAGES
-}
-
-void initWorkspace(String image) {
-    sh "mkdir -p ${getWorkspacePath(image)}"
-    sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
-}
-
-void cleanWorkspaces() {
-    sh "rm -rf ${getWorkspacesPath()}"
-}
-
-String getWorkspacesPath() {
-    return "${WORKSPACE}/workspaces"
-}
-
-String getWorkspacePath(String image) {
-    return "${getWorkspacesPath()}/${image}"
 }
 
 String[] getImages() {
@@ -239,26 +92,21 @@ String[] getImages() {
     if (isProdCI()) {
         listCmd += ' arg=--prod'
     }
-    return runPythonCommand("${listCmd} | tr '\\n' ','", true).trim().split(',')
-}
-
-List getImageBuildPlatforms() {
-    return "${IMAGE_BUILD_PLATFORMS}".split(',') as List
-}
-
-String getImageVersion() {
-    return runPythonCommand('make display-image-version', true).trim()
+    return util.runWithPythonVirtualEnv("${listCmd} | tr '\\n' ','", 'cekit', true).trim().split(',')
 }
 
 boolean isProdCI() {
     return env.PROD_CI ? env.PROD_CI.toBoolean() : false
 }
 
-String getTempBuiltImageTag(String imageName) {
-    return "localhost:5000/${imageName}:${githubscm.getCommitHash()}"
+String getChangeAuthor() {
+    return env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepoGitUrl) : (env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR)
 }
 
-void runPythonCommand(String cmd, boolean stdout = false) {
-    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
+String getChangeBranch() {
+    return env.ghprbSourceBranch ?: CHANGE_BRANCH
 }
 
+String getChangeTarget() {
+    return env.ghprbTargetBranch ?: CHANGE_TARGET
+}
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
new file mode 100644
index 00000000000..d59d9f79d21
--- /dev/null
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -0,0 +1,349 @@
+ @Library('jenkins-pipeline-shared-libraries')_
+
+QUAY_REGISTRY = 'quay.io'
+
+pipeline {
+    agent {
+        label 'kie-rhel8 && docker && !built-in'
+    }
+    tools {
+        maven env.BUILD_MAVEN_TOOL
+        jdk env.BUILD_JDK_TOOL
+    }
+    options {
+        timeout(time: 120, unit: 'MINUTES')
+    }
+    environment {
+        CI = true
+
+        // Linked to node label
+        // Use docker due to multiplatform build
+        CONTAINER_ENGINE = 'docker'
+        CONTAINER_ENGINE_TLS_OPTIONS = ''
+
+        OPENSHIFT_API = credentials('OPENSHIFT_API')
+        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
+        OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
+
+        IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64'
+    }
+    stages {
+        stage('Initialization') {
+            steps {
+                script {
+                    clean()
+
+                    assert getBuildImageName() : 'Please provide `BUILD_IMAGE_NAME` parameter'
+
+                    currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
+
+                    if (getTargetBranch()) {
+                        echo "Got a target branch ... Trying to merge the source with the target"
+                        githubscm.checkoutIfExists(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getTargetBranch(), true)
+                    } else {
+                        echo "No target branch ... Checking out simply"
+                        checkout(githubscm.resolveRepository(getRepoName(), getSourceAuthor(), getSourceBranch(), false))
+                    }
+
+                    if (isProdCI()) {
+                        // Prod fix to be able to build the image as a community one
+                        sh "echo '' > content_sets.yaml"
+                    }
+
+                    // Login to final registry if deploy is needed
+                    if (shouldDeployImage()) {
+                        if (isDeployImageInOpenshiftRegistry()) {
+                            cloud.loginOpenShift(env.OPENSHIFT_API, env.OPENSHIFT_CREDS_KEY)
+                            cloud.loginOpenshiftRegistry(env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
+                        } else if (getDeployImageRegistryCredentials()) {
+                            cloud.loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials(), env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
+                        }
+                    }
+                }
+            }
+        }
+        stage('Prepare environment') {
+            steps {
+                script {
+                    cloud.prepareForDockerMultiplatformBuild()
+                    cloud.startLocalRegistry()
+                    if (shouldDeployImage()) {
+                        cloud.installSkopeo()
+                    }
+
+                    // Set the mirror url only if exist
+                    if (env.MAVEN_MIRROR_REPOSITORY) {
+                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
+
+                        // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
+                        runPythonCommand("python3 scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
+                    }
+                }
+            }
+        }
+        // Commented as we cannot fully rely on Quarkus platform
+        // Should be uncommmented once https://issues.redhat.com/browse/KOGITO-9120 is implemented
+        // stage('Setup Quarkus platform') {
+        //     steps {
+        //         script {
+        //             if (getQuarkusPlatformURL()) {
+        //                 String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
+        //                 String quarkusPlatformVersion = "kogito-${kogitoVersion}"
+        //                 if (getMavenArtifactRepository()) {
+        //                     echo "[WARN] Artifacts repository defined in env will override the quarkus platform URL in tests. Make sure the platform artifacts are available on that artifacts repository (you can use a maven group)"
+        //                 }
+        //                 // Setup quarkus platform repo configuration
+        //                 runPythonCommand("python3 scripts/update-repository.py --repo-url ${getQuarkusPlatformURL()} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
+        //             }
+        //         }
+        //     }
+        // }
+        stage('Build image') {
+            steps {
+                script {
+                    // Generate the Dockerfile
+                    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_test=true ignore_tag=true build_options='--dry-run'")
+
+                    // Build multiplatform from generated Dockerfile
+                    String squashMessage = "${getBuildImageName()}:${getImageVersion()} squashed"
+                    dir('target/image') {
+                        cloud.dockerBuildMultiPlatformImages(getBuiltImageTag(), getImageBuildPlatforms(), shouldDeployImage(), squashMessage)
+                    }
+                }
+            }
+        }
+        stage('Push tags') {
+            when {
+                expression { return shouldDeployImage() }
+            }
+            steps {
+                script {
+                    // Make public if quay registry
+                    if (getDeployImageRegistry() == QUAY_REGISTRY) {
+                        String namespace = getDeployImageNamespace()
+                        String repository = getFinalImageName()
+                        echo "Check and set public if needed Quay repository ${namespace}/${repository}"
+                        try {
+                            cloud.makeQuayImagePublic(namespace, repository, [ usernamePassword: getDeployImageRegistryCredentials()])
+                        } catch (err) {
+                            echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
+                        }
+                    }
+
+                    int retries = Integer.parseInt(env.MAX_REGISTRY_RETRIES)
+                    String imageTag = getBuiltImageTag()
+                    if (isDeployLatestTag()) {
+                        cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag('latest'), retries)
+                    }
+                    try {
+                        cloud.skopeoCopyRegistryImages(cloud.getReducedTag(getDeployImageTag()), getBuiltImageTag(reducedTag), retries)
+                    } catch(err) {
+                        echo "Reduced tag cannot be applied"
+                    }
+                }
+            }
+        }
+        stage('Setup for testing') {
+            when {
+                expression { return !shouldSkipTests() }
+            }
+            steps {
+                script {
+                    updateTestsCommand = 'python3 scripts/update-repository.py --tests-only'
+                    updateTestsCommand += getMavenArtifactRepository() ? " --repo-url ${getMavenArtifactRepository()}" : ''
+                    updateTestsCommand += getTestsKogitoExamplesRef() ? " --examples-ref ${getTestsKogitoExamplesRef()}" : ''
+                    updateTestsCommand += getTestsKogitoExamplesURI() ? " --examples-uri ${getTestsKogitoExamplesURI()}" : ''
+
+                    // Launch update tests
+                    runPythonCommand(updateTestsCommand)
+
+                    // Debug purpose in case of issue
+                    sh 'cat tests/test-apps/clone-repo.sh'
+                    sh 'cat scripts/setup-maven.sh'
+                    sh 'cat tests/features/kogito-s2i-builder.feature'
+                }
+            }
+        }
+        stage('Test image') {
+            when {
+                expression { return !shouldSkipTests() }
+            }
+            steps {
+                script {
+                    String testImageTag = "quay.io/kiegroup/${getBuildImageName()}:${getImageVersion()}"
+                    String builtImageTag = getBuiltImageTag()
+                    // Pull and tag to test image
+                    sh """
+                        docker pull ${builtImageTag}
+                        docker tag ${builtImageTag} ${testImageTag}
+                    """
+                    try {
+                        runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_build=true ignore_tag=${isProdCI()}")
+                    } catch (err) {
+                        unstable "Testing error(s) for image ${getBuildImageName()}"
+                    } finally {
+                        junit testResults: 'target/**/*.xml', allowEmptyResults: true
+                        archiveArtifacts artifacts: 'target/**/*.xml', allowEmptyArchive: true
+                    }
+                }
+            }
+        }
+    }
+    post {
+        always {
+            script {
+                clean()
+            }
+        }
+    }
+}
+
+void clean() {
+    util.cleanNode(env.CONTAINER_ENGINE)
+
+    cloud.cleanDockerMultiplatformBuild()
+    cloud.cleanLocalRegistry()
+    cloud.cleanSkopeo()
+
+    // Clean Cekit cache, in case we reuse an old node
+    sh "rm -rf \$HOME/.cekit/cache"
+}
+
+String getMakeBuildImageArgs() {
+    List args = []
+    if (getBuildKogitoAppsRef()) {
+        args.add("KOGITO_APPS_TARGET_BRANCH=${getBuildKogitoAppsRef()}")
+    }
+    if (getBuildKogitoAppsURI()) {
+        args.add("KOGITO_APPS_TARGET_URI=${getBuildKogitoAppsURI()}")
+    }
+    args.add("BUILD_ENGINE=${CONTAINER_ENGINE}")
+    if (env.CONTAINER_ENGINE_TLS_OPTIONS) {
+        args.add("BUILD_ENGINE_TLS_OPTIONS=${CONTAINER_ENGINE_TLS_OPTIONS}")
+    }
+    return args.join(' ')
+}
+
+String getImageVersion() {
+    return runPythonCommand('make display-image-version', true).trim()
+}
+
+String getBuiltImageTag(String imageTag = '') {
+    if (shouldDeployImage()) {
+        return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName()}:${imageTag ?: getDeployImageTag()}"
+    } else {
+        return "localhost:5000/${getBuildImageName()}:${githubscm.getCommitHash()}"
+    }
+}
+
+void runPythonCommand(String cmd, boolean stdout = false) {
+    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
+}
+
+////////////////////////////////////////////////////////////////////////
+// Deploy image information
+////////////////////////////////////////////////////////////////////////
+
+boolean isDeployImageInOpenshiftRegistry() {
+    return params.DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY
+}
+
+String getDeployImageRegistryCredentials() {
+    return params.DEPLOY_IMAGE_REGISTRY_CREDENTIALS
+}
+
+String getDeployImageRegistry() {
+    return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.DEPLOY_IMAGE_REGISTRY
+}
+
+String getDeployImageNamespace() {
+    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.DEPLOY_IMAGE_NAMESPACE
+}
+
+String getDeployImageNameSuffix() {
+    return params.DEPLOY_IMAGE_NAME_SUFFIX
+}
+
+String getDeployImageTag() {
+    if (params.DEPLOY_IMAGE_TAG != '') {
+        return params.DEPLOY_IMAGE_TAG
+    } else {
+        return sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+    }
+}
+
+String getFinalImageName() {
+    return getBuildImageName() + (getDeployImageNameSuffix() ? "-${getDeployImageNameSuffix()}" : '')
+}
+
+boolean isDeployLatestTag() {
+    return params.DEPLOY_WITH_LATEST_TAG
+}
+
+////////////////////////////////////////////////////////////////////////
+// utils
+////////////////////////////////////////////////////////////////////////
+
+String getRepoName() {
+    return env.REPO_NAME
+}
+
+String getBuildImageName() {
+    return params.BUILD_IMAGE_NAME
+}
+
+String getSourceAuthor() {
+    return params.SOURCE_AUTHOR
+}
+
+String getSourceBranch() {
+    return params.SOURCE_BRANCH
+}
+
+String getTargetAuthor() {
+    return env.TARGET_AUTHOR
+}
+
+String getTargetBranch() {
+    return params.TARGET_BRANCH
+}
+
+boolean shouldDeployImage() {
+    return params.DEPLOY_IMAGE
+}
+
+String getBuildKogitoAppsRef() {
+    return params.BUILD_KOGITO_APPS_REF
+}
+
+String getBuildKogitoAppsURI() {
+    return params.BUILD_KOGITO_APPS_URI
+}
+
+String getTestsKogitoExamplesRef() {
+    return params.TESTS_KOGITO_EXAMPLES_REF
+}
+
+String getTestsKogitoExamplesURI() {
+    return params.TESTS_KOGITO_EXAMPLES_URI
+}
+
+boolean shouldSkipTests() {
+    return params.SKIP_TESTS
+}
+
+List getImageBuildPlatforms() {
+    return "${IMAGE_BUILD_PLATFORMS}".split(',') as List
+}
+
+String getMavenArtifactRepository() {
+    return params.TESTS_MAVEN_ARTIFACTS_REPOSITORY_URL
+}
+
+boolean isProdCI() {
+    return env.PROD_CI ? Boolean.parseBoolean(env.PROD_CI) : false
+}
+
+String getQuarkusPlatformURL() {
+    return params.QUARKUS_PLATFORM_URL
+}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index b122f41e5f4..8a0f3539cae 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -1,8 +1,8 @@
 @Library('jenkins-pipeline-shared-libraries')_
 
-deployProperties = [ : ]
+deployProperties = [:]
 
-commitDone = false
+changesDone = false
 
 BUILT_IMAGES = []
 BUILD_FAILED_IMAGES = []
@@ -10,7 +10,7 @@ TEST_FAILED_IMAGES = []
 
 pipeline {
     agent {
-        label 'kie-rhel8 && docker && kie-mem24g && !built-in'
+        label 'rhel8 && !built-in'
     }
 
     // Needed for local build
@@ -23,29 +23,10 @@ pipeline {
         timeout(time: 120, unit: 'MINUTES')
     }
 
-    // parameters {
-    // For parameters, check into ./dsl/jobs.groovy file
-    // }
-
     environment {
-        // Static env is defined into ./dsl/jobs.groovy file
-
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
-        JAVA_HOME = "${GRAALVM_HOME}"
-
-        // Linked to node label
-        // Use docker due to multiplatform build
-        CONTAINER_ENGINE = 'docker'
-        CONTAINER_ENGINE_TLS_OPTIONS = ''
-
-        OPENSHIFT_API = credentials('OPENSHIFT_API')
-        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
-        OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
-
         BOT_BRANCH_HASH = "${util.generateHash(10)}"
-
-        IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64'
     }
 
     stages {
@@ -54,9 +35,7 @@ pipeline {
                 script {
                     clean()
 
-                    if (params.DISPLAY_NAME) {
-                        currentBuild.displayName = params.DISPLAY_NAME
-                    }
+                    currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
 
                     checkoutRepo()
 
@@ -65,17 +44,6 @@ pipeline {
                         assert getProjectVersion()
                         assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())
                     }
-
-                    // Login to final registry
-                    if (isDeployImageInOpenshiftRegistry()) {
-                        loginOpenshiftRegistry()
-                    } else if (getDeployImageRegistryCredentials()) {
-                        loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials())
-                    }
-
-                    cloud.prepareForDockerMultiplatformBuild()
-                    cloud.startLocalRegistry()
-                    cloud.installSkopeo()
                 }
             }
             post {
@@ -90,9 +58,10 @@ pipeline {
                 }
             }
         }
+
         stage('Prepare for PR') {
             when {
-                expression { return isRelease() || isCreateChangesPR() }
+                expression { return isRelease() }
             }
             steps {
                 script {
@@ -101,9 +70,27 @@ pipeline {
                 }
             }
         }
+
+        stage('Setup Quarkus platform version') {
+            when {
+                expression { isRelease() }
+            }
+            steps {
+                script {
+                    if (getQuarkusPlatformVersion()) {
+                        runPythonCommand("python3 scripts/update-repository.py --quarkus-platform-version ${getQuarkusPlatformVersion()}")
+
+                        commitAndPushChanges("Update Quarkus Platform version to ${getQuarkusPlatformVersion()}")
+                    } else {
+                        echo 'No new quarkus version given for the release. Statu quo ...'
+                    }
+                }
+            }
+        }
+
         stage('Update project version') {
             when {
-                expression { return getProjectVersion() != '' }
+                expression { return isRelease() }
             }
             steps {
                 script {
@@ -116,10 +103,11 @@ pipeline {
                     }
                     runPythonCommand(versionCmd)
 
-                    commitChanges("Update project version to ${getProjectVersion()}")
+                    commitAndPushChanges("Update project version to ${getProjectVersion()}")
                 }
             }
         }
+
         stage('Validate CeKit Image and Modules descriptors') {
             steps {
                 script {
@@ -138,129 +126,17 @@ pipeline {
                 }
             }
         }
-        stage('Prepare environment') {
-            steps {
-                script {
-                    // Set the mirror url only if exist
-                    if (env.MAVEN_MIRROR_REPOSITORY) {
-                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
-
-                        // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                        runPythonCommand("python3 scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
-                    }
-                }
-            }
-        }
-        // Commented as we cannot fully rely on Quarkus platform
-        // Should be uncommmented once https://issues.redhat.com/browse/KOGITO-9120 is implemented
-        // stage('Setup Quarkus platform') {
-        //     steps {
-        //         script {
-        //             String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
-        //             String quarkusPlatformVersion = "kogito-${kogitoVersion}"
-
-        //             if (isRelease()) {
-        //                 if (params.QUARKUS_PLATFORM_VERSION) {
-        //                     runPythonCommand("python3 scripts/update-repository.py --quarkus-platform-version ${params.QUARKUS_PLATFORM_VERSION}")
-        //                 } else {
-        //                     echo "No new quarkus version given for the release. Statu quo ..."
-        //                 }
-        //             } else {
-        //                 if (getMavenArtifactRepository()) {
-        //                     echo "[WARN] Artifacts repository defined in env will override the quarkus platform URL in tests. Make sure the platform artifacts are available on that artifacts repository (you can use a maven group)"
-        //                 }
-        //                 // Setup quarkus platform repo configuration
-        //                 runPythonCommand("python3 scripts/update-repository.py --repo-url ${QUARKUS_PLATFORM_NEXUS_URL} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
-        //             }
-        //         }
-        //     }
-        // }
-        stage('Setup for testing') {
-            when {
-                expression { return !shouldSkipTests() }
-            }
-            steps {
-                script {
-                    updateTestsCommand = 'python3 scripts/update-repository.py --tests-only'
-                    if (getMavenArtifactRepository()) {
-                        // Update repo in tests
-                        updateTestsCommand += " --repo-url ${getMavenArtifactRepository()}"
-                    }
-
-                    // Set kogito-examples to bot author/branch if release
-                    if (params.EXAMPLES_REF) {
-                        updateTestsCommand += " --examples-ref ${params.EXAMPLES_REF}"
-                    }
-                    if (params.EXAMPLES_URI) {
-                        updateTestsCommand += " --examples-uri ${params.EXAMPLES_URI}"
-                    }
-
-                    // Launch update tests
-                    runPythonCommand(updateTestsCommand)
-
-                    // Debug purpose in case of issue
-                    sh 'cat tests/test-apps/clone-repo.sh'
-                    sh 'cat scripts/setup-maven.sh'
-                    sh 'cat tests/features/kogito-s2i-builder.feature'
 
-                    // Prepare local examples
-                    runPythonCommand('make clone-repos')
-                }
-            }
-        }
-        stage('Build & Test Images') {
+        stage('Build, Push & Test Images') {
             steps {
                 script {
                     parallelStages = [:]
                     getImages().each { image ->
-                        initWorkspace(image)
-                        String workspacePath = getWorkspacePath(image)
-                        parallelStages["Build&Test ${image}"] = {
-                            stage("Build/Test ${image}") {
-                                dir(workspacePath) {
-                                    try {
-                                        buildImage(image)
-                                        registerBuiltImage(image)
-                                    } catch (err) {
-                                        registerBuildFailedImage(image)
-                                        util.archiveConsoleLog(image, 400)
-                                        unstable("Error building the '${image}' image")
-                                    }
-                                    if (!shouldSkipTests()) {
-                                        try {
-                                            testImage(image)
-                                        } catch (err) {
-                                            registerTestFailedImage(image)
-                                        } finally {
-                                            junit testResults: 'target/test/results/*.xml', allowEmptyResults: true
-                                            archiveArtifacts artifacts: 'target/test/results/*.xml', allowEmptyArchive: true
-                                        }
-                                    }
-                                }
-                            }
-                        }
+                        parallelStages["Build&Test ${image}"] = createBuildAndTestStageClosure(image)
                     }
                     parallel parallelStages
                 }
             }
-            post {
-                always {
-                    script {
-                        cleanWorkspaces()
-                    }
-                }
-            }
-        }
-        stage('Push to registry') {
-            steps {
-                script {
-                    pushFinalImages()
-
-                    if (isQuayRegistry()) {
-                        makeQuayImagesPublic()
-                    }
-                }
-            }
             post {
                 always {
                     script {
@@ -275,16 +151,15 @@ pipeline {
                 }
             }
         }
+
         stage('Create PR') {
             when {
                 expression {
-                    return commitDone && (isRelease() || isCreateChangesPR())
+                    return changesDone && isRelease()
                 }
             }
             steps {
                 script {
-                    githubscm.pushObject('origin', getBotBranch(), getBotAuthorCredsID())
-
                     def commitMsg = "[${getBuildBranch()}] Update Maven artifacts"
                     def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}."
                     if (isRelease()) {
@@ -316,10 +191,6 @@ pipeline {
                     }
                     String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
                     deployProperties["${getRepoName()}.pr.link"] = prLink
-
-                    if (isCreateChangesPR()) {
-                        sendNotification("PR has been created with update Maven artifacts.\nPlease review it here: ${prLink}")
-                    }
                 }
             }
             post {
@@ -347,7 +218,7 @@ pipeline {
         always {
             script {
                 def propertiesStr = deployProperties.collect { entry -> "${entry.key}=${entry.value}" }.join('\n')
-                writeFile( file : env.PROPERTIES_FILE_NAME , text : propertiesStr)
+                writeFile(file : env.PROPERTIES_FILE_NAME , text : propertiesStr)
                 archiveArtifacts artifacts: env.PROPERTIES_FILE_NAME, allowEmptyArchive:true
             }
         }
@@ -383,57 +254,56 @@ void checkoutRepo() {
     checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
 }
 
-void commitChanges(String commitMsg) {
+void commitAndPushChanges(String commitMsg) {
     githubscm.commitChanges(commitMsg)
-    commitDone = true
+    githubscm.pushObject('origin', getBotBranch(), getBotAuthorCredsID())
+    changesDone = true
 }
 
 void clean() {
-    cleanWs()
-    util.cleanNode(env.CONTAINER_ENGINE)
-
-    cloud.cleanDockerMultiplatformBuild()
-    cloud.cleanLocalRegistry()
-    cloud.cleanSkopeo()
-
-    // Clean Cekit cache, in case we reuse an old node
-    sh 'rm -rf \$HOME/.cekit/cache'
-}
-
-void buildImage(String imageName) {
-    // Generate the Dockerfile
-    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_test=true ignore_tag=true build_options='--dry-run'")
-
-    // Build multiplatform from generated Dockerfile
-    String tempBuiltImageTag = getTempBuiltImageTag(imageName)
-    String squashMessage = "${imageName}:${getImageVersion()} squashed"
-    dir('target/image') {
-        cloud.dockerBuildMultiPlatformImages(tempBuiltImageTag, getImageBuildPlatforms(), true, squashMessage)
-    }
-}
-
-void testImage(String imageName) {
-    String testImageTag = "quay.io/kiegroup/${imageName}:${getImageVersion()}"
-    String tempBuiltImageTag = getTempBuiltImageTag(imageName)
-    // Pull and tag to test image
-    sh """
-        docker pull ${tempBuiltImageTag}
-        docker tag ${tempBuiltImageTag} ${testImageTag}
-    """
-    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${imageName} ignore_build=true ignore_test_prepare=true")
-}
-
-String getMakeBuildImageArgs() {
-    List args = [ "cekit_option='--work-dir .'" ]
-    args.add("KOGITO_APPS_TARGET_BRANCH=${getKogitoAppsRef()}")
-    if (getKogitoAppsUri()) {
-        args.add("KOGITO_APPS_TARGET_URI=${getKogitoAppsUri()}")
-    }
-    args.add("BUILD_ENGINE=${CONTAINER_ENGINE}")
-    if (env.CONTAINER_ENGINE_TLS_OPTIONS) {
-        args.add("BUILD_ENGINE_TLS_OPTIONS=${CONTAINER_ENGINE_TLS_OPTIONS}")
+    util.cleanNode()
+}
+
+void createBuildAndTestStageClosure(String image) {
+    return  {
+        stage("Build&Test ${image}") {
+            List buildParams = []
+            buildParams.add(string(name: 'DISPLAY_NAME', value: "${params.DISPLAY_NAME} - ${image}"))
+            buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
+            buildParams.add(string(name: 'SOURCE_AUTHOR', value: isRelease() ? getBotAuthor() : getGitAuthor()))
+            buildParams.add(string(name: 'SOURCE_BRANCH', value: isRelease() ? getBotBranch() : getBuildBranch()))
+
+            buildParams.add(string(name: 'BUILD_KOGITO_APPS_URI', value: params.APPS_URI))
+            buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: params.APPS_REF))
+            buildParams.add(booleanParam(name: 'SKIP_TESTS', value: params.SKIP_TESTS))
+            buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_URI', value: params.EXAMPLES_URI))
+            buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_REF', value: params.EXAMPLES_REF))
+            buildParams.add(string(name: 'TESTS_MAVEN_ARTIFACTS_REPOSITORY_URL', value: env.MAVEN_ARTIFACT_REPOSITORY ?: (isRelease() ? env.DEFAULT_STAGING_REPOSITORY : '')))
+
+            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
+            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: params.IMAGE_USE_OPENSHIFT_REGISTRY))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_CREDENTIALS', value: params.IMAGE_REGISTRY_CREDENTIALS))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: params.IMAGE_REGISTRY))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: params.IMAGE_NAMESPACE))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: params.IMAGE_NAME_SUFFIX))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_TAG', value: params.IMAGE_TAG))
+            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: params.DEPLOY_WITH_LATEST_TAG))
+
+            def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
+            if (!job.result == 'SUCCESS') {
+                if (job.result == 'UNSTABLE') {
+                    registerTestFailedImage(image)
+                    unstable("Tests on ${image} seems to have failed")
+                    registerBuiltImage(image)
+                } else {
+                    registerBuildFailedImage(image)
+                    error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
+                }
+            } else {
+                registerBuiltImage(image)
+            }
+        }
     }
-    return args.join(' ')
 }
 
 void registerBuiltImage(String imageName) {
@@ -454,12 +324,6 @@ void registerTestFailedImage(String imageName) {
     }
 }
 
-void removeBuiltImage (String imageName) {
-    lock("${BUILD_URL}") {
-        BUILT_IMAGES = BUILT_IMAGES.findAll { it != imageName }
-    }
-}
-
 List getBuiltImages() {
     return BUILT_IMAGES
 }
@@ -468,105 +332,14 @@ List getBuildFailedImages() {
     return BUILD_FAILED_IMAGES
 }
 
-boolean isBuildFailedImage(String imageName) {
-    return BUILD_FAILED_IMAGES.contains(imageName)
-}
-
 List getTestFailedImages() {
     return TEST_FAILED_IMAGES
 }
 
-void pushFinalImages() {
-    for (String imageName : getBuiltImages()) {
-        String tempBuiltImageTag = getTempBuiltImageTag(imageName)
-        pushFinalImage(tempBuiltImageTag, buildImageName(imageName))
-        if (isDeployLatestTag()) {
-            pushFinalImage(tempBuiltImageTag, buildImageName(imageName, 'latest'))
-        }
-        String reducedTag = getReducedTag()
-        if (reducedTag) {
-            pushFinalImage(tempBuiltImageTag, buildImageName(imageName, reducedTag))
-        }
-    }
-}
-
-void pushFinalImage(String oldImageName, String newImageName) {
-    cloud.skopeoCopyRegistryImages(oldImageName, newImageName, Integer.parseInt(env.MAX_REGISTRY_RETRIES))
-}
-
-// Set images public on quay. Useful when new images are introduced.
-void makeQuayImagesPublic() {
-    String namespace = getDeployImageNamespace()
-    for (String imageName : getBuiltImages()) {
-        String repository = getFinalImageName(imageName)
-        echo "Check and set public if needed Quay repository ${namespace}/${repository}"
-        try {
-            cloud.makeQuayImagePublic(namespace, repository, [ usernamePassword: getDeployImageRegistryCredentials()])
-        } catch (err) {
-            echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
-        }
-    }
-}
-
-String buildImageName(String imageName, String imageTag = '') {
-    return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName(imageName)}:${imageTag ?: getDeployImageTag()}"
-}
-
-String getFinalImageName(String imageName) {
-    return getDeployImageNameSuffix() ? "${imageName}-${getDeployImageNameSuffix()}" : imageName
-}
-
-String getImageVersion() {
-    return runPythonCommand('make display-image-version', true).trim()
-}
-
-String getReducedTag() {
-    try {
-        String version = getDeployImageTag()
-        String[] versionSplit = version.split("\\.")
-        return "${versionSplit[0]}.${versionSplit[1]}"
-    } catch (error) {
-        echo "${getDeployImageTag()} cannot be reduced to the format X.Y"
-    }
-    return ''
-}
-
-void loginOpenshift() {
-    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]) {
-        sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
-    }
-}
-
-void loginOpenshiftRegistry() {
-    loginOpenshift()
-    // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
-    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${env.OPENSHIFT_REGISTRY}"
-}
-
-void loginContainerRegistry(String registry, String credsId) {
-    withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
-        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${registry}"
-    }
-}
-
-void setDeployPropertyIfneeded(String key, def value) {
-    if (value != null && value != '') {
-        deployProperties[key] = value
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////
 // Deploy image information
 ////////////////////////////////////////////////////////////////////////
 
-boolean isDeployImageInOpenshiftRegistry() {
-    return params.IMAGE_USE_OPENSHIFT_REGISTRY
-}
-
-String getDeployImageRegistryCredentials() {
-    return params.IMAGE_REGISTRY_CREDENTIALS
-}
-
 String getDeployImageRegistry() {
     return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.IMAGE_REGISTRY
 }
@@ -587,35 +360,6 @@ String getDeployImageTag() {
     }
 }
 
-boolean isQuayRegistry() {
-    return getDeployImageRegistry() == 'quay.io'
-}
-
-boolean isDeployLatestTag() {
-    return params.DEPLOY_WITH_LATEST_TAG
-}
-
-////////////////////////////////////////////////////////////////////////
-// Workspaces
-////////////////////////////////////////////////////////////////////////
-
-void initWorkspace(String image) {
-    sh "mkdir -p ${getWorkspacePath(image)}"
-    sh "rsync -av --progress . ${getWorkspacePath(image)} --exclude workspaces"
-}
-
-void cleanWorkspaces() {
-    sh "rm -rf ${getWorkspacesPath()}"
-}
-
-String getWorkspacesPath() {
-    return "${WORKSPACE}/workspaces"
-}
-
-String getWorkspacePath(String image) {
-    return "${getWorkspacesPath()}/${image}"
-}
-
 ////////////////////////////////////////////////////////////////////////
 // utils
 ////////////////////////////////////////////////////////////////////////
@@ -628,22 +372,10 @@ String getRepoName() {
     return env.REPO_NAME
 }
 
-boolean isCreateChangesPR() {
-    return params.CREATE_PR
-}
-
 String getBuildBranch() {
     return params.BUILD_BRANCH_NAME
 }
 
-String getKogitoAppsRef() {
-    return params.APPS_REF ?: getBuildBranch()
-}
-
-String getKogitoAppsUri() {
-    return params.APPS_URI
-}
-
 String getGitAuthor() {
     return "${GIT_AUTHOR}"
 }
@@ -668,18 +400,6 @@ String getKogitoArtifactsVersion() {
     return params.KOGITO_ARTIFACTS_VERSION
 }
 
-String getMavenArtifactRepository() {
-    return env.MAVEN_ARTIFACT_REPOSITORY ?: (isRelease() ? env.DEFAULT_STAGING_REPOSITORY : '')
-}
-
-boolean shouldSkipTests() {
-    return params.SKIP_TESTS
-}
-
-List getImageBuildPlatforms() {
-    return "${IMAGE_BUILD_PLATFORMS}".split(',') as List
-}
-
 void setDeployPropertyIfNeeded(String key, def value) {
     if (value) {
         deployProperties[key] = value
@@ -690,14 +410,6 @@ String[] getImages() {
     return runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
 }
 
-boolean isThereAnyChanges() {
-    return sh(script: 'git status --porcelain', returnStdout: true).trim() != ''
-}
-
-String getTempBuiltImageTag(String imageName) {
-    return "localhost:5000/${imageName}:${getImageVersion()}"
-}
-
 void runPythonCommand(String cmd, boolean stdout = false) {
     return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
 }
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index ba1f4a6029f..8f4e686a153 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -45,6 +45,8 @@ KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [],
 /////////////////////////////////////////////////////////////////
 
 void setupPrJob(boolean isProdCI = false) {
+    setupBuildImageJob(JobType.PULL_REQUEST, '', isProdCI)
+
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.PULL_REQUEST, "${jenkins_path}/Jenkinsfile", "Kogito Images${isProdCI ? ' Prod' : ''} PR check")
     JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
     jobParams.pr.putAll([
@@ -52,9 +54,6 @@ void setupPrJob(boolean isProdCI = false) {
         disable_status_message_error: true,
         disable_status_message_failure: true,
     ])
-    jobParams.env.putAll([
-        QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
-    ])
     if (isProdCI) {
         jobParams.job.name += '.prod'
         jobParams.pr.trigger_phrase = '.*[j|J]enkins,?.*(rerun|run) [prod|Prod|PROD].*'
@@ -94,6 +93,8 @@ void createSetupBranchJob() {
 }
 
 void setupDeployJob(JobType jobType, String envName = '') {
+    setupBuildImageJob(jobType, envName)
+
     def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-images-deploy', jobType, envName, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
     JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
     if (jobType == JobType.PULL_REQUEST) {
@@ -162,13 +163,56 @@ void setupDeployJob(JobType jobType, String envName = '') {
                 stringParam('QUARKUS_PLATFORM_VERSION', '', 'Allow to override the Quarkus Platform version')
             }
 
-            booleanParam('CREATE_PR', false, 'In case of not releasing, you can ask to create a PR with the changes')
-
             booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
         }
     }
 }
 
+void setupBuildImageJob(JobType jobType, String envName = '', boolean prodCI = false) {
+    def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-images.build-image', jobType, envName, "${jenkins_path}/Jenkinsfile.build-image", 'Kogito Images Build single image')
+    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    jobParams.env.putAll([
+        MAX_REGISTRY_RETRIES: 3,
+        TARGET_AUTHOR: Utils.getGitAuthor(this), // In case of a PR to merge with target branch
+        PROD_CI: prodCI,
+    ])
+    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
+        logRotator {
+            daysToKeep(10)
+        }
+        parameters {
+            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
+
+            stringParam('BUILD_IMAGE_NAME', '', 'Image name to build. Mandatory parameter.')
+
+            stringParam('SOURCE_AUTHOR', Utils.getGitAuthor(this), 'Build author')
+            stringParam('SOURCE_BRANCH', Utils.getGitBranch(this), 'Build branch name')
+            stringParam('TARGET_BRANCH', '', 'In case of a PR to merge with target branch, please provide the target branch')
+
+            // Build information
+            stringParam('BUILD_KOGITO_APPS_URI', '', 'Git uri to the kogito-apps repository to use for tests.')
+            stringParam('BUILD_KOGITO_APPS_REF', '', 'Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
+            stringParam('QUARKUS_PLATFORM_URL', Utils.getMavenQuarkusPlatformRepositoryUrl(this), 'URL to the Quarkus platform to use. The version to use will be guessed from artifacts.')
+
+            // Test information
+            booleanParam('SKIP_TESTS', false, 'Skip tests')
+            stringParam('TESTS_KOGITO_EXAMPLES_URI', '', 'Git uri to the kogito-examples repository to use for tests.')
+            stringParam('TESTS_KOGITO_EXAMPLES_REF', '', 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
+            stringParam('TESTS_MAVEN_ARTIFACTS_REPOSITORY_URL', "${MAVEN_ARTIFACTS_REPOSITORY}")
+
+            // Deploy information
+            booleanParam('DEPLOY_IMAGE', false, 'Should we deploy image to given deploy registry ?')
+            booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('DEPLOY_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('DEPLOY_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
+            stringParam('DEPLOY_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
+            stringParam('DEPLOY_IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
+            stringParam('DEPLOY_IMAGE_TAG', '', 'Image tag to use to deploy images')
+            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
+        }
+    }
+}
+
 void setupPromoteJob(JobType jobType) {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-promote', jobType, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote')
     jobParams.env.putAll([
diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
index 19d58b7bc7e..d5af992a849 100644
--- a/.github/workflows/kogito-images-pr-check.yml
+++ b/.github/workflows/kogito-images-pr-check.yml
@@ -3,6 +3,9 @@ name: Images PR check
 on: pull_request
 jobs:
   bats_test:
+    concurrency:
+      group: ${{ github.repository.name }}_bats_test-${{ github.head_ref }}
+      cancel-in-progress: true
     name: Bats Tests
     runs-on: ubuntu-latest
 
@@ -24,6 +27,9 @@ jobs:
           ./scripts/run-bats.sh
           
   validate_kogito_imagestream:
+    concurrency:
+      group: ${{ github.repository.name }}_validate_kogito_imagestream-${{ github.head_ref }}
+      cancel-in-progress: true
     name: Validate Kogito imagestreams
     runs-on: ubuntu-latest
     steps:
@@ -43,6 +49,9 @@ jobs:
           ${HOME}/openshift-template-validator-linux-amd64 validate -f logic-imagestream.yaml
 
   shellcheck:
+    concurrency:
+      group: ${{ github.repository.name }}_shellcheck-${{ github.head_ref }}
+      cancel-in-progress: true
     name: ShellCheck
     runs-on: ubuntu-latest
 
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 5efd049f781..b68ec46cf63 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -19,7 +19,7 @@ shift $#
 
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
 
-NODE_OPTIONS="${NODE_OPTIONS} --max_old_space_size=4096"
+export NODE_OPTIONS="${NODE_OPTIONS} --max_old_space_size=4096"
 MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
 # used for all-in-one image
 extended_context=""
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 262841d50c4..f8e27c446ca 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -8,8 +8,7 @@ if [ -n "${IMAGE_NAME}" ]; then
     if [[ ${IMAGE_NAME} =~ rhpam|logic* ]]; then
         prod="--prod"
     fi
-    python3 ../../scripts/list-images.py ${prod} -is ${IMAGE_NAME}
-    if [ $? = 0 ]; then
+    if python3 ../../scripts/list-images.py ${prod} -is ${IMAGE_NAME}; then
         echo "Target image is supporting services, skipping examples build"
         exit 0
     fi

From 7c195095a535cd38753c0b9e4b69a3b411b0d789 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Wed, 21 Jun 2023 11:26:55 +0200
Subject: [PATCH 597/709] set OpenShift Serverless Logic productized images to
 version 1.30.0 (#1589)

---
 logic-data-index-ephemeral-rhel8-image.yaml    |  6 +++---
 logic-imagestream.yaml                         | 18 +++++++++---------
 logic-swf-builder-rhel8-image.yaml             |  2 +-
 logic-swf-devmode-rhel8-image.yaml             |  2 +-
 .../prod/module.yaml                           |  2 +-
 .../kogito-swf/builder/runtime/osl/module.yaml |  2 +-
 .../kogito-swf/devmode/runtime/osl/module.yaml |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
index d6f867357f7..f9415ff90f7 100644
--- a/logic-data-index-ephemeral-rhel8-image.yaml
+++ b/logic-data-index-ephemeral-rhel8-image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8"
-version: "1.29.0"
+version: "1.30.0"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
@@ -39,7 +39,7 @@ modules:
   - name: org.kie.kogito.dynamic.resources
   - name: org.kie.kogito.launch.scripts
   - name: org.kie.kogito.dataindex.prod.ephemeral
-    version: "1.29.0"
+    version: "1.30.0"
   - name: org.kie.kogito.dataindex.common
   - name: org.kie.kogito.security.custom.truststores
   - name: org.kie.kogito.pkg-update
@@ -61,7 +61,7 @@ osbs:
   extra_dir: osbs-extra/logic-data-index-ephemeral-rhel8
   repository:
     name: containers/openshift-serverless-1-logic-data-index-ephemeral
-    branch: openshift-serverless-1.29-rhel-8
+    branch: openshift-serverless-1.30-rhel-8
 
 ports:
   - value: 8080
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
index f00ddd97d51..eaba390338f 100644
--- a/logic-imagestream.yaml
+++ b/logic-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group
     spec:
       tags:
-      - name: '1.29.0'
+      - name: '1.30.0'
         annotations:
           description: Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
           iconClass: icon-jbpm
           tags: logic-data-index,kogito,data-index,data-index-ephemeral
           supports: quarkus
-          version: '1.29.0'
+          version: '1.30.0'
         referencePolicy:
           type: Local
         from:
           kind: DockerImage
-          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.29.0
+          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.30.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group
     spec:
       tags:
-        - name: '1.29.0'
+        - name: '1.30.0'
           annotations:
             description: Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
             iconClass: icon-jbpm
             tags: logic,devmode,kogito,kogito,development,serverless,workflow
             supports: quarkus
-            version: '1.29.0'
+            version: '1.30.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8:1.29.0
+            name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8:1.30.0
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,15 +57,15 @@ items:
         openshift.io/provider-display-name: Kie Group
     spec:
       tags:
-        - name: '1.29.0'
+        - name: '1.30.0'
           annotations:
             description: Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
             iconClass: icon-jbpm
             tags: logic,builder,kogito,workflow,serverless
             supports: quarkus
-            version: '1.29.0'
+            version: '1.30.0'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:1.29.0
+            name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:1.30.0
diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml
index 9ba703b7ae9..149014088c2 100644
--- a/logic-swf-builder-rhel8-image.yaml
+++ b/logic-swf-builder-rhel8-image.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: "openshift-serverless-1-tech-preview/logic-swf-builder-rhel8"
-version: "1.29.0"
+version: "1.30.0"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Red Hat build of Runtime image for Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
 
diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml
index 005d8f9bffe..c28afd8b0bf 100644
--- a/logic-swf-devmode-rhel8-image.yaml
+++ b/logic-swf-devmode-rhel8-image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 name: "openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-version: "1.29.0"
+version: "1.30.0"
 description: "Red Hat build of Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
 
 labels:
diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml
index a37947e23f6..0596e56b54c 100644
--- a/modules/kogito-data-index-ephemeral/prod/module.yaml
+++ b/modules/kogito-data-index-ephemeral/prod/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.prod.ephemeral
-version: "1.29.0"
+version: "1.30.0"
 
 artifacts:
   # data-index-service-inmemory-1.24.0.Final-redhat-00011-image-build.zip
diff --git a/modules/kogito-swf/builder/runtime/osl/module.yaml b/modules/kogito-swf/builder/runtime/osl/module.yaml
index 7774e53f40a..9758f7be586 100644
--- a/modules/kogito-swf/builder/runtime/osl/module.yaml
+++ b/modules/kogito-swf/builder/runtime/osl/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.builder.runtime.osl
-version: "1.29.0"
+version: "1.30.0"
 description: "OpenShift Serverless Logic builder module with required extensions"
 
 artifacts:
diff --git a/modules/kogito-swf/devmode/runtime/osl/module.yaml b/modules/kogito-swf/devmode/runtime/osl/module.yaml
index a140dd955a3..d2cba2a8911 100644
--- a/modules/kogito-swf/devmode/runtime/osl/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/osl/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.devmode.runtime.osl
-version: "1.29.0"
+version: "1.30.0"
 description: "OpenShift Serverless Logic devmode with required extensions"
 
 envs:

From 0675a41e51e1446241bd77e0677343374679a6d7 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Wed, 21 Jun 2023 11:57:39 +0200
Subject: [PATCH 598/709] set swf-builder and swf-devmode brew branches to OSL
 1.30 (#1595)

---
 logic-swf-builder-rhel8-image.yaml | 2 +-
 logic-swf-devmode-rhel8-image.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml
index 149014088c2..dad8d2875fe 100644
--- a/logic-swf-builder-rhel8-image.yaml
+++ b/logic-swf-builder-rhel8-image.yaml
@@ -66,4 +66,4 @@ osbs:
   extra_dir: osbs-extra/logic-swf-builder-rhel8
   repository:
     name: containers/openshift-serverless-1-logic-swf-builder
-    branch: openshift-serverless-1.29-rhel-8
\ No newline at end of file
+    branch: openshift-serverless-1.30-rhel-8
diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml
index c28afd8b0bf..d3cf7bc38ab 100644
--- a/logic-swf-devmode-rhel8-image.yaml
+++ b/logic-swf-devmode-rhel8-image.yaml
@@ -65,4 +65,4 @@ osbs:
   extra_dir: osbs-extra/logic-swf-devmode-rhel8
   repository:
     name: containers/openshift-serverless-1-logic-swf-devmode
-    branch: openshift-serverless-1.29-rhel-8
+    branch: openshift-serverless-1.30-rhel-8

From 919f9eb1c91c1bda472bacc1e1aaea5a01cf27c9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 13:47:05 +0200
Subject: [PATCH 599/709] Fix deploy pipeline for release (#1591) (#1593)

Co-authored-by: Tristan Radisson <tradisso@redhat.com>
---
 .ci/jenkins/Jenkinsfile.deploy | 35 ++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 8a0f3539cae..fa76349879b 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -27,6 +27,8 @@ pipeline {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
         BOT_BRANCH_HASH = "${util.generateHash(10)}"
+
+        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
     }
 
     stages {
@@ -281,13 +283,13 @@ void createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'TESTS_MAVEN_ARTIFACTS_REPOSITORY_URL', value: env.MAVEN_ARTIFACT_REPOSITORY ?: (isRelease() ? env.DEFAULT_STAGING_REPOSITORY : '')))
 
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
-            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: params.IMAGE_USE_OPENSHIFT_REGISTRY))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_CREDENTIALS', value: params.IMAGE_REGISTRY_CREDENTIALS))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: params.IMAGE_REGISTRY))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: params.IMAGE_NAMESPACE))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: params.IMAGE_NAME_SUFFIX))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_TAG', value: params.IMAGE_TAG))
-            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: params.DEPLOY_WITH_LATEST_TAG))
+            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_CREDENTIALS', value: getDeployImageRegistryCredentials()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: getDeployImageRegistry()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: getDeployImageNamespace()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: getDeployImageNameSuffix()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_TAG', value: getDeployImageTag()))
+            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: isDeployLatestTag()))
 
             def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
             if (!job.result == 'SUCCESS') {
@@ -340,18 +342,23 @@ List getTestFailedImages() {
 // Deploy image information
 ////////////////////////////////////////////////////////////////////////
 
+boolean isDeployImageInOpenshiftRegistry() {
+    return params.IMAGE_USE_OPENSHIFT_REGISTRY
+}
+
+String getDeployImageRegistryCredentials() {
+    return params.IMAGE_REGISTRY_CREDENTIALS
+}
+
 String getDeployImageRegistry() {
     return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.IMAGE_REGISTRY
 }
-
 String getDeployImageNamespace() {
     return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
 }
-
 String getDeployImageNameSuffix() {
     return params.IMAGE_NAME_SUFFIX
 }
-
 String getDeployImageTag() {
     if (params.IMAGE_TAG != '') {
         return params.IMAGE_TAG
@@ -360,6 +367,10 @@ String getDeployImageTag() {
     }
 }
 
+boolean isDeployLatestTag() {
+    return params.DEPLOY_WITH_LATEST_TAG
+}
+
 ////////////////////////////////////////////////////////////////////////
 // utils
 ////////////////////////////////////////////////////////////////////////
@@ -413,3 +424,7 @@ String[] getImages() {
 void runPythonCommand(String cmd, boolean stdout = false) {
     return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
 }
+
+String getQuarkusPlatformVersion() {
+    return params.QUARKUS_PLATFORM_VERSION
+}
\ No newline at end of file

From f2a43690ed29a46cc9f785deb4676b3d33c74f54 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 21 Jun 2023 23:28:43 +0200
Subject: [PATCH 600/709] CI: deploy pipeline small fix (#1597)

---
 .ci/jenkins/Jenkinsfile.build-image | 13 ++++++-------
 .ci/jenkins/Jenkinsfile.deploy      |  2 +-
 scripts/common.py                   |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index d59d9f79d21..9de3849bdb9 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -65,12 +65,6 @@ pipeline {
         stage('Prepare environment') {
             steps {
                 script {
-                    cloud.prepareForDockerMultiplatformBuild()
-                    cloud.startLocalRegistry()
-                    if (shouldDeployImage()) {
-                        cloud.installSkopeo()
-                    }
-
                     // Set the mirror url only if exist
                     if (env.MAVEN_MIRROR_REPOSITORY) {
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
@@ -101,6 +95,9 @@ pipeline {
         stage('Build image') {
             steps {
                 script {
+                    cloud.prepareForDockerMultiplatformBuild()
+                    cloud.startLocalRegistry()
+
                     // Generate the Dockerfile
                     runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_test=true ignore_tag=true build_options='--dry-run'")
 
@@ -118,6 +115,8 @@ pipeline {
             }
             steps {
                 script {
+                    cloud.installSkopeo()
+
                     // Make public if quay registry
                     if (getDeployImageRegistry() == QUAY_REGISTRY) {
                         String namespace = getDeployImageNamespace()
@@ -178,7 +177,7 @@ pipeline {
                         docker tag ${builtImageTag} ${testImageTag}
                     """
                     try {
-                        runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_build=true ignore_tag=${isProdCI()}")
+                        runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_build=true")
                     } catch (err) {
                         unstable "Testing error(s) for image ${getBuildImageName()}"
                     } finally {
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index fa76349879b..4b804108caa 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -292,7 +292,7 @@ void createBuildAndTestStageClosure(String image) {
             buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: isDeployLatestTag()))
 
             def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
-            if (!job.result == 'SUCCESS') {
+            if (job.result != 'SUCCESS') {
                 if (job.result == 'UNSTABLE') {
                     registerTestFailedImage(image)
                     unstable("Tests on ${image} seems to have failed")
diff --git a/scripts/common.py b/scripts/common.py
index eea855dc28a..40b8c777733 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -372,7 +372,7 @@ def update_maven_repo_in_behave_tests(repo_url, replace_jboss_repository):
     env_var_key = "MAVEN_REPO_URL"
     if replace_jboss_repository:
         env_var_key = "JBOSS_MAVEN_REPO_URL"
-    replacement = "| variable | value |\n      | {} | {} |\n      | MAVEN_DOWNLOAD_OUTPUT | true |".format(env_var_key,
+    replacement = "| variable | value |\n      | {} | {} |".format(env_var_key,
                                                                                                            repo_url)
     update_in_behave_tests(pattern, replacement)
 

From 89a0250c4800abd34bdc065ebb1d187f7ea478c5 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 22 Jun 2023 13:16:22 +0200
Subject: [PATCH 601/709] CI: Build Image job should use build branch
 jenkinsfile (#1599)

---
 .ci/jenkins/dsl/jobs.groovy | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 8f4e686a153..6a70c16a2db 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -170,6 +170,9 @@ void setupDeployJob(JobType jobType, String envName = '') {
 
 void setupBuildImageJob(JobType jobType, String envName = '', boolean prodCI = false) {
     def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-images.build-image', jobType, envName, "${jenkins_path}/Jenkinsfile.build-image", 'Kogito Images Build single image')
+    // Use jenkinsfile from the build branch
+    jobParams.git.author = '${SOURCE_AUTHOR}'
+    jobParams.git.branch = '${SOURCE_BRANCH}'
     JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
     jobParams.env.putAll([
         MAX_REGISTRY_RETRIES: 3,
@@ -187,17 +190,17 @@ void setupBuildImageJob(JobType jobType, String envName = '', boolean prodCI = f
 
             stringParam('SOURCE_AUTHOR', Utils.getGitAuthor(this), 'Build author')
             stringParam('SOURCE_BRANCH', Utils.getGitBranch(this), 'Build branch name')
-            stringParam('TARGET_BRANCH', '', 'In case of a PR to merge with target branch, please provide the target branch')
+            stringParam('TARGET_BRANCH', '', '(Optional) In case of a PR to merge with target branch, please provide the target branch')
 
             // Build information
-            stringParam('BUILD_KOGITO_APPS_URI', '', 'Git uri to the kogito-apps repository to use for tests.')
-            stringParam('BUILD_KOGITO_APPS_REF', '', 'Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
+            stringParam('BUILD_KOGITO_APPS_URI', '', '(Optional) Git uri to the kogito-apps repository to use for tests.')
+            stringParam('BUILD_KOGITO_APPS_REF', '', '(Optional) Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
             stringParam('QUARKUS_PLATFORM_URL', Utils.getMavenQuarkusPlatformRepositoryUrl(this), 'URL to the Quarkus platform to use. The version to use will be guessed from artifacts.')
 
             // Test information
             booleanParam('SKIP_TESTS', false, 'Skip tests')
-            stringParam('TESTS_KOGITO_EXAMPLES_URI', '', 'Git uri to the kogito-examples repository to use for tests.')
-            stringParam('TESTS_KOGITO_EXAMPLES_REF', '', 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
+            stringParam('TESTS_KOGITO_EXAMPLES_URI', '', '(Optional) Git uri to the kogito-examples repository to use for tests.')
+            stringParam('TESTS_KOGITO_EXAMPLES_REF', '', '(Optional) Git reference (branch/tag) to the kogito-examples repository to use for tests.')
             stringParam('TESTS_MAVEN_ARTIFACTS_REPOSITORY_URL', "${MAVEN_ARTIFACTS_REPOSITORY}")
 
             // Deploy information

From 5688a235320101464493ff91c3b14d4f00fb0b6d Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Fri, 23 Jun 2023 06:14:10 -0300
Subject: [PATCH 602/709] =?UTF-8?q?[KOGITO-9343]=20-=20Update=20the=20swf?=
 =?UTF-8?q?=20devmode=20image=20to=20handle=20arm=20data-index=E2=80=A6=20?=
 =?UTF-8?q?(#1584)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [KOGITO-9343] - Update the swf devmode image to handle arm data-index and jobs-service addons

Signed-off-by: Spolti <fspolti@redhat.com>

* Update modules/kogito-swf/common/scripts/added/create-app.sh

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* Update modules/kogito-swf/common/scripts/added/create-app.sh

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* small typo fix

Signed-off-by: Spolti <fspolti@redhat.com>

* small logic typo

Signed-off-by: Spolti <fspolti@redhat.com>

---------

Signed-off-by: Spolti <fspolti@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 .../common/scripts/added/create-app.sh        | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/modules/kogito-swf/common/scripts/added/create-app.sh b/modules/kogito-swf/common/scripts/added/create-app.sh
index 4dd9134ebb5..6153a02d934 100755
--- a/modules/kogito-swf/common/scripts/added/create-app.sh
+++ b/modules/kogito-swf/common/scripts/added/create-app.sh
@@ -49,6 +49,60 @@ if [ ! -z ${KOGITO_VERSION} ]; then
         }" pom.xml
 fi
 
+# if the image being built is X86_64, remove the arm64 maven dependencies from
+# kogito-addons-quarkus-jobs-service-embedded and kogito-addons-quarkus-data-index-inmemory
+# using maven exclusions
+exclusion_jobs_service=""
+pattern_jobs_service="<artifactId>kogito-addons-quarkus-jobs-service-embedded</artifactId>"
+base_exclusions="<exclusion>\
+          <groupId>io.zonky.test.postgres</groupId>\
+          <artifactId>embedded-postgres-binaries-linux-amd64-alpine</artifactId>\
+        </exclusion>\
+        <exclusion>\
+          <groupId>io.zonky.test.postgres</groupId>\
+          <artifactId>embedded-postgres-binaries-darwin-amd64</artifactId>\
+        </exclusion>\
+        <exclusion>\
+          <groupId>io.zonky.test.postgres</groupId>\
+          <artifactId>embedded-postgres-binaries-darwin-arm64v8</artifactId>\
+        </exclusion>\
+        <exclusion>\
+          <groupId>io.zonky.test.postgres</groupId>\
+          <artifactId>embedded-postgres-binaries-windows-amd64</artifactId>\
+        </exclusion>"
+
+arch=$(uname -p)
+if [ "${arch}" = "x86_64" ]; then
+    echo "Removing arm64 dependencies from kogito-addons-quarkus-jobs-service-embedded and kogito-addons-quarkus-data-index-inmemory dependencies"
+    exclusion_jobs_service="${pattern_jobs_service}\
+     <exclusions>\
+        $base_exclusions\
+        <exclusion>\
+          <groupId>io.zonky.test.postgres</groupId>\
+          <artifactId>embedded-postgres-binaries-linux-arm64v8</artifactId>\
+        </exclusion>\
+     </exclusions>"
+
+elif [ "${arch}" = "aarch64" ]; then
+    echo "Removing amd64 dependencies from kogito-addons-quarkus-jobs-service-embedded and kogito-addons-quarkus-data-index-inmemory dependencies"
+    exclusion_jobs_service="${pattern_jobs_service}\
+     <exclusions>\
+        $base_exclusions\
+        <exclusion>\
+          <groupId>io.zonky.test.postgres</groupId>\
+          <artifactId>embedded-postgres-binaries-linux-amd64</artifactId>\
+        </exclusion>\
+     </exclusions>"
+fi
+
+# Do the replace if needed
+if [ ! -z "${exclusion_jobs_service}" ]; then
+    sed -i.bak "s|$pattern_jobs_service|$exclusion_jobs_service|" pom.xml
+fi
+
+if [ "${SCRIPT_DEBUG^^}" = "TRUE" ]; then
+    cat pom.xml
+fi
 
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
   -nsu \

From 7e23a6c343c34655ce6375496f7ed124c8307e71 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Sun, 25 Jun 2023 16:16:14 +0200
Subject: [PATCH 603/709] KOGITO-9469 Set back Kogito Base Builder Image
 (#1604)

* KOGITO-9469 Set back Kogito Base Builder Image

* updated test
---
 kogito-base-builder-image.yaml | 49 ++++++++++++++++++++++++++++++++++
 tests/features/common.feature  |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 kogito-base-builder-image.yaml

diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
new file mode 100644
index 00000000000..806731dc19f
--- /dev/null
+++ b/kogito-base-builder-image.yaml
@@ -0,0 +1,49 @@
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-base-builder"
+version: "2.0.0-snapshot"
+from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"
+
+labels:
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
+  - name: "io.quarkus.platform.version"
+    value: "2.16.7.Final"
+  - name: "org.kie.kogito.version"
+    value: "2.0.0-SNAPSHOT"
+  - name: "maintainer"
+    value: "kogito <bsig-cloud@redhat.com>"
+  - name: "io.k8s.description"
+    value: "Platform for building Kogito based on JDK and Maven"
+  - name: "io.k8s.display-name"
+    value: "Kogito based on JDK and Maven"
+  - name: "io.openshift.tags"
+    value: "base-builder,kogito"
+
+packages:
+  manager: microdnf
+
+modules:
+  repositories:
+    - path: modules
+  install:
+    - name: org.kie.kogito.image.dependencies
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.openjdk
+      version: "11"
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven
+      version: "3.8.6"
+    - name: org.kie.kogito.project.versions
+    - name: org.kie.kogito.security.custom.truststores
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 465dcf9878c..6cac9b8e0e2 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -18,6 +18,7 @@
 @quay.io/kiegroup/kogito-management-console
 @quay.io/kiegroup/kogito-task-console
 @quay.io/kiegroup/kogito-swf-builder
+@quay.io/kiegroup/kogito-base-builder
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 @rhpam-7/rhpam-kogito-builder-rhel8
 @rhpam-7/rhpam-kogito-runtime-native-rhel8

From 58947b9ab2807ff3907ddaa1f0d46ddaac015778 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Sun, 25 Jun 2023 11:18:29 -0300
Subject: [PATCH 604/709] [KOGITO-9450] - Fix behave test for the
 kogito-data-index-oracle image (#1605)

Signed-off-by: Spolti <fspolti@redhat.com>
---
 .../data-index/kogito-data-index-oracle.feature       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature
index b8fcfa4c6ac..c24c39696ca 100644
--- a/tests/features/data-index/kogito-data-index-oracle.feature
+++ b/tests/features/data-index/kogito-data-index-oracle.feature
@@ -9,16 +9,15 @@ Feature: Kogito-data-index oracle feature.
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Oracle
       And the image should contain label io.openshift.tags with value kogito,data-index,data-index-oracle
 
-
   Scenario: verify if of container is correctly started with oracle parameters
     When container is started with env
-      | variable                     | value                                     |
-      | SCRIPT_DEBUG                 | true                                      |
+      | variable                     | value                                      |
+      | SCRIPT_DEBUG                 | true                                       |
       | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:oracle:thin:@//10.1.1.53:1521/quarkus |
-      | QUARKUS_DATASOURCE_USERNAME  | kogito                                    |
-      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                    |
+      | QUARKUS_DATASOURCE_USERNAME  | kogito                                     |
+      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                     |
     Then container log should contain -Djava.library.path=/home/kogito/lib -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>': IO Error: The Network Adapter could not establish the connection
+    And container log should contain java.sql.SQLException: Acquisition timeout while waiting for new connection
     And container log should not contain Application failed to start
 
   Scenario: check if the default quarkus profile is correctly set on data index

From 0cd46a07d5ec006b223b5a36cb6695959c5c670b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Jun 2023 15:18:10 +0200
Subject: [PATCH 605/709] [1.40.x-prod] Fix build-image job with specific
 repository (#1612) (#1613)

* Fix build-image job with specific repository

* Allow to override images list

* update

Co-authored-by: Tristan Radisson <tradisso@redhat.com>
---
 .ci/jenkins/Jenkinsfile                 |  3 +++
 .ci/jenkins/Jenkinsfile.build-image     | 20 +++++++++++++-------
 .ci/jenkins/Jenkinsfile.deploy          |  5 ++++-
 .ci/jenkins/Jenkinsfile.promote         |  4 ++--
 .ci/jenkins/dsl/jobs.groovy             | 10 +++++++++-
 scripts/build-kogito-apps-components.sh |  2 +-
 6 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 9fcd81285d8..732885c5c17 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -88,6 +88,9 @@ Closure createBuildAndTestStageClosure(String image) {
 }
 
 String[] getImages() {
+    if (env.IMAGES_LIST) {
+        return env.IMAGES_LIST.split(',')
+    }
     String listCmd = 'make list'
     if (isProdCI()) {
         listCmd += ' arg=--prod'
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 9de3849bdb9..16ebd5a38f4 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -1,4 +1,4 @@
- @Library('jenkins-pipeline-shared-libraries')_
+@Library('jenkins-pipeline-shared-libraries')_
 
 QUAY_REGISTRY = 'quay.io'
 
@@ -38,10 +38,10 @@ pipeline {
                     currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
 
                     if (getTargetBranch()) {
-                        echo "Got a target branch ... Trying to merge the source with the target"
+                        echo 'Got a target branch ... Trying to merge the source with the target'
                         githubscm.checkoutIfExists(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getTargetBranch(), true)
                     } else {
-                        echo "No target branch ... Checking out simply"
+                        echo 'No target branch ... Checking out simply'
                         checkout(githubscm.resolveRepository(getRepoName(), getSourceAuthor(), getSourceBranch(), false))
                     }
 
@@ -67,11 +67,17 @@ pipeline {
                 script {
                     // Set the mirror url only if exist
                     if (env.MAVEN_MIRROR_REPOSITORY) {
+                        echo "Setup Maven mirror url to '${env.MAVEN_MIRROR_REPOSITORY}'"
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
 
                         // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
                         runPythonCommand("python3 scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
                     }
+
+                    if (getMavenArtifactRepository()) {
+                        echo "Setup Repository url to '${getMavenArtifactRepository()}'"
+                        runPythonCommand("python3 scripts/update-repository.py  --repo-url ${getMavenArtifactRepository()}")
+                    }
                 }
             }
         }
@@ -136,8 +142,8 @@ pipeline {
                     }
                     try {
                         cloud.skopeoCopyRegistryImages(cloud.getReducedTag(getDeployImageTag()), getBuiltImageTag(reducedTag), retries)
-                    } catch(err) {
-                        echo "Reduced tag cannot be applied"
+                    } catch (err) {
+                        echo 'Reduced tag cannot be applied'
                     }
                 }
             }
@@ -336,7 +342,7 @@ List getImageBuildPlatforms() {
 }
 
 String getMavenArtifactRepository() {
-    return params.TESTS_MAVEN_ARTIFACTS_REPOSITORY_URL
+    return params.MAVEN_ARTIFACTS_REPOSITORY
 }
 
 boolean isProdCI() {
@@ -345,4 +351,4 @@ boolean isProdCI() {
 
 String getQuarkusPlatformURL() {
     return params.QUARKUS_PLATFORM_URL
-}
\ No newline at end of file
+}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 4b804108caa..bc10afa0996 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -275,12 +275,12 @@ void createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'SOURCE_AUTHOR', value: isRelease() ? getBotAuthor() : getGitAuthor()))
             buildParams.add(string(name: 'SOURCE_BRANCH', value: isRelease() ? getBotBranch() : getBuildBranch()))
 
+            buildParams.add(string(name: 'MAVEN_ARTIFACTS_REPOSITORY', value: env.MAVEN_ARTIFACT_REPOSITORY ?: (isRelease() ? env.DEFAULT_STAGING_REPOSITORY : '')))
             buildParams.add(string(name: 'BUILD_KOGITO_APPS_URI', value: params.APPS_URI))
             buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: params.APPS_REF))
             buildParams.add(booleanParam(name: 'SKIP_TESTS', value: params.SKIP_TESTS))
             buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_URI', value: params.EXAMPLES_URI))
             buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_REF', value: params.EXAMPLES_REF))
-            buildParams.add(string(name: 'TESTS_MAVEN_ARTIFACTS_REPOSITORY_URL', value: env.MAVEN_ARTIFACT_REPOSITORY ?: (isRelease() ? env.DEFAULT_STAGING_REPOSITORY : '')))
 
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
@@ -418,6 +418,9 @@ void setDeployPropertyIfNeeded(String key, def value) {
 }
 
 String[] getImages() {
+    if (env.IMAGES_LIST) {
+        return env.IMAGES_LIST.split(',')
+    }
     return runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
 }
 
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 21540adf3f6..981ec61af63 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -460,8 +460,8 @@ String getNewImageTag() {
 }
 
 String[] getImages() {
-    String oldImageNames = getOldImageNames()
-    return oldImageNames ? oldImageNames.split(',') : runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
+    String images = getOldImageNames() ?: env.IMAGES_LIST ?: runPythonCommand("make list | tr '\\n' ','", true).trim()
+    return images.split(',')
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 6a70c16a2db..48c39dcbacd 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -60,6 +60,8 @@ void setupPrJob(boolean isProdCI = false) {
         jobParams.pr.trigger_phrase_only = true
         jobParams.pr.commitContext = 'Prod'
         jobParams.env.put('PROD_CI', true)
+    } else if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
+        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
     }
     KogitoJobTemplate.createPRJob(this, jobParams)
 }
@@ -129,6 +131,9 @@ void setupDeployJob(JobType jobType, String envName = '') {
             QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
         ])
     }
+    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
+        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
+    }
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
@@ -193,6 +198,7 @@ void setupBuildImageJob(JobType jobType, String envName = '', boolean prodCI = f
             stringParam('TARGET_BRANCH', '', '(Optional) In case of a PR to merge with target branch, please provide the target branch')
 
             // Build information
+            stringParam('MAVEN_ARTIFACTS_REPOSITORY', "${MAVEN_ARTIFACTS_REPOSITORY}")
             stringParam('BUILD_KOGITO_APPS_URI', '', '(Optional) Git uri to the kogito-apps repository to use for tests.')
             stringParam('BUILD_KOGITO_APPS_REF', '', '(Optional) Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
             stringParam('QUARKUS_PLATFORM_URL', Utils.getMavenQuarkusPlatformRepositoryUrl(this), 'URL to the Quarkus platform to use. The version to use will be guessed from artifacts.')
@@ -201,7 +207,6 @@ void setupBuildImageJob(JobType jobType, String envName = '', boolean prodCI = f
             booleanParam('SKIP_TESTS', false, 'Skip tests')
             stringParam('TESTS_KOGITO_EXAMPLES_URI', '', '(Optional) Git uri to the kogito-examples repository to use for tests.')
             stringParam('TESTS_KOGITO_EXAMPLES_REF', '', '(Optional) Git reference (branch/tag) to the kogito-examples repository to use for tests.')
-            stringParam('TESTS_MAVEN_ARTIFACTS_REPOSITORY_URL', "${MAVEN_ARTIFACTS_REPOSITORY}")
 
             // Deploy information
             booleanParam('DEPLOY_IMAGE', false, 'Should we deploy image to given deploy registry ?')
@@ -236,6 +241,9 @@ void setupPromoteJob(JobType jobType) {
         DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
         MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
     ])
+    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
+        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
+    }
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index b68ec46cf63..b4cb92da5c3 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -20,7 +20,7 @@ shift $#
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
 
 export NODE_OPTIONS="${NODE_OPTIONS} --max_old_space_size=4096"
-MAVEN_OPTIONS="${MAVEN_OPTIONS} -Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
+MAVEN_OPTIONS="${MAVEN_OPTIONS} ${BUILD_MVN_OPTS} -Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
 # used for all-in-one image
 extended_context=""
 

From 4a8a7143ef52e80e534f6033876b6e1e1f5b0fad Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 28 Jun 2023 14:54:22 +0200
Subject: [PATCH 606/709] Fix kogito apps build with pnpm (#1616)

---
 .ci/jenkins/Jenkinsfile                 | 2 ++
 .ci/jenkins/Jenkinsfile.build-image     | 2 ++
 scripts/build-kogito-apps-components.sh | 6 ++++++
 scripts/setup-maven.sh                  | 1 +
 4 files changed, 11 insertions(+)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 732885c5c17..d3344697f52 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -17,6 +17,8 @@ pipeline {
                 script {
                     clean()
 
+                    sh 'printenv'
+
                     githubscm.checkoutIfExists('kogito-images', getChangeAuthor(), getChangeBranch(), 'kiegroup', getChangeTarget(), true)
                 }
             }
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 16ebd5a38f4..e81478b8c13 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -33,6 +33,8 @@ pipeline {
                 script {
                     clean()
 
+                    sh 'printenv'
+
                     assert getBuildImageName() : 'Please provide `BUILD_IMAGE_NAME` parameter'
 
                     currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index b4cb92da5c3..c0d57ecfb4c 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -24,6 +24,12 @@ MAVEN_OPTIONS="${MAVEN_OPTIONS} ${BUILD_MVN_OPTS} -Dquarkus.package.type=fast-ja
 # used for all-in-one image
 extended_context=""
 
+# Fix taken from https://github.com/kiegroup/kogito-apps/pull/1762
+if [ ! -z "${CYPRESS_BINARY_URL}" ]; then
+    export CYPRESS_INSTALL_BINARY="${CYPRESS_BINARY_URL}/cypress-9.7.0.zip"
+    echo "Setting 'CYPRESS_INSTALL_BINARY' variable to ${CYPRESS_INSTALL_BINARY}"
+fi
+
 case ${imageName} in
     "kogito-management-console")
         contextDir="management-console"
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
index ee00579b295..deecf943a89 100755
--- a/scripts/setup-maven.sh
+++ b/scripts/setup-maven.sh
@@ -41,6 +41,7 @@ if [ ! -z "${NPM_REGISTRY_URL}" ]; then
 <yarnDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/yarn/</yarnDownloadRoot>\
 <nodeDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/node/</nodeDownloadRoot>\
 <npmDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/npm/</npmDownloadRoot>\
+<pnpmDownloadRoot>http://download.devel.redhat.com/rcm-guest/staging/rhba/dist/pnpm/</pnpmDownloadRoot>\
 </properties>\
 </profile>\
 "   

From aad33eaa70dd66e05721ecc78c33b0d6753df9af Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 28 Jun 2023 16:52:45 +0200
Subject: [PATCH 607/709] Small fix for building kogito apps in prod branch
 (#1615)

* Small fix for building kogito apps in prod branch

Follow-up on https://github.com/kiegroup/kogito-images/pull/1611

* Small fix for building kogito apps in prod branch

Follow-up on https://github.com/kiegroup/kogito-images/pull/1611
---
 scripts/build-kogito-apps-components.sh | 4 +++-
 scripts/setup-maven.sh                  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index c0d57ecfb4c..d9353944be8 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -20,7 +20,7 @@ shift $#
 script_dir_path=$(cd `dirname "${BASH_SOURCE[0]}"`; pwd -P)
 
 export NODE_OPTIONS="${NODE_OPTIONS} --max_old_space_size=4096"
-MAVEN_OPTIONS="${MAVEN_OPTIONS} ${BUILD_MVN_OPTS} -Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
+APPS_MAVEN_OPTIONS="-Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
 # used for all-in-one image
 extended_context=""
 
@@ -105,6 +105,7 @@ for ctx in ${contextDir}; do
     mkdir -p ${mvn_local_repo}
 
     . ${script_dir_path}/setup-maven.sh "${build_target_dir}"/settings.xml
+    MAVEN_OPTIONS="${MAVEN_OPTIONS} ${APPS_MAVEN_OPTIONS}"
 
     if stat ${HOME}/.m2/repository/ &> /dev/null; then
         echo "Copy current maven repo to maven context local repo ${mvn_local_repo}"
@@ -120,6 +121,7 @@ for ctx in ${contextDir}; do
         eval ${git_command}
     fi
     cd ${KOGITO_APPS_REPO_NAME} && echo "working dir `pwd`"
+    echo "Got MAVEN_OPTIONS = ${MAVEN_OPTIONS}"
     mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS} -Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false"
     echo "Building component(s) ${contextDir} with the following maven command [${mvn_command}]"
     export YARN_CACHE_FOLDER=/tmp/cache/yarn/${ctx} # Fix for building yarn apps in parallel
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
index deecf943a89..99dd300b1a4 100755
--- a/scripts/setup-maven.sh
+++ b/scripts/setup-maven.sh
@@ -4,7 +4,7 @@
 
 MAVEN_VERSION="3.8.x"
 MVN_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-maven/${MAVEN_VERSION}"
-MAVEN_OPTIONS="-DskipTests"
+export MAVEN_OPTIONS="${BUILD_MVN_OPTS} -DskipTests"
 # Do not remove below, this can be updated by the python scripts
 MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true
 

From d3d111e0cea388e54dbc690c65c75ccbc21fba3e Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 3 Jul 2023 07:37:29 -0400
Subject: [PATCH 608/709] [main] Update version to 2.0.0-snapshot

---
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index dc35587dea0..100d9f16c38 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 3337992d5cf..ee8bde464ed 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |              
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |               
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index a5184652ec5..4eac6b7c39c 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT | 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From d39ddf8d4322027ce4e6e5468c6d53b0717c3163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Macik?= <mmacik@redhat.com>
Date: Mon, 3 Jul 2023 17:13:27 +0200
Subject: [PATCH 609/709] KOGITO-9512 - Unify logic-swf-* image description
 with labels and fix BDD tests (#1617)

---
 logic-data-index-ephemeral-rhel8-image.yaml   |  2 ++
 logic-imagestream.yaml                        |  2 +-
 logic-swf-builder-rhel8-image.yaml            |  4 +++-
 logic-swf-devmode-rhel8-image.yaml            |  4 +++-
 .../logic-data-index-ephemeral.feature        |  1 +
 .../logic-swf-builder.feature                 |  5 +++--
 .../logic-swf-devmode.feature                 | 20 +++++++++----------
 7 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
index f9415ff90f7..0d89e1d8702 100644
--- a/logic-data-index-ephemeral-rhel8-image.yaml
+++ b/logic-data-index-ephemeral-rhel8-image.yaml
@@ -8,6 +8,8 @@ description: "Red Hat build of Runtime image for Kogito Data Index Service for e
 labels:
 - name: "com.redhat.component"
   value: "openshift-serverless-1-logic-data-index-ephemeral-rhel8-container"
+- name: "maintainer"
+  value: "serverless-logic <bsig-cloud@redhat.com>"
 - name: "io.k8s.description"
   value: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 - name: "io.k8s.display-name"
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
index eaba390338f..46e863bb1fb 100644
--- a/logic-imagestream.yaml
+++ b/logic-imagestream.yaml
@@ -53,7 +53,7 @@ items:
     metadata:
       name: logic-builder
       annotations:
-        openshift.io/display-name: Red Hat build of Runtime image for Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled
+        openshift.io/display-name: Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
         openshift.io/provider-display-name: Kie Group
     spec:
       tags:
diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml
index dad8d2875fe..10100c29e69 100644
--- a/logic-swf-builder-rhel8-image.yaml
+++ b/logic-swf-builder-rhel8-image.yaml
@@ -2,7 +2,7 @@ schema_version: 1
 name: "openshift-serverless-1-tech-preview/logic-swf-builder-rhel8"
 version: "1.30.0"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Red Hat build of Runtime image for Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
+description: "Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled"
 
 labels:
   - name: "io.openshift.s2i.scripts-url"
@@ -15,6 +15,8 @@ labels:
     value: "2.0.0-SNAPSHOT"
   - name: "com.redhat.component"
     value: "openshift-serverless-1-logic-swf-builder-rhel8-container"
+  - name: "maintainer"
+    value: "serverless-logic <bsig-cloud@redhat.com>"
   - name: "io.k8s.description"
     value: "Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled"
   - name: "io.k8s.display-name"
diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml
index d3cf7bc38ab..c240e71eb50 100644
--- a/logic-swf-devmode-rhel8-image.yaml
+++ b/logic-swf-devmode-rhel8-image.yaml
@@ -2,7 +2,7 @@ schema_version: 1
 name: "openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 version: "1.30.0"
-description: "Red Hat build of Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
+description: "Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled"
 
 labels:
   - name: "io.quarkus.platform.version"
@@ -19,6 +19,8 @@ labels:
     value: "8080:http,5005:http"
   - name: "com.redhat.component"
     value: "openshift-serverless-1-logic-swf-devmode-rhel8-container"
+  - name: "maintainer"
+    value: "serverless-logic <bsig-cloud@redhat.com>"
 
 modules:
   repositories:
diff --git a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
index 4f944a5eb17..5b5ae60b6c4 100644
--- a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
+++ b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
@@ -4,6 +4,7 @@ Feature: logic-data-index-ephemeral-rhel8 feature.
   Scenario: verify if all labels are correctly set on logic-data-index-ephemeral-rhel8 image
     Given image is built
       Then the image should contain label io.openshift.expose-services with value 8080:http
+      And the image should contain label maintainer with value serverless-logic <bsig-cloud@redhat.com>
       And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
       And the image should contain label io.k8s.display-name with value Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
       And the image should contain label io.openshift.tags with value logic-data-index,kogito,data-index,data-index-ephemeral
diff --git a/tests/features/openshift-serverless-logic/logic-swf-builder.feature b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
index d056fc92cad..3eaad6779c7 100644
--- a/tests/features/openshift-serverless-logic/logic-swf-builder.feature
+++ b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
@@ -1,10 +1,11 @@
 @openshift-serverless-1-tech-preview/logic-swf-builder-rhel8
-Feature: logic--swf-builder-rhel8 feature.
+Feature: logic-swf-builder-rhel8 feature.
 
   Scenario: verify if all labels are correctly set on logic-swf-builder-rhel8 image
     Given image is built
       Then the image should contain label io.openshift.expose-services with value 8080:http
-      And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled
+      And the image should contain label maintainer with value serverless-logic <bsig-cloud@redhat.com>
+      And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
       And the image should contain label io.k8s.display-name with value Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
       And the image should contain label io.openshift.tags with value logic-swf-builder,kogito,swf-builder
       And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-builder-rhel8-container
diff --git a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
index 0f8f7cf042d..05a4eb4636d 100644
--- a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
+++ b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
@@ -1,13 +1,11 @@
 @openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8
-Feature: Serverless Workflow devmode images
+Feature: logic-swf-devmode-rhel8 feature.
 
-  Feature: logic-swf-devmode-rhel8 feature.
-
-    Scenario: verify if all labels are correctly set on logic-swf-devmode-rhel8 image
-      Given image is built
-        Then the image should contain label io.openshift.expose-services with value 8080:http,5005:http
-        AND the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
-        And the image should contain label io.k8s.description with value Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
-        And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic SWF Devmode
-        And the image should contain label io.openshift.tags with value logic,devmode,kogito,kogito,development,serverless,workflow
-        And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-devmode-rhel8-container
\ No newline at end of file
+  Scenario: verify if all labels are correctly set on logic-swf-devmode-rhel8 image
+    Given image is built
+      Then the image should contain label io.openshift.expose-services with value 8080:http,5005:http
+      And the image should contain label maintainer with value serverless-logic <bsig-cloud@redhat.com>
+      And the image should contain label io.k8s.description with value Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
+      And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic SWF Devmode
+      And the image should contain label io.openshift.tags with value logic,devmode,kogito,kogito,development,serverless,workflow
+      And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-devmode-rhel8-container
\ No newline at end of file

From 070ed4e2f988ef6bcb100f06f2c48265a1b724e6 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Tue, 11 Jul 2023 09:28:44 +0200
Subject: [PATCH 610/709] build-quarkus-app.sh: include brotli4j
 native-linux-aarch64 artifact (#1626)

---
 scripts/logic/build-quarkus-app.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 8fc21d6bac1..534da4b8f6d 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -16,6 +16,8 @@ quarkus_platform_groupid="${2}"
 quarkus_platform_version="${3}"
 kogito_version="${KOGITO_VERSION:-${4}}"
 
+# arch specific dependencies
+quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch64:1.8.0"
 # common extensions used by the kogito-swf-builder and kogito-swf-devmode
 quarkus_extensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
 # dev mode purpose extensions used only by the kogito-swf-devmode
@@ -28,10 +30,10 @@ fi
 
 case ${image_name} in
     "kogito-swf-builder")
-        quarkus_extensions="${quarkus_extensions}"
+        quarkus_extensions="${quarkus_extensions},${quarkus_extensions_arch_specific}"
         ;;
     "kogito-swf-devmode")
-        quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions}"
+        quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions},${quarkus_extensions_arch_specific}"
         ;;
     *)
         echo "${image_name} is not a quarkus app image, exiting..."

From 125885805565f16d2f061816528cd98455500fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Macik?= <mmacik@redhat.com>
Date: Tue, 11 Jul 2023 09:35:49 +0200
Subject: [PATCH 611/709] Fix io.k8s.display-name for logic-swf-builder (#1624)

---
 .../openshift-serverless-logic/logic-swf-builder.feature        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/features/openshift-serverless-logic/logic-swf-builder.feature b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
index 3eaad6779c7..4130ca3c864 100644
--- a/tests/features/openshift-serverless-logic/logic-swf-builder.feature
+++ b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
@@ -6,6 +6,6 @@ Feature: logic-swf-builder-rhel8 feature.
       Then the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label maintainer with value serverless-logic <bsig-cloud@redhat.com>
       And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
-      And the image should contain label io.k8s.display-name with value Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
+      And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic Builder image
       And the image should contain label io.openshift.tags with value logic-swf-builder,kogito,swf-builder
       And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-builder-rhel8-container

From 507c14de574f249754a45fb4951538e067066e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Macik?= <mmacik@redhat.com>
Date: Tue, 11 Jul 2023 15:16:33 +0200
Subject: [PATCH 612/709] Remove full stops from logic features

---
 .../logic-data-index-ephemeral.feature                          | 2 +-
 .../openshift-serverless-logic/logic-swf-builder.feature        | 2 +-
 .../openshift-serverless-logic/logic-swf-devmode.feature        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
index 5b5ae60b6c4..147918c4e16 100644
--- a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
+++ b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
@@ -1,5 +1,5 @@
 @openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
-Feature: logic-data-index-ephemeral-rhel8 feature.
+Feature: logic-data-index-ephemeral-rhel8 feature
 
   Scenario: verify if all labels are correctly set on logic-data-index-ephemeral-rhel8 image
     Given image is built
diff --git a/tests/features/openshift-serverless-logic/logic-swf-builder.feature b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
index 4130ca3c864..4982cb886b6 100644
--- a/tests/features/openshift-serverless-logic/logic-swf-builder.feature
+++ b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
@@ -1,5 +1,5 @@
 @openshift-serverless-1-tech-preview/logic-swf-builder-rhel8
-Feature: logic-swf-builder-rhel8 feature.
+Feature: logic-swf-builder-rhel8 feature
 
   Scenario: verify if all labels are correctly set on logic-swf-builder-rhel8 image
     Given image is built
diff --git a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
index 05a4eb4636d..a69f5d166ba 100644
--- a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
+++ b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
@@ -1,5 +1,5 @@
 @openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8
-Feature: logic-swf-devmode-rhel8 feature.
+Feature: logic-swf-devmode-rhel8 feature
 
   Scenario: verify if all labels are correctly set on logic-swf-devmode-rhel8 image
     Given image is built

From 136b9cd7392e7ef7bea021e4e7575b836d3ca910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mari=C3=A1n=20Macik?= <mmacik@redhat.com>
Date: Tue, 11 Jul 2023 16:20:07 +0200
Subject: [PATCH 613/709] Include kogito-swf-builder.feature for
 logic-swf-builder-rhel8

---
 tests/features/kogito-swf-builder.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 96c72b7073f..288357b74a7 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -1,4 +1,5 @@
 @quay.io/kiegroup/kogito-swf-builder
+@openshift-serverless-1-tech-preview/logic-swf-builder-rhel8
 Feature: Serverless Workflow builder images
 
   Scenario: Verify that the application is built and started correctly

From ce85468dd7a4a5064f3a7881d15d1396ef41569a Mon Sep 17 00:00:00 2001
From: kie-ci3 <106377484+kie-ci3@users.noreply.github.com>
Date: Wed, 12 Jul 2023 14:39:43 +0200
Subject: [PATCH 614/709] [main] Bump Quarkus version to 2.16.8.Final (#1623)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 kogito-base-builder-image.yaml              | 2 +-
 kogito-runtime-jvm-image.yaml               | 2 +-
 kogito-runtime-native-image.yaml            | 2 +-
 kogito-s2i-builder-image.yaml               | 2 +-
 kogito-swf-builder-image.yaml               | 2 +-
 kogito-swf-devmode-image.yaml               | 2 +-
 modules/kogito-project-versions/module.yaml | 2 +-
 tests/features/kogito-swf-common.feature    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index 806731dc19f..02182cd671c 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.7.Final"
+    value: "2.16.8.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
index 17e630d6ca9..91252391b71 100644
--- a/kogito-runtime-jvm-image.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.7.Final"
+    value: "2.16.8.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml
index 9646b2eeb79..c696d3c890b 100644
--- a/kogito-runtime-native-image.yaml
+++ b/kogito-runtime-native-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.7.Final"
+    value: "2.16.8.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
index c72035d414e..70e0f0bc5b8 100644
--- a/kogito-s2i-builder-image.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.7.Final"
+    value: "2.16.8.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 5f3abfab322..4ef937ea4e2 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -33,7 +33,7 @@
       - name: "io.openshift.s2i.destination"
         value: "/tmp"
       - name: "io.quarkus.platform.version"
-        value: "2.16.7.Final"
+        value: "2.16.8.Final"
       - name: "org.kie.kogito.version"
         value: "2.0.0-SNAPSHOT"
       - name: "maintainer"
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 074f0007a5d..03b1587d158 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -29,7 +29,7 @@
 
     labels:
       - name: "io.quarkus.platform.version"
-        value: "2.16.7.Final"
+        value: "2.16.8.Final"
       - name: "org.kie.kogito.version"
         value: "2.0.0-SNAPSHOT"
       - name: "maintainer"
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index 382ff1336df..1a9820f0a96 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -8,5 +8,5 @@ envs:
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "2.16.7.Final"
+    value: "2.16.8.Final"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 7efd4f9e189..049b4181c1a 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -7,7 +7,7 @@ Feature: Serverless Workflow images common
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.7.Final/quarkus-bom-2.16.7.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.8.Final/quarkus-bom-2.16.8.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From c66a1519d9a634d04d6bf3492b21507eca7d119a Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 17 Jul 2023 15:25:15 +0200
Subject: [PATCH 615/709] CI: Correct operator build with registry mirror
 (#1632)

Depends on https://github.com/kiegroup/jenkins-pipeline-shared-libraries/pull/286
---
 .ci/jenkins/Jenkinsfile.build-image | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index e81478b8c13..431468d6161 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -103,8 +103,8 @@ pipeline {
         stage('Build image') {
             steps {
                 script {
-                    cloud.prepareForDockerMultiplatformBuild()
-                    cloud.startLocalRegistry()
+                    String localRegistry = cloud.startLocalRegistry()
+                    cloud.prepareForDockerMultiplatformBuild([localRegistry],[cloud.getDockerIOMirrorRegistryConfig()], false)
 
                     // Generate the Dockerfile
                     runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_test=true ignore_tag=true build_options='--dry-run'")

From 5dd65be254d56ed3c7afc75b8aa63378041c54a2 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 18 Jul 2023 13:13:20 +0200
Subject: [PATCH 616/709] KOGITO-9488 CI: Update status for each image built
 (#1602)

* Test update status

* update
---
 .ci/jenkins/Jenkinsfile                 | 20 ++++++++++---
 .ci/jenkins/Jenkinsfile.build-image     | 39 +++++++++++++++++++++++--
 .ci/jenkins/dsl/jobs.groovy             | 10 ++++++-
 kogito-data-index-postgresql-image.yaml |  1 +
 4 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index d3344697f52..9111c2a7482 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -18,8 +18,8 @@ pipeline {
                     clean()
 
                     sh 'printenv'
-
-                    githubscm.checkoutIfExists('kogito-images', getChangeAuthor(), getChangeBranch(), 'kiegroup', getChangeTarget(), true)
+                    
+                    githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'kiegroup', getChangeTarget(), true)
                 }
             }
         }
@@ -76,8 +76,12 @@ Closure createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
             buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
             buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
-
-            def job = build(job: "kogito-images.build-image", wait: true, parameters: buildParams, propagate: false)
+            
+            githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'kiegroup', getGitAuthorCredentialsId())
+            githubscm.updateGithubCommitStatus(image, 'PENDING', 'Queued', getRepoName())
+            
+            // Keep executing so we can cancel all if needed
+            def job = build(job: "${getRepoName()}.build-image", wait: true, parameters: buildParams, propagate: false)
             if (job.result != 'SUCCESS') {
                 if (job.result == 'UNSTABLE') {
                     unstable("Tests on ${image} seems to have failed")
@@ -115,3 +119,11 @@ String getChangeBranch() {
 String getChangeTarget() {
     return env.ghprbTargetBranch ?: CHANGE_TARGET
 }
+
+String getRepoName() {
+    return env.REPO_NAME
+}
+
+String getGitAuthorCredentialsId() {
+    return env.AUTHOR_CREDS_ID
+}
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 431468d6161..48b835f3120 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -36,16 +36,18 @@ pipeline {
                     sh 'printenv'
 
                     assert getBuildImageName() : 'Please provide `BUILD_IMAGE_NAME` parameter'
-
                     currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
 
                     if (getTargetBranch()) {
                         echo 'Got a target branch ... Trying to merge the source with the target'
-                        githubscm.checkoutIfExists(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getTargetBranch(), true)
+                        githubscm.checkoutIfExists(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getTargetBranch(), true, [ token: getGitAuthorTokenCredentialsId(), usernamePassword: getGitAuthorCredentialsId() ])
+                        githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getGitAuthorCredentialsId())
                     } else {
                         echo 'No target branch ... Checking out simply'
-                        checkout(githubscm.resolveRepository(getRepoName(), getSourceAuthor(), getSourceBranch(), false))
+                        checkout(githubscm.resolveRepository(getRepoName(), getSourceAuthor(), getSourceBranch(), false, getGitAuthorCredentialsId()))
+                        githubscm.prepareCommitStatusInformation(getRepoName(), getSourceAuthor(), getSourceBranch(), getGitAuthorCredentialsId())
                     }
+                    updateGithubCommitStatus('PENDING', 'Started')
 
                     if (isProdCI()) {
                         // Prod fix to be able to build the image as a community one
@@ -103,6 +105,8 @@ pipeline {
         stage('Build image') {
             steps {
                 script {
+                    updateGithubCommitStatus('PENDING', 'Build in progress')
+
                     String localRegistry = cloud.startLocalRegistry()
                     cloud.prepareForDockerMultiplatformBuild([localRegistry],[cloud.getDockerIOMirrorRegistryConfig()], false)
 
@@ -177,6 +181,8 @@ pipeline {
             }
             steps {
                 script {
+                    updateGithubCommitStatus('PENDING', 'Tests in progress')
+
                     String testImageTag = "quay.io/kiegroup/${getBuildImageName()}:${getImageVersion()}"
                     String builtImageTag = getBuiltImageTag()
                     // Pull and tag to test image
@@ -199,6 +205,8 @@ pipeline {
     post {
         always {
             script {
+                updateGithubCommitStatusFromBuildResult()
+
                 clean()
             }
         }
@@ -315,6 +323,14 @@ String getTargetBranch() {
     return params.TARGET_BRANCH
 }
 
+String getGitAuthorCredentialsId() {
+    return env.AUTHOR_CREDS_ID
+}
+
+String getGitAuthorTokenCredentialsId() {
+    return env.AUTHOR_TOKEN_CREDS_ID
+}
+
 boolean shouldDeployImage() {
     return params.DEPLOY_IMAGE
 }
@@ -354,3 +370,20 @@ boolean isProdCI() {
 String getQuarkusPlatformURL() {
     return params.QUARKUS_PLATFORM_URL
 }
+
+def updateGithubCommitStatus(String state, String message) {
+    githubscm.updateGithubCommitStatus(getBuildImageName(), state, message)
+}
+
+def updateGithubCommitStatusFromBuildResult() {
+    githubscm.updateGithubCommitStatusFromBuildResult(getBuildImageName())
+}
+
+Map getRepositoryInfo() {
+    return [
+        repository: getRepoName(),
+        author: getSourceAuthor(),
+        branch: getSourceBranch(),
+        credentials_id: getGitAuthorCredentialsId(),
+    ]
+}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 48c39dcbacd..bf389d7fb14 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -53,16 +53,21 @@ void setupPrJob(boolean isProdCI = false) {
         run_only_for_branches: [ "${GIT_BRANCH}" ],
         disable_status_message_error: true,
         disable_status_message_failure: true,
+        commitContext: 'Retrieve and Launch Image Checks',
+        contextShowtestResults: false,
     ])
     if (isProdCI) {
         jobParams.job.name += '.prod'
         jobParams.pr.trigger_phrase = '.*[j|J]enkins,?.*(rerun|run) [prod|Prod|PROD].*'
         jobParams.pr.trigger_phrase_only = true
-        jobParams.pr.commitContext = 'Prod'
+        jobParams.pr.commitContext = '(Prod) Retrieve and Launch Image Checks'
         jobParams.env.put('PROD_CI', true)
     } else if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
         jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
     }
+    jobParams.env.putAll([
+        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+    ])
     KogitoJobTemplate.createPRJob(this, jobParams)
 }
 
@@ -183,6 +188,9 @@ void setupBuildImageJob(JobType jobType, String envName = '', boolean prodCI = f
         MAX_REGISTRY_RETRIES: 3,
         TARGET_AUTHOR: Utils.getGitAuthor(this), // In case of a PR to merge with target branch
         PROD_CI: prodCI,
+
+        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        AUTHOR_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         logRotator {
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index 546ebf9045a..56ecf30fbd1 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -5,6 +5,7 @@ version: "2.0.0-snapshot"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
 
+
 labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"

From ea3fec92fce3c92d7a6cc7bde61c3810145b22fa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 14:07:01 +0200
Subject: [PATCH 617/709] CI: Fix reduced tag push (#1636) (#1639)

Co-authored-by: Tristan Radisson <tradisso@redhat.com>
---
 .ci/jenkins/Jenkinsfile.build-image | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 48b835f3120..2d5d323fc2c 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -147,9 +147,10 @@ pipeline {
                         cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag('latest'), retries)
                     }
                     try {
-                        cloud.skopeoCopyRegistryImages(cloud.getReducedTag(getDeployImageTag()), getBuiltImageTag(reducedTag), retries)
+                        String reducedTag = cloud.getReducedTag(getDeployImageTag())
+                        cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag(reducedTag), retries)
                     } catch (err) {
-                        echo 'Reduced tag cannot be applied'
+                        echo "Reduced tag cannot be applied: ${err}"
                     }
                 }
             }

From 55d1055189650585b508c09ef52211f633e820a3 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 24 Jul 2023 03:37:44 -0400
Subject: [PATCH 618/709] [main] Update version to 2.0.0-snapshot

---
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 100d9f16c38..c64cf698459 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -127,7 +127,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index ee8bde464ed..19ca31944a4 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |               
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |                
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 4eac6b7c39c..e2a610f16fc 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |       
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 8959a28876ae2e7391fa6507d26385470b0e81a1 Mon Sep 17 00:00:00 2001
From: Andrea Lamparelli <a.lamparelli95@gmail.com>
Date: Wed, 26 Jul 2023 10:44:30 +0200
Subject: [PATCH 619/709] [BXMSPRO-2086] update quarkus job for prod images
 (#1644)

* [BXMSPRO-2086] update quarkus job for prod images

* Update .ci/jenkins/dsl/jobs.groovy

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

---------

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 .ci/jenkins/dsl/jobs.groovy | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index bf389d7fb14..95a402903d5 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -34,11 +34,11 @@ setupPromoteJob(JobType.RELEASE)
 if (Utils.isProductizedBranch(this)) {
     setupPrJob(true) // Prod CI job
     setupProdUpdateVersionJob()
+    setupQuarkusUpdateJob(true) // Prod CI job
 }
 
-KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
-    'source ~/virtenvs/cekit/bin/activate && python3 scripts/update-repository.py --quarkus-platform-version %new_version%'
-])
+// Update quarkus on community
+setupQuarkusUpdateJob()
 
 /////////////////////////////////////////////////////////////////
 // Methods
@@ -309,3 +309,10 @@ void setupProdUpdateVersionJob() {
         }
     }
 }
+
+void setupQuarkusUpdateJob(boolean isProdCI = false) {
+    def prodFlag = isProdCI ? '--prod' : ''
+    KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
+        "source ~/virtenvs/cekit/bin/activate && python3 scripts/update-repository.py --quarkus-platform-version %new_version% ${prodFlag}"
+    ])
+}

From 3e9f6dbfb946b38a30fda179b143977848026374 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 26 Jul 2023 05:46:06 -0300
Subject: [PATCH 620/709] [KOGITO-9633] - tzdb.dat (No such file or directory)
 (#1643)

* [KOGITO-9633] - tzdb.dat (No such file or directory)

Signed-off-by: Spolti <fspolti@redhat.com>

* Apply suggestions from code review

---------

Signed-off-by: Spolti <fspolti@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 modules/kogito-openjdk/11-headless/module.yaml | 1 +
 modules/kogito-openjdk/11/module.yaml          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/kogito-openjdk/11-headless/module.yaml b/modules/kogito-openjdk/11-headless/module.yaml
index 55a7daa4f55..aacfc7fd2d1 100644
--- a/modules/kogito-openjdk/11-headless/module.yaml
+++ b/modules/kogito-openjdk/11-headless/module.yaml
@@ -25,4 +25,5 @@ execute:
 
 packages:
   install:
+    - tzdata-java # Fix for new openjdk installations. See https://bugzilla.redhat.com/show_bug.cgi?id=2224411
     - java-11-openjdk-headless
diff --git a/modules/kogito-openjdk/11/module.yaml b/modules/kogito-openjdk/11/module.yaml
index 4a1c377e2f7..a6d65ea9a08 100644
--- a/modules/kogito-openjdk/11/module.yaml
+++ b/modules/kogito-openjdk/11/module.yaml
@@ -25,5 +25,6 @@ execute:
 
 packages:
   install:
+    - tzdata-java # Fix for new openjdk installations. See https://bugzilla.redhat.com/show_bug.cgi?id=2224411
     - java-11-openjdk-devel
 

From c18f1894ad61f0e335edf309ff104ed906ae1c36 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Wed, 26 Jul 2023 06:41:39 -0300
Subject: [PATCH 621/709] [KOGITO-9465] - Fix behave test for the
 kogito-s2i-builder image (#1610)

* [KOGITO-9465] - Fix behave test for the kogito-s2i-builder image

Signed-off-by: Spolti <fspolti@redhat.com>

* test config

* try 2 builds in one scenario

* update

* correction

* Update tests/features/kogito-common-builder-jvm.feature

* Revert "test config"

This reverts commit 79eff86300963f4720c82c441e1420cd0655b082.

* Update feature files

* Update tests/features/kogito-s2i-builder-native.feature

* Update tests/test-apps/clone-repo.sh

* review

Signed-off-by: Spolti <fspolti@redhat.com>

---------

Signed-off-by: Spolti <fspolti@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 Makefile                                      |  2 +-
 .../kogito-common-builder-jvm.feature         | 44 ++++++-------------
 .../kogito-s2i-builder-native.feature         | 26 +++--------
 3 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/Makefile b/Makefile
index 786102f7b5e..e5f3d8c2362 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ clone-repos:
 # if the ignore_test env is not defined or false, proceed with the tests, as first step prepare the examples to be used
 ifneq ($(ignore_test),true)
 ifneq ($(ignore_test_prepare),true)
-	cd tests/test-apps && sh clone-repo.sh $(NATIVE) $(image_name)
+	cd tests/test-apps && export CONTAINER_ENGINE=$(BUILD_ENGINE) && sh clone-repo.sh $(NATIVE) $(image_name)
 	cd ../..
 endif
 endif
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index e5ade0fff2f..450277b2f67 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -95,31 +95,17 @@ Feature: kogito-s2i-builder image JVM build tests
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/quarkus-run.jar should exist
 
-  Scenario: Perform a incremental s2i build using quarkus runtime type
+  Scenario: Perform an incremental s2i build using quarkus runtime type
     Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
-    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-
-  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
-  Scenario: Perform a second incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    And s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
-    Then s2i build log should contain Expanding artifacts from incremental build...
-    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And s2i build log should contain Expanding artifacts from incremental build...
     And file /home/kogito/bin/quarkus-run.jar should exist
     And check that page is served
       | property        | value                 |
@@ -131,7 +117,6 @@ Feature: kogito-s2i-builder image JVM build tests
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
 
-
 #### SpringBoot Scenarios
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
@@ -207,12 +192,19 @@ Feature: kogito-s2i-builder image JVM build tests
     And container log should contain Started DemoApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
-  Scenario: Perform a incremental s2i build using springboot runtime type
+  Scenario: Perform an incremental s2i build using springboot runtime type
     Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
-    Then check that page is served
+    And s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
+      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
+      | variable     | value      |
+      | RUNTIME_TYPE | springboot |
+    Then s2i build log should contain Expanding artifacts from incremental build...
+    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And file /home/kogito/bin/process-springboot-example.jar should exist
+    And check that page is served
       | property             | value                                                                         |
       | port                 | 8080                                                                          |
       | path                 | /orders                                                                       |
@@ -221,16 +213,6 @@ Feature: kogito-s2i-builder image JVM build tests
       | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
       | content_type         | application/json                                                              |
       | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-
-  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
-  Scenario: Perform a second incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable     | value      |
-      | RUNTIME_TYPE | springboot |
-    Then s2i build log should contain Expanding artifacts from incremental build...
-    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
 
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
     Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index c64cf698459..23ed427e866 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -83,32 +83,19 @@ Feature: kogito-s2i-builder image native build tests
      And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
      And s2i build log should contain -J-Xmx5153960755
 
-  Scenario: Perform a incremental s2i build for native test
+  Scenario: Perform an incremental s2i build for native test
     Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
-    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-
-  # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected.
-  Scenario:Perform a second incremental s2i build for native scenario, this time, with native enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    And s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value      |
       | RUNTIME_TYPE | quarkus    |
       | NATIVE       | true       |
       | LIMIT_MEMORY | 6442450944 |
-    Then s2i build log should contain Expanding artifacts from incremental build...
-    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And s2i build log should contain Expanding artifacts from incremental build...
+    And s2i build log should contain -J-Xmx5153960755
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
     And check that page is served
       | property        | value                 |
@@ -118,8 +105,7 @@ Feature: kogito-s2i-builder image native build tests
       | content_type    | application/json      |
       | request_body    | {"strings":["hello"]} |
       | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And s2i build log should contain -J-Xmx5153960755
+      | expected_phrase | ["hello","world"]     |    
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest

From df75994343cb7c21ed67bcdaf89ab473062fa35d Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 26 Jul 2023 15:03:05 +0200
Subject: [PATCH 622/709] KOGITO-9616 Improve release notes (#1642)

* KOGITO-9616 Improve release notes

Similar to https://github.com/kiegroup/kogito-runtimes/pull/3017

* review comments
---
 .ci/jenkins/Jenkinsfile.promote | 40 ++++-----------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 981ec61af63..933d438dc8c 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -219,43 +219,11 @@ void makeQuayNewImagesPublic() {
 }
 
 void createRelease() {
-    if (isReleaseExist()) {
-        deleteRelease()
-    }
-
-    if (githubscm.isTagExist('origin', getGitTag())) {
-        githubscm.removeLocalTag(getGitTag())
-        githubscm.removeRemoteTag('origin', getGitTag(), getGitAuthorCredsID())
-    }
-
-    def releaseName = "Kogito Images Version ${getProjectVersion()}"
-    def description = params.RELEASE_NOTES ?: "We are glad to announce that the Kogito ${getProjectVersion()} release is now available!"
-    withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
-        sh """
-            export GITHUB_USER=${getGitAuthor()}
-            github-release release --tag ${getGitTag()} --target '${getBuildBranch()}' --name '${releaseName}' --description '${description}' --pre-release
-        """
-    }
-}
-
-boolean isReleaseExist() {
-    releaseExistStatus = -1
-    withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
-        releaseExistStatus = sh(returnStatus: true, script: """
-            export GITHUB_USER=${getGitAuthor()}
-            github-release info --tag ${getGitTag()}
-        """)
-    }
-    return releaseExistStatus == 0
-}
-
-void deleteRelease() {
-    withCredentials([string(credentialsId: env.GITHUB_TOKEN_CREDS_ID, variable: 'GITHUB_TOKEN')]) {
-        sh """
-            export GITHUB_USER=${getGitAuthor()}
-            github-release delete --tag ${getGitTag()}
-        """
+    if(githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsID())) {
+        githubscm.deleteReleaseAndTag(getGitTag(), getGitAuthorCredsID())
     }
+    githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTag(getGitTag()), getGitAuthorCredsID())
+    githubscm.updateReleaseBody(getGitTag(), getGitAuthorCredsID())
 }
 
 String getOldImageFullTag(String imageName) {

From 45ff4bd9158a157ee06029214ed8ba3f70374872 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Tue, 1 Aug 2023 13:53:18 +0200
Subject: [PATCH 623/709] Fix Spring Boot incremental testing (#1652)

---
 tests/features/kogito-common-builder-jvm.feature | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index 450277b2f67..f405feb73f8 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -201,8 +201,8 @@ Feature: kogito-s2i-builder image JVM build tests
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
-    Then s2i build log should contain Expanding artifacts from incremental build...
-    And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
+    And s2i build log should contain Expanding artifacts from incremental build...
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And check that page is served
       | property             | value                                                                         |

From 7814f2b120e8d6618be7176b15c49ec730240f20 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 2 Aug 2023 16:15:49 +0200
Subject: [PATCH 624/709] KOGITO-9671 CI: Remove bot account usage (#1662)

* KOGITO-9671 CI: Remove bot account usage

* review comments
---
 .ci/jenkins/Jenkinsfile.deploy              | 29 +++++++++------------
 .ci/jenkins/Jenkinsfile.promote             | 15 ++++-------
 .ci/jenkins/Jenkinsfile.update-prod-version | 21 ++++++---------
 .ci/jenkins/dsl/jobs.groovy                 |  6 -----
 4 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index bc10afa0996..ccbccd336d6 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -26,7 +26,7 @@ pipeline {
     environment {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
-        BOT_BRANCH_HASH = "${util.generateHash(10)}"
+        PR_BRANCH_HASH = "${util.generateHash(10)}"
 
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
     }
@@ -67,8 +67,7 @@ pipeline {
             }
             steps {
                 script {
-                    githubscm.forkRepo(getBotAuthorCredsID())
-                    githubscm.createBranch(getBotBranch())
+                    githubscm.createBranch(getPRBranch())
                 }
             }
         }
@@ -191,15 +190,15 @@ pipeline {
                         }
                         prBody += '\nSee build url above for more information'
                     }
-                    String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
+                    String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getGitAuthorCredsID())
                     deployProperties["${getRepoName()}.pr.link"] = prLink
                 }
             }
             post {
                 always {
                     script {
-                        setDeployPropertyIfNeeded("${getRepoName()}.pr.source.uri", "https://github.com/${getBotAuthor()}/${getRepoName()}")
-                        setDeployPropertyIfNeeded("${getRepoName()}.pr.source.ref", getBotBranch())
+                        setDeployPropertyIfNeeded("${getRepoName()}.pr.source.uri", "https://github.com/${getGitAuthor()}/${getRepoName()}")
+                        setDeployPropertyIfNeeded("${getRepoName()}.pr.source.ref", getPRBranch())
                         setDeployPropertyIfNeeded("${getRepoName()}.pr.target.uri", "https://github.com/${getGitAuthor()}/${getRepoName()}")
                         setDeployPropertyIfNeeded("${getRepoName()}.pr.target.ref", getBuildBranch())
                     }
@@ -258,7 +257,7 @@ void checkoutRepo() {
 
 void commitAndPushChanges(String commitMsg) {
     githubscm.commitChanges(commitMsg)
-    githubscm.pushObject('origin', getBotBranch(), getBotAuthorCredsID())
+    githubscm.pushObject('origin', getPRBranch(), getGitAuthorCredsID())
     changesDone = true
 }
 
@@ -272,8 +271,8 @@ void createBuildAndTestStageClosure(String image) {
             List buildParams = []
             buildParams.add(string(name: 'DISPLAY_NAME', value: "${params.DISPLAY_NAME} - ${image}"))
             buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
-            buildParams.add(string(name: 'SOURCE_AUTHOR', value: isRelease() ? getBotAuthor() : getGitAuthor()))
-            buildParams.add(string(name: 'SOURCE_BRANCH', value: isRelease() ? getBotBranch() : getBuildBranch()))
+            buildParams.add(string(name: 'SOURCE_AUTHOR', value: isRelease() ? getGitAuthor() : getGitAuthor()))
+            buildParams.add(string(name: 'SOURCE_BRANCH', value: isRelease() ? getPRBranch() : getBuildBranch()))
 
             buildParams.add(string(name: 'MAVEN_ARTIFACTS_REPOSITORY', value: env.MAVEN_ARTIFACT_REPOSITORY ?: (isRelease() ? env.DEFAULT_STAGING_REPOSITORY : '')))
             buildParams.add(string(name: 'BUILD_KOGITO_APPS_URI', value: params.APPS_URI))
@@ -391,16 +390,12 @@ String getGitAuthor() {
     return "${GIT_AUTHOR}"
 }
 
-String getBotBranch() {
-    return "${getProjectVersion() ?: getBuildBranch()}-${env.BOT_BRANCH_HASH}"
+String getGitAuthorCredsID() {
+    retrun env.AUTHOR_CREDS_ID
 }
 
-String getBotAuthor() {
-    return env.GIT_AUTHOR_BOT
-}
-
-String getBotAuthorCredsID() {
-    return env.BOT_CREDENTIALS_ID
+String getPRBranch() {
+    return "${getProjectVersion() ?: getBuildBranch()}-${env.PR_BRANCH_HASH}"
 }
 
 String getProjectVersion() {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 933d438dc8c..ed8078c2311 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -28,7 +28,7 @@ pipeline {
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
 
-        BOT_BRANCH_HASH = "${util.generateHash(10)}"
+        PR_BRANCH_HASH = "${util.generateHash(10)}"
 
         GITHUB_REPO = "${REPO_NAME}" // for github-release cli
     }
@@ -113,10 +113,9 @@ pipeline {
                 script {
                     String prLink = ''
                     String nextVersion = getNextVersion()
-                    dir('bot') { // Use different folder from `Update PR with released Maven artifacts` to avoid conflicts
+                    dir('pr') { // Use different folder from `Update PR with released Maven artifacts` to avoid conflicts
                         // Prepare PR
                         checkoutRepo()
-                        githubscm.forkRepo(getBotAuthorCredsID())
                         githubscm.createBranch(getSnapshotBranch())
 
                         // Update version to next snapshot
@@ -129,8 +128,8 @@ pipeline {
                         def commitMsg = "[${getBuildBranch()}] Update snapshot version to ${nextVersion}"
                         def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}"
                         githubscm.commitChanges(commitMsg)
-                        githubscm.pushObject('origin', getSnapshotBranch(), getBotAuthorCredsID())
-                        prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getBotAuthorCredsID())
+                        githubscm.pushObject('origin', getSnapshotBranch(), getGitAuthorCredsID())
+                        prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getGitAuthorCredsID())
                     }
                     dir(getRepoName()) {
                         if (prLink) {
@@ -338,10 +337,6 @@ String getGitAuthorCredsID() {
     return env.AUTHOR_CREDS_ID
 }
 
-String getBotAuthorCredsID() {
-    return env.BOT_CREDENTIALS_ID
-}
-
 String getMavenArtifactRepository() {
     return env.MAVEN_ARTIFACT_REPOSITORY ?: ''
 }
@@ -356,7 +351,7 @@ String getKogitoArtifactsNextVersion() {
 }
 
 String getSnapshotBranch() {
-    return "${getNextVersion()}-${env.BOT_BRANCH_HASH}"
+    return "${getNextVersion()}-${env.PR_BRANCH_HASH}"
 }
 
 boolean isQuayRegistry(String registry) {
diff --git a/.ci/jenkins/Jenkinsfile.update-prod-version b/.ci/jenkins/Jenkinsfile.update-prod-version
index 8715898b37b..ddd12068d39 100644
--- a/.ci/jenkins/Jenkinsfile.update-prod-version
+++ b/.ci/jenkins/Jenkinsfile.update-prod-version
@@ -16,7 +16,7 @@ pipeline {
     environment {
         // Static env is defined into ./dsl/jobs.groovy file
 
-        BOT_BRANCH_HASH = "${util.generateHash(10)}"
+        PR_BRANCH_HASH = "${util.generateHash(10)}"
     }
 
     stages {
@@ -36,8 +36,7 @@ pipeline {
         stage('Prepare for PR') {
             steps {
                 script {
-                    githubscm.forkRepo(getBotAuthorCredsID())
-                    githubscm.createBranch(getBotBranch())
+                    githubscm.createBranch(getPRBranch())
                 }
             }
         }
@@ -60,8 +59,8 @@ pipeline {
                     } else {
                         error 'No update version can be done'
                     }
-                    githubscm.pushObject('origin', getBotBranch(), getBotAuthorCredsID())
-                    String prLink = githubscm.createPR(commitMsg, 'Please review and merge', getBuildBranch(), getBotAuthorCredsID())
+                    githubscm.pushObject('origin', getPRBranch(), getGitAuthorCredsID())
+                    String prLink = githubscm.createPR(commitMsg, 'Please review and merge', getBuildBranch(), getGitAuthorCredsID())
 
                     echo "Created PR ${prLink}"
                 }
@@ -87,16 +86,12 @@ String getGitAuthor() {
     return "${GIT_AUTHOR}"
 }
 
-String getBotBranch() {
-    return "${getProdProjectVersion() ?: getBuildBranch()}-${env.BOT_BRANCH_HASH}"
+String getGitAuthorCredsID() {
+    retrun env.AUTHOR_CREDS_ID
 }
 
-String getBotAuthor() {
-    return "${GIT_AUTHOR_BOT}"
-}
-
-String getBotAuthorCredsID() {
-    return "${BOT_CREDENTIALS_ID}"
+String getPRBranch() {
+    return "${getProdProjectVersion() ?: getBuildBranch()}-${env.PR_BRANCH_HASH}"
 }
 
 String getProdProjectVersion() {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 95a402903d5..590a0368d26 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -127,8 +127,6 @@ void setupDeployJob(JobType jobType, String envName = '') {
 
             AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
             GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
-            GIT_AUTHOR_BOT: "${GIT_BOT_AUTHOR_NAME}",
-            BOT_CREDENTIALS_ID: "${GIT_BOT_AUTHOR_CREDENTIALS_ID}",
 
             MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
             DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
@@ -243,8 +241,6 @@ void setupPromoteJob(JobType jobType) {
 
         AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
         GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
-        GIT_AUTHOR_BOT: "${GIT_BOT_AUTHOR_NAME}",
-        BOT_CREDENTIALS_ID: "${GIT_BOT_AUTHOR_CREDENTIALS_ID}",
 
         DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
         MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
@@ -299,8 +295,6 @@ void setupProdUpdateVersionJob() {
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
         AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
         GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
-        GIT_AUTHOR_BOT: "${GIT_BOT_AUTHOR_NAME}",
-        BOT_CREDENTIALS_ID: "${GIT_BOT_AUTHOR_CREDENTIALS_ID}",
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {

From 2775085d13d11e0feb13b9a9d8e8b1660adda6e6 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 3 Aug 2023 13:26:25 +0200
Subject: [PATCH 625/709] CI: Fix typo (#1663)

---
 .ci/jenkins/Jenkinsfile.deploy              | 2 +-
 .ci/jenkins/Jenkinsfile.update-prod-version | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index ccbccd336d6..214146399ac 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -391,7 +391,7 @@ String getGitAuthor() {
 }
 
 String getGitAuthorCredsID() {
-    retrun env.AUTHOR_CREDS_ID
+    return env.AUTHOR_CREDS_ID
 }
 
 String getPRBranch() {
diff --git a/.ci/jenkins/Jenkinsfile.update-prod-version b/.ci/jenkins/Jenkinsfile.update-prod-version
index ddd12068d39..3d4bb28a016 100644
--- a/.ci/jenkins/Jenkinsfile.update-prod-version
+++ b/.ci/jenkins/Jenkinsfile.update-prod-version
@@ -87,7 +87,7 @@ String getGitAuthor() {
 }
 
 String getGitAuthorCredsID() {
-    retrun env.AUTHOR_CREDS_ID
+    return env.AUTHOR_CREDS_ID
 }
 
 String getPRBranch() {

From 1e4b96c500013a0ca5c719fdfe970ee9b35eba88 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 4 Aug 2023 10:13:35 +0200
Subject: [PATCH 626/709] [main] Make shell tests more flexible (#1656)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [1.40.x-prod] Make shell tests more flexible (#1641)

* Make shell tests more flexible

* Setup prod test scripts

* setup community_image_id prod env test

* debug container build

* Update scripts/logic/test/shell_test.sh

Co-authored-by: Marián Macik <macik.marian@gmail.com>

---------

Co-authored-by: Marián Macik <macik.marian@gmail.com>

* Prod test script: Allow to use community images

* Remove `@sha256` from image name

* Update scripts/logic/test/env_test.sh

Co-authored-by: Marián Macik <mmacik@redhat.com>

---------

Co-authored-by: Tristan Radisson <tradisso@redhat.com>
Co-authored-by: Marián Macik <macik.marian@gmail.com>
Co-authored-by: Marián Macik <mmacik@redhat.com>
---
 Makefile                                      |  2 +-
 scripts/logic/test/behave_test.sh             | 10 +++++++
 scripts/logic/test/env_test.sh                | 16 +++++++++++
 scripts/logic/test/shell_test.sh              | 10 +++++++
 tests/shell/kogito-swf-builder/RunTests.java  | 27 ++++++++++++-------
 .../kogito-swf-builder/resources/Dockerfile   |  4 +--
 tests/shell/kogito-swf-devmode/RunTests.java  | 25 ++++++++++-------
 tests/shell/run.sh                            | 19 ++++++++-----
 8 files changed, 84 insertions(+), 29 deletions(-)
 create mode 100755 scripts/logic/test/behave_test.sh
 create mode 100755 scripts/logic/test/env_test.sh
 create mode 100755 scripts/logic/test/shell_test.sh

diff --git a/Makefile b/Makefile
index e5f3d8c2362..4e2b4657005 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ endif
 # if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} --descriptor ${image_name}-image.yaml test behave ${test_options}
-	tests/shell/run.sh ${image_name} ${SHORTENED_LATEST_VERSION}
+	tests/shell/run.sh ${image_name} "quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}"
 endif
 
 # Build all images
diff --git a/scripts/logic/test/behave_test.sh b/scripts/logic/test/behave_test.sh
new file mode 100755
index 00000000000..c5107759017
--- /dev/null
+++ b/scripts/logic/test/behave_test.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+source ${script_dir_path}/env_test.sh $@
+
+echo "---- Pulling image ${image_full_tag} ----"
+docker pull ${image_full_tag}
+
+echo "---- Run behave test for image ${image_id} ----"
+cekit --descriptor ${image_descriptor_filename} test --image ${image_full_tag} behave
diff --git a/scripts/logic/test/env_test.sh b/scripts/logic/test/env_test.sh
new file mode 100755
index 00000000000..14e8b904db8
--- /dev/null
+++ b/scripts/logic/test/env_test.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+export image_id=$1
+export image_full_tag=$2
+
+export image_full_name=${image_full_tag%%:*}
+export image_full_name=${image_full_name%%@sha256*} # Remove `@sha256` if needed
+export image_registry_name=${image_full_name%/*}
+export image_name=${image_full_name##*/}
+export image_registry=${image_registry_name%/*}
+export image_namespace=${image_registry_name##*/}
+
+export image_descriptor_filename=${image_id}-image.yaml
+
+export community_image_id=${image_id/logic-/kogito-}
+export community_image_id=${community_image_id/-rhel8/}
diff --git a/scripts/logic/test/shell_test.sh b/scripts/logic/test/shell_test.sh
new file mode 100755
index 00000000000..8a133425a12
--- /dev/null
+++ b/scripts/logic/test/shell_test.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+source ${script_dir_path}/env_test.sh $@
+
+echo "---- Pulling image ${image_full_tag} ----"
+docker pull ${image_full_tag}
+
+echo "---- Run jBang test for image ${image_id} ----"
+tests/shell/run.sh ${community_image_id} ${image_full_tag}
diff --git a/tests/shell/kogito-swf-builder/RunTests.java b/tests/shell/kogito-swf-builder/RunTests.java
index dc5085b909a..f2dee5a80b0 100644
--- a/tests/shell/kogito-swf-builder/RunTests.java
+++ b/tests/shell/kogito-swf-builder/RunTests.java
@@ -48,8 +48,8 @@ public class RunTests {
     @Container
     private GenericContainer builtImage = new GenericContainer(
             new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
-                    .withDockerfile(Paths.get("tests/shell/kogito-swf-builder/", "resources", "Dockerfile"))
-                    .withBuildArg("BUILDER_VERSION", System.getenv("IMAGE_VERSION")))
+                    .withDockerfile(Paths.get(getScriptDirPath(), "resources", "Dockerfile"))
+                    .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
             .withExposedPorts(8080)
             .waitingFor(Wait.forHttp("/jsongreet"))
             .withLogConsumer(logConsumer);
@@ -70,16 +70,23 @@ public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOExc
     }
 
     public static void main(String... args) throws Exception {
-        if (args == null || args.length != 1) {
-            System.err.println("Output directory is not specified. Usage:");
-            System.err.println(RunTests.class.getSimpleName() + ".java <reports output directory>");
-            System.exit(1);
-            throw new IllegalStateException("Unreachable code");
-        }
-        System.out.println("Got IMAGE_VERSION = " + System.getenv("IMAGE_VERSION"));
+        // Log docker build. Source: https://github.com/testcontainers/testcontainers-java/issues/3093
+        System.setProperty("org.slf4j.simpleLogger.log.com.github.dockerjava.api.command.BuildImageResultCallback", "debug");
         CommandLineOptions options = new CommandLineOptions();
         options.setSelectedClasses(Collections.singletonList(RunTests.class.getName()));
-        options.setReportsDir(Paths.get(args[0]));
+        options.setReportsDir(Paths.get(getOutputDir()));
         new ConsoleTestExecutor(options).execute(new PrintWriter(System.out));
     }
+
+    static String getTestImage() {
+        return System.getenv("TEST_IMAGE");
+    }
+
+    static String getOutputDir() {
+        return System.getenv("OUTPUT_DIR");
+    }
+
+    static String getScriptDirPath() {
+        return System.getenv("TESTS_SCRIPT_DIR_PATH");
+    }
 }
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/resources/Dockerfile b/tests/shell/kogito-swf-builder/resources/Dockerfile
index 5b38530f626..a8e4bdd1f0b 100644
--- a/tests/shell/kogito-swf-builder/resources/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/Dockerfile
@@ -1,6 +1,6 @@
-ARG BUILDER_VERSION="2.0"
+ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0"
 
-FROM quay.io/kiegroup/kogito-swf-builder:${BUILDER_VERSION} AS builder
+FROM ${BUILDER_IMAGE_TAG} AS builder
 
 # Kogito user
 USER 1001
diff --git a/tests/shell/kogito-swf-devmode/RunTests.java b/tests/shell/kogito-swf-devmode/RunTests.java
index eac8fba0564..c3cb89db399 100644
--- a/tests/shell/kogito-swf-devmode/RunTests.java
+++ b/tests/shell/kogito-swf-devmode/RunTests.java
@@ -47,8 +47,8 @@ public class RunTests {
     private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
 
     @Container
-    private GenericContainer devModeImage = new GenericContainer("quay.io/kiegroup/kogito-swf-devmode:" + System.getenv("IMAGE_VERSION"))
-            .withFileSystemBind("tests/shell/kogito-swf-devmode/resources", "/home/kogito/serverless-workflow-project/src/main/resources", BindMode.READ_ONLY)
+    private GenericContainer devModeImage = new GenericContainer(getTestImage())
+            .withFileSystemBind(getScriptDirPath() + "/resources", "/home/kogito/serverless-workflow-project/src/main/resources", BindMode.READ_ONLY)
             .withExposedPorts(8080)
             .waitingFor(Wait.forHttp("/jsongreet"))
             .withLogConsumer(logConsumer);
@@ -69,16 +69,21 @@ public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOExc
     }
 
     public static void main(String... args) throws Exception {
-        if (args == null || args.length != 1) {
-            System.err.println("Output directory is not specified. Usage:");
-            System.err.println(RunTests.class.getSimpleName() + ".java <reports output directory>");
-            System.exit(1);
-            throw new IllegalStateException("Unreachable code");
-        }
-        System.out.println("Got IMAGE_VERSION = " + System.getenv("IMAGE_VERSION"));
         CommandLineOptions options = new CommandLineOptions();
         options.setSelectedClasses(Collections.singletonList(RunTests.class.getName()));
-        options.setReportsDir(Paths.get(args[0]));
+        options.setReportsDir(Paths.get(getOutputDir()));
         new ConsoleTestExecutor(options).execute(new PrintWriter(System.out));
     }
+
+    static String getTestImage() {
+        return System.getenv("TEST_IMAGE");
+    }
+
+    static String getOutputDir() {
+        return System.getenv("OUTPUT_DIR");
+    }
+
+    static String getScriptDirPath() {
+        return System.getenv("TESTS_SCRIPT_DIR_PATH");
+    }
 }
\ No newline at end of file
diff --git a/tests/shell/run.sh b/tests/shell/run.sh
index b3d842e3fae..89054395851 100755
--- a/tests/shell/run.sh
+++ b/tests/shell/run.sh
@@ -4,22 +4,29 @@ set -e
 script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 image_name=$1
-image_version=$2
+image_tag=$2
 
 if [ -z "${image_name}" ]; then
-  echo "Please provide the image name"
+  echo "Please provide the image id to test"
   exit 1
 fi
 
-if [ -z "${image_version}" ]; then
-  echo "Please provide the X.Y version"
+if [ -z "${image_tag}" ]; then
+  echo "Please provide the container image full tag (ie 'registry/namespace/image:version')"
   exit 1
 fi
 
-export IMAGE_VERSION=${image_version}
+export TEST_IMAGE="${image_tag}"
+export OUTPUT_DIR="${script_dir_path}/../../target/shell/${image_name}"
+export TESTS_SCRIPT_DIR_PATH="${script_dir_path}/${image_name}"
+
+echo "image_name=${image_name}"
+echo "TEST_IMAGE=${TEST_IMAGE}"
+echo "OUTPUT_DIR=${OUTPUT_DIR}"
+echo "TESTS_SCRIPT_DIR_PATH=${TESTS_SCRIPT_DIR_PATH}"
 
 if [ -d  "${script_dir_path}/${image_name}" ]; then
-  curl -Ls https://sh.jbang.dev | bash -s - "${script_dir_path}/${image_name}/RunTests.java" "${script_dir_path}/../../target/shell/${image_name}"
+  curl -Ls https://sh.jbang.dev | bash -s - "${TESTS_SCRIPT_DIR_PATH}/RunTests.java"
 else
   echo "No shell test to run for image ${image_name}"
 fi
\ No newline at end of file

From 60aa3d4d9e01b7517b27502aea6dd0a4910579e5 Mon Sep 17 00:00:00 2001
From: Michael Anstis <manstis@users.noreply.github.com>
Date: Mon, 7 Aug 2023 17:19:09 +0100
Subject: [PATCH 627/709] KOGITO-9654: Include
 kogito-addons-quarkus-process-management in kogito-swf-devmode-image (#1655)

Co-authored-by: Michael Anstis <manstis@redhat.com>
---
 modules/kogito-swf/devmode/build-config/module.yaml | 2 +-
 scripts/logic/build-quarkus-app.sh                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index 5c72abf37ce..beead207983 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -9,4 +9,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
+    value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 534da4b8f6d..5bd62d6ccc5 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -21,7 +21,7 @@ quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch6
 # common extensions used by the kogito-swf-builder and kogito-swf-devmode
 quarkus_extensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
 # dev mode purpose extensions used only by the kogito-swf-devmode
-kogito_swf_devmode_extensions="kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
+kogito_swf_devmode_extensions="kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
 
 if [ -z ${quarkus_platform_version} ]; then
     echo "Please provide the quarkus version"

From d3dabae91c7d7bd2a212937452f907e3dc0c4dcd Mon Sep 17 00:00:00 2001
From: kie-ci3 <106377484+kie-ci3@users.noreply.github.com>
Date: Tue, 8 Aug 2023 09:18:04 +0200
Subject: [PATCH 628/709] [main] Bump Quarkus version to 2.16.9.Final (#1661)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 kogito-base-builder-image.yaml              | 2 +-
 kogito-runtime-jvm-image.yaml               | 2 +-
 kogito-runtime-native-image.yaml            | 2 +-
 kogito-s2i-builder-image.yaml               | 2 +-
 kogito-swf-builder-image.yaml               | 2 +-
 kogito-swf-devmode-image.yaml               | 2 +-
 modules/kogito-project-versions/module.yaml | 2 +-
 tests/features/kogito-swf-common.feature    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index 02182cd671c..5a079e734d3 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.8.Final"
+    value: "2.16.9.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
index 91252391b71..d988e99899e 100644
--- a/kogito-runtime-jvm-image.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.8.Final"
+    value: "2.16.9.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml
index c696d3c890b..312095b4a89 100644
--- a/kogito-runtime-native-image.yaml
+++ b/kogito-runtime-native-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.8.Final"
+    value: "2.16.9.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
index 70e0f0bc5b8..58dafa1e2a1 100644
--- a/kogito-s2i-builder-image.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.8.Final"
+    value: "2.16.9.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 4ef937ea4e2..88ffc076c0f 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -33,7 +33,7 @@
       - name: "io.openshift.s2i.destination"
         value: "/tmp"
       - name: "io.quarkus.platform.version"
-        value: "2.16.8.Final"
+        value: "2.16.9.Final"
       - name: "org.kie.kogito.version"
         value: "2.0.0-SNAPSHOT"
       - name: "maintainer"
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 03b1587d158..b47915f4e88 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -29,7 +29,7 @@
 
     labels:
       - name: "io.quarkus.platform.version"
-        value: "2.16.8.Final"
+        value: "2.16.9.Final"
       - name: "org.kie.kogito.version"
         value: "2.0.0-SNAPSHOT"
       - name: "maintainer"
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index 1a9820f0a96..ae35b39a2b6 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -8,5 +8,5 @@ envs:
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "2.16.8.Final"
+    value: "2.16.9.Final"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 049b4181c1a..8e12214d070 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -7,7 +7,7 @@ Feature: Serverless Workflow images common
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.8.Final/quarkus-bom-2.16.8.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.9.Final/quarkus-bom-2.16.9.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From 217642d1e8ec761b3784a515b569ec132aaa44f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Biarn=C3=A9s=20Kiefer?= <mbiarnes@redhat.com>
Date: Tue, 8 Aug 2023 15:14:36 +0200
Subject: [PATCH 629/709] KOGITO-5386: added a new parameter for unique branch
 name (#1666)

---
 .ci/jenkins/Jenkinsfile.deploy | 7 ++++---
 .ci/jenkins/dsl/jobs.groovy    | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 214146399ac..9f694a47125 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -26,8 +26,6 @@ pipeline {
     environment {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
-        PR_BRANCH_HASH = "${util.generateHash(10)}"
-
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
     }
 
@@ -67,6 +65,9 @@ pipeline {
             }
             steps {
                 script {
+                    if (githubscm.isBranchExist('origin',getPRBranch())) {
+                        githubscm.removeRemoteBranch('origin', getPRBranch())
+                    }
                     githubscm.createBranch(getPRBranch())
                 }
             }
@@ -395,7 +396,7 @@ String getGitAuthorCredsID() {
 }
 
 String getPRBranch() {
-    return "${getProjectVersion() ?: getBuildBranch()}-${env.PR_BRANCH_HASH}"
+    return params.KOGITO_PR_BRANCH
 }
 
 String getProjectVersion() {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 590a0368d26..c386752087c 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -171,6 +171,7 @@ void setupDeployJob(JobType jobType, String envName = '') {
                 stringParam('QUARKUS_PLATFORM_VERSION', '', 'Allow to override the Quarkus Platform version')
             }
 
+            stringParam('KOGITO_PR_BRANCH', '', 'PR branch name')
             booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
         }
     }

From 3fee623e1002c753919b22f6bba20b0f1118e3c2 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Wed, 9 Aug 2023 10:05:45 +0200
Subject: [PATCH 630/709] KOGITO-9676 CI: Promote call setup-branch job (#1665)

---
 .ci/jenkins/Jenkinsfile.promote | 93 ++++-----------------------------
 1 file changed, 11 insertions(+), 82 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index ed8078c2311..ded4957e702 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -29,8 +29,6 @@ pipeline {
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
 
         PR_BRANCH_HASH = "${util.generateHash(10)}"
-
-        GITHUB_REPO = "${REPO_NAME}" // for github-release cli
     }
 
     stages {
@@ -45,11 +43,8 @@ pipeline {
 
                     readDeployProperties()
 
-                    if (isRelease()) {
-                        // Verify version is set and if on right release branch
-                        assert getProjectVersion()
-                        assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())
-                    }
+                    assert getProjectVersion()
+                    assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())
 
                     // Login old registry
                     if (isOldImageInOpenshiftRegistry()) {
@@ -69,11 +64,11 @@ pipeline {
                         checkoutRepo()
                     }
 
-                    installGitHubReleaseCLI()
                     cloud.installSkopeo()
                 }
             }
         }
+
         stage('Promote images') {
             steps {
                 script {
@@ -83,10 +78,8 @@ pipeline {
                 }
             }
         }
+
         stage('Merge PR and tag') {
-            when {
-                expression { return isRelease() }
-            }
             steps {
                 script {
                     dir(getRepoName()) {
@@ -96,47 +89,19 @@ pipeline {
                             githubscm.mergePR(prLink, getGitAuthorCredsID())
                             githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
                         }
-
-                        if (getGitTag()) {
-                            createRelease()
-                        }
                     }
                 }
             }
         }
-        stage('Set next version')
-        {
-            when {
-                expression { return isRelease() }
-            }
+
+        stage('Create release') {
             steps {
                 script {
-                    String prLink = ''
-                    String nextVersion = getNextVersion()
-                    dir('pr') { // Use different folder from `Update PR with released Maven artifacts` to avoid conflicts
-                        // Prepare PR
-                        checkoutRepo()
-                        githubscm.createBranch(getSnapshotBranch())
-
-                        // Update version to next snapshot
-                        versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${nextVersion} --artifacts-version ${getKogitoArtifactsNextVersion()} --confirm"
-                        if (getBuildBranch() != 'main') {
-                            versionCmd += " --examples-ref ${getBuildBranch()}"
-                        }
-                        runPythonCommand(versionCmd)
-
-                        def commitMsg = "[${getBuildBranch()}] Update snapshot version to ${nextVersion}"
-                        def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}"
-                        githubscm.commitChanges(commitMsg)
-                        githubscm.pushObject('origin', getSnapshotBranch(), getGitAuthorCredsID())
-                        prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getGitAuthorCredsID())
-                    }
-                    dir(getRepoName()) {
-                        if (prLink) {
-                            githubscm.mergePR(prLink, getGitAuthorCredsID())
-                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
-                        }
+                    if (githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsID())) {
+                        githubscm.deleteReleaseAndTag(getGitTag(), getGitAuthorCredsID())
                     }
+                    githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTag(getGitTag()), getGitAuthorCredsID())
+                    githubscm.updateReleaseBody(getGitTag(), getGitAuthorCredsID())
                 }
             }
         }
@@ -169,10 +134,6 @@ String getNotificationSubject() {
     return "[${getBuildBranch()}] Kogito Images"
 }
 
-void installGitHubReleaseCLI() {
-    sh 'go install github.com/github-release/github-release@latest'
-}
-
 void checkoutRepo() {
     deleteDir()
     checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
@@ -217,14 +178,6 @@ void makeQuayNewImagesPublic() {
     }
 }
 
-void createRelease() {
-    if(githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsID())) {
-        githubscm.deleteReleaseAndTag(getGitTag(), getGitAuthorCredsID())
-    }
-    githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTag(getGitTag()), getGitAuthorCredsID())
-    githubscm.updateReleaseBody(getGitTag(), getGitAuthorCredsID())
-}
-
 String getOldImageFullTag(String imageName) {
     return "${getOldImageRegistry()}/${getOldImageNamespace()}/${getFinalImageName(imageName, getOldImageNameSuffix())}:${getOldImageTag()}"
 }
@@ -269,6 +222,7 @@ void loginContainerRegistry(String registry, String credsId) {
         sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${registry}"
     }
 }
+
 void readDeployProperties() {
     String deployUrl = params.DEPLOY_BUILD_URL
     if (deployUrl != '') {
@@ -300,10 +254,6 @@ String getParamOrDeployProperty(String paramKey, String deployPropertyKey) {
 // Utils
 ////////////////////////////////////////////////////////////////////////
 
-boolean isRelease() {
-    return env.RELEASE ? env.RELEASE.toBoolean() : false
-}
-
 String getRepoName() {
     return env.REPO_NAME
 }
@@ -325,10 +275,6 @@ String getBuildBranch() {
     return params.BUILD_BRANCH_NAME
 }
 
-String getPRSourceBranch() {
-    return getDeployProperty("${getRepoName()}.pr.source.ref")
-}
-
 String getGitAuthor() {
     return env.GIT_AUTHOR
 }
@@ -337,23 +283,6 @@ String getGitAuthorCredsID() {
     return env.AUTHOR_CREDS_ID
 }
 
-String getMavenArtifactRepository() {
-    return env.MAVEN_ARTIFACT_REPOSITORY ?: ''
-}
-
-String getNextVersion() {
-    return util.getNextVersion(getProjectVersion(), 'micro', 'snapshot')
-}
-
-// To be later changed by artifacts version parameter
-String getKogitoArtifactsNextVersion() {
-    return util.getNextVersion(getKogitoArtifactsVersion(), 'micro', 'SNAPSHOT')
-}
-
-String getSnapshotBranch() {
-    return "${getNextVersion()}-${env.PR_BRANCH_HASH}"
-}
-
 boolean isQuayRegistry(String registry) {
     return registry == 'quay.io'
 }

From bf82cd9570e68851fbbc25c4d76f877056e858b2 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Thu, 10 Aug 2023 13:46:15 +0200
Subject: [PATCH 631/709] KOGITO-9692 Fix release generation (#1670)

---
 .ci/jenkins/Jenkinsfile.promote | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index ded4957e702..20b2aa12111 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -100,7 +100,7 @@ pipeline {
                     if (githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsID())) {
                         githubscm.deleteReleaseAndTag(getGitTag(), getGitAuthorCredsID())
                     }
-                    githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTag(getGitTag()), getGitAuthorCredsID())
+                    githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTagFromVersion(getGitTag()), getGitAuthorCredsID())
                     githubscm.updateReleaseBody(getGitTag(), getGitAuthorCredsID())
                 }
             }

From 11e0d7c1379a03fce14bfd372cf8bc903f141b3d Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 14 Aug 2023 09:28:54 -0400
Subject: [PATCH 632/709] [main] Update version to 2.0.0-snapshot

---
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 23ed427e866..273723a0b75 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -113,7 +113,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 19ca31944a4..1b9afe7445e 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |                
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |                 
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index e2a610f16fc..27d679bfdff 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |        
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |   
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From b985ce2e3e6bd726fdcd0befaefa756cca5c71bb Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 21 Aug 2023 13:42:42 +0200
Subject: [PATCH 633/709] KOGITO-9725 DSL cleanup: Remove 'kogito-bdd' check
 (#1672)

Never used/maintained
---
 .ci/jenkins/dsl/jobs.groovy            | 49 ++++++++------------------
 .github/workflows/jenkins-tests-PR.yml |  2 +-
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index c386752087c..cb073f2acb0 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -18,7 +18,6 @@ jenkins_path = '.ci/jenkins'
 
 // PR checks
 setupPrJob()
-setupDeployJob(JobType.PULL_REQUEST, 'kogito-bdd')
 
 // Init branch
 createSetupBranchJob()
@@ -45,7 +44,7 @@ setupQuarkusUpdateJob()
 /////////////////////////////////////////////////////////////////
 
 void setupPrJob(boolean isProdCI = false) {
-    setupBuildImageJob(JobType.PULL_REQUEST, '', isProdCI)
+    setupBuildImageJob(JobType.PULL_REQUEST, isProdCI)
 
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.PULL_REQUEST, "${jenkins_path}/Jenkinsfile", "Kogito Images${isProdCI ? ' Prod' : ''} PR check")
     JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
@@ -99,41 +98,27 @@ void createSetupBranchJob() {
     }
 }
 
-void setupDeployJob(JobType jobType, String envName = '') {
-    setupBuildImageJob(jobType, envName)
+void setupDeployJob(JobType jobType) {
+    setupBuildImageJob(jobType)
 
-    def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-images-deploy', jobType, envName, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
+    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-deploy', jobType, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
     JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
-    if (jobType == JobType.PULL_REQUEST) {
-        jobParams.git.branch = '${BUILD_BRANCH_NAME}'
-        jobParams.git.author = '${GIT_AUTHOR}'
-        jobParams.git.project_url = Utils.createProjectUrl("${GIT_AUTHOR_NAME}", jobParams.git.repository)
-    }
     jobParams.env.putAll([
-        REPO_NAME: 'kogito-images',
         PROPERTIES_FILE_NAME: 'deployment.properties',
 
         MAX_REGISTRY_RETRIES: 3,
 
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+
+        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+
+        MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+        DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
+
+        QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
     ])
-    if (jobType == JobType.PULL_REQUEST) {
-        jobParams.env.putAll([
-            MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_PR_CHECKS_REPOSITORY_URL}",
-        ])
-    } else {
-        jobParams.env.putAll([
-            GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
-
-            AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-            GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
-
-            MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
-            DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
-
-            QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
-        ])
-    }
     if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
         jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
     }
@@ -142,10 +127,6 @@ void setupDeployJob(JobType jobType, String envName = '') {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
 
             stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
-            if (jobType == JobType.PULL_REQUEST) {
-                // author can be changed as param only for PR behavior, due to source branch/target, else it is considered as an env
-                stringParam('GIT_AUTHOR', "${GIT_AUTHOR_NAME}", 'Set the Git author to checkout')
-            }
 
             stringParam('APPS_URI', '', 'Git uri to the kogito-apps repository to use for tests.')
             stringParam('APPS_REF', '', 'Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
@@ -177,8 +158,8 @@ void setupDeployJob(JobType jobType, String envName = '') {
     }
 }
 
-void setupBuildImageJob(JobType jobType, String envName = '', boolean prodCI = false) {
-    def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this, 'kogito-images.build-image', jobType, envName, "${jenkins_path}/Jenkinsfile.build-image", 'Kogito Images Build single image')
+void setupBuildImageJob(JobType jobType, boolean prodCI = false) {
+    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.build-image', jobType, "${jenkins_path}/Jenkinsfile.build-image", 'Kogito Images Build single image')
     // Use jenkinsfile from the build branch
     jobParams.git.author = '${SOURCE_AUTHOR}'
     jobParams.git.branch = '${SOURCE_BRANCH}'
diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index 535c1aac462..bf3815cbc36 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -18,5 +18,5 @@ jobs:
       uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main
       with:
         main-config-file-repo: kiegroup/kogito-pipelines
-        main-config-file-path: dsl/config/main.yaml
+        main-config-file-path: .ci/jenkins/config/main.yaml
         branch-config-file-repo: kiegroup/kogito-pipelines

From 3f454b7b5f040b3e14aa4b65c8af06e3ee81cb27 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 15:11:31 +0200
Subject: [PATCH 634/709] Fix promote pipeline (#1674) (#1675)

Co-authored-by: Tristan Radisson <tradisso@redhat.com>
---
 .ci/jenkins/Jenkinsfile.promote | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 20b2aa12111..5604453da21 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -97,11 +97,13 @@ pipeline {
         stage('Create release') {
             steps {
                 script {
-                    if (githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsID())) {
-                        githubscm.deleteReleaseAndTag(getGitTag(), getGitAuthorCredsID())
+                    dir(getRepoName()) {
+                        if (githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsID())) {
+                            githubscm.deleteReleaseAndTag(getGitTag(), getGitAuthorCredsID())
+                        }
+                        githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTagFromVersion(getGitTag()), getGitAuthorCredsID())
+                        githubscm.updateReleaseBody(getGitTag(), getGitAuthorCredsID())
                     }
-                    githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTagFromVersion(getGitTag()), getGitAuthorCredsID())
-                    githubscm.updateReleaseBody(getGitTag(), getGitAuthorCredsID())
                 }
             }
         }

From 9c76571af6731ed80b93b0d6d0e7069e111dff34 Mon Sep 17 00:00:00 2001
From: kie-ci3 <106377484+kie-ci3@users.noreply.github.com>
Date: Tue, 29 Aug 2023 11:00:27 +0200
Subject: [PATCH 635/709] [main] Bump Quarkus version to 2.16.10.Final (#1679)

Co-authored-by: Jenkins CI <noreply@redhat.com>
---
 kogito-base-builder-image.yaml              | 2 +-
 kogito-runtime-jvm-image.yaml               | 2 +-
 kogito-runtime-native-image.yaml            | 2 +-
 kogito-s2i-builder-image.yaml               | 2 +-
 kogito-swf-builder-image.yaml               | 2 +-
 kogito-swf-devmode-image.yaml               | 2 +-
 modules/kogito-project-versions/module.yaml | 2 +-
 tests/features/kogito-swf-common.feature    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index 5a079e734d3..a477a712561 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.9.Final"
+    value: "2.16.10.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
index d988e99899e..245c42dbb83 100644
--- a/kogito-runtime-jvm-image.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.9.Final"
+    value: "2.16.10.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml
index 312095b4a89..56412886d6f 100644
--- a/kogito-runtime-native-image.yaml
+++ b/kogito-runtime-native-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.9.Final"
+    value: "2.16.10.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
index 58dafa1e2a1..a947f4f713c 100644
--- a/kogito-s2i-builder-image.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -13,7 +13,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.9.Final"
+    value: "2.16.10.Final"
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 88ffc076c0f..ee6b1d68b9b 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -33,7 +33,7 @@
       - name: "io.openshift.s2i.destination"
         value: "/tmp"
       - name: "io.quarkus.platform.version"
-        value: "2.16.9.Final"
+        value: "2.16.10.Final"
       - name: "org.kie.kogito.version"
         value: "2.0.0-SNAPSHOT"
       - name: "maintainer"
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index b47915f4e88..7c647a7153a 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -29,7 +29,7 @@
 
     labels:
       - name: "io.quarkus.platform.version"
-        value: "2.16.9.Final"
+        value: "2.16.10.Final"
       - name: "org.kie.kogito.version"
         value: "2.0.0-SNAPSHOT"
       - name: "maintainer"
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index ae35b39a2b6..6face3dd54d 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -8,5 +8,5 @@ envs:
     value: "2.0.0-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "2.16.9.Final"
+    value: "2.16.10.Final"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 8e12214d070..02e7c00be79 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -7,7 +7,7 @@ Feature: Serverless Workflow images common
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.9.Final/quarkus-bom-2.16.9.Final.pom should exist
+      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.10.Final/quarkus-bom-2.16.10.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From bb14cd20ac3dedb69fcde3e556c0e8d296794e63 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 30 Aug 2023 10:54:14 -0300
Subject: [PATCH 636/709] [KOGITO-9749] - Add Events Process, Process
 Management, and Sources addon to builder image (#1678)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 modules/kogito-swf/builder/build-config/module.yaml | 2 +-
 scripts/logic/build-quarkus-app.sh                  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index cd08da1afbe..ffa8807610a 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -9,4 +9,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
+    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}
\ No newline at end of file
diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 5bd62d6ccc5..6a2458203f0 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -22,6 +22,8 @@ quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch6
 quarkus_extensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
 # dev mode purpose extensions used only by the kogito-swf-devmode
 kogito_swf_devmode_extensions="kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
+# builder/prod extensitons used only by the kogito-swf-builder
+kogito_swf_builder_extensions="org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}"
 
 if [ -z ${quarkus_platform_version} ]; then
     echo "Please provide the quarkus version"
@@ -30,7 +32,7 @@ fi
 
 case ${image_name} in
     "kogito-swf-builder")
-        quarkus_extensions="${quarkus_extensions},${quarkus_extensions_arch_specific}"
+        quarkus_extensions="${quarkus_extensions},${kogito_swf_builder_extensions},${quarkus_extensions_arch_specific}"
         ;;
     "kogito-swf-devmode")
         quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions},${quarkus_extensions_arch_specific}"

From ba0879e3c42c0ac1eca3360b2be540b6fadaf6c2 Mon Sep 17 00:00:00 2001
From: Filippe Spolti <fspolti@redhat.com>
Date: Thu, 31 Aug 2023 10:54:18 -0300
Subject: [PATCH 637/709] [SRVLOGIC-158] - Dynamic resources script is reading
 wrong container sys files on cgroupsv2 (#1676)

Signed-off-by: Spolti <fspolti@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
---
 .../added/container-limits                    | 83 ++++++++++++++-----
 .../features/common-dynamic-resources.feature |  8 +-
 tests/test-apps/clone-repo.sh                 |  1 +
 3 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/modules/kogito-dynamic-resources/added/container-limits b/modules/kogito-dynamic-resources/added/container-limits
index 3445c49bd7c..a6c359c70de 100644
--- a/modules/kogito-dynamic-resources/added/container-limits
+++ b/modules/kogito-dynamic-resources/added/container-limits
@@ -1,6 +1,5 @@
 #!/bin/sh
-
-# Detected container limits
+# Detects container limits
 # If found these are exposed as the following environment variables:
 #
 # - CONTAINER_MAX_MEMORY
@@ -12,6 +11,16 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
 fi
 
+# query the resources based on cgroups version
+# cgroups v1 points to tmpfs
+# cgroups v2 points to cgroup2fs
+CGROUPS_VERSION="v1"
+tmp_fs=$(stat -fc %T /sys/fs/cgroup)
+if [ "${tmp_fs}" = "cgroup2fs" ]; then
+    CGROUPS_VERSION="v2"
+fi
+
+
 ceiling() {
     awk -vnumber="$1" -vdiv="$2" '
         function ceiling(x){
@@ -23,21 +32,41 @@ ceiling() {
     '
 }
 
-# Based on the cgroup limits, figure out the max number of core we should utilize
+# Based on the cgroups limits, figure out the max number of core we should use
 core_limit() {
-    local cpu_period_file="/sys/fs/cgroup/cpu/cpu.cfs_period_us"
-    local cpu_quota_file="/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
-    if [ -r "${cpu_period_file}" ]; then
-        local cpu_period="$(cat ${cpu_period_file})"
-
-        if [ -r "${cpu_quota_file}" ]; then
-            local cpu_quota="$(cat ${cpu_quota_file})"
-            # cfs_quota_us == -1 --> no restrictions
-            if [ "x$cpu_quota" != "x-1" ]; then
-                ceiling "$cpu_quota" "$cpu_period"
+    if [ "${CGROUPS_VERSION}" = "v1" ]; then
+        local cpu_period_file="/sys/fs/cgroup/cpu/cpu.cfs_period_us"
+        local cpu_quota_file="/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
+        if [ -r "${cpu_period_file}" ]; then
+            local cpu_period="$(cat ${cpu_period_file})"
+            if [ -r "${cpu_quota_file}" ]; then
+                local cpu_quota="$(cat ${cpu_quota_file})"
+                # cfs_quota_us == -1 --> no restrictions
+                if [ "x$cpu_quota" != "x-1" ]; then
+                    ceiling "$cpu_quota" "$cpu_period"
+                fi
+            fi
+        fi
+    else
+        # v2
+        # on cgroupsv2 the period and quota a queried from the same file
+        local cpu_max_file="/sys/fs/cgroup/cpu.max"
+        # when both are set we will have the following output:
+        # $MAX $PERIOD
+        # where the first number is the quota/max and the second is the period
+        # if the quota/max is not set then we will have only the period set:
+        # max 100000
+        if [ -r "${cpu_max_file}" ]; then
+            local cpu_max="$(cat ${cpu_max_file})"
+            if [ "x$cpu_max" != "x" ]; then
+                local cpu_quota="$(echo $cpu_max | awk '{print $1}')"
+                local cpu_period="$(echo $cpu_max | awk '{print $2}')"
+                if [ "$cpu_quota" != "max" ] && [ "x$cpu_period" != "x" ]; then
+                    ceiling "$cpu_quota" "$cpu_period"
+                fi
             fi
         fi
-  fi
+    fi
 }
 
 max_unbounded() {
@@ -45,13 +74,27 @@ max_unbounded() {
 }
 
 container_memory() {
-    # High number which is the max limit unit which memory is supposed to be unbounded.
-    local mem_file="/sys/fs/cgroup/memory/memory.limit_in_bytes"
     local max_mem_unbounded="$(max_unbounded)"
-    if [ -r "${mem_file}" ]; then
-        local max_mem="$(cat ${mem_file})"
-        if [ ${max_mem} -lt ${max_mem_unbounded} ]; then
-            echo "${max_mem}"
+    # High number which is the max limit unit which memory is supposed to be unbounded.
+    if [ "${CGROUPS_VERSION}" = "v1" ]; then
+        local mem_file="/sys/fs/cgroup/memory/memory.limit_in_bytes"
+        if [ -r "${mem_file}" ]; then
+            local max_mem="$(cat ${mem_file})"
+            if [ ${max_mem} -lt ${max_mem_unbounded} ]; then
+                echo "${max_mem}"
+            fi
+        fi
+    else
+        # v2
+        local mem_file="/sys/fs/cgroup/memory.max"
+        if [ -r "${mem_file}" ]; then
+            local max_mem="$(cat ${mem_file})"
+            # if not set, it will contain only the string "max"
+            if [ "$max_mem" != "max" ]; then
+                if [ ${max_mem} -lt ${max_mem_unbounded} ]; then
+                    echo "${max_mem}"
+                fi
+            fi
         fi
     fi
 }
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index 4ad6f9f88e1..92cb56dd5cc 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -47,10 +47,10 @@ Feature: Common tests for Kogito images
 
   Scenario: Verify if Java Remote Debug is correctly configured
     When container is started with env
-      | variable       | value |
-      | SCRIPT_DEBUG   | true  |
-      | JAVA_DEBUG     | true  |
-      |JAVA_DEBUG_PORT | 9222  |
+      | variable        | value |
+      | SCRIPT_DEBUG    | true  |
+      | JAVA_DEBUG      | true  |
+      | JAVA_DEBUG_PORT | 9222  |
     Then container log should match regex -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9222
 
   Scenario: Verify if the DEFAULT MEM RATIO properties are overridden with different values from user provided Xmx and Xms
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index f8e27c446ca..f39a94bf03e 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -69,5 +69,6 @@ cp ${base_dir}/application.properties /tmp/kogito-examples/kogito-quarkus-exampl
 
 set +x
 
+git config commit.gpgsign false
 git add --all  :/
 git commit -am "test"
\ No newline at end of file

From 7efbbd626766a7fc154c50f92116998592dc0358 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Fri, 1 Sep 2023 09:29:14 +0200
Subject: [PATCH 638/709] fix typo in kogito version variable name in
 build-quarkus-app.sh (#1684)

---
 scripts/logic/build-quarkus-app.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 6a2458203f0..095a3ee282a 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -23,7 +23,7 @@ quarkus_extensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito
 # dev mode purpose extensions used only by the kogito-swf-devmode
 kogito_swf_devmode_extensions="kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
 # builder/prod extensitons used only by the kogito-swf-builder
-kogito_swf_builder_extensions="org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}"
+kogito_swf_builder_extensions="org.kie.kogito:kogito-addons-quarkus-events-process:${kogito_version},org.kie.kogito:kogito-addons-quarkus-process-management:${kogito_version},org.kie.kogito:kogito-addons-quarkus-source-files:${kogito_version}"
 
 if [ -z ${quarkus_platform_version} ]; then
     echo "Please provide the quarkus version"

From fca8839460b99851565b0b65cb3da07f43e543fd Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Fri, 1 Sep 2023 14:57:38 +0200
Subject: [PATCH 639/709] remove maven clean parameter when building the
 serverless-workflow-project sample project (#1685)

---
 scripts/logic/build-quarkus-app.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 095a3ee282a..48f38173324 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -103,7 +103,7 @@ mvn ${MAVEN_OPTIONS} \
     -DskipTests \
     -Dmaven.repo.local=${mvn_local_repo} \
     -Dquarkus.container-image.build=false \
-    clean install
+    install
 
 cd ${build_target_dir}
 

From 1068c324c6c75994925b99f38628b34d419301c0 Mon Sep 17 00:00:00 2001
From: Jenkins CI <noreply@redhat.com>
Date: Mon, 4 Sep 2023 10:56:12 -0400
Subject: [PATCH 640/709] [main] Update version to 2.0.0-snapshot

---
 modules/kogito-swf/builder/build-config/module.yaml | 2 +-
 tests/features/kogito-s2i-builder-native.feature    | 2 +-
 tests/features/kogito-s2i-builder.feature           | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature     | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index ffa8807610a..1052c0375cb 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -9,4 +9,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}
\ No newline at end of file
+    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 273723a0b75..62a3a19f39c 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -113,7 +113,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 1b9afe7445e..5238f47f98b 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |                 
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |                  
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 27d679bfdff..01c5ef313fc 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |         
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |    
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From ee5de39c3d2db50f088ee8f6cf97d333357394ef Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tradisso@redhat.com>
Date: Mon, 11 Sep 2023 16:51:37 +0200
Subject: [PATCH 641/709] Tests: Fix discovery test (#1695)

---
 tests/features/kogito-swf-devmode.feature | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index d7dabbb52b9..754ee5aaa5c 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -131,9 +131,9 @@ Feature: Serverless Workflow devmode images
 
   Scenario: Verify if container starts in devmode with service discovery property
     When container is started with env
-      | variable          | value                                                                              |
-      | SCRIPT_DEBUG      | true                                                                               |
-      | MAVEN_ARGS_APPEND | -Dkogito.dataindex.ws.url=knative:services.v1.serving.knative.dev/namespace1/test2 |
+      | variable          | value                                                                                 |
+      | SCRIPT_DEBUG      | true                                                                                  |
+      | MAVEN_ARGS_APPEND | -Dkogito.dataindex.ws.url=${knative:services.v1.serving.knative.dev/namespace1/test2} |
     Then check that page is served
       | property             | value             |
       | port                 | 8080              |
@@ -145,4 +145,4 @@ Feature: Serverless Workflow devmode images
     
   Scenario: Verify if container have the KOGITO_CODEGEN_PROCESS_FAILONERROR env set to false
     When container is started with command bash
-    Then run sh -c 'echo $KOGITO_CODEGEN_PROCESS_FAILONERROR' in container and immediately check its output for false
\ No newline at end of file
+    Then run sh -c 'echo $KOGITO_CODEGEN_PROCESS_FAILONERROR' in container and immediately check its output for false

From d0a297186332bf9033469f275fa899fc4b037ca3 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Wed, 13 Sep 2023 08:53:36 +0200
Subject: [PATCH 642/709] [KOGITO-9791] build-quarkus-app.sh: properly define
 versions of org.apache.maven.plugins to avoid downloading old artifacts
 (#1686)

* [KOGITO-9791] build-quarkus-app.sh: properly define versions of org.apache.maven.plugins to avoid downloading old artifacts

* fix sed command for OSX
---
 scripts/logic/build-quarkus-app.sh | 65 +++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 48f38173324..83b39479af3 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -16,6 +16,12 @@ quarkus_platform_groupid="${2}"
 quarkus_platform_version="${3}"
 kogito_version="${KOGITO_VERSION:-${4}}"
 
+# GAV of maven plugins to be injected in the plugin management section
+maven_plugins_gav=("org.apache.maven.plugins:maven-resources-plugin:3.3.1" "org.apache.maven.plugins:maven-install-plugin:3.1.1" "org.apache.maven.plugins:maven-jar-plugin:3.3.0" "org.apache.maven.plugins:maven-clean-plugin:3.3.1")
+
+# Properties to be replaced in the pom by the new versions
+properties_with_versions=("compiler-plugin.version:3.11.0" "surefire-plugin.version:3.1.2")
+
 # arch specific dependencies
 quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch64:1.8.0"
 # common extensions used by the kogito-swf-builder and kogito-swf-devmode
@@ -95,6 +101,63 @@ if [ ! -z ${kogito_version} ]; then
         }" serverless-workflow-project/pom.xml
 fi
 
+
+# Inject empty plugin management section if not present in the pom.xml
+if ! grep -q "<pluginManagement>" "serverless-workflow-project/pom.xml"; then
+    echo "Injecting empty plugin Management section as it does not exist in pom"
+    pattern_1="[ ]*<build>"
+    complete_pattern="$pattern_1"
+
+    replace_1="  <\build>\n"
+    replace_2="    <pluginManagement>\n"
+    replace_3="      <plugins>\n"
+    replace_4="      <\/plugins>\n"
+    replace_5="    <\/pluginManagement>"
+    complete_replace="$replace_1$replace_2$replace_3$replace_4$replace_5"
+
+    sed -i.bak -e "/$pattern_1/{
+        N;N;N
+        s/$complete_pattern/$complete_replace/
+        }" serverless-workflow-project/pom.xml
+fi
+
+# Inject maven plugins into plugin management section
+for gav in ${maven_plugins_gav[@]}; do
+    group_id=$(echo $gav | cut -f1 -d:)
+    artifact_id=$(echo $gav | cut -f2 -d:)
+    version=$(echo $gav | cut -f3 -d:)
+
+    echo "Injecting ${gav} in plugin management section"
+    pattern_1="[ ]*<pluginManagement>"
+    pattern_2="[ ]*<plugins>"
+    complete_pattern="$pattern_1\n$pattern_2"
+
+    replace_1="    <pluginManagement>\n"
+    replace_2="      <plugins>\n"
+    replace_3="        <plugin>\n"
+    replace_4="          <groupId>${group_id}<\/groupId>\n"
+    replace_5="          <artifactId>${artifact_id}<\/artifactId>\n"
+    replace_6="          <version>${version}<\/version>\n"
+    replace_7="        <\/plugin>"
+    complete_replace="$replace_1$replace_2$replace_3$replace_4$replace_5$replace_6$replace_7"
+
+    sed -i.bak -e "/$pattern_1/{
+        N;N;N
+        s/$complete_pattern/$complete_replace/
+        }" serverless-workflow-project/pom.xml
+done
+
+# Replace properties values by new values
+for property_with_version in ${properties_with_versions[@]}; do
+    property=$(echo $property_with_version | cut -f1 -d:)
+    new_version=$(echo $property_with_version | cut -f2 -d:)
+
+    echo "Replacing property ${property} with value ${new_version}"
+    complete_pattern="[ ]*<${property}>.*<\/${property}>"
+    complete_replace="    <${property}>${new_version}<\/${property}>"
+    sed -i.bak "s/$complete_pattern/$complete_replace/g" serverless-workflow-project/pom.xml
+done
+
 echo "Build quarkus app"
 cd "serverless-workflow-project"
 # Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
@@ -103,7 +166,7 @@ mvn ${MAVEN_OPTIONS} \
     -DskipTests \
     -Dmaven.repo.local=${mvn_local_repo} \
     -Dquarkus.container-image.build=false \
-    install
+    clean install
 
 cd ${build_target_dir}
 

From 9ad98ac7ca0f6bebb5b573b5497fffb316f0ae27 Mon Sep 17 00:00:00 2001
From: Jan Stastny <ststnjn@gmail.com>
Date: Tue, 19 Sep 2023 20:22:36 +0200
Subject: [PATCH 643/709] kie-issues#574 Initial ASF Jenkins CI Setup (#1703)

Prepare for Apache migration

Fix Cloud credentials reference

Remove prod jobs

Remove PR job

update pipelines (#1697)

PR multibranchPipelineJob (#1700)



Update `kiegroup` repository references to `apache` (#1698)

Co-authored-by: radtriste <tradisso@redhat.com>
Co-authored-by: jstastny-cz <jan.stastny@ibm.com>
---
 .ci/jenkins/Jenkinsfile                     |  22 +----
 .ci/jenkins/Jenkinsfile.build-image         |  22 +----
 .ci/jenkins/Jenkinsfile.deploy              |  13 +--
 .ci/jenkins/Jenkinsfile.promote             |  17 ++--
 .ci/jenkins/Jenkinsfile.setup-branch        |  21 +---
 .ci/jenkins/Jenkinsfile.update-prod-version | 103 --------------------
 .ci/jenkins/dsl/jobs.groovy                 |  71 ++++----------
 .ci/jenkins/dsl/test.sh                     |   2 +-
 .github/workflows/jenkins-tests-PR.yml      |   4 +-
 9 files changed, 49 insertions(+), 226 deletions(-)
 delete mode 100644 .ci/jenkins/Jenkinsfile.update-prod-version

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 9111c2a7482..693fa00c26e 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -2,11 +2,7 @@
 
 pipeline {
     agent {
-        label 'rhel8 && !built-in'
-    }
-    tools {
-        maven env.BUILD_MAVEN_TOOL
-        jdk env.BUILD_JDK_TOOL
+        label 'ubuntu'
     }
     options {
         timeout(time: 120, unit: 'MINUTES')
@@ -19,7 +15,7 @@ pipeline {
 
                     sh 'printenv'
                     
-                    githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'kiegroup', getChangeTarget(), true)
+                    githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true)
                 }
             }
         }
@@ -56,7 +52,7 @@ pipeline {
         }
         unsuccessful {
             script {
-                pullrequest.postComment(util.getMarkdownTestSummary(isProdCI() ? 'Prod' : 'PR', '', "${BUILD_URL}", 'GITHUB'))
+                pullrequest.postComment(util.getMarkdownTestSummary('PR', "${BUILD_URL}", 'GITHUB'))
             }
         }
     }
@@ -77,7 +73,7 @@ Closure createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
             buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
             
-            githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'kiegroup', getGitAuthorCredentialsId())
+            githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getGitAuthorCredentialsId())
             githubscm.updateGithubCommitStatus(image, 'PENDING', 'Queued', getRepoName())
             
             // Keep executing so we can cancel all if needed
@@ -97,15 +93,7 @@ String[] getImages() {
     if (env.IMAGES_LIST) {
         return env.IMAGES_LIST.split(',')
     }
-    String listCmd = 'make list'
-    if (isProdCI()) {
-        listCmd += ' arg=--prod'
-    }
-    return util.runWithPythonVirtualEnv("${listCmd} | tr '\\n' ','", 'cekit', true).trim().split(',')
-}
-
-boolean isProdCI() {
-    return env.PROD_CI ? env.PROD_CI.toBoolean() : false
+    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
 }
 
 String getChangeAuthor() {
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 2d5d323fc2c..f13a6404395 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -4,18 +4,15 @@ QUAY_REGISTRY = 'quay.io'
 
 pipeline {
     agent {
-        label 'kie-rhel8 && docker && !built-in'
-    }
-    tools {
-        maven env.BUILD_MAVEN_TOOL
-        jdk env.BUILD_JDK_TOOL
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
     options {
         timeout(time: 120, unit: 'MINUTES')
     }
     environment {
-        CI = true
-
         // Linked to node label
         // Use docker due to multiplatform build
         CONTAINER_ENGINE = 'docker'
@@ -49,11 +46,6 @@ pipeline {
                     }
                     updateGithubCommitStatus('PENDING', 'Started')
 
-                    if (isProdCI()) {
-                        // Prod fix to be able to build the image as a community one
-                        sh "echo '' > content_sets.yaml"
-                    }
-
                     // Login to final registry if deploy is needed
                     if (shouldDeployImage()) {
                         if (isDeployImageInOpenshiftRegistry()) {
@@ -253,7 +245,7 @@ String getBuiltImageTag(String imageTag = '') {
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
+    return sh(returnStdout: stdout, script: cmd)
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -364,10 +356,6 @@ String getMavenArtifactRepository() {
     return params.MAVEN_ARTIFACTS_REPOSITORY
 }
 
-boolean isProdCI() {
-    return env.PROD_CI ? Boolean.parseBoolean(env.PROD_CI) : false
-}
-
 String getQuarkusPlatformURL() {
     return params.QUARKUS_PLATFORM_URL
 }
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 9f694a47125..83697af7aa4 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -10,13 +10,10 @@ TEST_FAILED_IMAGES = []
 
 pipeline {
     agent {
-        label 'rhel8 && !built-in'
-    }
-
-    // Needed for local build
-    tools {
-        maven env.BUILD_MAVEN_TOOL
-        jdk env.BUILD_JDK_TOOL
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
 
     options {
@@ -421,7 +418,7 @@ String[] getImages() {
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
+    return sh(returnStdout: stdout, script: cmd)
 }
 
 String getQuarkusPlatformVersion() {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 5604453da21..9bf8b4994d5 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -5,24 +5,21 @@ deployProperties = [:]
 
 pipeline {
     agent {
-        label 'rhel8 && podman && !built-in'
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
 
     options {
         timeout(time: 120, unit: 'MINUTES')
     }
-    // parameters {
-    // For parameters, check into ./dsl/jobs.groovy file
-    // }
 
     environment {
-        // Static env is defined into ./dsl/jobs.groovy file
-
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
-        // Linked to node label
-        CONTAINER_ENGINE = 'podman'
-        CONTAINER_ENGINE_TLS_OPTIONS = '--tls-verify=false'
+        CONTAINER_ENGINE = 'docker'
+        CONTAINER_ENGINE_TLS_OPTIONS = ''
 
         OPENSHIFT_API = credentials('OPENSHIFT_API')
         OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
@@ -359,5 +356,5 @@ String[] getImages() {
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
+    return sh(returnStdout: stdout, script: cmd)
 }
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 9e0e4459c38..182689cb056 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -3,29 +3,18 @@ import org.jenkinsci.plugins.workflow.libs.Library
 
 pipeline {
     agent {
-        label 'rhel8 && podman && !built-in'
-    }
-
-    // Needed for local build
-    tools {
-        maven env.BUILD_MAVEN_TOOL
-        jdk env.BUILD_JDK_TOOL
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
     }
 
     options {
         timeout(time: 120, unit: 'MINUTES')
     }
 
-    // parameters {
-    // For parameters, check into ./dsl/jobs.groovy file
-    // }
-
     environment {
-        // Static env is defined into ./dsl/jobs.groovy file
-
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-
-        JAVA_HOME = "${GRAALVM_HOME}"
     }
 
     stages {
@@ -182,5 +171,5 @@ String getCleanedReleaseNotes() {
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
-    return util.runWithPythonVirtualEnv(cmd, 'cekit', stdout)
+    return sh(returnStdout: stdout, script: cmd)
 }
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.update-prod-version b/.ci/jenkins/Jenkinsfile.update-prod-version
deleted file mode 100644
index 3d4bb28a016..00000000000
--- a/.ci/jenkins/Jenkinsfile.update-prod-version
+++ /dev/null
@@ -1,103 +0,0 @@
-@Library('jenkins-pipeline-shared-libraries')_
-
-pipeline {
-    agent {
-        label 'rhel8 && podman && !built-in'
-    }
-
-    options {
-        timeout(time: 30, unit: 'MINUTES')
-    }
-
-    // parameters {
-    // For parameters, check into ./dsl/jobs.groovy file
-    // }
-
-    environment {
-        // Static env is defined into ./dsl/jobs.groovy file
-
-        PR_BRANCH_HASH = "${util.generateHash(10)}"
-    }
-
-    stages {
-        stage('Initialization') {
-            steps {
-                script {
-                    assert getProdProjectVersion()
-                    assert getJiraNumber()
-
-                    currentBuild.displayName = getProdProjectVersion()
-
-                    deleteDir()
-                    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
-                }
-            }
-        }
-        stage('Prepare for PR') {
-            steps {
-                script {
-                    githubscm.createBranch(getPRBranch())
-                }
-            }
-        }
-        stage('Update prod version') {
-            when {
-                expression { return getProdProjectVersion() != '' }
-            }
-            steps {
-                script {
-                    sh "python3 scripts/manage-kogito-version.py --bump-to ${getProdProjectVersion()} --confirm --prod"
-                }
-            }
-        }
-        stage('Create PR') {
-            steps {
-                script {
-                    String commitMsg = "[${getJiraNumber()}] Update product version to ${getProdProjectVersion()}"
-                    if (githubscm.isThereAnyChanges()) {
-                        githubscm.commitChanges(commitMsg)
-                    } else {
-                        error 'No update version can be done'
-                    }
-                    githubscm.pushObject('origin', getPRBranch(), getGitAuthorCredsID())
-                    String prLink = githubscm.createPR(commitMsg, 'Please review and merge', getBuildBranch(), getGitAuthorCredsID())
-
-                    echo "Created PR ${prLink}"
-                }
-            }
-        }
-    }
-    post {
-        cleanup {
-            cleanWs()
-        }
-    }
-}
-
-String getRepoName() {
-    return "${REPO_NAME}"
-}
-
-String getBuildBranch() {
-    return "${BUILD_BRANCH_NAME}"
-}
-
-String getGitAuthor() {
-    return "${GIT_AUTHOR}"
-}
-
-String getGitAuthorCredsID() {
-    return env.AUTHOR_CREDS_ID
-}
-
-String getPRBranch() {
-    return "${getProdProjectVersion() ?: getBuildBranch()}-${env.PR_BRANCH_HASH}"
-}
-
-String getProdProjectVersion() {
-    return "${PROD_PROJECT_VERSION}"
-}
-
-String getJiraNumber() {
-    return "${JIRA_NUMBER}"
-}
\ No newline at end of file
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index cb073f2acb0..fb18ed05fc4 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -2,10 +2,10 @@
 * This file is describing all the Jenkins jobs in the DSL format (see https://plugins.jenkins.io/job-dsl/)
 * needed by the Kogito pipelines.
 *
-* The main part of Jenkins job generation is defined into the https://github.com/kiegroup/kogito-pipelines repository.
+* The main part of Jenkins job generation is defined into the https://github.com/apache/incubator-kie-kogito-pipelines repository.
 *
 * This file is making use of shared libraries defined in
-* https://github.com/kiegroup/kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
+* https://github.com/apache/incubator-kie-kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
 */
 
 import org.kie.jenkins.jobdsl.model.JobType
@@ -17,7 +17,7 @@ import org.kie.jenkins.jobdsl.Utils
 jenkins_path = '.ci/jenkins'
 
 // PR checks
-setupPrJob()
+Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile")
 
 // Init branch
 createSetupBranchJob()
@@ -30,12 +30,6 @@ KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-lts')
 setupDeployJob(JobType.RELEASE)
 setupPromoteJob(JobType.RELEASE)
 
-if (Utils.isProductizedBranch(this)) {
-    setupPrJob(true) // Prod CI job
-    setupProdUpdateVersionJob()
-    setupQuarkusUpdateJob(true) // Prod CI job
-}
-
 // Update quarkus on community
 setupQuarkusUpdateJob()
 
@@ -43,11 +37,11 @@ setupQuarkusUpdateJob()
 // Methods
 /////////////////////////////////////////////////////////////////
 
-void setupPrJob(boolean isProdCI = false) {
-    setupBuildImageJob(JobType.PULL_REQUEST, isProdCI)
+void setupPrJob() {
+    setupBuildImageJob(JobType.PULL_REQUEST)
 
-    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.PULL_REQUEST, "${jenkins_path}/Jenkinsfile", "Kogito Images${isProdCI ? ' Prod' : ''} PR check")
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.PULL_REQUEST, "${jenkins_path}/Jenkinsfile", "Kogito Images PR check")
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.pr.putAll([
         run_only_for_branches: [ "${GIT_BRANCH}" ],
         disable_status_message_error: true,
@@ -55,13 +49,7 @@ void setupPrJob(boolean isProdCI = false) {
         commitContext: 'Retrieve and Launch Image Checks',
         contextShowtestResults: false,
     ])
-    if (isProdCI) {
-        jobParams.job.name += '.prod'
-        jobParams.pr.trigger_phrase = '.*[j|J]enkins,?.*(rerun|run) [prod|Prod|PROD].*'
-        jobParams.pr.trigger_phrase_only = true
-        jobParams.pr.commitContext = '(Prod) Retrieve and Launch Image Checks'
-        jobParams.env.put('PROD_CI', true)
-    } else if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
+    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
         jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
     }
     jobParams.env.putAll([
@@ -72,9 +60,8 @@ void setupPrJob(boolean isProdCI = false) {
 
 void createSetupBranchJob() {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.env.putAll([
-        REPO_NAME: 'kogito-images',
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
 
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
@@ -102,7 +89,7 @@ void setupDeployJob(JobType jobType) {
     setupBuildImageJob(jobType)
 
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-deploy', jobType, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.env.putAll([
         PROPERTIES_FILE_NAME: 'deployment.properties',
 
@@ -138,7 +125,7 @@ void setupDeployJob(JobType jobType) {
 
             // Deploy information
             booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
             stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
             stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
             stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
@@ -158,16 +145,15 @@ void setupDeployJob(JobType jobType) {
     }
 }
 
-void setupBuildImageJob(JobType jobType, boolean prodCI = false) {
+void setupBuildImageJob(JobType jobType) {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.build-image', jobType, "${jenkins_path}/Jenkinsfile.build-image", 'Kogito Images Build single image')
     // Use jenkinsfile from the build branch
     jobParams.git.author = '${SOURCE_AUTHOR}'
     jobParams.git.branch = '${SOURCE_BRANCH}'
-    JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.env.putAll([
         MAX_REGISTRY_RETRIES: 3,
         TARGET_AUTHOR: Utils.getGitAuthor(this), // In case of a PR to merge with target branch
-        PROD_CI: prodCI,
 
         AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
         AUTHOR_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
@@ -199,7 +185,7 @@ void setupBuildImageJob(JobType jobType, boolean prodCI = false) {
             // Deploy information
             booleanParam('DEPLOY_IMAGE', false, 'Should we deploy image to given deploy registry ?')
             booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('DEPLOY_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('DEPLOY_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
             stringParam('DEPLOY_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
             stringParam('DEPLOY_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
             stringParam('DEPLOY_IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
@@ -211,8 +197,8 @@ void setupBuildImageJob(JobType jobType, boolean prodCI = false) {
 
 void setupPromoteJob(JobType jobType) {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-promote', jobType, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote')
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.env.putAll([
-        REPO_NAME: 'kogito-images',
         PROPERTIES_FILE_NAME: 'deployment.properties',
 
         MAX_REGISTRY_RETRIES: 3,
@@ -241,7 +227,7 @@ void setupPromoteJob(JobType jobType) {
 
             // Base images information which can override `deployment.properties`
             booleanParam('BASE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Override `deployment.properties`. Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Override `deployment.properties`. Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
+            stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Override `deployment.properties`. Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
             stringParam('BASE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Override `deployment.properties`. Base image registry')
             stringParam('BASE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Override `deployment.properties`. Base image namespace')
             stringParam('BASE_IMAGE_NAMES', '', 'Override `deployment.properties`. Comma separated list of images')
@@ -250,7 +236,7 @@ void setupPromoteJob(JobType jobType) {
 
             // Promote images information
             booleanParam('PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
+            stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
             stringParam('PROMOTE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Promote image registry')
             stringParam('PROMOTE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Promote image namespace')
             stringParam('PROMOTE_IMAGE_NAME_SUFFIX', '', 'Promote image name suffix')
@@ -268,27 +254,8 @@ void setupPromoteJob(JobType jobType) {
     }
 }
 
-void setupProdUpdateVersionJob() {
-    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-update-prod-version', JobType.TOOLS, "${jenkins_path}/Jenkinsfile.update-prod-version", 'Update prod version for Kogito Images')
-    jobParams.env.putAll([
-        REPO_NAME: 'kogito-images',
-
-        BUILD_BRANCH_NAME: "${GIT_BRANCH}",
-        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
-    ])
-    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
-        parameters {
-            stringParam('JIRA_NUMBER', '', 'KIECLOUD-XXX or RHPAM-YYYY or else. This will be added to the commit and PR.')
-            stringParam('PROD_PROJECT_VERSION', '', 'Which version to set ?')
-        }
-    }
-}
-
-void setupQuarkusUpdateJob(boolean isProdCI = false) {
-    def prodFlag = isProdCI ? '--prod' : ''
+void setupQuarkusUpdateJob() {
     KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
-        "source ~/virtenvs/cekit/bin/activate && python3 scripts/update-repository.py --quarkus-platform-version %new_version% ${prodFlag}"
+        "source ~/virtenvs/cekit/bin/activate && python3 scripts/update-repository.py --quarkus-platform-version %new_version%"
     ])
 }
diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index ad8af34ac25..2d518eb9f9c 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 file=$(mktemp)
 # For more usage of the script, use ./test.sh -h
-curl -o ${file} https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
+curl -o ${file} https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
 chmod u+x ${file}
 ${file} $@
\ No newline at end of file
diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index bf3815cbc36..324a2deb101 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -17,6 +17,6 @@ jobs:
     - name: DSL tests
       uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main
       with:
-        main-config-file-repo: kiegroup/kogito-pipelines
+        main-config-file-repo: apache/incubator-kie-kogito-pipelines
         main-config-file-path: .ci/jenkins/config/main.yaml
-        branch-config-file-repo: kiegroup/kogito-pipelines
+        branch-config-file-repo: apache/incubator-kie-kogito-pipelines

From 5fac5e93307e730b226256370239586b517acb40 Mon Sep 17 00:00:00 2001
From: Davide Salerno <dsalerno@redhat.com>
Date: Wed, 27 Sep 2023 19:57:44 +0200
Subject: [PATCH 644/709] [KOGITO-9729] SonataFlow builder image is not
 preserving resources path (#1677)

* [KOGITO-9729] SonataFlow builder image is not preserving resources path

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* [KOGITO-9729] Added shell test

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

* Update modules/kogito-swf/common/scripts/added/build-app.sh

Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>

* [KOGITO-9729] Stopping containers into the same shell test

Signed-off-by: Davide Salerno <dsalerno@redhat.com>

---------

Signed-off-by: Davide Salerno <dsalerno@redhat.com>
Co-authored-by: Tristan Radisson <tristan.radisson@gmail.com>
---
 .../common/scripts/added/build-app.sh         |  2 +-
 tests/shell/kogito-swf-builder/RunTests.java  | 34 ++++++-
 .../.mvn/jvm.config                           |  0
 .../greet-with-inputschema/Dockerfile         | 40 +++++++++
 .../greet-with-inputschema/greet.sw.json      | 89 +++++++++++++++++++
 .../greet-with-inputschema/schemas/input.json | 16 ++++
 .../resources/greet/.mvn/jvm.config           |  1 +
 .../resources/{ => greet}/Dockerfile          |  0
 .../resources/{ => greet}/greet.sw.json       |  0
 9 files changed, 177 insertions(+), 5 deletions(-)
 rename tests/shell/kogito-swf-builder/resources/{ => greet-with-inputschema}/.mvn/jvm.config (100%)
 create mode 100644 tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
 create mode 100644 tests/shell/kogito-swf-builder/resources/greet-with-inputschema/greet.sw.json
 create mode 100644 tests/shell/kogito-swf-builder/resources/greet-with-inputschema/schemas/input.json
 create mode 100644 tests/shell/kogito-swf-builder/resources/greet/.mvn/jvm.config
 rename tests/shell/kogito-swf-builder/resources/{ => greet}/Dockerfile (100%)
 rename tests/shell/kogito-swf-builder/resources/{ => greet}/greet.sw.json (100%)

diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
index fdc5fc24c66..762c791e6ec 100755
--- a/modules/kogito-swf/common/scripts/added/build-app.sh
+++ b/modules/kogito-swf/common/scripts/added/build-app.sh
@@ -20,7 +20,7 @@ fi
 SUPPORTED_FILES=(".yaml" ".yml" ".json" ".properties" ".mvn/jvm.config")
 log_info "-> Copying files from ${resources_path}, if any..."
 if [ ! -z "${resources_path}" ]; then
-    find "${resources_path}" -regex '.*\.\(yaml\|yml\|json\|properties\)$' -exec cp -v {} src/main/resources/ \;
+    cd "${resources_path}" && find . -regex '.*\.\(yaml\|yml\|json\|properties\)$' | sed 's|^./||' | xargs cp -v --parents -t "${swf_home_dir}"/src/main/resources/ && cd -
     find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
 else
     log_warning "-> Nothing to copy from ${resources_path}"
diff --git a/tests/shell/kogito-swf-builder/RunTests.java b/tests/shell/kogito-swf-builder/RunTests.java
index f2dee5a80b0..8c570502844 100644
--- a/tests/shell/kogito-swf-builder/RunTests.java
+++ b/tests/shell/kogito-swf-builder/RunTests.java
@@ -46,9 +46,9 @@ public class RunTests {
     private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
 
     @Container
-    private GenericContainer builtImage = new GenericContainer(
+    private GenericContainer greetBuiltImage = new GenericContainer(
             new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
-                    .withDockerfile(Paths.get(getScriptDirPath(), "resources", "Dockerfile"))
+                    .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet", "Dockerfile"))
                     .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
             .withExposedPorts(8080)
             .waitingFor(Wait.forHttp("/jsongreet"))
@@ -56,9 +56,9 @@ public class RunTests {
 
     @Test
     public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
-        builtImage.start();
+        greetBuiltImage.start();
         HttpRequest request = HttpRequest.newBuilder()
-                .uri(new URI("http://" + builtImage.getHost() + ":" + builtImage.getFirstMappedPort() + "/jsongreet"))
+                .uri(new URI("http://" + greetBuiltImage.getHost() + ":" + greetBuiltImage.getFirstMappedPort() + "/jsongreet"))
                 .header("Content-Type", "application/json")
                 .header("Accept", "application/json")
                 .timeout(Duration.ofSeconds(10))
@@ -67,6 +67,32 @@ public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOExc
                 .build();
         HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
         assertEquals(201, response.statusCode());
+        greetBuiltImage.stop();
+    }
+
+    @Container
+    private GenericContainer greetWithInputSchemaBuiltImage = new GenericContainer(
+            new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
+                    .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet-with-inputschema", "Dockerfile"))
+                    .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
+            .withExposedPorts(8080)
+            .waitingFor(Wait.forHttp("/greeting"))
+            .withLogConsumer(logConsumer);
+
+    @Test
+    public void testBuiltContainerWithInputSchemaAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
+        greetWithInputSchemaBuiltImage.start();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(new URI("http://" + greetWithInputSchemaBuiltImage.getHost() + ":" + greetWithInputSchemaBuiltImage.getFirstMappedPort() + "/greeting"))
+                .header("Content-Type", "application/json")
+                .header("Accept", "application/json")
+                .timeout(Duration.ofSeconds(10))
+                .POST(HttpRequest.BodyPublishers
+                        .ofString("{\"name\": \"John\", \"language\": \"English\"}"))
+                .build();
+        HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
+        assertEquals(201, response.statusCode());
+        greetWithInputSchemaBuiltImage.stop();
     }
 
     public static void main(String... args) throws Exception {
diff --git a/tests/shell/kogito-swf-builder/resources/.mvn/jvm.config b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/.mvn/jvm.config
similarity index 100%
rename from tests/shell/kogito-swf-builder/resources/.mvn/jvm.config
rename to tests/shell/kogito-swf-builder/resources/greet-with-inputschema/.mvn/jvm.config
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
new file mode 100644
index 00000000000..88e1fc8a784
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
@@ -0,0 +1,40 @@
+ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0"
+
+FROM ${BUILDER_IMAGE_TAG} AS builder
+
+# Kogito user
+USER 1001
+
+ARG QUARKUS_PACKAGE_TYPE="jar"
+ARG SCRIPT_DEBUG="true"
+ARG MAVEN_DOWNLOAD_OUTPUT="true"
+ARG MAVEN_OFFLINE_MODE="true"
+
+# Copy from build context to resources directory
+COPY ./ ./resources/
+
+# Build app with given resources
+RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
+
+#=============================
+# Runtime Run
+#=============================
+FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:latest
+
+ARG QUARKUS_LAUNCH_DEVMODE=false
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
+# Default name is 'serverless-workflow-project'
+ARG PROJECT_ARTIFACT_ID='serverless-workflow-project'
+
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/lib/ /deployments/lib/
+COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/*.jar /deployments/
+COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/app/ /deployments/app/
+COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/quarkus/ /deployments/quarkus/
+
+EXPOSE 8080
+USER 185
+ENV AB_JOLOKIA_OFF=""
+ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/greet.sw.json b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/greet.sw.json
new file mode 100644
index 00000000000..183e2101f26
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/greet.sw.json
@@ -0,0 +1,89 @@
+{
+  "id": "greeting",
+  "description": "Greeting example on k8s!",
+  "version": "0.0.1",
+  "start": {
+    "stateName": "ChooseOnLanguage"
+  },
+  "dataInputSchema": {
+    "schema": "schemas/input.json",
+    "failOnValidationErrors": true
+  },
+  "specVersion": "0.8",
+  "expressionLang": "jq",
+  "states": [
+    {
+      "name": "ChooseOnLanguage",
+      "type": "switch",
+      "defaultCondition": {
+        "transition": {
+          "nextState": "GreetInEnglish"
+        }
+      },
+      "dataConditions": [
+        {
+          "condition": "${ .language == \"English\" }",
+          "transition": {
+            "nextState": "GreetInEnglish"
+          }
+        },
+        {
+          "condition": "${ .language == \"Spanish\" }",
+          "transition": {
+            "nextState": "GreetInSpanish"
+          }
+        }
+      ]
+    },
+    {
+      "name": "GreetInEnglish",
+      "type": "inject",
+      "transition": {
+        "nextState": "GreetPerson"
+      },
+      "data": {
+        "greeting": "Hello from JSON Workflow, "
+      }
+    },
+    {
+      "name": "GreetInSpanish",
+      "type": "inject",
+      "transition": {
+        "nextState": "GreetPerson"
+      },
+      "data": {
+        "greeting": "Saludos desde JSON Workflow, "
+      }
+    },
+    {
+      "name": "GreetPerson",
+      "type": "operation",
+      "end": {
+        "terminate": true
+      },
+      "actionMode": "sequential",
+      "actions": [
+        {
+          "name": "greetAction",
+          "functionRef": {
+            "refName": "greetFunction",
+            "arguments": {
+              "message": ".greeting+.name"
+            },
+            "invoke": "sync"
+          },
+          "actionDataFilter": {
+            "useResults": true
+          }
+        }
+      ]
+    }
+  ],
+  "functions": [
+    {
+      "name": "greetFunction",
+      "operation": "sysout",
+      "type": "custom"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/schemas/input.json b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/schemas/input.json
new file mode 100644
index 00000000000..1874fd25b3e
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/schemas/input.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "language": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "language",
+    "name"
+  ]
+}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/resources/greet/.mvn/jvm.config b/tests/shell/kogito-swf-builder/resources/greet/.mvn/jvm.config
new file mode 100644
index 00000000000..df7809fac1f
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/resources/greet/.mvn/jvm.config
@@ -0,0 +1 @@
+-Xms1024m
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/resources/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
similarity index 100%
rename from tests/shell/kogito-swf-builder/resources/Dockerfile
rename to tests/shell/kogito-swf-builder/resources/greet/Dockerfile
diff --git a/tests/shell/kogito-swf-builder/resources/greet.sw.json b/tests/shell/kogito-swf-builder/resources/greet/greet.sw.json
similarity index 100%
rename from tests/shell/kogito-swf-builder/resources/greet.sw.json
rename to tests/shell/kogito-swf-builder/resources/greet/greet.sw.json

From 98e816b48682a7ba1c890a12bf49c504a2fc6a1e Mon Sep 17 00:00:00 2001
From: Alex Porcelli <alex@porcelli.me>
Date: Tue, 21 Nov 2023 12:41:10 -0500
Subject: [PATCH 645/709] Update .asf.yaml to enable GitHub Issues (#1710)

---
 .asf.yaml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .asf.yaml

diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 00000000000..40a66c4ceaa
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,3 @@
+github:
+  features:
+    issues: true

From fb3e43e8c462e783a2ada8ba5f4285faf6a79bc2 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 1 Dec 2023 11:54:09 -0300
Subject: [PATCH 646/709] [KOGITO-9729] - (fix) Preserve directory structure
 while copying files in builder image (#1711)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 .../common/scripts/added/build-app.sh         | 14 ++++++----
 .../bats/kogito-swf-builder-build-app.bats    | 27 +++++++++++++++++++
 .../greet-with-inputschema/Dockerfile         |  2 +-
 .../resources/greet/Dockerfile                |  2 +-
 4 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats

diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
index 762c791e6ec..2f661aed49f 100755
--- a/modules/kogito-swf/common/scripts/added/build-app.sh
+++ b/modules/kogito-swf/common/scripts/added/build-app.sh
@@ -3,7 +3,7 @@ set -e
 
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 resources_path="$1"
-if [ ! -z "${resources_path}" ]; then
+if [ -n "${resources_path}" ]; then
     resources_path="$(realpath "${resources_path}")"
 fi
 
@@ -13,15 +13,17 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
     export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "Resources path is ${resources_path}"
     printenv
 fi
 
 # Copy resources if exists
-SUPPORTED_FILES=(".yaml" ".yml" ".json" ".properties" ".mvn/jvm.config")
 log_info "-> Copying files from ${resources_path}, if any..."
-if [ ! -z "${resources_path}" ]; then
-    cd "${resources_path}" && find . -regex '.*\.\(yaml\|yml\|json\|properties\)$' | sed 's|^./||' | xargs cp -v --parents -t "${swf_home_dir}"/src/main/resources/ && cd -
-    find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
+if [ -n "${resources_path}" ]; then
+    destination="${KOGITO_HOME}/serverless-workflow-project/src/main/resources/"
+    log_info "-> Destination folder is ${destination}"
+    cp -vR ${resources_path}/* ${destination}
+    find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p  ${destination}/.mvn \; -exec cp -v {} ${destination}/.mvn/ \;
 else
     log_warning "-> Nothing to copy from ${resources_path}"
 fi
@@ -33,6 +35,8 @@ if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
     ${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}" "true"
 fi
 
+cd ${KOGITO_HOME}/serverless-workflow-project
+
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
     -nsu \
     -s "${MAVEN_SETTINGS_PATH}" \
diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
new file mode 100644
index 00000000000..d0993822dd2
--- /dev/null
+++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
@@ -0,0 +1,27 @@
+#!/usr/bin/env bats
+
+setup() {
+    export KOGITO_HOME=/tmp/kogito
+    export HOME="${KOGITO_HOME}"
+    mkdir -p "${KOGITO_HOME}"/launch
+    mkdir -p "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/
+    cp $BATS_TEST_DIRNAME/../../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+    cp $BATS_TEST_DIRNAME/../../added/jvm-settings.sh "${KOGITO_HOME}"/launch/
+    cp $BATS_TEST_DIRNAME/../../added/build-app.sh "${KOGITO_HOME}"/launch/
+}
+
+teardown() {
+    rm -rf "${KOGITO_HOME}"
+    rm -rf /tmp/resources
+}
+
+@test "verify copy resources is working" {
+    TEMPD=$(mktemp -d)
+    cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/kogito-swf-builder/resources/greet-with-inputschema/* ${TEMPD}
+
+    # We don't care about the errors to try to execute and build the program, just the copy matters
+    source ${KOGITO_HOME}/launch/build-app.sh ${TEMPD} || true
+    
+    [[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/greet.sw.json ]]
+    [[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/schemas/input.json ]]
+}
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
index 88e1fc8a784..3581d31c53c 100644
--- a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
@@ -11,7 +11,7 @@ ARG MAVEN_DOWNLOAD_OUTPUT="true"
 ARG MAVEN_OFFLINE_MODE="true"
 
 # Copy from build context to resources directory
-COPY ./ ./resources/
+COPY --chown=1001 . ./resources
 
 # Build app with given resources
 RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
diff --git a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
index a8e4bdd1f0b..3581d31c53c 100644
--- a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
@@ -11,7 +11,7 @@ ARG MAVEN_DOWNLOAD_OUTPUT="true"
 ARG MAVEN_OFFLINE_MODE="true"
 
 # Copy from build context to resources directory
-COPY * ./resources/
+COPY --chown=1001 . ./resources
 
 # Build app with given resources
 RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'

From db9b072dd3fcf2a28ed1b0f66e8820342928aac5 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:31:20 -0300
Subject: [PATCH 647/709] [KOGITO-9729] - (fix) Preserve directory structure
 while copying files in builder image (#1711) (#1712)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

From 8e20b38c11e15eea9cd718a1ab629e5075d6aded Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 8 Dec 2023 10:21:52 -0300
Subject: [PATCH 648/709] kie-issues#632: Fix pipelines for Apache Incubator
 migration (#1709)

* Update kogito-images job to follow apache config

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* generate also build-image job

* use plain ubuntu in Jenkinsfile

* refactor Jenkinsfile to a dummy trigger

* pass PR source repository name

* use open ports

* hold localRegistryUrl after startup

* adjust repository URLs after transfer

* adjust KOGITO_APPS_REPO_NAME

* prevent repeated checkout

* remove jboss repository references

* fix settings.xml

* invoke bash explicitly to process bash directives

* set git config

* set global config

* replace mailing lists

* collect logs from all containers

* try log everything

* add initial sleep into startup command in feature files

* use skopeo installed in image

* Tidying the PR up #1

* Fix problem with builder script copying files for swf-builder-image

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* fix cleanup in build-image

* increase pipeline timeouts

* solve deferred wipeout issues

* increase timeout

* skip docker cleanup

* [KOGITO-9729] - (fix) Preserve directory structure while copying files in builder image

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* handle GitHub push credentials


---------

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
Co-authored-by: radtriste <tradisso@redhat.com>
Co-authored-by: jstastny-cz <jan.stastny@ibm.com>
---
 .ci/jenkins/Jenkinsfile                       | 112 +++-------
 .ci/jenkins/Jenkinsfile.build-and-test        | 130 ++++++++++++
 .ci/jenkins/Jenkinsfile.build-image           |  76 ++++---
 .ci/jenkins/Jenkinsfile.deploy                | 192 +++++++++---------
 .ci/jenkins/Jenkinsfile.promote               |  23 ++-
 .ci/jenkins/Jenkinsfile.setup-branch          |  14 +-
 .ci/jenkins/dsl/jobs.groovy                   |  93 ++++++---
 .github/workflows/jenkins-tests-PR.yml        |   2 +-
 .github/workflows/pr-backporting.yml          |   4 +-
 Makefile                                      |  10 +-
 README.md                                     |  60 +++---
 kogito-base-builder-image.yaml                |   2 +-
 kogito-data-index-ephemeral-image.yaml        |   2 +-
 kogito-data-index-infinispan-image.yaml       |   2 +-
 kogito-data-index-mongodb-image.yaml          |   2 +-
 kogito-data-index-oracle-image.yaml           |   2 +-
 kogito-data-index-postgresql-image.yaml       |   2 +-
 kogito-explainability-image.yaml              |   2 +-
 kogito-jit-runner-image.yaml                  |   2 +-
 kogito-jobs-service-allinone-image.yaml       |   2 +-
 kogito-jobs-service-ephemeral-image.yaml      |   2 +-
 kogito-jobs-service-infinispan-image.yaml     |   2 +-
 kogito-jobs-service-mongodb-image.yaml        |   2 +-
 kogito-jobs-service-postgresql-image.yaml     |   2 +-
 kogito-management-console-image.yaml          |   2 +-
 kogito-runtime-jvm-image.yaml                 |   2 +-
 kogito-runtime-native-image.yaml              |   2 +-
 kogito-s2i-builder-image.yaml                 |   2 +-
 kogito-swf-builder-image.yaml                 |   2 +-
 kogito-swf-devmode-image.yaml                 |   2 +-
 kogito-task-console-image.yaml                |   2 +-
 kogito-trusty-infinispan-image.yaml           |   2 +-
 kogito-trusty-postgresql-image.yaml           |   2 +-
 kogito-trusty-redis-image.yaml                |   2 +-
 kogito-trusty-ui-image.yaml                   |   2 +-
 logic-data-index-ephemeral-rhel8-image.yaml   |   2 +-
 logic-swf-builder-rhel8-image.yaml            |   2 +-
 logic-swf-devmode-rhel8-image.yaml            |   2 +-
 .../3.8.x-rpm/added/configure-maven.sh        |   4 +-
 .../kogito-maven/3.8.x-rpm/maven/settings.xml |  12 +-
 modules/kogito-maven/3.8.x-rpm/module.yaml    |   6 +-
 .../3.8.x/added/configure-maven.sh            |   4 +-
 modules/kogito-maven/3.8.x/maven/settings.xml |  12 +-
 modules/kogito-maven/3.8.x/module.yaml        |   6 +-
 .../common/scripts/added/build-app.sh         |   0
 scripts/README.md                             |   4 +-
 scripts/build-kogito-apps-components.sh       |  16 +-
 scripts/common.py                             |  38 ++--
 scripts/list-images.py                        |   2 +-
 scripts/manage-kogito-version.py              |   2 +-
 scripts/push-local-registry.sh                |   2 +-
 scripts/push-staging.py                       |   2 +-
 scripts/retrieve_version.py                   |   4 +-
 scripts/setup-maven.sh                        |   2 +-
 scripts/update-repository.py                  |  16 +-
 tests/features/common-build-runtime.feature   |   2 +-
 .../features/common-custom-truststore.feature |   2 +-
 .../features/common-dynamic-resources.feature |  19 +-
 .../kogito-data-index-ephemeral.feature       |   2 +-
 .../kogito-data-index-infinispan.feature      |   2 +-
 .../kogito-data-index-mongodb.feature         |   2 +-
 .../kogito-data-index-oracle.feature          |   2 +-
 .../kogito-data-index-postgresql.feature      |   2 +-
 .../kogito-jobs-service-all-in-one.feature    |   2 +-
 .../kogito-jobs-service-ephemeral.feature     |   2 +-
 .../kogito-jobs-service-infinispan.feature    |   2 +-
 .../kogito-jobs-service-mongodb.feature       |   2 +-
 .../kogito-jobs-service-postgresql.feature    |   2 +-
 .../kogito-common-builder-jvm.feature         |  24 +--
 tests/features/kogito-explainability.feature  |   2 +-
 tests/features/kogito-jit-runner.feature      |   2 +-
 .../kogito-management-console.feature         |   2 +-
 tests/features/kogito-runtime-jvm.feature     |   2 +-
 tests/features/kogito-runtime-native.feature  |   2 +-
 .../kogito-s2i-builder-native.feature         |  10 +-
 tests/features/kogito-s2i-builder.feature     |   6 +-
 tests/features/kogito-task-console.feature    |   2 +-
 .../logic-data-index-ephemeral.feature        |   2 +-
 .../logic-swf-builder.feature                 |   2 +-
 .../logic-swf-devmode.feature                 |   2 +-
 .../trusty/kogito-trusty-common.feature       |   7 +-
 .../trusty/kogito-trusty-infinispan.feature   |   2 +-
 .../trusty/kogito-trusty-postgresql.feature   |   2 +-
 .../trusty/kogito-trusty-redis.feature        |   2 +-
 .../features/trusty/kogito-trusty-ui.feature  |   2 +-
 tests/test-apps/clone-repo.sh                 |  25 ++-
 86 files changed, 597 insertions(+), 446 deletions(-)
 create mode 100644 .ci/jenkins/Jenkinsfile.build-and-test
 mode change 100755 => 100644 modules/kogito-swf/common/scripts/added/build-app.sh

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 693fa00c26e..3454a840369 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -5,111 +5,53 @@ pipeline {
         label 'ubuntu'
     }
     options {
-        timeout(time: 120, unit: 'MINUTES')
+        timeout(time: 240, unit: 'MINUTES')
+        disableConcurrentBuilds(abortPrevious: true)
+        skipDefaultCheckout()
     }
     stages {
-        stage('Initialization') {
+        stage("Invoke build-and-test") {
             steps {
                 script {
-                    clean()
-
                     sh 'printenv'
-                    
-                    githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true)
-                }
-            }
-        }
-        stage('Validate CeKit Image and Modules descriptors') {
-            steps {
-                script {
-                    sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
-                        tar -xzvf cekit-image-validator-runner.tgz
-                        chmod +x cekit-image-validator-runner
-                    '''
-                    sh './cekit-image-validator-runner modules/'
-                    getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
-                }
-            }
-        }
-        stage('Build & Test Images') {
-            steps {
-                script {
-                    parallelStages = [:]
-                    for(String image : getImages()){
-                        parallelStages[image] = createBuildAndTestStageClosure(image)
+                    List buildParams = []
+                    buildParams.add(string(name: 'DISPLAY_NAME', value: "PR #${CHANGE_ID}: ${CHANGE_URL}"))
+                    buildParams.add(string(name: 'CHANGE_ID', value: CHANGE_ID))
+                    buildParams.add(string(name: 'CHANGE_URL', value: CHANGE_URL))
+                    buildParams.add(string(name: 'SOURCE_REPOSITORY', value: getChangeRepository()))
+                    buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
+                    buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
+                    buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
+                    buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
+                    // Keep executing so we can cancel all if needed
+                    def job = build(job: "../kogito-images.build-and-test", wait: true, parameters: buildParams, propagate: false)
+                    if (job.result != 'SUCCESS') {
+                        if (job.result == 'UNSTABLE') {
+                            unstable("Tests on images seems to have failed: ${job.absoluteUrl}")
+                        } else {
+                            error("Error building images. Please check the logs of the job: ${job.absoluteUrl}")
+                        }
                     }
-                    parallel parallelStages
-                }
-            }
-        }
-    }
-    post {
-        always {
-            script {
-                clean()
-            }
-        }
-        unsuccessful {
-            script {
-                pullrequest.postComment(util.getMarkdownTestSummary('PR', "${BUILD_URL}", 'GITHUB'))
-            }
-        }
-    }
-}
-
-void clean() {
-    util.cleanNode()
-}
-
-Closure createBuildAndTestStageClosure(String image) {
-    return {
-        stage("Build&Test ${image}") {
-            List buildParams = []
-            buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${ghprbPullId} - ${image}: ${ghprbPullLink}"))
-            buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
-            buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
-            buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
-            buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
-            buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
-            
-            githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getGitAuthorCredentialsId())
-            githubscm.updateGithubCommitStatus(image, 'PENDING', 'Queued', getRepoName())
-            
-            // Keep executing so we can cancel all if needed
-            def job = build(job: "${getRepoName()}.build-image", wait: true, parameters: buildParams, propagate: false)
-            if (job.result != 'SUCCESS') {
-                if (job.result == 'UNSTABLE') {
-                    unstable("Tests on ${image} seems to have failed")
-                } else {
-                    error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
                 }
             }
         }
     }
 }
 
-String[] getImages() {
-    if (env.IMAGES_LIST) {
-        return env.IMAGES_LIST.split(',')
-    }
-    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
+String getChangeAuthor() {
+    return pullrequest.getAuthorAndRepoForPr().split('/')[0]
 }
 
-String getChangeAuthor() {
-    return env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepoGitUrl) : (env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR)
+String getChangeRepository() {
+    return pullrequest.getAuthorAndRepoForPr().split('/')[1]
 }
 
 String getChangeBranch() {
-    return env.ghprbSourceBranch ?: CHANGE_BRANCH
+    return CHANGE_BRANCH
 }
 
 String getChangeTarget() {
-    return env.ghprbTargetBranch ?: CHANGE_TARGET
-}
-
-String getRepoName() {
-    return env.REPO_NAME
+    return CHANGE_TARGET
 }
 
 String getGitAuthorCredentialsId() {
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
new file mode 100644
index 00000000000..4e99f9e14d5
--- /dev/null
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -0,0 +1,130 @@
+@Library('jenkins-pipeline-shared-libraries')_
+
+pipeline {
+    agent {
+        docker { 
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
+    }
+    options {
+        timeout(time: 240, unit: 'MINUTES')
+        skipDefaultCheckout()
+    }
+    stages {
+        stage('Initialization') {
+            steps {
+                script {
+                    sh 'printenv'
+                    
+                    dir(getRepoName()) {
+                        // TODO Test pupose
+                        deleteDir()
+                        githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorTokenCredentialsId(), usernamePassword: getGitAuthorCredentialsId()])
+                    }
+                }
+            }
+        }
+        stage('Validate CeKit Image and Modules descriptors') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        sh '''
+                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                            tar -xzvf cekit-image-validator-runner.tgz
+                            chmod +x cekit-image-validator-runner
+                        '''
+                        sh './cekit-image-validator-runner modules/'
+                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
+                    }
+                }
+            }
+        }
+        stage('Build & Test Images') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getGitAuthorCredentialsId())
+                        parallelStages = [:]
+                        for(String image : getImages()){
+                            parallelStages[image] = createBuildAndTestStageClosure(image)
+                        }
+                        parallel parallelStages
+                    }
+                }
+            }
+        }
+    }
+    post {
+        unsuccessful {
+            script {
+                pullrequest.postComment(util.getMarkdownTestSummary('PR', '', "${BUILD_URL}", 'GITHUB'))
+            }
+        }
+    }
+}
+
+Closure createBuildAndTestStageClosure(String image) {
+    return {
+        stage("Build&Test ${image}") {
+            List buildParams = []
+            buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${getChangeId()} - ${image}: ${getChangeUrl()}"))
+            buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
+            buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
+            buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
+            buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
+            buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
+
+            githubscm.updateGithubCommitStatus(image, 'PENDING', 'Queued', getRepoName())
+
+            // Keep executing so we can cancel all if needed
+            def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
+            if (job.result != 'SUCCESS') {
+                if (job.result == 'UNSTABLE') {
+                    unstable("Tests on ${image} seems to have failed")
+                } else {
+                    error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
+                }
+            }
+        }
+    }
+}
+
+String[] getImages() {
+    if (env.IMAGES_LIST) {
+        return env.IMAGES_LIST.split(',')
+    }
+    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
+}
+
+String getChangeAuthor() {
+    return SOURCE_AUTHOR
+}
+
+String getChangeBranch() {
+    return SOURCE_BRANCH
+}
+
+String getChangeTarget() {
+    return TARGET_BRANCH
+}
+
+String getChangeId() {
+    return CHANGE_ID
+}
+
+String getChangeUrl() {
+    return CHANGE_URL
+}
+
+String getRepoName() {
+    return env.REPO_NAME
+}
+
+String getGitAuthorCredentialsId() {
+    return env.GIT_AUTHOR_CREDS_ID
+}
+
+String getGitAuthorTokenCredentialsId() {
+    return env.GIT_AUTHOR_TOKEN_CREDS_ID
+}
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index f13a6404395..5436d77d03f 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -7,10 +7,12 @@ pipeline {
         docker { 
             image env.AGENT_DOCKER_BUILDER_IMAGE
             args env.AGENT_DOCKER_BUILDER_ARGS
+            alwaysPull true
         }
     }
     options {
-        timeout(time: 120, unit: 'MINUTES')
+        timeout(time: 150, unit: 'MINUTES')
+        skipDefaultCheckout()
     }
     environment {
         // Linked to node label
@@ -18,8 +20,6 @@ pipeline {
         CONTAINER_ENGINE = 'docker'
         CONTAINER_ENGINE_TLS_OPTIONS = ''
 
-        OPENSHIFT_API = credentials('OPENSHIFT_API')
-        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
         OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
 
         IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64'
@@ -28,8 +28,6 @@ pipeline {
         stage('Initialization') {
             steps {
                 script {
-                    clean()
-
                     sh 'printenv'
 
                     assert getBuildImageName() : 'Please provide `BUILD_IMAGE_NAME` parameter'
@@ -44,12 +42,13 @@ pipeline {
                         checkout(githubscm.resolveRepository(getRepoName(), getSourceAuthor(), getSourceBranch(), false, getGitAuthorCredentialsId()))
                         githubscm.prepareCommitStatusInformation(getRepoName(), getSourceAuthor(), getSourceBranch(), getGitAuthorCredentialsId())
                     }
+                    githubscm.setUserConfig('robot', 'kie.apache.org', true)
                     updateGithubCommitStatus('PENDING', 'Started')
 
                     // Login to final registry if deploy is needed
                     if (shouldDeployImage()) {
                         if (isDeployImageInOpenshiftRegistry()) {
-                            cloud.loginOpenShift(env.OPENSHIFT_API, env.OPENSHIFT_CREDS_KEY)
+                            cloud.loginOpenShift(getOpenShiftAPI(), env.OPENSHIFT_CREDS_KEY)
                             cloud.loginOpenshiftRegistry(env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
                         } else if (getDeployImageRegistryCredentials()) {
                             cloud.loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials(), env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
@@ -67,12 +66,12 @@ pipeline {
                         env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
 
                         // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                        runPythonCommand("python3 scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
+                        runPythonCommand("python scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
                     }
 
                     if (getMavenArtifactRepository()) {
                         echo "Setup Repository url to '${getMavenArtifactRepository()}'"
-                        runPythonCommand("python3 scripts/update-repository.py  --repo-url ${getMavenArtifactRepository()}")
+                        runPythonCommand("python scripts/update-repository.py  --repo-url ${getMavenArtifactRepository()}")
                     }
                 }
             }
@@ -89,7 +88,7 @@ pipeline {
         //                     echo "[WARN] Artifacts repository defined in env will override the quarkus platform URL in tests. Make sure the platform artifacts are available on that artifacts repository (you can use a maven group)"
         //                 }
         //                 // Setup quarkus platform repo configuration
-        //                 runPythonCommand("python3 scripts/update-repository.py --repo-url ${getQuarkusPlatformURL()} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
+        //                 runPythonCommand("python scripts/update-repository.py --repo-url ${getQuarkusPlatformURL()} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
         //             }
         //         }
         //     }
@@ -99,8 +98,9 @@ pipeline {
                 script {
                     updateGithubCommitStatus('PENDING', 'Build in progress')
 
-                    String localRegistry = cloud.startLocalRegistry()
-                    cloud.prepareForDockerMultiplatformBuild([localRegistry],[cloud.getDockerIOMirrorRegistryConfig()], false)
+                    int freePort = cloud.findFreePort()
+                    env.localRegistryUrl = cloud.startLocalRegistry(freePort)
+                    cloud.prepareForDockerMultiplatformBuild([env.localRegistryUrl],[cloud.getDockerIOMirrorRegistryConfig()], false)
 
                     // Generate the Dockerfile
                     runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_test=true ignore_tag=true build_options='--dry-run'")
@@ -108,7 +108,7 @@ pipeline {
                     // Build multiplatform from generated Dockerfile
                     String squashMessage = "${getBuildImageName()}:${getImageVersion()} squashed"
                     dir('target/image') {
-                        cloud.dockerBuildMultiPlatformImages(getBuiltImageTag(), getImageBuildPlatforms(), shouldDeployImage(), squashMessage)
+                        cloud.dockerBuildMultiPlatformImages(getBuiltImageTag(), getImageBuildPlatforms(), shouldDeployImage(), squashMessage, false, true)
                     }
                 }
             }
@@ -119,8 +119,6 @@ pipeline {
             }
             steps {
                 script {
-                    cloud.installSkopeo()
-
                     // Make public if quay registry
                     if (getDeployImageRegistry() == QUAY_REGISTRY) {
                         String namespace = getDeployImageNamespace()
@@ -153,7 +151,7 @@ pipeline {
             }
             steps {
                 script {
-                    updateTestsCommand = 'python3 scripts/update-repository.py --tests-only'
+                    updateTestsCommand = 'python scripts/update-repository.py --tests-only'
                     updateTestsCommand += getMavenArtifactRepository() ? " --repo-url ${getMavenArtifactRepository()}" : ''
                     updateTestsCommand += getTestsKogitoExamplesRef() ? " --examples-ref ${getTestsKogitoExamplesRef()}" : ''
                     updateTestsCommand += getTestsKogitoExamplesURI() ? " --examples-uri ${getTestsKogitoExamplesURI()}" : ''
@@ -189,7 +187,7 @@ pipeline {
                         unstable "Testing error(s) for image ${getBuildImageName()}"
                     } finally {
                         junit testResults: 'target/**/*.xml', allowEmptyResults: true
-                        archiveArtifacts artifacts: 'target/**/*.xml', allowEmptyArchive: true
+                        archiveArtifacts artifacts: 'target/**/*.xml, **/*.txt, **/*.log', allowEmptyArchive: true
                     }
                 }
             }
@@ -199,22 +197,22 @@ pipeline {
         always {
             script {
                 updateGithubCommitStatusFromBuildResult()
-
-                clean()
+                collectContainerLogs()
+                archiveArtifacts artifacts: '**/*-build.log, **/*.log', allowEmptyArchive: true
+            }
+        }
+        cleanup {
+            script {
+                cleanWs()
             }
         }
     }
 }
 
-void clean() {
-    util.cleanNode(env.CONTAINER_ENGINE)
-
-    cloud.cleanDockerMultiplatformBuild()
-    cloud.cleanLocalRegistry()
-    cloud.cleanSkopeo()
-
-    // Clean Cekit cache, in case we reuse an old node
-    sh "rm -rf \$HOME/.cekit/cache"
+void collectContainerLogs() {
+    sh '''#!/bin/bash
+        for container in $(docker container ls --format "{{.Names}}"); do echo "[$container:START]"; docker logs $container; echo "[$container:END]"; done &> containers.log
+    '''
 }
 
 String getMakeBuildImageArgs() {
@@ -240,7 +238,7 @@ String getBuiltImageTag(String imageTag = '') {
     if (shouldDeployImage()) {
         return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName()}:${imageTag ?: getDeployImageTag()}"
     } else {
-        return "localhost:5000/${getBuildImageName()}:${githubscm.getCommitHash()}"
+        return "${env.localRegistryUrl}/${getBuildImageName()}:${githubscm.getCommitHash()}"
     }
 }
 
@@ -261,7 +259,7 @@ String getDeployImageRegistryCredentials() {
 }
 
 String getDeployImageRegistry() {
-    return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.DEPLOY_IMAGE_REGISTRY
+    return isDeployImageInOpenshiftRegistry() ? getOpenShiftRegistry() : params.DEPLOY_IMAGE_REGISTRY
 }
 
 String getDeployImageNamespace() {
@@ -292,6 +290,22 @@ boolean isDeployLatestTag() {
 // utils
 ////////////////////////////////////////////////////////////////////////
 
+String getOpenShiftRegistry() {
+    String registry = ''
+    withCredentials([string(credentialsId: 'OPENSHIFT_REGISTRY', variable: 'OPENSHIFT_REGISTRY')]) {
+        registry = env.OPENSHIFT_REGISTRY
+    }
+    return registry
+}
+
+String getOpenShiftAPI() {
+    String openShiftAPI = ''
+    withCredentials([string(credentialsId: 'OPENSHIFT_API', variable: 'OPENSHIFT_API')]) {
+        openShiftAPI = env.OPENSHIFT_API
+    }
+    return openShiftAPI
+}
+
 String getRepoName() {
     return env.REPO_NAME
 }
@@ -317,11 +331,11 @@ String getTargetBranch() {
 }
 
 String getGitAuthorCredentialsId() {
-    return env.AUTHOR_CREDS_ID
+    return env.GIT_AUTHOR_CREDS_ID
 }
 
 String getGitAuthorTokenCredentialsId() {
-    return env.AUTHOR_TOKEN_CREDS_ID
+    return env.GIT_AUTHOR_TOKEN_CREDS_ID
 }
 
 boolean shouldDeployImage() {
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 83697af7aa4..a4ff1c6eb73 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -4,9 +4,9 @@ deployProperties = [:]
 
 changesDone = false
 
-BUILT_IMAGES = []
-BUILD_FAILED_IMAGES = []
-TEST_FAILED_IMAGES = []
+BUILT_IMAGES = Collections.synchronizedList([])
+BUILD_FAILED_IMAGES = Collections.synchronizedList([])
+TEST_FAILED_IMAGES = Collections.synchronizedList([])
 
 pipeline {
     agent {
@@ -17,24 +17,23 @@ pipeline {
     }
 
     options {
-        timeout(time: 120, unit: 'MINUTES')
+        timeout(time: 240, unit: 'MINUTES')
+        skipDefaultCheckout()
     }
 
     environment {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-
-        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
     }
 
     stages {
         stage('Initialization') {
             steps {
                 script {
-                    clean()
-
                     currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
 
-                    checkoutRepo()
+                    dir(getRepoName()) {
+                        checkoutRepo()
+                    }
 
                     if (isRelease()) {
                         // Verify version is set and if on right release branch
@@ -62,10 +61,12 @@ pipeline {
             }
             steps {
                 script {
-                    if (githubscm.isBranchExist('origin',getPRBranch())) {
-                        githubscm.removeRemoteBranch('origin', getPRBranch())
+                    dir(getRepoName()) {
+                        if (githubscm.isBranchExist('origin', getPRBranch())) {
+                            githubscm.removeRemoteBranch('origin', getPRBranch(), getGitAuthorPushCredsId())
+                        }
+                        githubscm.createBranch(getPRBranch())
                     }
-                    githubscm.createBranch(getPRBranch())
                 }
             }
         }
@@ -76,12 +77,14 @@ pipeline {
             }
             steps {
                 script {
-                    if (getQuarkusPlatformVersion()) {
-                        runPythonCommand("python3 scripts/update-repository.py --quarkus-platform-version ${getQuarkusPlatformVersion()}")
+                    dir(getRepoName()) {
+                        if (getQuarkusPlatformVersion()) {
+                            sh "python scripts/update-repository.py --quarkus-platform-version ${getQuarkusPlatformVersion()}"
 
-                        commitAndPushChanges("Update Quarkus Platform version to ${getQuarkusPlatformVersion()}")
-                    } else {
-                        echo 'No new quarkus version given for the release. Statu quo ...'
+                            commitAndPushChanges("Update Quarkus Platform version to ${getQuarkusPlatformVersion()}")
+                        } else {
+                            echo 'No new quarkus version given for the release. Statu quo ...'
+                        }
                     }
                 }
             }
@@ -93,16 +96,18 @@ pipeline {
             }
             steps {
                 script {
-                    versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
-                    if (getBuildBranch() != 'main') {
-                        versionCmd += " --examples-ref ${!isRelease() ? 'nightly-' : ''}${getBuildBranch()}"
-                    }
-                    if (getKogitoArtifactsVersion()) {
-                        versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
-                    }
-                    runPythonCommand(versionCmd)
+                    dir(getRepoName()) {
+                        versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
+                        if (getBuildBranch() != 'main') {
+                            versionCmd += " --examples-ref ${!isRelease() ? 'nightly-' : ''}${getBuildBranch()}"
+                        }
+                        if (getKogitoArtifactsVersion()) {
+                            versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
+                        }
+                        sh versionCmd
 
-                    commitAndPushChanges("Update project version to ${getProjectVersion()}")
+                        commitAndPushChanges("Update project version to ${getProjectVersion()}")
+                    }
                 }
             }
         }
@@ -110,18 +115,15 @@ pipeline {
         stage('Validate CeKit Image and Modules descriptors') {
             steps {
                 script {
-                    sh '''
-                        curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
-                        tar -xzvf cekit-image-validator-runner.tgz
-                        chmod +x cekit-image-validator-runner
-                    '''
-                    sh './cekit-image-validator-runner modules/'
-                    getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
-                }
-            }
-            post {
-                always {
-                    sh 'rm -rf cekit-image-validator-runner*'
+                    dir(getRepoName()) {
+                        sh '''
+                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                            tar -xzvf cekit-image-validator-runner.tgz
+                            chmod +x cekit-image-validator-runner
+                        '''
+                        sh './cekit-image-validator-runner modules/'
+                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
+                    }
                 }
             }
         }
@@ -129,11 +131,13 @@ pipeline {
         stage('Build, Push & Test Images') {
             steps {
                 script {
-                    parallelStages = [:]
-                    getImages().each { image ->
-                        parallelStages["Build&Test ${image}"] = createBuildAndTestStageClosure(image)
+                    dir(getRepoName()) {
+                        parallelStages = [:]
+                        getImages().each { image ->
+                            parallelStages["Build&Test ${image}"] = createBuildAndTestStageClosure(image)
+                        }
+                        parallel parallelStages
                     }
-                    parallel parallelStages
                 }
             }
             post {
@@ -159,37 +163,39 @@ pipeline {
             }
             steps {
                 script {
-                    def commitMsg = "[${getBuildBranch()}] Update Maven artifacts"
-                    def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}."
-                    if (isRelease()) {
-                        commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()}"
-                        prBody += '\nPlease do not merge, it should be merged automatically.'
-                    } else if (currentBuild.currentResult != 'SUCCESS') {
-                        commitMsg += " (${currentBuild.currentResult})"
-                        prBody += '\n\nSuccessful images:\n'
-                        getBuiltImages().each {
-                            prBody += "- ${it}\n"
-                        }
-                        if (getBuildFailedImages()) {
-                            prBody += '\nBuild failures on those images:\n'
-                            getBuildFailedImages().each {
+                    dir(getRepoName()) {
+                        def commitMsg = "[${getBuildBranch()}] Update Maven artifacts"
+                        def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}."
+                        if (isRelease()) {
+                            commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()}"
+                            prBody += '\nPlease do not merge, it should be merged automatically.'
+                        } else if (currentBuild.currentResult != 'SUCCESS') {
+                            commitMsg += " (${currentBuild.currentResult})"
+                            prBody += '\n\nSuccessful images:\n'
+                            getBuiltImages().each {
                                 prBody += "- ${it}\n"
                             }
-                        } else {
-                            prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
-                        }
-                        if (getTestFailedImages()) {
-                            prBody += '\nTest failures on those images:\n'
-                            getTestFailedImages().each {
-                                prBody += "- ${it}\n"
+                            if (getBuildFailedImages()) {
+                                prBody += '\nBuild failures on those images:\n'
+                                getBuildFailedImages().each {
+                                    prBody += "- ${it}\n"
+                                }
+                            } else {
+                                prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
                             }
-                        } else {
-                            prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
+                            if (getTestFailedImages()) {
+                                prBody += '\nTest failures on those images:\n'
+                                getTestFailedImages().each {
+                                    prBody += "- ${it}\n"
+                                }
+                            } else {
+                                prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
+                            }
+                            prBody += '\nSee build url above for more information'
                         }
-                        prBody += '\nSee build url above for more information'
+                        String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getGitAuthorPushCredsId())
+                        deployProperties["${getRepoName()}.pr.link"] = prLink
                     }
-                    String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getGitAuthorCredsID())
-                    deployProperties["${getRepoName()}.pr.link"] = prLink
                 }
             }
             post {
@@ -221,12 +227,12 @@ pipeline {
                 archiveArtifacts artifacts: env.PROPERTIES_FILE_NAME, allowEmptyArchive:true
             }
         }
+        cleanup {
+            cleanWs()
+        }
         unsuccessful {
             sendUnsuccessfulNotification()
         }
-        cleanup {
-            clean()
-        }
     }
 }
 
@@ -250,19 +256,15 @@ String getNotificationSubject() {
 
 void checkoutRepo() {
     deleteDir()
-    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
+    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsId()))
 }
 
 void commitAndPushChanges(String commitMsg) {
     githubscm.commitChanges(commitMsg)
-    githubscm.pushObject('origin', getPRBranch(), getGitAuthorCredsID())
+    githubscm.pushObject('origin', getPRBranch(), getGitAuthorPushCredsId())
     changesDone = true
 }
 
-void clean() {
-    util.cleanNode()
-}
-
 void createBuildAndTestStageClosure(String image) {
     return  {
         stage("Build&Test ${image}") {
@@ -306,21 +308,15 @@ void createBuildAndTestStageClosure(String image) {
 }
 
 void registerBuiltImage(String imageName) {
-    lock("${BUILD_URL} build success") {
-        BUILT_IMAGES.add(imageName)
-    }
+    BUILT_IMAGES.add(imageName)
 }
 
 void registerBuildFailedImage(String imageName) {
-    lock("${BUILD_URL} build failed") {
-        BUILD_FAILED_IMAGES.add(imageName)
-    }
+    BUILD_FAILED_IMAGES.add(imageName)
 }
 
 void registerTestFailedImage(String imageName) {
-    lock("${BUILD_URL} test failed") {
-        TEST_FAILED_IMAGES.add(imageName)
-    }
+    TEST_FAILED_IMAGES.add(imageName)
 }
 
 List getBuiltImages() {
@@ -348,7 +344,7 @@ String getDeployImageRegistryCredentials() {
 }
 
 String getDeployImageRegistry() {
-    return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.IMAGE_REGISTRY
+    return isDeployImageInOpenshiftRegistry() ? getOpenShiftRegistry() : params.IMAGE_REGISTRY
 }
 String getDeployImageNamespace() {
     return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
@@ -388,8 +384,12 @@ String getGitAuthor() {
     return "${GIT_AUTHOR}"
 }
 
-String getGitAuthorCredsID() {
-    return env.AUTHOR_CREDS_ID
+String getGitAuthorCredsId() {
+    return env.GIT_AUTHOR_CREDS_ID
+}
+
+String getGitAuthorPushCredsId() {
+    return env.GIT_AUTHOR_PUSH_CREDS_ID
 }
 
 String getPRBranch() {
@@ -404,6 +404,14 @@ String getKogitoArtifactsVersion() {
     return params.KOGITO_ARTIFACTS_VERSION
 }
 
+String getOpenShiftRegistry() {
+    String registry = ''
+    withCredentials([string(credentialsId: 'OPENSHIFT_REGISTRY', variable: 'OPENSHIFT_REGISTRY')]) {
+        registry = env.OPENSHIFT_REGISTRY
+    }
+    return registry
+}
+
 void setDeployPropertyIfNeeded(String key, def value) {
     if (value) {
         deployProperties[key] = value
@@ -414,11 +422,7 @@ String[] getImages() {
     if (env.IMAGES_LIST) {
         return env.IMAGES_LIST.split(',')
     }
-    return runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
-}
-
-void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(returnStdout: stdout, script: cmd)
+    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
 }
 
 String getQuarkusPlatformVersion() {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 9bf8b4994d5..41c877c7cfd 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -13,6 +13,7 @@ pipeline {
 
     options {
         timeout(time: 120, unit: 'MINUTES')
+        skipDefaultCheckout()
     }
 
     environment {
@@ -83,8 +84,8 @@ pipeline {
                         // Merge PR
                         String prLink = getDeployProperty("${getRepoName()}.pr.link")
                         if (prLink) {
-                            githubscm.mergePR(prLink, getGitAuthorCredsID())
-                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
+                            githubscm.mergePR(prLink, getGitAuthorPushCredsId())
+                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorPushCredsId())
                         }
                     }
                 }
@@ -95,11 +96,11 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        if (githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsID())) {
-                            githubscm.deleteReleaseAndTag(getGitTag(), getGitAuthorCredsID())
+                        if (githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsId())) {
+                            githubscm.deleteReleaseAndTag(getGitTag(), getGitAuthorPushCredsId())
                         }
-                        githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTagFromVersion(getGitTag()), getGitAuthorCredsID())
-                        githubscm.updateReleaseBody(getGitTag(), getGitAuthorCredsID())
+                        githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTagFromVersion(getGitTag()), getGitAuthorPushCredsId())
+                        githubscm.updateReleaseBody(getGitTag(), getGitAuthorPushCredsId())
                     }
                 }
             }
@@ -135,7 +136,7 @@ String getNotificationSubject() {
 
 void checkoutRepo() {
     deleteDir()
-    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false))
+    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsId()))
     // need to manually checkout branch since on a detached branch after checkout command
     sh "git checkout ${getBuildBranch()}"
 }
@@ -278,8 +279,12 @@ String getGitAuthor() {
     return env.GIT_AUTHOR
 }
 
-String getGitAuthorCredsID() {
-    return env.AUTHOR_CREDS_ID
+String getGitAuthorCredsId() {
+    return env.GIT_AUTHOR_CREDS_ID
+}
+
+String getGitAuthorPushCredsId() {
+    return env.GIT_AUTHOR_PUSH_CREDS_ID
 }
 
 boolean isQuayRegistry(String registry) {
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 182689cb056..ea5a9cce4a7 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -35,7 +35,7 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getKogitoVersion()} --confirm"
+                        versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getKogitoVersion()} --confirm"
                         versionCmd += " --examples-ref nightly-${getBuildBranch()}"
                         if (getKogitoArtifactsVersion()) {
                             versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
@@ -87,7 +87,7 @@ pipeline {
                     dir(getRepoName()) {
                         if (githubscm.isThereAnyChanges()) {
                             githubscm.commitChanges("[${getBuildBranch()}] Update version to ${getKogitoVersion()}")
-                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorCredsID())
+                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorPushCredsId())
                         } else {
                             println '[WARN] no changes to commit'
                         }
@@ -117,7 +117,7 @@ void sendUnsuccessfulNotification() {
 void checkoutRepo(String repository, String branch) {
     dir(repository) {
         deleteDir()
-        checkout(githubscm.resolveRepository(repository, getGitAuthor(), branch, false))
+        checkout(githubscm.resolveRepository(repository, getGitAuthor(), branch, false, getGitAuthorCredsId()))
         sh "git checkout ${branch}"
     }
 }
@@ -138,8 +138,12 @@ String getGitAuthor() {
     return "${GIT_AUTHOR}"
 }
 
-String getGitAuthorCredsID() {
-    return "${AUTHOR_CREDS_ID}"
+String getGitAuthorCredsId() {
+    return "${GIT_AUTHOR_CREDS_ID}"
+}
+
+String getGitAuthorPushCredsId() {
+    return "${GIT_AUTHOR_PUSH_CREDS_ID}"
 }
 
 String getKogitoVersion() {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index fb18ed05fc4..8a100ec5f9b 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -17,7 +17,7 @@ import org.kie.jenkins.jobdsl.Utils
 jenkins_path = '.ci/jenkins'
 
 // PR checks
-Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile")
+setupPrJob()
 
 // Init branch
 createSetupBranchJob()
@@ -39,23 +39,10 @@ setupQuarkusUpdateJob()
 
 void setupPrJob() {
     setupBuildImageJob(JobType.PULL_REQUEST)
+    setupBuildAndTestJob(JobType.PULL_REQUEST)
 
-    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.PULL_REQUEST, "${jenkins_path}/Jenkinsfile", "Kogito Images PR check")
-    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
-    jobParams.pr.putAll([
-        run_only_for_branches: [ "${GIT_BRANCH}" ],
-        disable_status_message_error: true,
-        disable_status_message_failure: true,
-        commitContext: 'Retrieve and Launch Image Checks',
-        contextShowtestResults: false,
-    ])
-    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
-        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
-    }
-    jobParams.env.putAll([
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-    ])
-    KogitoJobTemplate.createPRJob(this, jobParams)
+    // Branch Source Plugin multibranchPipelineJob
+    Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile", JobType.PULL_REQUEST.getName())
 }
 
 void createSetupBranchJob() {
@@ -66,7 +53,8 @@ void createSetupBranchJob() {
 
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
 
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
 
         IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}"
     ])
@@ -98,8 +86,8 @@ void setupDeployJob(JobType jobType) {
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
 
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
 
         MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
         DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
@@ -155,8 +143,8 @@ void setupBuildImageJob(JobType jobType) {
         MAX_REGISTRY_RETRIES: 3,
         TARGET_AUTHOR: Utils.getGitAuthor(this), // In case of a PR to merge with target branch
 
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        AUTHOR_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         logRotator {
@@ -195,6 +183,61 @@ void setupBuildImageJob(JobType jobType) {
     }
 }
 
+void setupBuildAndTestJob(JobType jobType) {
+    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.build-and-test', jobType, "${jenkins_path}/Jenkinsfile.build-and-test", 'Kogito Images Build And test images')
+    // Use jenkinsfile from the build branch
+    jobParams.git.author = '${SOURCE_AUTHOR}'
+    jobParams.git.repository = '${SOURCE_REPOSITORY}'
+    jobParams.git.branch = '${SOURCE_BRANCH}'
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
+    jobParams.env.putAll([
+        MAX_REGISTRY_RETRIES: 3,
+        TARGET_AUTHOR: Utils.getGitAuthor(this), // In case of a PR to merge with target branch
+
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+    ])
+    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
+        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
+    }
+    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
+        logRotator {
+            daysToKeep(10)
+        }
+        parameters {
+            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
+
+            stringParam('SOURCE_AUTHOR', Utils.getGitAuthor(this), 'Build author')
+            stringParam('SOURCE_REPOSITORY', Utils.getRepoName(this), 'Build repository name')
+            stringParam('SOURCE_BRANCH', Utils.getGitBranch(this), 'Build branch name')
+            stringParam('TARGET_BRANCH', '', '(Optional) In case of a PR to merge with target branch, please provide the target branch')
+            stringParam('CHANGE_ID', '', 'CHANGE_ID coming from Branch Source Plugin')
+            stringParam('CHANGE_URL', '', 'CHANGE_URL coming from Branch Source Plugin')
+
+            // Build information
+            stringParam('MAVEN_ARTIFACTS_REPOSITORY', "${MAVEN_ARTIFACTS_REPOSITORY}")
+            stringParam('BUILD_KOGITO_APPS_URI', '', '(Optional) Git uri to the kogito-apps repository to use for tests.')
+            stringParam('BUILD_KOGITO_APPS_REF', '', '(Optional) Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
+            stringParam('QUARKUS_PLATFORM_URL', Utils.getMavenQuarkusPlatformRepositoryUrl(this), 'URL to the Quarkus platform to use. The version to use will be guessed from artifacts.')
+
+            // Test information
+            booleanParam('SKIP_TESTS', false, 'Skip tests')
+            stringParam('TESTS_KOGITO_EXAMPLES_URI', '', '(Optional) Git uri to the kogito-examples repository to use for tests.')
+            stringParam('TESTS_KOGITO_EXAMPLES_REF', '', '(Optional) Git reference (branch/tag) to the kogito-examples repository to use for tests.')
+
+            // Deploy information
+            booleanParam('DEPLOY_IMAGE', false, 'Should we deploy image to given deploy registry ?')
+            booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('DEPLOY_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('DEPLOY_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
+            stringParam('DEPLOY_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
+            stringParam('DEPLOY_IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
+            stringParam('DEPLOY_IMAGE_TAG', '', 'Image tag to use to deploy images')
+            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
+        }
+    }
+}
+
 void setupPromoteJob(JobType jobType) {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-promote', jobType, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote')
     JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
@@ -207,8 +250,8 @@ void setupPromoteJob(JobType jobType) {
 
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
 
-        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
 
         DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
         MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
@@ -256,6 +299,6 @@ void setupPromoteJob(JobType jobType) {
 
 void setupQuarkusUpdateJob() {
     KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
-        "source ~/virtenvs/cekit/bin/activate && python3 scripts/update-repository.py --quarkus-platform-version %new_version%"
+        "python scripts/update-repository.py --quarkus-platform-version %new_version%"
     ])
 }
diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index 324a2deb101..d9bb4083b45 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: DSL tests
-      uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main
+      uses: apache/incubator-kie-kogito-pipelines/.ci/actions/dsl-tests@main
       with:
         main-config-file-repo: apache/incubator-kie-kogito-pipelines
         main-config-file-path: .ci/jenkins/config/main.yaml
diff --git a/.github/workflows/pr-backporting.yml b/.github/workflows/pr-backporting.yml
index ae52e051d97..e700524572f 100644
--- a/.github/workflows/pr-backporting.yml
+++ b/.github/workflows/pr-backporting.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Set target branches
         id: set-targets
-        uses: kiegroup/kie-ci/.ci/actions/parse-labels@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/parse-labels@main
         with:
           labels: ${LABELS}
   
@@ -34,7 +34,7 @@ jobs:
       REVIEWERS: ${{ toJSON(github.event.pull_request.requested_reviewers) }}
     steps:
       - name: Backporting
-        uses: kiegroup/kie-ci/.ci/actions/backporting@main
+        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/backporting@main
         with:
           target-branch: ${{ matrix.target-branch }}
           additional-reviewers: ${REVIEWERS}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 4e2b4657005..852d729af4b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-IMAGE_VERSION := $(shell python3 scripts/retrieve_version.py)
+IMAGE_VERSION := $(shell python scripts/retrieve_version.py)
 SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
 KOGITO_APPS_TARGET_BRANCH ?= main
-KOGITO_APPS_TARGET_URI ?= https://github.com/kiegroup/kogito-apps.git
+KOGITO_APPS_TARGET_URI ?= https://github.com/apache/incubator-kie-kogito-apps.git
 BUILD_ENGINE ?= docker
 BUILD_ENGINE_TLS_OPTIONS ?= ''
 .DEFAULT_GOAL := build
@@ -12,14 +12,14 @@ clone-repos:
 # if the ignore_test env is not defined or false, proceed with the tests, as first step prepare the examples to be used
 ifneq ($(ignore_test),true)
 ifneq ($(ignore_test_prepare),true)
-	cd tests/test-apps && export CONTAINER_ENGINE=$(BUILD_ENGINE) && sh clone-repo.sh $(NATIVE) $(image_name)
+	cd tests/test-apps && export CONTAINER_ENGINE=$(BUILD_ENGINE) && bash clone-repo.sh $(NATIVE) $(image_name)
 	cd ../..
 endif
 endif
 
 .PHONY: list
 list:
-	@python3 scripts/list-images.py $(arg)
+	@python scripts/list-images.py $(arg)
 
 .PHONY: display-image-version
 display-image-version:
@@ -99,7 +99,7 @@ endif
 .PHONY: push-staging
 push-staging: build _push-staging
 _push-staging:
-	python3 scripts/push-staging.py ${override}
+	python scripts/push-staging.py ${override}
 
 
 # push to local registry, useful to push the built images to local registry
diff --git a/README.md b/README.md
index f7c8b91c7d0..f61da8c41ab 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,11 @@ Kogito
 
 <p align="center"><img width=55% height=55% src="docsimg/kogito.png"></p>
 
-[![GitHub Stars](https://img.shields.io/github/stars/kiegroup/kogito-images.svg)](https://github.com/kiegroup/kogito-images/stargazers)
-[![GitHub Forks](https://img.shields.io/github/forks/kiegroup/kogito-images.svg)](https://github.com/kiegroup/kogito-images/network/members)
-[![Pull Requests](https://img.shields.io/github/issues-pr/kiegroup/kogito-images.svg?style=flat-square)](https://github.com/kiegroup/kogito-images/pulls)
-[![Contributors](https://img.shields.io/github/contributors/kiegroup/kogito-images.svg?style=flat-square)](https://github.com/kiegroup/kogito-images/graphs/contributors)
-[![License](https://img.shields.io/github/license/kiegroup/kogito-images.svg)](https://github.com/kiegroup/kogito-images/blob/main/LICENSE)
+[![GitHub Stars](https://img.shields.io/github/stars/apache/incubator-kie-kogito-images.svg)](https://github.com/apache/incubator-kie-kogito-images/stargazers)
+[![GitHub Forks](https://img.shields.io/github/forks/apache/incubator-kie-kogito-images.svg)](https://github.com/apache/incubator-kie-kogito-images/network/members)
+[![Pull Requests](https://img.shields.io/github/issues-pr/apache/incubator-kie-kogito-images.svg?style=flat-square)](https://github.com/apache/incubator-kie-kogito-images/pulls)
+[![Contributors](https://img.shields.io/github/contributors/apache/incubator-kie-kogito-images.svg?style=flat-square)](https://github.com/apache/incubator-kie-kogito-images/graphs/contributors)
+[![License](https://img.shields.io/github/license/apache/incubator-kie-kogito-images.svg)](https://github.com/apache/incubator-kie-kogito-images/blob/main/LICENSE)
 [![Twitter Follow](https://img.shields.io/twitter/follow/kogito_kie.svg?label=Follow&style=social)](https://twitter.com/kogito_kie?lang=en)
 
 
@@ -231,12 +231,12 @@ See the next topic for an example.
 #### Kogito s2i Builder Image example
 
 ##### S2i Builder Image Example with Quarkus
-In this example, let's use a simple application based on Quarkus that is available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
+In this example, let's use a simple application based on Quarkus that is available in the [Kogito Examples](https://github.com/apache/incubator-kie-kogito-examples)
 repository: the *rules-quarkus-helloworld* example, with native compilation disabled.
 
 
 ```bash
-$ s2i build https://github.com/kiegroup/kogito-examples.git \
+$ s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus \
     --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
@@ -279,11 +279,11 @@ $ curl -H "Content-Type: application/json" -X POST -d '{"strings":["hello"]}' ht
 
 
 ##### S2i Builder Image Example with Springboot
-In this example, let's use a simple application based on Spring Boot that is available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples)
+In this example, let's use a simple application based on Spring Boot that is available in the [Kogito Examples](https://github.com/apache/incubator-kie-kogito-examples)
 repository: the *process-springboot-example*.
 
 ```bash
-$ s2i build https://github.com/kiegroup/kogito-examples.git \
+$ s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
     --ref main \
     --context-dir kogito-springboot-examples/process-springboot-example \
     -e RUNTIME_TYPE=springboot \
@@ -320,7 +320,7 @@ Let's start 2 builds with the incremental option enabled and compare the time sp
 
 ```bash
 # First incremental build
-$ time s2i build https://github.com/kiegroup/kogito-examples.git \
+$ time s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus
     --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
@@ -338,7 +338,7 @@ And now, let's run it again.
 
 ```bash
 # Second incremental build
-$ time s2i build https://github.com/kiegroup/kogito-examples.git \
+$ time s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus
     --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
@@ -366,7 +366,7 @@ To make it possible we just need to set the **MAVEN_MIRROR_URL** environment var
 
 ```bash
 # Third incremental build, with Maven mirror option
-$ time s2i build https://github.com/kiegroup/kogito-examples.git \
+$ time s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
     --ref main \
     -e RUNTIME_TYPE=quarkus
     --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
@@ -435,8 +435,8 @@ If you don't have an already existing project, the best way to create a new one
 to generate project structure. 
 The available archetypes are:
 
-- [Kogito Quarkus Archetype](https://github.com/kiegroup/kogito-runtimes/tree/main/archetypes/kogito-quarkus-archetype)
-- [Kogito Spring Boot Archetype](https://github.com/kiegroup/kogito-runtimes/tree/main/archetypes/kogito-springboot-archetype)
+- [Kogito Quarkus Archetype](https://github.com/apache/incubator-kie-kogito-runtimes/tree/main/archetypes/kogito-quarkus-archetype)
+- [Kogito Spring Boot Archetype](https://github.com/apache/incubator-kie-kogito-runtimes/tree/main/archetypes/kogito-springboot-archetype)
 
 Note that, when building Quarkus based application that is **not** an *UberJAR* we also need to copy the **lib** directory 
 located inside the *target* directory.  
@@ -476,7 +476,7 @@ docker run -it quay.io/kiegroup/kogito-runtime-jvm:latest /home/kogito/kogito-ap
 In the next few lines let's take a look on how this image can be used to receive an already built UberJAR. 
 To configure Quarkus to generate an UberJAR please follow the instructions described [here](https://quarkus.io/guides/maven-tooling#configuration-reference)
 
-For this example let's use the [process-quarkus-example](https://github.com/kiegroup/kogito-examples/tree/stable/kogito-quarkus-examples/process-quarkus-example).
+For this example let's use the [process-quarkus-example](https://github.com/apache/incubator-kie-kogito-examples/tree/stable/kogito-quarkus-examples/process-quarkus-example).
 Once you have checked out the example on your local machine follow the steps below:
 
 **Example with UberJAR**
@@ -681,7 +681,7 @@ $ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=m
 You should notice a few debug messages present in the system output.
 
 
-The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Data Index Service 
+The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Data Index Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
 ### Kogito Explainability Component Image
@@ -702,7 +702,7 @@ You should notice a few debug messages being printed in the system output.
 
 To know what configurations this image accepts please take a look [here](kogito-explainability-image.yaml) on the **envs** section.
 
-The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Explainability Service 
+The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Explainability Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
 
@@ -746,7 +746,7 @@ You should notice a few debug messages being printed in the system output.
 
 To know what configurations this image accepts please take a look [here](kogito-trusty-image.yaml) on the **envs** section.
 
-The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty Service 
+The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Trusty Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
 ### Kogito Jobs Service Component Images
@@ -754,7 +754,7 @@ to your Kogito infrastructure on a Kubernetes cluster and provide its capabiliti
 The Kogito Jobs Service is a dedicated lightweight service responsible for scheduling jobs that aim at firing at a given time. 
 It does not execute the job itself, but it triggers a callback that could be an HTTP request on a given endpoint specified 
 on the job request, or any other callback that could be supported by the service. 
-For more information please visit this [link](https://github.com/kiegroup/kogito-runtimes/wiki/Job-Service).
+For more information please visit this [link](https://github.com/apache/incubator-kie-kogito-runtimes/wiki/Job-Service).
 
 Today, the Jobs service contains four images:
 
@@ -820,7 +820,7 @@ podman-compose -f contrib/jobs-service/container-compose-<variant>.yaml up
 
 The above command will spinup the Jobs-service so you can connect your application.
 
-The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Jobs Service
+The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Jobs Service
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications
 
 
@@ -849,7 +849,7 @@ You should notice a few debug messages being printed in the system output.
 
 To know what configurations this image accepts please take a look [here](kogito-management-console-image.yaml) on the **envs** section.
 
-The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Management Console 
+The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Management Console 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
 ### Kogito Task Console Component Image
@@ -874,7 +874,7 @@ You should notice a few debug messages being printed in the system output.
 
 To know what configurations this image accepts please take a look [here](kogito-task-console-image.yaml) on the **envs** section.
 
-The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Task Console
+The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Task Console
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
 ### Kogito Trusty UI Component Image
@@ -899,12 +899,12 @@ You should notice a few debug messages being printed in the system output.
 
 To know what configurations this image accepts please take a look [here](kogito-trusty-ui-image.yaml) on the **envs** section.
 
-The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty UI 
+The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Trusty UI 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
 ### Kogito JIT Runner Component Image
 
-The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/kiegroup/kogito-apps/tree/main/jitexecutor).
+The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/apache/incubator-kie-kogito-apps/tree/main/jitexecutor).
 
 Basic usage:
 
@@ -930,10 +930,10 @@ Once the images are built and imported into a registry (quay.io or any other reg
 
 As a first step, we need to make the Kogito Images available as Image Streams in OpenShift. If you have `cluster-admin` 
 rights you can deploy it into the **openshift** namespace, otherwise, deploy it into the namespace where you have permissions. 
-To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/kiegroup/kogito-images/main/kogito-imagestream.yaml).
+To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/apache/incubator-kie-kogito-images/main/kogito-imagestream.yaml).
 It points to the latest released version.
 
-Let's use the *kogito-quarkus-examples/rules-quarkus-helloworld* from [Kogito Examples](https://github.com/kiegroup/kogito-examples).
+Let's use the *kogito-quarkus-examples/rules-quarkus-helloworld* from [Kogito Examples](https://github.com/apache/incubator-kie-kogito-examples).
 
 ```bash
 # creating a new namespace
@@ -947,7 +947,7 @@ You can add applications to this project with the 'new-app' command. For example
 to build a new example application in Ruby.
 
 # installing the imagestream on the current namespace
-$ oc create -f https://raw.githubusercontent.com/kiegroup/kogito-images/0.16.0/kogito-imagestream.yaml
+$ oc create -f https://raw.githubusercontent.com/apache/incubator-kie-kogito-images/0.16.0/kogito-imagestream.yaml
 imagestream.image.openshift.io/kogito-runtime-native created
 imagestream.image.openshift.io/kogito-runtime-jvm created
 imagestream.image.openshift.io/kogito-s2i-builder created
@@ -967,7 +967,7 @@ imagestream.image.openshift.io/kogito-management-console created
 
 # performing a new build
 $ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-s2i-builder:latest \ 
-    https://github.com/kiegroup/kogito-examples.git#main --context-dir=kogito-quarkus-examples/rules-quarkus-helloworld \
+    https://github.com/apache/incubator-kie-kogito-examples.git#main --context-dir=kogito-quarkus-examples/rules-quarkus-helloworld \
     --strategy=source --env NATIVE=false 
 --> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-s2i-builder" under tag "latest" for "kogito-s2i-builder:latest"
 
@@ -978,7 +978,7 @@ $ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-s2i
     Tags: builder, kogito, quarkus
 
     * The source repository appears to match: jee
-    * A source build using source code from https://github.com/kiegroup/kogito-examples.git#main will be created
+    * A source build using source code from https://github.com/apache/incubator-kie-kogito-examples.git#main will be created
       * The resulting image will be pushed to image stream tag "rules-quarkus-helloworld-builder:latest"
       * Use 'start-build' to trigger a new build
 
@@ -1077,7 +1077,7 @@ As output, you should see the following response:
 ```
 
 
-For more complex deployment, please use the [Kogito Cloud Operator](https://github.com/kiegroup/kogito-cloud-operator)
+For more complex deployment, please use the [Kogito Cloud Operator](https://github.com/apache/incubator-kie-kogito-operator)
 
 
 
diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index a477a712561..88be045bc2e 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -17,7 +17,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Platform for building Kogito based on JDK and Maven"
   - name: "io.k8s.display-name"
diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index ca4d1a1bcd7..00e9f7233d3 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
   - name: "io.k8s.display-name"
diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml
index c0416aee7ab..e8ebd3122cf 100644
--- a/kogito-data-index-infinispan-image.yaml
+++ b/kogito-data-index-infinispan-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
   - name: "io.k8s.display-name"
diff --git a/kogito-data-index-mongodb-image.yaml b/kogito-data-index-mongodb-image.yaml
index fd091fc52a0..ff9d55d61cd 100644
--- a/kogito-data-index-mongodb-image.yaml
+++ b/kogito-data-index-mongodb-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
   - name: "io.k8s.display-name"
diff --git a/kogito-data-index-oracle-image.yaml b/kogito-data-index-oracle-image.yaml
index f4f544ae395..af4c192de7e 100644
--- a/kogito-data-index-oracle-image.yaml
+++ b/kogito-data-index-oracle-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
   - name: "io.k8s.display-name"
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index 56ecf30fbd1..e7ba4fb41eb 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -10,7 +10,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
   - name: "io.k8s.display-name"
diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml
index dab26f90266..059c6685d87 100644
--- a/kogito-explainability-image.yaml
+++ b/kogito-explainability-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Explainability Service"
   - name: "io.k8s.display-name"
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 841a310395c..423ac0ff446 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito JIT Runner"
   - name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index a83a110a8f9..60c360fb112 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Jobs Service with all available jdbc providers"
   - name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index 497d8ef75ab..5975572e622 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito in memory Jobs Service"
   - name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml
index a772a679883..5ab15692a14 100644
--- a/kogito-jobs-service-infinispan-image.yaml
+++ b/kogito-jobs-service-infinispan-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Jobs Service based on Infinispan"
   - name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-mongodb-image.yaml b/kogito-jobs-service-mongodb-image.yaml
index 40577f658fe..d83a458412d 100644
--- a/kogito-jobs-service-mongodb-image.yaml
+++ b/kogito-jobs-service-mongodb-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Jobs Service based on MongoDB"
   - name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index 98e2608b499..56ea62d81e7 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Jobs Service based on Postgresql"
   - name: "io.k8s.display-name"
diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml
index f604fdfaa75..3a4de549f68 100644
--- a/kogito-management-console-image.yaml
+++ b/kogito-management-console-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Management Console, manage your Business Process easily."
   - name: "io.k8s.display-name"
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
index 245c42dbb83..8871487f1c4 100644
--- a/kogito-runtime-jvm-image.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -17,7 +17,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
   - name: "io.k8s.display-name"
diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml
index 56412886d6f..62139b82f03 100644
--- a/kogito-runtime-native-image.yaml
+++ b/kogito-runtime-native-image.yaml
@@ -17,7 +17,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito based on Quarkus native image"
   - name: "io.k8s.display-name"
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
index a947f4f713c..7c4b288ad6a 100644
--- a/kogito-s2i-builder-image.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -17,7 +17,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Platform for building Kogito based on Quarkus or Spring Boot"
   - name: "io.k8s.display-name"
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index ee6b1d68b9b..421d04480fb 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -37,7 +37,7 @@
       - name: "org.kie.kogito.version"
         value: "2.0.0-SNAPSHOT"
       - name: "maintainer"
-        value: "kogito <bsig-cloud@redhat.com>"
+        value: "Apache KIE <dev@kie.apache.org>"
       - name: "io.k8s.description"
         value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled."
       - name: "io.k8s.display-name"
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 7c647a7153a..2503a869925 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -33,7 +33,7 @@
       - name: "org.kie.kogito.version"
         value: "2.0.0-SNAPSHOT"
       - name: "maintainer"
-        value: "kogito <bsig-cloud@redhat.com>"
+        value: "Apache KIE <dev@kie.apache.org>"
       - name: "io.k8s.description"
         value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled."
       - name: "io.k8s.display-name"
diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
index 18ca8eaba93..d4a0d1a0b5b 100644
--- a/kogito-task-console-image.yaml
+++ b/kogito-task-console-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Task Console, manage your Business Process easily."
   - name: "io.k8s.display-name"
diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml
index 5e4807d8530..0fcec594487 100644
--- a/kogito-trusty-infinispan-image.yaml
+++ b/kogito-trusty-infinispan-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
   - name: "io.k8s.display-name"
diff --git a/kogito-trusty-postgresql-image.yaml b/kogito-trusty-postgresql-image.yaml
index d0e142566f7..6f8848df6fb 100644
--- a/kogito-trusty-postgresql-image.yaml
+++ b/kogito-trusty-postgresql-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
   - name: "io.k8s.display-name"
diff --git a/kogito-trusty-redis-image.yaml b/kogito-trusty-redis-image.yaml
index 0964ab65963..eb5bfc69b5b 100644
--- a/kogito-trusty-redis-image.yaml
+++ b/kogito-trusty-redis-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Trusty Service for Redis persistence provider"
   - name: "io.k8s.display-name"
diff --git a/kogito-trusty-ui-image.yaml b/kogito-trusty-ui-image.yaml
index b5d414945a5..0386231f575 100644
--- a/kogito-trusty-ui-image.yaml
+++ b/kogito-trusty-ui-image.yaml
@@ -9,7 +9,7 @@ labels:
   - name: "org.kie.kogito.version"
     value: "2.0.0-SNAPSHOT"
   - name: "maintainer"
-    value: "kogito <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Runtime image for Kogito Trusty UI, manage your Business Process easily."
   - name: "io.k8s.display-name"
diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
index 0d89e1d8702..9e7bf634c1b 100644
--- a/logic-data-index-ephemeral-rhel8-image.yaml
+++ b/logic-data-index-ephemeral-rhel8-image.yaml
@@ -9,7 +9,7 @@ labels:
 - name: "com.redhat.component"
   value: "openshift-serverless-1-logic-data-index-ephemeral-rhel8-container"
 - name: "maintainer"
-  value: "serverless-logic <bsig-cloud@redhat.com>"
+  value: "Apache KIE <dev@kie.apache.org>"
 - name: "io.k8s.description"
   value: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 - name: "io.k8s.display-name"
diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml
index 10100c29e69..ad674d6b37c 100644
--- a/logic-swf-builder-rhel8-image.yaml
+++ b/logic-swf-builder-rhel8-image.yaml
@@ -16,7 +16,7 @@ labels:
   - name: "com.redhat.component"
     value: "openshift-serverless-1-logic-swf-builder-rhel8-container"
   - name: "maintainer"
-    value: "serverless-logic <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
     value: "Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled"
   - name: "io.k8s.display-name"
diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml
index c240e71eb50..88e6e4e942e 100644
--- a/logic-swf-devmode-rhel8-image.yaml
+++ b/logic-swf-devmode-rhel8-image.yaml
@@ -20,7 +20,7 @@ labels:
   - name: "com.redhat.component"
     value: "openshift-serverless-1-logic-swf-devmode-rhel8-container"
   - name: "maintainer"
-    value: "serverless-logic <bsig-cloud@redhat.com>"
+    value: "Apache KIE <dev@kie.apache.org>"
 
 modules:
   repositories:
diff --git a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
index 84997daec4e..4fbf01faeb8 100644
--- a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
@@ -126,9 +126,9 @@ function ignore_maven_self_signed_certificates() {
 }
 
 function set_kogito_maven_repo() {
-    local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
+    local kogito_maven_repo_url="${DEFAULT_MAVEN_REPO_URL}"
     if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i.bak "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
+        sed -i.bak "s|https://repository.apache.org/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
diff --git a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
index 826461aa861..bf67912d23e 100644
--- a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
+++ b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
@@ -18,9 +18,9 @@
       <id>kogito-images</id>
       <repositories>
         <repository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <id>apache-public-repository-group</id>
+          <name>Apache Public Repository Group</name>
+          <url>https://repository.apache.org/content/groups/public/</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -36,9 +36,9 @@
 
       <pluginRepositories>
         <pluginRepository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <id>apache-public-repository-group</id>
+          <name>Apache Public Repository Group</name>
+          <url>https://repository.apache.org/content/groups/public/</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
index 843bc5c6543..4794794193a 100644
--- a/modules/kogito-maven/3.8.x-rpm/module.yaml
+++ b/modules/kogito-maven/3.8.x-rpm/module.yaml
@@ -32,9 +32,9 @@ envs:
   - name: "MAVEN_DOWNLOAD_OUTPUT"
     description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
     example: "true"
-  - name: "JBOSS_MAVEN_REPO_URL"
-    value: "https://repository.jboss.org/nexus/content/groups/public/"
-    description: "Defines the Jboss Maven repository for Kogito artifacts."
+  - name: "DEFAULT_MAVEN_REPO_URL"
+    value: "https://repository.apache.org/content/groups/public/"
+    description: "Defines the Default Maven repository for Kogito artifacts."
   - name: "MAVEN_REPO_URL"
     description: "Defines an extra Maven repository."
     example: "https://nexus.test.com/group/public"
diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/3.8.x/added/configure-maven.sh
index f53617daf00..0027aa01f83 100644
--- a/modules/kogito-maven/3.8.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x/added/configure-maven.sh
@@ -126,9 +126,9 @@ function ignore_maven_self_signed_certificates() {
 }
 
 function set_kogito_maven_repo() {
-    local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
+    local kogito_maven_repo_url="${DEFAULT_MAVEN_REPO_URL}"
     if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i.bak "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
+        sed -i.bak "s|https://repository.apache.org/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
     fi
 }
 
diff --git a/modules/kogito-maven/3.8.x/maven/settings.xml b/modules/kogito-maven/3.8.x/maven/settings.xml
index 5fe723c3e7e..233a6a6b76f 100644
--- a/modules/kogito-maven/3.8.x/maven/settings.xml
+++ b/modules/kogito-maven/3.8.x/maven/settings.xml
@@ -18,9 +18,9 @@
       <id>kogito-images</id>
       <repositories>
         <repository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <id>apache-public-repository-group</id>
+          <name>Apache Public Repository Group</name>
+          <url>https://repository.apache.org/content/groups/public/</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -36,9 +36,9 @@
 
       <pluginRepositories>
         <pluginRepository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <id>apache-public-repository-group</id>
+          <name>Apache Public Repository Group</name>
+          <url>https://repository.apache.org/content/groups/public/</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 0e19e6d46b1..147d1b6522f 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -32,9 +32,9 @@ envs:
   - name: "MAVEN_DOWNLOAD_OUTPUT"
     description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
     example: "true"
-  - name: "JBOSS_MAVEN_REPO_URL"
-    value: "https://repository.jboss.org/nexus/content/groups/public/"
-    description: "Defines the Jboss Maven repository for Kogito artifacts."
+  - name: "DEFAULT_MAVEN_REPO_URL"
+    value: "https://repository.apache.org/content/groups/public/"
+    description: "Defines the default Maven repository for Kogito artifacts."
   - name: "MAVEN_REPO_URL"
     description: "Defines an extra Maven repository."
     example: "https://nexus.test.com/group/public"
diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
old mode 100755
new mode 100644
diff --git a/scripts/README.md b/scripts/README.md
index b11e68cfb7e..6b13cceba4d 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -50,13 +50,13 @@ Utilitary script used to retrieve all images that can be built on this repo, the
 the community image list:
 
 ```bash
-$ python3 list-images.py
+$ python list-images.py
 ```
 
 And the product image list by using the `--prod` flag:
 
 ```bash
-$ python3 list-images.py --prod
+$ python list-images.py --prod
 ```
 
 
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index d9353944be8..9c77acbe77d 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -2,18 +2,19 @@
 # Parameters:
 #   1 - image name - can't  be empty.
 #   2 - git target branch - defaults to main
-#   3 - git target uri - defaults to https://github.com/kiegroup/kogito-apps.git
+#   3 - git target uri - defaults to https://github.com/apache/incubator-kie-kogito-apps.git
 
 # fast fail
 set -e
 set -o pipefail
 
-KOGITO_APPS_REPO_NAME="kogito-apps"
+KOGITO_APPS_REPO_NAME="incubator-kie-kogito-apps"
+KOGITO_APPS_FOLDER_NAME="kogito-apps"
 
 # Read entries before sourcing
 imageName="${1}"
 gitBranch="${2:-main}"
-gitUri="${3:-https://github.com/kiegroup/kogito-apps.git}"
+gitUri="${3:-https://github.com/apache/${KOGITO_APPS_REPO_NAME}.git}"
 contextDir=""
 shift $#
 
@@ -24,7 +25,7 @@ APPS_MAVEN_OPTIONS="-Dquarkus.package.type=fast-jar -Dquarkus.build.image=false"
 # used for all-in-one image
 extended_context=""
 
-# Fix taken from https://github.com/kiegroup/kogito-apps/pull/1762
+# Fix taken from https://github.com/apache/incubator-kie-kogito-apps/pull/1762
 if [ ! -z "${CYPRESS_BINARY_URL}" ]; then
     export CYPRESS_INSTALL_BINARY="${CYPRESS_BINARY_URL}/cypress-9.7.0.zip"
     echo "Setting 'CYPRESS_INSTALL_BINARY' variable to ${CYPRESS_INSTALL_BINARY}"
@@ -115,12 +116,13 @@ for ctx in ${contextDir}; do
     cd ${build_target_dir}
     echo "Using branch/tag ${gitBranch}, checking out. Temporary build dir is ${build_target_dir} and target dist is ${target_tmp_dir}"
 
-    if [ ! -d "${build_target_dir}/${KOGITO_APPS_REPO_NAME}" ]; then
-        git_command="git clone --single-branch --branch ${gitBranch} --depth 1 ${gitUri}"
+    KOGITO_APPS_DIR=${build_target_dir}/${KOGITO_APPS_FOLDER_NAME}
+    if [ ! -d "${KOGITO_APPS_DIR}" ]; then
+        git_command="git clone --single-branch --branch ${gitBranch} --depth 1 ${gitUri} ${KOGITO_APPS_DIR}"
         echo "cloning ${KOGITO_APPS_REPO_NAME} with the following git command: ${git_command}"
         eval ${git_command}
     fi
-    cd ${KOGITO_APPS_REPO_NAME} && echo "working dir `pwd`"
+    cd ${KOGITO_APPS_DIR} && echo "working dir `pwd`"
     echo "Got MAVEN_OPTIONS = ${MAVEN_OPTIONS}"
     mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS} -Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false"
     echo "Building component(s) ${contextDir} with the following maven command [${mvn_command}]"
diff --git a/scripts/common.py b/scripts/common.py
index 40b8c777733..f1d669b1622 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
 # This script defines some common function that are used by manage-kogito-version.py and push-staging.py script
 
 
@@ -319,7 +319,7 @@ def update_examples_uri_in_behave_tests(examples_uri):
     """
     print("Set examples_uri {} in behave tests".format(examples_uri))
     # pattern to get the default examples uri
-    pattern = re.compile(r'(https://github.com/kiegroup/kogito-examples.git)')
+    pattern = re.compile(r'(https://github.com/apache/incubator-kie-kogito-examples.git)')
     replacement = examples_uri
     update_in_behave_tests(pattern, replacement)
 
@@ -361,17 +361,17 @@ def update_runtime_image_in_behave_tests(runtime_image_name, image_suffix):
     update_in_behave_tests(pattern, replacement)
 
 
-def update_maven_repo_in_behave_tests(repo_url, replace_jboss_repository):
+def update_maven_repo_in_behave_tests(repo_url, replace_default_repository):
     """
     Update maven repository into behave tests
     :param repo_url: Maven repository url
-    :param replace_jboss_repository: Set to true if default Jboss repository needs to be overriden
+    :param replace_default_repository: Set to true if default repository needs to be overriden
     """
     print("Set maven repo {} in behave tests".format(repo_url))
     pattern = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
     env_var_key = "MAVEN_REPO_URL"
-    if replace_jboss_repository:
-        env_var_key = "JBOSS_MAVEN_REPO_URL"
+    if replace_default_repository:
+        env_var_key = "DEFAULT_MAVEN_REPO_URL"
     replacement = "| variable | value |\n      | {} | {} |".format(env_var_key,
                                                                                                            repo_url)
     update_in_behave_tests(pattern, replacement)
@@ -396,16 +396,16 @@ def update_maven_mirror_url_in_quarkus_plugin_behave_tests(mirror_url):
         "MAVEN_MIRROR_URL", mirror_url)
     update_in_behave_tests(pattern, replacement)
 
-def update_maven_repo_env_value(repo_url, replace_jboss_repository, prod=False):
+def update_maven_repo_env_value(repo_url, replace_default_repository, prod=False):
     """
     Update the given maven repository value for all images/modules.
     :param repo_url: Maven repository url
-    :param replace_jboss_repository: Set to true if default Jboss repository needs to be ove
+    :param replace_default_repository: Set to true if default repository needs to be overidden
     :param prod: if the module to be updated is prod version.
     """
     env_name = "MAVEN_REPO_URL"
-    if replace_jboss_repository:
-        env_name = "JBOSS_MAVEN_REPO_URL"
+    if replace_default_repository:
+        env_name = "DEFAULT_MAVEN_REPO_URL"
     update_env_value(env_name, repo_url, prod)
 
 
@@ -453,29 +453,29 @@ def update_examples_uri_in_clone_repo(examples_uri):
     replacement = "git clone {}".format(examples_uri)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
-def update_maven_repo_in_build_config(repo_url, replace_jboss_repository):
+def update_maven_repo_in_build_config(repo_url, replace_default_repository):
     """
     Update maven repository in build config modules
     :param repo_url: Maven repository url
-    :param replace_jboss_repository: Set to true if default Jboss repository needs to be overridden
+    :param replace_default_repository: Set to true if default repository needs to be overridden
     """
     maven_env_name = 'MAVEN_REPO_URL'
-    if replace_jboss_repository:
-        maven_env_name = 'JBOSS_MAVEN_REPO_URL'
+    if replace_default_repository:
+        maven_env_name = 'DEFAULT_MAVEN_REPO_URL'
     update_env_value_in_build_config_modules(maven_env_name, repo_url, True)
 
-def update_maven_repo_in_setup_maven(repo_url, replace_jboss_repository):
+def update_maven_repo_in_setup_maven(repo_url, replace_default_repository):
     """
     Update maven repository into setup-maven.sh script
     :param repo_url: Maven repository url
-    :param replace_jboss_repository: Set to true if default Jboss repository needs to be overridden
+    :param replace_default_repository: Set to true if default repository needs to be overridden
     """
     print("Set maven repo {} in setup-maven script".format(repo_url))
     pattern = ""
     replacement = ""
-    if replace_jboss_repository:
-        pattern = re.compile(r'(export JBOSS_MAVEN_REPO_URL=.*)')
-        replacement = 'export JBOSS_MAVEN_REPO_URL="{}"'.format(repo_url)
+    if replace_default_repository:
+        pattern = re.compile(r'(export DEFAULT_MAVEN_REPO_URL=.*)')
+        replacement = 'export DEFAULT_MAVEN_REPO_URL="{}"'.format(repo_url)
     else:
         pattern = re.compile(r'(# export MAVEN_REPO_URL=.*)')
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
diff --git a/scripts/list-images.py b/scripts/list-images.py
index 7cfa9edee7d..e982d164b22 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
 # Script responsible to update the tests with
 # Should be run from root directory of the repository
 
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index ec344bc81d6..346215fa4cd 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
 # This script will be responsible to help to manage kogito images and modules version, it will update all needed files
 # Example of usage:
 #   # move the current version to the next one or rcX
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index 157eb11ee7d..79d2ca89927 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -26,5 +26,5 @@ while read image; do
     ${BUILD_ENGINE} tag quay.io/kiegroup/${image}:${version} ${registry}/${namespace}/${image}:${version}
     echo "Deleting imagestream ${image} if exists `oc delete oc -n ${namespace} ${image}`"
     ${BUILD_ENGINE} push ${registry}/${namespace}/${image}:${version}
-done <<<$(python3 scripts/list-images.py)
+done <<<$(python scripts/list-images.py)
 
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 9a95c925f8f..5fde35932c7 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
 # This script will be responsible to fetch the latest rc tags from each image and define the next
 # rc tag to avoid images get overridden.
 #
diff --git a/scripts/retrieve_version.py b/scripts/retrieve_version.py
index 64e4274c023..b1b1c7a9867 100644
--- a/scripts/retrieve_version.py
+++ b/scripts/retrieve_version.py
@@ -1,7 +1,7 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
 #Script responsible to update the tests with 
 #Should be run from root directory of the repository
-#Sample usage:  python3 scripts/retrieve_version.py
+#Sample usage:  python scripts/retrieve_version.py
 
 import sys
 sys.dont_write_bytecode = True
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
index 99dd300b1a4..5ec16cfb9d9 100755
--- a/scripts/setup-maven.sh
+++ b/scripts/setup-maven.sh
@@ -21,7 +21,7 @@ echo "Updating settings file ${maven_settings_path}"
 
 # setup maven env
 # Do not remove below, this can be updated by the python scripts
-export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
+export DEFAULT_MAVEN_REPO_URL="https://repository.apache.org/content/groups/public/"
 # export MAVEN_REPO_URL=
 cp "${MVN_MODULE}"/maven/settings.xml "${maven_settings_path}"
 export MAVEN_SETTINGS_PATH="${maven_settings_path}"
diff --git a/scripts/update-repository.py b/scripts/update-repository.py
index 0c632d1ba0f..0ed9b8a2da0 100644
--- a/scripts/update-repository.py
+++ b/scripts/update-repository.py
@@ -1,7 +1,7 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
 #Script responsible to update the tests with 
 #Should be run from root directory of the repository
-#Sample usage:  python3 scripts/update-tests.py
+#Sample usage:  python scripts/update-tests.py
 
 import sys
 sys.dont_write_bytecode = True
@@ -14,8 +14,8 @@
     parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and '
                                                  'version.')
     parser.add_argument('--repo-url', dest='repo_url', help='Defines the url of the repository to setup into the tests')
-    parser.add_argument('--replace-jboss-repo', dest='replace_jboss_repo', default=False, action='store_true',
-                        help='Enable if repo-url should replace the main JBoss repository')
+    parser.add_argument('--replace-default-repo', dest='replace_default_repo', default=False, action='store_true',
+                        help='Enable if repo-url should replace the default repository')
     parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False,
                         action='store_true',
                         help='If set to true will relax the SSL for user-generated self-signed certificates')
@@ -41,11 +41,11 @@
     args = parser.parse_args()
 
     if args.repo_url:
-        common.update_maven_repo_in_build_config(args.repo_url, args.replace_jboss_repo)
-        common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_jboss_repo)
-        common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_jboss_repo)
+        common.update_maven_repo_in_build_config(args.repo_url, args.replace_default_repo)
+        common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_default_repo)
+        common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_default_repo)
         if not args.tests_only:
-            common.update_maven_repo_env_value(args.repo_url, args.replace_jboss_repo, args.prod)
+            common.update_maven_repo_env_value(args.repo_url, args.replace_default_repo, args.prod)
     
     if args.ignore_self_signed_cert:
         common.ignore_maven_self_signed_certificate_in_build_config()
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
index 9a1568507fb..f7a7bf7b63a 100644
--- a/tests/features/common-build-runtime.feature
+++ b/tests/features/common-build-runtime.feature
@@ -6,5 +6,5 @@
 Feature: Common tests for Kogito builder and runtime images
 
   Scenario: Verify if usage help is correctly called
-    When container is started with command /home/kogito/kogito-app-launch.sh -h
+    When container is started with command bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh -h"
     Then container log should contain This is the
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 32d7a40d8ff..b0d9ff3d955 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -18,7 +18,7 @@
 @openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Custom TrustStore configuration
   Scenario: Verify if a custom certificate is correctly handled
-    When container is started with command /home/kogito/kogito-app-launch.sh
+    When container is started with command bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"
       | variable            | value              |
       | CUSTOM_TRUSTSTORE   | my-truststore.jks  |
       | RUNTIME_TYPE        | quarkus            |
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index 92cb56dd5cc..35790b99773 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -24,6 +24,7 @@ Feature: Common tests for Kogito images
   Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
     When container is started with args
       | arg       | value                                                                           |
+      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                           |
       | mem_limit | 1073741824                                                                      |
       | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 80, "JAVA_INITIAL_MEM_RATIO": 25} |
     Then container log should match regex -Xms205m
@@ -32,6 +33,7 @@ Feature: Common tests for Kogito images
   Scenario: Verify if the DEFAULT MEM RATIO properties are overridden with different values
     When container is started with args
       | arg       | value                                                                           |
+      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                           |
       | mem_limit | 1073741824                                                                      |
       | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 50, "JAVA_INITIAL_MEM_RATIO": 10} |
     Then container log should match regex -Xms51m
@@ -39,23 +41,24 @@ Feature: Common tests for Kogito images
 
   Scenario: Verify if the properties were correctly set when aren't passed
     When container is started with args
-      | arg       | value                   |
-      | mem_limit | 1073741824              |
-      | env_json  | {"SCRIPT_DEBUG":"true"} |
+      | arg       | value                                                 |
+      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh" |
+      | mem_limit | 1073741824                                            |
+      | env_json  | {"SCRIPT_DEBUG":"true"}                               |
     Then container log should match regex -Xms128m
     And container log should match regex -Xmx512m
 
   Scenario: Verify if Java Remote Debug is correctly configured
-    When container is started with env
-      | variable        | value |
-      | SCRIPT_DEBUG    | true  |
-      | JAVA_DEBUG      | true  |
-      | JAVA_DEBUG_PORT | 9222  |
+    When container is started with args
+      | arg       | value                                                                   |
+      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                   |
+      | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_DEBUG":"true", "JAVA_DEBUG_PORT":"9222"}  |
     Then container log should match regex -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9222
 
   Scenario: Verify if the DEFAULT MEM RATIO properties are overridden with different values from user provided Xmx and Xms
     When container is started with args
       | arg       | value                                                                                                                 |
+      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                                                                 |
       | mem_limit | 1073741824                                                                                                            |
       | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 50, "JAVA_INITIAL_MEM_RATIO": 10, "JAVA_OPTIONS":"-Xms4000m -Xmx8000m"} |
     Then container log should match regex -Xms4000m
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
index a57d1941a1d..965bad01f4c 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index ephemeral postgresql feature.
 
   Scenario: verify if all labels are correctly set on kogito-data-index-ephemeral image
     Given image is built
-     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - ephemeral PostgreSQL
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index a33e5ac8763..399530742fd 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index infinispan feature.
 
   Scenario: verify if all labels are correctly set on kogito-data-index-infinispan image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
      And the image should contain label io.openshift.expose-services with value 8080:http
      And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Infinispan persistence provider
      And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Infinispan
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
index d130b8c438e..10578dc94af 100644
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index mongodb feature.
 
   Scenario: verify if all labels are correctly set on kogito-data-index-mongodb image
     Given image is built
-     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Mongodb persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Mongodb
diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature
index c24c39696ca..9cac42d0bb4 100644
--- a/tests/features/data-index/kogito-data-index-oracle.feature
+++ b/tests/features/data-index/kogito-data-index-oracle.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index oracle feature.
 
   Scenario: verify if all labels are correctly set on kogito-data-index-oracle image
     Given image is built
-     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Oracle persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Oracle
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
index ddd0b761854..2d3a1da77ff 100644
--- a/tests/features/data-index/kogito-data-index-postgresql.feature
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index postgresql feature.
 
   Scenario: verify if all labels are correctly set on kogito-data-index-postgresql image
     Given image is built
-     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for PostgreSQL persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Data Index Service - PostgreSQL
diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
index 3693143e711..636c458fbea 100644
--- a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-all-in-one feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service with all available jdbc providers
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service All-in-One
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index 53cd99f1f77..a6658a4b982 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-ephemeral feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito in memory Jobs Service
     And the image should contain label io.k8s.display-name with value Kogito in memory Jobs Service
diff --git a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
index 68412264399..3c235a53da8 100644
--- a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-infinispan feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Infinispan
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Infinispan
diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
index 277e82602be..3642f616cd8 100644
--- a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-mongodb feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on MongoDB
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on MongoDB
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index bb05ad25431..2b89a2807cb 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-postgresql feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Postgresql
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Postgresql
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index f405feb73f8..50ccacfd6a5 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -8,7 +8,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
       | variable     | value   |
       | NATIVE       | false   |
       | RUNTIME_TYPE | quarkus |
@@ -26,7 +26,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
       | variable     | value   |
       | NATIVE       | false   |
     Then check that page is served
@@ -43,7 +43,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value                     |
       | NATIVE       | false                     |
       | RUNTIME_TYPE | quarkus                   |
@@ -78,7 +78,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                                                    |
       | RUNTIME_TYPE      | quarkus                                                  |
       | NATIVE            | false                                                    |
@@ -96,11 +96,11 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/bin/quarkus-run.jar should exist
 
   Scenario: Perform an incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
-    And s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    And s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
@@ -120,7 +120,7 @@ Feature: kogito-s2i-builder image JVM build tests
 #### SpringBoot Scenarios
 
   Scenario: Verify if the s2i build is finished as expected with debug enabled
-      Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+      Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
         | variable     | value        |
         | RUNTIME_TYPE | springboot   |
         | JAVA_OPTIONS | -Ddebug=true |
@@ -138,7 +138,7 @@ Feature: kogito-s2i-builder image JVM build tests
       And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
   Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main
       | variable            | value        |
       | JAVA_OPTIONS        | -Ddebug=true |
       | RUNTIME_TYPE        | springboot   |
@@ -173,7 +173,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And container log should contain Tomcat initialized with port(s): 8080 (http)
   
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value |
       | JAVA_OPTIONS      | -Ddebug=true                       |
       | RUNTIME_TYPE      | springboot                         |
@@ -193,11 +193,11 @@ Feature: kogito-s2i-builder image JVM build tests
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
 
   Scenario: Perform an incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
-    And s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
+    And s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
       | variable     | value      |
       | RUNTIME_TYPE | springboot |
@@ -215,7 +215,7 @@ Feature: kogito-s2i-builder image JVM build tests
       | expected_status_code | 201                                                                           |
 
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                           |
       | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
       | RUNTIME_TYPE      | quarkus                         |
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index b7a75697b1d..ba997ebd45a 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -3,7 +3,7 @@ Feature: Kogito-explainability feature.
 
   Scenario: verify if all labels are correctly set on kogito-explainability image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Explainability Service
     And the image should contain label io.k8s.display-name with value Kogito Explainability Service
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index a38ada64d9f..bb5b21e4d1b 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jit-runner feature.
 
   Scenario: verify if all labels are correctly set on kogito-jit-runner image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito JIT Runner
     And the image should contain label io.k8s.display-name with value Kogito JIT Runner
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index 7be4652ce42..ad3aaef74a4 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -3,7 +3,7 @@ Feature: kogito-management-console feature
 
   Scenario: verify if all labels are correctly set kogito-management-console image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Management Console, manage your Business Process easily.
     And the image should contain label io.k8s.display-name with value Kogito Management Console
diff --git a/tests/features/kogito-runtime-jvm.feature b/tests/features/kogito-runtime-jvm.feature
index ed1302388f3..98732c802fa 100644
--- a/tests/features/kogito-runtime-jvm.feature
+++ b/tests/features/kogito-runtime-jvm.feature
@@ -3,7 +3,7 @@ Feature: kogito-runtime-jvm feature.
 
   Scenario: verify if all labels are correctly set on kogito-runtime-jvm image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-runtime-native.feature b/tests/features/kogito-runtime-native.feature
index 1cf48122a9d..314881abaff 100644
--- a/tests/features/kogito-runtime-native.feature
+++ b/tests/features/kogito-runtime-native.feature
@@ -3,7 +3,7 @@ Feature: Kogito-runtime-native feature.
 
   Scenario: verify if all labels are correctly set on kogito-runtime-native image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
      And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
      And the image should contain label io.openshift.s2i.destination with value /tmp
      And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 62a3a19f39c..d5e78cc6d69 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -15,7 +15,7 @@ Feature: kogito-s2i-builder image native build tests
     And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.3.2
 
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx2576980378
 
   Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
       | variable | value          |
       | NATIVE       | true       |
       | RUNTIME_TYPE | quarkus    |
@@ -71,7 +71,7 @@ Feature: kogito-s2i-builder image native build tests
     And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable          | value         |
       | RUNTIME_TYPE      | quarkus       |
       | NATIVE            | true          |
@@ -84,11 +84,11 @@ Feature: kogito-s2i-builder image native build tests
      And s2i build log should contain -J-Xmx5153960755
 
   Scenario: Perform an incremental s2i build for native test
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value   |
       | RUNTIME_TYPE | quarkus |
       | NATIVE       | false   |
-    And s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
+    And s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
       | variable     | value      |
       | RUNTIME_TYPE | quarkus    |
       | NATIVE       | true       |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 5238f47f98b..fe1cbfb84ae 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -3,7 +3,7 @@ Feature: kogito-s2i-builder image tests
 
   Scenario: verify if all labels are correctly set on kogito-s2i-builder image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
     And the image should contain label io.openshift.s2i.destination with value /tmp
     And the image should contain label io.openshift.expose-services with value 8080:http
@@ -23,7 +23,7 @@ Feature: kogito-s2i-builder image tests
     And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | NATIVE            | false         |
       | RUNTIME_TYPE      | quarkus       |
@@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image tests
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
+    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
       | MAVEN_ARGS_APPEND | -Ppersistence |
       | RUNTIME_TYPE      | springboot    |
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index 86ce99f71b8..78ba03764d2 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -3,7 +3,7 @@ Feature: kogito-task-console feature
 
   Scenario: verify if all labels are correctly set on kogito-task-console image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Task Console, manage your Business Process easily.
     And the image should contain label io.k8s.display-name with value Kogito Task Console
diff --git a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
index 147918c4e16..6f62ba9e662 100644
--- a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
+++ b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
@@ -4,7 +4,7 @@ Feature: logic-data-index-ephemeral-rhel8 feature
   Scenario: verify if all labels are correctly set on logic-data-index-ephemeral-rhel8 image
     Given image is built
       Then the image should contain label io.openshift.expose-services with value 8080:http
-      And the image should contain label maintainer with value serverless-logic <bsig-cloud@redhat.com>
+      And the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
       And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
       And the image should contain label io.k8s.display-name with value Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
       And the image should contain label io.openshift.tags with value logic-data-index,kogito,data-index,data-index-ephemeral
diff --git a/tests/features/openshift-serverless-logic/logic-swf-builder.feature b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
index 4982cb886b6..8d1f847c3ad 100644
--- a/tests/features/openshift-serverless-logic/logic-swf-builder.feature
+++ b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: logic-swf-builder-rhel8 feature
   Scenario: verify if all labels are correctly set on logic-swf-builder-rhel8 image
     Given image is built
       Then the image should contain label io.openshift.expose-services with value 8080:http
-      And the image should contain label maintainer with value serverless-logic <bsig-cloud@redhat.com>
+      And the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
       And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
       And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic Builder image
       And the image should contain label io.openshift.tags with value logic-swf-builder,kogito,swf-builder
diff --git a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
index a69f5d166ba..e67a7c51ff1 100644
--- a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
+++ b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
@@ -4,7 +4,7 @@ Feature: logic-swf-devmode-rhel8 feature
   Scenario: verify if all labels are correctly set on logic-swf-devmode-rhel8 image
     Given image is built
       Then the image should contain label io.openshift.expose-services with value 8080:http,5005:http
-      And the image should contain label maintainer with value serverless-logic <bsig-cloud@redhat.com>
+      And the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
       And the image should contain label io.k8s.description with value Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
       And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic SWF Devmode
       And the image should contain label io.openshift.tags with value logic,devmode,kogito,kogito,development,serverless,workflow
diff --git a/tests/features/trusty/kogito-trusty-common.feature b/tests/features/trusty/kogito-trusty-common.feature
index f755568bc0b..ac5e551dca2 100644
--- a/tests/features/trusty/kogito-trusty-common.feature
+++ b/tests/features/trusty/kogito-trusty-common.feature
@@ -3,7 +3,8 @@
 @quay.io/kiegroup/kogito-trusty-postgresql
 Feature: Kogito-trusty common feature.
   Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
-    When container is started with env
-      | variable               | value   |
-      | SCRIPT_DEBUG           | true    |
+    When container is started with args
+      | arg       | value                                                                   |
+      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                   |
+      | env_json  | {"SCRIPT_DEBUG":"true"}  |
     Then container log should contain -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
index a5d8d140f0b..dbf213ec9ec 100644
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -3,7 +3,7 @@ Feature: Kogito-trusty infinispan feature.
 
   Scenario: verify if all labels are correctly set on kogito-trusty-infinispan image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Infinispan persistence provider
     And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Infinispan
diff --git a/tests/features/trusty/kogito-trusty-postgresql.feature b/tests/features/trusty/kogito-trusty-postgresql.feature
index 829f255e8d3..a2224fbcd0d 100644
--- a/tests/features/trusty/kogito-trusty-postgresql.feature
+++ b/tests/features/trusty/kogito-trusty-postgresql.feature
@@ -3,7 +3,7 @@ Feature: Kogito-trusty postgresql feature.
 
   Scenario: verify if all labels are correctly set on kogito-trusty-postgresql image
     Given image is built
-     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for PostgreSQL persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Trusty Service - PostgreSQL
diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature
index a093a8862ec..f39b831e89a 100644
--- a/tests/features/trusty/kogito-trusty-redis.feature
+++ b/tests/features/trusty/kogito-trusty-redis.feature
@@ -3,7 +3,7 @@ Feature: Kogito-trusty redis feature.
 
   Scenario: verify if all labels are correctly set on kogito-trusty-redis image
     Given image is built
-     Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
       And the image should contain label io.openshift.expose-services with value 8080:http
       And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Redis persistence provider
       And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Redis
diff --git a/tests/features/trusty/kogito-trusty-ui.feature b/tests/features/trusty/kogito-trusty-ui.feature
index 3d1e875d942..1aa3a978cf1 100644
--- a/tests/features/trusty/kogito-trusty-ui.feature
+++ b/tests/features/trusty/kogito-trusty-ui.feature
@@ -3,7 +3,7 @@ Feature: kogito-trusty-ui feature
 
   Scenario: verify if all labels are correctly set on kogito-trusty-ui image
     Given image is built
-    Then the image should contain label maintainer with value kogito <bsig-cloud@redhat.com>
+    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty UI, manage your Business Process easily.
     And the image should contain label io.k8s.display-name with value Kogito Trusty UI
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index f39a94bf03e..4feb39f3e1f 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -3,12 +3,15 @@
 # Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
 # if image name is supporting services, don't build it
 IMAGE_NAME="$2"
+KOGITO_EXAMPLES_REPO_NAME='incubator-kie-kogito-examples'
+KOGITO_EXAMPLES_FOLDER_NAME='kogito-examples' # many tests rely on location /tmp/kogito-examples
+
 prod=""
 if [ -n "${IMAGE_NAME}" ]; then
     if [[ ${IMAGE_NAME} =~ rhpam|logic* ]]; then
         prod="--prod"
     fi
-    if python3 ../../scripts/list-images.py ${prod} -is ${IMAGE_NAME}; then
+    if python ../../scripts/list-images.py ${prod} -is ${IMAGE_NAME}; then
         echo "Target image is supporting services, skipping examples build"
         exit 0
     fi
@@ -34,16 +37,16 @@ fi
 set -e
 
 # Clone examples
-cd /tmp
-rm -rf kogito-examples/
-git clone https://github.com/kiegroup/kogito-examples.git
-cd kogito-examples/
+KOGITO_EXAMPLES_DIR=/tmp/${KOGITO_EXAMPLES_FOLDER_NAME}
+rm -rf ${KOGITO_EXAMPLES_DIR}
+git clone https://github.com/apache/${KOGITO_EXAMPLES_REPO_NAME}.git ${KOGITO_EXAMPLES_DIR}
+cd ${KOGITO_EXAMPLES_DIR}/
 git fetch origin
 git fetch origin --tags
 git checkout -b nightly-main
 
 # make a new copy of rules-quarkus-helloworld for native tests
-cp -rv  /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/
+cp -rv  ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld/ ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld-native/
 
 set -x
 
@@ -53,19 +56,19 @@ mvn -f kogito-springboot-examples/process-springboot-example clean package ${MAV
 
 if [ "$NATIVE_BUILD" = 'true' ]; then
     mvn -f kogito-quarkus-examples/rules-quarkus-helloworld-native -Dnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
-    ls -lah /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/target/
+    ls -lah ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld-native/target/
 fi
 
 # preparing directory to run kogito maven archetypes tests
-mkdir -pv /tmp/kogito-examples/dmn-example
-cp /tmp/kogito-examples/kogito-quarkus-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-example/
+mkdir -pv ${KOGITO_EXAMPLES_DIR}/dmn-example
+cp ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/dmn-quarkus-example/src/main/resources/* ${KOGITO_EXAMPLES_DIR}/dmn-example/
 
 # by adding the application.properties file telling app to start on
 # port 10000, the purpose of this tests is make sure that the images
 # will ensure the use of the port 8080.
 
-cp ${base_dir}/application.properties /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
-(echo ""; echo "server.port=10000") >> /tmp/kogito-examples/kogito-springboot-examples/process-springboot-example/src/main/resources/application.properties
+cp ${base_dir}/application.properties ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
+(echo ""; echo "server.port=10000") >> ${KOGITO_EXAMPLES_DIR}/kogito-springboot-examples/process-springboot-example/src/main/resources/application.properties
 
 set +x
 

From c91568db4ac63fef447ac43113163ef6984d8542 Mon Sep 17 00:00:00 2001
From: jstastny-cz <jan.stastny@ibm.com>
Date: Mon, 11 Dec 2023 08:30:12 +0100
Subject: [PATCH 649/709] kie-issues#749: fix nightly build and tests

---
 .ci/jenkins/Jenkinsfile.build-and-test          |  1 +
 .ci/jenkins/Jenkinsfile.build-image             |  1 +
 .ci/jenkins/Jenkinsfile.deploy                  |  1 +
 .ci/jenkins/Jenkinsfile.promote                 | 11 +----------
 scripts/common.py                               |  2 +-
 tests/features/common-custom-truststore.feature |  2 +-
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
index 4e99f9e14d5..c8ca9938440 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -15,6 +15,7 @@ pipeline {
         stage('Initialization') {
             steps {
                 script {
+                    util.waitForDocker()
                     sh 'printenv'
                     
                     dir(getRepoName()) {
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 5436d77d03f..deb941c3353 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -28,6 +28,7 @@ pipeline {
         stage('Initialization') {
             steps {
                 script {
+                    util.waitForDocker()
                     sh 'printenv'
 
                     assert getBuildImageName() : 'Please provide `BUILD_IMAGE_NAME` parameter'
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index a4ff1c6eb73..776766b35ee 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -29,6 +29,7 @@ pipeline {
         stage('Initialization') {
             steps {
                 script {
+                    util.waitForDocker()
                     currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
 
                     dir(getRepoName()) {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 41c877c7cfd..5a9fd416cd1 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -33,11 +33,10 @@ pipeline {
         stage('Initialization') {
             steps {
                 script {
-                    clean()
-
                     if (params.DISPLAY_NAME) {
                         currentBuild.displayName = params.DISPLAY_NAME
                     }
+                    util.waitForDocker()
 
                     readDeployProperties()
 
@@ -61,8 +60,6 @@ pipeline {
                     dir(getRepoName()) {
                         checkoutRepo()
                     }
-
-                    cloud.installSkopeo()
                 }
             }
         }
@@ -141,12 +138,6 @@ void checkoutRepo() {
     sh "git checkout ${getBuildBranch()}"
 }
 
-void clean() {
-    cleanWs()
-    util.cleanNode()
-    cloud.cleanSkopeo()
-}
-
 void promoteImages() {
     for (String imageName : getImages()) {
         promoteImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, getNewImageTag()))
diff --git a/scripts/common.py b/scripts/common.py
index f1d669b1622..682a19a73dc 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -450,7 +450,7 @@ def update_examples_uri_in_clone_repo(examples_uri):
     """
     print("Set examples_uri {} in clone-repo script".format(examples_uri))
     pattern = re.compile(r'(git clone.*)')
-    replacement = "git clone {}".format(examples_uri)
+    replacement = "git clone {} kogito-examples".format(examples_uri)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
 def update_maven_repo_in_build_config(repo_url, replace_default_repository):
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index b0d9ff3d955..c82cb8cc3e8 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -18,7 +18,7 @@
 @openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Custom TrustStore configuration
   Scenario: Verify if a custom certificate is correctly handled
-    When container is started with command bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"
+    When container is started with command bash -c "sleep 10s; /home/kogito/kogito-app-launch.sh"
       | variable            | value              |
       | CUSTOM_TRUSTSTORE   | my-truststore.jks  |
       | RUNTIME_TYPE        | quarkus            |

From 7f2f40205b2bd87d066a5b0b9ca430b1a8978a4e Mon Sep 17 00:00:00 2001
From: Walter Medvedeo <wmedvedeo@gmail.com>
Date: Mon, 11 Dec 2023 17:50:43 +0100
Subject: [PATCH 650/709] kie-issues-693: Update SonataFlow buidler and dev
 mode images to use the
 kogito-addons-quarkus-microprofile-config-service-catalog (#1713)

---
 modules/kogito-swf/builder/build-config/module.yaml | 2 +-
 modules/kogito-swf/devmode/build-config/module.yaml | 2 +-
 scripts/logic/build-quarkus-app.sh                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index 1052c0375cb..b90ef48bc98 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -9,4 +9,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}
+    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index beead207983..740e48b4ff7 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -9,4 +9,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
+    value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 83b39479af3..8f127f0ee80 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -25,7 +25,7 @@ properties_with_versions=("compiler-plugin.version:3.11.0" "surefire-plugin.vers
 # arch specific dependencies
 quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch64:1.8.0"
 # common extensions used by the kogito-swf-builder and kogito-swf-devmode
-quarkus_extensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-fabric8-kubernetes-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
+quarkus_extensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
 # dev mode purpose extensions used only by the kogito-swf-devmode
 kogito_swf_devmode_extensions="kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
 # builder/prod extensitons used only by the kogito-swf-builder

From b716f85425c1261ddb15263bbb48387e36f47623 Mon Sep 17 00:00:00 2001
From: jstastny-cz <jan.stastny@ibm.com>
Date: Tue, 12 Dec 2023 10:55:07 +0100
Subject: [PATCH 651/709] kie-issues#759: make git clone pattern more robust

---
 scripts/common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/common.py b/scripts/common.py
index 682a19a73dc..e0659e81897 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -449,8 +449,8 @@ def update_examples_uri_in_clone_repo(examples_uri):
     :param examples_uri: kogito-examples uri
     """
     print("Set examples_uri {} in clone-repo script".format(examples_uri))
-    pattern = re.compile(r'(git clone.*)')
-    replacement = "git clone {} kogito-examples".format(examples_uri)
+    pattern = re.compile(r'(git clone \S+)')
+    replacement = "git clone {}".format(examples_uri)
     update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
 
 def update_maven_repo_in_build_config(repo_url, replace_default_repository):

From 0bcbb83ba45aa0fe7515cf5e94e2d094f6aec206 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 12 Dec 2023 09:43:23 -0300
Subject: [PATCH 652/709] NO-ISSUE - Add exec permissions back to build-app.sh
 in kogito-swf common module (#1715)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 modules/kogito-swf/common/scripts/added/build-app.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 modules/kogito-swf/common/scripts/added/build-app.sh

diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
old mode 100644
new mode 100755

From 26fd4be77cca528fab326f4875225854d18f4964 Mon Sep 17 00:00:00 2001
From: jstastny-cz <jan.stastny@ibm.com>
Date: Thu, 14 Dec 2023 11:35:14 +0100
Subject: [PATCH 653/709] kie-issues#767: set user config for git

---
 .ci/jenkins/Jenkinsfile.deploy       | 1 +
 .ci/jenkins/Jenkinsfile.setup-branch | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 776766b35ee..224d74c26af 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -261,6 +261,7 @@ void checkoutRepo() {
 }
 
 void commitAndPushChanges(String commitMsg) {
+    githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
     githubscm.commitChanges(commitMsg)
     githubscm.pushObject('origin', getPRBranch(), getGitAuthorPushCredsId())
     changesDone = true
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index ea5a9cce4a7..7b834ae6298 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -86,6 +86,7 @@ pipeline {
                 script {
                     dir(getRepoName()) {
                         if (githubscm.isThereAnyChanges()) {
+                            githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
                             githubscm.commitChanges("[${getBuildBranch()}] Update version to ${getKogitoVersion()}")
                             githubscm.pushObject('origin', getBuildBranch(), getGitAuthorPushCredsId())
                         } else {

From 3f1398696e4772695de612488ec3cb3e4bb0a5e9 Mon Sep 17 00:00:00 2001
From: asf-ci-kie <asf-ci-kie@jenkins.kie.apache.org>
Date: Fri, 15 Dec 2023 06:05:54 +0000
Subject: [PATCH 654/709] [main] Update version to 2.0.0-snapshot

---
 tests/features/kogito-s2i-builder-native.feature | 2 +-
 tests/features/kogito-s2i-builder.feature        | 8 ++++----
 tests/features/rhpam-kogito-builder-jvm.feature  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index d5e78cc6d69..7e01ceefd0c 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -113,7 +113,7 @@ Feature: kogito-s2i-builder image native build tests
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index fe1cbfb84ae..77b7d471d8a 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -46,7 +46,7 @@ Feature: kogito-s2i-builder image tests
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -74,7 +74,7 @@ Feature: kogito-s2i-builder image tests
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -95,7 +95,7 @@ Feature: kogito-s2i-builder image tests
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |                  
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |                   
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -119,7 +119,7 @@ Feature: kogito-s2i-builder image tests
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 01c5ef313fc..113a70f2993 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |          
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |     
+      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...

From 000d4ebce2c500b1fa5863cd57836edf05d04f0f Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 22 Dec 2023 19:11:45 -0300
Subject: [PATCH 655/709] Fix bdd swf-devmode svc discovery (#1718)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 tests/features/kogito-swf-devmode.feature | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 754ee5aaa5c..d7b591f76ed 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -129,11 +129,10 @@ Feature: Serverless Workflow devmode images
       | wait                 | 480                                                                              |
       | expected_status_code | 200                                                                              |
 
-  Scenario: Verify if container starts in devmode with service discovery property
+  Scenario: Verify if container starts in devmode with service discovery enabled
     When container is started with env
-      | variable          | value                                                                                 |
-      | SCRIPT_DEBUG      | true                                                                                  |
-      | MAVEN_ARGS_APPEND | -Dkogito.dataindex.ws.url=${knative:services.v1.serving.knative.dev/namespace1/test2} |
+      | variable                    | value |
+      | QUARKUS_DEVSERVICES_ENABLED | false |
     Then check that page is served
       | property             | value             |
       | port                 | 8080              |
@@ -141,7 +140,7 @@ Feature: Serverless Workflow devmode images
       | wait                 | 480               |
       | request_method       | GET               |
       | expected_status_code | 200               |
-    And container log should contain Service Discovery has failed on property [kogito.dataindex.ws.url
+    And container log should contain kogito-addon-microprofile-config-service-catalog-extension
     
   Scenario: Verify if container have the KOGITO_CODEGEN_PROCESS_FAILONERROR env set to false
     When container is started with command bash

From 685474f741991f7ea69ad972eb09083885b16521 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Thu, 28 Dec 2023 20:05:43 -0300
Subject: [PATCH 656/709] Fix #1719 - Add Maven 3.9.3, Quarkus 3.2.9.Final and
 update Java images (#1720)

---
 README.md                                     |  16 +--
 kogito-base-builder-image.yaml                |  11 +-
 kogito-data-index-ephemeral-image.yaml        |   6 +-
 kogito-data-index-infinispan-image.yaml       |   6 +-
 kogito-data-index-mongodb-image.yaml          |   6 +-
 kogito-data-index-oracle-image.yaml           |   6 +-
 kogito-data-index-postgresql-image.yaml       |   6 +-
 kogito-explainability-image.yaml              |   6 +-
 kogito-imagestream.yaml                       | 132 +++++++++---------
 kogito-jit-runner-image.yaml                  |   6 +-
 kogito-jobs-service-allinone-image.yaml       |   6 +-
 kogito-jobs-service-ephemeral-image.yaml      |   6 +-
 kogito-jobs-service-infinispan-image.yaml     |   6 +-
 kogito-jobs-service-mongodb-image.yaml        |   6 +-
 kogito-jobs-service-postgresql-image.yaml     |   6 +-
 kogito-management-console-image.yaml          |   6 +-
 kogito-runtime-jvm-image.yaml                 |   8 +-
 kogito-runtime-native-image.yaml              |   6 +-
 kogito-s2i-builder-image.yaml                 |  17 +--
 kogito-swf-builder-image.yaml                 |  18 +--
 kogito-swf-devmode-image.yaml                 |  18 +--
 kogito-task-console-image.yaml                |   6 +-
 kogito-trusty-infinispan-image.yaml           |   6 +-
 kogito-trusty-postgresql-image.yaml           |   6 +-
 kogito-trusty-redis-image.yaml                |   6 +-
 kogito-trusty-ui-image.yaml                   |   6 +-
 logic-data-index-ephemeral-rhel8-image.yaml   |   2 +-
 logic-swf-builder-rhel8-image.yaml            |   2 +-
 logic-swf-devmode-rhel8-image.yaml            |   2 +-
 modules/kogito-custom-truststore/module.yaml  |   2 +-
 modules/kogito-data-index-common/module.yaml  |   2 +-
 .../community/module.yaml                     |   2 +-
 .../kogito-data-index-infinispan/module.yaml  |   2 +-
 modules/kogito-data-index-mongodb/module.yaml |   2 +-
 modules/kogito-data-index-oracle/module.yaml  |   2 +-
 .../kogito-data-index-postgresql/module.yaml  |   2 +-
 .../added/java-default-options                |   2 +-
 modules/kogito-dynamic-resources/module.yaml  |   4 +-
 modules/kogito-explainability/module.yaml     |   2 +-
 .../23.0-java-17/configure                    |  24 ++++
 .../23.0-java-17/module.yaml                  |  33 +++++
 .../{ => 22.3-java-11}/configure              |   3 -
 .../{ => 22.3-java-11}/module.yaml            |   2 +-
 .../{ => common}/added/memory-limit.sh        |   0
 .../kogito-graalvm-scripts/common/configure   |   6 +
 .../kogito-graalvm-scripts/common/module.yaml |   6 +
 .../tests/bats/memory-limits.bats             |   4 +-
 modules/kogito-image-dependencies/module.yaml |   2 +-
 modules/kogito-jit-runner/module.yaml         |   2 +-
 .../module.yaml                               |   2 +-
 .../kogito-jobs-service-common/module.yaml    |   2 +-
 .../kogito-jobs-service-ephemeral/module.yaml |   2 +-
 .../module.yaml                               |   2 +-
 .../kogito-jobs-service-mongodb/module.yaml   |   2 +-
 .../module.yaml                               |   2 +-
 modules/kogito-kubernetes-client/module.yaml  |   2 +-
 modules/kogito-launch-scripts/module.yaml     |   2 +-
 modules/kogito-logging/module.yaml            |   2 +-
 modules/kogito-management-console/module.yaml |   2 +-
 modules/kogito-maven/3.8.x/module.yaml        |  69 +--------
 modules/kogito-maven/3.9.x/module.yaml        |  14 ++
 .../added/configure-maven.sh                  |   0
 .../kogito-maven/{3.8.x => common}/configure  |   0
 .../{3.8.x => common}/maven/settings.xml      |   0
 modules/kogito-maven/common/module.yaml       |  76 ++++++++++
 .../tests/bats/maven-settings.bats            |   4 +-
 modules/kogito-openjdk/17-headless/clean.sh   |   4 +
 .../kogito-openjdk/17-headless/module.yaml    |  26 ++++
 modules/kogito-openjdk/17/clean.sh            |   4 +
 modules/kogito-openjdk/17/module.yaml         |  26 ++++
 modules/kogito-persistence/module.yaml        |   2 +-
 modules/kogito-pkg-update/module.yaml         |   2 +-
 modules/kogito-project-versions/module.yaml   |   6 +-
 modules/kogito-runtime-jvm/module.yaml        |   2 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-runtime-native/module.yaml     |   2 +-
 .../added/kogito-app-launch.sh                |   2 +-
 modules/kogito-s2i-builder/module.yaml        |   2 +-
 modules/kogito-s2i-core/added/s2i-core        |   4 +-
 modules/kogito-s2i-core/module.yaml           |   2 +-
 .../builder/build-config/module.yaml          |   4 +-
 .../builder/runtime/community/module.yaml     |   2 +-
 modules/kogito-swf/common/build/module.yaml   |   2 +-
 .../common/scripts/added/create-app.sh        |   8 +-
 modules/kogito-swf/common/scripts/module.yaml |   4 +-
 .../bats/kogito-swf-builder-jvm-settings.bats |   4 +-
 .../devmode/build-config/module.yaml          |   4 +-
 .../devmode/runtime/common/module.yaml        |   2 +-
 .../devmode/runtime/community/module.yaml     |   2 +-
 modules/kogito-system-user/module.yaml        |   2 +-
 modules/kogito-task-console/module.yaml       |   2 +-
 modules/kogito-trusty-common/module.yaml      |   2 +-
 modules/kogito-trusty-infinispan/module.yaml  |   2 +-
 modules/kogito-trusty-postgresql/module.yaml  |   2 +-
 modules/kogito-trusty-redis/module.yaml       |   2 +-
 modules/kogito-trusty-ui/module.yaml          |   2 +-
 scripts/README.md                             |   4 +-
 scripts/logic/build-quarkus-app.sh            |   4 +-
 scripts/logic/builder-maven-repo/pom.xml      |   2 +-
 scripts/logic/builder-quarkus-app/pom.xml     |   2 +-
 scripts/logic/devmode-maven-repo/pom.xml      |   2 +-
 scripts/logic/devmode-quarkus-app/pom.xml     |   2 +-
 scripts/logic/pom.xml                         |   2 +-
 scripts/run-bats.sh                           |   2 +-
 scripts/setup-maven.sh                        |   3 +-
 tests/features/common-build-runtime.feature   |   3 +
 .../features/common-custom-truststore.feature |   5 +-
 .../features/common-dynamic-resources.feature |  40 +++---
 .../kogito-data-index-ephemeral.feature       |   2 +-
 .../kogito-data-index-oracle.feature          |   7 +-
 .../kogito-common-builder-jvm.feature         |  13 +-
 .../kogito-common-runtime-jvm.feature         |   4 +-
 .../kogito-s2i-builder-native.feature         |  16 ++-
 tests/features/kogito-s2i-builder.feature     |  15 +-
 tests/features/kogito-swf-common.feature      |   3 +-
 tests/features/kogito-swf-devmode.feature     |   4 +-
 .../features/rhpam-kogito-builder-jvm.feature |   8 +-
 tests/shell/README.md                         |  21 +++
 .../kogito-swf-builder/.vscode/launch.json    |  22 +++
 .../kogito-swf-builder/.vscode/settings.json  |  18 +++
 tests/shell/kogito-swf-builder/RunTests.java  | 118 ----------------
 .../greet-with-inputschema/Dockerfile         |   2 +-
 .../resources/greet/Dockerfile                |   2 +-
 .../kogito-swf-builder/src/RunTests.java      | 121 ++++++++++++++++
 .../kogito-swf-devmode/.vscode/launch.json    |  22 +++
 .../kogito-swf-devmode/.vscode/settings.json  |  18 +++
 .../{ => src}/RunTests.java                   |  31 ++--
 tests/shell/run.sh                            |   2 +-
 tests/test-apps/clone-repo.sh                 |   3 +-
 129 files changed, 779 insertions(+), 503 deletions(-)
 create mode 100644 modules/kogito-graalvm-installer/23.0-java-17/configure
 create mode 100644 modules/kogito-graalvm-installer/23.0-java-17/module.yaml
 rename modules/kogito-graalvm-scripts/{ => 22.3-java-11}/configure (81%)
 rename modules/kogito-graalvm-scripts/{ => 22.3-java-11}/module.yaml (76%)
 rename modules/kogito-graalvm-scripts/{ => common}/added/memory-limit.sh (100%)
 create mode 100644 modules/kogito-graalvm-scripts/common/configure
 create mode 100644 modules/kogito-graalvm-scripts/common/module.yaml
 rename modules/kogito-graalvm-scripts/{ => common}/tests/bats/memory-limits.bats (89%)
 create mode 100644 modules/kogito-maven/3.9.x/module.yaml
 rename modules/kogito-maven/{3.8.x => common}/added/configure-maven.sh (100%)
 rename modules/kogito-maven/{3.8.x => common}/configure (100%)
 rename modules/kogito-maven/{3.8.x => common}/maven/settings.xml (100%)
 create mode 100644 modules/kogito-maven/common/module.yaml
 create mode 100644 modules/kogito-openjdk/17-headless/clean.sh
 create mode 100644 modules/kogito-openjdk/17-headless/module.yaml
 create mode 100644 modules/kogito-openjdk/17/clean.sh
 create mode 100644 modules/kogito-openjdk/17/module.yaml
 create mode 100644 tests/shell/README.md
 create mode 100644 tests/shell/kogito-swf-builder/.vscode/launch.json
 create mode 100644 tests/shell/kogito-swf-builder/.vscode/settings.json
 delete mode 100644 tests/shell/kogito-swf-builder/RunTests.java
 create mode 100644 tests/shell/kogito-swf-builder/src/RunTests.java
 create mode 100644 tests/shell/kogito-swf-devmode/.vscode/launch.json
 create mode 100644 tests/shell/kogito-swf-devmode/.vscode/settings.json
 rename tests/shell/kogito-swf-devmode/{ => src}/RunTests.java (71%)

diff --git a/README.md b/README.md
index f61da8c41ab..912b416b45e 100644
--- a/README.md
+++ b/README.md
@@ -90,13 +90,13 @@ To interact with Kogito images, you would need to install the needed dependencie
             * All of those can be handled with pip, including CeKit.
             * if any dependency is missing CeKit will tell which one.
     * [Bats](https://github.com/sstephenson/bats) 
-    * Java 11 or higher
-    * Maven 3.8.6 or higher
+    * Java 17 or higher
+    * Maven 3.9.3 or higher
             
 * Optional dependencies:
     * [source-to-image](https://github.com/openshift/source-to-image)
         * used to perform local s2i images using some of the [builder images](#builder-images)
-    * [GraalVM 22.2.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-22.2.0) Java 11 or higher
+    * [GraalVM 23+](https://github.com/graalvm/mandrel/releases) Java 17 or higher
         * Useful to test Kogito apps on native mode before create a Container image with it.
     * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
         
@@ -145,8 +145,8 @@ There are three builder images available:
 
 * [quay.io/kiegroup/kogito-base-builder](https://quay.io/kiegroup/kogito-base-builder)  
 The Kogito base Builder Image is equipped with the following components:
-  * OpenJDK 11.0.6
-  * Maven 3.8.6
+  * OpenJDK 17.x
+  * Maven 3.9.3
 
 * [quay.io/kiegroup/kogito-swf-builder](https://quay.io/kiegroup/kogito-swf-builder)  
   The Kogito SWF Builder Image extends the kogito-base-builder is equipped with the following components for faster builds:
@@ -162,9 +162,9 @@ When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a
 
 The Kogito s2i Builder Image is equipped with the following components:
 
- * GraalVM 22.2.0-java11
- * OpenJDK 11+
- * Maven 3.8.6
+ * GraalVM 23+
+ * OpenJDK 17+
+ * Maven 3.9.3
  
 For more information about what is installed on this image, take a look [here](kogito-s2i-builder-image.yaml) in the
 **modules.install** section. 
diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index 88be045bc2e..de5cb884613 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-base-builder"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"
 
@@ -13,9 +13,9 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.10.Final"
+    value: "3.2.9.Final"
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -37,10 +37,11 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.openjdk
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
-      version: "3.8.6"
+      version: "3.9.3"
+    - name: org.kie.kogito.maven.common
     - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.security.custom.truststores
 
diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index 00e9f7233d3..7b831f1b6dc 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-ephemeral"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.community.ephemeral
diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml
index e8ebd3122cf..723cc63bc92 100644
--- a/kogito-data-index-infinispan-image.yaml
+++ b/kogito-data-index-infinispan-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-infinispan"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -53,7 +53,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.infinispan
diff --git a/kogito-data-index-mongodb-image.yaml b/kogito-data-index-mongodb-image.yaml
index ff9d55d61cd..dfbb5c1c7fa 100644
--- a/kogito-data-index-mongodb-image.yaml
+++ b/kogito-data-index-mongodb-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-mongodb"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -35,7 +35,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.mongodb
diff --git a/kogito-data-index-oracle-image.yaml b/kogito-data-index-oracle-image.yaml
index af4c192de7e..78fbf0227a4 100644
--- a/kogito-data-index-oracle-image.yaml
+++ b/kogito-data-index-oracle-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-oracle"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -35,7 +35,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.oracle
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index e7ba4fb41eb..b6f530a8b1f 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -1,14 +1,14 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-postgresql"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
 
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -39,7 +39,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.postgresql
diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml
index 059c6685d87..33cf268b1ab 100644
--- a/kogito-explainability-image.yaml
+++ b/kogito-explainability-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-explainability"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Explainability Service"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.explainability
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 6aa1d573e27..a8445b569c3 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -15,18 +15,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for Kogito based on Quarkus native image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus
             supports: quarkus
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-runtime-native:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-runtime-native:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -36,18 +36,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for Kogito based on Quarkus or Springboot JVM image
             iconClass: icon-jbpm
             tags: runtime,kogito,quarkus,springboot,jvm
             supports: quarkus
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-runtime-jvm:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-runtime-jvm:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -57,18 +57,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Platform for building Kogito based on Quarkus or Springboot
             iconClass: icon-jbpm
             tags: s2i-builder,kogito,quarkus,springboot
             supports: quarkus
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-s2i-builder:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-s2i-builder:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -78,18 +78,18 @@ items:
         openshift.io/provider-display-name: KIE Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Kogito Serverless Workflow builder with minimum Quarkus extensions libraries preinstalled
             iconClass: icon-jbpm
             tags: kogito,quarkus,swf,maven
             supports: quarkus
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-swf-builder:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-swf-builder:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -99,18 +99,18 @@ items:
         openshift.io/provider-display-name: KIE Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Kogito base builder
             iconClass: icon-jbpm
             tags: kogito,jdk,maven
             supports: quarkus
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-base-builder:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -120,18 +120,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Data Index Service with Infinispan
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-infinispan
             supports: persistence backed by Infinispan Server
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-infinispan:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-infinispan:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -141,18 +141,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Data Index Service with ephemeral PostgreSQL
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-ephemeral
             supports: persistence backed by ephemeral PostgreSQL Server
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-ephemeral:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-ephemeral:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -162,18 +162,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Data Index Service with Mongodb
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-mongodb
             supports: persistence backed by Mongodb server
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-mongodb:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-mongodb:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -183,18 +183,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Data Index Service with PostgreSQL
             iconClass: icon-jbpm
             tags: kogito,data-index,data-index-postgresql
             supports: persistence backed by PostgreSQL server
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-postgresql:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-data-index-postgresql:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -204,18 +204,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Trusty Service with Infinispan
             iconClass: icon-jbpm
             tags: kogito,trusty,trusty-infinispan
             supports: persistence backed by Infinispan server
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-infinispan:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-infinispan:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -225,18 +225,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Trusty Service with Redis
             iconClass: icon-jbpm
             tags: kogito,trusty,trusty-redis
             supports: persistence backed by Redis server
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-redis:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-redis:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -246,18 +246,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Trusty Service with PostgreSQL
             iconClass: icon-jbpm
             tags: kogito,trusty,trusty-postgresql
             supports: persistence backed by PostgreSQL RDBMS
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-postgresql:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-postgresql:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -267,18 +267,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Trusty UI Service
             iconClass: icon-jbpm
             tags: kogito,trusty-ui
             supports: Audit UI
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-ui:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-trusty-ui:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -288,18 +288,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito JIT Runner
             iconClass: icon-jbpm
             tags: kogito,jit-runner
             supports: JIT Runner
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jit-runner:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-jit-runner:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -309,18 +309,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Explainability Service
             iconClass: icon-jbpm
             tags: kogito,explainability
             supports: explainability for decisions
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-explainability:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-explainability:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -330,18 +330,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for Kogito in memory Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-ephemeral:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-ephemeral:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -351,18 +351,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for Kogito Jobs Service based on Infinispan
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-infinispan:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-infinispan:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -372,18 +372,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for Kogito Jobs Service based on Mongodb
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-mongodb:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-mongodb:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -393,18 +393,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for Kogito Jobs Service based on Postgresql
             iconClass: icon-jbpm
             tags: kogito,jobs-service
             supports: out-of-box process timers
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-postgresql:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-postgresql:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -414,18 +414,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: All in One Runtime image for Kogito Jobs Service
             iconClass: icon-jbpm
             tags: kogito,jobs-service, all-in-one
             supports: out-of-box process timers
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-allinone:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-jobs-service-allinone:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -435,18 +435,18 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Management Console
             iconClass: icon-jbpm
             tags: kogito,management-console
             supports: business process management
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-management-console:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -456,15 +456,15 @@ items:
         openshift.io/provider-display-name: Kie Group.
     spec:
       tags:
-        - name: '2.0.0-snapshot'
+        - name: '999-SNAPSHOT'
           annotations:
             description: Runtime image for the Kogito Task Console
             iconClass: icon-jbpm
             tags: kogito,task-console
             supports: business process management
-            version: '2.0.0-snapshot'
+            version: '999-SNAPSHOT'
           referencePolicy:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-task-console:2.0.0-snapshot
+            name: quay.io/kiegroup/kogito-task-console:999-SNAPSHOT
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 423ac0ff446..4cc1ef0c96a 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jit-runner"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito JIT Runner"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -35,7 +35,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jit-runner
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index 60c360fb112..6e0f1b8d194 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-allinone"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -41,7 +41,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.allinone
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index 5975572e622..b666fdec541 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito in memory Jobs Service"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.ephemeral
diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml
index 5ab15692a14..b1a818e9f41 100644
--- a/kogito-jobs-service-infinispan-image.yaml
+++ b/kogito-jobs-service-infinispan-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-infinispan"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Jobs Service based on Infinispan"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.infinispan
diff --git a/kogito-jobs-service-mongodb-image.yaml b/kogito-jobs-service-mongodb-image.yaml
index d83a458412d..f4db8c4ce6a 100644
--- a/kogito-jobs-service-mongodb-image.yaml
+++ b/kogito-jobs-service-mongodb-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-mongodb"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Jobs Service based on MongoDB"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.mongodb
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index 56ea62d81e7..c53b5427d19 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Jobs Service based on Postgresql"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.postgresql
diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml
index 3a4de549f68..1f0eba29610 100644
--- a/kogito-management-console-image.yaml
+++ b/kogito-management-console-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-management-console"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Management Console"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.management.console
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
index 8871487f1c4..e2fd82c7022 100644
--- a/kogito-runtime-jvm-image.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-runtime-jvm"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito based on Quarkus or Springboot JVM image"
 
@@ -13,9 +13,9 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.10.Final"
+    value: "3.2.9.Final"
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -50,7 +50,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.s2i.core
diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml
index 62139b82f03..11f01135acd 100644
--- a/kogito-runtime-native-image.yaml
+++ b/kogito-runtime-native-image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-runtime-native"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito based on Quarkus native image"
 
@@ -13,9 +13,9 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.10.Final"
+    value: "3.2.9.Final"
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
index 7c4b288ad6a..bc3901ee540 100644
--- a/kogito-s2i-builder-image.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-s2i-builder"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Platform for building Kogito based on Quarkus or Springboot"
 
@@ -13,9 +13,9 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "2.16.10.Final"
+    value: "3.2.9.Final"
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -62,14 +62,15 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.graalvm.java11.installer
-      version: "22.3"
-    - name: org.kie.kogito.graalvm.scripts
+    - name: org.kie.kogito.graalvm.java17.installer
+      version: "23.0"
+    - name: org.kie.kogito.graalvm.common.scripts
     - name: org.kie.kogito.openjdk
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
-      version: "3.8.6"
+      version: "3.9.3"
+    - name: org.kie.kogito.maven.common
     - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.s2i.core
     - name: org.kie.kogito.s2i.builder
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 421d04480fb..e501efe0c88 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -1,6 +1,6 @@
   - name: builder
     from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-    version: "2.0.0-snapshot"
+    version: "999-SNAPSHOT"
     modules:
       repositories:
         - path: modules
@@ -10,10 +10,11 @@
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
         - name: org.kie.kogito.openjdk
-          version: "11"
+          version: "17"
         - name: org.kie.kogito.dynamic.resources
         - name: org.kie.kogito.maven
-          version: "3.8.6"
+          version: "3.9.3"
+        - name: org.kie.kogito.maven.common
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
         - name: org.kie.kogito.swf.builder.build-config
@@ -24,7 +25,7 @@
 
   - name: "quay.io/kiegroup/kogito-swf-builder"
     from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-    version: "2.0.0-snapshot"
+    version: "999-SNAPSHOT"
     description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
 
     labels:
@@ -33,9 +34,9 @@
       - name: "io.openshift.s2i.destination"
         value: "/tmp"
       - name: "io.quarkus.platform.version"
-        value: "2.16.10.Final"
+        value: "3.2.9.Final"
       - name: "org.kie.kogito.version"
-        value: "2.0.0-SNAPSHOT"
+        value: "999-SNAPSHOT"
       - name: "maintainer"
         value: "Apache KIE <dev@kie.apache.org>"
       - name: "io.k8s.description"
@@ -57,10 +58,11 @@
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
         - name: org.kie.kogito.openjdk
-          version: "11"
+          version: "17"
         - name: org.kie.kogito.dynamic.resources
         - name: org.kie.kogito.maven
-          version: "3.8.6"
+          version: "3.9.3"
+        - name: org.kie.kogito.maven.common
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
         - name: org.kie.kogito.swf.builder.runtime.community
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 2503a869925..3c5de04d0dd 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -1,6 +1,6 @@
   - name: builder
     from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-    version: "2.0.0-snapshot"
+    version: "999-SNAPSHOT"
     modules:
       repositories:
         - path: modules
@@ -10,10 +10,11 @@
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
         - name: org.kie.kogito.openjdk
-          version: "11"
+          version: "17"
         - name: org.kie.kogito.dynamic.resources
         - name: org.kie.kogito.maven
-          version: "3.8.6"
+          version: "3.9.3"
+        - name: org.kie.kogito.maven.common
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
         - name: org.kie.kogito.swf.devmode.build-config
@@ -24,14 +25,14 @@
 
   - name: "quay.io/kiegroup/kogito-swf-devmode"
     from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-    version: "2.0.0-snapshot"
+    version: "999-SNAPSHOT"
     description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
 
     labels:
       - name: "io.quarkus.platform.version"
-        value: "2.16.10.Final"
+        value: "3.2.9.Final"
       - name: "org.kie.kogito.version"
-        value: "2.0.0-SNAPSHOT"
+        value: "999-SNAPSHOT"
       - name: "maintainer"
         value: "Apache KIE <dev@kie.apache.org>"
       - name: "io.k8s.description"
@@ -55,10 +56,11 @@
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
         - name: org.kie.kogito.openjdk
-          version: "11"
+          version: "17"
         - name: org.kie.kogito.dynamic.resources
         - name: org.kie.kogito.maven
-          version: "3.8.6"
+          version: "3.9.3"
+        - name: org.kie.kogito.maven.common
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
         - name: org.kie.kogito.swf.devmode.runtime.common
diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
index d4a0d1a0b5b..82468d3a225 100644
--- a/kogito-task-console-image.yaml
+++ b/kogito-task-console-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-task-console"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Task Console"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.task.console
diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml
index 0fcec594487..b67c62c6790 100644
--- a/kogito-trusty-infinispan-image.yaml
+++ b/kogito-trusty-infinispan-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-infinispan"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -53,7 +53,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.infinispan
diff --git a/kogito-trusty-postgresql-image.yaml b/kogito-trusty-postgresql-image.yaml
index 6f8848df6fb..84503be7c56 100644
--- a/kogito-trusty-postgresql-image.yaml
+++ b/kogito-trusty-postgresql-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-postgresql"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -35,7 +35,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.postgresql
diff --git a/kogito-trusty-redis-image.yaml b/kogito-trusty-redis-image.yaml
index eb5bfc69b5b..ddba8af99a0 100644
--- a/kogito-trusty-redis-image.yaml
+++ b/kogito-trusty-redis-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-redis"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Trusty Service for Redis persistence provider"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.redis
diff --git a/kogito-trusty-ui-image.yaml b/kogito-trusty-ui-image.yaml
index 0386231f575..f74cac804b8 100644
--- a/kogito-trusty-ui-image.yaml
+++ b/kogito-trusty-ui-image.yaml
@@ -1,13 +1,13 @@
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-ui"
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
 description: "Runtime image for Kogito Trusty UI"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.ui
diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
index 9e7bf634c1b..9b59a6519b2 100644
--- a/logic-data-index-ephemeral-rhel8-image.yaml
+++ b/logic-data-index-ephemeral-rhel8-image.yaml
@@ -19,7 +19,7 @@ labels:
 - name: "io.openshift.expose-services"
   value: "8080:http"
 - name: "org.kie.kogito.version"
-  value: "2.0.0-SNAPSHOT"
+  value: "999-SNAPSHOT"
 
 envs:
   - name: "SCRIPT_DEBUG"
diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml
index ad674d6b37c..57cfdb14d38 100644
--- a/logic-swf-builder-rhel8-image.yaml
+++ b/logic-swf-builder-rhel8-image.yaml
@@ -12,7 +12,7 @@ labels:
   - name: "io.quarkus.platform.version"
     value: "2.16.7.Final"
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "com.redhat.component"
     value: "openshift-serverless-1-logic-swf-builder-rhel8-container"
   - name: "maintainer"
diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml
index 88e6e4e942e..b241bd98a4b 100644
--- a/logic-swf-devmode-rhel8-image.yaml
+++ b/logic-swf-devmode-rhel8-image.yaml
@@ -8,7 +8,7 @@ labels:
   - name: "io.quarkus.platform.version"
     value: "2.16.7.Final"
   - name: "org.kie.kogito.version"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
   - name: "io.k8s.description"
     value: "Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled."
   - name: "io.k8s.display-name"
diff --git a/modules/kogito-custom-truststore/module.yaml b/modules/kogito-custom-truststore/module.yaml
index da19011e03c..52fcb334fa0 100644
--- a/modules/kogito-custom-truststore/module.yaml
+++ b/modules/kogito-custom-truststore/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.security.custom.truststores
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Adds the capability of configuring a custom Java Truststore to replace the original cacerts"
 
 envs:
diff --git a/modules/kogito-data-index-common/module.yaml b/modules/kogito-data-index-common/module.yaml
index 9a23ada0485..e08c45b6456 100644
--- a/modules/kogito-data-index-common/module.yaml
+++ b/modules/kogito-data-index-common/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.common
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Common modules for data-index persistence provider images, any addition that is common must be added in this module"
 
 envs:
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
index 165e87c2aa3..e5f65ce44c1 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.community.ephemeral
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 46a69af7d75..1f7c17cc426 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.infinispan
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 2a818e8b648..77cf50791a0 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.mongodb
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index 9e6821b579e..e53ca0d0c5b 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.oracle
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index c3be5d2e77b..2b03089b8eb 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dataindex.postgresql
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-dynamic-resources/added/java-default-options b/modules/kogito-dynamic-resources/added/java-default-options
index 5b4c78aa065..620515414d0 100644
--- a/modules/kogito-dynamic-resources/added/java-default-options
+++ b/modules/kogito-dynamic-resources/added/java-default-options
@@ -139,7 +139,7 @@ gc_config() {
     local timeRatio=${GC_TIME_RATIO:-4}
     local adaptiveSizePolicyWeight=${GC_ADAPTIVE_SIZE_POLICY_WEIGHT:-90}
     local maxMetaspaceSize
-    local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelOldGC}"
+    local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelGC}"
     # for compat reasons we don't set a default value for metaspaceSize
     local metaspaceSize
 
diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml
index a8ae2692e6c..ada2e7e5e5e 100644
--- a/modules/kogito-dynamic-resources/module.yaml
+++ b/modules/kogito-dynamic-resources/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.dynamic.resources
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 description: -| Module retrieved from https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash However it contains a few customizations to fit Kogito needs.
 
@@ -55,5 +55,5 @@ envs:
     description: The maximum metaspace size.
     example: "100"
   - name: GC_CONTAINER_OPTIONS
-    description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelOldGC`.
+    description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelGC`.
     example: -XX:+UseG1GC
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 66ecaaed73d..12363e12173 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.explainability
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-graalvm-installer/23.0-java-17/configure b/modules/kogito-graalvm-installer/23.0-java-17/configure
new file mode 100644
index 00000000000..fb9f8993663
--- /dev/null
+++ b/modules/kogito-graalvm-installer/23.0-java-17/configure
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+
+architecture=$(uname -i)
+
+if [ "$architecture" = "x86_64" ]; then
+    arch='amd64'
+elif [ "$architecture" = "aarch64" ]; then
+    arch='aarch64'
+else
+    exit 0
+fi
+
+SOURCES_DIR=/tmp/artifacts
+SCRIPT_DIR=$(dirname "${0}")
+
+tar xzf "${SOURCES_DIR}"/mandrel-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}"-Final.tar.gz -C /usr/share
+mv /usr/share/mandrel-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}-Final" /usr/share/graalvm
+
+#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
+# Java 17 + Mandrel: libsunec.so is not distributed in Mandrel
+#mkdir -p "${KOGITO_HOME}"/ssl-libs
+#cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
+cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
diff --git a/modules/kogito-graalvm-installer/23.0-java-17/module.yaml b/modules/kogito-graalvm-installer/23.0-java-17/module.yaml
new file mode 100644
index 00000000000..c3151285e2c
--- /dev/null
+++ b/modules/kogito-graalvm-installer/23.0-java-17/module.yaml
@@ -0,0 +1,33 @@
+schema_version: 1
+name: org.kie.kogito.graalvm.java17.installer
+version: "23.0"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_HOME"
+    value: "/usr/share/graalvm"
+  - name: "GRAALVM_VERSION"
+    value: "23.0.2.1"
+  - name: "GRAALVM_JAVA_VERSION"
+    value: "17"
+
+packages:
+  manager: microdnf
+  install:
+    - freetype-devel
+    - gcc
+    - glibc-devel
+    - libstdc++-static
+    - zlib-devel
+
+artifacts:
+  - name: mandrel-java17-linux-amd64-23.0.2.1-Final.tar.gz
+    url: https://github.com/graalvm/mandrel/releases/download/mandrel-23.0.2.1-Final/mandrel-java17-linux-amd64-23.0.2.1-Final.tar.gz
+    md5: b026ea8d357b13702f9cd05f3d87f64a
+  - name: mandrel-java17-linux-aarch64-23.0.2.1-Final.tar.gz
+    url: https://github.com/graalvm/mandrel/releases/download/mandrel-23.0.2.1-Final/mandrel-java17-linux-aarch64-23.0.2.1-Final.tar.gz
+    md5: e3143fe4bb21267087cca3ca66ae6af2
+
+execute:
+  - script: configure
diff --git a/modules/kogito-graalvm-scripts/configure b/modules/kogito-graalvm-scripts/22.3-java-11/configure
similarity index 81%
rename from modules/kogito-graalvm-scripts/configure
rename to modules/kogito-graalvm-scripts/22.3-java-11/configure
index 025dea6b93c..d7026ea9c7f 100644
--- a/modules/kogito-graalvm-scripts/configure
+++ b/modules/kogito-graalvm-scripts/22.3-java-11/configure
@@ -13,8 +13,5 @@ else
 fi
 
 SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
 
 /usr/share/graalvm/bin/gu -L install "${SOURCES_DIR}"/native-image-installable-svm-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}".jar
diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml
similarity index 76%
rename from modules/kogito-graalvm-scripts/module.yaml
rename to modules/kogito-graalvm-scripts/22.3-java-11/module.yaml
index b29ae4316a6..ec2680345cf 100644
--- a/modules/kogito-graalvm-scripts/module.yaml
+++ b/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
-version: "2.0.0-snapshot"
+version: "22.3-java-11"
 
 execute:
   - script: configure
diff --git a/modules/kogito-graalvm-scripts/added/memory-limit.sh b/modules/kogito-graalvm-scripts/common/added/memory-limit.sh
similarity index 100%
rename from modules/kogito-graalvm-scripts/added/memory-limit.sh
rename to modules/kogito-graalvm-scripts/common/added/memory-limit.sh
diff --git a/modules/kogito-graalvm-scripts/common/configure b/modules/kogito-graalvm-scripts/common/configure
new file mode 100644
index 00000000000..b742d4ca98f
--- /dev/null
+++ b/modules/kogito-graalvm-scripts/common/configure
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR=$(dirname "${0}")
+
+cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
diff --git a/modules/kogito-graalvm-scripts/common/module.yaml b/modules/kogito-graalvm-scripts/common/module.yaml
new file mode 100644
index 00000000000..edeafd8856a
--- /dev/null
+++ b/modules/kogito-graalvm-scripts/common/module.yaml
@@ -0,0 +1,6 @@
+schema_version: 1
+name: org.kie.kogito.graalvm.common.scripts
+version: "999-SNAPSHOT"
+
+execute:
+  - script: configure
diff --git a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats b/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats
similarity index 89%
rename from modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
rename to modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats
index f500322d9a6..e08db0ddf29 100644
--- a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats
+++ b/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats
@@ -3,8 +3,8 @@
 export KOGITO_HOME=/tmp/kogito
 export JBOSS_CONTAINER_JAVA_JVM_MODULE=${KOGITO_HOME}/launch
 mkdir -p "${KOGITO_HOME}"/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-cp $BATS_TEST_DIRNAME/../../../kogito-dynamic-resources/added/container-limits "${KOGITO_HOME}"/launch/
+cp $BATS_TEST_DIRNAME/../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+cp $BATS_TEST_DIRNAME/../../../../kogito-dynamic-resources/added/container-limits "${KOGITO_HOME}"/launch/
 
 # imports
 source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index ce03a19fd75..a6d6a21754f 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.image.dependencies
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: holds common dependencies across images
 
 execute:
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index eb2cbb4b0aa..77f8bedae2f 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jit-runner
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml
index 56bdb28966b..140c270223f 100644
--- a/modules/kogito-jobs-service-all-in-one/module.yaml
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.allinone
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 artifacts:
   - path: /tmp/build/jobs-service-inmemory-all-in-one/jobs-service-inmemory-quarkus-app.zip
diff --git a/modules/kogito-jobs-service-common/module.yaml b/modules/kogito-jobs-service-common/module.yaml
index c423842dbd4..42c6ffd5074 100644
--- a/modules/kogito-jobs-service-common/module.yaml
+++ b/modules/kogito-jobs-service-common/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.common
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "This module needs to be run last, if adding it, add in the last position."
 
 execute:
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index cb817ae3a9d..6d4ac029262 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.ephemeral
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index 23b09619017..d12ef2619ae 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.infinispan
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index e3402a6aae8..3f9ecbec3d8 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.mongodb
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 6731266938b..5a39d9389eb 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.jobs.service.postgresql
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 2a4de0e6c12..6f67c9d1ae0 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 execute:
   - script: configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index 9d9c9802c31..63c4df00bcc 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index d8f6defdd7e..41afea6be38 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.logging
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 execute:
   - script: configure
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 941d55a3a14..b9cf666a400 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.management.console
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 147d1b6522f..5526d8e74c2 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -5,77 +5,10 @@ version: "3.8.6"
 envs:
   - name: "MAVEN_VERSION"
     value: "3.8.6"
-  - name: "MAVEN_HOME"
-    value: "/usr/share/maven"
-  - name: "MAVEN_SETTINGS_PATH"
-    description: "The location of the settings.xml file"
-    value: '${KOGITO_HOME}/.m2/settings.xml'
-  - name: "HTTP_PROXY"
-    description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
-    example: "http://127.0.0.1:8080"
-  - name: "HTTP_PROXY_HOST"
-    description: "Proxy Host, don't need to be set if HTTP_PROXY is used."
-    example: "127.0.0.1"
-  - name: "HTTP_PROXY_PORT"
-    description: "Proxy Port, don't need to be set if HTTP_PROXY is used."
-    example: "8181"
-  - name: "HTTP_PROXY_PASSWORD"
-    description: "Proxy Password"
-  - name: "HTTP_PROXY_USERNAME"
-    description: "Proxy Username"
-  - name: "HTTP_PROXY_NONPROXYHOSTS"
-    description: "Non proxy hosts, list of hosts that will ot be proxied."
-    example: "localhost"
-  - name: "MAVEN_MIRROR_URL"
-    description: "The base URL of a mirror used for retrieving artifacts."
-    example: "http://10.0.0.1:8080/repository/internal/"
-  - name: "MAVEN_DOWNLOAD_OUTPUT"
-    description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
-    example: "true"
-  - name: "DEFAULT_MAVEN_REPO_URL"
-    value: "https://repository.apache.org/content/groups/public/"
-    description: "Defines the default Maven repository for Kogito artifacts."
-  - name: "MAVEN_REPO_URL"
-    description: "Defines an extra Maven repository."
-    example: "https://nexus.test.com/group/public"
-  - name: "MAVEN_REPO_ID"
-    description: "Defines the id of the new Repository"
-    example: "nexus-test"
-  - name: "MAVEN_REPO_LAYOUT"
-    description: "The type of layout this repository uses for locating and storing artifacts - can be 'legacy' or 'default'.Defaults to 'default'."
-    example: "legacy"
-  - name: "MAVEN_REPO_RELEASES_ENABLED"
-    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
-    example: "false"
-  - name: "MAVEN_REPO_RELEASES_UPDATE_POLICY"
-    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
-    example: "never"
-  - name: "MAVEN_REPO_RELEASES_CHECKSUM_POLICY"
-    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
-    example: "fail"
-  - name: "MAVEN_REPO_SNAPSHOTS_ENABLED"
-    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
-    example: "false"
-  - name: "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY"
-    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
-    example: "never"
-  - name: "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY"
-    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
-    example: "fail"
-  - name: "MAVEN_REPOS"
-    description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories."
-    example: "CENTRAL,INTERNAL"
-  - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
-    description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
-    example: "true"
-  - name: "MAVEN_OFFLINE_MODE"
-    description: "When set to true, tells Maven to work in offline mode. See Maven `-o` option for more information."
-    example: "true"
+
 # unfortunately by now the version needs to be hardcoded.
 artifacts:
   - name: apache-maven-3.8.6-bin.tar.gz
     url: https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz
     md5: 0e07de4a7b5c84ebed737a2002f52019
 
-execute:
-  - script: configure
diff --git a/modules/kogito-maven/3.9.x/module.yaml b/modules/kogito-maven/3.9.x/module.yaml
new file mode 100644
index 00000000000..2c90c69afc3
--- /dev/null
+++ b/modules/kogito-maven/3.9.x/module.yaml
@@ -0,0 +1,14 @@
+schema_version: 1
+name: org.kie.kogito.maven
+version: "3.9.3"
+
+envs:
+  - name: "MAVEN_VERSION"
+    value: "3.9.3"
+
+# unfortunately by now the version needs to be hardcoded.
+artifacts:
+  - name: apache-maven-3.9.3-bin.tar.gz
+    url: https://archive.apache.org/dist/maven/maven-3/3.9.3/binaries/apache-maven-3.9.3-bin.tar.gz
+    md5: f3fbff830d9a0dc2c6c99a76e27d0c01
+
diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/common/added/configure-maven.sh
similarity index 100%
rename from modules/kogito-maven/3.8.x/added/configure-maven.sh
rename to modules/kogito-maven/common/added/configure-maven.sh
diff --git a/modules/kogito-maven/3.8.x/configure b/modules/kogito-maven/common/configure
similarity index 100%
rename from modules/kogito-maven/3.8.x/configure
rename to modules/kogito-maven/common/configure
diff --git a/modules/kogito-maven/3.8.x/maven/settings.xml b/modules/kogito-maven/common/maven/settings.xml
similarity index 100%
rename from modules/kogito-maven/3.8.x/maven/settings.xml
rename to modules/kogito-maven/common/maven/settings.xml
diff --git a/modules/kogito-maven/common/module.yaml b/modules/kogito-maven/common/module.yaml
new file mode 100644
index 00000000000..fcc35b2202e
--- /dev/null
+++ b/modules/kogito-maven/common/module.yaml
@@ -0,0 +1,76 @@
+schema_version: 1
+name: org.kie.kogito.maven.common
+version: "999-SNAPSHOT"
+
+envs:
+  - name: "MAVEN_VERSION"
+    description: "The Maven version to setup with this module"
+  - name: "MAVEN_HOME"
+    value: "/usr/share/maven"
+  - name: "MAVEN_SETTINGS_PATH"
+    description: "The location of the settings.xml file"
+    value: '${KOGITO_HOME}/.m2/settings.xml'
+  - name: "HTTP_PROXY"
+    description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
+    example: "http://127.0.0.1:8080"
+  - name: "HTTP_PROXY_HOST"
+    description: "Proxy Host, don't need to be set if HTTP_PROXY is used."
+    example: "127.0.0.1"
+  - name: "HTTP_PROXY_PORT"
+    description: "Proxy Port, don't need to be set if HTTP_PROXY is used."
+    example: "8181"
+  - name: "HTTP_PROXY_PASSWORD"
+    description: "Proxy Password"
+  - name: "HTTP_PROXY_USERNAME"
+    description: "Proxy Username"
+  - name: "HTTP_PROXY_NONPROXYHOSTS"
+    description: "Non proxy hosts, list of hosts that will ot be proxied."
+    example: "localhost"
+  - name: "MAVEN_MIRROR_URL"
+    description: "The base URL of a mirror used for retrieving artifacts."
+    example: "http://10.0.0.1:8080/repository/internal/"
+  - name: "MAVEN_DOWNLOAD_OUTPUT"
+    description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
+    example: "true"
+  - name: "DEFAULT_MAVEN_REPO_URL"
+    value: "https://repository.apache.org/content/groups/public/"
+    description: "Defines the default Maven repository for Kogito artifacts."
+  - name: "MAVEN_REPO_URL"
+    description: "Defines an extra Maven repository."
+    example: "https://nexus.test.com/group/public"
+  - name: "MAVEN_REPO_ID"
+    description: "Defines the id of the new Repository"
+    example: "nexus-test"
+  - name: "MAVEN_REPO_LAYOUT"
+    description: "The type of layout this repository uses for locating and storing artifacts - can be 'legacy' or 'default'.Defaults to 'default'."
+    example: "legacy"
+  - name: "MAVEN_REPO_RELEASES_ENABLED"
+    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
+    example: "false"
+  - name: "MAVEN_REPO_RELEASES_UPDATE_POLICY"
+    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
+    example: "never"
+  - name: "MAVEN_REPO_RELEASES_CHECKSUM_POLICY"
+    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
+    example: "fail"
+  - name: "MAVEN_REPO_SNAPSHOTS_ENABLED"
+    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
+    example: "false"
+  - name: "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY"
+    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
+    example: "never"
+  - name: "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY"
+    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
+    example: "fail"
+  - name: "MAVEN_REPOS"
+    description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories."
+    example: "CENTRAL,INTERNAL"
+  - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
+    description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
+    example: "true"
+  - name: "MAVEN_OFFLINE_MODE"
+    description: "When set to true, tells Maven to work in offline mode. See Maven `-o` option for more information."
+    example: "true"
+
+execute:
+  - script: configure
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index f1dcec0ab60..7d666ae1020 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -1,13 +1,13 @@
 #!/usr/bin/env bats
 
 # imports
-source $BATS_TEST_DIRNAME/../../3.8.x/added/configure-maven.sh
+source $BATS_TEST_DIRNAME/../../common/added/configure-maven.sh
 
 
 setup() {
     export HOME=$BATS_TMPDIR/maven
     mkdir -p ${HOME}/.m2/
-    cp $BATS_TEST_DIRNAME/../../3.8.x/maven/settings.xml ${HOME}/.m2/
+    cp $BATS_TEST_DIRNAME/../../common/maven/settings.xml ${HOME}/.m2/
     export MAVEN_SETTINGS_PATH="${HOME}/.m2/settings.xml"
 }
 
diff --git a/modules/kogito-openjdk/17-headless/clean.sh b/modules/kogito-openjdk/17-headless/clean.sh
new file mode 100644
index 00000000000..d99eb4fb10e
--- /dev/null
+++ b/modules/kogito-openjdk/17-headless/clean.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+microdnf clean all
+rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/17-headless/module.yaml b/modules/kogito-openjdk/17-headless/module.yaml
new file mode 100644
index 00000000000..2df5eaf2490
--- /dev/null
+++ b/modules/kogito-openjdk/17-headless/module.yaml
@@ -0,0 +1,26 @@
+schema_version: 1
+name: org.kie.kogito.openjdk.headless
+version: "17"
+
+labels:
+  - name: "org.jboss.product"
+    value: "openjdk"
+  - name: "org.jboss.product.version"
+    value: "17"
+  - name: "org.jboss.product.openjdk.version"
+    value: "17"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/lib/jvm/java-17"
+  - name: "JAVA_VENDOR"
+    value: "openjdk"
+  - name: "JAVA_VERSION"
+    value: "17"
+
+execute:
+  - script: clean.sh
+
+packages:
+  install:
+    - java-17-openjdk-headless
diff --git a/modules/kogito-openjdk/17/clean.sh b/modules/kogito-openjdk/17/clean.sh
new file mode 100644
index 00000000000..d99eb4fb10e
--- /dev/null
+++ b/modules/kogito-openjdk/17/clean.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+microdnf clean all
+rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/17/module.yaml b/modules/kogito-openjdk/17/module.yaml
new file mode 100644
index 00000000000..c182e22c9ad
--- /dev/null
+++ b/modules/kogito-openjdk/17/module.yaml
@@ -0,0 +1,26 @@
+schema_version: 1
+name: org.kie.kogito.openjdk
+version: "17"
+
+labels:
+  - name: "org.jboss.product"
+    value: "openjdk"
+  - name: "org.jboss.product.version"
+    value: "17"
+  - name: "org.jboss.product.openjdk.version"
+    value: "17"
+
+envs:
+  - name: "JAVA_HOME"
+    value: "/usr/lib/jvm/java-17"
+  - name: "JAVA_VENDOR"
+    value: "openjdk"
+  - name: "JAVA_VERSION"
+    value: "17"
+
+execute:
+  - script: clean.sh
+
+packages:
+  install:
+    - java-17-openjdk-devel
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index fd4705bef4f..f6d242dc962 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.persistence
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 modules:
   install:
diff --git a/modules/kogito-pkg-update/module.yaml b/modules/kogito-pkg-update/module.yaml
index 48d86464e69..1d14cf80555 100644
--- a/modules/kogito-pkg-update/module.yaml
+++ b/modules/kogito-pkg-update/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.pkg-update
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Perform a system update via the package manager."
 
 execute:
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index 6face3dd54d..745c9c1852c 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -1,12 +1,12 @@
 schema_version: 1
 name: org.kie.kogito.project.versions
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Kogito Project versions information"
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "2.0.0-SNAPSHOT"
+    value: "999-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "2.16.10.Final"
+    value: "3.2.9.Final"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
diff --git a/modules/kogito-runtime-jvm/module.yaml b/modules/kogito-runtime-jvm/module.yaml
index c639277d2ce..7e2becb2203 100644
--- a/modules/kogito-runtime-jvm/module.yaml
+++ b/modules/kogito-runtime-jvm/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.runtime.jvm
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 execute:
   - script: configure
diff --git a/modules/kogito-runtime-native/added/kogito-app-launch.sh b/modules/kogito-runtime-native/added/kogito-app-launch.sh
index be0dee0fc53..90c4ca8b461 100644
--- a/modules/kogito-runtime-native/added/kogito-app-launch.sh
+++ b/modules/kogito-runtime-native/added/kogito-app-launch.sh
@@ -22,5 +22,5 @@ source "${KOGITO_HOME}"/launch/configure.sh
 
 # shellcheck disable=SC2086
 exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_NATIVE_PROPS} \
-    -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
+    -Dquarkus.http.host=0.0.0.0 \
     -Dquarkus.http.port=8080
diff --git a/modules/kogito-runtime-native/module.yaml b/modules/kogito-runtime-native/module.yaml
index edac72546f6..4f8bc3813ed 100644
--- a/modules/kogito-runtime-native/module.yaml
+++ b/modules/kogito-runtime-native/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.runtime.native
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 execute:
   - script: configure
diff --git a/modules/kogito-s2i-builder/added/kogito-app-launch.sh b/modules/kogito-s2i-builder/added/kogito-app-launch.sh
index 71a1766e83b..13dec2f9982 100644
--- a/modules/kogito-s2i-builder/added/kogito-app-launch.sh
+++ b/modules/kogito-s2i-builder/added/kogito-app-launch.sh
@@ -36,7 +36,7 @@ case ${runtime_type} in
             fi
             # shellcheck disable=SC2086
             exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
-                -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \
+                -Dquarkus.http.host=0.0.0.0 \
                 -Dquarkus.http.port=8080 \
                 -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
         else
diff --git a/modules/kogito-s2i-builder/module.yaml b/modules/kogito-s2i-builder/module.yaml
index e5f1ca10058..55e5cb99ea2 100644
--- a/modules/kogito-s2i-builder/module.yaml
+++ b/modules/kogito-s2i-builder/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.builder
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 labels:
   - name: "io.openshift.s2i.scripts-url"
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index d25870f82d4..2e6737052ef 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -136,7 +136,7 @@ function build_kogito_app() {
                     -DprojectGroupId=$PROJECT_GROUP_ID \
                     -DprojectArtifactId=$PROJECT_ARTIFACT_ID \
                     -DprojectVersion=$PROJECT_VERSION \
-                    -Dextensions="kogito,quarkus-smallrye-health,quarkus-smallrye-openapi,quarkus-resteasy,quarkus-resteasy-jackson"
+                    -Dextensions="org.kie.kogito:kogito-quarkus:${KOGITO_VERSION},quarkus-smallrye-health,quarkus-smallrye-openapi,quarkus-resteasy,quarkus-resteasy-jackson"
 
             if [ ! -z ${QUARKUS_EXTRA_EXTENSIONS} ]; then
                 log_info "----> Adding extra Quarkus extensions: ${QUARKUS_EXTRA_EXTENSIONS}"
@@ -218,7 +218,7 @@ function build_kogito_app() {
 
             $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
                 "${quarkus_plugin}":"${quarkus_platform_version}":add-extension \
-                -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow"
+                -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION}"
         fi
 
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${MAVEN_SETTINGS_PATH}" \
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index c2b2948539c..b6ee030b437 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.s2i.core
-version: '2.0.0-snapshot'
+version: '999-SNAPSHOT'
 description: Kogito s2i core module. All s2i files shoul be placed here.
 
 labels:
diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index b90ef48bc98..b61c27cbae3 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.builder.build-config
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Kogito Serverless Workflow builder image build configuration"
 
 envs:
@@ -9,4 +9,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}
+    value: quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}
diff --git a/modules/kogito-swf/builder/runtime/community/module.yaml b/modules/kogito-swf/builder/runtime/community/module.yaml
index fe19031ac0d..62ccde52f94 100644
--- a/modules/kogito-swf/builder/runtime/community/module.yaml
+++ b/modules/kogito-swf/builder/runtime/community/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.builder.runtime.community
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Kogito Serverless Workflow builder runtime module"
 
 artifacts:
diff --git a/modules/kogito-swf/common/build/module.yaml b/modules/kogito-swf/common/build/module.yaml
index ad782c42a84..433afad89fa 100644
--- a/modules/kogito-swf/common/build/module.yaml
+++ b/modules/kogito-swf/common/build/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.common.build
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Kogito Serverless Workflow image build process"
 
 packages:
diff --git a/modules/kogito-swf/common/scripts/added/create-app.sh b/modules/kogito-swf/common/scripts/added/create-app.sh
index 6153a02d934..5a4ce738a1a 100755
--- a/modules/kogito-swf/common/scripts/added/create-app.sh
+++ b/modules/kogito-swf/common/scripts/added/create-app.sh
@@ -104,9 +104,11 @@ if [ "${SCRIPT_DEBUG^^}" = "TRUE" ]; then
     cat pom.xml
 fi
 
+# we force the dependencies download beforehand, so we won't have problems when running or building our apps in offline mode
+# see:
+#   https://quarkus.io/guides/maven-tooling#downloading-maven-artifact-dependencies-for-offline-development-and-testing
+#   https://maven.apache.org/plugins/maven-dependency-plugin/go-offline-mojo.html
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
   -nsu \
   -s "${MAVEN_SETTINGS_PATH}" \
-  -DskipTests \
-  -Dquarkus.container-image.build=false \
-   clean install
+  clean dependency:go-offline io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":go-offline
diff --git a/modules/kogito-swf/common/scripts/module.yaml b/modules/kogito-swf/common/scripts/module.yaml
index 46b0e37ca22..7f5b20b71b5 100644
--- a/modules/kogito-swf/common/scripts/module.yaml
+++ b/modules/kogito-swf/common/scripts/module.yaml
@@ -1,11 +1,11 @@
 schema_version: 1
 name: org.kie.kogito.swf.common.scripts
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Kogito Serverless Workflow image common scripts"
 
 envs:
   - name: QUARKUS_EXTENSIONS
-    example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing'
+    example: 'quarkus-kubernetes,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION}'
     description: To add extension to your application
 
   - name: PROJECT_GROUP_ID
diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
index 3c67ff1eccb..1b45a00b751 100644
--- a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
+++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
@@ -22,7 +22,7 @@ teardown() {
     source ${KOGITO_HOME}/launch/jvm-settings.sh
 
     echo "MAVEN_OPTS is: ${MAVEN_OPTS}"
-    [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
+    [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
 }
 
 @test "run jvm-settings with custom conf" {
@@ -34,5 +34,5 @@ teardown() {
     source ${KOGITO_HOME}/launch/jvm-settings.sh
 
     echo "MAVEN_OPTS is: ${MAVEN_OPTS}"
-    [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
+    [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
 }
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index 740e48b4ff7..9e66192550e 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.devmode.build-config
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Kogito Serverless Workflow devmode image build configuration"
 
 envs:
@@ -9,4 +9,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
+    value: org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow-devui:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
diff --git a/modules/kogito-swf/devmode/runtime/common/module.yaml b/modules/kogito-swf/devmode/runtime/common/module.yaml
index c99b9da2508..c8e8083a65c 100644
--- a/modules/kogito-swf/devmode/runtime/common/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/common/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.devmode.runtime.common
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Kogito Serverless Workflow devmode common module"
 
 execute:
diff --git a/modules/kogito-swf/devmode/runtime/community/module.yaml b/modules/kogito-swf/devmode/runtime/community/module.yaml
index 7c6026c8aa4..9b8e00e9ec3 100644
--- a/modules/kogito-swf/devmode/runtime/community/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/community/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.swf.devmode.runtime.community
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Kogito Serverless Workflow devmode with required extensions"
 
 envs:
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index a1da8a916bd..8d01bd7db12 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 execute:
   - script: add-user
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 1d8ebd5a81c..c4cbee70f5b 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.task.console
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-trusty-common/module.yaml b/modules/kogito-trusty-common/module.yaml
index 282ebc18185..dad4cba4370 100644
--- a/modules/kogito-trusty-common/module.yaml
+++ b/modules/kogito-trusty-common/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.common
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 description: "Common modules for trusty provider images, any addition that is common must be added in this module"
 
 execute:
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 0338735d429..9a4b4ec4100 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.infinispan
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 0477bc4bb64..87cae0e0ee0 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.postgresql
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 20ebe8c8638..7fdc03988f3 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.redis
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6ee43fbee47..6e9b7ead90f 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -1,6 +1,6 @@
 schema_version: 1
 name: org.kie.kogito.trusty.ui
-version: "2.0.0-snapshot"
+version: "999-SNAPSHOT"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/scripts/README.md b/scripts/README.md
index 6b13cceba4d..f0056efc310 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -191,10 +191,10 @@ This will set the default artifacts version.
 ##### Update quarkus version
 
 ```bash
-$ python update-repository.py --quarkus-platform-version 2.16.7.Final
+$ python update-repository.py --quarkus-platform-version 3.2.9.Final
 ```
 
-This will set the image quarkus version to 2.16.0.Final.
+This will set the image quarkus version to 3.2.9.Final.
 
 ##### Update Examples URI and Ref
 
diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 8f127f0ee80..c58ddcf9bde 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -25,9 +25,9 @@ properties_with_versions=("compiler-plugin.version:3.11.0" "surefire-plugin.vers
 # arch specific dependencies
 quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch64:1.8.0"
 # common extensions used by the kogito-swf-builder and kogito-swf-devmode
-quarkus_extensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
+quarkus_extensions="quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${kogito_version},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${kogito_version},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
 # dev mode purpose extensions used only by the kogito-swf-devmode
-kogito_swf_devmode_extensions="kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
+kogito_swf_devmode_extensions="org.kie.kogito:kogito-quarkus-serverless-workflow-devui:${kogito_version},org.kie.kogito:kogito-addons-quarkus-source-files:${kogito_version},org.kie.kogito:kogito-addons-quarkus-process-management:${kogito_version},org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
 # builder/prod extensitons used only by the kogito-swf-builder
 kogito_swf_builder_extensions="org.kie.kogito:kogito-addons-quarkus-events-process:${kogito_version},org.kie.kogito:kogito-addons-quarkus-process-management:${kogito_version},org.kie.kogito:kogito-addons-quarkus-source-files:${kogito_version}"
 
diff --git a/scripts/logic/builder-maven-repo/pom.xml b/scripts/logic/builder-maven-repo/pom.xml
index a13ec8694a9..6f3297af4f4 100644
--- a/scripts/logic/builder-maven-repo/pom.xml
+++ b/scripts/logic/builder-maven-repo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.kie.kogito</groupId>
         <artifactId>kogito-image-build-artifacts-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>999-SNAPSHOT</version>
     </parent>
 
     <artifactId>kogito-builder-maven-repository</artifactId>
diff --git a/scripts/logic/builder-quarkus-app/pom.xml b/scripts/logic/builder-quarkus-app/pom.xml
index a243f0883bc..20158d3c594 100644
--- a/scripts/logic/builder-quarkus-app/pom.xml
+++ b/scripts/logic/builder-quarkus-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.kie.kogito</groupId>
         <artifactId>kogito-image-build-artifacts-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>999-SNAPSHOT</version>
     </parent>
 
     <artifactId>kogito-builder-quarkus-app</artifactId>
diff --git a/scripts/logic/devmode-maven-repo/pom.xml b/scripts/logic/devmode-maven-repo/pom.xml
index d666709f98d..287e8d24b0b 100644
--- a/scripts/logic/devmode-maven-repo/pom.xml
+++ b/scripts/logic/devmode-maven-repo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.kie.kogito</groupId>
         <artifactId>kogito-image-build-artifacts-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>999-SNAPSHOT</version>
     </parent>
 
     <artifactId>kogito-devmode-maven-repository</artifactId>
diff --git a/scripts/logic/devmode-quarkus-app/pom.xml b/scripts/logic/devmode-quarkus-app/pom.xml
index b059e3cffc4..098ccfc026f 100644
--- a/scripts/logic/devmode-quarkus-app/pom.xml
+++ b/scripts/logic/devmode-quarkus-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.kie.kogito</groupId>
         <artifactId>kogito-image-build-artifacts-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>999-SNAPSHOT</version>
     </parent>
 
     <artifactId>kogito-devmode-quarkus-app</artifactId>
diff --git a/scripts/logic/pom.xml b/scripts/logic/pom.xml
index 724a80fa68f..0588d4c6069 100644
--- a/scripts/logic/pom.xml
+++ b/scripts/logic/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.kie.kogito</groupId>
     <artifactId>kogito-image-build-artifacts-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>999-SNAPSHOT</version>
 
     <name>Kogito image build artifacts</name>
     <description>Maven project to build a Quarkus App with Kogito Serverless Worflow</description>
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 12e6684b397..0351bf5be24 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -17,7 +17,7 @@ echo "----> running bats on kogito-explainability"
 ./bats/bin/bats modules/kogito-explainability/tests/bats
 
 echo "----> running bats on kogito-graalvm-scripts"
-./bats/bin/bats modules/kogito-graalvm-scripts/tests/bats
+./bats/bin/bats modules/kogito-graalvm-scripts/common/tests/bats
 
 echo "----> running bats on kogito-jobs-service-common"
 ./bats/bin/bats modules/kogito-jobs-service-common/tests/bats
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
index 5ec16cfb9d9..589f444a972 100755
--- a/scripts/setup-maven.sh
+++ b/scripts/setup-maven.sh
@@ -2,8 +2,7 @@
 # Holds common maven configuration for CI;
 # Usage: . setup-maven.sh
 
-MAVEN_VERSION="3.8.x"
-MVN_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-maven/${MAVEN_VERSION}"
+MVN_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-maven/common"
 export MAVEN_OPTIONS="${BUILD_MVN_OPTS} -DskipTests"
 # Do not remove below, this can be updated by the python scripts
 MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
index f7a7bf7b63a..654c3af1029 100644
--- a/tests/features/common-build-runtime.feature
+++ b/tests/features/common-build-runtime.feature
@@ -5,6 +5,9 @@
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: Common tests for Kogito builder and runtime images
 
+  # This scenario launches a container that dies instantly, causing Cekit to hand trying to fetch logs
+  # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
+  @ignore 
   Scenario: Verify if usage help is correctly called
     When container is started with command bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh -h"
     Then container log should contain This is the
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index c82cb8cc3e8..6e2bb671202 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -17,8 +17,11 @@
 @rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 @openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Custom TrustStore configuration
+  # This test sets an invalid certificate to the container, it fails to start, and if timing is bad cekit hangs on 'Running command ps -C java in container'
+  # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
+  @ignore
   Scenario: Verify if a custom certificate is correctly handled
-    When container is started with command bash -c "sleep 10s; /home/kogito/kogito-app-launch.sh"
+    When container is started with command bash -c "/home/kogito/kogito-app-launch.sh"
       | variable            | value              |
       | CUSTOM_TRUSTSTORE   | my-truststore.jks  |
       | RUNTIME_TYPE        | quarkus            |
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index 35790b99773..d65e79dbee5 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -1,24 +1,26 @@
-@quay.io/kiegroup/kogito-s2i-builder
-@quay.io/kiegroup/kogito-runtime-jvm
-@quay.io/kiegroup/kogito-data-index-infinispan
+# Run only on images that won't die instantly
+# See https://github.com/apache/incubator-kie-kogito-images/issues/1722
+#@quay.io/kiegroup/kogito-s2i-builder
+#@quay.io/kiegroup/kogito-runtime-jvm
+#@quay.io/kiegroup/kogito-data-index-infinispan
 @quay.io/kiegroup/kogito-data-index-ephemeral
-@quay.io/kiegroup/kogito-data-index-mongodb
-@quay.io/kiegroup/kogito-data-index-postgresql
-@quay.io/kiegroup/kogito-trusty-infinispan
-@quay.io/kiegroup/kogito-trusty-redis
-@quay.io/kiegroup/kogito-trusty-postgresql
-@quay.io/kiegroup/kogito-trusty-ui
-@quay.io/kiegroup/kogito-explainability
-@quay.io/kiegroup/kogito-jit-runner
+#@quay.io/kiegroup/kogito-data-index-mongodb
+#@quay.io/kiegroup/kogito-data-index-postgresql
+#@quay.io/kiegroup/kogito-trusty-infinispan
+#@quay.io/kiegroup/kogito-trusty-redis
+#@quay.io/kiegroup/kogito-trusty-postgresql
+#@quay.io/kiegroup/kogito-trusty-ui
+#@quay.io/kiegroup/kogito-explainability
+#@quay.io/kiegroup/kogito-jit-runner
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
-@quay.io/kiegroup/kogito-jobs-service-infinispan
-@quay.io/kiegroup/kogito-jobs-service-mongodb
-@quay.io/kiegroup/kogito-jobs-service-postgresql
-@quay.io/kiegroup/kogito-management-console
-@quay.io/kiegroup/kogito-task-console
-@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
-@rhpam-7/rhpam-kogito-builder-rhel8
-@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
+#@quay.io/kiegroup/kogito-jobs-service-infinispan
+#@quay.io/kiegroup/kogito-jobs-service-mongodb
+#@quay.io/kiegroup/kogito-jobs-service-postgresql
+#@quay.io/kiegroup/kogito-management-console
+#@quay.io/kiegroup/kogito-task-console
+#@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
+#@rhpam-7/rhpam-kogito-builder-rhel8
+#@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
index 965bad01f4c..f5006657088 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -21,4 +21,4 @@ Feature: Kogito-data-index ephemeral postgresql feature.
     When container is started with env
       | variable               | value   |
       | SCRIPT_DEBUG           | true    |
-    Then container log should contain -Dquarkus.profile=http-events-support
+    Then available container log should contain -Dquarkus.profile=http-events-support
diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature
index 9cac42d0bb4..64bb798196e 100644
--- a/tests/features/data-index/kogito-data-index-oracle.feature
+++ b/tests/features/data-index/kogito-data-index-oracle.feature
@@ -12,16 +12,15 @@ Feature: Kogito-data-index oracle feature.
   Scenario: verify if of container is correctly started with oracle parameters
     When container is started with env
       | variable                     | value                                      |
-      | SCRIPT_DEBUG                 | true                                       |
       | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:oracle:thin:@//10.1.1.53:1521/quarkus |
       | QUARKUS_DATASOURCE_USERNAME  | kogito                                     |
       | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                     |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -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 java.sql.SQLException: Acquisition timeout while waiting for new connection
+    Then container log should contain java.sql.SQLRecoverableException: ORA-17002: I/O error
     And container log should not contain Application failed to start
 
   Scenario: check if the default quarkus profile is correctly set on data index
     When container is started with env
       | variable               | value   |
       | SCRIPT_DEBUG           | true    |
-    Then container log should contain -Dquarkus.profile=kafka-events-support
\ No newline at end of file
+    Then container log should contain -Dquarkus.profile=kafka-events-support
+    And container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index 50ccacfd6a5..0fb180b03f0 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -4,8 +4,8 @@ Feature: kogito-s2i-builder image JVM build tests
   Scenario: verify if the maven and java installation are correct
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
-    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.9.3
+    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-17
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
     Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
@@ -22,7 +22,6 @@ Feature: kogito-s2i-builder image JVM build tests
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/quarkus-run.jar should exist
-    And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
 
   Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
@@ -39,9 +38,9 @@ Feature: kogito-s2i-builder image JVM build tests
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/quarkus-run.jar should exist
-    And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
 
+  @ignore
   Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
     Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value                     |
@@ -61,6 +60,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And container log should contain DEBUG [io.qua.
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
 
+  @ignore
   Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
     Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable     | value   |
@@ -77,6 +77,7 @@ Feature: kogito-s2i-builder image JVM build tests
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/quarkus-run.jar should exist
 
+  @ignore
   Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
     Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                                                    |
@@ -119,6 +120,7 @@ Feature: kogito-s2i-builder image JVM build tests
 
 #### SpringBoot Scenarios
 
+  @ignore
   Scenario: Verify if the s2i build is finished as expected with debug enabled
       Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
         | variable     | value        |
@@ -155,6 +157,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And container log should contain Started DemoApplication
     And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
   
+  @ignore
   Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
     Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
@@ -172,6 +175,7 @@ Feature: kogito-s2i-builder image JVM build tests
     And file /home/kogito/bin/process-springboot-example.jar should exist
     And container log should contain Tomcat initialized with port(s): 8080 (http)
   
+  @ignore
   Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
     Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value |
@@ -214,6 +218,7 @@ Feature: kogito-s2i-builder image JVM build tests
       | content_type         | application/json                                                              |
       | expected_status_code | 201                                                                           |
 
+  @ignore
   Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
     Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value                           |
diff --git a/tests/features/kogito-common-runtime-jvm.feature b/tests/features/kogito-common-runtime-jvm.feature
index 2f2d6c369bc..d3501b6b169 100644
--- a/tests/features/kogito-common-runtime-jvm.feature
+++ b/tests/features/kogito-common-runtime-jvm.feature
@@ -4,9 +4,9 @@ Feature: kogito-runtime-jvm feature.
 
   Scenario: verify if the java installation is correct
     When container is started with command bash
-    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
+    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-17
     And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
-    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11
+    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 17
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus
     Given s2i build /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld from target
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
index 7e01ceefd0c..4019e6d4f04 100644
--- a/tests/features/kogito-s2i-builder-native.feature
+++ b/tests/features/kogito-s2i-builder-native.feature
@@ -3,17 +3,17 @@ Feature: kogito-s2i-builder image native build tests
 
   Scenario: verify java cacerts and libsunec are available in the given kogito builder container.
     When container is started with command bash
-    Then  file /home/kogito/ssl-libs/libsunec.so should exist
-    And file /home/kogito/cacerts should exist
+    Then file /home/kogito/cacerts should exist
 
   Scenario: verify if the maven and graal vm settings are correct on kogito-s2i-builder image for native
     When container is started with command bash
     Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6
-    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11
+    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.9.3
+    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-17
     And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.3.2
+    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 23.0.2.1
 
+  @ignore
   Scenario: Verify if the s2i build is finished as expected using native build and runtime image
     Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
@@ -48,10 +48,10 @@ Feature: kogito-s2i-builder image native build tests
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And file /home/kogito/ssl-libs/libsunec.so should exist
     And file /home/kogito/cacerts should exist
     And s2i build log should contain -J-Xmx2576980378
 
+  @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
     Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable     | value      |
@@ -70,6 +70,7 @@ Feature: kogito-s2i-builder image native build tests
     And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
     And s2i build log should contain -J-Xmx5153960755
 
+  @ignore
   Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image
     Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable          | value         |
@@ -107,13 +108,14 @@ Feature: kogito-s2i-builder image native build tests
       | wait            | 80                    |
       | expected_phrase | ["hello","world"]     |    
 
+  @ignore
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
       | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 999-SNAPSHOT |      
     Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
     And check that page is served
       | property        | value                                                                                            |
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 77b7d471d8a..9135d1e24eb 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -22,6 +22,7 @@ Feature: kogito-s2i-builder image tests
     And file /home/kogito/.m2/settings.xml should not contain <id>redhat-techpreview-repository</id>
     And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
 
+  @ignore
   Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
     Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
@@ -32,6 +33,7 @@ Feature: kogito-s2i-builder image tests
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
+  @ignore
   Scenario: Verify if the s2i build is finished as expected with persistence enabled
     Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable          | value         |
@@ -41,12 +43,13 @@ Feature: kogito-s2i-builder image tests
     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
 
+  @ignore
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 999-SNAPSHOT |      
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
@@ -68,13 +71,13 @@ Feature: kogito-s2i-builder image tests
       | content_type    | application/json                |
       | request_body    | {"status": "UP", "checks": []}  |
 
-
+  @ignore
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 999-SNAPSHOT |      
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -90,12 +93,13 @@ Feature: kogito-s2i-builder image tests
       | content_type    | application/json                                                                                 |
       | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
 
+  @ignore
   Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
     Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable                 | value                                                 |
       | RUNTIME_TYPE             | quarkus                                               |
       | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |                   
+      | KOGITO_VERSION | 999-SNAPSHOT |                   
       | PROJECT_GROUP_ID         | com.mycompany                                         |
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
@@ -116,10 +120,11 @@ Feature: kogito-s2i-builder image tests
 
 #### SpringBoot Scenarios
 
+  @ignore
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 999-SNAPSHOT |      
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 02e7c00be79..391be6e4e40 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -6,8 +6,7 @@ Feature: Serverless Workflow images common
 
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
-    Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist
-      And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.10.Final/quarkus-bom-2.16.10.Final.pom should exist
+    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.2.9.Final/quarkus-bom-3.2.9.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index d7b591f76ed..1ae248b3691 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -117,14 +117,14 @@ Feature: Serverless Workflow devmode images
     Then check that page is served
       | property             | value                                                              |
       | port                 | 8080                                                               |
-      | path                 | /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow/dataindex |
+      | path                 | /q/dev-v1/org.kie.kogito.kogito-quarkus-serverless-workflow/dataindex |
       | request_method       | GET                                                                |
       | wait                 | 480                                                                |
       | expected_status_code | 200                                                                |
     And check that page is served
       | property             | value                                                                            |
       | port                 | 8080                                                                             |
-      | path                 | /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/workflowInstances |
+      | path                 | /q/dev-v1/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/workflowInstances |
       | request_method       | GET                                                                              |
       | wait                 | 480                                                                              |
       | expected_status_code | 200                                                                              |
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
index 113a70f2993..68bb639a9ed 100644
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ b/tests/features/rhpam-kogito-builder-jvm.feature
@@ -29,7 +29,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | true           |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 999-SNAPSHOT |      
     Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
 
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
@@ -37,7 +37,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable       | value          |
       | RUNTIME_TYPE   | quarkus        |
       | NATIVE         | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 999-SNAPSHOT |      
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for project...
     And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
@@ -64,7 +64,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
       | variable            | value          |
       | RUNTIME_TYPE        | quarkus        |
       | NATIVE              | false          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |           
+      | KOGITO_VERSION | 999-SNAPSHOT |           
       | PROJECT_GROUP_ID    | com.mycompany  |
       | PROJECT_ARTIFACT_ID | myproject      |
       | PROJECT_VERSION     | 2.0-SNAPSHOT   |
@@ -85,7 +85,7 @@ Feature: rhpam-kogito-builder-rhel8 feature.
   Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
     Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
       | variable       | value          |
-      | KOGITO_VERSION | 2.0.0-SNAPSHOT |      
+      | KOGITO_VERSION | 999-SNAPSHOT |      
       | RUNTIME_TYPE   | springboot     |
     Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
     And s2i build log should contain Generating springboot project structure for project...
diff --git a/tests/shell/README.md b/tests/shell/README.md
new file mode 100644
index 00000000000..687dc4d2fa1
--- /dev/null
+++ b/tests/shell/README.md
@@ -0,0 +1,21 @@
+# Tests in Shell
+
+## Running Tests With JBang
+
+- Install JBang
+- Install VSCode Red Hat's Java plugin
+- Install VSCode JBang plugin
+
+You can then edit the files in `kogito-swf-builder` and `kogito-swf-devmode` with intellisense.
+
+The `run.sh` should be used to run the tests since it must set a few env vars. To run from your terminal, try:
+
+```shell
+tests/shell/run.sh kogito-swf-devmode quay.io/kiegroup/kogito-swf-devmode:999-SNAPSHOT
+```
+
+The first argument is the test case to run and the second, the image.
+
+Under the hood, it uses [Junit's Console Launcher](https://junit.org/junit5/docs/current/user-guide/#running-tests-console-launcher) tool to run the tests from the command line.
+
+Update this file with new findings, and don't remove the `.vscode` folder. It's useful to run JBang from the IDE.
diff --git a/tests/shell/kogito-swf-builder/.vscode/launch.json b/tests/shell/kogito-swf-builder/.vscode/launch.json
new file mode 100644
index 00000000000..f329b95134c
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "RunTests-port-4004",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": 4004
+        },
+        {
+            "type": "java",
+            "name": "Debug (Launch) - RunTests",
+            "request": "launch",
+            "mainClass": "RunTests",
+            "projectName": "RunTests"
+        }
+    ]
+}
diff --git a/tests/shell/kogito-swf-builder/.vscode/settings.json b/tests/shell/kogito-swf-builder/.vscode/settings.json
new file mode 100644
index 00000000000..ca7dd198068
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/.vscode/settings.json
@@ -0,0 +1,18 @@
+{
+    "java.import.gradle.enabled": false,
+    "java.import.maven.enabled": false,
+    "java.eclipse.downloadSources": true,
+    "files.exclude": {
+        "bin/": true,
+        ".eclipse/": true,
+        ".project": true,
+        ".classpath": true,
+        "build.gradle": true
+    },
+    "java.completion.importOrder": [
+        "",
+        "javax",
+        "java",
+        "#"
+    ]
+}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/RunTests.java b/tests/shell/kogito-swf-builder/RunTests.java
deleted file mode 100644
index 8c570502844..00000000000
--- a/tests/shell/kogito-swf-builder/RunTests.java
+++ /dev/null
@@ -1,118 +0,0 @@
-///usr/bin/env jbang "$0" "$@" ; exit $?
-
-//DEPS org.slf4j:slf4j-simple:2.0.6
-
-// Junit console to start the test engine:
-//DEPS org.junit.platform:junit-platform-console:1.8.2
-
-// engine to run the tests (tests are written with Junit5):
-//DEPS org.junit.jupiter:junit-jupiter-engine:5.8.2
-
-// testcontainers
-//DEPS org.testcontainers:testcontainers:1.17.6
-//DEPS org.testcontainers:junit-jupiter:1.17.6
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.util.Collections;
-
-import org.junit.jupiter.api.Test;
-import org.junit.platform.console.options.CommandLineOptions;
-import org.junit.platform.console.tasks.ConsoleTestExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-@Testcontainers
-public class RunTests {
-
-    private static Logger LOGGER = LoggerFactory.getLogger(RunTests.class);
-
-    private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
-
-    @Container
-    private GenericContainer greetBuiltImage = new GenericContainer(
-            new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
-                    .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet", "Dockerfile"))
-                    .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
-            .withExposedPorts(8080)
-            .waitingFor(Wait.forHttp("/jsongreet"))
-            .withLogConsumer(logConsumer);
-
-    @Test
-    public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
-        greetBuiltImage.start();
-        HttpRequest request = HttpRequest.newBuilder()
-                .uri(new URI("http://" + greetBuiltImage.getHost() + ":" + greetBuiltImage.getFirstMappedPort() + "/jsongreet"))
-                .header("Content-Type", "application/json")
-                .header("Accept", "application/json")
-                .timeout(Duration.ofSeconds(10))
-                .POST(HttpRequest.BodyPublishers
-                        .ofString("{\"workflowdata\" : {\"name\": \"John\", \"language\": \"English\"}}"))
-                .build();
-        HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
-        assertEquals(201, response.statusCode());
-        greetBuiltImage.stop();
-    }
-
-    @Container
-    private GenericContainer greetWithInputSchemaBuiltImage = new GenericContainer(
-            new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
-                    .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet-with-inputschema", "Dockerfile"))
-                    .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
-            .withExposedPorts(8080)
-            .waitingFor(Wait.forHttp("/greeting"))
-            .withLogConsumer(logConsumer);
-
-    @Test
-    public void testBuiltContainerWithInputSchemaAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
-        greetWithInputSchemaBuiltImage.start();
-        HttpRequest request = HttpRequest.newBuilder()
-                .uri(new URI("http://" + greetWithInputSchemaBuiltImage.getHost() + ":" + greetWithInputSchemaBuiltImage.getFirstMappedPort() + "/greeting"))
-                .header("Content-Type", "application/json")
-                .header("Accept", "application/json")
-                .timeout(Duration.ofSeconds(10))
-                .POST(HttpRequest.BodyPublishers
-                        .ofString("{\"name\": \"John\", \"language\": \"English\"}"))
-                .build();
-        HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
-        assertEquals(201, response.statusCode());
-        greetWithInputSchemaBuiltImage.stop();
-    }
-
-    public static void main(String... args) throws Exception {
-        // Log docker build. Source: https://github.com/testcontainers/testcontainers-java/issues/3093
-        System.setProperty("org.slf4j.simpleLogger.log.com.github.dockerjava.api.command.BuildImageResultCallback", "debug");
-        CommandLineOptions options = new CommandLineOptions();
-        options.setSelectedClasses(Collections.singletonList(RunTests.class.getName()));
-        options.setReportsDir(Paths.get(getOutputDir()));
-        new ConsoleTestExecutor(options).execute(new PrintWriter(System.out));
-    }
-
-    static String getTestImage() {
-        return System.getenv("TEST_IMAGE");
-    }
-
-    static String getOutputDir() {
-        return System.getenv("OUTPUT_DIR");
-    }
-
-    static String getScriptDirPath() {
-        return System.getenv("TESTS_SCRIPT_DIR_PATH");
-    }
-}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
index 3581d31c53c..2172c7129d0 100644
--- a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
@@ -19,7 +19,7 @@ RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
 #=============================
 # Runtime Run
 #=============================
-FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
 
 ARG QUARKUS_LAUNCH_DEVMODE=false
 
diff --git a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
index 3581d31c53c..2172c7129d0 100644
--- a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
@@ -19,7 +19,7 @@ RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
 #=============================
 # Runtime Run
 #=============================
-FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
 
 ARG QUARKUS_LAUNCH_DEVMODE=false
 
diff --git a/tests/shell/kogito-swf-builder/src/RunTests.java b/tests/shell/kogito-swf-builder/src/RunTests.java
new file mode 100644
index 00000000000..d3bc70a9d1c
--- /dev/null
+++ b/tests/shell/kogito-swf-builder/src/RunTests.java
@@ -0,0 +1,121 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+
+//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
+
+// engine to run the tests (tests are written with Junit5):
+//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1
+
+// testcontainers
+//DEPS org.testcontainers:testcontainers:1.19.3
+//DEPS org.testcontainers:junit-jupiter:1.19.3
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.file.Paths;
+import java.time.Duration;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.console.ConsoleLauncher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.images.builder.ImageFromDockerfile;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+@Testcontainers
+public class RunTests {
+
+        private static Logger LOGGER = LoggerFactory.getLogger(RunTests.class);
+
+        private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
+
+        @Container
+        private GenericContainer greetBuiltImage = new GenericContainer(
+                        new ImageFromDockerfile(
+                                        "dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
+                                        .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet", "Dockerfile"))
+                                        .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
+                        .withExposedPorts(8080)
+                        .waitingFor(Wait.forHttp("/jsongreet"))
+                        .withLogConsumer(logConsumer);
+
+        @Test
+        public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
+                greetBuiltImage.start();
+                HttpRequest request = HttpRequest.newBuilder()
+                                .uri(new URI("http://" + greetBuiltImage.getHost() + ":"
+                                                + greetBuiltImage.getFirstMappedPort() + "/jsongreet"))
+                                .header("Content-Type", "application/json")
+                                .header("Accept", "application/json")
+                                .timeout(Duration.ofSeconds(10))
+                                .POST(HttpRequest.BodyPublishers
+                                                .ofString("{\"workflowdata\" : {\"name\": \"John\", \"language\": \"English\"}}"))
+                                .build();
+                HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
+                assertEquals(201, response.statusCode());
+                greetBuiltImage.stop();
+        }
+
+        @Container
+        private GenericContainer greetWithInputSchemaBuiltImage = new GenericContainer(
+                        new ImageFromDockerfile(
+                                        "dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
+                                        .withDockerfile(Paths.get(getScriptDirPath(),
+                                                        "resources/greet-with-inputschema", "Dockerfile"))
+                                        .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
+                        .withExposedPorts(8080)
+                        .waitingFor(Wait.forHttp("/greeting"))
+                        .withLogConsumer(logConsumer);
+
+        @Test
+        public void testBuiltContainerWithInputSchemaAnswerCorrectly()
+                        throws URISyntaxException, IOException, InterruptedException {
+                greetWithInputSchemaBuiltImage.start();
+                HttpRequest request = HttpRequest.newBuilder()
+                                .uri(new URI("http://" + greetWithInputSchemaBuiltImage.getHost() + ":"
+                                                + greetWithInputSchemaBuiltImage.getFirstMappedPort() + "/greeting"))
+                                .header("Content-Type", "application/json")
+                                .header("Accept", "application/json")
+                                .timeout(Duration.ofSeconds(10))
+                                .POST(HttpRequest.BodyPublishers
+                                                .ofString("{\"name\": \"John\", \"language\": \"English\"}"))
+                                .build();
+                HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
+                assertEquals(201, response.statusCode());
+                greetWithInputSchemaBuiltImage.stop();
+        }
+
+        public static void main(String... args) throws Exception {
+                // Log docker build. Source:
+                // https://github.com/testcontainers/testcontainers-java/issues/3093
+                System.setProperty(
+                                "org.slf4j.simpleLogger.log.com.github.dockerjava.api.command.BuildImageResultCallback",
+                                "debug");
+                ConsoleLauncher.main("--select-class=" + RunTests.class.getName(),
+                                "--reports-dir=" + Paths.get(getOutputDir()).toString());
+        }
+
+        static String getTestImage() {
+                return System.getenv("TEST_IMAGE");
+        }
+
+        static String getOutputDir() {
+                return System.getenv("OUTPUT_DIR");
+        }
+
+        static String getScriptDirPath() {
+                return System.getenv("TESTS_SCRIPT_DIR_PATH");
+        }
+}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-devmode/.vscode/launch.json b/tests/shell/kogito-swf-devmode/.vscode/launch.json
new file mode 100644
index 00000000000..f329b95134c
--- /dev/null
+++ b/tests/shell/kogito-swf-devmode/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "RunTests-port-4004",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": 4004
+        },
+        {
+            "type": "java",
+            "name": "Debug (Launch) - RunTests",
+            "request": "launch",
+            "mainClass": "RunTests",
+            "projectName": "RunTests"
+        }
+    ]
+}
diff --git a/tests/shell/kogito-swf-devmode/.vscode/settings.json b/tests/shell/kogito-swf-devmode/.vscode/settings.json
new file mode 100644
index 00000000000..ca7dd198068
--- /dev/null
+++ b/tests/shell/kogito-swf-devmode/.vscode/settings.json
@@ -0,0 +1,18 @@
+{
+    "java.import.gradle.enabled": false,
+    "java.import.maven.enabled": false,
+    "java.eclipse.downloadSources": true,
+    "files.exclude": {
+        "bin/": true,
+        ".eclipse/": true,
+        ".project": true,
+        ".classpath": true,
+        "build.gradle": true
+    },
+    "java.completion.importOrder": [
+        "",
+        "javax",
+        "java",
+        "#"
+    ]
+}
\ No newline at end of file
diff --git a/tests/shell/kogito-swf-devmode/RunTests.java b/tests/shell/kogito-swf-devmode/src/RunTests.java
similarity index 71%
rename from tests/shell/kogito-swf-devmode/RunTests.java
rename to tests/shell/kogito-swf-devmode/src/RunTests.java
index c3cb89db399..9971e8229cf 100644
--- a/tests/shell/kogito-swf-devmode/RunTests.java
+++ b/tests/shell/kogito-swf-devmode/src/RunTests.java
@@ -1,21 +1,20 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
-//DEPS org.slf4j:slf4j-simple:2.0.6
+//DEPS org.slf4j:slf4j-simple:2.0.9
 
 // Junit console to start the test engine:
-//DEPS org.junit.platform:junit-platform-console:1.8.2
+//DEPS org.junit.platform:junit-platform-console:1.10.1
 
 // engine to run the tests (tests are written with Junit5):
-//DEPS org.junit.jupiter:junit-jupiter-engine:5.8.2
+//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1
 
 // testcontainers
-//DEPS org.testcontainers:testcontainers:1.17.6
-//DEPS org.testcontainers:junit-jupiter:1.17.6
+//DEPS org.testcontainers:testcontainers:1.19.3
+//DEPS org.testcontainers:junit-jupiter:1.19.3
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.http.HttpClient;
@@ -24,18 +23,14 @@
 import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.file.Paths;
 import java.time.Duration;
-import java.util.Collections;
-
 import org.junit.jupiter.api.Test;
-import org.junit.platform.console.options.CommandLineOptions;
-import org.junit.platform.console.tasks.ConsoleTestExecutor;
+import org.junit.platform.console.ConsoleLauncher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -48,16 +43,20 @@ public class RunTests {
 
     @Container
     private GenericContainer devModeImage = new GenericContainer(getTestImage())
-            .withFileSystemBind(getScriptDirPath() + "/resources", "/home/kogito/serverless-workflow-project/src/main/resources", BindMode.READ_ONLY)
+            .withEnv("MAVEN_ARGS_APPEND", "-Ddebug=false -Dquarkus.devservices.enabled=false")
+            .withFileSystemBind(getScriptDirPath() + "/resources",
+                    "/home/kogito/serverless-workflow-project/src/main/resources", BindMode.READ_ONLY)
             .withExposedPorts(8080)
             .waitingFor(Wait.forHttp("/jsongreet"))
+            .withStartupTimeout(Duration.ofMinutes(2))
             .withLogConsumer(logConsumer);
 
     @Test
     public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
         devModeImage.start();
         HttpRequest request = HttpRequest.newBuilder()
-                .uri(new URI("http://" + devModeImage.getHost() + ":" + devModeImage.getFirstMappedPort() + "/jsongreet"))
+                .uri(new URI(
+                        "http://" + devModeImage.getHost() + ":" + devModeImage.getFirstMappedPort() + "/jsongreet"))
                 .header("Content-Type", "application/json")
                 .header("Accept", "application/json")
                 .timeout(Duration.ofSeconds(10))
@@ -69,10 +68,8 @@ public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOExc
     }
 
     public static void main(String... args) throws Exception {
-        CommandLineOptions options = new CommandLineOptions();
-        options.setSelectedClasses(Collections.singletonList(RunTests.class.getName()));
-        options.setReportsDir(Paths.get(getOutputDir()));
-        new ConsoleTestExecutor(options).execute(new PrintWriter(System.out));
+        ConsoleLauncher.main("--select-class=" + RunTests.class.getName(),
+                "--reports-dir=" + Paths.get(getOutputDir()).toString());
     }
 
     static String getTestImage() {
diff --git a/tests/shell/run.sh b/tests/shell/run.sh
index 89054395851..f61b18e4233 100755
--- a/tests/shell/run.sh
+++ b/tests/shell/run.sh
@@ -26,7 +26,7 @@ echo "OUTPUT_DIR=${OUTPUT_DIR}"
 echo "TESTS_SCRIPT_DIR_PATH=${TESTS_SCRIPT_DIR_PATH}"
 
 if [ -d  "${script_dir_path}/${image_name}" ]; then
-  curl -Ls https://sh.jbang.dev | bash -s - "${TESTS_SCRIPT_DIR_PATH}/RunTests.java"
+  curl -Ls https://sh.jbang.dev | bash -s - "${TESTS_SCRIPT_DIR_PATH}/src/RunTests.java"
 else
   echo "No shell test to run for image ${image_name}"
 fi
\ No newline at end of file
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 4feb39f3e1f..92e22cc8dde 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -20,6 +20,7 @@ fi
 set -e
 realPath="realpath"
 if [[ $OSTYPE == 'darwin'* ]]; then
+  # If you are on MacOS, use "brew install coreutils"
   realPath="grealpath"
 fi
 base_dir=`dirname $(${realPath} -s $0)`
@@ -43,7 +44,7 @@ git clone https://github.com/apache/${KOGITO_EXAMPLES_REPO_NAME}.git ${KOGITO_EX
 cd ${KOGITO_EXAMPLES_DIR}/
 git fetch origin
 git fetch origin --tags
-git checkout -b nightly-main
+git switch nightly-main
 
 # make a new copy of rules-quarkus-helloworld for native tests
 cp -rv  ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld/ ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld-native/

From a08e1c67299d9ffcb0143ed3db2ab8fe7d1d3870 Mon Sep 17 00:00:00 2001
From: Jozef Marko <Jozef.Marko@ibm.com>
Date: Wed, 17 Jan 2024 07:25:09 +0100
Subject: [PATCH 657/709] incubator-kie-issues#563: Add apache license headers
 (#1708)

* Add apache license headers

* github.com/kiegroup -> github.com/apache/incubator-kie-

* trigger build

* trigger build

* trigger build

* keep kie-cloud-tools link

* Add header to new files since PR was opened

* 755 permission

* restore 755 permission

* restore 755 permission 2
---
 .asf.yaml                                     | 18 +++++++++++++
 .ci/jenkins/Jenkinsfile                       | 18 ++++++++++++-
 .ci/jenkins/Jenkinsfile.build-and-test        | 16 ++++++++++++
 .ci/jenkins/Jenkinsfile.build-image           | 16 ++++++++++++
 .ci/jenkins/Jenkinsfile.deploy                | 16 ++++++++++++
 .ci/jenkins/Jenkinsfile.promote               | 17 +++++++++++++
 .ci/jenkins/Jenkinsfile.setup-branch          | 17 +++++++++++++
 .ci/jenkins/dsl/jobs.groovy                   | 19 ++++++++++++++
 .ci/jenkins/dsl/test.sh                       | 19 ++++++++++++++
 README.md                                     |  2 +-
 container.yaml                                | 18 +++++++++++++
 content_sets.yaml                             | 18 +++++++++++++
 .../container-compose-infinispan.yaml         | 18 +++++++++++++
 .../container-compose-mongodb.yaml            | 18 +++++++++++++
 .../container-compose-postgresql.yaml         | 18 +++++++++++++
 kogito-base-builder-image.yaml                | 18 +++++++++++++
 kogito-data-index-ephemeral-image.yaml        | 18 +++++++++++++
 kogito-data-index-infinispan-image.yaml       | 18 +++++++++++++
 kogito-data-index-mongodb-image.yaml          | 18 +++++++++++++
 kogito-data-index-oracle-image.yaml           | 18 +++++++++++++
 kogito-data-index-postgresql-image.yaml       | 18 +++++++++++++
 kogito-explainability-image.yaml              | 18 +++++++++++++
 kogito-imagestream.yaml                       | 18 +++++++++++++
 kogito-jit-runner-image.yaml                  | 18 +++++++++++++
 kogito-jobs-service-allinone-image.yaml       | 18 +++++++++++++
 kogito-jobs-service-ephemeral-image.yaml      | 18 +++++++++++++
 kogito-jobs-service-infinispan-image.yaml     | 18 +++++++++++++
 kogito-jobs-service-mongodb-image.yaml        | 18 +++++++++++++
 kogito-jobs-service-postgresql-image.yaml     | 18 +++++++++++++
 kogito-management-console-image.yaml          | 18 +++++++++++++
 kogito-runtime-jvm-image.yaml                 | 18 +++++++++++++
 kogito-runtime-native-image.yaml              | 18 +++++++++++++
 kogito-s2i-builder-image.yaml                 | 18 +++++++++++++
 kogito-swf-builder-image.yaml                 | 18 +++++++++++++
 kogito-swf-devmode-image.yaml                 | 18 +++++++++++++
 kogito-task-console-image.yaml                | 18 +++++++++++++
 kogito-trusty-infinispan-image.yaml           | 18 +++++++++++++
 kogito-trusty-postgresql-image.yaml           | 18 +++++++++++++
 kogito-trusty-redis-image.yaml                | 18 +++++++++++++
 kogito-trusty-ui-image.yaml                   | 18 +++++++++++++
 logic-data-index-ephemeral-rhel8-image.yaml   | 18 +++++++++++++
 logic-imagestream.yaml                        | 18 +++++++++++++
 logic-swf-builder-rhel8-image.yaml            | 18 +++++++++++++
 logic-swf-devmode-rhel8-image.yaml            | 18 +++++++++++++
 .../added/configure-custom-truststore.sh      | 18 +++++++++++++
 modules/kogito-custom-truststore/configure    | 19 +++++++++++++-
 modules/kogito-custom-truststore/module.yaml  | 18 +++++++++++++
 .../tests/bats/kogito-custom-truststore.bats  | 19 ++++++++++++++
 .../added/kogito-data-index-common.sh         | 19 ++++++++++++++
 modules/kogito-data-index-common/configure    | 18 +++++++++++++
 modules/kogito-data-index-common/module.yaml  | 18 +++++++++++++
 .../tests/bats/kogito-data-index-common.bats  | 19 ++++++++++++++
 .../community/added/kogito-app-launch.sh      | 19 ++++++++++++++
 .../community/configure                       | 18 +++++++++++++
 .../community/module.yaml                     | 18 +++++++++++++
 .../prod/added/kogito-app-launch.sh           | 19 ++++++++++++++
 .../prod/configure                            | 18 +++++++++++++
 .../prod/module.yaml                          | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../kogito-data-index-infinispan/configure    | 18 +++++++++++++
 .../kogito-data-index-infinispan/module.yaml  | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-data-index-mongodb/configure   | 18 +++++++++++++
 modules/kogito-data-index-mongodb/module.yaml | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-data-index-oracle/configure    | 18 +++++++++++++
 modules/kogito-data-index-oracle/module.yaml  | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../kogito-data-index-postgresql/configure    | 18 +++++++++++++
 .../kogito-data-index-postgresql/module.yaml  | 18 +++++++++++++
 .../added/container-limits                    | 18 +++++++++++++
 .../added/debug-options                       | 19 +++++++++++++-
 .../added/java-default-options                | 18 +++++++++++++
 modules/kogito-dynamic-resources/configure    | 18 +++++++++++++
 modules/kogito-dynamic-resources/module.yaml  | 18 +++++++++++++
 modules/kogito-epel/7/configure.sh            | 19 ++++++++++++++
 modules/kogito-epel/7/module.yaml             | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../added/launch/kogito-explainability.sh     | 19 ++++++++++++++
 modules/kogito-explainability/configure       | 18 +++++++++++++
 modules/kogito-explainability/module.yaml     | 18 +++++++++++++
 .../tests/bats/kogito-explainability.bats     | 19 ++++++++++++++
 .../22.3-java-11/configure                    | 18 +++++++++++++
 .../22.3-java-11/module.yaml                  | 18 +++++++++++++
 .../23.0-java-17/configure                    | 18 +++++++++++++
 .../23.0-java-17/module.yaml                  | 18 +++++++++++++
 .../22.3-java-11/configure                    | 18 +++++++++++++
 .../22.3-java-11/module.yaml                  | 18 +++++++++++++
 .../common/added/memory-limit.sh              | 19 ++++++++++++++
 .../kogito-graalvm-scripts/common/configure   | 18 +++++++++++++
 .../kogito-graalvm-scripts/common/module.yaml | 18 +++++++++++++
 .../common/tests/bats/memory-limits.bats      | 19 ++++++++++++++
 modules/kogito-image-dependencies/clean.sh    | 18 +++++++++++++
 modules/kogito-image-dependencies/module.yaml | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-jit-runner/configure           | 18 +++++++++++++
 modules/kogito-jit-runner/module.yaml         | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../kogito-jobs-service-all-in-one/configure  | 18 +++++++++++++
 .../module.yaml                               | 18 +++++++++++++
 .../launch/kogito-jobs-service-common.sh      | 19 ++++++++++++++
 modules/kogito-jobs-service-common/configure  | 18 +++++++++++++
 .../kogito-jobs-service-common/module.yaml    | 18 +++++++++++++
 .../bats/kogito-jobs-service-common.bats      | 19 ++++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../kogito-jobs-service-ephemeral/configure   | 18 +++++++++++++
 .../kogito-jobs-service-ephemeral/module.yaml | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../kogito-jobs-service-infinispan/configure  | 18 +++++++++++++
 .../module.yaml                               | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-jobs-service-mongodb/configure | 18 +++++++++++++
 .../kogito-jobs-service-mongodb/module.yaml   | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../kogito-jobs-service-postgresql/configure  | 18 +++++++++++++
 .../module.yaml                               | 18 +++++++++++++
 .../added/kogito-kubernetes-client.sh         | 19 ++++++++++++++
 modules/kogito-kubernetes-client/configure    | 19 +++++++++++++-
 modules/kogito-kubernetes-client/module.yaml  | 18 +++++++++++++
 .../tests/bats/kogito-kubernetes-client.bats  | 19 ++++++++++++++
 .../kogito-launch-scripts/added/configure.sh  | 19 ++++++++++++++
 modules/kogito-launch-scripts/configure       | 18 +++++++++++++
 modules/kogito-launch-scripts/module.yaml     | 18 +++++++++++++
 modules/kogito-logging/added/logging.sh       | 19 ++++++++++++++
 modules/kogito-logging/configure              | 19 +++++++++++++-
 modules/kogito-logging/module.yaml            | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../added/launch/kogito-management-console.sh | 19 ++++++++++++++
 .../kogito-management-console/configure.sh    | 18 +++++++++++++
 modules/kogito-management-console/module.yaml | 18 +++++++++++++
 .../tests/bats/kogito-management-console.bats | 19 ++++++++++++++
 .../3.8.x-rpm/added/configure-maven.sh        | 19 ++++++++++++++
 modules/kogito-maven/3.8.x-rpm/configure      | 18 +++++++++++++
 modules/kogito-maven/3.8.x-rpm/module.yaml    | 18 +++++++++++++
 modules/kogito-maven/3.8.x/module.yaml        | 18 +++++++++++++
 modules/kogito-maven/3.9.x/module.yaml        | 18 +++++++++++++
 .../common/added/configure-maven.sh           | 19 ++++++++++++++
 modules/kogito-maven/common/configure         | 18 +++++++++++++
 modules/kogito-maven/common/module.yaml       | 18 +++++++++++++
 .../kogito-maven/maven-dnf-module/configure   | 18 +++++++++++++
 .../kogito-maven/maven-dnf-module/module.yaml | 18 +++++++++++++
 .../tests/bats/maven-settings.bats            | 19 ++++++++++++++
 modules/kogito-openjdk/11-headless/clean.sh   | 18 +++++++++++++
 .../kogito-openjdk/11-headless/module.yaml    | 18 +++++++++++++
 modules/kogito-openjdk/11/clean.sh            | 18 +++++++++++++
 modules/kogito-openjdk/11/module.yaml         | 18 +++++++++++++
 modules/kogito-openjdk/17-headless/clean.sh   | 18 +++++++++++++
 .../kogito-openjdk/17-headless/module.yaml    | 18 +++++++++++++
 modules/kogito-openjdk/17/clean.sh            | 19 +++++++++++++-
 modules/kogito-openjdk/17/module.yaml         | 18 +++++++++++++
 .../added/kogito-persistence.sh               | 19 ++++++++++++++
 modules/kogito-persistence/configure          | 19 +++++++++++++-
 modules/kogito-persistence/module.yaml        | 18 +++++++++++++
 .../tests/bats/kogito-persistence.bats        | 19 ++++++++++++++
 modules/kogito-pkg-update/configure           | 18 +++++++++++++
 modules/kogito-pkg-update/module.yaml         | 18 +++++++++++++
 modules/kogito-project-versions/module.yaml   | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-runtime-jvm/configure          | 19 +++++++++++++-
 modules/kogito-runtime-jvm/module.yaml        | 18 +++++++++++++
 modules/kogito-runtime-jvm/s2i/bin/assemble   | 18 +++++++++++++
 modules/kogito-runtime-jvm/s2i/bin/usage      | 19 +++++++++++++-
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-runtime-native/configure       | 19 +++++++++++++-
 modules/kogito-runtime-native/module.yaml     | 18 +++++++++++++
 .../kogito-runtime-native/s2i/bin/assemble    | 18 +++++++++++++
 modules/kogito-runtime-native/s2i/bin/usage   | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-s2i-builder/configure          | 18 +++++++++++++
 modules/kogito-s2i-builder/module.yaml        | 18 +++++++++++++
 modules/kogito-s2i-builder/s2i/bin/assemble   | 18 +++++++++++++
 modules/kogito-s2i-builder/s2i/bin/usage      | 18 +++++++++++++
 modules/kogito-s2i-core/added/s2i-core        | 18 +++++++++++++
 modules/kogito-s2i-core/configure.sh          | 19 ++++++++++++++
 modules/kogito-s2i-core/module.yaml           | 18 +++++++++++++
 .../kogito-s2i-core/s2i/bin/assemble-runtime  | 17 +++++++++++++
 modules/kogito-s2i-core/s2i/bin/run           | 18 +++++++++++++
 .../kogito-s2i-core/s2i/bin/save-artifacts    | 20 ++++++++++++++-
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 19 ++++++++++++++
 .../builder/build-config/module.yaml          | 18 +++++++++++++
 .../builder/runtime/community/configure.sh    | 19 ++++++++++++++
 .../builder/runtime/community/module.yaml     | 18 +++++++++++++
 .../builder/runtime/osl/configure.sh          | 19 ++++++++++++++
 .../builder/runtime/osl/module.yaml           | 18 +++++++++++++
 .../common/build/added/cleanup_project.sh     | 19 ++++++++++++++
 .../common/build/added/zip_files.sh           | 19 ++++++++++++++
 modules/kogito-swf/common/build/configure.sh  | 19 ++++++++++++++
 modules/kogito-swf/common/build/module.yaml   | 18 +++++++++++++
 .../common/scripts/added/add-extension.sh     | 19 ++++++++++++++
 .../common/scripts/added/build-app.sh         | 19 ++++++++++++++
 .../common/scripts/added/configure-jvm-mvn.sh | 19 ++++++++++++++
 .../common/scripts/added/create-app.sh        | 19 ++++++++++++++
 .../common/scripts/added/jvm-settings.sh      | 19 ++++++++++++++
 .../kogito-swf/common/scripts/configure.sh    | 19 ++++++++++++++
 modules/kogito-swf/common/scripts/module.yaml | 18 +++++++++++++
 .../bats/kogito-swf-builder-build-app.bats    | 18 +++++++++++++
 .../bats/kogito-swf-builder-jvm-settings.bats | 19 ++++++++++++++
 .../devmode/build-config/module.yaml          | 18 +++++++++++++
 .../runtime/common/added/run-app-devmode.sh   | 19 ++++++++++++++
 .../devmode/runtime/common/configure.sh       | 19 ++++++++++++++
 .../devmode/runtime/common/module.yaml        | 18 +++++++++++++
 .../devmode/runtime/community/configure.sh    | 19 ++++++++++++++
 .../devmode/runtime/community/module.yaml     | 18 +++++++++++++
 .../devmode/runtime/osl/configure.sh          | 19 ++++++++++++++
 .../devmode/runtime/osl/module.yaml           | 18 +++++++++++++
 modules/kogito-system-user/add-user           | 19 +++++++++++++-
 modules/kogito-system-user/module.yaml        | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../added/launch/kogito-task-console.sh       | 19 ++++++++++++++
 modules/kogito-task-console/configure         | 18 +++++++++++++
 modules/kogito-task-console/module.yaml       | 18 +++++++++++++
 .../tests/bats/kogito-task-console.bats       | 19 ++++++++++++++
 .../added/launch/kogito-trusty.sh             | 19 ++++++++++++++
 modules/kogito-trusty-common/configure        | 18 +++++++++++++
 modules/kogito-trusty-common/module.yaml      | 18 +++++++++++++
 .../tests/bats/kogito-trusty-common.bats      | 19 ++++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-trusty-infinispan/configure    | 18 +++++++++++++
 modules/kogito-trusty-infinispan/module.yaml  | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-trusty-postgresql/configure    | 18 +++++++++++++
 modules/kogito-trusty-postgresql/module.yaml  | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 modules/kogito-trusty-redis/configure         | 18 +++++++++++++
 modules/kogito-trusty-redis/module.yaml       | 18 +++++++++++++
 .../added/kogito-app-launch.sh                | 19 ++++++++++++++
 .../added/launch/kogito-trusty-ui.sh          | 19 ++++++++++++++
 modules/kogito-trusty-ui/configure            | 18 +++++++++++++
 modules/kogito-trusty-ui/module.yaml          | 18 +++++++++++++
 .../tests/bats/kogito-trusty-ui.bats          | 19 ++++++++++++++
 modules/rhpam-kogito-prod-profile/configure   | 18 +++++++++++++
 modules/rhpam-kogito-prod-profile/module.yaml | 18 +++++++++++++
 .../gating.yaml                               | 18 +++++++++++++
 .../logic-swf-builder-rhel8/gating.yaml       | 18 +++++++++++++
 .../logic-swf-devmode-rhel8/gating.yaml       | 18 +++++++++++++
 .../rhpam-kogito-builder-rhel8/gating.yaml    | 18 +++++++++++++
 .../gating.yaml                               | 18 +++++++++++++
 .../gating.yaml                               | 18 +++++++++++++
 scripts/build-kogito-apps-components.sh       | 19 ++++++++++++++
 scripts/build-osbs.sh                         | 25 +++++++++++--------
 scripts/build-product-image.sh                | 19 ++++++++++++++
 scripts/common.py                             | 19 ++++++++++++++
 scripts/list-images.py                        | 19 ++++++++++++++
 scripts/logic/build-quarkus-app.sh            | 19 ++++++++++++++
 scripts/logic/test/behave_test.sh             | 18 +++++++++++++
 scripts/logic/test/env_test.sh                | 18 +++++++++++++
 scripts/logic/test/shell_test.sh              | 18 +++++++++++++
 scripts/manage-kogito-version.py              | 19 ++++++++++++++
 scripts/push-local-registry.sh                | 19 ++++++++++++++
 scripts/push-staging.py                       | 19 ++++++++++++++
 scripts/retrieve_version.py                   | 19 ++++++++++++++
 scripts/run-bats.sh                           | 19 ++++++++++++++
 scripts/setup-maven.sh                        | 19 ++++++++++++++
 scripts/update-repository.py                  | 19 ++++++++++++++
 .../kogito-swf-builder/src/RunTests.java      | 17 +++++++++++++
 tests/shell/run.sh                            | 19 ++++++++++++++
 tests/test-apps/clone-repo.sh                 | 19 ++++++++++++++
 257 files changed, 4679 insertions(+), 23 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 40a66c4ceaa..e5d1ef5d6d0 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 github:
   features:
     issues: true
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 3454a840369..bb77329f3e8 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 @Library('jenkins-pipeline-shared-libraries')_
 
 pipeline {
@@ -56,4 +72,4 @@ String getChangeTarget() {
 
 String getGitAuthorCredentialsId() {
     return env.AUTHOR_CREDS_ID
-}
+}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
index c8ca9938440..7849fd87855 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 @Library('jenkins-pipeline-shared-libraries')_
 
 pipeline {
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index deb941c3353..2a51da90ad9 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 @Library('jenkins-pipeline-shared-libraries')_
 
 QUAY_REGISTRY = 'quay.io'
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 224d74c26af..415e23053ad 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 @Library('jenkins-pipeline-shared-libraries')_
 
 deployProperties = [:]
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 5a9fd416cd1..27df81c9d6e 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+ 
 // Promote images
 @Library('jenkins-pipeline-shared-libraries')_
 
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 7b834ae6298..9f7159af523 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+ 
 import org.jenkinsci.plugins.workflow.libs.Library
 @Library('jenkins-pipeline-shared-libraries')_
 
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 8a100ec5f9b..ea1c1c29700 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+ 
 /*
 * This file is describing all the Jenkins jobs in the DSL format (see https://plugins.jenkins.io/job-dsl/)
 * needed by the Kogito pipelines.
diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index 2d518eb9f9c..a15d034b0f7 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -1,4 +1,23 @@
 #!/bin/bash -e
+#
+# 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.
+#
+
 file=$(mktemp)
 # For more usage of the script, use ./test.sh -h
 curl -o ${file} https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
diff --git a/README.md b/README.md
index 912b416b45e..8a3a8d66cdd 100644
--- a/README.md
+++ b/README.md
@@ -1443,4 +1443,4 @@ Master PR:
 
 0.9.x PR cherry picker from main:
 [0.9.x][KOGITO-XXXX] - Description of the Issue
-```
+```
\ No newline at end of file
diff --git a/container.yaml b/container.yaml
index deb7d3dad27..064e9952f73 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 ---
 platforms:
   only:
diff --git a/content_sets.yaml b/content_sets.yaml
index 1ec60cababa..c57d57bc30d 100644
--- a/content_sets.yaml
+++ b/content_sets.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 # This is a file defining which content sets (yum repositories) are needed to
 # update content in this image. Data provided here helps determine which images
 # are vulnerable to specific CVEs. Generally you should only need to update this
diff --git a/contrib/jobs-service/container-compose-infinispan.yaml b/contrib/jobs-service/container-compose-infinispan.yaml
index 9e2258d552b..0ecfb2b3109 100644
--- a/contrib/jobs-service/container-compose-infinispan.yaml
+++ b/contrib/jobs-service/container-compose-infinispan.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 services:
   infinispan:
     image: infinispan/server:14.0.4.Final
diff --git a/contrib/jobs-service/container-compose-mongodb.yaml b/contrib/jobs-service/container-compose-mongodb.yaml
index bad8f3e97d3..531d425547a 100644
--- a/contrib/jobs-service/container-compose-mongodb.yaml
+++ b/contrib/jobs-service/container-compose-mongodb.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 services:
   mongo:
     image: mongo
diff --git a/contrib/jobs-service/container-compose-postgresql.yaml b/contrib/jobs-service/container-compose-postgresql.yaml
index d3e022c1482..4f2b8026fa9 100644
--- a/contrib/jobs-service/container-compose-postgresql.yaml
+++ b/contrib/jobs-service/container-compose-postgresql.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 services:
   postgres:
     image: postgres:13.4-alpine3.14
diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index de5cb884613..9390018b411 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-base-builder"
diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index 7b831f1b6dc..5cd7606f63f 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-ephemeral"
diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml
index 723cc63bc92..56670c8a20d 100644
--- a/kogito-data-index-infinispan-image.yaml
+++ b/kogito-data-index-infinispan-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-infinispan"
diff --git a/kogito-data-index-mongodb-image.yaml b/kogito-data-index-mongodb-image.yaml
index dfbb5c1c7fa..efff5ff3ca0 100644
--- a/kogito-data-index-mongodb-image.yaml
+++ b/kogito-data-index-mongodb-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-mongodb"
diff --git a/kogito-data-index-oracle-image.yaml b/kogito-data-index-oracle-image.yaml
index 78fbf0227a4..be1851f645a 100644
--- a/kogito-data-index-oracle-image.yaml
+++ b/kogito-data-index-oracle-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-oracle"
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index b6f530a8b1f..a0852f996de 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-postgresql"
diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml
index 33cf268b1ab..102506fdad9 100644
--- a/kogito-explainability-image.yaml
+++ b/kogito-explainability-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-explainability"
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index a8445b569c3..a5edcf3d8ee 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 kind: ImageStreamList
 apiVersion: v1
 metadata:
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 4cc1ef0c96a..801539ae320 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jit-runner"
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index 6e0f1b8d194..6765bdaae90 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-allinone"
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index b666fdec541..b6b5bd6c870 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml
index b1a818e9f41..52590018ca1 100644
--- a/kogito-jobs-service-infinispan-image.yaml
+++ b/kogito-jobs-service-infinispan-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-infinispan"
diff --git a/kogito-jobs-service-mongodb-image.yaml b/kogito-jobs-service-mongodb-image.yaml
index f4db8c4ce6a..5c54b82978f 100644
--- a/kogito-jobs-service-mongodb-image.yaml
+++ b/kogito-jobs-service-mongodb-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-mongodb"
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index c53b5427d19..b13f5204392 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml
index 1f0eba29610..3e4c14f3e16 100644
--- a/kogito-management-console-image.yaml
+++ b/kogito-management-console-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-management-console"
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
index e2fd82c7022..f147c77fcb6 100644
--- a/kogito-runtime-jvm-image.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-runtime-jvm"
diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml
index 11f01135acd..336ec91070b 100644
--- a/kogito-runtime-native-image.yaml
+++ b/kogito-runtime-native-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-runtime-native"
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
index bc3901ee540..055f28be962 100644
--- a/kogito-s2i-builder-image.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-s2i-builder"
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index e501efe0c88..a937e26aeef 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
   - name: builder
     from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
     version: "999-SNAPSHOT"
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 3c5de04d0dd..6f43468109e 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
   - name: builder
     from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
     version: "999-SNAPSHOT"
diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
index 82468d3a225..75bfaf15c8f 100644
--- a/kogito-task-console-image.yaml
+++ b/kogito-task-console-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-task-console"
diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml
index b67c62c6790..3edb2f6e284 100644
--- a/kogito-trusty-infinispan-image.yaml
+++ b/kogito-trusty-infinispan-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-infinispan"
diff --git a/kogito-trusty-postgresql-image.yaml b/kogito-trusty-postgresql-image.yaml
index 84503be7c56..4e206e43da9 100644
--- a/kogito-trusty-postgresql-image.yaml
+++ b/kogito-trusty-postgresql-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-postgresql"
diff --git a/kogito-trusty-redis-image.yaml b/kogito-trusty-redis-image.yaml
index ddba8af99a0..8ca55292719 100644
--- a/kogito-trusty-redis-image.yaml
+++ b/kogito-trusty-redis-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-redis"
diff --git a/kogito-trusty-ui-image.yaml b/kogito-trusty-ui-image.yaml
index f74cac804b8..fc6a2ed52fb 100644
--- a/kogito-trusty-ui-image.yaml
+++ b/kogito-trusty-ui-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "quay.io/kiegroup/kogito-trusty-ui"
diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
index 9b59a6519b2..798f5e08e0e 100644
--- a/logic-data-index-ephemeral-rhel8-image.yaml
+++ b/logic-data-index-ephemeral-rhel8-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 
 name: "openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8"
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
index 46e863bb1fb..80ee96c0329 100644
--- a/logic-imagestream.yaml
+++ b/logic-imagestream.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 kind: ImageStreamList
 apiVersion: v1
 metadata:
diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml
index 57cfdb14d38..50c8770bb21 100644
--- a/logic-swf-builder-rhel8-image.yaml
+++ b/logic-swf-builder-rhel8-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: "openshift-serverless-1-tech-preview/logic-swf-builder-rhel8"
 version: "1.30.0"
diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml
index b241bd98a4b..1977e835361 100644
--- a/logic-swf-devmode-rhel8-image.yaml
+++ b/logic-swf-devmode-rhel8-image.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: "openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8"
 from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
diff --git a/modules/kogito-custom-truststore/added/configure-custom-truststore.sh b/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
index ceb13d1f80a..f3c180f88a5 100755
--- a/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
+++ b/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 # imports
diff --git a/modules/kogito-custom-truststore/configure b/modules/kogito-custom-truststore/configure
index 30150e5be02..ddd815e3ec2 100644
--- a/modules/kogito-custom-truststore/configure
+++ b/modules/kogito-custom-truststore/configure
@@ -1,5 +1,22 @@
 #!/bin/sh
-
+#
+# 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.
+#
 SCRIPT_DIR=$(dirname "${0}")
 
 # custom truststore configuration
diff --git a/modules/kogito-custom-truststore/module.yaml b/modules/kogito-custom-truststore/module.yaml
index 52fcb334fa0..aa895428b56 100644
--- a/modules/kogito-custom-truststore/module.yaml
+++ b/modules/kogito-custom-truststore/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.security.custom.truststores
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats b/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
index 0924abaeb6e..0ac34266fb5 100644
--- a/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
+++ b/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export HOME="${KOGITO_HOME}"
diff --git a/modules/kogito-data-index-common/added/kogito-data-index-common.sh b/modules/kogito-data-index-common/added/kogito-data-index-common.sh
index 99e1537f7db..373ada7efde 100644
--- a/modules/kogito-data-index-common/added/kogito-data-index-common.sh
+++ b/modules/kogito-data-index-common/added/kogito-data-index-common.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 source "${KOGITO_HOME}"/launch/logging.sh
 
diff --git a/modules/kogito-data-index-common/configure b/modules/kogito-data-index-common/configure
index e7a63ea169c..fc3e5005588 100644
--- a/modules/kogito-data-index-common/configure
+++ b/modules/kogito-data-index-common/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SCRIPT_DIR=$(dirname "${0}")
diff --git a/modules/kogito-data-index-common/module.yaml b/modules/kogito-data-index-common/module.yaml
index e08c45b6456..a71ecc59efa 100644
--- a/modules/kogito-data-index-common/module.yaml
+++ b/modules/kogito-data-index-common/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.dataindex.common
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats b/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
index 73c57f50bbf..312815753c5 100644
--- a/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
+++ b/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export HOME="${KOGITO_HOME}"
diff --git a/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh
index c7cb1665e13..aa15cda2106 100644
--- a/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-data-index-ephemeral/community/configure b/modules/kogito-data-index-ephemeral/community/configure
index 08f17a9c6f8..f5807a90e19 100644
--- a/modules/kogito-data-index-ephemeral/community/configure
+++ b/modules/kogito-data-index-ephemeral/community/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
index e5f65ce44c1..31d4e1bee69 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.dataindex.community.ephemeral
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
index c7cb1665e13..aa15cda2106 100644
--- a/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-data-index-ephemeral/prod/configure b/modules/kogito-data-index-ephemeral/prod/configure
index 3fbee431118..d24e68683d6 100644
--- a/modules/kogito-data-index-ephemeral/prod/configure
+++ b/modules/kogito-data-index-ephemeral/prod/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml
index 0596e56b54c..f0c0a8ddc97 100644
--- a/modules/kogito-data-index-ephemeral/prod/module.yaml
+++ b/modules/kogito-data-index-ephemeral/prod/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.dataindex.prod.ephemeral
 version: "1.30.0"
diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
index e82e98ae5d5..ec77a25695a 100644
--- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-data-index-infinispan/configure b/modules/kogito-data-index-infinispan/configure
index 5e2c185feb3..3ab6e8d850d 100644
--- a/modules/kogito-data-index-infinispan/configure
+++ b/modules/kogito-data-index-infinispan/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
index 1f7c17cc426..ba2ed20da3a 100644
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ b/modules/kogito-data-index-infinispan/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.dataindex.infinispan
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
index e82e98ae5d5..ec77a25695a 100644
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-data-index-mongodb/configure b/modules/kogito-data-index-mongodb/configure
index 1448e355e03..cbe1dd397a3 100644
--- a/modules/kogito-data-index-mongodb/configure
+++ b/modules/kogito-data-index-mongodb/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
index 77cf50791a0..447ae738955 100644
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ b/modules/kogito-data-index-mongodb/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.dataindex.mongodb
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
index 2210fc5ce98..8394e808f44 100644
--- a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-data-index-oracle/configure b/modules/kogito-data-index-oracle/configure
index 051da7b2118..7ff1cae769b 100644
--- a/modules/kogito-data-index-oracle/configure
+++ b/modules/kogito-data-index-oracle/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
index e53ca0d0c5b..a4ab95bbd25 100644
--- a/modules/kogito-data-index-oracle/module.yaml
+++ b/modules/kogito-data-index-oracle/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.dataindex.oracle
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
index e82e98ae5d5..ec77a25695a 100644
--- a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-data-index-postgresql/configure b/modules/kogito-data-index-postgresql/configure
index 54b243a83aa..a38b551b6ec 100644
--- a/modules/kogito-data-index-postgresql/configure
+++ b/modules/kogito-data-index-postgresql/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 2b03089b8eb..3ad6f18723f 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.dataindex.postgresql
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-dynamic-resources/added/container-limits b/modules/kogito-dynamic-resources/added/container-limits
index a6c359c70de..316cc17a538 100644
--- a/modules/kogito-dynamic-resources/added/container-limits
+++ b/modules/kogito-dynamic-resources/added/container-limits
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 # Detects container limits
 # If found these are exposed as the following environment variables:
 #
diff --git a/modules/kogito-dynamic-resources/added/debug-options b/modules/kogito-dynamic-resources/added/debug-options
index bbc71d2d8ae..b7ea7d4ed10 100644
--- a/modules/kogito-dynamic-resources/added/debug-options
+++ b/modules/kogito-dynamic-resources/added/debug-options
@@ -1,5 +1,22 @@
 #!/bin/sh
-
+#
+# 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.
+#
 # Check for debug options and echo them if enabled. Meant to be included by
 # a run script.
 
diff --git a/modules/kogito-dynamic-resources/added/java-default-options b/modules/kogito-dynamic-resources/added/java-default-options
index 620515414d0..5ec707a68f7 100644
--- a/modules/kogito-dynamic-resources/added/java-default-options
+++ b/modules/kogito-dynamic-resources/added/java-default-options
@@ -1,4 +1,22 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
 # =================================================================
 # Detect whether running in a container and set appropriate options
 # for limiting Java VM resources
diff --git a/modules/kogito-dynamic-resources/configure b/modules/kogito-dynamic-resources/configure
index c9c4131f860..4a24c6e9a75 100644
--- a/modules/kogito-dynamic-resources/configure
+++ b/modules/kogito-dynamic-resources/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SCRIPT_DIR=$(dirname "$0")
diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml
index ada2e7e5e5e..55802bf98dd 100644
--- a/modules/kogito-dynamic-resources/module.yaml
+++ b/modules/kogito-dynamic-resources/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.dynamic.resources
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-epel/7/configure.sh b/modules/kogito-epel/7/configure.sh
index 1ded449d026..ee946345f6a 100644
--- a/modules/kogito-epel/7/configure.sh
+++ b/modules/kogito-epel/7/configure.sh
@@ -1,4 +1,23 @@
 #!/bin/sh
+#
+# 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.
+#
+
 set -e
 
 rpm -i https://download.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
diff --git a/modules/kogito-epel/7/module.yaml b/modules/kogito-epel/7/module.yaml
index 8354aa9d94d..3a84cf27baa 100644
--- a/modules/kogito-epel/7/module.yaml
+++ b/modules/kogito-epel/7/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.epel
 version: "7"
diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
index 77505f7d70a..f838b195e17 100644
--- a/modules/kogito-explainability/added/kogito-app-launch.sh
+++ b/modules/kogito-explainability/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-explainability/added/launch/kogito-explainability.sh b/modules/kogito-explainability/added/launch/kogito-explainability.sh
index 39436a468eb..de30f040c09 100644
--- a/modules/kogito-explainability/added/launch/kogito-explainability.sh
+++ b/modules/kogito-explainability/added/launch/kogito-explainability.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-explainability/configure b/modules/kogito-explainability/configure
index ec958af86b2..fd40b372e82 100644
--- a/modules/kogito-explainability/configure
+++ b/modules/kogito-explainability/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
index 12363e12173..26dfeb05e5e 100644
--- a/modules/kogito-explainability/module.yaml
+++ b/modules/kogito-explainability/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.explainability
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-explainability/tests/bats/kogito-explainability.bats b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
index edda6753d3a..d0c85630846 100644
--- a/modules/kogito-explainability/tests/bats/kogito-explainability.bats
+++ b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export HOME="${KOGITO_HOME}"
diff --git a/modules/kogito-graalvm-installer/22.3-java-11/configure b/modules/kogito-graalvm-installer/22.3-java-11/configure
index 5155cecc1f5..7ce473e7142 100644
--- a/modules/kogito-graalvm-installer/22.3-java-11/configure
+++ b/modules/kogito-graalvm-installer/22.3-java-11/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 architecture=$(uname -i)
diff --git a/modules/kogito-graalvm-installer/22.3-java-11/module.yaml b/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
index 551734f7498..5a5c81a54a4 100644
--- a/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
+++ b/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.graalvm.java11.installer
 version: "22.3"
diff --git a/modules/kogito-graalvm-installer/23.0-java-17/configure b/modules/kogito-graalvm-installer/23.0-java-17/configure
index fb9f8993663..b88d4b06385 100644
--- a/modules/kogito-graalvm-installer/23.0-java-17/configure
+++ b/modules/kogito-graalvm-installer/23.0-java-17/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 architecture=$(uname -i)
diff --git a/modules/kogito-graalvm-installer/23.0-java-17/module.yaml b/modules/kogito-graalvm-installer/23.0-java-17/module.yaml
index c3151285e2c..83cee0a3d4b 100644
--- a/modules/kogito-graalvm-installer/23.0-java-17/module.yaml
+++ b/modules/kogito-graalvm-installer/23.0-java-17/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.graalvm.java17.installer
 version: "23.0"
diff --git a/modules/kogito-graalvm-scripts/22.3-java-11/configure b/modules/kogito-graalvm-scripts/22.3-java-11/configure
index d7026ea9c7f..b39969f7b7c 100644
--- a/modules/kogito-graalvm-scripts/22.3-java-11/configure
+++ b/modules/kogito-graalvm-scripts/22.3-java-11/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 architecture=$(uname -i)
diff --git a/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml b/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml
index ec2680345cf..49a2e2b389a 100644
--- a/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml
+++ b/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.graalvm.scripts
 version: "22.3-java-11"
diff --git a/modules/kogito-graalvm-scripts/common/added/memory-limit.sh b/modules/kogito-graalvm-scripts/common/added/memory-limit.sh
index 5fbc5cd9892..7b5e53bc6b2 100644
--- a/modules/kogito-graalvm-scripts/common/added/memory-limit.sh
+++ b/modules/kogito-graalvm-scripts/common/added/memory-limit.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 #
 # Limit memory usage for Graal VM native builds
 # for more info access https://issues.jboss.org/browse/KOGITO-306
diff --git a/modules/kogito-graalvm-scripts/common/configure b/modules/kogito-graalvm-scripts/common/configure
index b742d4ca98f..8d0a9cae070 100644
--- a/modules/kogito-graalvm-scripts/common/configure
+++ b/modules/kogito-graalvm-scripts/common/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SCRIPT_DIR=$(dirname "${0}")
diff --git a/modules/kogito-graalvm-scripts/common/module.yaml b/modules/kogito-graalvm-scripts/common/module.yaml
index edeafd8856a..a9ec2e0a04b 100644
--- a/modules/kogito-graalvm-scripts/common/module.yaml
+++ b/modules/kogito-graalvm-scripts/common/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.graalvm.common.scripts
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats b/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats
index e08db0ddf29..7037115807a 100644
--- a/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats
+++ b/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export JBOSS_CONTAINER_JAVA_JVM_MODULE=${KOGITO_HOME}/launch
diff --git a/modules/kogito-image-dependencies/clean.sh b/modules/kogito-image-dependencies/clean.sh
index d99eb4fb10e..5b184d1a00b 100644
--- a/modules/kogito-image-dependencies/clean.sh
+++ b/modules/kogito-image-dependencies/clean.sh
@@ -1,4 +1,22 @@
 #!/bin/bash
+#
+# 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.
+#
 
 microdnf clean all
 rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
index a6d6a21754f..bae10fce552 100644
--- a/modules/kogito-image-dependencies/module.yaml
+++ b/modules/kogito-image-dependencies/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.image.dependencies
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-jit-runner/added/kogito-app-launch.sh b/modules/kogito-jit-runner/added/kogito-app-launch.sh
index e4b381a1ea4..f519f07d4eb 100644
--- a/modules/kogito-jit-runner/added/kogito-app-launch.sh
+++ b/modules/kogito-jit-runner/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-jit-runner/configure b/modules/kogito-jit-runner/configure
index 0e635d596b7..871632d9a83 100644
--- a/modules/kogito-jit-runner/configure
+++ b/modules/kogito-jit-runner/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 77f8bedae2f..75fee11a735 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.jit-runner
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
index 655a58a5d04..750845d0f13 100644
--- a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-jobs-service-all-in-one/configure b/modules/kogito-jobs-service-all-in-one/configure
index eac87292dc6..d77d57dcc65 100644
--- a/modules/kogito-jobs-service-all-in-one/configure
+++ b/modules/kogito-jobs-service-all-in-one/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml
index 140c270223f..0886aa3ff9f 100644
--- a/modules/kogito-jobs-service-all-in-one/module.yaml
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.jobs.service.allinone
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh b/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh
index 589ed1fa32b..b5c8c61315c 100644
--- a/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh
+++ b/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 source "${KOGITO_HOME}"/launch/logging.sh
 
diff --git a/modules/kogito-jobs-service-common/configure b/modules/kogito-jobs-service-common/configure
index 033b6cb996a..4f07301d782 100644
--- a/modules/kogito-jobs-service-common/configure
+++ b/modules/kogito-jobs-service-common/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-jobs-service-common/module.yaml b/modules/kogito-jobs-service-common/module.yaml
index 42c6ffd5074..83ad300e86c 100644
--- a/modules/kogito-jobs-service-common/module.yaml
+++ b/modules/kogito-jobs-service-common/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.jobs.service.common
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats b/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats
index 66b86ba1a72..f6ab9514e9a 100644
--- a/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats
+++ b/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export HOME="${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
index 75d6ec88294..66b2da357fe 100644
--- a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-jobs-service-ephemeral/configure b/modules/kogito-jobs-service-ephemeral/configure
index e0d10a7961d..c9a470c1b1a 100644
--- a/modules/kogito-jobs-service-ephemeral/configure
+++ b/modules/kogito-jobs-service-ephemeral/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 6d4ac029262..685f27e2a63 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.jobs.service.ephemeral
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
index d2991896275..43b80d17337 100644
--- a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-jobs-service-infinispan/configure b/modules/kogito-jobs-service-infinispan/configure
index da71b7c3344..5966a945914 100644
--- a/modules/kogito-jobs-service-infinispan/configure
+++ b/modules/kogito-jobs-service-infinispan/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
index d12ef2619ae..abae5a2aa26 100644
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ b/modules/kogito-jobs-service-infinispan/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.jobs.service.infinispan
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
index b46d90c1706..8f6f9223aab 100644
--- a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-jobs-service-mongodb/configure b/modules/kogito-jobs-service-mongodb/configure
index 8ecd954a5e6..0b3d85b719e 100644
--- a/modules/kogito-jobs-service-mongodb/configure
+++ b/modules/kogito-jobs-service-mongodb/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
index 3f9ecbec3d8..28b6488e564 100644
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ b/modules/kogito-jobs-service-mongodb/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.jobs.service.mongodb
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
index 35aa6253e26..4ee5b43d62b 100644
--- a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-jobs-service-postgresql/configure b/modules/kogito-jobs-service-postgresql/configure
index 314d7c6e8b0..5ecde975555 100644
--- a/modules/kogito-jobs-service-postgresql/configure
+++ b/modules/kogito-jobs-service-postgresql/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 5a39d9389eb..67c5b13d099 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.jobs.service.postgresql
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
index 6ff9c801f84..ad347c76221 100644
--- a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
+++ b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 # imports
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-kubernetes-client/configure b/modules/kogito-kubernetes-client/configure
index 9a5ee7cebdd..edee947fd57 100644
--- a/modules/kogito-kubernetes-client/configure
+++ b/modules/kogito-kubernetes-client/configure
@@ -1,5 +1,22 @@
 #!/bin/sh
-
+#
+# 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.
+#
 SCRIPT_DIR=$(dirname "${0}")
 
 # kogito-kubernetes-client
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
index 6f67c9d1ae0..0b69f553a52 100644
--- a/modules/kogito-kubernetes-client/module.yaml
+++ b/modules/kogito-kubernetes-client/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.kubernetes.client
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats b/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
index 10876f6cf7c..6f4df27e192 100644
--- a/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
+++ b/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=$BATS_TMPDIR/kogito_home
 mkdir -p "${KOGITO_HOME}"/launch
diff --git a/modules/kogito-launch-scripts/added/configure.sh b/modules/kogito-launch-scripts/added/configure.sh
index 1e24088305e..638e9bbcff7 100644
--- a/modules/kogito-launch-scripts/added/configure.sh
+++ b/modules/kogito-launch-scripts/added/configure.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 # This script executes a list of modules defined by CONFIGURE_SCRIPTS.
 #
 # Configuration occurs over three basic phases: preConfigure, configure and
diff --git a/modules/kogito-launch-scripts/configure b/modules/kogito-launch-scripts/configure
index 96e16a503b0..096018fd528 100644
--- a/modules/kogito-launch-scripts/configure
+++ b/modules/kogito-launch-scripts/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index 63c4df00bcc..f1f932236c4 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.launch.scripts
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-logging/added/logging.sh b/modules/kogito-logging/added/logging.sh
index 7d43595506c..9c72c21edb7 100644
--- a/modules/kogito-logging/added/logging.sh
+++ b/modules/kogito-logging/added/logging.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 BLACK='\033[0;30m'
 RED='\033[0;31m'
diff --git a/modules/kogito-logging/configure b/modules/kogito-logging/configure
index 620777ae54d..f16737b464c 100644
--- a/modules/kogito-logging/configure
+++ b/modules/kogito-logging/configure
@@ -1,5 +1,22 @@
 #!/bin/sh
-
+#
+# 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.
+#
 SCRIPT_DIR=$(dirname "${0}")
 
 # logging
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index 41afea6be38..119f26c80d3 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.logging
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
index e0a80090d6b..e5d0f05fdb2 100644
--- a/modules/kogito-management-console/added/kogito-app-launch.sh
+++ b/modules/kogito-management-console/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-management-console/added/launch/kogito-management-console.sh b/modules/kogito-management-console/added/launch/kogito-management-console.sh
index d8b68ce3c39..e0f9641394a 100644
--- a/modules/kogito-management-console/added/launch/kogito-management-console.sh
+++ b/modules/kogito-management-console/added/launch/kogito-management-console.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-management-console/configure.sh b/modules/kogito-management-console/configure.sh
index e370070e013..a7d9cab33c5 100644
--- a/modules/kogito-management-console/configure.sh
+++ b/modules/kogito-management-console/configure.sh
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index b9cf666a400..063487f45a1 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.management.console
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-management-console/tests/bats/kogito-management-console.bats b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
index cd7e2b033ce..ee8c95f203b 100644
--- a/modules/kogito-management-console/tests/bats/kogito-management-console.bats
+++ b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export HOME="${KOGITO_HOME}"
diff --git a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
index 4fbf01faeb8..6af4c2a5b6c 100644
--- a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #Please keep them in alphabetical order
 function prepareEnv() {
diff --git a/modules/kogito-maven/3.8.x-rpm/configure b/modules/kogito-maven/3.8.x-rpm/configure
index 12edfbf4c94..ef74352f148 100644
--- a/modules/kogito-maven/3.8.x-rpm/configure
+++ b/modules/kogito-maven/3.8.x-rpm/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
index 4794794193a..cc5bdf92c41 100644
--- a/modules/kogito-maven/3.8.x-rpm/module.yaml
+++ b/modules/kogito-maven/3.8.x-rpm/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.maven.rpm
 version: "3.8"
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 5526d8e74c2..2749d798b59 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.maven
 version: "3.8.6"
diff --git a/modules/kogito-maven/3.9.x/module.yaml b/modules/kogito-maven/3.9.x/module.yaml
index 2c90c69afc3..dcd4b8a67bb 100644
--- a/modules/kogito-maven/3.9.x/module.yaml
+++ b/modules/kogito-maven/3.9.x/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.maven
 version: "3.9.3"
diff --git a/modules/kogito-maven/common/added/configure-maven.sh b/modules/kogito-maven/common/added/configure-maven.sh
index 0027aa01f83..b2b41b7cba4 100644
--- a/modules/kogito-maven/common/added/configure-maven.sh
+++ b/modules/kogito-maven/common/added/configure-maven.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #Please keep them in alphabetical order
 function prepareEnv() {
diff --git a/modules/kogito-maven/common/configure b/modules/kogito-maven/common/configure
index 196423d3aac..aa7e67b613d 100644
--- a/modules/kogito-maven/common/configure
+++ b/modules/kogito-maven/common/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-maven/common/module.yaml b/modules/kogito-maven/common/module.yaml
index fcc35b2202e..0c28db9b277 100644
--- a/modules/kogito-maven/common/module.yaml
+++ b/modules/kogito-maven/common/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.maven.common
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-maven/maven-dnf-module/configure b/modules/kogito-maven/maven-dnf-module/configure
index 3b0c90a3e94..fd40c2e4ce0 100644
--- a/modules/kogito-maven/maven-dnf-module/configure
+++ b/modules/kogito-maven/maven-dnf-module/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SCRIPT_DIR=$(dirname $0)
diff --git a/modules/kogito-maven/maven-dnf-module/module.yaml b/modules/kogito-maven/maven-dnf-module/module.yaml
index e3fde534b31..13daf59a28a 100644
--- a/modules/kogito-maven/maven-dnf-module/module.yaml
+++ b/modules/kogito-maven/maven-dnf-module/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.maven.dnf.module
 version: "3.8"
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats
index 7d666ae1020..8a7e85067c7 100644
--- a/modules/kogito-maven/tests/bats/maven-settings.bats
+++ b/modules/kogito-maven/tests/bats/maven-settings.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 # imports
 source $BATS_TEST_DIRNAME/../../common/added/configure-maven.sh
diff --git a/modules/kogito-openjdk/11-headless/clean.sh b/modules/kogito-openjdk/11-headless/clean.sh
index d99eb4fb10e..5b184d1a00b 100644
--- a/modules/kogito-openjdk/11-headless/clean.sh
+++ b/modules/kogito-openjdk/11-headless/clean.sh
@@ -1,4 +1,22 @@
 #!/bin/bash
+#
+# 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.
+#
 
 microdnf clean all
 rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/11-headless/module.yaml b/modules/kogito-openjdk/11-headless/module.yaml
index aacfc7fd2d1..bf78ddea605 100644
--- a/modules/kogito-openjdk/11-headless/module.yaml
+++ b/modules/kogito-openjdk/11-headless/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.openjdk.headless
 version: "11"
diff --git a/modules/kogito-openjdk/11/clean.sh b/modules/kogito-openjdk/11/clean.sh
index d99eb4fb10e..5b184d1a00b 100644
--- a/modules/kogito-openjdk/11/clean.sh
+++ b/modules/kogito-openjdk/11/clean.sh
@@ -1,4 +1,22 @@
 #!/bin/bash
+#
+# 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.
+#
 
 microdnf clean all
 rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/11/module.yaml b/modules/kogito-openjdk/11/module.yaml
index a6d65ea9a08..c0f8e74eb33 100644
--- a/modules/kogito-openjdk/11/module.yaml
+++ b/modules/kogito-openjdk/11/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.openjdk
 version: "11"
diff --git a/modules/kogito-openjdk/17-headless/clean.sh b/modules/kogito-openjdk/17-headless/clean.sh
index d99eb4fb10e..5b184d1a00b 100644
--- a/modules/kogito-openjdk/17-headless/clean.sh
+++ b/modules/kogito-openjdk/17-headless/clean.sh
@@ -1,4 +1,22 @@
 #!/bin/bash
+#
+# 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.
+#
 
 microdnf clean all
 rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/17-headless/module.yaml b/modules/kogito-openjdk/17-headless/module.yaml
index 2df5eaf2490..ebdf54bd500 100644
--- a/modules/kogito-openjdk/17-headless/module.yaml
+++ b/modules/kogito-openjdk/17-headless/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.openjdk.headless
 version: "17"
diff --git a/modules/kogito-openjdk/17/clean.sh b/modules/kogito-openjdk/17/clean.sh
index d99eb4fb10e..f4c79eb5cde 100644
--- a/modules/kogito-openjdk/17/clean.sh
+++ b/modules/kogito-openjdk/17/clean.sh
@@ -1,4 +1,21 @@
 #!/bin/bash
-
+#
+# 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.
+#
 microdnf clean all
 rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/17/module.yaml b/modules/kogito-openjdk/17/module.yaml
index c182e22c9ad..7a7e7349d26 100644
--- a/modules/kogito-openjdk/17/module.yaml
+++ b/modules/kogito-openjdk/17/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.openjdk
 version: "17"
diff --git a/modules/kogito-persistence/added/kogito-persistence.sh b/modules/kogito-persistence/added/kogito-persistence.sh
index a325e616fd6..a9cea6665bc 100644
--- a/modules/kogito-persistence/added/kogito-persistence.sh
+++ b/modules/kogito-persistence/added/kogito-persistence.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 # imports
 source "${KOGITO_HOME}"/launch/kogito-kubernetes-client.sh
diff --git a/modules/kogito-persistence/configure b/modules/kogito-persistence/configure
index af187835961..1ecd7ef1d3f 100644
--- a/modules/kogito-persistence/configure
+++ b/modules/kogito-persistence/configure
@@ -1,5 +1,22 @@
 #!/bin/sh
-
+#
+# 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.
+#
 SCRIPT_DIR=$(dirname "${0}")
 
 # kogito-persistence
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
index f6d242dc962..c65cb8f2b6a 100644
--- a/modules/kogito-persistence/module.yaml
+++ b/modules/kogito-persistence/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.persistence
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
index 401d362f187..fdb026348dd 100644
--- a/modules/kogito-persistence/tests/bats/kogito-persistence.bats
+++ b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=$BATS_TMPDIR/kogito_home
 export MOCK_RESPONSE=""
diff --git a/modules/kogito-pkg-update/configure b/modules/kogito-pkg-update/configure
index ef7ae411ca7..82dc65a5d75 100644
--- a/modules/kogito-pkg-update/configure
+++ b/modules/kogito-pkg-update/configure
@@ -1,4 +1,22 @@
 #!/bin/bash
+#
+# 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.
+#
 set -euo pipefail
 
 for candidate in yum dnf microdnf; do
diff --git a/modules/kogito-pkg-update/module.yaml b/modules/kogito-pkg-update/module.yaml
index 1d14cf80555..f62beedc9a9 100644
--- a/modules/kogito-pkg-update/module.yaml
+++ b/modules/kogito-pkg-update/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.pkg-update
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index 745c9c1852c..b9031b3dabc 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.project.versions
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
index 0b089518eb9..0a2b12647ef 100644
--- a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
+++ b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 #
 # S2I run script for the 'kogito-runtime-jvm' images.
 # The run script executes the server that runs your application.
diff --git a/modules/kogito-runtime-jvm/configure b/modules/kogito-runtime-jvm/configure
index 79a6447b8d1..6635e0e76dd 100644
--- a/modules/kogito-runtime-jvm/configure
+++ b/modules/kogito-runtime-jvm/configure
@@ -1,5 +1,22 @@
 #!/bin/sh
-
+#
+# 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.
+#
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
diff --git a/modules/kogito-runtime-jvm/module.yaml b/modules/kogito-runtime-jvm/module.yaml
index 7e2becb2203..23b538245a4 100644
--- a/modules/kogito-runtime-jvm/module.yaml
+++ b/modules/kogito-runtime-jvm/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.runtime.jvm
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-runtime-jvm/s2i/bin/assemble b/modules/kogito-runtime-jvm/s2i/bin/assemble
index 1a2513dea5c..390579ce5c4 100755
--- a/modules/kogito-runtime-jvm/s2i/bin/assemble
+++ b/modules/kogito-runtime-jvm/s2i/bin/assemble
@@ -1,4 +1,22 @@
 #!/bin/bash -e
+#
+# 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.
+#
 # this script is used by OpenShift with chained builds
 # to transfer data from builder image into the runtime image
 
diff --git a/modules/kogito-runtime-jvm/s2i/bin/usage b/modules/kogito-runtime-jvm/s2i/bin/usage
index fe19a008b73..7a5201d0a11 100644
--- a/modules/kogito-runtime-jvm/s2i/bin/usage
+++ b/modules/kogito-runtime-jvm/s2i/bin/usage
@@ -1,5 +1,22 @@
 #!/bin/bash -e
-
+#
+# 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.
+#
 IMAGE_NAME="quay.io/kiegroup/kogito-runtime-jvm"
 if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
     IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8"
diff --git a/modules/kogito-runtime-native/added/kogito-app-launch.sh b/modules/kogito-runtime-native/added/kogito-app-launch.sh
index 90c4ca8b461..234ea882096 100644
--- a/modules/kogito-runtime-native/added/kogito-app-launch.sh
+++ b/modules/kogito-runtime-native/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 #
 # S2I run script for the 'kogito-runtime-native' images.
 # The run script executes the server that runs your application.
diff --git a/modules/kogito-runtime-native/configure b/modules/kogito-runtime-native/configure
index 79a6447b8d1..6635e0e76dd 100644
--- a/modules/kogito-runtime-native/configure
+++ b/modules/kogito-runtime-native/configure
@@ -1,5 +1,22 @@
 #!/bin/sh
-
+#
+# 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.
+#
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
diff --git a/modules/kogito-runtime-native/module.yaml b/modules/kogito-runtime-native/module.yaml
index 4f8bc3813ed..c9dadd2d195 100644
--- a/modules/kogito-runtime-native/module.yaml
+++ b/modules/kogito-runtime-native/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.runtime.native
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-runtime-native/s2i/bin/assemble b/modules/kogito-runtime-native/s2i/bin/assemble
index 1a2513dea5c..390579ce5c4 100755
--- a/modules/kogito-runtime-native/s2i/bin/assemble
+++ b/modules/kogito-runtime-native/s2i/bin/assemble
@@ -1,4 +1,22 @@
 #!/bin/bash -e
+#
+# 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.
+#
 # this script is used by OpenShift with chained builds
 # to transfer data from builder image into the runtime image
 
diff --git a/modules/kogito-runtime-native/s2i/bin/usage b/modules/kogito-runtime-native/s2i/bin/usage
index d14e5c523a2..1366d83c972 100644
--- a/modules/kogito-runtime-native/s2i/bin/usage
+++ b/modules/kogito-runtime-native/s2i/bin/usage
@@ -1,4 +1,22 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
 
 IMAGE_NAME="quay.io/kiegroup/kogito-runtime-native"
 if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
diff --git a/modules/kogito-s2i-builder/added/kogito-app-launch.sh b/modules/kogito-s2i-builder/added/kogito-app-launch.sh
index 13dec2f9982..77ec66bf83a 100644
--- a/modules/kogito-s2i-builder/added/kogito-app-launch.sh
+++ b/modules/kogito-s2i-builder/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 #
 # S2I run script for the 'kogito-s2i-builder' image.
 # The run script executes the server that runs your application.
diff --git a/modules/kogito-s2i-builder/configure b/modules/kogito-s2i-builder/configure
index 480c0383e9a..ebfe5a14b66 100644
--- a/modules/kogito-s2i-builder/configure
+++ b/modules/kogito-s2i-builder/configure
@@ -1,4 +1,22 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
 
 set -e
 
diff --git a/modules/kogito-s2i-builder/module.yaml b/modules/kogito-s2i-builder/module.yaml
index 55e5cb99ea2..772cc9956c3 100644
--- a/modules/kogito-s2i-builder/module.yaml
+++ b/modules/kogito-s2i-builder/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.s2i.builder
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-s2i-builder/s2i/bin/assemble b/modules/kogito-s2i-builder/s2i/bin/assemble
index 488029f176b..be0aeec0d4c 100644
--- a/modules/kogito-s2i-builder/s2i/bin/assemble
+++ b/modules/kogito-s2i-builder/s2i/bin/assemble
@@ -1,5 +1,23 @@
 #!/usr/bin/env bash
 #
+# 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.
+#
+#
 # S2I assemble script for the 'kogito-builder' image.
 # The 'assemble' script builds your application source so that it is ready to run.
 #
diff --git a/modules/kogito-s2i-builder/s2i/bin/usage b/modules/kogito-s2i-builder/s2i/bin/usage
index a1df5f9d5cf..416d0f117ab 100644
--- a/modules/kogito-s2i-builder/s2i/bin/usage
+++ b/modules/kogito-s2i-builder/s2i/bin/usage
@@ -1,4 +1,22 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
 
 IMAGE_NAME="quay.io/kiegroup/kogito-s2i-builder"
 RUNTIME_JVM_IMAGE_NAME="quay.io/kiegroup/kogito-runtime-jvm"
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 2e6737052ef..46ff1a6094c 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -1,4 +1,22 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
 
 # imports
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-s2i-core/configure.sh b/modules/kogito-s2i-core/configure.sh
index e61ce36f462..3b2991106c6 100644
--- a/modules/kogito-s2i-core/configure.sh
+++ b/modules/kogito-s2i-core/configure.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 # Configure module
 set -e
 
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index b6ee030b437..27f67a4e369 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.s2i.core
 version: '999-SNAPSHOT'
diff --git a/modules/kogito-s2i-core/s2i/bin/assemble-runtime b/modules/kogito-s2i-core/s2i/bin/assemble-runtime
index 8beb2d20a5f..e9b027587f4 100644
--- a/modules/kogito-s2i-core/s2i/bin/assemble-runtime
+++ b/modules/kogito-s2i-core/s2i/bin/assemble-runtime
@@ -1,5 +1,22 @@
 #!/bin/bash -e
 #
+# 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.
+#
 # S2I assemble-runtime script for the 'kogito-runtime-native' image.
 # The assemble-runtime script executes preparation for running the container on runtime image.
 #
diff --git a/modules/kogito-s2i-core/s2i/bin/run b/modules/kogito-s2i-core/s2i/bin/run
index e4379a95a5f..3294dc1dbc8 100644
--- a/modules/kogito-s2i-core/s2i/bin/run
+++ b/modules/kogito-s2i-core/s2i/bin/run
@@ -1,3 +1,21 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
 set -e
 exec "${KOGITO_HOME}"/kogito-app-launch.sh ${1}
\ No newline at end of file
diff --git a/modules/kogito-s2i-core/s2i/bin/save-artifacts b/modules/kogito-s2i-core/s2i/bin/save-artifacts
index 46e04c06080..114e50a2aba 100644
--- a/modules/kogito-s2i-core/s2i/bin/save-artifacts
+++ b/modules/kogito-s2i-core/s2i/bin/save-artifacts
@@ -1,5 +1,23 @@
-#!/usr/bin/env bash
 
+#!/usr/bin/env bash
+#
+# 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.
+#
 cd ${HOME}
 tar cf - .m2
 
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 714ed4c9cda..5201654d7e9 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=$BATS_TMPDIR/kogito_home
 mkdir -p "${KOGITO_HOME}"/{bin,launch}
diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index b61c27cbae3..b00d0629155 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.swf.builder.build-config
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-swf/builder/runtime/community/configure.sh b/modules/kogito-swf/builder/runtime/community/configure.sh
index 0f0bc8e916c..14d76b74531 100644
--- a/modules/kogito-swf/builder/runtime/community/configure.sh
+++ b/modules/kogito-swf/builder/runtime/community/configure.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-swf/builder/runtime/community/module.yaml b/modules/kogito-swf/builder/runtime/community/module.yaml
index 62ccde52f94..0a4d4172865 100644
--- a/modules/kogito-swf/builder/runtime/community/module.yaml
+++ b/modules/kogito-swf/builder/runtime/community/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.swf.builder.runtime.community
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-swf/builder/runtime/osl/configure.sh b/modules/kogito-swf/builder/runtime/osl/configure.sh
index d4c58e01df6..70c258fa61a 100644
--- a/modules/kogito-swf/builder/runtime/osl/configure.sh
+++ b/modules/kogito-swf/builder/runtime/osl/configure.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-swf/builder/runtime/osl/module.yaml b/modules/kogito-swf/builder/runtime/osl/module.yaml
index 9758f7be586..b126715ce3f 100644
--- a/modules/kogito-swf/builder/runtime/osl/module.yaml
+++ b/modules/kogito-swf/builder/runtime/osl/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.swf.builder.runtime.osl
 version: "1.30.0"
diff --git a/modules/kogito-swf/common/build/added/cleanup_project.sh b/modules/kogito-swf/common/build/added/cleanup_project.sh
index 2a2309248b7..b3c12a33609 100755
--- a/modules/kogito-swf/common/build/added/cleanup_project.sh
+++ b/modules/kogito-swf/common/build/added/cleanup_project.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 #remove unnecessary files
diff --git a/modules/kogito-swf/common/build/added/zip_files.sh b/modules/kogito-swf/common/build/added/zip_files.sh
index f6ef2559cd9..31e30ec6fb0 100755
--- a/modules/kogito-swf/common/build/added/zip_files.sh
+++ b/modules/kogito-swf/common/build/added/zip_files.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 BUILD_OUTPUT="${KOGITO_HOME}"/build_output/
diff --git a/modules/kogito-swf/common/build/configure.sh b/modules/kogito-swf/common/build/configure.sh
index 30c62f5ea1b..50897c656b1 100644
--- a/modules/kogito-swf/common/build/configure.sh
+++ b/modules/kogito-swf/common/build/configure.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/modules/kogito-swf/common/build/module.yaml b/modules/kogito-swf/common/build/module.yaml
index 433afad89fa..8f277cd9f72 100644
--- a/modules/kogito-swf/common/build/module.yaml
+++ b/modules/kogito-swf/common/build/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.swf.common.build
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-swf/common/scripts/added/add-extension.sh b/modules/kogito-swf/common/scripts/added/add-extension.sh
index 2ef004a8cfa..82a023ace1b 100755
--- a/modules/kogito-swf/common/scripts/added/add-extension.sh
+++ b/modules/kogito-swf/common/scripts/added/add-extension.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
index 2f661aed49f..c85927c4bed 100755
--- a/modules/kogito-swf/common/scripts/added/build-app.sh
+++ b/modules/kogito-swf/common/scripts/added/build-app.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
diff --git a/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh b/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh
index bad548b6cbf..cd8292cc014 100755
--- a/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh
+++ b/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Dmaven.compiler.release=${JAVA_VERSION}"
diff --git a/modules/kogito-swf/common/scripts/added/create-app.sh b/modules/kogito-swf/common/scripts/added/create-app.sh
index 5a4ce738a1a..ad25fb66fcb 100755
--- a/modules/kogito-swf/common/scripts/added/create-app.sh
+++ b/modules/kogito-swf/common/scripts/added/create-app.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
diff --git a/modules/kogito-swf/common/scripts/added/jvm-settings.sh b/modules/kogito-swf/common/scripts/added/jvm-settings.sh
index b2c3e4ce9bf..b8a1fce9554 100755
--- a/modules/kogito-swf/common/scripts/added/jvm-settings.sh
+++ b/modules/kogito-swf/common/scripts/added/jvm-settings.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 # Calculate the java memory for the given maven build.
 # It is based in the container-limits that can be found in
 # https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash/artifacts/opt/jboss/container/java/jvm/container-limits
diff --git a/modules/kogito-swf/common/scripts/configure.sh b/modules/kogito-swf/common/scripts/configure.sh
index 2beff0e3f87..8fa4b87981a 100644
--- a/modules/kogito-swf/common/scripts/configure.sh
+++ b/modules/kogito-swf/common/scripts/configure.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/modules/kogito-swf/common/scripts/module.yaml b/modules/kogito-swf/common/scripts/module.yaml
index 7f5b20b71b5..4d10be8a392 100644
--- a/modules/kogito-swf/common/scripts/module.yaml
+++ b/modules/kogito-swf/common/scripts/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.swf.common.scripts
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
index d0993822dd2..9ffce5d374c 100644
--- a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
+++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
@@ -1,4 +1,22 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
 
 setup() {
     export KOGITO_HOME=/tmp/kogito
diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
index 1b45a00b751..a0487e8d477 100644
--- a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
+++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export HOME="${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index 9e66192550e..bf8b40bf150 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.swf.devmode.build-config
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
index 295ce739f28..d929b29aadd 100755
--- a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
+++ b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
diff --git a/modules/kogito-swf/devmode/runtime/common/configure.sh b/modules/kogito-swf/devmode/runtime/common/configure.sh
index 7eb338429c7..582997ada49 100644
--- a/modules/kogito-swf/devmode/runtime/common/configure.sh
+++ b/modules/kogito-swf/devmode/runtime/common/configure.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/modules/kogito-swf/devmode/runtime/common/module.yaml b/modules/kogito-swf/devmode/runtime/common/module.yaml
index c8e8083a65c..cad1b7061b5 100644
--- a/modules/kogito-swf/devmode/runtime/common/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/common/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.swf.devmode.runtime.common
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-swf/devmode/runtime/community/configure.sh b/modules/kogito-swf/devmode/runtime/community/configure.sh
index 87cc1b18a11..efe6f6089ca 100644
--- a/modules/kogito-swf/devmode/runtime/community/configure.sh
+++ b/modules/kogito-swf/devmode/runtime/community/configure.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/modules/kogito-swf/devmode/runtime/community/module.yaml b/modules/kogito-swf/devmode/runtime/community/module.yaml
index 9b8e00e9ec3..c48ec72819f 100644
--- a/modules/kogito-swf/devmode/runtime/community/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/community/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.swf.devmode.runtime.community
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-swf/devmode/runtime/osl/configure.sh b/modules/kogito-swf/devmode/runtime/osl/configure.sh
index 6c11bdb8d9b..a72caf961b7 100644
--- a/modules/kogito-swf/devmode/runtime/osl/configure.sh
+++ b/modules/kogito-swf/devmode/runtime/osl/configure.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/modules/kogito-swf/devmode/runtime/osl/module.yaml b/modules/kogito-swf/devmode/runtime/osl/module.yaml
index d2cba2a8911..6da3562f731 100644
--- a/modules/kogito-swf/devmode/runtime/osl/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/osl/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.swf.devmode.runtime.osl
 version: "1.30.0"
diff --git a/modules/kogito-system-user/add-user b/modules/kogito-system-user/add-user
index 8f0ca354519..cd5c209fc8b 100644
--- a/modules/kogito-system-user/add-user
+++ b/modules/kogito-system-user/add-user
@@ -1,5 +1,22 @@
 #!/bin/sh
-
+#
+# 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.
+#
 groupadd -r kogito -g 1001 && useradd -u 1001 -r -g root -G "${USER}" -m -d "${KOGITO_HOME}" -s /sbin/nologin -c "Kogito user" ${USER}
 
 mkdir "${KOGITO_HOME}"/bin
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index 8d01bd7db12..74788b3e249 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.system.user
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh
index 6e80c75f944..538dc5490e8 100644
--- a/modules/kogito-task-console/added/kogito-app-launch.sh
+++ b/modules/kogito-task-console/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-task-console/added/launch/kogito-task-console.sh b/modules/kogito-task-console/added/launch/kogito-task-console.sh
index c88f8474a70..1b6a600e3f2 100644
--- a/modules/kogito-task-console/added/launch/kogito-task-console.sh
+++ b/modules/kogito-task-console/added/launch/kogito-task-console.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-task-console/configure b/modules/kogito-task-console/configure
index 484f7192af4..1c6659a10d0 100644
--- a/modules/kogito-task-console/configure
+++ b/modules/kogito-task-console/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index c4cbee70f5b..43d5667f0e8 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.task.console
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-task-console/tests/bats/kogito-task-console.bats b/modules/kogito-task-console/tests/bats/kogito-task-console.bats
index 33a0a1eed45..ac1de079f39 100644
--- a/modules/kogito-task-console/tests/bats/kogito-task-console.bats
+++ b/modules/kogito-task-console/tests/bats/kogito-task-console.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export HOME="${KOGITO_HOME}"
diff --git a/modules/kogito-trusty-common/added/launch/kogito-trusty.sh b/modules/kogito-trusty-common/added/launch/kogito-trusty.sh
index 02a945df25f..a163c81d9dc 100644
--- a/modules/kogito-trusty-common/added/launch/kogito-trusty.sh
+++ b/modules/kogito-trusty-common/added/launch/kogito-trusty.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-trusty-common/configure b/modules/kogito-trusty-common/configure
index 01239faa1e4..a54486162cc 100644
--- a/modules/kogito-trusty-common/configure
+++ b/modules/kogito-trusty-common/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-trusty-common/module.yaml b/modules/kogito-trusty-common/module.yaml
index dad4cba4370..9a7be9b8cfd 100644
--- a/modules/kogito-trusty-common/module.yaml
+++ b/modules/kogito-trusty-common/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.trusty.common
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats b/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats
index fc3ab97f23c..afa1ffe0a8e 100644
--- a/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats
+++ b/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export HOME="${KOGITO_HOME}"
diff --git a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
index 2caba923a96..ab8a34e3221 100644
--- a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-trusty-infinispan/configure b/modules/kogito-trusty-infinispan/configure
index fdc16014397..93536c02517 100644
--- a/modules/kogito-trusty-infinispan/configure
+++ b/modules/kogito-trusty-infinispan/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
index 9a4b4ec4100..316cb95b52c 100644
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ b/modules/kogito-trusty-infinispan/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.trusty.infinispan
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh b/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
index 2caba923a96..ab8a34e3221 100644
--- a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-trusty-postgresql/configure b/modules/kogito-trusty-postgresql/configure
index a2e9d402777..9cca2a2a850 100644
--- a/modules/kogito-trusty-postgresql/configure
+++ b/modules/kogito-trusty-postgresql/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
index 87cae0e0ee0..31fde32f607 100644
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ b/modules/kogito-trusty-postgresql/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.trusty.postgresql
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-trusty-redis/added/kogito-app-launch.sh b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
index 2caba923a96..ab8a34e3221 100644
--- a/modules/kogito-trusty-redis/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-trusty-redis/configure b/modules/kogito-trusty-redis/configure
index 132ba778469..cfb84f93a0f 100644
--- a/modules/kogito-trusty-redis/configure
+++ b/modules/kogito-trusty-redis/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
index 7fdc03988f3..b932b7fdb04 100644
--- a/modules/kogito-trusty-redis/module.yaml
+++ b/modules/kogito-trusty-redis/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.trusty.redis
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
index 18ff16a26ae..be69ceb8967 100644
--- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh
+++ b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
index f8a16c7d61f..79fb635783d 100644
--- a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
+++ b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 #import
 source "${KOGITO_HOME}"/launch/logging.sh
diff --git a/modules/kogito-trusty-ui/configure b/modules/kogito-trusty-ui/configure
index 41a4214e0d8..13fc920e04f 100644
--- a/modules/kogito-trusty-ui/configure
+++ b/modules/kogito-trusty-ui/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 SOURCES_DIR=/tmp/artifacts
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
index 6e9b7ead90f..7559cc64cfe 100644
--- a/modules/kogito-trusty-ui/module.yaml
+++ b/modules/kogito-trusty-ui/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.trusty.ui
 version: "999-SNAPSHOT"
diff --git a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
index 1eb510ab87c..6f755ab7046 100644
--- a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
+++ b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
@@ -1,4 +1,23 @@
 #!/usr/bin/env bats
+#
+# 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.
+#
+
 
 export KOGITO_HOME=/tmp/kogito
 export HOME="${KOGITO_HOME}"
diff --git a/modules/rhpam-kogito-prod-profile/configure b/modules/rhpam-kogito-prod-profile/configure
index 821a9250fce..f352652d13e 100644
--- a/modules/rhpam-kogito-prod-profile/configure
+++ b/modules/rhpam-kogito-prod-profile/configure
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+# 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.
+#
 set -e
 
 # configure Red Hat repositories on the maven settings.xml for product builds
diff --git a/modules/rhpam-kogito-prod-profile/module.yaml b/modules/rhpam-kogito-prod-profile/module.yaml
index 67dbec0dab0..47af707f2f2 100644
--- a/modules/rhpam-kogito-prod-profile/module.yaml
+++ b/modules/rhpam-kogito-prod-profile/module.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 schema_version: 1
 name: org.kie.kogito.rhpam.prod.profile
 version: '7.13.0'
diff --git a/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml b/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml
index 5d497c87432..4930b68cdb0 100644
--- a/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml
+++ b/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 --- !Policy
 id: "cvp-logic-data-index-ephemeral-rhel8"
 product_versions:
diff --git a/osbs-extra/logic-swf-builder-rhel8/gating.yaml b/osbs-extra/logic-swf-builder-rhel8/gating.yaml
index f23861d007b..d6ae18ae837 100644
--- a/osbs-extra/logic-swf-builder-rhel8/gating.yaml
+++ b/osbs-extra/logic-swf-builder-rhel8/gating.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 --- !Policy
 id: "cvp-logic-swf-builder-rhel8"
 product_versions:
diff --git a/osbs-extra/logic-swf-devmode-rhel8/gating.yaml b/osbs-extra/logic-swf-devmode-rhel8/gating.yaml
index 0369c3ed30f..d35f9bcf114 100644
--- a/osbs-extra/logic-swf-devmode-rhel8/gating.yaml
+++ b/osbs-extra/logic-swf-devmode-rhel8/gating.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 --- !Policy
 id: "cvp-logic-swf-devmode-rhel8"
 product_versions:
diff --git a/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml
index 236bfdfb635..bb8ef66d436 100644
--- a/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml
+++ b/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 --- !Policy
 id: "cvp-rhpam-kogito-builder"
 product_versions:
diff --git a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
index e1769f0b5a2..b0b6e9f01bc 100644
--- a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
+++ b/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 --- !Policy
 id: "cvp-rhpam-kogito-runtime-jvm"
 product_versions:
diff --git a/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml
index 31dbaac8cc5..b0601469cd3 100644
--- a/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml
+++ b/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 --- !Policy
 id: "cvp-rhpam-kogito-runtime-native"
 product_versions:
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 9c77acbe77d..c36e5425ea2 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 # Parameters:
 #   1 - image name - can't  be empty.
 #   2 - git target branch - defaults to main
diff --git a/scripts/build-osbs.sh b/scripts/build-osbs.sh
index cd2ae0e7522..f8a79ca4766 100755
--- a/scripts/build-osbs.sh
+++ b/scripts/build-osbs.sh
@@ -1,17 +1,22 @@
 #!/bin/bash
-# Copyright 2020 Red Hat, Inc. and/or its affiliates
 #
-# Licensed 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
+# 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
+#   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.
 #
-# 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.
 
 set -e
 
diff --git a/scripts/build-product-image.sh b/scripts/build-product-image.sh
index 0a007f7cb16..3abd3b052e5 100755
--- a/scripts/build-product-image.sh
+++ b/scripts/build-product-image.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 # Simple usage: /bin/sh scripts/build-product-image.sh "build" ${IMAGE_NAME} ${BUILD_ENGINE}
 
 ver=$(cekit --version )
diff --git a/scripts/common.py b/scripts/common.py
index e0659e81897..bc99fa70cf9 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -1,4 +1,23 @@
 #!/usr/bin/python
+#
+# 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.
+#
+
 # This script defines some common function that are used by manage-kogito-version.py and push-staging.py script
 
 
diff --git a/scripts/list-images.py b/scripts/list-images.py
index e982d164b22..6ad2c154b86 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -1,4 +1,23 @@
 #!/usr/bin/env python
+#
+# 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.
+#
+
 # Script responsible to update the tests with
 # Should be run from root directory of the repository
 
diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index c58ddcf9bde..30fdd6454cf 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 # Parameters:
 #   1 - Image name
 #   2 - Quarkus platform group id
diff --git a/scripts/logic/test/behave_test.sh b/scripts/logic/test/behave_test.sh
index c5107759017..f4eec48b8bc 100755
--- a/scripts/logic/test/behave_test.sh
+++ b/scripts/logic/test/behave_test.sh
@@ -1,4 +1,22 @@
 #!/bin/bash
+#
+# 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.
+#
 
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 source ${script_dir_path}/env_test.sh $@
diff --git a/scripts/logic/test/env_test.sh b/scripts/logic/test/env_test.sh
index 14e8b904db8..a830d1d0058 100755
--- a/scripts/logic/test/env_test.sh
+++ b/scripts/logic/test/env_test.sh
@@ -1,4 +1,22 @@
 #!/bin/bash
+#
+# 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.
+#
 
 export image_id=$1
 export image_full_tag=$2
diff --git a/scripts/logic/test/shell_test.sh b/scripts/logic/test/shell_test.sh
index 8a133425a12..dff8a2839b2 100755
--- a/scripts/logic/test/shell_test.sh
+++ b/scripts/logic/test/shell_test.sh
@@ -1,4 +1,22 @@
 #!/bin/bash
+#
+# 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.
+#
 
 script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
 source ${script_dir_path}/env_test.sh $@
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 346215fa4cd..1a407f4a70a 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -1,4 +1,23 @@
 #!/usr/bin/env python
+#
+# 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.
+#
+
 # This script will be responsible to help to manage kogito images and modules version, it will update all needed files
 # Example of usage:
 #   # move the current version to the next one or rcX
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index 79d2ca89927..1a3d1615dc2 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 # Simple usage: /bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}
 
 BUILD_ENGINE="docker"
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 5fde35932c7..94d9dc18422 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -1,4 +1,23 @@
 #!/usr/bin/env python
+#
+# 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.
+#
+
 # This script will be responsible to fetch the latest rc tags from each image and define the next
 # rc tag to avoid images get overridden.
 #
diff --git a/scripts/retrieve_version.py b/scripts/retrieve_version.py
index b1b1c7a9867..2a87cba9628 100644
--- a/scripts/retrieve_version.py
+++ b/scripts/retrieve_version.py
@@ -1,4 +1,23 @@
 #!/usr/bin/env python
+#
+# 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.
+#
+
 #Script responsible to update the tests with 
 #Should be run from root directory of the repository
 #Sample usage:  python scripts/retrieve_version.py
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 0351bf5be24..79c11c5a3f4 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 
 set -e
 
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
index 589f444a972..78be682dfe7 100755
--- a/scripts/setup-maven.sh
+++ b/scripts/setup-maven.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 # Holds common maven configuration for CI;
 # Usage: . setup-maven.sh
 
diff --git a/scripts/update-repository.py b/scripts/update-repository.py
index 0ed9b8a2da0..9465535c5f9 100644
--- a/scripts/update-repository.py
+++ b/scripts/update-repository.py
@@ -1,4 +1,23 @@
 #!/usr/bin/env python
+#
+# 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.
+#
+
 #Script responsible to update the tests with 
 #Should be run from root directory of the repository
 #Sample usage:  python scripts/update-tests.py
diff --git a/tests/shell/kogito-swf-builder/src/RunTests.java b/tests/shell/kogito-swf-builder/src/RunTests.java
index d3bc70a9d1c..3cccdd70285 100644
--- a/tests/shell/kogito-swf-builder/src/RunTests.java
+++ b/tests/shell/kogito-swf-builder/src/RunTests.java
@@ -1,5 +1,22 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
+// 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.
+
 //DEPS org.slf4j:slf4j-simple:2.0.9
 
 // Junit console to start the test engine:
diff --git a/tests/shell/run.sh b/tests/shell/run.sh
index f61b18e4233..8903f84a49f 100755
--- a/tests/shell/run.sh
+++ b/tests/shell/run.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 set -e
 
 script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 92e22cc8dde..4a9fdfc5397 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
+#
+# 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.
+#
+
 #
 # Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
 # if image name is supporting services, don't build it

From 0ec648c0dc7e5ab2b3d99970cee6e6bdbdd9a5a3 Mon Sep 17 00:00:00 2001
From: Walter Medvedeo <wmedvedeo@gmail.com>
Date: Wed, 17 Jan 2024 16:09:07 +0100
Subject: [PATCH 658/709] kie-kogito-images-1727: Add the
 kogito-addons-quarkus-knative-serving addon to the swf-builder images (#1730)

---
 modules/kogito-swf/builder/build-config/module.yaml | 2 +-
 modules/kogito-swf/devmode/build-config/module.yaml | 2 +-
 scripts/logic/build-quarkus-app.sh                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index b00d0629155..79fac6fe481 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -27,4 +27,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION}
+    value: quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION}
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index bf8b40bf150..292e0535c73 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -27,4 +27,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow-devui:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION}
+    value: org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow-devui:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION}
diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
index 30fdd6454cf..93fb0a440c7 100755
--- a/scripts/logic/build-quarkus-app.sh
+++ b/scripts/logic/build-quarkus-app.sh
@@ -44,7 +44,7 @@ properties_with_versions=("compiler-plugin.version:3.11.0" "surefire-plugin.vers
 # arch specific dependencies
 quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch64:1.8.0"
 # common extensions used by the kogito-swf-builder and kogito-swf-devmode
-quarkus_extensions="quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${kogito_version},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${kogito_version},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}"
+quarkus_extensions="quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${kogito_version},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${kogito_version},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version},org.kie.kogito:kogito-addons-quarkus-knative-serving:${kogito_version}"
 # dev mode purpose extensions used only by the kogito-swf-devmode
 kogito_swf_devmode_extensions="org.kie.kogito:kogito-quarkus-serverless-workflow-devui:${kogito_version},org.kie.kogito:kogito-addons-quarkus-source-files:${kogito_version},org.kie.kogito:kogito-addons-quarkus-process-management:${kogito_version},org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
 # builder/prod extensitons used only by the kogito-swf-builder

From d60b31219d019ef909c51262397349536c1cbc50 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:58:44 -0300
Subject: [PATCH 659/709] NO-ISSUE - Deprecate Images anda DBs not supported
 (#1726)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 .github/pull_request_template.md              |   3 -
 .github/workflows/kogito-images-pr-check.yml  |   3 -
 Makefile                                      |  26 --
 README.md                                     | 182 +-----------
 kogito-data-index-infinispan-image.yaml       |  89 ------
 kogito-data-index-mongodb-image.yaml          |  71 -----
 kogito-data-index-oracle-image.yaml           |  71 -----
 kogito-explainability-image.yaml              |  73 -----
 kogito-imagestream.yaml                       | 189 ------------
 kogito-jobs-service-infinispan-image.yaml     |  73 -----
 kogito-jobs-service-mongodb-image.yaml        |  73 -----
 kogito-trusty-infinispan-image.yaml           |  89 ------
 kogito-trusty-postgresql-image.yaml           |  71 -----
 kogito-trusty-redis-image.yaml                |  74 -----
 kogito-trusty-ui-image.yaml                   |  72 -----
 logic-data-index-ephemeral-rhel8-image.yaml   |  94 ------
 logic-imagestream.yaml                        |  89 ------
 logic-swf-builder-rhel8-image.yaml            |  89 ------
 logic-swf-devmode-rhel8-image.yaml            |  88 ------
 .../added/kogito-app-launch.sh                |  49 ----
 .../kogito-data-index-infinispan/configure    |  30 --
 .../kogito-data-index-infinispan/module.yaml  |  31 --
 .../added/kogito-app-launch.sh                |  49 ----
 modules/kogito-data-index-mongodb/configure   |  30 --
 modules/kogito-data-index-mongodb/module.yaml |  31 --
 .../added/kogito-app-launch.sh                |  49 ----
 modules/kogito-data-index-oracle/configure    |  30 --
 modules/kogito-data-index-oracle/module.yaml  |  31 --
 .../added/kogito-app-launch.sh                |  49 ----
 .../added/launch/kogito-explainability.sh     |  47 ---
 modules/kogito-explainability/configure       |  37 ---
 modules/kogito-explainability/module.yaml     |  32 ---
 .../tests/bats/kogito-explainability.bats     |  56 ----
 .../added/kogito-app-launch.sh                |  48 ----
 .../kogito-jobs-service-infinispan/configure  |  31 --
 .../module.yaml                               |  31 --
 .../added/kogito-app-launch.sh                |  48 ----
 modules/kogito-jobs-service-mongodb/configure |  30 --
 .../kogito-jobs-service-mongodb/module.yaml   |  30 --
 .../3.8.x-rpm/added/configure-maven.sh        | 272 ------------------
 modules/kogito-maven/3.8.x-rpm/configure      | 107 -------
 .../kogito-maven/3.8.x-rpm/maven/settings.xml |  60 ----
 modules/kogito-maven/3.8.x-rpm/module.yaml    | 103 -------
 .../kogito-s2i-core/tests/bats/s2i-core.bats  |  14 -
 .../added/launch/kogito-trusty.sh             |  46 ---
 modules/kogito-trusty-common/configure        |  28 --
 modules/kogito-trusty-common/module.yaml      |  25 --
 .../tests/bats/kogito-trusty-common.bats      |  55 ----
 .../added/kogito-app-launch.sh                |  49 ----
 modules/kogito-trusty-infinispan/configure    |  29 --
 modules/kogito-trusty-infinispan/module.yaml  |  31 --
 .../added/kogito-app-launch.sh                |  49 ----
 modules/kogito-trusty-postgresql/configure    |  29 --
 modules/kogito-trusty-postgresql/module.yaml  |  31 --
 .../added/kogito-app-launch.sh                |  49 ----
 modules/kogito-trusty-redis/configure         |  29 --
 modules/kogito-trusty-redis/module.yaml       |  31 --
 .../added/kogito-app-launch.sh                |  49 ----
 .../added/launch/kogito-trusty-ui.sh          |  49 ----
 modules/kogito-trusty-ui/configure            |  34 ---
 modules/kogito-trusty-ui/module.yaml          |  31 --
 .../tests/bats/kogito-trusty-ui.bats          |  55 ----
 modules/rhpam-kogito-prod-profile/configure   | 100 -------
 modules/rhpam-kogito-prod-profile/module.yaml |  30 --
 .../gating.yaml                               |  25 --
 .../logic-swf-builder-rhel8/gating.yaml       |  25 --
 .../logic-swf-devmode-rhel8/gating.yaml       |  25 --
 .../rhpam-kogito-builder-rhel8/gating.yaml    |  25 --
 .../gating.yaml                               |  25 --
 .../gating.yaml                               |  25 --
 scripts/README.md                             |  33 ---
 scripts/build-kogito-apps-components.sh       |  30 --
 scripts/build-osbs.sh                         | 228 ---------------
 scripts/build-product-image.sh                |  53 ----
 scripts/common.py                             | 117 ++------
 scripts/list-images.py                        |   9 +-
 scripts/manage-kogito-version.py              |  31 +-
 scripts/run-bats.sh                           |   9 -
 scripts/update-repository.py                  |   7 +-
 tests/features/common-build-runtime.feature   |   2 -
 .../features/common-custom-truststore.feature |  10 -
 .../features/common-dynamic-resources.feature |  12 -
 tests/features/common.feature                 |  13 -
 .../kogito-data-index-common.feature          |   3 -
 .../kogito-data-index-infinispan.feature      |  33 ---
 .../kogito-data-index-mongodb.feature         |  31 --
 .../kogito-data-index-oracle.feature          |  26 --
 .../kogito-jobs-service-common.feature        |   2 -
 .../kogito-jobs-service-infinispan.feature    |  33 ---
 .../kogito-jobs-service-mongodb.feature       |  23 --
 .../kogito-common-builder-jvm.feature         |   2 +-
 .../kogito-common-postresql-services.feature  |   1 -
 .../kogito-common-runtime-jvm.feature         |   1 -
 .../kogito-common-runtime-native.feature      |   1 -
 tests/features/kogito-explainability.feature  |  38 ---
 tests/features/kogito-swf-builder.feature     |   1 -
 tests/features/kogito-swf-common.feature      |   2 -
 tests/features/kogito-swf-devmode.feature     |   1 -
 .../logic-data-index-ephemeral.feature        |  26 --
 .../logic-swf-builder.feature                 |  11 -
 .../logic-swf-devmode.feature                 |  11 -
 .../features/rhpam-kogito-builder-jvm.feature | 108 -------
 .../features/rhpam-kogito-runtime-jvm.feature |  16 --
 .../rhpam-kogito-runtime-native.feature       |  15 -
 .../supporting-services-common.feature        |   8 -
 .../trusty/kogito-trusty-common.feature       |  10 -
 .../trusty/kogito-trusty-infinispan.feature   |  36 ---
 .../trusty/kogito-trusty-postgresql.feature   |  11 -
 .../trusty/kogito-trusty-redis.feature        |  18 --
 .../features/trusty/kogito-trusty-ui.feature  |  30 --
 tests/test-apps/clone-repo.sh                 |   6 +-
 111 files changed, 54 insertions(+), 4827 deletions(-)
 delete mode 100644 kogito-data-index-infinispan-image.yaml
 delete mode 100644 kogito-data-index-mongodb-image.yaml
 delete mode 100644 kogito-data-index-oracle-image.yaml
 delete mode 100644 kogito-explainability-image.yaml
 delete mode 100644 kogito-jobs-service-infinispan-image.yaml
 delete mode 100644 kogito-jobs-service-mongodb-image.yaml
 delete mode 100644 kogito-trusty-infinispan-image.yaml
 delete mode 100644 kogito-trusty-postgresql-image.yaml
 delete mode 100644 kogito-trusty-redis-image.yaml
 delete mode 100644 kogito-trusty-ui-image.yaml
 delete mode 100644 logic-data-index-ephemeral-rhel8-image.yaml
 delete mode 100644 logic-imagestream.yaml
 delete mode 100644 logic-swf-builder-rhel8-image.yaml
 delete mode 100644 logic-swf-devmode-rhel8-image.yaml
 delete mode 100644 modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-data-index-infinispan/configure
 delete mode 100644 modules/kogito-data-index-infinispan/module.yaml
 delete mode 100644 modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-data-index-mongodb/configure
 delete mode 100644 modules/kogito-data-index-mongodb/module.yaml
 delete mode 100644 modules/kogito-data-index-oracle/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-data-index-oracle/configure
 delete mode 100644 modules/kogito-data-index-oracle/module.yaml
 delete mode 100644 modules/kogito-explainability/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-explainability/added/launch/kogito-explainability.sh
 delete mode 100644 modules/kogito-explainability/configure
 delete mode 100644 modules/kogito-explainability/module.yaml
 delete mode 100644 modules/kogito-explainability/tests/bats/kogito-explainability.bats
 delete mode 100644 modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-jobs-service-infinispan/configure
 delete mode 100644 modules/kogito-jobs-service-infinispan/module.yaml
 delete mode 100644 modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-jobs-service-mongodb/configure
 delete mode 100644 modules/kogito-jobs-service-mongodb/module.yaml
 delete mode 100644 modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
 delete mode 100644 modules/kogito-maven/3.8.x-rpm/configure
 delete mode 100644 modules/kogito-maven/3.8.x-rpm/maven/settings.xml
 delete mode 100644 modules/kogito-maven/3.8.x-rpm/module.yaml
 delete mode 100644 modules/kogito-trusty-common/added/launch/kogito-trusty.sh
 delete mode 100644 modules/kogito-trusty-common/configure
 delete mode 100644 modules/kogito-trusty-common/module.yaml
 delete mode 100644 modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats
 delete mode 100644 modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-trusty-infinispan/configure
 delete mode 100644 modules/kogito-trusty-infinispan/module.yaml
 delete mode 100644 modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-trusty-postgresql/configure
 delete mode 100644 modules/kogito-trusty-postgresql/module.yaml
 delete mode 100644 modules/kogito-trusty-redis/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-trusty-redis/configure
 delete mode 100644 modules/kogito-trusty-redis/module.yaml
 delete mode 100644 modules/kogito-trusty-ui/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
 delete mode 100644 modules/kogito-trusty-ui/configure
 delete mode 100644 modules/kogito-trusty-ui/module.yaml
 delete mode 100644 modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
 delete mode 100644 modules/rhpam-kogito-prod-profile/configure
 delete mode 100644 modules/rhpam-kogito-prod-profile/module.yaml
 delete mode 100644 osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml
 delete mode 100644 osbs-extra/logic-swf-builder-rhel8/gating.yaml
 delete mode 100644 osbs-extra/logic-swf-devmode-rhel8/gating.yaml
 delete mode 100644 osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml
 delete mode 100644 osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
 delete mode 100644 osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml
 delete mode 100755 scripts/build-osbs.sh
 delete mode 100755 scripts/build-product-image.sh
 delete mode 100644 tests/features/data-index/kogito-data-index-infinispan.feature
 delete mode 100644 tests/features/data-index/kogito-data-index-mongodb.feature
 delete mode 100644 tests/features/data-index/kogito-data-index-oracle.feature
 delete mode 100644 tests/features/jobs-service/kogito-jobs-service-infinispan.feature
 delete mode 100644 tests/features/jobs-service/kogito-jobs-service-mongodb.feature
 delete mode 100644 tests/features/kogito-explainability.feature
 delete mode 100644 tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
 delete mode 100644 tests/features/openshift-serverless-logic/logic-swf-builder.feature
 delete mode 100644 tests/features/openshift-serverless-logic/logic-swf-devmode.feature
 delete mode 100644 tests/features/rhpam-kogito-builder-jvm.feature
 delete mode 100644 tests/features/rhpam-kogito-runtime-jvm.feature
 delete mode 100644 tests/features/rhpam-kogito-runtime-native.feature
 delete mode 100644 tests/features/trusty/kogito-trusty-common.feature
 delete mode 100644 tests/features/trusty/kogito-trusty-infinispan.feature
 delete mode 100644 tests/features/trusty/kogito-trusty-postgresql.feature
 delete mode 100644 tests/features/trusty/kogito-trusty-redis.feature
 delete mode 100644 tests/features/trusty/kogito-trusty-ui.feature

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f554a992c35..9511f9aadae 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -18,9 +18,6 @@ How to retest this PR or trigger a specific build:
 
 - <b>(Re)run Jenkins tests</b>  
   Please add comment: <b>Jenkins [test|retest] this</b>
-
-- <b>Prod tests</b>  
-  Please add comment: <b>Jenkins (re)run [prod|Prod|PROD]</b>
 </details>
 
 <details>
diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
index d5af992a849..98a5199ba6f 100644
--- a/.github/workflows/kogito-images-pr-check.yml
+++ b/.github/workflows/kogito-images-pr-check.yml
@@ -44,9 +44,6 @@ jobs:
       - name: validate kogito imagestream
         run: |
           ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
-      - name: validate logic imagestream
-        run: |
-          ${HOME}/openshift-template-validator-linux-amd64 validate -f logic-imagestream.yaml
 
   shellcheck:
     concurrency:
diff --git a/Makefile b/Makefile
index 852d729af4b..7feb4fe5dbd 100644
--- a/Makefile
+++ b/Makefile
@@ -55,26 +55,6 @@ ifneq ($(ignore_test),true)
 	tests/shell/run.sh ${image_name} "quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}"
 endif
 
-# Build all images
-.PHONY: build-prod
-# start to build the images
-build-prod:
-	@for iname in $(shell make list arg=--prod); do make build-prod-image image_name=$${iname}; done
-
-
-.PHONY: build-prod-image
-image_name=
-build-prod-image: clone-repos _build-prod-image
-
-_build-prod-image:
-ifneq ($(ignore_build),true)
-	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
-	scripts/build-product-image.sh "build" $(image_name) ${build_options} ${BUILD_ENGINE}
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	scripts/build-product-image.sh "test" $(image_name) ${test_options}
-endif
 
 # push images to quay.io, this requires permissions under kiegroup organization
 .PHONY: push
@@ -116,9 +96,3 @@ push-local-registry:
 .PHONY: bats
 bats:
 	./scripts/run-bats.sh
-
-.PHONY: container-build-osbs
-prod_component=
-container-build-osbs:
-	echo "calling RHPAM container-build-osbs......................................"
-	$(CEKIT_CMD) --descriptor $(prod_component).yaml --redhat build ${build_options} osbs --assume-yes ${osbs_options}
\ No newline at end of file
diff --git a/README.md b/README.md
index 8a3a8d66cdd..9be81e49519 100644
--- a/README.md
+++ b/README.md
@@ -52,13 +52,10 @@ Table of Contents
         - [Kogito Runtime Native Image Example](#kogito-runtime-native-image-example)
   - [Kogito Component Images](#kogito-component-images)
     - [Kogito Data Index Component Images](#kogito-data-index-component-images)
-    - [Kogito Explainability Component Image](#kogito-explainability-component-image)
-    - [Kogito Trusty Component Image](#kogito-trusty-component-image)
     - [Kogito Jobs Service Component Images](#kogito-jobs-service-component-images)
       - [Jobs Services All-in-one](#jobs-services-all-in-one)
     - [Kogito Management Console Component Image](#kogito-management-console-component-image)
     - [Kogito Task Console Component Image](#kogito-task-console-component-image)
-    - [Kogito Trusty UI Component Image](#kogito-trusty-ui-component-image)
     - [Kogito JIT Runner Component Image](#kogito-jit-runner-component-image)
   - [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift)
     - [Using released images](#using-released-images)
@@ -84,7 +81,7 @@ To interact with Kogito images, you would need to install the needed dependencie
     * Moby Engine or Docker CE
         * Podman can be use to build the images, but at this moment CeKit does not support it, so images build with podman
             cannot be tested with CeKit.
-    * [CeKit 3.6.0+](https://docs.cekit.io/en/latest/): 
+    * [CeKit 4.8.0+](https://docs.cekit.io/en/latest/): 
         * CeKit also has its own dependencies:
             * python packages: docker, docker-squash, odcs-client. 
             * All of those can be handled with pip, including CeKit.
@@ -170,7 +167,7 @@ For more information about what is installed on this image, take a look [here](k
 **modules.install** section. 
 
 
-#### Kogito SWF (Serverless Workflow) Builder Image usage
+#### SonataFlow Builder Image usage
 
 ##### Using as a builder
 
@@ -205,7 +202,7 @@ Replace `<local_workflow_path>` with your local filesystem containing your workf
 
 After the image bootstrap, you can access [http://localhost:8080/q/swagger-ui](http://localhost:8080/q/swagger-ui) and test the workflow application right away!
 
-##### Using the Kogito SWF Builder Image nightly image
+##### Using the SonataFlow Builder Image nightly image
 
 The nightly builder image has been built and optimized with an internal nightly build of the Quarkus Platform.  
 There are 2 environment variables that should not be changed when using it:
@@ -602,24 +599,15 @@ Order has been created Order[12345] with assigned approver JOHN
 
 The Kogito Component Images can be considered as lightweight images that will complement the Kogito core engine 
 by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications.
-Today we have 16 Kogito Component Images:
+Today we have the following Kogito Component Images:
 
-* [quay.io/kiegroup/kogito-data-index-infinispan](https://quay.io/kiegroup/kogito-data-index-infinispan)
 * [quay.io/kiegroup/kogito-data-index-ephemeral](https://quay.io/kiegroup/kogito-data-index-ephemeral)
-* [quay.io/kiegroup/kogito-data-index-mongodb](https://quay.io/kiegroup/kogito-data-index-mongodb)
 * [quay.io/kiegroup/kogito-data-index-postgresql](https://quay.io/kiegroup/kogito-data-index-postgresql)
-* [quay.io/kiegroup/kogito-trusty-infinispan](https://quay.io/kiegroup/kogito-trusty-infinispan)
-* [quay.io/kiegroup/kogito-trusty-redis](https://quay.io/kiegroup/kogito-trusty-redis)
-* [quay.io/kiegroup/kogito-trusty-postgresql](https://quay.io/kiegroup/kogito-trusty-postgresql)
-* [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability)
 * [quay.io/kiegroup/kogito-jobs-service-ephemeral](https://quay.io/kiegroup/kogito-jobs-service-ephemeral) 
-* [quay.io/kiegroup/kogito-jobs-service-infinispan](https://quay.io/kiegroup/kogito-jobs-service-infinispan)
-* [quay.io/kiegroup/kogito-jobs-service-mongodb](https://quay.io/kiegroup/kogito-jobs-service-mongodb)
 * [quay.io/kiegroup/kogito-jobs-service-postgresql](https://quay.io/kiegroup/kogito-jobs-service-postgresql)
 * [quay.io/kiegroup/kogito-jobs-service-allinone](https://quay.io/kiegroup/kogito-jobs-service-allinone)
 * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
 * [quay.io/kiegroup/kogito-task-console](https://quay.io/kiegroup/kogito-task-console)
-* [quay.io/kiegroup/kogito-trusty-ui](https://quay.io/kiegroup/kogito-trusty-ui)
 * [quay.io/kiegroup/kogito-jit-runner](https://quay.io/kiegroup/kogito-jit-runner)
 
 
@@ -630,41 +618,16 @@ For more information please visit this (link)(https://docs.jboss.org/kogito/rele
 The Data Index Service depends on a running Infinispan, MongoDB or PostgreSQL.
 The Persistence service can be switched by using its corresponding image
 
-- Infinispan: quay.io/kiegroup/kogito-data-index-infinispan
-  [image.yaml](kogito-data-index-infinispan-image.yaml)
 - Ephemeral PostgreSQL: quay.io/kiegroup/kogito-data-index-ephemeral
   [image.yaml](kogito-data-index-ephemeral-image.yaml)
-- Mongodb: quay.io/kiegroup/kogito-data-index-mongodb 
-  [image.yaml](kogito-data-index-mongodb-image.yaml)
-- Oracle: quay.io/kiegroup/kogito-data-index-oracle
-  [image.yaml](kogito-data-index-oracle-image.yaml)
 - PostgreSQL: quay.io/kiegroup/kogito-data-index-postgresql
   [image.yaml](kogito-data-index-postgresql-image.yaml)
 
-
-Basic usage with Infinispan:
-```bash
-$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
-```
-
 Basic usage with Ephemeral PostgreSQL:
 ```bash
 $ docker run -it quay.io/kiegroup/kogito-data-index-ephemeral:latest
 ```
 
-Basic usage with Mongodb:
-```bash
-$ docker run -it --env QUARKUS_MONGODB_CONNECTION_STRING=mongodb://localhost:27017 quay.io/kiegroup/kogito-data-index-mongodb:latest
-```
-
-Basic usage with Oracle:
-```bash
-$ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:oracle:thin://localhost:1521/kogito"  \
-    --env QUARKUS_DATASOURCE_USERNAME="kogito" \
-    --env QUARKUS_DATASOURCE_PASSWORD="secret" \
-    quay.io/kiegroup/kogito-data-index-oracle:latest
-```
-
 Basic usage with PostgreSQL:
 ```bash
 $ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus"  \
@@ -676,7 +639,7 @@ $ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:
 To enable debug just use this env while running this image:
 
 ```bash
-$ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest
+$ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-postgresql:latest
 ```
 You should notice a few debug messages present in the system output.
 
@@ -684,71 +647,6 @@ You should notice a few debug messages present in the system output.
 The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Data Index Service 
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
-### Kogito Explainability Component Image
-
-The Explainability Service aims to provide explainability on the decisions that have been taken by kogito runtime applications. 
-
-Basic usage
-```bash
-$ docker run -it quay.io/kiegroup/kogito-explainability:latest
-```
-
-To enable debug just use this env while running this image:
-
-```bash
-docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-explainability:latest
-```
-You should notice a few debug messages being printed in the system output.
-
-To know what configurations this image accepts please take a look [here](kogito-explainability-image.yaml) on the **envs** section.
-
-The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Explainability Service 
-to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
-
-
-### Kogito Trusty Component Image
-
-The Trusty Service aims at collecting tracing information by one or more Kogito runtime services and provides analytical capabilities on top of the collected data. 
-The Trusty Service depends on a running Infinispan, Redis Server or PostgreSQL RDBMS.
-The Trusty service can be switched by using its corresponding image
-
-- Infinispan: quay.io/kiegroup/kogito-trusty-infinispan
-    [image.yaml](kogito-trusty-infinispan-image.yaml)
-- Redis: quay.io/kiegroup/kogito-trusty-redis
-    [image.yaml](kogito-trusty-redis-image.yaml)
-- PostgreSQL: quay.io/kiegroup/kogito-trusty-postgresql
-    [image.yaml](kogito-trusty-postgresql-image.yaml)
-
-Basic usage with Infinispan:
-```bash
-$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty-infinispan:latest
-```
-
-Basic usage with Redis:
-```bash
-$ docker run -it --env KOGITO_PERSISTENCE_REDIS_URL=redis://localhost:6379 quay.io/kiegroup/kogito-trusty-redis:latest
-```
-
-Basic usage with PostgreSQL:
-```bash
-$ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus"  \
-    --env QUARKUS_DATASOURCE_USERNAME="kogito" \
-    --env QUARKUS_DATASOURCE_PASSWORD="secret" \
-    quay.io/kiegroup/kogito-trusty-postgresql:latest
-```
-
-To enable debug just use this env while running this image:
-
-```bash
-docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty:latest
-```
-You should notice a few debug messages being printed in the system output.
-
-To know what configurations this image accepts please take a look [here](kogito-trusty-image.yaml) on the **envs** section.
-
-The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Trusty Service 
-to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
-
 ### Kogito Jobs Service Component Images
 
 The Kogito Jobs Service is a dedicated lightweight service responsible for scheduling jobs that aim at firing at a given time. 
@@ -759,8 +657,6 @@ For more information please visit this [link](https://github.com/apache/incubato
 Today, the Jobs service contains four images:
 
 - [ephemeral](kogito-jobs-service-ephemeral-image.yaml)
-- [infinispan](kogito-jobs-service-infinispan-image.yaml)
-- [mongodb](kogito-jobs-service-mongodb-image.yaml)
 - [postgresql](kogito-jobs-service-postgresql-image.yaml)
 - [all-in-one](kogito-jobs-service-allinone-image.yaml)
 
@@ -773,7 +669,7 @@ $ docker run -it quay.io/kiegroup/kogito-jobs-service-ephemeral:latest
 To enable debug on the Jobs Service images, set the ` SCRIPT_DEBUG` to `true`, example: 
 
 ```bash
-docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-infinispan:latest
+docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-postgresql:latest
 ```
 
 You should notice a few debug messages being printed in the system output.
@@ -877,31 +773,6 @@ To know what configurations this image accepts please take a look [here](kogito-
 The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Task Console
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
 
-### Kogito Trusty UI Component Image
-
-The Kogito Trusty UI provides an audit tool that allows you to retrieve and inspect the decisions that have been taken by Kogito Runtime Services.
-It depends on the Kogito Trusty Service on which the Trusty UI will connect to so it can be able to retrieve the information to display.
-
-To work correctly, the Kogito Trusty UI needs the Kogito Trusty Service url. If not provided, it will try to connect to the default one (http://localhost:8180).
-
-Basic usage:
-
-```bash
-$ docker run -it --env KOGITO_TRUSTY_ENDPOINT=trusty-service-url:9090 quay.io/kiegroup/kogito-trusty-ui:latest
-```
-
-To enable debug just use this env while running this image:
-
-```bash
-docker run -it --env SCRIPT_DEBUG=true --env KOGITO_TRUSTY_ENDPOINT=trusty-service-url:9090 quay.io/kiegroup/kogito-trusty-ui:latest
-```
-You should notice a few debug messages being printed in the system output.
-
-To know what configurations this image accepts please take a look [here](kogito-trusty-ui-image.yaml) on the **envs** section.
-
-The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Trusty UI 
-to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
-
 ### Kogito JIT Runner Component Image
 
 The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/apache/incubator-kie-kogito-apps/tree/main/jitexecutor).
@@ -951,16 +822,9 @@ $ oc create -f https://raw.githubusercontent.com/apache/incubator-kie-kogito-ima
 imagestream.image.openshift.io/kogito-runtime-native created
 imagestream.image.openshift.io/kogito-runtime-jvm created
 imagestream.image.openshift.io/kogito-s2i-builder created
-imagestream.image.openshift.io/kogito-data-index-infinispan created
 imagestream.image.openshift.io/kogito-data-index-ephemeral created
-imagestream.image.openshift.io/kogito-data-index-mongodb created
 imagestream.image.openshift.io/kogito-data-index-postgresql created
-imagestream.image.openshift.io/kogito-trusty-infinispan created
-imagestream.image.openshift.io/kogito-trusty-redis created
-imagestream.image.openshift.io/kogito-trusty-postgresql created
 imagestream.image.openshift.io/kogito-jobs-service-ephemeral created
-imagestream.image.openshift.io/kogito-jobs-service-infinispan created
-imagestream.image.openshift.io/kogito-jobs-service-mongodb created
 imagestream.image.openshift.io/kogito-jobs-service-postgresql created
 imagestream.image.openshift.io/kogito-jobs-service-allinone created
 imagestream.image.openshift.io/kogito-management-console created
@@ -1145,22 +1009,12 @@ With this Makefile you can:
      $ make build-image image_name=kogito-s2i-builder
      $ make build-image image_name=kogito-runtime-jvm-ubi8
      $ make build-image image_name=kogito-runtime-native
-     $ make build-image image_name=kogito-data-index-infinispan
      $ make build-image image_name=kogito-data-index-ephemeral
-     $ make build-image image_name=kogito-data-index-mongodb
-     $ make build-image image_name=kogito-data-index-oracle
      $ make build-image image_name=kogito-data-index-postgresql
-     $ make build-image image_name=kogito-trusty-infinispan
-     $ make build-image image_name=kogito-trusty-redis
-     $ make build-image image_name=kogito-trusty-postgresql
-     $ make build-image image_name=kogito-explainability
      $ make build-image image_name=kogito-jobs-service-ephemeral
-     $ make build-image image_name=kogito-jobs-service-infinispan
-     $ make build-image image_name=kogito-jobs-service-mongodb
      $ make build-image image_name=kogito-jobs-service-postgresql
      $ make build-image image_name=kogito-jobs-service-allinone
      $ make build-image image_name=kogito-management-console
-     $ make build-image image_name=kogito-trusty-ui
      $ make build-image image_name=kogito-jit-runner
      ```
   
@@ -1217,30 +1071,20 @@ To better understand the CeKit Modules, please visit this [link](https://docs.ce
 Below you can find all modules used to build the Kogito Images
 
 - [kogito-data-index-common](modules/kogito-data-index-common): Data Index common module.
-- [kogito-data-index-infinispan](modules/kogito-data-index-infinispan): Installs and Configure the infinispan data-index jar inside the image.
 - [kogito-data-index-ephemeral](modules/kogito-data-index-ephemeral): Installs and Configure the ephemeral PostgreSQL data-index jar inside the image.
-- [kogito-data-index-mongodb](modules/kogito-data-index-mongodb): Installs and Configure the mongodb data-index jar inside the image.
-- [kogito-data-index-oracle](modules/kogito-data-index-oracle): Installs and Configure the Oracle data-index jar inside the image.
 - [kogito-data-index-postgresql](modules/kogito-data-index-postgresql): Installs and Configure the PostgreSQL data-index jar inside the image.
-- [kogito-trusty-infinispan](modules/kogito-trusty-infinispan): Installs and Configure the infinispan trusty jar inside the image.
-- [kogito-trusty-redis](modules/kogito-trusty-redis): Installs and Configure the redis trusty jar inside the image.
-- [kogito-trusty-postgresql](modules/kogito-trusty-postgresql): Installs and Configure the PostgreSQL trusty jar inside the image.
-- [kogito-explainability](modules/kogito-explainability): Installs and Configure the explainability jar inside the image.
 - [kogito-epel](modules/kogito-epel): Configures the epel repository on the target image.
 - [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image.
 - [kogito-graalvm-scripts](modules/kogito-graalvm-scripts): Configures the GraalVM on the target image and provides custom configuration script. 
 - [kogito-image-dependencies](modules/kogito-image-dependencies): Installs rpm packages on the target image. Contains common dependencies for Kogito Images.
 - [kogito-jobs-service-common](modules/kogito-jobs-service-common): Job service common module
 - [kogito-jobs-service-ephemeral](modules/kogito-jobs-service-ephemeral): Installs and Configure the in-memory jobs-service jar inside the image
-- [kogito-jobs-service-infinispan](modules/kogito-jobs-service-infinispan): Installs and Configure the infinispan jobs-service jar inside the image
-- [kogito-jobs-service-mongodb](modules/kogito-jobs-service-mongodb): Installs and Configure the mongodb jobs-service jar inside the image
 - [kogito-jobs-service-postgresql](modules/kogito-jobs-service-postgresql): Installs and Configure the postgresql jobs-service jar inside the image
 - [kogito-jobs-service-allinone](modules/kogito-jobs-service-all-in-one): Provides the runner script that supports all jobs-service flavors
 - [kogito-kubernetes-client](modules/kogito-kubernetes-client): Provides a simple wrapper to interact with Kubernetes API.
 - [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
 - [kogito-logging](modules/kogito-logging): Provides common logging functions.
 - [kogito-management-console](modules/kogito-management-console): Installs and Configure the management-console jar inside the image
-- [kogito-trusty-ui](modules/kogito-trusty-ui): Installs and Configure the trusty-ui jar inside the image
 - [kogito-jit-runner](modules/kogito-jit-runner): Installs and Configure the jit-runner jar inside the image
 - [kogito-maven](modules/kogito-maven): Installs and configure Maven on the S2I images, also provides custom configuration script.
 - [kogito-openjdk](modules/kogito-openjdk): Provides OpenJDK and JRE.
@@ -1254,22 +1098,12 @@ Below you can find all modules used to build the Kogito Images
 For each image, we use a specific *-image.yaml file.
 Please inspect the image files to learn which modules are being installed on each image:
 
-- [quay.io/kiegroup/kogito-data-index-infinispan](kogito-data-index-infinispan-image.yaml)
 - [quay.io/kiegroup/kogito-data-index-ephemeral](kogito-data-index-ephemeral-image.yaml)
-- [quay.io/kiegroup/kogito-data-index-mongodb](kogito-data-index-mongodb-image.yaml)
-- [quay.io/kiegroup/kogito-data-index-oracle](kogito-data-index-oracle-image.yaml)
 - [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml)
-- [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-image.yaml)
-- [quay.io/kiegroup/kogito-trusty-redis](kogito-trusty-redis-image.yaml)
-- [quay.io/kiegroup/kogito-trusty-postgresql](kogito-trusty-postgresql-image.yaml)
-- [quay.io/kiegroup/kogito-explainability](kogito-explainability-image.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-infinispan](kogito-jobs-service-infinispan-image.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-mongodb](kogito-jobs-service-mongodb-image.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml) 
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-image.yaml)
-- [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-image.yaml)
 - [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-image.yaml)
 - [quay.io/kiegroup/kogito-runtime-jvm](kogito-runtime-jvm-image.yaml)
 - [quay.io/kiegroup/kogito-runtime-native](kogito-runtime-native-image.yaml)
@@ -1372,8 +1206,8 @@ For example, if we are creating a new image called quay.io/kiegroup/kogito-moon-
 example:
 
 ```text
-@quay.io/kiegroup/kogito-data-index-infinispan
-Feature: Kogito-data-index-infinispan feature.
+@quay.io/kiegroup/kogito-data-index-postgresql
+Feature: Kogito-data-index-postgresql feature.
     ...
     Scenarios......
 ```
diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml
deleted file mode 100644
index 56670c8a20d..00000000000
--- a/kogito-data-index-infinispan-image.yaml
+++ /dev/null
@@ -1,89 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-data-index-infinispan"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
-  - name: "io.k8s.display-name"
-    value: "Kogito Data Index Service - Infinispan"
-  - name: "io.openshift.tags"
-    value: "kogito,data-index,data-index-infinispan"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "QUARKUS_INFINISPAN_CLIENT_HOSTS"
-    example: "172.18.0.1:11222"
-    description: "Sets the host name/port to connect to. Each one is separated by a semicolon (eg. host1:11222;host2:11222)."
-  - name: "QUARKUS_INFINISPAN_CLIENT_USE_AUTH"
-    example: "true"
-    description: "Enables or disables authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_USERNAME"
-    example: "myUsername"
-    description: "Sets user name used by authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_PASSWORD"
-    example: "hard2guess"
-    description: "Sets password used by authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_REALM"
-    example: "SecretRealm"
-    description: "Sets realm used by authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM"
-    example: "COOLGSSAPI"
-    description: "Sets SASL mechanism used by authentication"
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.dataindex.infinispan
-    - name: org.kie.kogito.dataindex.common
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-data-index-mongodb-image.yaml b/kogito-data-index-mongodb-image.yaml
deleted file mode 100644
index efff5ff3ca0..00000000000
--- a/kogito-data-index-mongodb-image.yaml
+++ /dev/null
@@ -1,71 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-data-index-mongodb"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
-  - name: "io.k8s.display-name"
-    value: "Kogito Data Index Service - Mongodb"
-  - name: "io.openshift.tags"
-    value: "kogito,data-index,data-index-mongodb"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.dataindex.mongodb
-    - name: org.kie.kogito.dataindex.common
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-data-index-oracle-image.yaml b/kogito-data-index-oracle-image.yaml
deleted file mode 100644
index be1851f645a..00000000000
--- a/kogito-data-index-oracle-image.yaml
+++ /dev/null
@@ -1,71 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-data-index-oracle"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
-  - name: "io.k8s.display-name"
-    value: "Kogito Data Index Service - Oracle"
-  - name: "io.openshift.tags"
-    value: "kogito,data-index,data-index-oracle"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.dataindex.oracle
-    - name: org.kie.kogito.dataindex.common
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml
deleted file mode 100644
index 102506fdad9..00000000000
--- a/kogito-explainability-image.yaml
+++ /dev/null
@@ -1,73 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-explainability"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Explainability Service"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Explainability Service"
-  - name: "io.k8s.display-name"
-    value: "Kogito Explainability Service"
-  - name: "io.openshift.tags"
-    value: "kogito,explainability"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "EXPLAINABILITY_COMMUNICATION"
-    example: "REST"
-    description: "Defines which kind of communication should be used by the Explainability Container: rest api or kafka events."
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.explainability
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index a5edcf3d8ee..139458273b8 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -129,27 +129,6 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-data-index-infinispan
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Data Index Service for Infinispan persistence provider
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Data Index Service with Infinispan
-            iconClass: icon-jbpm
-            tags: kogito,data-index,data-index-infinispan
-            supports: persistence backed by Infinispan Server
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-infinispan:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -171,27 +150,6 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-data-index-ephemeral:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-data-index-mongodb
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Data Index Service for MongoDB persistence provider
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Data Index Service with Mongodb
-            iconClass: icon-jbpm
-            tags: kogito,data-index,data-index-mongodb
-            supports: persistence backed by Mongodb server
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-mongodb:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -213,90 +171,6 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-data-index-postgresql:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-trusty-infinispan
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Trusty Service for Infinispan persistence provider
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Trusty Service with Infinispan
-            iconClass: icon-jbpm
-            tags: kogito,trusty,trusty-infinispan
-            supports: persistence backed by Infinispan server
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-infinispan:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-trusty-redis
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Trusty Service for Redis persistence provider
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Trusty Service with Redis
-            iconClass: icon-jbpm
-            tags: kogito,trusty,trusty-redis
-            supports: persistence backed by Redis server
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-redis:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-trusty-postgresql
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Trusty Service for PostgreSQL persistence provider
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Trusty Service with PostgreSQL
-            iconClass: icon-jbpm
-            tags: kogito,trusty,trusty-postgresql
-            supports: persistence backed by PostgreSQL RDBMS
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-postgresql:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-trusty-ui
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Trusty UI Service
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Trusty UI Service
-            iconClass: icon-jbpm
-            tags: kogito,trusty-ui
-            supports: Audit UI
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-trusty-ui:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -318,27 +192,6 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-jit-runner:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-explainability
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Explainability Service
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Explainability Service
-            iconClass: icon-jbpm
-            tags: kogito,explainability
-            supports: explainability for decisions
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-explainability:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -360,48 +213,6 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-jobs-service-ephemeral:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-jobs-service-infinispan
-      annotations:
-        openshift.io/display-name: Runtime image for Kogito Jobs Service based on Infinispan
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for Kogito Jobs Service based on Infinispan
-            iconClass: icon-jbpm
-            tags: kogito,jobs-service
-            supports: out-of-box process timers
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-infinispan:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-jobs-service-mongodb
-      annotations:
-        openshift.io/display-name: Runtime image for Kogito Jobs Service based on Mongodb
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for Kogito Jobs Service based on Mongodb
-            iconClass: icon-jbpm
-            tags: kogito,jobs-service
-            supports: out-of-box process timers
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-mongodb:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml
deleted file mode 100644
index 52590018ca1..00000000000
--- a/kogito-jobs-service-infinispan-image.yaml
+++ /dev/null
@@ -1,73 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-jobs-service-infinispan"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Jobs Service based on Infinispan"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Jobs Service based on Infinispan"
-  - name: "io.k8s.display-name"
-    value: "Kogito Jobs Service based on Infinispan"
-  - name: "io.openshift.tags"
-    value: "kogito,jobs-service-infinispan"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "ENABLE_EVENTS"
-    example: "true"
-    description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.jobs.service.infinispan
-    - name: org.kie.kogito.security.custom.truststores
-    - name: org.kie.kogito.jobs.service.common
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
diff --git a/kogito-jobs-service-mongodb-image.yaml b/kogito-jobs-service-mongodb-image.yaml
deleted file mode 100644
index 5c54b82978f..00000000000
--- a/kogito-jobs-service-mongodb-image.yaml
+++ /dev/null
@@ -1,73 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-jobs-service-mongodb"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Jobs Service based on MongoDB"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Jobs Service based on MongoDB"
-  - name: "io.k8s.display-name"
-    value: "Kogito Jobs Service based on MongoDB"
-  - name: "io.openshift.tags"
-    value: "kogito,jobs-service-mongodb"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "ENABLE_EVENTS"
-    example: "true"
-    description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.jobs.service.mongodb
-    - name: org.kie.kogito.security.custom.truststores
-    - name: org.kie.kogito.jobs.service.common
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml
deleted file mode 100644
index 3edb2f6e284..00000000000
--- a/kogito-trusty-infinispan-image.yaml
+++ /dev/null
@@ -1,89 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-trusty-infinispan"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
-  - name: "io.k8s.display-name"
-    value: "Kogito Trusty Service - Infinispan"
-  - name: "io.openshift.tags"
-    value: "kogito,trusty,trusty-infinispan"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "QUARKUS_INFINISPAN_CLIENT_HOSTS"
-    example: "172.18.0.1:11222"
-    description: "Sets the host name/port to connect to. Each one is separated by a semicolon (eg. host1:11222;host2:11222)."
-  - name: "QUARKUS_INFINISPAN_CLIENT_USE_AUTH"
-    example: "true"
-    description: "Enables or disables authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_USERNAME"
-    example: "myUsername"
-    description: "Sets user name used by authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_PASSWORD"
-    example: "hard2guess"
-    description: "Sets password used by authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_REALM"
-    example: "SecretRealm"
-    description: "Sets realm used by authentication"
-  - name: "QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM"
-    example: "COOLGSSAPI"
-    description: "Sets SASL mechanism used by authentication"
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.trusty.infinispan
-    - name: org.kie.kogito.trusty.common
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-trusty-postgresql-image.yaml b/kogito-trusty-postgresql-image.yaml
deleted file mode 100644
index 4e206e43da9..00000000000
--- a/kogito-trusty-postgresql-image.yaml
+++ /dev/null
@@ -1,71 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-trusty-postgresql"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
-  - name: "io.k8s.display-name"
-    value: "Kogito Trusty Service - PostgreSQL"
-  - name: "io.openshift.tags"
-    value: "kogito,trusty,trusty-postgresql"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.trusty.postgresql
-    - name: org.kie.kogito.trusty.common
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-trusty-redis-image.yaml b/kogito-trusty-redis-image.yaml
deleted file mode 100644
index 8ca55292719..00000000000
--- a/kogito-trusty-redis-image.yaml
+++ /dev/null
@@ -1,74 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-trusty-redis"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Trusty Service for Redis persistence provider"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Trusty Service for Redis persistence provider"
-  - name: "io.k8s.display-name"
-    value: "Kogito Trusty Service - Redis"
-  - name: "io.openshift.tags"
-    value: "kogito,trusty,trusty-redis"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "KOGITO_PERSISTENCE_REDIS_URL"
-    example: "http://localhost:6379"
-    description: "The URL of the RediSearch cluster."
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.trusty.redis
-    - name: org.kie.kogito.trusty.common
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-trusty-ui-image.yaml b/kogito-trusty-ui-image.yaml
deleted file mode 100644
index fc6a2ed52fb..00000000000
--- a/kogito-trusty-ui-image.yaml
+++ /dev/null
@@ -1,72 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-trusty-ui"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito Trusty UI"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Trusty UI, manage your Business Process easily."
-  - name: "io.k8s.display-name"
-    value: "Kogito Trusty UI"
-  - name: "io.openshift.tags"
-    value: "kogito,trusty,trusty-ui"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "KOGITO_TRUSTY_ENDPOINT"
-    example: "http://trusty.service:8080"
-    description: "Trusty service address, defaults to http://localhost:8180."
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.trusty.ui
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
deleted file mode 100644
index 798f5e08e0e..00000000000
--- a/logic-data-index-ephemeral-rhel8-image.yaml
+++ /dev/null
@@ -1,94 +0,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.
-#
-schema_version: 1
-
-name: "openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8"
-version: "1.30.0"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
-
-labels:
-- name: "com.redhat.component"
-  value: "openshift-serverless-1-logic-data-index-ephemeral-rhel8-container"
-- name: "maintainer"
-  value: "Apache KIE <dev@kie.apache.org>"
-- name: "io.k8s.description"
-  value: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
-- name: "io.k8s.display-name"
-  value: "Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL"
-- name: "io.openshift.tags"
-  value: "logic-data-index,kogito,data-index,data-index-ephemeral"
-- name: "io.openshift.expose-services"
-  value: "8080:http"
-- name: "org.kie.kogito.version"
-  value: "999-SNAPSHOT"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "KOGITO_DATA_INDEX_QUARKUS_PROFILE"
-    value: "http-events-support"
-    description: "Allows to change the event connection type. The possible values are :`kafka-events-support` or `http-events-support`(default)"
-
-modules:
-  repositories:
-    - path: modules
-  install:
-  - name: org.kie.kogito.image.dependencies
-  - name: org.kie.kogito.system.user
-  - name: org.kie.kogito.logging
-  - name: org.kie.kogito.openjdk.headless
-    version: "11"
-  - name: org.kie.kogito.dynamic.resources
-  - name: org.kie.kogito.launch.scripts
-  - name: org.kie.kogito.dataindex.prod.ephemeral
-    version: "1.30.0"
-  - name: org.kie.kogito.dataindex.common
-  - name: org.kie.kogito.security.custom.truststores
-  - name: org.kie.kogito.pkg-update
-
-packages:
-  manager: microdnf
-  content_sets_file: content_sets.yaml
-
-osbs:
-  configuration:
-    container:
-      platforms:
-        only:
-        - x86_64
-        - aarch64
-        - ppc64le
-      compose:
-        pulp_repos: true
-  extra_dir: osbs-extra/logic-data-index-ephemeral-rhel8
-  repository:
-    name: containers/openshift-serverless-1-logic-data-index-ephemeral
-    branch: openshift-serverless-1.30-rhel-8
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml
deleted file mode 100644
index 80ee96c0329..00000000000
--- a/logic-imagestream.yaml
+++ /dev/null
@@ -1,89 +0,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.
-#
-kind: ImageStreamList
-apiVersion: v1
-metadata:
-  name: openshift-serverless-kogito-image-streams
-  annotations:
-    description: ImageStream definitions for Red Hat OpenShift Serverless Logic images
-    openshift.io/provider-display-name: Kie Group
-items:
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: logic-data-index-ephemeral-rhel8
-      annotations:
-        openshift.io/display-name: Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
-        openshift.io/provider-display-name: Kie Group
-    spec:
-      tags:
-      - name: '1.30.0'
-        annotations:
-          description: Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
-          iconClass: icon-jbpm
-          tags: logic-data-index,kogito,data-index,data-index-ephemeral
-          supports: quarkus
-          version: '1.30.0'
-        referencePolicy:
-          type: Local
-        from:
-          kind: DockerImage
-          name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.30.0
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: logic-devmode
-      annotations:
-        openshift.io/display-name: Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
-        openshift.io/provider-display-name: Kie Group
-    spec:
-      tags:
-        - name: '1.30.0'
-          annotations:
-            description: Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
-            iconClass: icon-jbpm
-            tags: logic,devmode,kogito,kogito,development,serverless,workflow
-            supports: quarkus
-            version: '1.30.0'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8:1.30.0
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: logic-builder
-      annotations:
-        openshift.io/display-name: Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
-        openshift.io/provider-display-name: Kie Group
-    spec:
-      tags:
-        - name: '1.30.0'
-          annotations:
-            description: Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
-            iconClass: icon-jbpm
-            tags: logic,builder,kogito,workflow,serverless
-            supports: quarkus
-            version: '1.30.0'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:1.30.0
diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml
deleted file mode 100644
index 50c8770bb21..00000000000
--- a/logic-swf-builder-rhel8-image.yaml
+++ /dev/null
@@ -1,89 +0,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.
-#
-schema_version: 1
-name: "openshift-serverless-1-tech-preview/logic-swf-builder-rhel8"
-version: "1.30.0"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled"
-
-labels:
-  - name: "io.openshift.s2i.scripts-url"
-    value: "image:///usr/local/s2i"
-  - name: "io.openshift.s2i.destination"
-    value: "/tmp"
-  - name: "io.quarkus.platform.version"
-    value: "2.16.7.Final"
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "com.redhat.component"
-    value: "openshift-serverless-1-logic-swf-builder-rhel8-container"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled"
-  - name: "io.k8s.display-name"
-    value: "Red Hat OpenShift Serverless Logic Builder image"
-  - name: "io.openshift.tags"
-    value: "logic-swf-builder,kogito,swf-builder"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "11"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.maven.rpm
-      version: "3.8"
-    - name: org.kie.kogito.project.versions
-    - name: org.kie.kogito.swf.common.scripts
-    - name: org.kie.kogito.swf.builder.runtime.osl
-
-run:
-  workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
-  user: 1001
-
-ports:
-  - value: 8080
-  - value: 5005
-
-packages:
-  manager: microdnf
-  content_sets_file: content_sets.yaml
-
-osbs:
-  configuration:
-    container:
-      platforms:
-        only:
-          - x86_64
-          - ppc64le
-          - aarch64
-      compose:
-        pulp_repos: true
-  extra_dir: osbs-extra/logic-swf-builder-rhel8
-  repository:
-    name: containers/openshift-serverless-1-logic-swf-builder
-    branch: openshift-serverless-1.30-rhel-8
diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml
deleted file mode 100644
index 1977e835361..00000000000
--- a/logic-swf-devmode-rhel8-image.yaml
+++ /dev/null
@@ -1,88 +0,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.
-#
-schema_version: 1
-name: "openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-version: "1.30.0"
-description: "Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled"
-
-labels:
-  - name: "io.quarkus.platform.version"
-    value: "2.16.7.Final"
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "io.k8s.description"
-    value: "Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled."
-  - name: "io.k8s.display-name"
-    value: "Red Hat OpenShift Serverless Logic SWF Devmode"
-  - name: "io.openshift.tags"
-    value: "logic,devmode,kogito,kogito,development,serverless,workflow"
-  - name: "io.openshift.expose-services"
-    value: "8080:http,5005:http"
-  - name: "com.redhat.component"
-    value: "openshift-serverless-1-logic-swf-devmode-rhel8-container"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "11"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.maven.rpm
-      version: "3.8"
-    - name: org.kie.kogito.project.versions
-    - name: org.kie.kogito.swf.common.scripts
-    - name: org.kie.kogito.swf.devmode.runtime.common
-    - name: org.kie.kogito.swf.devmode.runtime.osl
-
-ports:
-  - value: 8080
-  - value: 5005
-
-run:
-  workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
-  user: 1001
-  cmd:
-    - "/home/kogito/launch/run-app-devmode.sh"
-
-packages:
-  manager: microdnf
-  content_sets_file: content_sets.yaml
-
-osbs:
-  configuration:
-    container:
-      platforms:
-        only:
-          - x86_64
-          - ppc64le
-          - aarch64
-      compose:
-        pulp_repos: true
-  extra_dir: osbs-extra/logic-swf-devmode-rhel8
-  repository:
-    name: containers/openshift-serverless-1-logic-swf-devmode
-    branch: openshift-serverless-1.30-rhel-8
diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
deleted file mode 100644
index ec77a25695a..00000000000
--- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
-    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Djava.library.path="${KOGITO_HOME}"/lib \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-infinispan/configure b/modules/kogito-data-index-infinispan/configure
deleted file mode 100644
index 3ab6e8d850d..00000000000
--- a/modules/kogito-data-index-infinispan/configure
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/data-index-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml
deleted file mode 100644
index ba2ed20da3a..00000000000
--- a/modules/kogito-data-index-infinispan/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.dataindex.infinispan
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/data-index-service-infinispan/data-index-service-infinispan-quarkus-app.zip
-    name: data-index-service-infinispan-quarkus-app.zip
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
deleted file mode 100644
index ec77a25695a..00000000000
--- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
-    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Djava.library.path="${KOGITO_HOME}"/lib \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-data-index-mongodb/configure b/modules/kogito-data-index-mongodb/configure
deleted file mode 100644
index cbe1dd397a3..00000000000
--- a/modules/kogito-data-index-mongodb/configure
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/data-index-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml
deleted file mode 100644
index 447ae738955..00000000000
--- a/modules/kogito-data-index-mongodb/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.dataindex.mongodb
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/data-index-service-mongodb/data-index-service-mongodb-quarkus-app.zip
-    name: data-index-service-mongodb-quarkus-app.zip
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
deleted file mode 100644
index 8394e808f44..00000000000
--- a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
-    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Djava.library.path="${KOGITO_HOME}"/lib \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-data-index-oracle/configure b/modules/kogito-data-index-oracle/configure
deleted file mode 100644
index 7ff1cae769b..00000000000
--- a/modules/kogito-data-index-oracle/configure
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/data-index-service-oracle-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml
deleted file mode 100644
index a4ab95bbd25..00000000000
--- a/modules/kogito-data-index-oracle/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.dataindex.oracle
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/data-index-service-oracle/data-index-service-oracle-quarkus-app.zip
-    name: data-index-service-oracle-quarkus-app.zip
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh
deleted file mode 100644
index f838b195e17..00000000000
--- a/modules/kogito-explainability/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-explainability.sh
-  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Djava.library.path="${KOGITO_HOME}"/lib \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/"${EXPLAINABILITY_SERVICE_COMMUNICATION}"/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-explainability/added/launch/kogito-explainability.sh b/modules/kogito-explainability/added/launch/kogito-explainability.sh
deleted file mode 100644
index de30f040c09..00000000000
--- a/modules/kogito-explainability/added/launch/kogito-explainability.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset EXPLAINABILITY_COMMUNICATION
-}
-
-function configure() {
-    configure_explainability_jar
-}
-
-function configure_explainability_jar {
-    local allowed_communication_types=("REST" "MESSAGING")
-    local communication="MESSAGING"
-    if [[ ! "${allowed_communication_types[*]}" =~ ${EXPLAINABILITY_COMMUNICATION^^} ]]; then
-        log_warning "Explainability communication type ${EXPLAINABILITY_COMMUNICATION} is not allowed, the allowed types are [${allowed_communication_types[*]}]. Defaulting to ${communication}."
-        unset EXPLAINABILITY_COMMUNICATION
-
-    elif [ "x${EXPLAINABILITY_COMMUNICATION}" != "x" ]; then
-        communication="${EXPLAINABILITY_COMMUNICATION}"
-    fi
-
-    log_info "Explainability communication is set to ${communication}"
-    EXPLAINABILITY_SERVICE_COMMUNICATION="${communication,,}"
-}
diff --git a/modules/kogito-explainability/configure b/modules/kogito-explainability/configure
deleted file mode 100644
index fd40b372e82..00000000000
--- a/modules/kogito-explainability/configure
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/explainability-service-rest-quarkus-app.zip -d "${KOGITO_HOME}"/bin/rest/
-unzip "${SOURCES_DIR}"/explainability-service-messaging-quarkus-app.zip -d "${KOGITO_HOME}"/bin/messaging/
-
-
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml
deleted file mode 100644
index 26dfeb05e5e..00000000000
--- a/modules/kogito-explainability/module.yaml
+++ /dev/null
@@ -1,32 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.explainability
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/explainability-service-rest/explainability-service-rest-quarkus-app.zip
-    name: explainability-service-rest-quarkus-app.zip
-  - path: /tmp/build/explainability-service-messaging/explainability-service-messaging-quarkus-app.zip
-    name: explainability-service-messaging-quarkus-app.zip
-
-execute:
-  - script: configure
diff --git a/modules/kogito-explainability/tests/bats/kogito-explainability.bats b/modules/kogito-explainability/tests/bats/kogito-explainability.bats
deleted file mode 100644
index d0c85630846..00000000000
--- a/modules/kogito-explainability/tests/bats/kogito-explainability.bats
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=/tmp/kogito
-export HOME="${KOGITO_HOME}"
-mkdir -p "${KOGITO_HOME}"/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-explainability.sh
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"
-}
-
-
-@test "test if the default explainability communication type is correctly set" {
-    configure_explainability_jar
-    expected="messaging"
-    echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
-    [ "${EXPLAINABILITY_SERVICE_COMMUNICATION}" = "${expected}" ]
-}
-
-@test "test if explainability communication service default value is correctly set if a nonsense type is set" {
-    EXPLAINABILITY_COMMUNICATION="nonsense"
-    configure_explainability_jar
-    expected="messaging"
-    echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
-    [ "${EXPLAINABILITY_SERVICE_COMMUNICATION}" = "${expected}" ]
-}
-
-@test "test if explainability communication service default value s correctly set if set to rest" {
-    EXPLAINABILITY_COMMUNICATION="rest"
-    configure_explainability_jar
-    expected="rest"
-    echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}"
-    [ "${EXPLAINABILITY_SERVICE_COMMUNICATION}" = "${expected}" ]
-}
\ No newline at end of file
diff --git a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
deleted file mode 100644
index 43b80d17337..00000000000
--- a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-jobs-service-common.sh
-  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-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/infinispan/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-infinispan/configure b/modules/kogito-jobs-service-infinispan/configure
deleted file mode 100644
index 5966a945914..00000000000
--- a/modules/kogito-jobs-service-infinispan/configure
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/jobs-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/infinispan
-
-cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
-
diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml
deleted file mode 100644
index abae5a2aa26..00000000000
--- a/modules/kogito-jobs-service-infinispan/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.jobs.service.infinispan
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/jobs-service-infinispan/jobs-service-infinispan-quarkus-app.zip
-    name: jobs-service-infinispan-quarkus-app.zip
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
deleted file mode 100644
index 8f6f9223aab..00000000000
--- a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-jobs-service-common.sh
-  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-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/mongodb/quarkus-app/quarkus-run.jar
diff --git a/modules/kogito-jobs-service-mongodb/configure b/modules/kogito-jobs-service-mongodb/configure
deleted file mode 100644
index 0b3d85b719e..00000000000
--- a/modules/kogito-jobs-service-mongodb/configure
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/jobs-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/mongodb
-
-cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml
deleted file mode 100644
index 28b6488e564..00000000000
--- a/modules/kogito-jobs-service-mongodb/module.yaml
+++ /dev/null
@@ -1,30 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.jobs.service.mongodb
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/jobs-service-mongodb/jobs-service-mongodb-quarkus-app.zip
-    name: jobs-service-mongodb-quarkus-app.zip
-
-execute:
-  - script: configure
diff --git a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
deleted file mode 100644
index 6af4c2a5b6c..00000000000
--- a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#Please keep them in alphabetical order
-function prepareEnv() {
-    unset HTTP_PROXY_HOST
-    unset HTTP_PROXY_PORT
-    unset HTTP_PROXY_PASSWORD
-    unset HTTP_PROXY_USERNAME
-    unset HTTP_PROXY_NONPROXYHOSTS
-    unset HTTPS_PROXY
-    unset MAVEN_DOWNLOAD_OUTPUT
-    unset MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE
-    unset MAVEN_MIRROR_URL
-    unset MAVEN_REPO_ID
-    unset MAVEN_REPO_LAYOUT
-    unset MAVEN_REPO_RELEASES_ENABLED
-    unset MAVEN_REPO_RELEASES_UPDATE_POLICY
-    unset MAVEN_REPO_RELEASES_CHECKSUM_POLICY
-    unset MAVEN_REPO_SNAPSHOTS_ENABLED
-    unset MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY
-    unset MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY
-    unset MAVEN_REPO_URL
-    unset MAVEN_REPOS
-}
-
-function configure() {
-    log_info "Configure Maven"
-
-    configure_proxy
-    configure_mirrors
-    configure_maven_download_output
-    configure_maven_offline_mode
-    ignore_maven_self_signed_certificates
-    set_kogito_maven_repo
-    add_maven_repo
-    configureMavenHome
-
-    if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-        cat "${MAVEN_SETTINGS_PATH}"
-    fi
-
-    rm -rf *.bak
-}
-
-# When Running on OpenShift with AnyUID the HOME environment variable gets overridden to "/"
-# Maven build main fail with this issue Could not create local repository at /.m2/repository
-# Set the property maven.home to $KOGITO_HOME so the HOME env is ignored.
-function configureMavenHome() {
-  export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Duser.home=${KOGITO_HOME}"
-}
-
-# insert settings for HTTP proxy into maven settings.xml if supplied
-function configure_proxy() {
-    # prefer old http_proxy_ format for username/password, but
-    # also allow proxy_ format.
-    HTTP_PROXY_USERNAME=${HTTP_PROXY_USERNAME:-$PROXY_USERNAME}
-    HTTP_PROXY_PASSWORD=${HTTP_PROXY_PASSWORD:-$PROXY_PASSWORD}
-
-    proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}}
-    # if http_proxy_host/port is set, prefer that (oldest mechanism)
-    # before looking at HTTP(S)_PROXY
-    proxyhost=${HTTP_PROXY_HOST:-$(echo "${proxy}" | cut -d : -f 1,2)}
-    proxyport=${HTTP_PROXY_PORT:-$(echo "${proxy}" | cut -d : -f 3)}
-
-    if [ -n "$proxyhost" ]; then
-        if echo "${proxyhost}" | grep -q -i https://; then
-          proxyport=${proxyport:-443}
-          proxyprotocol="https"
-        else
-          proxyport=${proxyport:-80}
-          proxyprotocol="http"
-        fi
-
-        xml="<proxy>\
-         <id>genproxy</id>\
-         <active>true</active>\
-         <protocol>$proxyprotocol</protocol>\
-         <host>$proxyhost</host>\
-         <port>$proxyport</port>"
-
-        if [ -n "$HTTP_PROXY_USERNAME" ] && [ -n "$HTTP_PROXY_PASSWORD" ]; then
-            xml="$xml\
-         <username>$HTTP_PROXY_USERNAME</username>\
-         <password>$HTTP_PROXY_PASSWORD</password>"
-        fi
-        if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then
-            nonproxyhosts="${HTTP_PROXY_NONPROXYHOSTS//|/\\|}"
-            xml="$xml\
-         <nonProxyHosts>$nonproxyhosts</nonProxyHosts>"
-        fi
-        xml="$xml\
-       </proxy>"
-        sed -i.bak "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-# insert settings for mirrors/repository managers into settings.xml if supplied
-function configure_mirrors() {
-    if [ -n "$MAVEN_MIRROR_URL" ]; then
-        xml="    <mirror>\
-      <id>mirror.default</id>\
-      <url>$MAVEN_MIRROR_URL</url>\
-      <mirrorOf>external:*</mirrorOf>\
-    </mirror>"
-        sed -i.bak "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-function configure_maven_download_output() {
-    if [ "${MAVEN_DOWNLOAD_OUTPUT}" != "true" ]; then
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --no-transfer-progress"
-    fi
-}
-
-function configure_maven_offline_mode() {
-    if [ "${MAVEN_OFFLINE_MODE}" = "true" ]; then
-        log_info "Setup Maven offline mode. No artifact will be downloaded !!!"
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -o"
-    fi
-}
-
-function ignore_maven_self_signed_certificates() {
-    if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
-    fi
-}
-
-function set_kogito_maven_repo() {
-    local kogito_maven_repo_url="${DEFAULT_MAVEN_REPO_URL}"
-    if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i.bak "s|https://repository.apache.org/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-function add_maven_repo() {
-    # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service
-    local single_repo_url="${MAVEN_REPO_URL}"
-    if [ -n "$single_repo_url" ]; then
-        single_repo_id=$(_maven_find_env "MAVEN_REPO_ID" "repo-$(_generate_random_id)")
-        _add_maven_repo "$single_repo_url" "$single_repo_id" ""
-    fi
-
-    # multiple remote repositories scenario: respect fully qualified url(s) if specified, otherwise find and use service(s); can be used together with "single repo scenario" above
-    local multi_repo_counter=1
-    IFS=',' read -r -a multi_repo_prefixes <<<"${MAVEN_REPOS}"
-    for multi_repo_prefix in "${multi_repo_prefixes[@]}"; do
-        multi_repo_url=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_URL")
-        multi_repo_id=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_ID" "repo${multi_repo_counter}-$(_generate_random_id)")
-        _add_maven_repo "$multi_repo_url" "$multi_repo_id" "$multi_repo_prefix"
-        multi_repo_counter=$((multi_repo_counter + 1))
-    done
-}
-# add maven repositories
-# Parameters:
-#   $1 - repo url
-#   $2 - repo id
-#   $3 - repo prefix
-function _add_maven_repo() {
-    local repo_url=$1
-    local repo_id=$2
-    local prefix=$3
-
-    repo_name=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_NAME" "${repo_id}")
-    repo_layout=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_LAYOUT" "default")
-    releases_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_ENABLED" "true")
-    releases_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_UPDATE_POLICY" "always")
-    releases_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" "warn")
-    snapshots_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_ENABLED" "true")
-    snapshots_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" "always")
-    snapshots_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" "warn")
-
-    local repo="\n\
-                <repository>\n\
-                    <id>${repo_id}</id>\n\
-                    <name>${repo_name}</name>\n\
-                    <url>${repo_url}</url>\n\
-                    <layout>${repo_layout}</layout>\n\
-                    <releases>\n\
-                        <enabled>${releases_enabled}</enabled>\n\
-                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
-                    </releases>\n\
-                    <snapshots>\n\
-                        <enabled>${snapshots_enabled}</enabled>\n\
-                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
-                    </snapshots>\n\
-                </repository>\n\
-                <!-- ### configured repositories ### -->"
-    sed -i.bak "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
-
-    local pluginRepo="\n\
-                <pluginRepository>\n\
-                    <id>${repo_id}</id>\n\
-                    <name>${repo_name}</name>\n\
-                    <url>${repo_url}</url>\n\
-                    <layout>${repo_layout}</layout>\n\
-                    <releases>\n\
-                        <enabled>${releases_enabled}</enabled>\n\
-                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
-                    </releases>\n\
-                    <snapshots>\n\
-                        <enabled>${snapshots_enabled}</enabled>\n\
-                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
-                    </snapshots>\n\
-                </pluginRepository>\n\
-                <!-- ### configured plugin repositories ### -->"
-
-    sed -i.bak "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
-
-    # new repo should be skipped by mirror if exists
-    sed -i.bak "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
-}
-
-# Finds the environment variable  and returns its value if found.
-# Otherwise returns the default value if provided.
-#
-# Arguments:
-# $1 env variable name to check
-# $2 default value if environment variable was not set
-function _maven_find_env() {
-    local var=${!1}
-    echo "${var:-$2}"
-}
-
-# Finds the environment variable with the given prefix. If not found
-# the default value will be returned. If no prefix is provided will
-# rely on _maven_find_env
-#
-# Arguments
-#  - $1 prefix. Transformed to uppercase and replace - by _
-#  - $2 variable name. Prepended by "prefix_"
-#  - $3 default value if the variable is not defined
-function _maven_find_prefixed_env() {
-    local prefix=$1
-
-    if [[ -z $prefix ]]; then
-        _maven_find_env "${2}" "${3}"
-    else
-        prefix=${prefix^^} # uppercase
-        prefix=${prefix//-/_} #replace - by _
-
-        local var_name="${prefix}_${2}"
-        echo "${!var_name:-${3}}"
-      fi
-}
-
-# private
-function _generate_random_id() {
-    env LC_CTYPE=C < /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
-}
diff --git a/modules/kogito-maven/3.8.x-rpm/configure b/modules/kogito-maven/3.8.x-rpm/configure
deleted file mode 100644
index ef74352f148..00000000000
--- a/modules/kogito-maven/3.8.x-rpm/configure
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-mkdir "${KOGITO_HOME}"/.m2
-cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
-
-# configure Red Hat repositories on the maven settings.xml for product builds
-if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
-    echo "enabling red hat repositories"
-    rh_repos="    <!-- JBoss EAP Maven repository -->\
-<profile>\
-  <id>redhat-maven-repositories</id>\
-  <repositories>\
-    <repository>\
-      <id>redhat-ga-repository</id>\
-      <url>https://maven.repository.redhat.com/ga/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-    <repository>\
-      <id>redhat-ea-repository</id>\
-      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-    <repository>\
-      <id>redhat-techpreview-repository</id>\
-      <url>https://maven.repository.redhat.com/techpreview/all</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-  </repositories>\
-  <pluginRepositories>\
-    <pluginRepository>\
-      <id>redhat-ga-plugin-repository</id>\
-      <url>https://maven.repository.redhat.com/ga/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-    <pluginRepository>\
-      <id>redhat-ea-plugin-repository</id>\
-      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-    <pluginRepository>\
-      <id>redhat-techpreview-repository</id>\
-      <url>https://maven.repository.redhat.com/techpreview/all</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-  </pluginRepositories>\
-</profile>\
-"
-    sed -i "s|<!-- ### redhat maven repositories ### -->|$rh_repos|" "${KOGITO_HOME}"/.m2/settings.xml
-    sed -i "s|<!-- ### redhat maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${KOGITO_HOME}"/.m2/settings.xml
-
-    mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp
-    #format and write the new file
-    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${KOGITO_HOME}"/.m2/settings.xml
-fi
diff --git a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
deleted file mode 100644
index bf67912d23e..00000000000
--- a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-  <mirrors>
-    <!-- ### configured mirrors ### -->
-  </mirrors>
-
-  <proxies>
-    <!-- ### configured http proxy ### -->
-  </proxies>
-
-  <profiles>
-    <!-- ### redhat maven repositories ### -->
-
-    <profile>
-      <id>kogito-images</id>
-      <repositories>
-        <repository>
-          <id>apache-public-repository-group</id>
-          <name>Apache Public Repository Group</name>
-          <url>https://repository.apache.org/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </repository>
-        <!-- ### configured repositories ### -->
-      </repositories>
-
-      <pluginRepositories>
-        <pluginRepository>
-          <id>apache-public-repository-group</id>
-          <name>Apache Public Repository Group</name>
-          <url>https://repository.apache.org/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </pluginRepository>
-        <!-- ### configured plugin repositories ### -->
-      </pluginRepositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <!-- ### redhat maven profile ### -->
-    <activeProfile>kogito-images</activeProfile>
-  </activeProfiles>
-</settings>
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
deleted file mode 100644
index cc5bdf92c41..00000000000
--- a/modules/kogito-maven/3.8.x-rpm/module.yaml
+++ /dev/null
@@ -1,103 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.maven.rpm
-version: "3.8"
-
-envs:
-  - name: "MAVEN_VERSION"
-    value: "3.8"
-  - name: "MAVEN_HOME"
-    value: "/usr/share/maven"
-  - name: "MAVEN_SETTINGS_PATH"
-    description: "The location of the settings.xml file"
-    value: '${KOGITO_HOME}/.m2/settings.xml'
-  - name: "HTTP_PROXY"
-    description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
-    example: "http://127.0.0.1:8080"
-  - name: "HTTP_PROXY_HOST"
-    description: "Proxy Host, don't need to be set if HTTP_PROXY is used."
-    example: "127.0.0.1"
-  - name: "HTTP_PROXY_PORT"
-    description: "Proxy Port, don't need to be set if HTTP_PROXY is used."
-    example: "8181"
-  - name: "HTTP_PROXY_PASSWORD"
-    description: "Proxy Password"
-  - name: "HTTP_PROXY_USERNAME"
-    description: "Proxy Username"
-  - name: "HTTP_PROXY_NONPROXYHOSTS"
-    description: "Non proxy hosts, list of hosts that will ot be proxied."
-    example: "localhost"
-  - name: "MAVEN_MIRROR_URL"
-    description: "The base URL of a mirror used for retrieving artifacts."
-    example: "http://10.0.0.1:8080/repository/internal/"
-  - name: "MAVEN_DOWNLOAD_OUTPUT"
-    description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
-    example: "true"
-  - name: "DEFAULT_MAVEN_REPO_URL"
-    value: "https://repository.apache.org/content/groups/public/"
-    description: "Defines the Default Maven repository for Kogito artifacts."
-  - name: "MAVEN_REPO_URL"
-    description: "Defines an extra Maven repository."
-    example: "https://nexus.test.com/group/public"
-  - name: "MAVEN_REPO_ID"
-    description: "Defines the id of the new Repository"
-    example: "nexus-test"
-  - name: "MAVEN_REPO_LAYOUT"
-    description: "The type of layout this repository uses for locating and storing artifacts - can be 'legacy' or 'default'.Defaults to 'default'."
-    example: "legacy"
-  - name: "MAVEN_REPO_RELEASES_ENABLED"
-    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
-    example: "false"
-  - name: "MAVEN_REPO_RELEASES_UPDATE_POLICY"
-    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
-    example: "never"
-  - name: "MAVEN_REPO_RELEASES_CHECKSUM_POLICY"
-    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
-    example: "fail"
-  - name: "MAVEN_REPO_SNAPSHOTS_ENABLED"
-    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
-    example: "false"
-  - name: "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY"
-    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
-    example: "never"
-  - name: "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY"
-    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
-    example: "fail"
-  - name: "MAVEN_REPOS"
-    description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories."
-    example: "CENTRAL,INTERNAL"
-  - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
-    description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
-    example: "true"
-  - name: "MAVEN_OFFLINE_MODE"
-    description: "When set to true, tells Maven to work in offline mode. See Maven `-o` option for more information."
-    example: "true"
-
-modules:
-  install:
-    - name: org.kie.kogito.maven.dnf.module
-
-packages:
-  install:
-    - maven
-
-
-execute:
-  - script: configure
diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
index 5201654d7e9..40e71fddf36 100644
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
@@ -462,20 +462,6 @@ teardown() {
     [ "${result}" = "${expected}" ]
 }
 
-
-@test "test if the Quarkus platform properties are correctly returned for prod version" {
-    QUARKUS_PLATFORM_VERSION="1.2.3.4"
-    JBOSS_IMAGE_NAME="rhpam-7/kogito-builder"
-
-    result=$(get_quarkus_platform_properties)
-
-    expected=" -DplatformGroupId=com.redhat.quarkus.platform -DplatformArtifactId=quarkus-bom -DplatformVersion=1.2.3.4"
-
-    echo "result  : $result"
-    echo "expected: $expected"
-    [ "${result}" = "${expected}" ]
-}
-
 @test "Check if the expected message is printed if native build is enabled" {
     QUARKUS_PLATFORM_VERSION="1.2.3.4"
     JBOSS_IMAGE_NAME="rhpam-7/kogito-builder"
diff --git a/modules/kogito-trusty-common/added/launch/kogito-trusty.sh b/modules/kogito-trusty-common/added/launch/kogito-trusty.sh
deleted file mode 100644
index a163c81d9dc..00000000000
--- a/modules/kogito-trusty-common/added/launch/kogito-trusty.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset EXPLAINABILITY_ENABLED
-}
-
-function configure() {
-    enable_explainability
-}
-
-
-function enable_explainability {
-    local allowed_values=("TRUE" "FALSE")
-    local explainability_enabled="true"
-    # shellcheck disable=SC2153
-    if [[ ! "${allowed_values[*]}" =~ ${EXPLAINABILITY_ENABLED^^} ]]; then
-        log_warning "Explainability enabled type ${EXPLAINABILITY_ENABLED} is not allowed, the allowed types are [${allowed_values[*]}]. Defaulting to ${explainability_enabled}."
-    elif [ "${EXPLAINABILITY_ENABLED^^}" == "FALSE" ]; then
-        explainability_enabled="${EXPLAINABILITY_ENABLED^^}"
-    fi
-    log_info "Explainability is enabled: ${explainability_enabled}"
-    KOGITO_TRUSTY_PROPS="${KOGITO_TRUSTY_PROPS} -Dtrusty.explainability.enabled=${explainability_enabled,,}"
-}
diff --git a/modules/kogito-trusty-common/configure b/modules/kogito-trusty-common/configure
deleted file mode 100644
index a54486162cc..00000000000
--- a/modules/kogito-trusty-common/configure
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
\ No newline at end of file
diff --git a/modules/kogito-trusty-common/module.yaml b/modules/kogito-trusty-common/module.yaml
deleted file mode 100644
index 9a7be9b8cfd..00000000000
--- a/modules/kogito-trusty-common/module.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.trusty.common
-version: "999-SNAPSHOT"
-description: "Common modules for trusty provider images, any addition that is common must be added in this module"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats b/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats
deleted file mode 100644
index afa1ffe0a8e..00000000000
--- a/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=/tmp/kogito
-export HOME="${KOGITO_HOME}"
-mkdir -p "${KOGITO_HOME}"/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-trusty.sh
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"
-}
-
-@test "explainability is enabled by default" {
-    enable_explainability
-    expected=" -Dtrusty.explainability.enabled=true"
-    echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}"
-    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
-}
-
-@test "disable explainability" {
-    export EXPLAINABILITY_ENABLED="false" 
-    enable_explainability
-    expected=" -Dtrusty.explainability.enabled=false"
-    echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}"
-    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
-}
-
-@test "explainability is enabled even if nonsense values are provided" {
-    EXPLAINABILITY_ENABLED="nonsense"
-    enable_explainability
-    expected=" -Dtrusty.explainability.enabled=true"
-    echo "result: ${KOGITO_TRUSTY_PROPS} \n expected: ${expected}"
-    [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ]
-}
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
deleted file mode 100644
index ab8a34e3221..00000000000
--- a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-trusty.sh
-  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Djava.library.path="${KOGITO_HOME}"/lib \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/configure b/modules/kogito-trusty-infinispan/configure
deleted file mode 100644
index 93536c02517..00000000000
--- a/modules/kogito-trusty-infinispan/configure
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/trusty-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml
deleted file mode 100644
index 316cb95b52c..00000000000
--- a/modules/kogito-trusty-infinispan/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.trusty.infinispan
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/trusty-service-infinispan/trusty-service-infinispan-quarkus-app.zip
-    name: trusty-service-infinispan-quarkus-app.zip
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh b/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
deleted file mode 100644
index ab8a34e3221..00000000000
--- a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-trusty.sh
-  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Djava.library.path="${KOGITO_HOME}"/lib \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-postgresql/configure b/modules/kogito-trusty-postgresql/configure
deleted file mode 100644
index 9cca2a2a850..00000000000
--- a/modules/kogito-trusty-postgresql/configure
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/trusty-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml
deleted file mode 100644
index 31fde32f607..00000000000
--- a/modules/kogito-trusty-postgresql/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.trusty.postgresql
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/trusty-service-postgresql/trusty-service-postgresql-quarkus-app.zip
-    name: trusty-service-postgresql-quarkus-app.zip
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-trusty-redis/added/kogito-app-launch.sh b/modules/kogito-trusty-redis/added/kogito-app-launch.sh
deleted file mode 100644
index ab8a34e3221..00000000000
--- a/modules/kogito-trusty-redis/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-trusty.sh
-  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Djava.library.path="${KOGITO_HOME}"/lib \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-redis/configure b/modules/kogito-trusty-redis/configure
deleted file mode 100644
index cfb84f93a0f..00000000000
--- a/modules/kogito-trusty-redis/configure
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/trusty-service-redis-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
\ No newline at end of file
diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml
deleted file mode 100644
index b932b7fdb04..00000000000
--- a/modules/kogito-trusty-redis/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.trusty.redis
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/trusty-service-redis/trusty-service-redis-quarkus-app.zip
-    name: trusty-service-redis-quarkus-app.zip
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh
deleted file mode 100644
index be69ceb8967..00000000000
--- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-trusty-ui.sh
-  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
deleted file mode 100644
index 79fb635783d..00000000000
--- a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset KOGITO_TRUSTY_ENDPOINT
-}
-
-function configure() {
-    configure_trusty_url
-}
-
-# Exit codes:
-#   10 - invalid url
-function configure_trusty_url {
-    url_simple_regex='(https?)://'
-    local trustyURL=${KOGITO_TRUSTY_ENDPOINT}
-    if [ "${trustyURL}x" != "x" ]; then
-        if [[ ! "${trustyURL}x" =~ $url_simple_regex ]]; then
-            log_error "URL must start with http or https."
-            exit 10
-        fi
-    else
-        log_info "Trusty url not set, default will be used: http://localhost:8180"
-        trustyURL="http://localhost:8180"
-    fi
-    KOGITO_TRUSTY_UI_PROPS="${KOGITO_TRUSTY_PROPS} -Dkogito.trusty.http.url=${trustyURL}"
-}
\ No newline at end of file
diff --git a/modules/kogito-trusty-ui/configure b/modules/kogito-trusty-ui/configure
deleted file mode 100644
index 13fc920e04f..00000000000
--- a/modules/kogito-trusty-ui/configure
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-unzip "${SOURCES_DIR}"/trusty-ui-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml
deleted file mode 100644
index 7559cc64cfe..00000000000
--- a/modules/kogito-trusty-ui/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.trusty.ui
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/trusty-ui/trusty-ui-quarkus-app.zip
-    name: trusty-ui-quarkus-app.zip
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
deleted file mode 100644
index 6f755ab7046..00000000000
--- a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=/tmp/kogito
-export HOME="${KOGITO_HOME}"
-mkdir -p "${KOGITO_HOME}"/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-trusty-ui.sh
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"
-}
-
-@test "test if the default value for trusty url will be set" {
-    local expected=" -Dkogito.trusty.http.url=http://localhost:8180"
-    configure_trusty_url
-    echo "Result is [${KOGITO_TRUSTY_UI_PROPS}] and expected is [${expected}]" >&2
-    [ "${expected}" = "${KOGITO_TRUSTY_UI_PROPS}" ]
-}
-
-@test "test if KOGITO_TRUSTY_URL will be correctly set " {
-    export KOGITO_TRUSTY_ENDPOINT="http://10.10.10.10:8080"
-    local expected=" -Dkogito.trusty.http.url=http://10.10.10.10:8080"
-    configure_trusty_url
-    echo "Result is [${KOGITO_TRUSTY_UI_PROPS}] and expected is [${expected}]" >&2
-    [ "${expected}" = "${KOGITO_TRUSTY_UI_PROPS}" ]
-}
-
-@test "test if a invalid value for trusty url will return the expected exit code" {
-    export KOGITO_TRUSTY_ENDPOINT="a.b.c"
-    run configure_trusty_url
-    [ "${status}" == "10" ]
-}
-
-
diff --git a/modules/rhpam-kogito-prod-profile/configure b/modules/rhpam-kogito-prod-profile/configure
deleted file mode 100644
index f352652d13e..00000000000
--- a/modules/rhpam-kogito-prod-profile/configure
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-# configure Red Hat repositories on the maven settings.xml for product builds
-if [ "${ENABLE_RH_MAVEN_REPO}" = "true" ]; then
-    echo "enabling red hat repositories"
-    rh_repos="    <!-- JBoss EAP Maven repository -->\
-<profile>\
-  <id>redhat-maven-repositories</id>\
-  <repositories>\
-    <repository>\
-      <id>redhat-ga-repository</id>\
-      <url>https://maven.repository.redhat.com/ga/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-    <repository>\
-      <id>redhat-ea-repository</id>\
-      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-    <repository>\
-      <id>redhat-techpreview-repository</id>\
-      <url>https://maven.repository.redhat.com/techpreview/all</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </repository>\
-  </repositories>\
-  <pluginRepositories>\
-    <pluginRepository>\
-      <id>redhat-ga-plugin-repository</id>\
-      <url>https://maven.repository.redhat.com/ga/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-    <pluginRepository>\
-      <id>redhat-ea-plugin-repository</id>\
-      <url>https://maven.repository.redhat.com/earlyaccess/all/</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-    <pluginRepository>\
-      <id>redhat-techpreview-repository</id>\
-      <url>https://maven.repository.redhat.com/techpreview/all</url>\
-      <releases>\
-        <enabled>true</enabled>\
-      </releases>\
-      <snapshots>\
-        <enabled>false</enabled>\
-      </snapshots>\
-    </pluginRepository>\
-  </pluginRepositories>\
-</profile>\
-"
-    sed -i "s|<!-- ### extra maven repositories ### -->|$rh_repos|" "${MAVEN_SETTINGS_PATH}"
-    sed -i "s|<!-- ### extra maven profile ### -->|<activeProfile>redhat-maven-repositories</activeProfile>|" "${MAVEN_SETTINGS_PATH}"
-
-    mv "${MAVEN_SETTINGS_PATH}" "${KOGITO_HOME}"/.m2/settings.xml.bkp
-    #format and write the new file
-    xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${MAVEN_SETTINGS_PATH}"
-fi
diff --git a/modules/rhpam-kogito-prod-profile/module.yaml b/modules/rhpam-kogito-prod-profile/module.yaml
deleted file mode 100644
index 47af707f2f2..00000000000
--- a/modules/rhpam-kogito-prod-profile/module.yaml
+++ /dev/null
@@ -1,30 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.rhpam.prod.profile
-version: '7.13.0'
-description: Holds custom configurations for productized Kogito images. Add as the last module as it can depend on other modules.
-
-envs:
-  - name: "ENABLE_RH_MAVEN_REPO"
-    value: "true"
-    description: "If set, will enable the usage of the Red Hat Maven repositories to resolve Java dependencies. Enabled by default on productized images."
-
-execute:
-- script: configure
\ No newline at end of file
diff --git a/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml b/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml
deleted file mode 100644
index 4930b68cdb0..00000000000
--- a/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
---- !Policy
-id: "cvp-logic-data-index-ephemeral-rhel8"
-product_versions:
-  - cvp
-decision_context: cvp_default
-rules:
-  - !PassingTestCaseRule {test_case_name: logic-data-index-ephemeral-rhel8.openshift.external}
\ No newline at end of file
diff --git a/osbs-extra/logic-swf-builder-rhel8/gating.yaml b/osbs-extra/logic-swf-builder-rhel8/gating.yaml
deleted file mode 100644
index d6ae18ae837..00000000000
--- a/osbs-extra/logic-swf-builder-rhel8/gating.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
---- !Policy
-id: "cvp-logic-swf-builder-rhel8"
-product_versions:
-  - cvp
-decision_context: cvp_default
-rules:
-  - !PassingTestCaseRule {test_case_name: logic-swf-builder-rhel8.openshift.external}
\ No newline at end of file
diff --git a/osbs-extra/logic-swf-devmode-rhel8/gating.yaml b/osbs-extra/logic-swf-devmode-rhel8/gating.yaml
deleted file mode 100644
index d35f9bcf114..00000000000
--- a/osbs-extra/logic-swf-devmode-rhel8/gating.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
---- !Policy
-id: "cvp-logic-swf-devmode-rhel8"
-product_versions:
-  - cvp
-decision_context: cvp_default
-rules:
-  - !PassingTestCaseRule {test_case_name: logic-swf-devmode-rhel8.openshift.external}
\ No newline at end of file
diff --git a/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml
deleted file mode 100644
index bb8ef66d436..00000000000
--- a/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
---- !Policy
-id: "cvp-rhpam-kogito-builder"
-product_versions:
-  - cvp
-decision_context: cvp_default
-rules:
-  - !PassingTestCaseRule {test_case_name: rhpam-kogito-builder.openshift.external}
\ No newline at end of file
diff --git a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
deleted file mode 100644
index b0b6e9f01bc..00000000000
--- a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
---- !Policy
-id: "cvp-rhpam-kogito-runtime-jvm"
-product_versions:
-  - cvp
-decision_context: cvp_default
-rules:
-  - !PassingTestCaseRule {test_case_name: rhpam-kogito-runtime-jvm.openshift.external}
\ No newline at end of file
diff --git a/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml
deleted file mode 100644
index b0601469cd3..00000000000
--- a/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
---- !Policy
-id: "cvp-rhpam-kogito-runtime-native"
-product_versions:
-  - cvp
-decision_context: cvp_default
-rules:
-  - !PassingTestCaseRule {test_case_name: rhpam-kogito-runtime-native.openshift.external}
\ No newline at end of file
diff --git a/scripts/README.md b/scripts/README.md
index f0056efc310..28ed41d0912 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -4,7 +4,6 @@ On this directory you can find some python scripts used to help with some repeti
 
 Today we have these scripts:
 
-- [build-product-image.sh](build-product-image.sh)
 - [common.py](common.py)
 - [list-images.py](list-images.py)
 - [manage-kogito-version.py](manage-kogito-version.py)
@@ -14,31 +13,6 @@ Today we have these scripts:
 - [update-repository.py](update-repository.py)
 
 
-
-### Build Product Image Script
-
-Script should not be used to build community images. Handled by `make build-prod` command.
-
-To switch the `build_engine` do the following:
-
-```bash
-make BUILD_ENGINE=osbs build-prod
-```
-
-
-It receives the Product image name to build the images.
-
-Example: 
-
-```bash 
-cekit --verbose --redhat --descriptor logic-data-index-ephemeral-rhel8-image.yaml build docker
-```
-
-The product image name must respect the community image name:
-
- - rhpam-$(kogito_image_name)-rhel8
-
-
 ### Common script
 
 The `common.py` script defines some common functions for the scripts.
@@ -53,13 +27,6 @@ the community image list:
 $ python list-images.py
 ```
 
-And the product image list by using the `--prod` flag:
-
-```bash
-$ python list-images.py --prod
-```
-
-
 ### Managing Kogito images version script
 
 The manage-kogito-version script will help when we need to update the current version due a new release.
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index c36e5425ea2..24f7187dab5 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -60,27 +60,12 @@ case ${imageName} in
     "kogito-data-index-ephemeral")
         contextDir="data-index/data-index-service/data-index-service-inmemory"
         ;;
-    "kogito-data-index-infinispan")
-        contextDir="data-index/data-index-service/data-index-service-infinispan"
-        ;;
-    "kogito-data-index-mongodb")
-        contextDir="data-index/data-index-service/data-index-service-mongodb"
-        ;;
-    "kogito-data-index-oracle")
-        contextDir="data-index/data-index-service/data-index-service-oracle"
-        ;;
     "kogito-data-index-postgresql")
         contextDir="data-index/data-index-service/data-index-service-postgresql"
         ;;
     "kogito-jobs-service-ephemeral")
         contextDir="jobs-service/jobs-service-inmemory"
         ;;
-    "kogito-jobs-service-infinispan")
-        contextDir="jobs-service/jobs-service-infinispan"
-        ;;
-    "kogito-jobs-service-mongodb")
-        contextDir="jobs-service/jobs-service-mongodb"
-        ;;
     "kogito-jobs-service-postgresql")
         contextDir="jobs-service/jobs-service-postgresql"
         ;;
@@ -91,21 +76,6 @@ case ${imageName} in
         contextDir="${contextDir} jobs-service/jobs-service-postgresql"
         contextDir="${contextDir} jobs-service/jobs-service-mongodb"
         ;;
-    "kogito-trusty-infinispan")
-        contextDir="trusty/trusty-service/trusty-service-infinispan"
-        ;;
-    "kogito-trusty-postgresql")
-        contextDir="trusty/trusty-service/trusty-service-postgresql"
-        ;;
-    "kogito-trusty-redis")
-        contextDir="trusty/trusty-service/trusty-service-redis"
-        ;;
-    "kogito-trusty-ui")
-        contextDir="trusty-ui"
-        ;;
-    "kogito-explainability")
-        contextDir="explainability/explainability-service-messaging explainability/explainability-service-rest"
-        ;;
     "kogito-jit-runner")
         contextDir="jitexecutor/jitexecutor-runner"
         ;;
diff --git a/scripts/build-osbs.sh b/scripts/build-osbs.sh
deleted file mode 100755
index f8a79ca4766..00000000000
--- a/scripts/build-osbs.sh
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-set -e
-
-DEBUG=
-GIT_USER=${GIT_USER:-"Your Name"}
-GIT_EMAIL=${GIT_EMAIL:-"yourname@email.com"}
-WORK_DIR=$(pwd)/build-temp
-
-function help()
-{
-    echo "usage: build-osbs.sh [options]"
-    echo
-    echo "Run a cekit osbs build of an rhpam ba operator image with bundle"
-    echo
-    echo "For each of the options below, the names of the arguments are environment variables that may be set"
-    echo "instead of using the particular option on the invocation"
-    echo ""
-    echo "Required:"
-    echo "  -v PROD_VERSION           Version being built. Passed to the build-overrides.sh -v option"
-    echo "  -t OSBS_BUILD_TARGET      Build target for osbs, for example rhba-7.3-openshift-containers-candidate"
-    echo ""
-    echo "Optional:"
-    echo "  -h                        Print this help message"
-    echo "  -p KERBEROS_PRINCIPAL     Kerberos principal to use with to access build systems. If not specified,"
-    echo "                            the script assumes there is a valid kerberos ticket in force. If it is specified"
-    echo "                            then one of KERBEROS_KEYTAB or KERBEROS_PASSWORD is required."
-    echo "  -k KERBEROS_KEYTAB        Path to a keytab file for KERBEROS_PRINCIPAL if no KERBEROS_PASSWORD is specified."
-    echo "  -s KERBEROS_PASSWORD      Password for KERBEROS_PRINCIPAL (a keytab file may be used instead via KERBEROS_KEYTAB)"
-    echo "  -i OSBS_BUILD_USER        Maps to the build-osbs-user option for cekit (ie the user for rhpkg commands)"
-    echo "                            The default will be KERBEROS_PRINCIPAL if this is not set"
-    echo "  -b BUILD_DATE             The date of the nightly build to access. Passed to the build-overrides.sh -b option if set"
-    echo "  -w WORK_DIR               The working directory used for generating overrides, cekit cache, etc. Default is ./build-temp."
-    echo "  -u GIT_USER               User config for git commits to internal repositories. Default is 'Your Name'"
-    echo "  -e GIT_EMAIL              Email config for git commits to internal repositories. Default is 'yourname@email.com'"
-    echo "  -o CEKIT_BUILD_OPTIONS    Additional options to pass through to the cekit build command, should be quoted"
-    echo "  -l CEKIT_CACHE_LOCAL      Comma-separated list of urls to download and add to the local cekit cache"
-    echo "  -c PROD_COMPONENT         Prod Component or image name that will be built."
-    echo "  -g                        Debug setting, currently sets verbose flag on cekit commands"
-}
-
-
-function get_short_version() {
-  local version_array
-  local short_version=$1
-  IFS='.' read -r -a version_array <<< "$1"
-  if [ ${#version_array[@]} -gt 1 ]; then
-      short_version="${version_array[0]}.${version_array[1]}"
-  fi
-  echo $short_version
-}
-
-function check_for_required_envs()
-{
-    if [ -z "$GIT_EMAIL" ]; then
-        echo "No git email specified with GIT_EMAIL"
-        exit -1
-    fi
-    if [ -z "$GIT_USER" ]; then
-        echo "No git user specified with GIT_USER"
-        exit -1
-    fi
-    if [ -z "$PROD_VERSION" ]; then
-        echo "No version specified with PROD_VERSION"
-        exit -1
-    fi
-    if [ -z "$OSBS_BUILD_TARGET" ]; then
-        echo "No build target specified with OSBS_BUILD_TARGET"
-        exit -1
-    fi
-    if [ -z "PROD_COMPONENT" ]; then
-        echo "No prod component specified with PROD_COMPONENT"
-        exit -1
-    fi
-}
-
-function get_kerb_ticket() {
-    set +e
-    retries=10
-    delay=5
-    if [ -n "$KERBEROS_PASSWORD" ]; then
-        echo "$KERBEROS_PASSWORD" | kinit "$KERBEROS_PRINCIPAL"
-        _klist
-        if [ "$?" -ne 0 ]; then
-            echo "Failed to get kerberos token for $KERBEROS_PRINCIPAL with password"
-            exit -1
-        fi
-    elif [ -n "$KERBEROS_KEYTAB" ]; then
-        for i in `seq 1 $retries`; do
-            kinit -k -t "$KERBEROS_KEYTAB" "$KERBEROS_PRINCIPAL"
-            [ $? -eq 0 ] && break
-            echo "Failed to acquire Kerberos ticket, retrying (try $i of $retries)..."
-            _klist
-            sleep $delay
-        done
-        if [ "$?" -ne 0 ]; then
-            echo "Failed to get kerberos token for $KERBEROS_PRINCIPAL with $KERBEROS_KEYTAB"
-            exit -1
-        fi
-    else
-        echo "No kerberos password or keytab specified with KERBEROS_PASSWORD or KERBEROS_KEYTAB"
-        exit -1
-    fi
-    set -e
-}
-
-# _klist will help to indentify if the kerberos ticket, prints when debug is enabled
-function _klist() {
-    if [ -n "$DEBUG" ]; then
-        klist
-    fi
-}
-
-
-function set_git_config() {
-    git config --global user.email "$GIT_EMAIL"
-    git config --global user.name  "$GIT_USER"
-    git config --global core.pager ""
-}
-
-
-while getopts gu:e:v:c:t:o:r:n:d:p:k:s:b:l:i:w:h option; do
-    case $option in
-        g)
-            DEBUG=true
-            ;;
-        u)
-            GIT_USER=$OPTARG
-            ;;
-        e)
-            GIT_EMAIL=$OPTARG
-            ;;
-        v)
-            PROD_VERSION=$OPTARG
-            ;;
-        c)
-            PROD_COMPONENT=$OPTARG
-            ;;
-        t)
-            OSBS_BUILD_TARGET=$OPTARG
-            ;;
-        o)
-            CEKIT_BUILD_OPTIONS=$OPTARG
-            ;;
-        p)
-            KERBEROS_PRINCIPAL=$OPTARG
-            ;;
-        k)
-            KERBEROS_KEYTAB=$OPTARG
-            ;;
-        s)
-            KERBEROS_PASSWORD=$OPTARG
-            ;;
-        b)
-            BUILD_DATE=$OPTARG
-            ;;
-        l)
-            CEKIT_CACHE_LOCAL=$OPTARG
-            ;;
-        i)
-            OSBS_BUILD_USER=$OPTARG
-            ;;
-        w)
-            WORK_DIR=$OPTARG
-            ;;
-        h)
-            help
-            exit 0
-            ;;
-        *)
-            ;;
-    esac
-done
-shift $((OPTIND-1))
-
-mkdir -p $WORK_DIR
-bo_options=" --no-color"
-
-check_for_required_envs
-set_git_config
-
-if [ -n "$KERBEROS_PRINCIPAL" ]; then
-    get_kerb_ticket
-    # overrides the OSBS_BUILD_USER if it is not set and KERBEROS principal is in use
-    if [ ! -n "$OSBS_BUILD_USER" ]; then
-      echo "setting OSBS_BUILD_USER to KERBEROS_PRINCIPAL"
-      # need to catch only the first part of the principal, before the / otherwise 'rhpkg' will fail
-      OSBS_BUILD_USER=$(echo ${KERBEROS_PRINCIPAL} | awk -F"/" '{print $1}')
-    fi
-else
-    echo No kerberos principal specified, assuming there is a current kerberos ticket
-fi
-
-debug=
-if [ -n "$DEBUG" ]; then
-    debug="--verbose"
-fi
-
-builduser=
-if [ -n "$OSBS_BUILD_USER" ]; then
-    builduser="$OSBS_BUILD_USER"
-fi
-
-cd ../
-set -x
-PROD_C="${PROD_COMPONENT}-image"
-# hack to replace the branch overrides as cekit detects two osbs sections and don't know which one to override.
-sed -i 's/rhba-7-rhel-8/rhba-7-rhel-8-nightly/g' ${PROD_C}.yaml
-make container-build-osbs prod_component=${PROD_C}
-set +x
diff --git a/scripts/build-product-image.sh b/scripts/build-product-image.sh
deleted file mode 100755
index 3abd3b052e5..00000000000
--- a/scripts/build-product-image.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-# Simple usage: /bin/sh scripts/build-product-image.sh "build" ${IMAGE_NAME} ${BUILD_ENGINE}
-
-ver=$(cekit --version )
-ver=$((${ver//./} + 0))
-if [ ${ver//./} -lt 379 ]; then
-    echo "Using CEKit version $ver, Please use CEKit version 3.8.0 or greater."
-    exit 10
-fi
-
-image="${2}"
-if [ "x${image}" == "x" ]; then
-    echo "image_name can't be empty.."
-    exit 8
-fi
-
-BUILD_ENGINE="${3:-docker}"
-CEKIT_CMD="cekit --verbose --redhat"
-
-ACTION=${1}
-case ${ACTION} in
-    "build")
-        echo "Using ${BUILD_ENGINE} build engine"
-        ${CEKIT_CMD} --descriptor ${image_name}-image.yaml build ${BUILD_ENGINE}
-    ;;
-
-    "test")
-        ${CEKIT_CMD} --descriptor ${image_name}-image.yaml test behave $3
-    ;;
-    *)
-        echo "Please use build or test actions."
-    ;;
-esac
-
diff --git a/scripts/common.py b/scripts/common.py
index bc99fa70cf9..9398669b7a3 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -30,12 +30,10 @@
 MODULES_DIR = "modules"
 
 COMMUNITY_PREFIX = 'kogito-'
-PRODUCT_PREFIX = 'logic-'
 
 # imagestream file that contains all images, this file aldo needs to be updated.
 PROJECT_VERSIONS_MODULE = "modules/kogito-project-versions/module.yaml"
 IMAGE_STREAM_FILENAME = "kogito-imagestream.yaml"
-PROD_IMAGE_STREAM_FILENAME = "logic-imagestream.yaml"
 KOGITO_VERSION_ENV_KEY = "KOGITO_VERSION"
 KOGITO_VERSION_LABEL_NAME = "org.kie.kogito.version"
 
@@ -48,19 +46,14 @@
 CLONE_REPO_SCRIPT = 'tests/test-apps/clone-repo.sh'
 SETUP_MAVEN_SCRIPT = 'scripts/setup-maven.sh'
 
-SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral", "kogito-data-index-infinispan",
-                              "kogito-data-index-mongodb", "kogito-data-index-oracle",
-                              "kogito-data-index-postgresql", "kogito-explainability",
+SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral", 
+                              "kogito-data-index-postgresql", 
                               "kogito-jit-runner", "kogito-jobs-service-ephemeral",
-                              "kogito-jobs-service-infinispan", "kogito-jobs-service-mongodb",
                               "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone",
-                              "kogito-management-console", "kogito-task-console",
-                              "kogito-trusty-infinispan", "kogito-trusty-postgresql",
-                              "kogito-trusty-redis", "kogito-trusty-ui"}
+                              "kogito-management-console", "kogito-task-console"
+                              }
 
-PROD_SUPPORTING_SERVICES_IMAGES = {"logic-data-index-ephemeral-rhel8"}
 SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-base-builder", "kogito-swf-devmode"}
-PROD_SWF_BUILDER_IMAGES = {"logic-swf-devmode-rhel8", "logic-swf-builder-rhel8"}
 
 
 def yaml_loader():
@@ -84,15 +77,6 @@ def update_community_images_version(target_version):
         update_image_version_tag_in_yaml_file(target_version, "{}-image.yaml".format(img))
 
 
-def update_prod_image_version(target_version):
-    """
-    Update logic-*-image.yaml files version tag.
-    :param target_version: version used to update the files
-    """
-    for img in sorted(get_prod_images()):
-        update_image_version_tag_in_yaml_file(target_version, "{}-image.yaml".format(img))
-
-
 def update_image_version_tag_in_yaml_file(target_version, yaml_file):
     """
     Update root version tag in yaml file.
@@ -110,15 +94,12 @@ def update_image_version_tag_in_yaml_file(target_version, yaml_file):
     except TypeError as err:
         print("Unexpected error:", err)
 
-def update_image_stream(target_version, prod=False):
+def update_image_stream(target_version):
     """
     Update the imagestream file, it will update the tag name, version and image tag.
-    :param prod: if the imagestream is the prod version
     :param target_version: version used to update the imagestream file;
     """
     image_stream_filename = IMAGE_STREAM_FILENAME
-    if prod:
-        image_stream_filename = PROD_IMAGE_STREAM_FILENAME
     print("Updating ImageStream images version from file {0} to version {1}".format(image_stream_filename,
                                                                                     target_version))
     try:
@@ -160,25 +141,12 @@ def get_community_module_dirs():
     """
     community_modules = []
     for module_path in get_all_module_dirs():
-        if "{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(COMMUNITY_PREFIX) and os.path.basename(module_path) != "prod":
+        if "{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(COMMUNITY_PREFIX):
             community_modules.append(module_path)
 
     return community_modules
 
 
-
-def get_prod_module_dirs():
-    """
-    Retrieve the Logic module directories
-    """
-    prod_modules = []
-    for module_path in get_all_module_dirs():
-        if "{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(PRODUCT_PREFIX) or ("{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(COMMUNITY_PREFIX) and os.path.basename(module_path) == "prod"):
-            prod_modules.append(module_path)
-
-    return prod_modules
-
-
 def get_images(prefix):
     """
     Retrieve the Kogito images' files
@@ -202,41 +170,26 @@ def get_community_images():
     return get_images(COMMUNITY_PREFIX)
 
 
-def get_prod_images():
-    """
-    Retrieve the Prod images' names
-    """
-    return get_images(PRODUCT_PREFIX)
-
-
-def get_supporting_services_images(is_prod_image):
+def get_supporting_services_images():
     """
     Retrieve the Supporting Services images' names
     """
-    if is_prod_image:
-        return PROD_SUPPORTING_SERVICES_IMAGES
     return SUPPORTING_SERVICES_IMAGES
 
 
-def is_supporting_services_or_swf_builder(image_name, prod=False):
+def is_supporting_services_or_swf_builder(image_name):
     """
     Raise an error if the given image is not a supporting service
     """
     found = False
-    if prod:
-        if image_name not in PROD_SUPPORTING_SERVICES_IMAGES:
-            raise RuntimeError('{} is not a productized supporting service'.format(image_name))
-    else:
-        if image_name not in SUPPORTING_SERVICES_IMAGES and image_name not in SWF_BUILDER_IMAGES:
-            raise RuntimeError('{} is not a supporting service or a swf builder image.'.format(image_name))
+    if image_name not in SUPPORTING_SERVICES_IMAGES and image_name not in SWF_BUILDER_IMAGES:
+        raise RuntimeError('{} is not a supporting service or a swf builder image.'.format(image_name))
 
 
-def get_swf_builder_images(is_prod_image):
+def get_swf_builder_images():
     """
     Raise an error if the given image is not a supporting service
     """
-    if is_prod_image:
-            return PROD_SWF_BUILDER_IMAGES
     return SWF_BUILDER_IMAGES
 
 
@@ -261,18 +214,14 @@ def get_project_versions_module_data():
         raise
 
 
-def update_kogito_modules_version(target_version, prod=False):
+def update_kogito_modules_version(target_version):
     """
     Update every Kogito module.yaml to the given version.
-    :param prod: if the module to be updated is prod version.
     :param target_version: version used to update all Kogito module.yaml files
     """
     modules = []
     current_version = retrieve_version()
-    if prod:
-        modules = get_prod_module_dirs()
-    else:
-        modules = get_community_module_dirs()
+    modules = get_community_module_dirs()
 
     for module_dir in modules:
         update_kogito_module_version(module_dir, current_version, target_version)
@@ -299,13 +248,13 @@ def update_kogito_module_version(module_dir, old_version, target_version):
     except TypeError:
         raise
 
-def update_quarkus_platform_version_in_build(quarkus_platform_version, prod=False):
+def update_quarkus_platform_version_in_build(quarkus_platform_version):
     """
     Update quarkus_platform_version version into images/modules
     :param quarkus_platform_version: quarkus version to set
     """
-    update_env_value(QUARKUS_PLATFORM_VERSION_ENV_KEY, quarkus_platform_version, prod)
-    update_label_value(QUARKUS_PLATFORM_VERSION_LABEL_NAME, quarkus_platform_version, prod)
+    update_env_value(QUARKUS_PLATFORM_VERSION_ENV_KEY, quarkus_platform_version)
+    update_label_value(QUARKUS_PLATFORM_VERSION_LABEL_NAME, quarkus_platform_version)
 
 def update_quarkus_platform_version_in_behave_tests_repository_paths(quarkus_platform_version):
     """
@@ -342,13 +291,13 @@ def update_examples_uri_in_behave_tests(examples_uri):
     replacement = examples_uri
     update_in_behave_tests(pattern, replacement)
 
-def update_artifacts_version_in_build(artifacts_version, prod=False):
+def update_artifacts_version_in_build(artifacts_version):
     """
     Update artifacts version into modules / images
     :param artifacts_version: artifacts version to set
     """
-    update_env_value(KOGITO_VERSION_ENV_KEY, artifacts_version, prod)
-    update_label_value(KOGITO_VERSION_LABEL_NAME, artifacts_version, prod)
+    update_env_value(KOGITO_VERSION_ENV_KEY, artifacts_version)
+    update_label_value(KOGITO_VERSION_LABEL_NAME, artifacts_version)
 
 def update_artifacts_version_in_behave_tests(artifacts_version):
     """
@@ -415,17 +364,16 @@ def update_maven_mirror_url_in_quarkus_plugin_behave_tests(mirror_url):
         "MAVEN_MIRROR_URL", mirror_url)
     update_in_behave_tests(pattern, replacement)
 
-def update_maven_repo_env_value(repo_url, replace_default_repository, prod=False):
+def update_maven_repo_env_value(repo_url, replace_default_repository):
     """
     Update the given maven repository value for all images/modules.
     :param repo_url: Maven repository url
     :param replace_default_repository: Set to true if default repository needs to be overidden
-    :param prod: if the module to be updated is prod version.
     """
     env_name = "MAVEN_REPO_URL"
     if replace_default_repository:
         env_name = "DEFAULT_MAVEN_REPO_URL"
-    update_env_value(env_name, repo_url, prod)
+    update_env_value(env_name, repo_url)
 
 
 def ignore_maven_self_signed_certificate_in_behave_tests():
@@ -500,7 +448,7 @@ def update_maven_repo_in_setup_maven(repo_url, replace_default_repository):
         replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
     update_in_file(SETUP_MAVEN_SCRIPT, pattern, replacement)
 
-def update_env_value(env_name, env_value, prod=False):
+def update_env_value(env_name, env_value):
     """
     Update environment value into the given yaml module/image file
     :param env_name: environment variable name to update
@@ -509,12 +457,8 @@ def update_env_value(env_name, env_value, prod=False):
 
     images = []
     modules = []
-    if prod:
-        images = get_prod_images()
-        modules = get_prod_module_dirs()
-    else:
-        images = get_community_images()
-        modules = get_community_module_dirs()
+    images = get_community_images()
+    modules = get_community_module_dirs()
 
     for image_name in images:
         image_filename = "{}-image.yaml".format(image_name)
@@ -591,7 +535,7 @@ def update_env_value_in_build_config_modules(env_name, new_value, ignore_empty =
         except TypeError:
             raise
 
-def update_label_value(label_name, label_value, prod=False):
+def update_label_value(label_name, label_value):
     """
     Update label value in all module / image files 
     :param label_name: label name to update
@@ -600,12 +544,8 @@ def update_label_value(label_name, label_value, prod=False):
 
     images = []
     modules = []
-    if prod:
-        images = get_prod_images()
-        modules = get_prod_module_dirs()
-    else:
-        images = get_community_images()
-        modules = get_community_module_dirs()
+    images = get_community_images()
+    modules = get_community_module_dirs()
 
     for image_name in images:
         image_filename = "{}-image.yaml".format(image_name)
@@ -707,6 +647,3 @@ def update_field_in_dict(data, key, new_value, ignore_empty = False):
     print("Community modules:")
     for m in get_community_module_dirs():
         print("module {}".format(m))
-    print("\nProd modules:")
-    for m in get_prod_module_dirs():
-        print("module {}".format(m))
diff --git a/scripts/list-images.py b/scripts/list-images.py
index 6ad2c154b86..9d77880cd99 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -33,7 +33,6 @@
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
         description='Kogito Version Manager - List Images by Community and Product version')
-    parser.add_argument('--prod', default=False, action='store_true', help='List product images')
     parser.add_argument('--swf-builder', default=False, action='store_true', help='List swf builder images')
     parser.add_argument('-s', '--supporting-services', default=False, action='store_true',
                         help='List Supporting Services images')
@@ -44,13 +43,11 @@
 
     images = []
     if args.is_supporting_services_or_swf_builder:
-        common.is_supporting_services_or_swf_builder(args.is_supporting_services_or_swf_builder, args.prod)
+        common.is_supporting_services_or_swf_builder(args.is_supporting_services_or_swf_builder)
     elif args.supporting_services:
-        images = common.get_supporting_services_images(args.prod)
-    elif args.prod:
-        images = common.get_prod_images()
+        images = common.get_supporting_services_images()
     elif args.swf_builder:
-        images = common.get_swf_builder_images(args.prod)
+        images = common.get_swf_builder_images()
     else:
         images = common.get_community_images()
 
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 1a407f4a70a..04cb161fbb2 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -46,7 +46,6 @@
     parser.add_argument('--examples-ref', dest='examples_ref',
                         help='Update Behave tests to use the desired branch for kogito-examples')
     parser.add_argument('--confirm', default=False, action='store_true', help='To confirm automatically the setup')
-    parser.add_argument('--prod', default=False, action='store_true', help='Update product modules/images')
 
     args = parser.parse_args()
 
@@ -68,31 +67,23 @@
             if args.artifacts_version:
                 artifacts_version = args.artifacts_version
 
-            if args.prod:
-                print("Product images version will be updated to {0}".format(args.bump_to))
-            else:
-                print("Images version will be updated to {0}".format(args.bump_to))
-                print("Artifacts version will be updated to {0}".format(artifacts_version))
-                print("Examples ref will be updated to {}".format(examples_ref))
+            print("Images version will be updated to {0}".format(args.bump_to))
+            print("Artifacts version will be updated to {0}".format(artifacts_version))
+            print("Examples ref will be updated to {}".format(examples_ref))
 
             if not args.confirm:
                 input("Is the information correct? If so press any key to continue...")
 
             # modules
-            if args.prod:
-                common.update_kogito_modules_version(args.bump_to, args.prod)
-                common.update_prod_image_version(args.bump_to)
-                common.update_image_stream(args.bump_to, args.prod)
-            else:
-                common.update_kogito_modules_version(args.bump_to) # Need to be done before updating the project data version
-                common.update_community_images_version(args.bump_to)
-                common.update_image_stream(args.bump_to)
-                common.update_artifacts_version_in_build(artifacts_version)
+            common.update_kogito_modules_version(args.bump_to) # Need to be done before updating the project data version
+            common.update_community_images_version(args.bump_to)
+            common.update_image_stream(args.bump_to)
+            common.update_artifacts_version_in_build(artifacts_version)
 
-                # tests default values
-                common.update_examples_ref_in_behave_tests(examples_ref)
-                common.update_examples_ref_in_clone_repo(examples_ref)
-                common.update_artifacts_version_in_behave_tests(artifacts_version)
+            # tests default values
+            common.update_examples_ref_in_behave_tests(examples_ref)
+            common.update_examples_ref_in_clone_repo(examples_ref)
+            common.update_artifacts_version_in_behave_tests(artifacts_version)
         else:
             print("Provided version {0} does not match the expected regex - {1}".format(args.bump_to, pattern))
     else:
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 79c11c5a3f4..c7e1adecc3f 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -29,12 +29,6 @@ else
     rm -rf bats-core
 fi
 
-echo  "----> running bats on kogito-trusty-common"
-./bats/bin/bats modules/kogito-trusty-common/tests/bats
-
-echo "----> running bats on kogito-explainability"
-./bats/bin/bats modules/kogito-explainability/tests/bats
-
 echo "----> running bats on kogito-graalvm-scripts"
 ./bats/bin/bats modules/kogito-graalvm-scripts/common/tests/bats
 
@@ -50,9 +44,6 @@ echo "----> running bats on kogito-management-console"
 echo "----> running bats on kogito-task-console"
 ./bats/bin/bats modules/kogito-task-console/tests/bats/
 
-echo "----> running bats on kogito-trusty-ui"
-./bats/bin/bats modules/kogito-trusty-ui/tests/bats/
-
 echo "----> running bats on kogito-maven"
 ./bats/bin/bats modules/kogito-maven/tests/bats
 
diff --git a/scripts/update-repository.py b/scripts/update-repository.py
index 9465535c5f9..2583e409684 100644
--- a/scripts/update-repository.py
+++ b/scripts/update-repository.py
@@ -56,7 +56,6 @@
                         help='To update the runtime native image name in behave tests\'s steps')
 
     parser.add_argument('--tests-only', dest='tests_only', default=False, action='store_true', help='Update product modules/images')
-    parser.add_argument('--prod', default=False, action='store_true', help='Update product modules/images')
     args = parser.parse_args()
 
     if args.repo_url:
@@ -64,7 +63,7 @@
         common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_default_repo)
         common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_default_repo)
         if not args.tests_only:
-            common.update_maven_repo_env_value(args.repo_url, args.replace_default_repo, args.prod)
+            common.update_maven_repo_env_value(args.repo_url, args.replace_default_repo)
     
     if args.ignore_self_signed_cert:
         common.ignore_maven_self_signed_certificate_in_build_config()
@@ -87,11 +86,11 @@
         common.update_examples_ref_in_clone_repo(args.examples_ref)
 
     if args.artifacts_version:
-        common.update_artifacts_version_in_build(args.artifacts_version, args.prod)
+        common.update_artifacts_version_in_build(args.artifacts_version)
     
     if args.quarkus_platform_version:
         if not args.tests_only:
-            common.update_quarkus_platform_version_in_build(args.quarkus_platform_version, args.prod)
+            common.update_quarkus_platform_version_in_build(args.quarkus_platform_version)
         
         common.update_quarkus_platform_version_in_behave_tests_repository_paths(args.quarkus_platform_version)
     
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
index 654c3af1029..b543feba343 100644
--- a/tests/features/common-build-runtime.feature
+++ b/tests/features/common-build-runtime.feature
@@ -1,8 +1,6 @@
 @quay.io/kiegroup/kogito-s2i-builder
 @quay.io/kiegroup/kogito-runtime-native
 @quay.io/kiegroup/kogito-runtime-jvm
-@rhpam-7/rhpam-kogito-builder-rhel8
-@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: Common tests for Kogito builder and runtime images
 
   # This scenario launches a container that dies instantly, causing Cekit to hand trying to fetch logs
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 6e2bb671202..4184dc17c8f 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -1,21 +1,11 @@
 @quay.io/kiegroup/kogito-runtime-jvm 
-@quay.io/kiegroup/kogito-data-index-infinispan
 @quay.io/kiegroup/kogito-data-index-ephemeral
-@quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-task-console 
 @quay.io/kiegroup/kogito-management-console 
-@quay.io/kiegroup/kogito-explainability 
 @quay.io/kiegroup/kogito-jit-runner 
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
-@quay.io/kiegroup/kogito-jobs-service-infinispan
-@quay.io/kiegroup/kogito-jobs-service-mongodb
 @quay.io/kiegroup/kogito-jobs-service-postgresql
-@quay.io/kiegroup/kogito-trusty-infinispan
-@quay.io/kiegroup/kogito-trusty-redis
-@quay.io/kiegroup/kogito-trusty-postgresql
-@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
-@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Custom TrustStore configuration
   # This test sets an invalid certificate to the container, it fails to start, and if timing is bad cekit hangs on 'Running command ps -C java in container'
   # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index d65e79dbee5..da33c0d0862 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -2,25 +2,13 @@
 # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
 #@quay.io/kiegroup/kogito-s2i-builder
 #@quay.io/kiegroup/kogito-runtime-jvm
-#@quay.io/kiegroup/kogito-data-index-infinispan
 @quay.io/kiegroup/kogito-data-index-ephemeral
-#@quay.io/kiegroup/kogito-data-index-mongodb
 #@quay.io/kiegroup/kogito-data-index-postgresql
-#@quay.io/kiegroup/kogito-trusty-infinispan
-#@quay.io/kiegroup/kogito-trusty-redis
-#@quay.io/kiegroup/kogito-trusty-postgresql
-#@quay.io/kiegroup/kogito-trusty-ui
-#@quay.io/kiegroup/kogito-explainability
 #@quay.io/kiegroup/kogito-jit-runner
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
-#@quay.io/kiegroup/kogito-jobs-service-infinispan
-#@quay.io/kiegroup/kogito-jobs-service-mongodb
 #@quay.io/kiegroup/kogito-jobs-service-postgresql
 #@quay.io/kiegroup/kogito-management-console
 #@quay.io/kiegroup/kogito-task-console
-#@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
-#@rhpam-7/rhpam-kogito-builder-rhel8
-#@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 6cac9b8e0e2..77923242093 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,28 +1,15 @@
 @quay.io/kiegroup/kogito-s2i-builder
 @quay.io/kiegroup/kogito-runtime-jvm
 @quay.io/kiegroup/kogito-runtime-native
-@quay.io/kiegroup/kogito-data-index-infinispan
 @quay.io/kiegroup/kogito-data-index-ephemeral
-@quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-postgresql
-@quay.io/kiegroup/kogito-trusty-infinispan
-@quay.io/kiegroup/kogito-trusty-redis
-@quay.io/kiegroup/kogito-trusty-postgresql
-@quay.io/kiegroup/kogito-trusty-ui
-@quay.io/kiegroup/kogito-explainability
 @quay.io/kiegroup/kogito-jit-runner
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
-@quay.io/kiegroup/kogito-jobs-service-infinispan
-@quay.io/kiegroup/kogito-jobs-service-mongodb
 @quay.io/kiegroup/kogito-jobs-service-postgresql
 @quay.io/kiegroup/kogito-management-console
 @quay.io/kiegroup/kogito-task-console
 @quay.io/kiegroup/kogito-swf-builder
 @quay.io/kiegroup/kogito-base-builder
-@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
-@rhpam-7/rhpam-kogito-builder-rhel8
-@rhpam-7/rhpam-kogito-runtime-native-rhel8
-@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index 6ed0ec81051..a4de284fb46 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -1,8 +1,5 @@
-@quay.io/kiegroup/kogito-data-index-infinispan
 @quay.io/kiegroup/kogito-data-index-ephemeral
-@quay.io/kiegroup/kogito-data-index-mongodb
 @quay.io/kiegroup/kogito-data-index-postgresql
-@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: Kogito-data-index common feature.
 
   Scenario: Verify if the debug is correctly enabled and test default http port
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
deleted file mode 100644
index 399530742fd..00000000000
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ /dev/null
@@ -1,33 +0,0 @@
-@quay.io/kiegroup/kogito-data-index-infinispan
-Feature: Kogito-data-index infinispan feature.
-
-  Scenario: verify if all labels are correctly set on kogito-data-index-infinispan image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-     And the image should contain label io.openshift.expose-services with value 8080:http
-     And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Infinispan persistence provider
-     And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Infinispan
-     And the image should contain label io.openshift.tags with value kogito,data-index,data-index-infinispan
-
-  Scenario: verify if all parameters are correctly set
-    When container is started with env
-      | variable                                  | value             |
-      | SCRIPT_DEBUG                              | true              |
-      | QUARKUS_INFINISPAN_CLIENT_HOSTS           | 172.18.0.1:11222  |
-      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_USERNAME        | IamNotExist       |
-      | QUARKUS_INFINISPAN_CLIENT_PASSWORD        | hard2guess        |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
-      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222
-     And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
-     And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess
-     And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist
-     And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
-     And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
-
-  Scenario: check if the default quarkus profile is correctly set on data index
-    When container is started with env
-      | variable               | value   |
-      | SCRIPT_DEBUG           | true    |
-    Then container log should contain -Dquarkus.profile=kafka-events-support
\ No newline at end of file
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
deleted file mode 100644
index 10578dc94af..00000000000
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ /dev/null
@@ -1,31 +0,0 @@
-@quay.io/kiegroup/kogito-data-index-mongodb
-Feature: Kogito-data-index mongodb feature.
-
-  Scenario: verify if all labels are correctly set on kogito-data-index-mongodb image
-    Given image is built
-     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-      And the image should contain label io.openshift.expose-services with value 8080:http
-      And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Mongodb persistence provider
-      And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Mongodb
-      And the image should contain label io.openshift.tags with value kogito,data-index,data-index-mongodb
-
-  Scenario: verify if all parameters are correctly set
-    When container is started with env
-      | variable                                   | value                       |
-      | SCRIPT_DEBUG                               | true                        |
-      | QUARKUS_MONGODB_CONNECTION_STRING          | mongodb://172.18.0.1:27071  |
-      | QUARKUS_MONGODB_DATABASE                   | database                    |
-      | QUARKUS_MONGODB_CREDENTIALS_AUTH_USERNAME  | IamNotExist                 |
-      | QUARKUS_MONGODB_CREDENTIALS_AUTH_PASSWORD  | SecretRealm                 |
-      | QUARKUS_MONGODB_CREDENTIALS_AUTH_MECHANISM | MONGODB-X509                |
-    Then container log should contain QUARKUS_MONGODB_CONNECTION_STRING=mongodb://172.18.0.1:27071
-     And container log should contain QUARKUS_MONGODB_DATABASE=database
-     And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_USERNAME=IamNotExist
-     And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_PASSWORD=SecretRealm
-     And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_MECHANISM=MONGODB-X509
-
-  Scenario: check if the default quarkus profile is correctly set on data index
-    When container is started with env
-      | variable               | value   |
-      | SCRIPT_DEBUG           | true    |
-    Then container log should contain -Dquarkus.profile=kafka-events-support
\ No newline at end of file
diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature
deleted file mode 100644
index 64bb798196e..00000000000
--- a/tests/features/data-index/kogito-data-index-oracle.feature
+++ /dev/null
@@ -1,26 +0,0 @@
-@quay.io/kiegroup/kogito-data-index-oracle
-Feature: Kogito-data-index oracle feature.
-
-  Scenario: verify if all labels are correctly set on kogito-data-index-oracle image
-    Given image is built
-     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-      And the image should contain label io.openshift.expose-services with value 8080:http
-      And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Oracle persistence provider
-      And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Oracle
-      And the image should contain label io.openshift.tags with value kogito,data-index,data-index-oracle
-
-  Scenario: verify if of container is correctly started with oracle parameters
-    When container is started with env
-      | variable                     | value                                      |
-      | QUARKUS_DATASOURCE_JDBC_URL  | jdbc:oracle:thin:@//10.1.1.53:1521/quarkus |
-      | QUARKUS_DATASOURCE_USERNAME  | kogito                                     |
-      | QUARKUS_DATASOURCE_PASSWORD  | s3cr3t                                     |
-    Then container log should contain java.sql.SQLRecoverableException: ORA-17002: I/O error
-    And container log should not contain Application failed to start
-
-  Scenario: check if the default quarkus profile is correctly set on data index
-    When container is started with env
-      | variable               | value   |
-      | SCRIPT_DEBUG           | true    |
-    Then container log should contain -Dquarkus.profile=kafka-events-support
-    And container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature
index 432fcddcb40..34e21b0a369 100644
--- a/tests/features/jobs-service/kogito-jobs-service-common.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-common.feature
@@ -1,5 +1,3 @@
-@quay.io/kiegroup/kogito-jobs-service-infinispan
-@quay.io/kiegroup/kogito-jobs-service-mongodb
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
 @quay.io/kiegroup/kogito-jobs-service-postgresql
 @quay.io/kiegroup/kogito-jobs-service-allinone
diff --git a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
deleted file mode 100644
index 3c235a53da8..00000000000
--- a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
+++ /dev/null
@@ -1,33 +0,0 @@
-@quay.io/kiegroup/kogito-jobs-service-infinispan
-Feature: Kogito-jobs-service-infinispan feature.
-
-  Scenario: verify if all labels are correctly set kogito-jobs-service image image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Infinispan
-    And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Infinispan
-    And the image should contain label io.openshift.tags with value kogito,jobs-service-infinispan
-
-  Scenario: Verify if the application jar exists
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar
-
-  Scenario: verify if auth is correctly set
-    When container is started with env
-      | variable                                  | value             |
-      | SCRIPT_DEBUG                              | true              |
-      | QUARKUS_INFINISPAN_CLIENT_HOSTS           | 172.18.0.1:11222  |
-      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_USERNAME        | IamNotExist       |
-      | QUARKUS_INFINISPAN_CLIENT_PASSWORD        | hard2guess        |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
-      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
-    And container log should not contain Application failed to start
diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
deleted file mode 100644
index 3642f616cd8..00000000000
--- a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
+++ /dev/null
@@ -1,23 +0,0 @@
-@quay.io/kiegroup/kogito-jobs-service-mongodb
-Feature: Kogito-jobs-service-mongodb feature.
-
-  Scenario: verify if all labels are correctly set kogito-jobs-service image image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on MongoDB
-    And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on MongoDB
-    And the image should contain label io.openshift.tags with value kogito,jobs-service-mongodb
-
-  Scenario: Verify if the application jar exists
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar
-
-  Scenario: verify if the container is correctly started with mongo parameters
-    When container is started with env
-      | variable                          | value                                          |
-      | SCRIPT_DEBUG                      | true                                           |
-      | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://user:password@localhost:27017/admin  |
-      | QUARKUS_MONGODB_DATABASE          | kogito                                         |
-    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar
-    And container log should not contain Application failed to start
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
index 0fb180b03f0..ab4bf871183 100644
--- a/tests/features/kogito-common-builder-jvm.feature
+++ b/tests/features/kogito-common-builder-jvm.feature
@@ -1,4 +1,4 @@
-@quay.io/kiegroup/kogito-s2i-builder @rhpam-7/rhpam-kogito-builder-rhel8
+@quay.io/kiegroup/kogito-s2i-builder
 Feature: kogito-s2i-builder image JVM build tests
 
   Scenario: verify if the maven and java installation are correct
diff --git a/tests/features/kogito-common-postresql-services.feature b/tests/features/kogito-common-postresql-services.feature
index da0754237bb..cf77b26fdd0 100644
--- a/tests/features/kogito-common-postresql-services.feature
+++ b/tests/features/kogito-common-postresql-services.feature
@@ -1,4 +1,3 @@
-@quay.io/kiegroup/kogito-trusty-postgresql
 @quay.io/kiegroup/kogito-data-index-postgresql
 Feature: Kogito-data-index postgresql feature.
 
diff --git a/tests/features/kogito-common-runtime-jvm.feature b/tests/features/kogito-common-runtime-jvm.feature
index d3501b6b169..79b8c98b8b2 100644
--- a/tests/features/kogito-common-runtime-jvm.feature
+++ b/tests/features/kogito-common-runtime-jvm.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-runtime-jvm
-@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
 Feature: kogito-runtime-jvm feature.
 
   Scenario: verify if the java installation is correct
diff --git a/tests/features/kogito-common-runtime-native.feature b/tests/features/kogito-common-runtime-native.feature
index 5d435894f18..9715614ca70 100644
--- a/tests/features/kogito-common-runtime-native.feature
+++ b/tests/features/kogito-common-runtime-native.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-runtime-native
-@rhpam-7/rhpam-kogito-runtime-native-rhel8
 Feature: Kogito-runtime-native feature.
 
   Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus native
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
deleted file mode 100644
index ba997ebd45a..00000000000
--- a/tests/features/kogito-explainability.feature
+++ /dev/null
@@ -1,38 +0,0 @@
-@quay.io/kiegroup/kogito-explainability
-Feature: Kogito-explainability feature.
-
-  Scenario: verify if all labels are correctly set on kogito-explainability image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Explainability Service
-    And the image should contain label io.k8s.display-name with value Kogito Explainability Service
-    And the image should contain label io.openshift.tags with value kogito,explainability
-
-  Scenario: verify if the messaging binary is available on /home/kogito
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/messaging/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/messaging/quarkus-app/quarkus-run.jar
-
-  Scenario: verify if the rest binary is available on /home/kogito
-    When container is started with command bash
-    Then run sh -c 'ls /home/kogito/bin/rest/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/rest/quarkus-app/quarkus-run.jar
-
-  Scenario: Verify if the debug is correctly enabled and test default http port
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/messaging/quarkus-app/quarkus-run.jar
-
-  Scenario: Verify if the explainability rest binary is selected by the enviroment variable EXPLAINABILITY_COMMUNICATION
-    When container is started with env
-      | variable      | value |
-      | EXPLAINABILITY_COMMUNICATION  | rest |
-      | SCRIPT_DEBUG  | true  |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/rest/quarkus-app/quarkus-run.jar
-
-  Scenario: Verify if the communication is correctly set to its default value if a wrong communication type is set
-    When container is started with env
-      | variable               | value    |
-      | SCRIPT_DEBUG           | true     |
-      | EXPLAINABILITY_COMMUNICATION | nonsense |
-    Then container log should contain WARN Explainability communication type nonsense is not allowed, the allowed types are [REST MESSAGING]. Defaulting to MESSAGING.
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 288357b74a7..96c72b7073f 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-swf-builder
-@openshift-serverless-1-tech-preview/logic-swf-builder-rhel8
 Feature: Serverless Workflow builder images
 
   Scenario: Verify that the application is built and started correctly
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 391be6e4e40..65bc9811502 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -1,7 +1,5 @@
 @quay.io/kiegroup/kogito-swf-builder
 @quay.io/kiegroup/kogito-swf-devmode
-@openshift-serverless-1-tech-preview/logic-swf-builder-rhel8
-@openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8
 Feature: Serverless Workflow images common
 
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 1ae248b3691..533521167e7 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -1,5 +1,4 @@
 @quay.io/kiegroup/kogito-swf-devmode
-@openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8
 Feature: Serverless Workflow devmode images
 
   Scenario: Verify if container starts in devmode by default
diff --git a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
deleted file mode 100644
index 6f62ba9e662..00000000000
--- a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
+++ /dev/null
@@ -1,26 +0,0 @@
-@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
-Feature: logic-data-index-ephemeral-rhel8 feature
-
-  Scenario: verify if all labels are correctly set on logic-data-index-ephemeral-rhel8 image
-    Given image is built
-      Then the image should contain label io.openshift.expose-services with value 8080:http
-      And the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-      And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
-      And the image should contain label io.k8s.display-name with value Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
-      And the image should contain label io.openshift.tags with value logic-data-index,kogito,data-index,data-index-ephemeral
-      And the image should contain label com.redhat.component with value openshift-serverless-1-logic-data-index-ephemeral-rhel8-container
-
-  Scenario: verify if of logic-data-index-ephemeral-rhel8 container is correctly started
-    When container is started with env
-      | variable       | value  |
-      | SCRIPT_DEBUG   | true   |
-    Then container log should contain -Djava.library.path=/home/kogito/lib -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 Embedded Postgres started at port
-    And container log should not contain Application failed to start
-
-  Scenario: check if the default quarkus profile is correctly set on data index
-    When container is started with env
-      | variable                           | value               |
-      | SCRIPT_DEBUG                       | true                |
-    Then container log should contain -Dquarkus.profile=http-events-support
-
diff --git a/tests/features/openshift-serverless-logic/logic-swf-builder.feature b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
deleted file mode 100644
index 8d1f847c3ad..00000000000
--- a/tests/features/openshift-serverless-logic/logic-swf-builder.feature
+++ /dev/null
@@ -1,11 +0,0 @@
-@openshift-serverless-1-tech-preview/logic-swf-builder-rhel8
-Feature: logic-swf-builder-rhel8 feature
-
-  Scenario: verify if all labels are correctly set on logic-swf-builder-rhel8 image
-    Given image is built
-      Then the image should contain label io.openshift.expose-services with value 8080:http
-      And the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-      And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
-      And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic Builder image
-      And the image should contain label io.openshift.tags with value logic-swf-builder,kogito,swf-builder
-      And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-builder-rhel8-container
diff --git a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
deleted file mode 100644
index e67a7c51ff1..00000000000
--- a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
+++ /dev/null
@@ -1,11 +0,0 @@
-@openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8
-Feature: logic-swf-devmode-rhel8 feature
-
-  Scenario: verify if all labels are correctly set on logic-swf-devmode-rhel8 image
-    Given image is built
-      Then the image should contain label io.openshift.expose-services with value 8080:http,5005:http
-      And the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-      And the image should contain label io.k8s.description with value Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
-      And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic SWF Devmode
-      And the image should contain label io.openshift.tags with value logic,devmode,kogito,kogito,development,serverless,workflow
-      And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-devmode-rhel8-container
\ No newline at end of file
diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature
deleted file mode 100644
index 68bb639a9ed..00000000000
--- a/tests/features/rhpam-kogito-builder-jvm.feature
+++ /dev/null
@@ -1,108 +0,0 @@
-@rhpam-7/rhpam-kogito-builder-rhel8
-Feature: rhpam-kogito-builder-rhel8 feature.
-
-  Scenario: verify if all labels are correctly set on rhpam-kogito-builder-rhel8 image
-    Given image is built
-    # Then the image should not contain label maintainer TODO add support to this sentence on cekit behave steps
-    Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value RHPAM Platform for building Kogito based on Quarkus or Spring Boot
-    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito builder based on Quarkus or SpringBoot
-    And the image should contain label io.openshift.tags with value rhpam-kogito,builder,kogito,quarkus,springboot
-    And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
-    And the image should contain label com.redhat.component with value rhpam-7-kogito-builder-rhel8-container
-
-  Scenario: verify if prod builder image contains the red hat maven repositories
-    When container is started with command bash
-    Then file /home/kogito/.m2/settings.xml should contain <id>redhat-maven-repositories</id>
-    And file /home/kogito/.m2/settings.xml should contain <activeProfile>redhat-maven-repositories</activeProfile>
-    And file /home/kogito/.m2/settings.xml should contain <id>redhat-ga-repository</id>
-    And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/ga/</url>
-    And file /home/kogito/.m2/settings.xml should contain <id>redhat-ea-repository</id>
-    And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/earlyaccess/all/</url>
-    And file /home/kogito/.m2/settings.xml should contain <id>redhat-techpreview-repository</id>
-    And file /home/kogito/.m2/settings.xml should contain <url>https://maven.repository.redhat.com/techpreview/all</url>
-
-  Scenario: Check if the expected message is printed if native build is enabled
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
-      | variable       | value          |
-      | RUNTIME_TYPE   | quarkus        |
-      | NATIVE         | true           |
-      | KOGITO_VERSION | 999-SNAPSHOT |      
-    Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation.
-
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
-      | variable       | value          |
-      | RUNTIME_TYPE   | quarkus        |
-      | NATIVE         | false          |
-      | KOGITO_VERSION | 999-SNAPSHOT |      
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure for project...
-    And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-    And check that page is served
-      | property        | value                           |
-      | port            | 8080                            |
-      | path            | /q/health/live                  |
-      | wait            | 80                              |
-      | request_method  | GET                             |
-      | content_type    | application/json                |
-      | request_body    | {"status": "UP", "checks": []}  |
-
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
-      | variable            | value          |
-      | RUNTIME_TYPE        | quarkus        |
-      | NATIVE              | false          |
-      | KOGITO_VERSION | 999-SNAPSHOT |           
-      | PROJECT_GROUP_ID    | com.mycompany  |
-      | PROJECT_ARTIFACT_ID | myproject      |
-      | PROJECT_VERSION     | 2.0-SNAPSHOT   |
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure for myproject...
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-
-#### SpringBoot Scenarios
-
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest
-      | variable       | value          |
-      | KOGITO_VERSION | 999-SNAPSHOT |      
-      | RUNTIME_TYPE   | springboot     |
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
-    And s2i build log should contain Generating springboot project structure for project...
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-    And check that page is served
-      | property        | value            |
-      | port            | 8080             |
-      | path            | /actuator/health |
-      | wait            | 80               |
-      | request_method  | GET              |
-      | content_type    | application/json |
-      | request_body    | {"status":"UP"}  |
diff --git a/tests/features/rhpam-kogito-runtime-jvm.feature b/tests/features/rhpam-kogito-runtime-jvm.feature
deleted file mode 100644
index e077dffafaa..00000000000
--- a/tests/features/rhpam-kogito-runtime-jvm.feature
+++ /dev/null
@@ -1,16 +0,0 @@
-@rhpam-7/rhpam-kogito-runtime-jvm-rhel8
-Feature: rhpam-kogito-runtime-jvm feature.
-
-  Scenario: verify if all labels are correctly set on rhpam-kogito-runtime-jvm-rhel8 image
-    Given image is built
-    # Then the image should not contain label maintainer TODO add support to this sentence on cekit behave steps
-    Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value RHPAM Runtime image for Kogito based on Quarkus or Spring Boot JVM image
-    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito runtime based on Quarkus or SpringBoot JVM image
-    And the image should contain label io.openshift.tags with value rhpam-kogito,runtime,kogito,quarkus,springboot,jvm
-    And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
-    And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-jvm-rhel8-container
-
-
diff --git a/tests/features/rhpam-kogito-runtime-native.feature b/tests/features/rhpam-kogito-runtime-native.feature
deleted file mode 100644
index 9e3dc8fd159..00000000000
--- a/tests/features/rhpam-kogito-runtime-native.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-@rhpam-7/rhpam-kogito-runtime-native-rhel8
-Feature: rhpam-kogito-runtime-jvm feature.
-
-  Scenario: verify if all labels are correctly set on rhpam-kogito-runtime-jvm-rhel8 image
-    Given image is built
-    # Then the image should not contain label maintainer TODO add support to this sentence on cekit behave steps
-    Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value RHPAM Runtime image for Kogito based on Quarkus native image
-    And the image should contain label io.k8s.display-name with value Red Hat build of Kogito runtime based on Quarkus native image
-    And the image should contain label io.openshift.tags with value rhpam-kogito,runtime,kogito,quarkus,native
-    And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
-    And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-native-rhel8-container
-
diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature
index d2e73b03ecc..8b32e8ed90c 100644
--- a/tests/features/supporting-services-common.feature
+++ b/tests/features/supporting-services-common.feature
@@ -1,16 +1,8 @@
 @quay.io/kiegroup/kogito-management-console
 @quay.io/kiegroup/kogito-task-console
 @quay.io/kiegroup/kogito-data-index-ephemeral
-@quay.io/kiegroup/kogito-data-index-infinispan
-@quay.io/kiegroup/kogito-data-index-mongodb
-@quay.io/kiegroup/kogito-data-index-oracle
 @quay.io/kiegroup/kogito-data-index-postgresql
-@quay.io/kiegroup/kogito-trusty-infinispan
-@quay.io/kiegroup/kogito-trusty-postgresql
-@quay.io/kiegroup/kogito-trusty-redis
-@quay.io/kiegroup/kogito-trusty-ui
 @quay.io/kiegroup/kogito-jit-runner
-@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
 Feature: kogito supporting services common feature
 
 Scenario: Verify if the application jar exists
diff --git a/tests/features/trusty/kogito-trusty-common.feature b/tests/features/trusty/kogito-trusty-common.feature
deleted file mode 100644
index ac5e551dca2..00000000000
--- a/tests/features/trusty/kogito-trusty-common.feature
+++ /dev/null
@@ -1,10 +0,0 @@
-@quay.io/kiegroup/kogito-trusty-infinispan
-@quay.io/kiegroup/kogito-trusty-redis
-@quay.io/kiegroup/kogito-trusty-postgresql
-Feature: Kogito-trusty common feature.
-  Scenario:   Scenario: Verify if the debug is correctly enabled and test default http port
-    When container is started with args
-      | arg       | value                                                                   |
-      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                   |
-      | env_json  | {"SCRIPT_DEBUG":"true"}  |
-    Then container log should contain -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
deleted file mode 100644
index dbf213ec9ec..00000000000
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ /dev/null
@@ -1,36 +0,0 @@
-@quay.io/kiegroup/kogito-trusty-infinispan
-Feature: Kogito-trusty infinispan feature.
-
-  Scenario: verify if all labels are correctly set on kogito-trusty-infinispan image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Infinispan persistence provider
-    And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Infinispan
-    And the image should contain label io.openshift.tags with value kogito,trusty,trusty-infinispan
-
-  Scenario: Verify if the explainability messaging is disabled
-    When container is started with env
-      | variable      | value |
-      | SCRIPT_DEBUG  | true  |
-      | EXPLAINABILITY_ENABLED     | false  |
-    Then container log should contain -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
-
-  Scenario: verify if auth is correctly set
-    When container is started with env
-      | variable                                  | value             |
-      | SCRIPT_DEBUG                              | true              |
-      | ENABLE_PERSISTENCE                        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_HOSTS           | 172.18.0.1:11222  |
-      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_USERNAME        | IamNotExist       |
-      | QUARKUS_INFINISPAN_CLIENT_PASSWORD        | hard2guess        |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
-      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222
-    Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
-    And container log should not contain Application failed to start
diff --git a/tests/features/trusty/kogito-trusty-postgresql.feature b/tests/features/trusty/kogito-trusty-postgresql.feature
deleted file mode 100644
index a2224fbcd0d..00000000000
--- a/tests/features/trusty/kogito-trusty-postgresql.feature
+++ /dev/null
@@ -1,11 +0,0 @@
-@quay.io/kiegroup/kogito-trusty-postgresql
-Feature: Kogito-trusty postgresql feature.
-
-  Scenario: verify if all labels are correctly set on kogito-trusty-postgresql image
-    Given image is built
-     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-      And the image should contain label io.openshift.expose-services with value 8080:http
-      And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for PostgreSQL persistence provider
-      And the image should contain label io.k8s.display-name with value Kogito Trusty Service - PostgreSQL
-      And the image should contain label io.openshift.tags with value kogito,trusty,trusty-postgresql
-
diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature
deleted file mode 100644
index f39b831e89a..00000000000
--- a/tests/features/trusty/kogito-trusty-redis.feature
+++ /dev/null
@@ -1,18 +0,0 @@
-@quay.io/kiegroup/kogito-trusty-redis
-Feature: Kogito-trusty redis feature.
-
-  Scenario: verify if all labels are correctly set on kogito-trusty-redis image
-    Given image is built
-     Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-      And the image should contain label io.openshift.expose-services with value 8080:http
-      And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Redis persistence provider
-      And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Redis
-      And the image should contain label io.openshift.tags with value kogito,trusty,trusty-redis
-
-  Scenario: verify if all parameters are correctly set
-    When container is started with env
-      | variable                                   | value                       |
-      | SCRIPT_DEBUG                               | true                        |
-      | KOGITO_PERSISTENCE_REDIS_URL               | redis://127.0.0.1:6379      |
-    Then container log should contain KOGITO_PERSISTENCE_REDIS_URL=redis://127.0.0.1:6379
-    And container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/tests/features/trusty/kogito-trusty-ui.feature b/tests/features/trusty/kogito-trusty-ui.feature
deleted file mode 100644
index 1aa3a978cf1..00000000000
--- a/tests/features/trusty/kogito-trusty-ui.feature
+++ /dev/null
@@ -1,30 +0,0 @@
-@quay.io/kiegroup/kogito-trusty-ui
-Feature: kogito-trusty-ui feature
-
-  Scenario: verify if all labels are correctly set on kogito-trusty-ui image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty UI, manage your Business Process easily.
-    And the image should contain label io.k8s.display-name with value Kogito Trusty UI
-    And the image should contain label io.openshift.tags with value kogito,trusty,trusty-ui
-
-  Scenario: Verify if the debug is correctly enabled and test default http port
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then container log should contain -Dkogito.trusty.http.url=http://localhost:8180 -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 Trusty url not set, default will be used: http://localhost:8180
-    And container log should contain started in
-    And container log should not contain Application failed to start
-
-  Scenario: Verify if the debug is correctly enabled and set trusty url
-    When container is started with env
-      | variable                  | value            |
-      | SCRIPT_DEBUG              | true             |
-      | KOGITO_TRUSTY_ENDPOINT    | http://test:9090 |
-    Then container log should contain -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
-    And container log should not contain Trusty url not set, default will be used: http://localhost:8180
-    And container log should contain started in
-    And container log should not contain Application failed to start
-
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 4a9fdfc5397..13e108ae1df 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -25,12 +25,8 @@ IMAGE_NAME="$2"
 KOGITO_EXAMPLES_REPO_NAME='incubator-kie-kogito-examples'
 KOGITO_EXAMPLES_FOLDER_NAME='kogito-examples' # many tests rely on location /tmp/kogito-examples
 
-prod=""
 if [ -n "${IMAGE_NAME}" ]; then
-    if [[ ${IMAGE_NAME} =~ rhpam|logic* ]]; then
-        prod="--prod"
-    fi
-    if python ../../scripts/list-images.py ${prod} -is ${IMAGE_NAME}; then
+    if python ../../scripts/list-images.py -is ${IMAGE_NAME}; then
         echo "Target image is supporting services, skipping examples build"
         exit 0
     fi

From feebea2e272bf62ae5fab8e18c98314b1d1240c3 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 19 Jan 2024 14:40:00 -0300
Subject: [PATCH 660/709] [NO-ISSUE] Remove MongoDB leftovers duo to ASF
 restrictions (#1732)

* Remove MongoDB leftovers duo to ASF restrictions

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Removing composer references on Infinispan and MongoDB

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Remove Inifinispan leftovers

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

---------

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 README.md                                     |  9 ++--
 .../container-compose-infinispan.yaml         | 46 ----------------
 .../container-compose-mongodb.yaml            | 54 -------------------
 .../jobs-service/infinispan/infinispan.xml    | 19 -------
 kogito-jobs-service-allinone-image.yaml       |  6 +--
 .../added/kogito-app-launch.sh                |  2 +-
 .../kogito-jobs-service-all-in-one/configure  | 10 ----
 .../module.yaml                               |  4 --
 scripts/build-kogito-apps-components.sh       |  2 -
 .../kogito-jobs-service-all-in-one.feature    | 36 +------------
 10 files changed, 9 insertions(+), 179 deletions(-)
 delete mode 100644 contrib/jobs-service/container-compose-infinispan.yaml
 delete mode 100644 contrib/jobs-service/container-compose-mongodb.yaml
 delete mode 100644 contrib/jobs-service/infinispan/infinispan.xml

diff --git a/README.md b/README.md
index 9be81e49519..f511a8d4081 100644
--- a/README.md
+++ b/README.md
@@ -615,7 +615,7 @@ Today we have the following Kogito Component Images:
 
 The Data Index Service aims at capturing and indexing data produced by one more Kogito runtime services. 
 For more information please visit this (link)(https://docs.jboss.org/kogito/release/latest/html_single/#proc-kogito-travel-agency-enable-data-index_kogito-deploying-on-openshift). 
-The Data Index Service depends on a running Infinispan, MongoDB or PostgreSQL.
+The Data Index Service depends on a PostgreSQL instance.
 The Persistence service can be switched by using its corresponding image
 
 - Ephemeral PostgreSQL: quay.io/kiegroup/kogito-data-index-ephemeral
@@ -639,7 +639,7 @@ $ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:
 To enable debug just use this env while running this image:
 
 ```bash
-$ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-postgresql:latest
+$ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-data-index-postgresql:latest
 ```
 You should notice a few debug messages present in the system output.
 
@@ -675,16 +675,13 @@ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-post
 You should notice a few debug messages being printed in the system output.
 
 The ephemeral image does not have external dependencies like a backend persistence provider, it uses in-memory persistence
-while working with Jobs Services `allinone`, `infinispan`, `mongodb` and `postgresql` variants, it will need to 
-have an Infinispan, MongoDB or PostgreSQL server, respectively, previously running.
+while working with Jobs Services `postgresql` variant, it will need to have a PostgreSQL server previously running.
 
 #### Jobs Services All-in-one 
 
 The Jobs Services All in One image provides the option to run any supported variant that we have at disposal, which are:
 
 - PostgreSQL
-- Infinispan
-- MongoDB
 - Ephemeral (default if no variant is specified)
 
 There are 3 exposed environment variables that can be used to configure the behaviour, which are:
diff --git a/contrib/jobs-service/container-compose-infinispan.yaml b/contrib/jobs-service/container-compose-infinispan.yaml
deleted file mode 100644
index 0ecfb2b3109..00000000000
--- a/contrib/jobs-service/container-compose-infinispan.yaml
+++ /dev/null
@@ -1,46 +0,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.
-#
-services:
-  infinispan:
-    image: infinispan/server:14.0.4.Final
-    container_name: infinispan
-    ports:
-      - "11222:11222"
-    command: "-c infinispan-demo.xml"
-    volumes:
-      - ./infinispan/infinispan.xml:/opt/infinispan/server/conf/infinispan-demo.xml
-    healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:11222/rest/v2/cache-managers/default/health/status" ]
-      interval: 1s
-      timeout: 1s
-      retries: 50
-
-  jobs-service-all-in-one:
-    image: quay.io/kiegroup/kogito-jobs-service-allinone:latest
-    container_name: jobs-service
-    ports:
-      - "8080:8080"
-    depends_on:
-      infinispan:
-        condition: service_healthy
-    environment:
-      JOBS_SERVICE_PERSISTENCE: infinispan
-      KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false"
-      QUARKUS_INFINISPAN_CLIENT_HOSTS: infinispan:11222
-      QUARKUS_INFINISPAN_CLIENT_USE_AUTH: "false"
\ No newline at end of file
diff --git a/contrib/jobs-service/container-compose-mongodb.yaml b/contrib/jobs-service/container-compose-mongodb.yaml
deleted file mode 100644
index 531d425547a..00000000000
--- a/contrib/jobs-service/container-compose-mongodb.yaml
+++ /dev/null
@@ -1,54 +0,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.
-#
-services:
-  mongo:
-    image: mongo
-    container_name: mongo
-    restart: always
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: example
-
-  mongo-express:
-    image: mongo-express
-    container_name: mongo-express
-    restart: always
-    ports:
-      - 8081:8081
-    environment:
-      ME_CONFIG_MONGODB_ADMINUSERNAME: root
-      ME_CONFIG_MONGODB_ADMINPASSWORD: example
-      ME_CONFIG_MONGODB_URL: mongodb://root:example@mongo:27017/
-
-  jobs-service-all-in-one:
-    image: quay.io/kiegroup/kogito-jobs-service-allinone:latest
-    container_name: jobs-service
-    ports:
-      - "8080:8080"
-    depends_on:
-      - mongo
-    environment:
-      JOBS_SERVICE_PERSISTENCE: mongodb
-      QUARKUS_MONGODB_CONNECTION_STRING: mongodb://mongo:27017
-      QUARKUS_MONGODB_DATABASE: kogito
-      MONGODB_HOST: mongodb:27017
-      QUARKUS_MONGODB_CREDENTIALS_USERNAME: root
-      QUARKUS_MONGODB_CREDENTIALS_PASSWORD: example
-      QUARKUS_MONGODB_CREDENTIALS_AUTH_SOURCE: admin
-      KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false"
\ No newline at end of file
diff --git a/contrib/jobs-service/infinispan/infinispan.xml b/contrib/jobs-service/infinispan/infinispan.xml
deleted file mode 100644
index 726675509af..00000000000
--- a/contrib/jobs-service/infinispan/infinispan.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<infinispan>
-  <cache-container name="default"/>
-  <server>
-    <interfaces>
-      <interface name='public'>
-        <inet-address value='${infinispan.bind.address:0.0.0.0}'/>
-      </interface>
-    </interfaces>
-    <socket-bindings default-interface='public' port-offset='0'>
-      <socket-binding name='default' port='11222'/>
-    </socket-bindings>
-    <endpoints>
-      <endpoint socket-binding='default'>
-        <hotrod-connector name="hotrod"/>
-        <rest-connector name="rest"/>
-      </endpoint>
-    </endpoints>
-  </server>
-</infinispan>
\ No newline at end of file
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index 6765bdaae90..0db23c68060 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -33,7 +33,7 @@ labels:
   - name: "io.k8s.display-name"
     value: "Kogito Jobs Service All-in-One"
   - name: "io.openshift.tags"
-    value: "kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral"
+    value: "kogito,jobs-service,postgresql,ephemeral"
   - name: "io.openshift.expose-services"
     value: "8080:http"
 
@@ -45,8 +45,8 @@ envs:
     example: "true"
     description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
   - name: "JOBS_SERVICE_PERSISTENCE"
-    example: "mongodb"
-    description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral, postgresql, mongodb and infinispan, if empty, defaults to ephemeral"
+    example: "postgresql"
+    description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral and postgresql, if empty, defaults to ephemeral"
 
 packages:
   manager: microdnf
diff --git a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
index 750845d0f13..43fc15e1c50 100644
--- a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
+++ b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
@@ -30,7 +30,7 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     printenv
 fi
 
-allowed_jobs_service_flavors=("ephemeral" "mongodb" "infinispan" "postgresql")
+allowed_jobs_service_flavors=("ephemeral" "postgresql")
 jobs_service_flavor="ephemeral"
 if [[ ! "${allowed_jobs_service_flavors[*]}" =~ ${JOBS_SERVICE_PERSISTENCE,,} ]]; then
   log_warning "${JOBS_SERVICE_PERSISTENCE,,} is not supported, the allowed flavors are [${allowed_jobs_service_flavors[*]}], defaulting to ${jobs_service_flavor}"
diff --git a/modules/kogito-jobs-service-all-in-one/configure b/modules/kogito-jobs-service-all-in-one/configure
index d77d57dcc65..6777f480645 100644
--- a/modules/kogito-jobs-service-all-in-one/configure
+++ b/modules/kogito-jobs-service-all-in-one/configure
@@ -24,8 +24,6 @@ SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
 unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ephemeral
-unzip "${SOURCES_DIR}"/jobs-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/infinispan
-unzip "${SOURCES_DIR}"/jobs-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/mongodb
 unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/postgresql
 
 
@@ -35,14 +33,6 @@ mv "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-
 rm -rf "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib
 ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib
 
-cp -r "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
-rm -rf "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib
-ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib
-
-cp -r "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
-rm -rf "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib
-ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib
-
 cp -r "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
 rm -rf "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib
 ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib
diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml
index 0886aa3ff9f..aa890d32635 100644
--- a/modules/kogito-jobs-service-all-in-one/module.yaml
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -23,10 +23,6 @@ version: "999-SNAPSHOT"
 artifacts:
   - path: /tmp/build/jobs-service-inmemory-all-in-one/jobs-service-inmemory-quarkus-app.zip
     name: jobs-service-inmemory-quarkus-app.zip
-  - path: /tmp/build/jobs-service-mongodb-all-in-one/jobs-service-mongodb-quarkus-app.zip
-    name: jobs-service-mongodb-quarkus-app.zip
-  - path: /tmp/build/jobs-service-infinispan-all-in-one/jobs-service-infinispan-quarkus-app.zip
-    name: jobs-service-infinispan-quarkus-app.zip
   - path: /tmp/build/jobs-service-postgresql-all-in-one/jobs-service-postgresql-quarkus-app.zip
     name: jobs-service-postgresql-quarkus-app.zip
 
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 24f7187dab5..ddaada7d88d 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -72,9 +72,7 @@ case ${imageName} in
     "kogito-jobs-service-allinone")
         extended_context="-all-in-one"
         contextDir="jobs-service/jobs-service-inmemory"
-        contextDir="${contextDir} jobs-service/jobs-service-infinispan"
         contextDir="${contextDir} jobs-service/jobs-service-postgresql"
-        contextDir="${contextDir} jobs-service/jobs-service-mongodb"
         ;;
     "kogito-jit-runner")
         contextDir="jitexecutor/jitexecutor-runner"
diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
index 636c458fbea..39541519072 100644
--- a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
@@ -7,14 +7,12 @@ Feature: Kogito-jobs-service-all-in-one feature.
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service with all available jdbc providers
     And the image should contain label io.k8s.display-name with value Kogito Jobs Service All-in-One
-    And the image should contain label io.openshift.tags with value kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral
+    And the image should contain label io.openshift.tags with value kogito,jobs-service,postgresql,ephemeral
 
   Scenario: Verify if all jobs-service flavors are in the image
     When container is started with command bash
     Then file /home/kogito/bin/ephemeral/quarkus-app/quarkus-run.jar should exist
-    And file /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar should exist
     And file /home/kogito/bin/postgresql/quarkus-app/quarkus-run.jar should exist
-    And file /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar should exist
 
   Scenario: Verify if the debug is correctly enabled with the ephemeral jar
     When container is started with env
@@ -24,43 +22,13 @@ Feature: Kogito-jobs-service-all-in-one feature.
     And container log should contain started in
     And container log should not contain Application failed to start
 
-  Scenario: Infinispan - verify if auth is correctly set
-    When container is started with env
-      | variable                                  | value             |
-      | SCRIPT_DEBUG                              | true              |
-      | JOBS_SERVICE_PERSISTENCE                  | infinispan        |
-      | QUARKUS_INFINISPAN_CLIENT_HOSTS           | 172.18.0.1:11222  |
-      | QUARKUS_INFINISPAN_CLIENT_USE_AUTH        | true              |
-      | QUARKUS_INFINISPAN_CLIENT_USERNAME        | IamNotExist       |
-      | QUARKUS_INFINISPAN_CLIENT_PASSWORD        | hard2guess        |
-      | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM      | SecretRealm       |
-      | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM  | COOLGSSAPI        |
-    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal
-    And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI
-    And container log should not contain Application failed to start
-
-  Scenario: verify if the container is correctly started with mongo parameters
-    When container is started with env
-      | variable                          | value                                          |
-      | SCRIPT_DEBUG                      | true                                           |
-      | JOBS_SERVICE_PERSISTENCE          | mongodb                                        |
-      | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://user:password@localhost:27017/admin  |
-      | QUARKUS_MONGODB_DATABASE          | kogito                                         |
-    Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar
-    And container log should not contain Application failed to start
-
   Scenario: verify if the container is started with invalid jobs-service flavor
     When container is started with env
       | variable                          | value      |
       | SCRIPT_DEBUG                      | true       |
       | JOBS_SERVICE_PERSISTENCE          | something  |
     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
-    And container log should contain something is not supported, the allowed flavors are [ephemeral mongodb infinispan postgresql], defaulting to ephemeral
+    And container log should contain something is not supported, the allowed flavors are [ephemeral postgresql], defaulting to ephemeral
 
   Scenario: verify if container starts as expected
     When container is started with env

From e8c7b7b45548634d7500b572e95251bea1cf26c6 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Mon, 22 Jan 2024 08:25:23 +0100
Subject: [PATCH 661/709] NO-ISSUE: drop scripts/logic folder as it is
 deprecated (#1733)

---
 scripts/logic/build-quarkus-app.sh        | 213 ----------------------
 scripts/logic/builder-maven-repo/pom.xml  |  40 ----
 scripts/logic/builder-quarkus-app/pom.xml |  40 ----
 scripts/logic/devmode-maven-repo/pom.xml  |  40 ----
 scripts/logic/devmode-quarkus-app/pom.xml |  40 ----
 scripts/logic/pom.xml                     |  85 ---------
 scripts/logic/test/behave_test.sh         |  28 ---
 scripts/logic/test/env_test.sh            |  34 ----
 scripts/logic/test/shell_test.sh          |  28 ---
 9 files changed, 548 deletions(-)
 delete mode 100755 scripts/logic/build-quarkus-app.sh
 delete mode 100644 scripts/logic/builder-maven-repo/pom.xml
 delete mode 100644 scripts/logic/builder-quarkus-app/pom.xml
 delete mode 100644 scripts/logic/devmode-maven-repo/pom.xml
 delete mode 100644 scripts/logic/devmode-quarkus-app/pom.xml
 delete mode 100644 scripts/logic/pom.xml
 delete mode 100755 scripts/logic/test/behave_test.sh
 delete mode 100755 scripts/logic/test/env_test.sh
 delete mode 100755 scripts/logic/test/shell_test.sh

diff --git a/scripts/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh
deleted file mode 100755
index 93fb0a440c7..00000000000
--- a/scripts/logic/build-quarkus-app.sh
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-# Parameters:
-#   1 - Image name
-#   2 - Quarkus platform group id
-#   3 - Quarkus platform version
-#   4 - Kogito version
-# Note that all parameters are required and can't be empty
-
-# fast fail
-set -e
-set -o pipefail
-
-# Read entries before sourcing
-image_name="${1}"
-quarkus_platform_groupid="${2}"
-quarkus_platform_version="${3}"
-kogito_version="${KOGITO_VERSION:-${4}}"
-
-# GAV of maven plugins to be injected in the plugin management section
-maven_plugins_gav=("org.apache.maven.plugins:maven-resources-plugin:3.3.1" "org.apache.maven.plugins:maven-install-plugin:3.1.1" "org.apache.maven.plugins:maven-jar-plugin:3.3.0" "org.apache.maven.plugins:maven-clean-plugin:3.3.1")
-
-# Properties to be replaced in the pom by the new versions
-properties_with_versions=("compiler-plugin.version:3.11.0" "surefire-plugin.version:3.1.2")
-
-# arch specific dependencies
-quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch64:1.8.0"
-# common extensions used by the kogito-swf-builder and kogito-swf-devmode
-quarkus_extensions="quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${kogito_version},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${kogito_version},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version},org.kie.kogito:kogito-addons-quarkus-knative-serving:${kogito_version}"
-# dev mode purpose extensions used only by the kogito-swf-devmode
-kogito_swf_devmode_extensions="org.kie.kogito:kogito-quarkus-serverless-workflow-devui:${kogito_version},org.kie.kogito:kogito-addons-quarkus-source-files:${kogito_version},org.kie.kogito:kogito-addons-quarkus-process-management:${kogito_version},org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}"
-# builder/prod extensitons used only by the kogito-swf-builder
-kogito_swf_builder_extensions="org.kie.kogito:kogito-addons-quarkus-events-process:${kogito_version},org.kie.kogito:kogito-addons-quarkus-process-management:${kogito_version},org.kie.kogito:kogito-addons-quarkus-source-files:${kogito_version}"
-
-if [ -z ${quarkus_platform_version} ]; then
-    echo "Please provide the quarkus version"
-    exit 1
-fi
-
-case ${image_name} in
-    "kogito-swf-builder")
-        quarkus_extensions="${quarkus_extensions},${kogito_swf_builder_extensions},${quarkus_extensions_arch_specific}"
-        ;;
-    "kogito-swf-devmode")
-        quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions},${quarkus_extensions_arch_specific}"
-        ;;
-    *)
-        echo "${image_name} is not a quarkus app image, exiting..."
-        exit 0
-        ;;
-esac
-
-
-target_tmp_dir="/tmp/build/${image_name}"
-build_target_dir="/tmp/${image_name}"
-mvn_local_repo="/tmp/temp_maven/${image_name}"
-
-rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir}
-rm -rf ${build_target_dir} && mkdir -p ${build_target_dir}
-if [ "${CI}" = "true" ]; then
-    # On CI we want to make sure we remove all artifacts from maven repo
-    rm -rf ${mvn_local_repo}
-fi
-mkdir -p ${mvn_local_repo}
-
-if [ "${NIGHTLY}" = "true" ]; then
-    # In case of a nightly, the Kogito/Drools artifacts are not deployed anywhere, so they need to be copied
-    # inside the maven repo local folder
-    cp -rp ${NIGHTLY_DEPLOY_FOLDER}/* ${mvn_local_repo}
-fi
-
-set -x
-echo "Create quarkus project to path ${build_target_dir}"
-cd ${build_target_dir}
-mvn ${MAVEN_OPTIONS} \
-    -Dmaven.repo.local=${mvn_local_repo} \
-    -DprojectGroupId="org.acme" \
-    -DprojectArtifactId="serverless-workflow-project" \
-    -DprojectVersionId="1.0.0-SNAPSHOT" \
-    -DplatformVersion="${quarkus_platform_version}" \
-    -Dextensions="${quarkus_extensions}" \
-    "${quarkus_platform_groupid}":quarkus-maven-plugin:"${quarkus_platform_version}":create
-
-# Fix as we cannot rely on Quarkus platform
-# Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented
-if [ ! -z ${kogito_version} ]; then
-    echo "Replacing Kogito Platform BOM with version ${kogito_version}"
-    # [ ]* -> is a regexp pattern to match any number of spaces
-    pattern_1="[ ]*<groupId>.*<\/groupId>"
-    pattern_2="[ ]*<artifactId>quarkus-kogito-bom<\/artifactId>\n"
-    pattern_3="[ ]*<version>.*<\/version>\n"
-    complete_pattern="$pattern_1\n$pattern_2$pattern_3"
-
-    replace_1="        <groupId>org.kie.kogito<\/groupId>\n"
-    replace_2="        <artifactId>kogito-bom<\/artifactId>\n"
-    replace_3="        <version>${kogito_version}<\/version>\n"
-    complete_replace="$replace_1$replace_2$replace_3"
-
-    sed -i.bak -e "/$pattern_1/{
-        N;N;N
-        s/$complete_pattern/$complete_replace/
-        }" serverless-workflow-project/pom.xml
-fi
-
-
-# Inject empty plugin management section if not present in the pom.xml
-if ! grep -q "<pluginManagement>" "serverless-workflow-project/pom.xml"; then
-    echo "Injecting empty plugin Management section as it does not exist in pom"
-    pattern_1="[ ]*<build>"
-    complete_pattern="$pattern_1"
-
-    replace_1="  <\build>\n"
-    replace_2="    <pluginManagement>\n"
-    replace_3="      <plugins>\n"
-    replace_4="      <\/plugins>\n"
-    replace_5="    <\/pluginManagement>"
-    complete_replace="$replace_1$replace_2$replace_3$replace_4$replace_5"
-
-    sed -i.bak -e "/$pattern_1/{
-        N;N;N
-        s/$complete_pattern/$complete_replace/
-        }" serverless-workflow-project/pom.xml
-fi
-
-# Inject maven plugins into plugin management section
-for gav in ${maven_plugins_gav[@]}; do
-    group_id=$(echo $gav | cut -f1 -d:)
-    artifact_id=$(echo $gav | cut -f2 -d:)
-    version=$(echo $gav | cut -f3 -d:)
-
-    echo "Injecting ${gav} in plugin management section"
-    pattern_1="[ ]*<pluginManagement>"
-    pattern_2="[ ]*<plugins>"
-    complete_pattern="$pattern_1\n$pattern_2"
-
-    replace_1="    <pluginManagement>\n"
-    replace_2="      <plugins>\n"
-    replace_3="        <plugin>\n"
-    replace_4="          <groupId>${group_id}<\/groupId>\n"
-    replace_5="          <artifactId>${artifact_id}<\/artifactId>\n"
-    replace_6="          <version>${version}<\/version>\n"
-    replace_7="        <\/plugin>"
-    complete_replace="$replace_1$replace_2$replace_3$replace_4$replace_5$replace_6$replace_7"
-
-    sed -i.bak -e "/$pattern_1/{
-        N;N;N
-        s/$complete_pattern/$complete_replace/
-        }" serverless-workflow-project/pom.xml
-done
-
-# Replace properties values by new values
-for property_with_version in ${properties_with_versions[@]}; do
-    property=$(echo $property_with_version | cut -f1 -d:)
-    new_version=$(echo $property_with_version | cut -f2 -d:)
-
-    echo "Replacing property ${property} with value ${new_version}"
-    complete_pattern="[ ]*<${property}>.*<\/${property}>"
-    complete_replace="    <${property}>${new_version}<\/${property}>"
-    sed -i.bak "s/$complete_pattern/$complete_replace/g" serverless-workflow-project/pom.xml
-done
-
-echo "Build quarkus app"
-cd "serverless-workflow-project"
-# Quarkus version is enforced if some dependency pulled has older version of Quarkus set.
-# This avoids to have, for example, Quarkus BOMs or other artifacts with multiple versions.
-mvn ${MAVEN_OPTIONS} \
-    -DskipTests \
-    -Dmaven.repo.local=${mvn_local_repo} \
-    -Dquarkus.container-image.build=false \
-    clean install
-
-cd ${build_target_dir}
-
-#remove unnecessary files
-rm -rfv serverless-workflow-project/target
-rm -rfv serverless-workflow-project/src/main/resources/*
-rm -rfv serverless-workflow-project/src/main/docker
-rm -rfv serverless-workflow-project/.mvn/wrapper
-rm -rfv serverless-workflow-project/mvnw*
-rm -rfv serverless-workflow-project/src/test
-rm -rfv serverless-workflow-project/*.bak
-
-# Maven useless files
-# Needed to avoid Maven to automatically re-download from original Maven repository ...
-find ${mvn_local_repo} -name _remote.repositories -type f -delete
-find ${mvn_local_repo} -name _maven.repositories -type f -delete
-find ${mvn_local_repo} -name *.lastUpdated -type f -delete
-
-echo "Zip and copy scaffold project"
-zip -r ${image_name}-quarkus-app.zip serverless-workflow-project/
-cp -v ${image_name}-quarkus-app.zip ${target_tmp_dir}/
-echo "Zip and copy maven repo"
-cd ${mvn_local_repo}
-zip -r ${image_name}-maven-repo.zip *
-cp -v ${image_name}-maven-repo.zip ${target_tmp_dir}/
\ No newline at end of file
diff --git a/scripts/logic/builder-maven-repo/pom.xml b/scripts/logic/builder-maven-repo/pom.xml
deleted file mode 100644
index 6f3297af4f4..00000000000
--- a/scripts/logic/builder-maven-repo/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-image-build-artifacts-parent</artifactId>
-        <version>999-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>kogito-builder-maven-repository</artifactId>
-    <name>Kogito Builder Quarkus App - Maven repository zip</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>/tmp/build/${build.quarkusapp.argument.imagename.builder}/${build.quarkusapp.argument.imagename.builder}-maven-repo.zip</file>
-                                    <type>zip</type>
-                                    <classifier>image-build</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/scripts/logic/builder-quarkus-app/pom.xml b/scripts/logic/builder-quarkus-app/pom.xml
deleted file mode 100644
index 20158d3c594..00000000000
--- a/scripts/logic/builder-quarkus-app/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-image-build-artifacts-parent</artifactId>
-        <version>999-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>kogito-builder-quarkus-app</artifactId>
-    <name>Kogito Builder Quarkus App - Quarkus app zip</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>/tmp/build/${build.quarkusapp.argument.imagename.builder}/${build.quarkusapp.argument.imagename.builder}-quarkus-app.zip</file>
-                                    <type>zip</type>
-                                    <classifier>image-build</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/scripts/logic/devmode-maven-repo/pom.xml b/scripts/logic/devmode-maven-repo/pom.xml
deleted file mode 100644
index 287e8d24b0b..00000000000
--- a/scripts/logic/devmode-maven-repo/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-image-build-artifacts-parent</artifactId>
-        <version>999-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>kogito-devmode-maven-repository</artifactId>
-    <name>Kogito Dev Mode Quarkus App - Maven repository zip</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>/tmp/build/${build.quarkusapp.argument.imagename.devmode}/${build.quarkusapp.argument.imagename.devmode}-maven-repo.zip</file>
-                                    <type>zip</type>
-                                    <classifier>image-build</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/scripts/logic/devmode-quarkus-app/pom.xml b/scripts/logic/devmode-quarkus-app/pom.xml
deleted file mode 100644
index 098ccfc026f..00000000000
--- a/scripts/logic/devmode-quarkus-app/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-image-build-artifacts-parent</artifactId>
-        <version>999-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>kogito-devmode-quarkus-app</artifactId>
-    <name>Kogito Dev Mode Quarkus App - Quarkus app zip</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>/tmp/build/${build.quarkusapp.argument.imagename.devmode}/${build.quarkusapp.argument.imagename.devmode}-quarkus-app.zip</file>
-                                    <type>zip</type>
-                                    <classifier>image-build</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/scripts/logic/pom.xml b/scripts/logic/pom.xml
deleted file mode 100644
index 0588d4c6069..00000000000
--- a/scripts/logic/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-image-build-artifacts-parent</artifactId>
-    <version>999-SNAPSHOT</version>
-
-    <name>Kogito image build artifacts</name>
-    <description>Maven project to build a Quarkus App with Kogito Serverless Worflow</description>
-    <packaging>pom</packaging>
-
-    <url>http://kogito.kie.org</url>
-    <inceptionYear>2019</inceptionYear>
-    <organization>
-        <name>JBoss by Red Hat</name>
-        <url>http://www.jboss.org/</url>
-    </organization>
-
-    <licenses>
-        <license>
-            <name>Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <properties>
-        <build.quarkusapp.argument.imagename.devmode>kogito-swf-devmode</build.quarkusapp.argument.imagename.devmode>
-        <build.quarkusapp.argument.imagename.builder>kogito-swf-builder</build.quarkusapp.argument.imagename.builder>
-        <build.quarkusapp.argument.quarkusplatform.groupid>io.quarkus.platform</build.quarkusapp.argument.quarkusplatform.groupid>
-        <build.quarkusapp.argument.quarkusplatform.version>2.16.7.Final</build.quarkusapp.argument.quarkusplatform.version>
-        <build.quarkusapp.argument.kogitoversion>1.40.0.Final</build.quarkusapp.argument.kogitoversion>
-    </properties>
-
-    <modules>
-        <module>devmode-quarkus-app</module>
-        <module>devmode-maven-repo</module>
-        <module>builder-quarkus-app</module>
-        <module>builder-maven-repo</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>devmode-quarkus-app</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>${project.basedir}/build-quarkus-app.sh</executable>
-                            <arguments>
-                                <argument>${build.quarkusapp.argument.imagename.devmode}</argument>
-                                <argument>${build.quarkusapp.argument.quarkusplatform.groupid}</argument>
-                                <argument>${build.quarkusapp.argument.quarkusplatform.version}</argument>
-                                <argument>${build.quarkusapp.argument.kogitoversion}</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>builder-quarkus-app</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>${project.basedir}/build-quarkus-app.sh</executable>
-                            <arguments>
-                                <argument>${build.quarkusapp.argument.imagename.builder}</argument>
-                                <argument>${build.quarkusapp.argument.quarkusplatform.groupid}</argument>
-                                <argument>${build.quarkusapp.argument.quarkusplatform.version}</argument>
-                                <argument>${build.quarkusapp.argument.kogitoversion}</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/scripts/logic/test/behave_test.sh b/scripts/logic/test/behave_test.sh
deleted file mode 100755
index f4eec48b8bc..00000000000
--- a/scripts/logic/test/behave_test.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
-source ${script_dir_path}/env_test.sh $@
-
-echo "---- Pulling image ${image_full_tag} ----"
-docker pull ${image_full_tag}
-
-echo "---- Run behave test for image ${image_id} ----"
-cekit --descriptor ${image_descriptor_filename} test --image ${image_full_tag} behave
diff --git a/scripts/logic/test/env_test.sh b/scripts/logic/test/env_test.sh
deleted file mode 100755
index a830d1d0058..00000000000
--- a/scripts/logic/test/env_test.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-export image_id=$1
-export image_full_tag=$2
-
-export image_full_name=${image_full_tag%%:*}
-export image_full_name=${image_full_name%%@sha256*} # Remove `@sha256` if needed
-export image_registry_name=${image_full_name%/*}
-export image_name=${image_full_name##*/}
-export image_registry=${image_registry_name%/*}
-export image_namespace=${image_registry_name##*/}
-
-export image_descriptor_filename=${image_id}-image.yaml
-
-export community_image_id=${image_id/logic-/kogito-}
-export community_image_id=${community_image_id/-rhel8/}
diff --git a/scripts/logic/test/shell_test.sh b/scripts/logic/test/shell_test.sh
deleted file mode 100755
index dff8a2839b2..00000000000
--- a/scripts/logic/test/shell_test.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
-source ${script_dir_path}/env_test.sh $@
-
-echo "---- Pulling image ${image_full_tag} ----"
-docker pull ${image_full_tag}
-
-echo "---- Run jBang test for image ${image_id} ----"
-tests/shell/run.sh ${community_image_id} ${image_full_tag}

From bed894802de58a0e1098cb0a730e0791cf0a325d Mon Sep 17 00:00:00 2001
From: Walter Medvedeo <wmedvedeo@gmail.com>
Date: Mon, 22 Jan 2024 15:15:19 +0100
Subject: [PATCH 662/709] kie-kogito-images-1735: Add the
 kogito-addons-quarkus-jobs-knative-eventing addon to the swf-builder images
 (#1736)

---
 modules/kogito-swf/builder/build-config/module.yaml | 2 +-
 tests/shell/kogito-swf-builder/src/RunTests.java    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index 79fac6fe481..b3563932cd3 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -27,4 +27,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION}
+    value: quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:${KOGITO_VERSION}
diff --git a/tests/shell/kogito-swf-builder/src/RunTests.java b/tests/shell/kogito-swf-builder/src/RunTests.java
index 3cccdd70285..2ec43afadc8 100644
--- a/tests/shell/kogito-swf-builder/src/RunTests.java
+++ b/tests/shell/kogito-swf-builder/src/RunTests.java
@@ -65,6 +65,7 @@ public class RunTests {
                                         .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet", "Dockerfile"))
                                         .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
                         .withExposedPorts(8080)
+                        .withEnv("KOGITO_SERVICE_URL", "http://localhost:8080")
                         .waitingFor(Wait.forHttp("/jsongreet"))
                         .withLogConsumer(logConsumer);
 
@@ -93,6 +94,7 @@ public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOExc
                                                         "resources/greet-with-inputschema", "Dockerfile"))
                                         .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
                         .withExposedPorts(8080)
+                        .withEnv("KOGITO_SERVICE_URL", "http://localhost:8080")
                         .waitingFor(Wait.forHttp("/greeting"))
                         .withLogConsumer(logConsumer);
 

From 4eb5fdd6b47a5edd4c5bdc1be714a0554fb3db5a Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Tue, 23 Jan 2024 18:28:24 +0100
Subject: [PATCH 663/709] NO-ISSUE: remove deprecated prod modules (#1737)

---
 .../prod/added/kogito-app-launch.sh           | 50 -------------------
 .../prod/configure                            | 31 ------------
 .../prod/module.yaml                          | 34 -------------
 .../builder/runtime/osl/configure.sh          | 32 ------------
 .../builder/runtime/osl/module.yaml           | 33 ------------
 .../devmode/runtime/osl/configure.sh          | 31 ------------
 .../devmode/runtime/osl/module.yaml           | 50 -------------------
 7 files changed, 261 deletions(-)
 delete mode 100644 modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-data-index-ephemeral/prod/configure
 delete mode 100644 modules/kogito-data-index-ephemeral/prod/module.yaml
 delete mode 100644 modules/kogito-swf/builder/runtime/osl/configure.sh
 delete mode 100644 modules/kogito-swf/builder/runtime/osl/module.yaml
 delete mode 100644 modules/kogito-swf/devmode/runtime/osl/configure.sh
 delete mode 100644 modules/kogito-swf/devmode/runtime/osl/module.yaml

diff --git a/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
deleted file mode 100644
index aa15cda2106..00000000000
--- a/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-    printenv
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-    "${KOGITO_HOME}"/launch/kogito-data-index-common.sh
-    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Djava.library.path="${KOGITO_HOME}"/lib \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
-
diff --git a/modules/kogito-data-index-ephemeral/prod/configure b/modules/kogito-data-index-ephemeral/prod/configure
deleted file mode 100644
index d24e68683d6..00000000000
--- a/modules/kogito-data-index-ephemeral/prod/configure
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-mkdir -p "${KOGITO_HOME}"/bin/quarkus-app
-unzip "${SOURCES_DIR}"/data-index-service-inmemory-image-build.zip -d "${KOGITO_HOME}"/bin/quarkus-app/
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml
deleted file mode 100644
index f0c0a8ddc97..00000000000
--- a/modules/kogito-data-index-ephemeral/prod/module.yaml
+++ /dev/null
@@ -1,34 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.dataindex.prod.ephemeral
-version: "1.30.0"
-
-artifacts:
-  # data-index-service-inmemory-1.24.0.Final-redhat-00011-image-build.zip
-- name: data-index-service-inmemory-image-build.zip
-  md5: 439ecd6255b9c204e3808e5a35a58463
-
-execute:
-  - script: configure
-
-packages:
-  install:
-    - pam
-
diff --git a/modules/kogito-swf/builder/runtime/osl/configure.sh b/modules/kogito-swf/builder/runtime/osl/configure.sh
deleted file mode 100644
index 70c258fa61a..00000000000
--- a/modules/kogito-swf/builder/runtime/osl/configure.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-
-mkdir -p "${KOGITO_HOME}"/.m2/repository
-
-# Unzip Quarkus app and Maven repository
-unzip "${SOURCES_DIR}"/kogito-builder-quarkus-app-image-build.zip -d "${KOGITO_HOME}"
-unzip "${SOURCES_DIR}"/kogito-builder-maven-repository-image-build.zip -d "${KOGITO_HOME}"/.m2/repository
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/builder/runtime/osl/module.yaml b/modules/kogito-swf/builder/runtime/osl/module.yaml
deleted file mode 100644
index b126715ce3f..00000000000
--- a/modules/kogito-swf/builder/runtime/osl/module.yaml
+++ /dev/null
@@ -1,33 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.swf.builder.runtime.osl
-version: "1.30.0"
-description: "OpenShift Serverless Logic builder module with required extensions"
-
-artifacts:
-  - name: kogito-builder-quarkus-app-image-build.zip
-    # kogito-builder-quarkus-app-1.38.0.Final-redhat-00002-image-build.zip
-    md5: e55ce232900dc6ea089813eb8ffe8d93
-  - name: kogito-builder-maven-repository-image-build.zip
-    # kogito-builder-maven-repository-1.38.0.Final-redhat-00002-image-build.zip
-    md5: 1489b401aa0356ac79fd3aa0e62bacf3
-
-execute:
-  - script: configure.sh
diff --git a/modules/kogito-swf/devmode/runtime/osl/configure.sh b/modules/kogito-swf/devmode/runtime/osl/configure.sh
deleted file mode 100644
index a72caf961b7..00000000000
--- a/modules/kogito-swf/devmode/runtime/osl/configure.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SOURCES_DIR=/tmp/artifacts
-
-# Unzip Quarkus app and Maven repository
-unzip "${SOURCES_DIR}"/kogito-devmode-quarkus-app-image-build.zip -d "${KOGITO_HOME}"
-unzip "${SOURCES_DIR}"/kogito-devmode-maven-repository-image-build.zip -d "${KOGITO_HOME}"/.m2/repository
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/runtime/osl/module.yaml b/modules/kogito-swf/devmode/runtime/osl/module.yaml
deleted file mode 100644
index 6da3562f731..00000000000
--- a/modules/kogito-swf/devmode/runtime/osl/module.yaml
+++ /dev/null
@@ -1,50 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.swf.devmode.runtime.osl
-version: "1.30.0"
-description: "OpenShift Serverless Logic devmode with required extensions"
-
-envs:
-  - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
-    description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
-    value: "false"
-  - name: QUARKUS_DEVSERVICES_ENABLED
-    description: Whether to enable Quarkus Devservices or not. Default to "false" since the Kafka broker needs Docker.
-    value: "false"
-  - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
-    description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
-    value: "false"
-  - name: QUARKUS_CONTINUOUS_TESTING
-    description: Whether to enable Quarkus continous testing on DevMode or not. Default to "disabled".
-    value: "disabled"
-  - name: KOGITO_CODEGEN_PROCESS_FAILONERROR
-    description: Boolean flag that will prevent Dev Mode to crash if the provided workflow is wrong.
-    value: "false"
-
-artifacts:
-  - name: kogito-devmode-quarkus-app-image-build.zip
-    # kogito-devmode-quarkus-app-1.38.0.Final-redhat-00001-image-build.zip
-    md5: c67fa5b0c78688023a5ac39877415dc7
-  - name: kogito-devmode-maven-repository-image-build.zip
-    # kogito-devmode-maven-repository-1.38.0.Final-redhat-00001-image-build.zip
-    md5: 5452062f247963d2ef7dbc35fbe29c3b
-
-execute:
-  - script: configure.sh

From 34fb88119c7b8bff50e44e5b5c114131fdab8c72 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <robertoguimaraes8@gmail.com>
Date: Mon, 29 Jan 2024 16:15:15 +0100
Subject: [PATCH 664/709] NOISSUE: fix bats tests (#1738)

---
 modules/kogito-dynamic-resources/added/container-limits | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/kogito-dynamic-resources/added/container-limits b/modules/kogito-dynamic-resources/added/container-limits
index 316cc17a538..f262ee7c408 100644
--- a/modules/kogito-dynamic-resources/added/container-limits
+++ b/modules/kogito-dynamic-resources/added/container-limits
@@ -121,17 +121,17 @@ min() {
     printf "%s\n" "$@" | sort -g | head -n1
 }
 
-local limit="$(core_limit)"
+limit="$(core_limit)"
 if [ x$limit != x ]; then
     export CONTAINER_CORE_LIMIT="$limit"
 fi
 
-local env_core_limit="$(min $CONTAINER_CORE_LIMIT $JAVA_CORE_LIMIT)"
+env_core_limit="$(min $CONTAINER_CORE_LIMIT $JAVA_CORE_LIMIT)"
 if [ -n "$env_core_limit" ]; then
     export CORE_LIMIT="$env_core_limit"
 fi
 
-local max_mem="$(container_memory)"
+max_mem="$(container_memory)"
 if [ x$max_mem != x ]; then
     export CONTAINER_MAX_MEMORY="$max_mem"
 fi

From c223f0ef0a560c8b3f1452ec5d0271afe2891127 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Thu, 8 Feb 2024 08:14:50 -0300
Subject: [PATCH 665/709] kie-issues#821: Kogito-images weekly job  (#1740)

* Kogito Images weekly job

* Add kogito-swf-builder image and weekly-latest tag
---
 .ci/jenkins/Jenkinsfile.build-image   |  10 +-
 .ci/jenkins/Jenkinsfile.weekly.deploy | 347 ++++++++++++++++++++++++++
 .ci/jenkins/dsl/jobs.groovy           |  56 +++++
 scripts/manage-kogito-version.py      |   6 +-
 4 files changed, 415 insertions(+), 4 deletions(-)
 create mode 100644 .ci/jenkins/Jenkinsfile.weekly.deploy

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 2a51da90ad9..75347f8581d 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -151,7 +151,8 @@ pipeline {
                     int retries = Integer.parseInt(env.MAX_REGISTRY_RETRIES)
                     String imageTag = getBuiltImageTag()
                     if (isDeployLatestTag()) {
-                        cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag('latest'), retries)
+                        latestTag = getTriggeringProjectName().contains('weekly') ? 'weekly-latest' : 'latest'
+                        cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag(latestTag), retries)
                     }
                     try {
                         String reducedTag = cloud.getReducedTag(getDeployImageTag())
@@ -407,3 +408,10 @@ Map getRepositoryInfo() {
         credentials_id: getGitAuthorCredentialsId(),
     ]
 }
+
+String getTriggeringProjectName() {
+    if (currentBuild.upstreamBuilds) {
+        return currentBuild.upstreamBuilds[0].projectName
+    }
+    return ""
+}
diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
new file mode 100644
index 00000000000..045e236630f
--- /dev/null
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -0,0 +1,347 @@
+/*
+ * 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.
+ */
+@Library('jenkins-pipeline-shared-libraries')_
+
+deployProperties = [:]
+
+changesDone = false
+
+BUILT_IMAGES = Collections.synchronizedList([])
+BUILD_FAILED_IMAGES = Collections.synchronizedList([])
+TEST_FAILED_IMAGES = Collections.synchronizedList([])
+
+pipeline {
+    agent {
+        docker {
+            image env.AGENT_DOCKER_BUILDER_IMAGE
+            args env.AGENT_DOCKER_BUILDER_ARGS
+        }
+    }
+
+    options {
+        timeout(time: 240, unit: 'MINUTES')
+        skipDefaultCheckout()
+    }
+
+    environment {
+        KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
+    }
+
+    stages {
+        stage('Initialization') {
+            steps {
+                script {
+                    util.waitForDocker()
+                    currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
+
+                    dir(getRepoName()) {
+                        checkoutRepo()
+                        env.PROJECT_VERSION = sh(returnStdout: true, script: "python scripts/retrieve_version.py").trim()
+                    }
+                }
+            }
+            post {
+                always {
+                    script {
+                        setDeployPropertyIfNeeded('git.branch', getBuildBranch())
+                        setDeployPropertyIfNeeded('git.author', getGitAuthor())
+                        setDeployPropertyIfNeeded('project.version', getProjectVersion())
+                    }
+                }
+            }
+        }
+
+        stage('Update project version') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
+                        if (getBuildBranch() != 'main') {
+                            versionCmd += " --examples-ref 'nightly-'${getBuildBranch()}"
+                        }
+                        sh versionCmd
+                    }
+                }
+            }
+        }
+
+        stage('Validate CeKit Image and Modules descriptors') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        sh '''
+                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+                            tar -xzvf cekit-image-validator-runner.tgz
+                            chmod +x cekit-image-validator-runner
+                        '''
+                        sh './cekit-image-validator-runner modules/'
+                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
+                    }
+                }
+            }
+        }
+
+        stage('Build, Push & Test Images') {
+            steps {
+                script {
+                    dir(getRepoName()) {
+                        parallelStages = [:]
+                        getImages().each { image ->
+                            parallelStages["Build&Test ${image}"] = createBuildAndTestStageClosure(image)
+                        }
+                        parallel parallelStages
+                    }
+                }
+            }
+            post {
+                always {
+                    script {
+                        // Store image deployment information
+                        String imgPrefix = "${getRepoName()}.image"
+                        setDeployPropertyIfNeeded("${imgPrefix}.registry", getDeployImageRegistry())
+                        setDeployPropertyIfNeeded("${imgPrefix}.namespace", getDeployImageNamespace())
+                        setDeployPropertyIfNeeded("${imgPrefix}.names", getBuiltImages().join(','))
+                        setDeployPropertyIfNeeded("${imgPrefix}.name-suffix", getDeployImageNameSuffix())
+                        setDeployPropertyIfNeeded("${imgPrefix}.tag", getDeployImageTag())
+                    }
+                }
+            }
+        }
+
+        stage('Create and push a new tag') {
+            steps {
+                script {
+                    projectVersion = getProjectVersion(false)
+                    dir(getRepoName()) {
+                        githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
+                        githubscm.tagRepository(projectVersion)
+                        githubscm.pushRemoteTag('origin', projectVersion, getGitAuthorPushCredsId())
+                    }
+                }
+            }
+        }
+
+        stage('Finalize') {
+            steps {
+                script {
+                    if (getBuildFailedImages()) {
+                        currentBuild.currentResult = 'FAILURE'
+                    }
+                }
+            }
+        }
+    }
+    post {
+        always {
+            script {
+                def propertiesStr = deployProperties.collect { entry -> "${entry.key}=${entry.value}" }.join('\n')
+                writeFile(file : env.PROPERTIES_FILE_NAME , text : propertiesStr)
+                archiveArtifacts artifacts: env.PROPERTIES_FILE_NAME, allowEmptyArchive:true
+            }
+        }
+        cleanup {
+            cleanWs()
+        }
+        unsuccessful {
+            sendUnsuccessfulNotification()
+        }
+    }
+}
+
+void sendUnsuccessfulNotification() {
+    if (params.SEND_NOTIFICATION) {
+        mailer.sendMarkdownTestSummaryNotification('Deploy', getNotificationSubject(), [env.KOGITO_CI_EMAIL_TO])
+    } else {
+        echo 'No notification sent per configuration'
+    }
+}
+
+void sendNotification(String body) {
+    emailext body: body,
+        subject: getNotificationSubject(),
+        to: env.KOGITO_CI_EMAIL_TO
+}
+
+String getNotificationSubject() {
+    return "[${getBuildBranch()}] Kogito Images"
+}
+
+void checkoutRepo() {
+    deleteDir()
+    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsId()))
+}
+
+void createBuildAndTestStageClosure(String image) {
+    return  {
+        stage("Build&Test ${image}") {
+            List buildParams = []
+            buildParams.add(string(name: 'DISPLAY_NAME', value: "${params.DISPLAY_NAME} - ${image}"))
+            buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
+            buildParams.add(string(name: 'SOURCE_AUTHOR', value: getGitAuthor()))
+            buildParams.add(string(name: 'SOURCE_BRANCH', value: getBuildBranch()))
+
+            buildParams.add(string(name: 'MAVEN_ARTIFACTS_REPOSITORY', value: env.MAVEN_ARTIFACT_REPOSITORY))
+            buildParams.add(string(name: 'BUILD_KOGITO_APPS_URI', value: params.APPS_URI))
+            buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: params.APPS_REF))
+            buildParams.add(booleanParam(name: 'SKIP_TESTS', value: params.SKIP_TESTS))
+            buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_URI', value: params.EXAMPLES_URI))
+            buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_REF', value: params.EXAMPLES_REF))
+
+            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
+            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_CREDENTIALS', value: getDeployImageRegistryCredentials()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: getDeployImageRegistry()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: getDeployImageNamespace()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: getDeployImageNameSuffix()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_TAG', value: getDeployImageTag()))
+            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: isDeployLatestTag()))
+
+            def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
+            if (job.result != 'SUCCESS') {
+                if (job.result == 'UNSTABLE') {
+                    registerTestFailedImage(image)
+                    unstable("Tests on ${image} seems to have failed")
+                    registerBuiltImage(image)
+                } else {
+                    registerBuildFailedImage(image)
+                    error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
+                }
+            } else {
+                registerBuiltImage(image)
+            }
+        }
+    }
+}
+
+void registerBuiltImage(String imageName) {
+    BUILT_IMAGES.add(imageName)
+}
+
+void registerBuildFailedImage(String imageName) {
+    BUILD_FAILED_IMAGES.add(imageName)
+}
+
+void registerTestFailedImage(String imageName) {
+    TEST_FAILED_IMAGES.add(imageName)
+}
+
+List getBuiltImages() {
+    return BUILT_IMAGES
+}
+
+List getBuildFailedImages() {
+    return BUILD_FAILED_IMAGES
+}
+
+List getTestFailedImages() {
+    return TEST_FAILED_IMAGES
+}
+
+////////////////////////////////////////////////////////////////////////
+// Deploy image information
+////////////////////////////////////////////////////////////////////////
+
+boolean isDeployImageInOpenshiftRegistry() {
+    return params.IMAGE_USE_OPENSHIFT_REGISTRY
+}
+
+String getDeployImageRegistryCredentials() {
+    return params.IMAGE_REGISTRY_CREDENTIALS
+}
+
+String getDeployImageRegistry() {
+    return isDeployImageInOpenshiftRegistry() ? getOpenShiftRegistry() : params.IMAGE_REGISTRY
+}
+String getDeployImageNamespace() {
+    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
+}
+String getDeployImageNameSuffix() {
+    return params.IMAGE_NAME_SUFFIX
+}
+String getDeployImageTag() {
+    return getProjectVersion(false)
+}
+
+boolean isDeployLatestTag() {
+    return params.DEPLOY_WITH_LATEST_TAG
+}
+
+////////////////////////////////////////////////////////////////////////
+// utils
+////////////////////////////////////////////////////////////////////////
+
+String getRepoName() {
+    return env.REPO_NAME
+}
+
+String getBuildBranch() {
+    return params.BUILD_BRANCH_NAME
+}
+
+String getGitAuthor() {
+    return "${GIT_AUTHOR}"
+}
+
+String getGitAuthorCredsId() {
+    return env.GIT_AUTHOR_CREDS_ID
+}
+
+String getGitAuthorPushCredsId() {
+    return env.GIT_AUTHOR_PUSH_CREDS_ID
+}
+
+String getOpenShiftRegistry() {
+    String registry = ''
+    withCredentials([string(credentialsId: 'OPENSHIFT_REGISTRY', variable: 'OPENSHIFT_REGISTRY')]) {
+        registry = env.OPENSHIFT_REGISTRY
+    }
+    return registry
+}
+
+void setDeployPropertyIfNeeded(String key, def value) {
+    if (value) {
+        deployProperties[key] = value
+    }
+}
+
+String[] getImages() {
+    if (env.IMAGES_LIST) {
+        return env.IMAGES_LIST.split(',')
+    }
+    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
+}
+
+String getQuarkusPlatformVersion() {
+    return params.QUARKUS_PLATFORM_VERSION
+}
+
+String getCheckoutDatetime() {
+    return params.GIT_CHECKOUT_DATETIME
+}
+
+String getProjectVersionDate() {
+    def projectVersionDate = (getCheckoutDatetime() =~ /(\d{4}-\d{2}-\d{2})/)[0][0]
+    return projectVersionDate.replace('-', '')
+}
+
+String getProjectVersion(boolean keepSnapshotSuffix = true) {
+    def projectVersion = env.PROJECT_VERSION
+    if (keepSnapshotSuffix) {
+        return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}-SNAPSHOT")
+    }
+    return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}")
+}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index ea1c1c29700..5ed082bb9ad 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -45,6 +45,9 @@ createSetupBranchJob()
 setupDeployJob(JobType.NIGHTLY)
 KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-lts')
 
+// Weekly jobs
+setupWeeklyDeployJob(JobType.OTHER)
+
 // Release jobs
 setupDeployJob(JobType.RELEASE)
 setupPromoteJob(JobType.RELEASE)
@@ -321,3 +324,56 @@ void setupQuarkusUpdateJob() {
         "python scripts/update-repository.py --quarkus-platform-version %new_version%"
     ])
 }
+
+void setupWeeklyDeployJob(JobType jobType) {
+    setupBuildImageJob(jobType)
+
+    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.weekly-deploy', jobType, "${jenkins_path}/Jenkinsfile.weekly.deploy", 'Kogito Images Weekly Deploy')
+    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
+    jobParams.env.putAll([
+        PROPERTIES_FILE_NAME: 'deployment.properties',
+
+        MAX_REGISTRY_RETRIES: 3,
+
+        JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
+
+        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
+        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
+
+        MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+        DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
+
+        QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
+    ])
+
+    jobParams.env.put('IMAGES_LIST', 'kogito-swf-builder,kogito-swf-devmode')
+
+    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
+        parameters {
+            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
+
+            stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
+
+            stringParam('APPS_URI', '', 'Git uri to the kogito-apps repository to use for tests.')
+            stringParam('APPS_REF', '', 'Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
+
+            // Build&Test information
+            booleanParam('SKIP_TESTS', false, 'Skip tests')
+            stringParam('EXAMPLES_URI', '', 'Git uri to the kogito-examples repository to use for tests.')
+            stringParam('EXAMPLES_REF', '', 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
+
+            // Deploy information
+            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
+            stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
+            stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
+            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
+
+            stringParam('GIT_CHECKOUT_DATETIME', '', 'Git checkout date and time - (Y-m-d H:i)')
+
+            booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
+        }
+    }
+}
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 04cb161fbb2..10950d2222d 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -51,9 +51,9 @@
 
     if args.bump_to:
         # validate if the provided version is valid.
-        # e.g. 1.10.0 or 1.0.0-rc1
-        pattern = '\d+.\d+.(\d+$|\d+-rc\d+$|\d+-snapshot$)'
-        regex = re.compile(r'\d+.\d+.(\d+$|\d+-rc\d+|\d+-snapshot$)')
+        # e.g. 1.10.0, 1.0.0-rc1, 999-snapshot or 999-20240101-snapshot
+        pattern = r'(\d+.\d+.)?(\d+$|\d+-rc\d+$|\d+(-\d{8})?-snapshot$)'
+        regex = re.compile(pattern, re.IGNORECASE)
         valid = regex.match(args.bump_to)
         examples_ref = ""
         if valid:

From 51c1f8b1daefc8cc00a5ae54881d1f06448c6a74 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Mon, 19 Feb 2024 15:23:54 -0300
Subject: [PATCH 666/709] Fix kie-issues-#830 - Make Images Reproducible
 (#1741)

---
 kogito-data-index-ephemeral-image.yaml        |  9 +--------
 kogito-data-index-postgresql-image.yaml       |  9 +--------
 kogito-jit-runner-image.yaml                  |  8 +-------
 kogito-jobs-service-allinone-image.yaml       |  8 +-------
 kogito-jobs-service-ephemeral-image.yaml      |  8 +-------
 kogito-jobs-service-postgresql-image.yaml     |  8 +-------
 kogito-management-console-image.yaml          |  8 +-------
 kogito-swf-builder-image.yaml                 | 20 ++-----------------
 kogito-swf-devmode-image.yaml                 | 14 ++-----------
 kogito-task-console-image.yaml                |  9 +--------
 .../community/configure                       |  4 ----
 .../community/module.yaml                     | 10 +++-------
 .../kogito-data-index-postgresql/configure    |  4 ----
 .../kogito-data-index-postgresql/module.yaml  |  6 +++---
 modules/kogito-dynamic-resources/module.yaml  |  2 --
 modules/kogito-jit-runner/configure           |  3 ---
 modules/kogito-jit-runner/module.yaml         |  5 +++--
 .../kogito-jobs-service-all-in-one/configure  |  5 -----
 .../module.yaml                               | 14 ++++++-------
 .../kogito-jobs-service-ephemeral/configure   |  3 ---
 .../kogito-jobs-service-ephemeral/module.yaml |  9 +++------
 .../kogito-jobs-service-postgresql/configure  |  4 ----
 .../module.yaml                               |  6 +++---
 .../kogito-management-console/configure.sh    |  2 --
 modules/kogito-management-console/module.yaml |  5 +++--
 modules/kogito-maven/common/configure         | 13 ++++++++++--
 .../kogito-openjdk/17-headless/module.yaml    |  3 +++
 modules/kogito-openjdk/17/module.yaml         |  3 +++
 .../builder/runtime/community/configure.sh    |  5 +++--
 .../builder/runtime/community/module.yaml     |  4 ++--
 .../common/build/added/cleanup_project.sh     |  7 ++++++-
 .../common/build/added/zip_files.sh           |  8 ++++----
 modules/kogito-swf/common/build/module.yaml   |  4 ----
 .../common/scripts/added/create-app.sh        | 10 +++++++++-
 .../devmode/runtime/community/configure.sh    |  7 +++++--
 .../devmode/runtime/community/module.yaml     |  4 ++--
 modules/kogito-system-user/module.yaml        |  3 +++
 modules/kogito-task-console/configure         |  2 --
 modules/kogito-task-console/module.yaml       |  5 +++--
 scripts/build-kogito-apps-components.sh       |  5 ++---
 tests/features/kogito-swf-builder.feature     |  2 --
 tests/features/kogito-swf-devmode.feature     |  2 --
 42 files changed, 92 insertions(+), 178 deletions(-)
 mode change 100644 => 100755 modules/kogito-maven/common/configure

diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index 5cd7606f63f..4801a69e00c 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-ephemeral"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
 description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
@@ -45,18 +45,12 @@ envs:
     value: "http-events-support"
     description: "Allows to change the event connection type. The possible values are :`kafka-events-support` or `http-events-support`(default)"
 
-packages:
-  manager: microdnf
-
 modules:
   repositories:
     - path: modules
   install:
-    - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.community.ephemeral
@@ -71,4 +65,3 @@ run:
   user: 1001
   cmd:
     - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index a0852f996de..3f41ff43cde 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-postgresql"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
 
 
@@ -43,9 +43,6 @@ envs:
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 
-packages:
-  manager: microdnf
-
 ports:
   - value: 8080
 
@@ -53,11 +50,8 @@ modules:
   repositories:
     - path: modules
   install:
-    - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.postgresql
@@ -69,4 +63,3 @@ run:
   user: 1001
   cmd:
     - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 801539ae320..0907088be30 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jit-runner"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
 description: "Runtime image for Kogito JIT Runner"
 
 labels:
@@ -42,18 +42,12 @@ envs:
     example: "true"
     description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
 
-packages:
-  manager: microdnf
-
 modules:
   repositories:
     - path: modules
   install:
-    - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jit-runner
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index 0db23c68060..f2a99f7a79b 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-allinone"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
 description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
 
 labels:
@@ -48,18 +48,12 @@ envs:
     example: "postgresql"
     description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral and postgresql, if empty, defaults to ephemeral"
 
-packages:
-  manager: microdnf
-
 modules:
   repositories:
     - path: modules
   install:
-    - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.allinone
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index b6b5bd6c870..d26ce19cb4e 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
 description: "Runtime image for Kogito in memory Jobs Service"
 
 labels:
@@ -45,18 +45,12 @@ envs:
     example: "true"
     description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
-packages:
-  manager: microdnf
-
 modules:
   repositories:
     - path: modules
   install:
-    - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.ephemeral
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index b13f5204392..df50edcc405 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
 description: "Runtime image for Kogito Jobs Service based on Postgresql"
 
 labels:
@@ -45,18 +45,12 @@ envs:
     example: "true"
     description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on."
 
-packages:
-  manager: microdnf
-
 modules:
   repositories:
     - path: modules
   install:
-    - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.postgresql
diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml
index 3e4c14f3e16..62ee228466f 100644
--- a/kogito-management-console-image.yaml
+++ b/kogito-management-console-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-management-console"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
 description: "Runtime image for Kogito Management Console"
 
 labels:
@@ -45,18 +45,12 @@ envs:
     example: "http://data-index.service:8080"
     description: "Data Index service address, defaults to http://localhost:8180."
 
-packages:
-  manager: microdnf
-
 modules:
   repositories:
     - path: modules
   install:
-    - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.management.console
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index a937e26aeef..195fdae6c8f 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -17,32 +17,24 @@
 # under the License.
 #
   - name: builder
-    from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
     version: "999-SNAPSHOT"
     modules:
       repositories:
         - path: modules
       install:
-        - name: org.kie.kogito.image.dependencies
         - name: org.kie.kogito.system.user
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
-        - name: org.kie.kogito.openjdk
-          version: "17"
         - name: org.kie.kogito.dynamic.resources
-        - name: org.kie.kogito.maven
-          version: "3.9.3"
         - name: org.kie.kogito.maven.common
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
         - name: org.kie.kogito.swf.builder.build-config
         - name: org.kie.kogito.swf.common.build
 
-    packages:
-      manager: microdnf
-
   - name: "quay.io/kiegroup/kogito-swf-builder"
-    from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
     version: "999-SNAPSHOT"
     description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
 
@@ -64,22 +56,14 @@
       - name: "io.openshift.tags"
         value: "kogito,builder,serverless,workflow"
 
-    packages:
-      manager: microdnf
-
     modules:
       repositories:
         - path: modules
       install:
-        - name: org.kie.kogito.image.dependencies
         - name: org.kie.kogito.system.user
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
-        - name: org.kie.kogito.openjdk
-          version: "17"
         - name: org.kie.kogito.dynamic.resources
-        - name: org.kie.kogito.maven
-          version: "3.9.3"
         - name: org.kie.kogito.maven.common
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 6f43468109e..105a522c5c9 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -17,21 +17,16 @@
 # under the License.
 #
   - name: builder
-    from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
     version: "999-SNAPSHOT"
     modules:
       repositories:
         - path: modules
       install:
-        - name: org.kie.kogito.image.dependencies
         - name: org.kie.kogito.system.user
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
-        - name: org.kie.kogito.openjdk
-          version: "17"
         - name: org.kie.kogito.dynamic.resources
-        - name: org.kie.kogito.maven
-          version: "3.9.3"
         - name: org.kie.kogito.maven.common
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
@@ -42,7 +37,7 @@
       manager: microdnf
 
   - name: "quay.io/kiegroup/kogito-swf-devmode"
-    from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
     version: "999-SNAPSHOT"
     description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
 
@@ -69,15 +64,10 @@
       repositories:
         - path: modules
       install:
-        - name: org.kie.kogito.image.dependencies
         - name: org.kie.kogito.system.user
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
-        - name: org.kie.kogito.openjdk
-          version: "17"
         - name: org.kie.kogito.dynamic.resources
-        - name: org.kie.kogito.maven
-          version: "3.9.3"
         - name: org.kie.kogito.maven.common
         - name: org.kie.kogito.project.versions
         - name: org.kie.kogito.swf.common.scripts
diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
index 75bfaf15c8f..2031de62f5c 100644
--- a/kogito-task-console-image.yaml
+++ b/kogito-task-console-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-task-console"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
 description: "Runtime image for Kogito Task Console"
 
 labels:
@@ -45,18 +45,12 @@ envs:
     example: "http://data-index.service:8080"
     description: "Data Index service address, defaults to http://localhost:8180."
 
-packages:
-  manager: microdnf
-
 modules:
   repositories:
     - path: modules
   install:
-    - name: org.kie.kogito.image.dependencies
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.task.console
@@ -70,4 +64,3 @@ run:
   user: 1001
   cmd:
     - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/modules/kogito-data-index-ephemeral/community/configure b/modules/kogito-data-index-ephemeral/community/configure
index f5807a90e19..ae5360b775e 100644
--- a/modules/kogito-data-index-ephemeral/community/configure
+++ b/modules/kogito-data-index-ephemeral/community/configure
@@ -19,12 +19,8 @@
 #
 set -e
 
-SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/data-index-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
index 31d4e1bee69..5a975f60802 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -23,13 +23,9 @@ version: "999-SNAPSHOT"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-  - path: /tmp/build/data-index-service-inmemory/data-index-service-inmemory-quarkus-app.zip
-    name: data-index-service-inmemory-quarkus-app.zip
+  - path: /tmp/build/data-index-service-inmemory
+    dest: /home/kogito/bin
+    name: quarkus-app
 
 execute:
   - script: configure
-
-packages:
-  install:
-    - pam
-
diff --git a/modules/kogito-data-index-postgresql/configure b/modules/kogito-data-index-postgresql/configure
index a38b551b6ec..ae5360b775e 100644
--- a/modules/kogito-data-index-postgresql/configure
+++ b/modules/kogito-data-index-postgresql/configure
@@ -19,12 +19,8 @@
 #
 set -e
 
-SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/data-index-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
 cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index 3ad6f18723f..d5037af8661 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -23,9 +23,9 @@ version: "999-SNAPSHOT"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-  - path: /tmp/build/data-index-service-postgresql/data-index-service-postgresql-quarkus-app.zip
-    name: data-index-service-postgresql-quarkus-app.zip
+  - path: /tmp/build/data-index-service-postgresql
+    dest: /home/kogito/bin
+    name: quarkus-app
 
 execute:
   - script: configure
-
diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml
index 55802bf98dd..7699783d876 100644
--- a/modules/kogito-dynamic-resources/module.yaml
+++ b/modules/kogito-dynamic-resources/module.yaml
@@ -26,8 +26,6 @@ execute:
   - script: configure
 
 envs:
-  - name: JBOSS_CONTAINER_JAVA_JVM_MODULE
-    value: /opt/container/java/jvm
   - name: JAVA_OPTIONS
     description: User specified Java options to be appended to generated options in JAVA_OPTS (internal use).
     example: "-verbose:class"
diff --git a/modules/kogito-jit-runner/configure b/modules/kogito-jit-runner/configure
index 871632d9a83..e1c6da21e36 100644
--- a/modules/kogito-jit-runner/configure
+++ b/modules/kogito-jit-runner/configure
@@ -19,12 +19,9 @@
 #
 set -e
 
-SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/jitexecutor-runner-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
-
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
 
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 75fee11a735..9928adf7d15 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -23,8 +23,9 @@ version: "999-SNAPSHOT"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-  - path: /tmp/build/jitexecutor-runner/jitexecutor-runner-quarkus-app.zip
-    name: jitexecutor-runner-quarkus-app.zip
+  - path: /tmp/build/jitexecutor-runner
+    dest: /home/kogito/bin
+    name: quarkus-app
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-all-in-one/configure b/modules/kogito-jobs-service-all-in-one/configure
index 6777f480645..04cf35c1f62 100644
--- a/modules/kogito-jobs-service-all-in-one/configure
+++ b/modules/kogito-jobs-service-all-in-one/configure
@@ -19,14 +19,9 @@
 #
 set -e
 
-SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ephemeral
-unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/postgresql
-
-
 mkdir "${KOGITO_HOME}"/bin/shared-libs/
 
 mv "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/
diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml
index aa890d32635..1ef0ffff538 100644
--- a/modules/kogito-jobs-service-all-in-one/module.yaml
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -21,14 +21,12 @@ name: org.kie.kogito.jobs.service.allinone
 version: "999-SNAPSHOT"
 
 artifacts:
-  - path: /tmp/build/jobs-service-inmemory-all-in-one/jobs-service-inmemory-quarkus-app.zip
-    name: jobs-service-inmemory-quarkus-app.zip
-  - path: /tmp/build/jobs-service-postgresql-all-in-one/jobs-service-postgresql-quarkus-app.zip
-    name: jobs-service-postgresql-quarkus-app.zip
-
-packages:
-  install:
-    - pam
+  - path: /tmp/build/jobs-service-inmemory-all-in-one
+    name: jobs-service-inmemory-all-in-one
+    dest: /home/kogito/bin/ephemeral
+  - path: /tmp/build/jobs-service-postgresql-all-in-one
+    name: jobs-service-postgresql-all-in-one
+    dest: /home/kogito/bin/postgresql
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-ephemeral/configure b/modules/kogito-jobs-service-ephemeral/configure
index c9a470c1b1a..10d0d252bfa 100644
--- a/modules/kogito-jobs-service-ephemeral/configure
+++ b/modules/kogito-jobs-service-ephemeral/configure
@@ -19,11 +19,8 @@
 #
 set -e
 
-SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ephemeral
-
 cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 685f27e2a63..1aeac43518b 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -23,12 +23,9 @@ version: "999-SNAPSHOT"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-  - path: /tmp/build/jobs-service-inmemory/jobs-service-inmemory-quarkus-app.zip
-    name: jobs-service-inmemory-quarkus-app.zip
-
-packages:
-  install:
-    - pam
+  - path: /tmp/build/jobs-service-inmemory
+    dest: /home/kogito/bin/ephemeral
+    name: quarkus-app
 
 execute:
   - script: configure
diff --git a/modules/kogito-jobs-service-postgresql/configure b/modules/kogito-jobs-service-postgresql/configure
index 5ecde975555..10d0d252bfa 100644
--- a/modules/kogito-jobs-service-postgresql/configure
+++ b/modules/kogito-jobs-service-postgresql/configure
@@ -19,12 +19,8 @@
 #
 set -e
 
-SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/postgresql
-
 cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
 chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 67c5b13d099..95da8e909ff 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -23,9 +23,9 @@ version: "999-SNAPSHOT"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-  - path: /tmp/build/jobs-service-postgresql/jobs-service-postgresql-quarkus-app.zip
-    name: jobs-service-postgresql-quarkus-app.zip
+  - path: /tmp/build/jobs-service-postgresql
+    dest: /home/kogito/bin/postgresql
+    name: quarkus-app
 
 execute:
   - script: configure
-
diff --git a/modules/kogito-management-console/configure.sh b/modules/kogito-management-console/configure.sh
index a7d9cab33c5..19b6d5c35b7 100644
--- a/modules/kogito-management-console/configure.sh
+++ b/modules/kogito-management-console/configure.sh
@@ -19,11 +19,9 @@
 #
 set -e
 
-SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/management-console-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
index 063487f45a1..f00bb9ed018 100644
--- a/modules/kogito-management-console/module.yaml
+++ b/modules/kogito-management-console/module.yaml
@@ -23,8 +23,9 @@ version: "999-SNAPSHOT"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-  - path: /tmp/build/management-console/management-console-quarkus-app.zip
-    name: management-console-quarkus-app.zip
+  - path: /tmp/build/management-console
+    dest: /home/kogito/bin
+    name: quarkus-app
 
 execute:
   - script: configure.sh
diff --git a/modules/kogito-maven/common/configure b/modules/kogito-maven/common/configure
old mode 100644
new mode 100755
index aa7e67b613d..7f53060455f
--- a/modules/kogito-maven/common/configure
+++ b/modules/kogito-maven/common/configure
@@ -22,8 +22,17 @@ set -e
 SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 
-tar xzf "${SOURCES_DIR}"/apache-maven-"${MAVEN_VERSION}"-bin.tar.gz -C /usr/share
-mv /usr/share/apache-maven-"${MAVEN_VERSION}" /usr/share/maven
+mvn_install_dir="/usr/share/maven"
+
+# Verify if mvn is installed
+if [ ! -d ${mvn_install_dir} ] && ! command -v mvn &> /dev/null ;
+then
+    echo "---> Maven not found, downloading and installing it"
+    tar xzf "${SOURCES_DIR}"/apache-maven-"${MAVEN_VERSION}"-bin.tar.gz -C /usr/share
+    mv /usr/share/apache-maven-"${MAVEN_VERSION}" ${mvn_install_dir}
+else
+    echo "---> Maven already present in the current context"
+fi
 
 mkdir "${KOGITO_HOME}"/.m2
 cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
diff --git a/modules/kogito-openjdk/17-headless/module.yaml b/modules/kogito-openjdk/17-headless/module.yaml
index ebdf54bd500..db55c4fe0c1 100644
--- a/modules/kogito-openjdk/17-headless/module.yaml
+++ b/modules/kogito-openjdk/17-headless/module.yaml
@@ -35,6 +35,9 @@ envs:
     value: "openjdk"
   - name: "JAVA_VERSION"
     value: "17"
+  # Same env set by the openjdk image for modules that won't use it
+  - name: JBOSS_CONTAINER_JAVA_JVM_MODULE
+    value: /opt/container/java/jvm
 
 execute:
   - script: clean.sh
diff --git a/modules/kogito-openjdk/17/module.yaml b/modules/kogito-openjdk/17/module.yaml
index 7a7e7349d26..6cd287ddfba 100644
--- a/modules/kogito-openjdk/17/module.yaml
+++ b/modules/kogito-openjdk/17/module.yaml
@@ -35,6 +35,9 @@ envs:
     value: "openjdk"
   - name: "JAVA_VERSION"
     value: "17"
+  # Same env set by the openjdk image for modules that won't use it
+  - name: JBOSS_CONTAINER_JAVA_JVM_MODULE
+    value: /opt/container/java/jvm
 
 execute:
   - script: clean.sh
diff --git a/modules/kogito-swf/builder/runtime/community/configure.sh b/modules/kogito-swf/builder/runtime/community/configure.sh
index 14d76b74531..8d26bb5940e 100644
--- a/modules/kogito-swf/builder/runtime/community/configure.sh
+++ b/modules/kogito-swf/builder/runtime/community/configure.sh
@@ -23,10 +23,11 @@ set -e
 SOURCES_DIR=/tmp/artifacts
 
 mkdir -p "${KOGITO_HOME}"/.m2/repository
+mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
 
 # Unzip Quarkus app and Maven repository
-unzip "${SOURCES_DIR}"/kogito-swf-quarkus-app.zip -d "${KOGITO_HOME}"
-unzip "${SOURCES_DIR}"/kogito-swf-maven-repo.zip -d "${KOGITO_HOME}"/.m2/repository
+tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/builder/runtime/community/module.yaml b/modules/kogito-swf/builder/runtime/community/module.yaml
index 0a4d4172865..4562b12ed59 100644
--- a/modules/kogito-swf/builder/runtime/community/module.yaml
+++ b/modules/kogito-swf/builder/runtime/community/module.yaml
@@ -23,9 +23,9 @@ description: "Kogito Serverless Workflow builder runtime module"
 
 artifacts:
   - image: builder
-    path: /home/kogito/build_output/kogito-swf-quarkus-app.zip
+    path: /home/kogito/build_output/kogito-swf-quarkus-app.tar
   - image: builder
-    path: /home/kogito/build_output/kogito-swf-maven-repo.zip
+    path: /home/kogito/build_output/kogito-swf-maven-repo.tar
 
 execute:
   - script: configure.sh
diff --git a/modules/kogito-swf/common/build/added/cleanup_project.sh b/modules/kogito-swf/common/build/added/cleanup_project.sh
index b3c12a33609..adfac1d52f9 100755
--- a/modules/kogito-swf/common/build/added/cleanup_project.sh
+++ b/modules/kogito-swf/common/build/added/cleanup_project.sh
@@ -35,4 +35,9 @@ rm -rfv "${PROJECT_ARTIFACT_ID}"/*.bak
 echo 'Clean Maven useless files'
 find "${KOGITO_HOME}"/.m2/repository -name _remote.repositories -type f -delete
 find "${KOGITO_HOME}"/.m2/repository -name _maven.repositories -type f -delete
-find "${KOGITO_HOME}"/.m2/repository -name *.lastUpdated -type f -delete
\ No newline at end of file
+find "${KOGITO_HOME}"/.m2/repository -name *.lastUpdated -type f -delete
+
+# Remove files that include build timestamps to have reproducible images
+find "${KOGITO_HOME}"/.m2/ -name resolver-status.properties -delete 
+# Remove quarkus registry
+rm -rf "${KOGITO_HOME}"/.m2/repository/io/quarkus/registry/
diff --git a/modules/kogito-swf/common/build/added/zip_files.sh b/modules/kogito-swf/common/build/added/zip_files.sh
index 31e30ec6fb0..3e68296ef2c 100755
--- a/modules/kogito-swf/common/build/added/zip_files.sh
+++ b/modules/kogito-swf/common/build/added/zip_files.sh
@@ -25,10 +25,10 @@ BUILD_OUTPUT="${KOGITO_HOME}"/build_output/
 mkdir -p "${BUILD_OUTPUT}"
 
 echo "Zip and copy scaffold project"
-zip -r kogito-swf-quarkus-app.zip "${PROJECT_ARTIFACT_ID}"/ 
-cp -v kogito-swf-quarkus-app.zip "${BUILD_OUTPUT}"
+tar cf kogito-swf-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" .
+cp -v kogito-swf-quarkus-app.tar "${BUILD_OUTPUT}"
 
 echo "Zip and copy maven repo"
 cd "${KOGITO_HOME}"/.m2/repository/
-zip -r kogito-swf-maven-repo.zip *
-cp -v kogito-swf-maven-repo.zip "${BUILD_OUTPUT}"
\ No newline at end of file
+tar cf kogito-swf-maven-repo.tar .
+cp -v kogito-swf-maven-repo.tar "${BUILD_OUTPUT}"
\ No newline at end of file
diff --git a/modules/kogito-swf/common/build/module.yaml b/modules/kogito-swf/common/build/module.yaml
index 8f277cd9f72..84c1dfbe695 100644
--- a/modules/kogito-swf/common/build/module.yaml
+++ b/modules/kogito-swf/common/build/module.yaml
@@ -21,9 +21,5 @@ name: org.kie.kogito.swf.common.build
 version: "999-SNAPSHOT"
 description: "Kogito Serverless Workflow image build process"
 
-packages:
-  install:
-    - zip
-
 execute:
   - script: configure.sh
diff --git a/modules/kogito-swf/common/scripts/added/create-app.sh b/modules/kogito-swf/common/scripts/added/create-app.sh
index ad25fb66fcb..f965d9b78a9 100755
--- a/modules/kogito-swf/common/scripts/added/create-app.sh
+++ b/modules/kogito-swf/common/scripts/added/create-app.sh
@@ -130,4 +130,12 @@ fi
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
   -nsu \
   -s "${MAVEN_SETTINGS_PATH}" \
-  clean dependency:go-offline io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":go-offline
+  -DskipTests=true \
+  -Dmaven.javadoc.skip=true \
+  clean dependency:go-offline io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":go-offline install
+
+# clean up
+"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
+  -nsu \
+  -s "${MAVEN_SETTINGS_PATH}" \
+  clean 
diff --git a/modules/kogito-swf/devmode/runtime/community/configure.sh b/modules/kogito-swf/devmode/runtime/community/configure.sh
index efe6f6089ca..7404a5c1e5f 100644
--- a/modules/kogito-swf/devmode/runtime/community/configure.sh
+++ b/modules/kogito-swf/devmode/runtime/community/configure.sh
@@ -23,9 +23,12 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 SOURCES_DIR=/tmp/artifacts
 
+mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+mkdir -p "${KOGITO_HOME}"/.m2/repository
+
 # Unzip Quarkus app and Maven repository
-unzip "${SOURCES_DIR}"/kogito-swf-quarkus-app.zip -d "${KOGITO_HOME}"
-unzip "${SOURCES_DIR}"/kogito-swf-maven-repo.zip -d "${KOGITO_HOME}"/.m2/repository
+tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/runtime/community/module.yaml b/modules/kogito-swf/devmode/runtime/community/module.yaml
index c48ec72819f..aa0662c6460 100644
--- a/modules/kogito-swf/devmode/runtime/community/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/community/module.yaml
@@ -40,9 +40,9 @@ envs:
 
 artifacts:
   - image: builder
-    path: /home/kogito/build_output/kogito-swf-quarkus-app.zip
+    path: /home/kogito/build_output/kogito-swf-quarkus-app.tar
   - image: builder
-    path: /home/kogito/build_output/kogito-swf-maven-repo.zip
+    path: /home/kogito/build_output/kogito-swf-maven-repo.tar
 
 execute:
   - script: configure.sh
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index 74788b3e249..75b6ff8aea4 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -26,6 +26,9 @@ execute:
 envs:
   - name: "KOGITO_HOME"
     value: "/home/kogito"
+  # Force override here since some images depends on OpenJDK, which sets home to /home/jboss. Might be worth removing the kogito user and keep jboss instead. TODO: open an issue to track it and link to Kogito Operator deprecation.
+  - name: "HOME"
+    value: "/home/kogito"
   - name: "USER"
     value: "kogito"
 
diff --git a/modules/kogito-task-console/configure b/modules/kogito-task-console/configure
index 1c6659a10d0..19b6d5c35b7 100644
--- a/modules/kogito-task-console/configure
+++ b/modules/kogito-task-console/configure
@@ -19,11 +19,9 @@
 #
 set -e
 
-SOURCES_DIR=/tmp/artifacts
 SCRIPT_DIR=$(dirname "${0}")
 ADDED_DIR="${SCRIPT_DIR}"/added
 
-unzip "${SOURCES_DIR}"/task-console-quarkus-app.zip -d "${KOGITO_HOME}"/bin/
 cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
 
 chown -R 1001:0 "${KOGITO_HOME}"
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
index 43d5667f0e8..5f45b4668a2 100644
--- a/modules/kogito-task-console/module.yaml
+++ b/modules/kogito-task-console/module.yaml
@@ -23,8 +23,9 @@ version: "999-SNAPSHOT"
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
 artifacts:
-  - path: /tmp/build/task-console/task-console-quarkus-app.zip
-    name: task-console-quarkus-app.zip
+  - path: /tmp/build/task-console
+    dest: /home/kogito/bin
+    name: quarkus-app
 
 execute:
   - script: configure
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index ddaada7d88d..4c80cd6c1bb 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -116,8 +116,7 @@ for ctx in ${contextDir}; do
     export YARN_CACHE_FOLDER=/tmp/cache/yarn/${ctx} # Fix for building yarn apps in parallel
     export CYPRESS_CACHE_FOLDER=/tmp/cache/cypress/${ctx} # https://docs.cypress.io/guides/getting-started/installing-cypress#Advanced
     eval ${mvn_command}
-    cd ${ctx}/target/
-    zip -r $(basename ${ctx})-quarkus-app.zip quarkus-app
-    cp -v $(basename ${ctx})-quarkus-app.zip ${target_tmp_dir}/
+    cd ${ctx}/target
+    cp -vr quarkus-app ${target_tmp_dir}/
     cd -
 done
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 96c72b7073f..2f6f0b544cc 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -14,7 +14,6 @@ Feature: Serverless Workflow builder images
       | expected_status_code | 200               |
     And container log should contain --no-transfer-progress
     And container log should contain -Duser.home=/home/kogito
-    And container log should match regex Installed features:.*kubernetes
     And container log should match regex Installed features:.*kogito-serverless-workflow
     And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
     And container log should match regex Installed features:.*smallrye-health
@@ -33,7 +32,6 @@ Feature: Serverless Workflow builder images
       | expected_status_code | 200               |
     And container log should contain -Duser.home=/home/kogito
     And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
-    And container log should match regex Installed features:.*kubernetes
     And container log should match regex Installed features:.*kogito-serverless-workflow
     And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
     And container log should match regex Installed features:.*smallrye-health
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 533521167e7..471d0e94350 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -15,7 +15,6 @@ Feature: Serverless Workflow devmode images
     And container log should contain --no-transfer-progress
     And container log should contain -Duser.home=/home/kogito -o
     And container log should contain -Dquarkus.test.continuous-testing=disabled
-    And container log should match regex Installed features:.*kubernetes
     And container log should match regex Installed features:.*kogito-serverless-workflow
     And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
     And container log should match regex Installed features:.*smallrye-health
@@ -55,7 +54,6 @@ Feature: Serverless Workflow devmode images
     And container log should contain -Duser.home=/home/kogito
     And container log should not contain /bin/mvn -B -X --batch-mode -o
     And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
-    And container log should match regex Installed features:.*kubernetes
     And container log should match regex Installed features:.*kogito-serverless-workflow
     And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
     And container log should match regex Installed features:.*smallrye-health

From 60abf289710ae02ef60aaa24dfec52e82624791b Mon Sep 17 00:00:00 2001
From: Martin Cimbalek <cimbik@gmail.com>
Date: Tue, 20 Feb 2024 14:51:56 +0100
Subject: [PATCH 667/709] kie-issues#777: Allow restricting jenkins agent
 labels for pipelines (#1742)

---
 .ci/jenkins/Jenkinsfile                | 2 +-
 .ci/jenkins/Jenkinsfile.build-and-test | 1 +
 .ci/jenkins/Jenkinsfile.build-image    | 1 +
 .ci/jenkins/Jenkinsfile.deploy         | 1 +
 .ci/jenkins/Jenkinsfile.promote        | 1 +
 .ci/jenkins/Jenkinsfile.setup-branch   | 1 +
 .ci/jenkins/Jenkinsfile.weekly.deploy  | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index bb77329f3e8..5780e5cc5eb 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -18,7 +18,7 @@
 
 pipeline {
     agent {
-        label 'ubuntu'
+        label util.avoidFaultyNodes('ubuntu')
     }
     options {
         timeout(time: 240, unit: 'MINUTES')
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
index 7849fd87855..da1a49fbd88 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -21,6 +21,7 @@ pipeline {
         docker { 
             image env.AGENT_DOCKER_BUILDER_IMAGE
             args env.AGENT_DOCKER_BUILDER_ARGS
+            label util.avoidFaultyNodes()
         }
     }
     options {
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 75347f8581d..b51a48cf360 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -23,6 +23,7 @@ pipeline {
         docker { 
             image env.AGENT_DOCKER_BUILDER_IMAGE
             args env.AGENT_DOCKER_BUILDER_ARGS
+            label util.avoidFaultyNodes()
             alwaysPull true
         }
     }
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 415e23053ad..2391a1ae8ce 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -29,6 +29,7 @@ pipeline {
         docker { 
             image env.AGENT_DOCKER_BUILDER_IMAGE
             args env.AGENT_DOCKER_BUILDER_ARGS
+            label util.avoidFaultyNodes()
         }
     }
 
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 27df81c9d6e..c3b2164b3fb 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -25,6 +25,7 @@ pipeline {
         docker { 
             image env.AGENT_DOCKER_BUILDER_IMAGE
             args env.AGENT_DOCKER_BUILDER_ARGS
+            label util.avoidFaultyNodes()
         }
     }
 
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 9f7159af523..5c5e06c85a6 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -23,6 +23,7 @@ pipeline {
         docker { 
             image env.AGENT_DOCKER_BUILDER_IMAGE
             args env.AGENT_DOCKER_BUILDER_ARGS
+            label util.avoidFaultyNodes()
         }
     }
 
diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
index 045e236630f..cf648e8a7e6 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -29,6 +29,7 @@ pipeline {
         docker {
             image env.AGENT_DOCKER_BUILDER_IMAGE
             args env.AGENT_DOCKER_BUILDER_ARGS
+            label util.avoidFaultyNodes()
         }
     }
 

From e43b86e9a74641d3c49e3e519c2f3d531af1f6fb Mon Sep 17 00:00:00 2001
From: Walter Medvedeo <wmedvedeo@gmail.com>
Date: Thu, 22 Feb 2024 18:38:42 +0100
Subject: [PATCH 668/709] kie-kogito-images-1744: Disable question about
 collecting Quarkus analytics (#1745)

---
 .../kogito-swf/devmode/runtime/common/added/run-app-devmode.sh | 1 +
 modules/kogito-swf/devmode/runtime/community/module.yaml       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
index d929b29aadd..ba8edc6585d 100755
--- a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
+++ b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
@@ -48,4 +48,5 @@ fi
     -DskipTests \
     -Dquarkus.http.host=0.0.0.0 \
     -Dquarkus.test.continuous-testing=${QUARKUS_CONTINUOUS_TESTING:-disabled} \
+    -Dquarkus.analytics.disabled=${QUARKUS_ANALYTICS_DISABLED:true} \
     clean compile quarkus:dev
\ No newline at end of file
diff --git a/modules/kogito-swf/devmode/runtime/community/module.yaml b/modules/kogito-swf/devmode/runtime/community/module.yaml
index aa0662c6460..ca49e2dcacd 100644
--- a/modules/kogito-swf/devmode/runtime/community/module.yaml
+++ b/modules/kogito-swf/devmode/runtime/community/module.yaml
@@ -34,6 +34,9 @@ envs:
   - name: QUARKUS_CONTINUOUS_TESTING
     description: Whether to enable Quarkus continous testing on DevMode or not. Default to "disabled".
     value: "disabled"
+  - name: QUARKUS_ANALYTICS_DISABLED
+    description: Whether to disable the Quarkus analytics data collecting on DevMode or not. Default to "true".
+    value: "true"
   - name: KOGITO_CODEGEN_PROCESS_FAILONERROR
     description: Boolean flag that will prevent Dev Mode to crash if the provided workflow is wrong.
     value: "false"

From ce62b9d86c2ea0385ab85c3ef5339afe5ecdea72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= <tiborzimanyi@ibm.com>
Date: Fri, 23 Feb 2024 15:07:04 +0100
Subject: [PATCH 669/709] [kie-issues#913] Upgrade to Quarkus 3.2.10.Final LTS
 version. (#1743)

---
 kogito-base-builder-image.yaml              | 2 +-
 kogito-runtime-jvm-image.yaml               | 2 +-
 kogito-runtime-native-image.yaml            | 2 +-
 kogito-s2i-builder-image.yaml               | 2 +-
 kogito-swf-builder-image.yaml               | 2 +-
 kogito-swf-devmode-image.yaml               | 2 +-
 modules/kogito-project-versions/module.yaml | 2 +-
 scripts/README.md                           | 4 ++--
 tests/features/kogito-swf-common.feature    | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index 9390018b411..92964f745fb 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -31,7 +31,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "3.2.9.Final"
+    value: "3.2.10.Final"
   - name: "org.kie.kogito.version"
     value: "999-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
index f147c77fcb6..a16aa13e787 100644
--- a/kogito-runtime-jvm-image.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -31,7 +31,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "3.2.9.Final"
+    value: "3.2.10.Final"
   - name: "org.kie.kogito.version"
     value: "999-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml
index 336ec91070b..e75649ff54a 100644
--- a/kogito-runtime-native-image.yaml
+++ b/kogito-runtime-native-image.yaml
@@ -31,7 +31,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "3.2.9.Final"
+    value: "3.2.10.Final"
   - name: "org.kie.kogito.version"
     value: "999-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
index 055f28be962..10e7520b73b 100644
--- a/kogito-s2i-builder-image.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -31,7 +31,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "3.2.9.Final"
+    value: "3.2.10.Final"
   - name: "org.kie.kogito.version"
     value: "999-SNAPSHOT"
   - name: "maintainer"
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 195fdae6c8f..5749630e2d1 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -44,7 +44,7 @@
       - name: "io.openshift.s2i.destination"
         value: "/tmp"
       - name: "io.quarkus.platform.version"
-        value: "3.2.9.Final"
+        value: "3.2.10.Final"
       - name: "org.kie.kogito.version"
         value: "999-SNAPSHOT"
       - name: "maintainer"
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 105a522c5c9..2b61576ad5a 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -43,7 +43,7 @@
 
     labels:
       - name: "io.quarkus.platform.version"
-        value: "3.2.9.Final"
+        value: "3.2.10.Final"
       - name: "org.kie.kogito.version"
         value: "999-SNAPSHOT"
       - name: "maintainer"
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index b9031b3dabc..c2f2068df71 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -26,5 +26,5 @@ envs:
     value: "999-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "3.2.9.Final"
+    value: "3.2.10.Final"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
diff --git a/scripts/README.md b/scripts/README.md
index 28ed41d0912..54326805091 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -158,10 +158,10 @@ This will set the default artifacts version.
 ##### Update quarkus version
 
 ```bash
-$ python update-repository.py --quarkus-platform-version 3.2.9.Final
+$ python update-repository.py --quarkus-platform-version 3.2.10.Final
 ```
 
-This will set the image quarkus version to 3.2.9.Final.
+This will set the image quarkus version to 3.2.10.Final.
 
 ##### Update Examples URI and Ref
 
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 65bc9811502..d81b28e1023 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -4,7 +4,7 @@ Feature: Serverless Workflow images common
 
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
-    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.2.9.Final/quarkus-bom-3.2.9.Final.pom should exist
+    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.2.10.Final/quarkus-bom-3.2.10.Final.pom should exist
       And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From b4cf1cbdf98a8958eb0fdb10e3372152f43c2b3d Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:21:53 -0300
Subject: [PATCH 670/709] Fix #1749 - Rename SonataFlow, jBPM, and Drools
 extensions (#1750)

* Fix #1749 - Rename SonataFlow, jBPM, and Drools extensions

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Review org.kie.kogito to org.kie namespace

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Rename to org.apache.kie.sonataflow

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Fix behave tests log regexp to match extensions descriptions

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Trying to switch back to sh from bash

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Changing behave tests fork to experiment with an older cekit version

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Using jmtd cekit-behave ref

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Fix devmodeui behave tests

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Remove cekit-behave workaround

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

---------

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 modules/kogito-s2i-core/added/s2i-core           |  4 ++--
 modules/kogito-s2i-core/module.yaml              |  2 +-
 .../kogito-swf/builder/build-config/module.yaml  |  3 +--
 modules/kogito-swf/common/scripts/module.yaml    |  2 +-
 .../kogito-swf/devmode/build-config/module.yaml  |  2 +-
 tests/features/common.feature                    |  4 ++--
 tests/features/kogito-s2i-builder.feature        |  2 +-
 tests/features/kogito-swf-builder.feature        |  4 ++--
 tests/features/kogito-swf-common.feature         |  2 +-
 tests/features/kogito-swf-devmode.feature        | 16 ++++++++--------
 10 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
index 46ff1a6094c..7a4070d1351 100644
--- a/modules/kogito-s2i-core/added/s2i-core
+++ b/modules/kogito-s2i-core/added/s2i-core
@@ -154,7 +154,7 @@ function build_kogito_app() {
                     -DprojectGroupId=$PROJECT_GROUP_ID \
                     -DprojectArtifactId=$PROJECT_ARTIFACT_ID \
                     -DprojectVersion=$PROJECT_VERSION \
-                    -Dextensions="org.kie.kogito:kogito-quarkus:${KOGITO_VERSION},quarkus-smallrye-health,quarkus-smallrye-openapi,quarkus-resteasy,quarkus-resteasy-jackson"
+                    -Dextensions="org.jbpm:jbpm-with-drools-quarkus:${KOGITO_VERSION},quarkus-smallrye-health,quarkus-smallrye-openapi,quarkus-resteasy,quarkus-resteasy-jackson"
 
             if [ ! -z ${QUARKUS_EXTRA_EXTENSIONS} ]; then
                 log_info "----> Adding extra Quarkus extensions: ${QUARKUS_EXTRA_EXTENSIONS}"
@@ -236,7 +236,7 @@ function build_kogito_app() {
 
             $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
                 "${quarkus_plugin}":"${quarkus_platform_version}":add-extension \
-                -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION}"
+                -Dextensions="org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION}"
         fi
 
         $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${MAVEN_SETTINGS_PATH}" \
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
index 27f67a4e369..d2e8b05aeb0 100644
--- a/modules/kogito-s2i-core/module.yaml
+++ b/modules/kogito-s2i-core/module.yaml
@@ -70,7 +70,7 @@ envs:
 
   - name: QUARKUS_EXTRA_EXTENSIONS
     description: ^ Defines the Quarkus' extra extensions (as comma-separated list) to be added when performing build from assets.
-    example: "org.kie.kogito:kogito-addons-quarkus-knative-eventing,quarkus-kubernetes"
+    example: "org.kie:kie-addons-quarkus-knative-eventing,quarkus-kubernetes"
 
 modules:
   install:
diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml
index b3563932cd3..f233d8ca128 100644
--- a/modules/kogito-swf/builder/build-config/module.yaml
+++ b/modules/kogito-swf/builder/build-config/module.yaml
@@ -25,6 +25,5 @@ envs:
   - name: "SCRIPT_DEBUG"
     value: "false"
   - name: QUARKUS_EXTENSIONS
-    # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:${KOGITO_VERSION}
+    value: quarkus-kubernetes,smallrye-health,org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie:kie-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie:kie-addons-quarkus-events-process:${KOGITO_VERSION},org.kie:kie-addons-quarkus-process-management:${KOGITO_VERSION},org.kie:kie-addons-quarkus-source-files:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-jobs-knative-eventing:${KOGITO_VERSION}
diff --git a/modules/kogito-swf/common/scripts/module.yaml b/modules/kogito-swf/common/scripts/module.yaml
index 4d10be8a392..dd90f59eb48 100644
--- a/modules/kogito-swf/common/scripts/module.yaml
+++ b/modules/kogito-swf/common/scripts/module.yaml
@@ -23,7 +23,7 @@ description: "Kogito Serverless Workflow image common scripts"
 
 envs:
   - name: QUARKUS_EXTENSIONS
-    example: 'quarkus-kubernetes,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION}'
+    example: 'quarkus-kubernetes,org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION}'
     description: To add extension to your application
 
   - name: PROJECT_GROUP_ID
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml
index 292e0535c73..b67edb9bdb7 100644
--- a/modules/kogito-swf/devmode/build-config/module.yaml
+++ b/modules/kogito-swf/devmode/build-config/module.yaml
@@ -27,4 +27,4 @@ envs:
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow-devui:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION}
+    value: org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION},smallrye-health,org.apache.kie.sonataflow:sonataflow-quarkus-devui:${KOGITO_VERSION},org.kie:kie-addons-quarkus-source-files:${KOGITO_VERSION},org.kie:kie-addons-quarkus-process-management:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-jobs-service-embedded:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-data-index-inmemory:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie:kie-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION}
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 77923242093..4fcbdec223a 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -13,8 +13,8 @@
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
-    When container is started with command bash
-    Then run bash -c 'echo $USER' in container and check its output for kogito
+    When container is started with command sh
+    Then run sh -c 'echo $USER' in container and check its output for kogito
      And run sh -c 'echo $HOME' in container and check its output for /home/kogito
      And run sh -c 'id' in container and check its output for uid=1001(kogito) gid=0(root) groups=0(root),1001(kogito)
 
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 9135d1e24eb..3031b628e84 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -104,7 +104,7 @@ Feature: kogito-s2i-builder image tests
       | PROJECT_ARTIFACT_ID      | myproject                                             |
       | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
       | K_SINK                   | http://localhost:8181                                 |
-      | QUARKUS_EXTRA_EXTENSIONS | org.kie.kogito:kogito-addons-quarkus-knative-eventing |
+      | QUARKUS_EXTRA_EXTENSIONS | org.kie:kie-addons-quarkus-knative-eventing |
     Then file /home/kogito/bin/quarkus-run.jar should exist
     And s2i build log should contain Generating quarkus project structure for myproject...
     And s2i build log should contain Adding Kogito Quarkus Workflows extension to the generated project.
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 2f6f0b544cc..acae47c9ca3 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -15,7 +15,7 @@ Feature: Serverless Workflow builder images
     And container log should contain --no-transfer-progress
     And container log should contain -Duser.home=/home/kogito
     And container log should match regex Installed features:.*kogito-serverless-workflow
-    And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
+    And container log should match regex Installed features:.*kie-addon-knative-eventing-extension
     And container log should match regex Installed features:.*smallrye-health
 
   Scenario: Verify that the application is built and started correctly when QUARKUS_EXTENSIONS env is used
@@ -33,6 +33,6 @@ Feature: Serverless Workflow builder images
     And container log should contain -Duser.home=/home/kogito
     And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
     And container log should match regex Installed features:.*kogito-serverless-workflow
-    And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
+    And container log should match regex Installed features:.*kie-addon-knative-eventing-extension
     And container log should match regex Installed features:.*smallrye-health
     And container log should match regex Installed features:.*security-jdbc
\ No newline at end of file
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index d81b28e1023..f69a482add3 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -5,7 +5,7 @@ Feature: Serverless Workflow images common
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
     Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.2.10.Final/quarkus-bom-3.2.10.Final.pom should exist
-      And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory
+      And file /home/kogito/.m2/repository/org/apache/kie/sonataflow/sonataflow-quarkus/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes
   # to make sure we only have one version of quarkus bom ...
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 471d0e94350..c17ff1f9e69 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -16,10 +16,10 @@ Feature: Serverless Workflow devmode images
     And container log should contain -Duser.home=/home/kogito -o
     And container log should contain -Dquarkus.test.continuous-testing=disabled
     And container log should match regex Installed features:.*kogito-serverless-workflow
-    And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
+    And container log should match regex Installed features:.*kie-addon-knative-eventing-extension
     And container log should match regex Installed features:.*smallrye-health
-    And container log should match regex Installed features:.*kogito-serverless-workflow-devui
-    And container log should match regex Installed features:.*kogito-addon-source-files-extension
+    And container log should match regex Installed features:.*sonataflow-quarkus-devui
+    And container log should match regex Installed features:.*kie-addon-source-files-extension
     And container log should match regex Installed features:.*kogito-addons-quarkus-jobs-service-embedded
     And container log should match regex Installed features:.*kogito-addons-quarkus-data-index-inmemory
 
@@ -55,10 +55,10 @@ Feature: Serverless Workflow devmode images
     And container log should not contain /bin/mvn -B -X --batch-mode -o
     And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
     And container log should match regex Installed features:.*kogito-serverless-workflow
-    And container log should match regex Installed features:.*kogito-addon-knative-eventing-extension
+    And container log should match regex Installed features:.*kie-addon-knative-eventing-extension
     And container log should match regex Installed features:.*smallrye-health
-    And container log should match regex Installed features:.*kogito-serverless-workflow-devui
-    And container log should match regex Installed features:.*kogito-addon-source-files-extension
+    And container log should match regex Installed features:.*sonataflow-quarkus-devui
+    And container log should match regex Installed features:.*kie-addon-source-files-extension
     And container log should match regex Installed features:.*kogito-addons-quarkus-jobs-service-embedded
     And container log should match regex Installed features:.*kogito-addons-quarkus-data-index-inmemory
     And container log should match regex Installed features:.*security-jdbc
@@ -114,14 +114,14 @@ Feature: Serverless Workflow devmode images
     Then check that page is served
       | property             | value                                                              |
       | port                 | 8080                                                               |
-      | path                 | /q/dev-v1/org.kie.kogito.kogito-quarkus-serverless-workflow/dataindex |
+      | path                 | /q/dev-v1/org.kie.kogito-addons-quarkus-data-index-inmemory/dataindex |
       | request_method       | GET                                                                |
       | wait                 | 480                                                                |
       | expected_status_code | 200                                                                |
     And check that page is served
       | property             | value                                                                            |
       | port                 | 8080                                                                             |
-      | path                 | /q/dev-v1/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/workflowInstances |
+      | path                 | /q/dev-ui/org.apache.kie.sonataflow.sonataflow-quarkus-devui/workflows |
       | request_method       | GET                                                                              |
       | wait                 | 480                                                                              |
       | expected_status_code | 200                                                                              |

From e93091be72f6510fed51904b0631654d124bc35a Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:21:45 -0300
Subject: [PATCH 671/709] Issue #1747 - Remove Kogito Operator managed images
 (#1748)

---
 .ci/jenkins/Jenkinsfile.build-image           |   1 -
 .github/pull_request_template.md              |   2 +-
 README.md                                     | 665 +-----------------
 kogito-base-builder-image.yaml                |  68 --
 kogito-imagestream.yaml                       |  84 ---
 kogito-runtime-jvm-image.yaml                 |  83 ---
 kogito-runtime-native-image.yaml              |  80 ---
 kogito-s2i-builder-image.yaml                 | 101 ---
 modules/kogito-epel/7/configure.sh            |  27 -
 modules/kogito-epel/7/module.yaml             |  24 -
 .../22.3-java-11/configure                    |  41 --
 .../22.3-java-11/module.yaml                  |  50 --
 .../23.0-java-17/configure                    |  42 --
 .../23.0-java-17/module.yaml                  |  51 --
 .../22.3-java-11/configure                    |  35 -
 .../22.3-java-11/module.yaml                  |  24 -
 .../common/added/memory-limit.sh              |  60 --
 .../kogito-graalvm-scripts/common/configure   |  24 -
 .../kogito-graalvm-scripts/common/module.yaml |  24 -
 .../common/tests/bats/memory-limits.bats      |  68 --
 modules/kogito-image-dependencies/clean.sh    |  22 -
 modules/kogito-image-dependencies/module.yaml |  33 -
 .../added/kogito-kubernetes-client.sh         |  87 ---
 modules/kogito-kubernetes-client/configure    |  25 -
 modules/kogito-kubernetes-client/module.yaml  |  24 -
 .../tests/bats/kogito-kubernetes-client.bats  |  48 --
 modules/kogito-maven/3.8.x/module.yaml        |  32 -
 modules/kogito-maven/3.9.x/module.yaml        |  32 -
 .../maven-dnf-module/artifacts/maven.module   |   5 -
 .../kogito-maven/maven-dnf-module/configure   |  25 -
 .../kogito-maven/maven-dnf-module/module.yaml |  25 -
 modules/kogito-openjdk/11-headless/clean.sh   |  22 -
 .../kogito-openjdk/11-headless/module.yaml    |  47 --
 modules/kogito-openjdk/11/clean.sh            |  22 -
 modules/kogito-openjdk/11/module.yaml         |  48 --
 modules/kogito-openjdk/17-headless/clean.sh   |  22 -
 .../kogito-openjdk/17-headless/module.yaml    |  47 --
 modules/kogito-openjdk/17/clean.sh            |  21 -
 modules/kogito-openjdk/17/module.yaml         |  47 --
 .../added/kogito-persistence.sh               |  57 --
 modules/kogito-persistence/configure          |  28 -
 modules/kogito-persistence/module.yaml        |  28 -
 .../tests/bats/kogito-persistence.bats        |  96 ---
 modules/kogito-pkg-update/configure           |  32 -
 modules/kogito-pkg-update/module.yaml         |  25 -
 .../added/kogito-app-launch.sh                |  64 --
 modules/kogito-runtime-jvm/configure          |  33 -
 modules/kogito-runtime-jvm/module.yaml        |  24 -
 modules/kogito-runtime-jvm/s2i/bin/assemble   |  25 -
 modules/kogito-runtime-jvm/s2i/bin/usage      |  40 --
 .../added/kogito-app-launch.sh                |  45 --
 modules/kogito-runtime-native/configure       |  33 -
 modules/kogito-runtime-native/module.yaml     |  24 -
 .../kogito-runtime-native/s2i/bin/assemble    |  25 -
 modules/kogito-runtime-native/s2i/bin/usage   |  38 -
 .../added/kogito-app-launch.sh                |  74 --
 modules/kogito-s2i-builder/configure          |  35 -
 modules/kogito-s2i-builder/module.yaml        |  37 -
 modules/kogito-s2i-builder/s2i/bin/assemble   |  78 --
 modules/kogito-s2i-builder/s2i/bin/usage      |  70 --
 modules/kogito-s2i-core/added/s2i-core        | 323 ---------
 modules/kogito-s2i-core/configure.sh          |  31 -
 modules/kogito-s2i-core/module.yaml           |  85 ---
 .../kogito-s2i-core/s2i/bin/assemble-runtime  |  29 -
 modules/kogito-s2i-core/s2i/bin/run           |  21 -
 .../kogito-s2i-core/s2i/bin/save-artifacts    |  23 -
 .../tests/bats/mocks/myapp-0.0.1-runner       | Bin 21736 -> 0 bytes
 .../kogito-s2i-core/tests/bats/s2i-core.bats  | 490 -------------
 scripts/common.py                             |  20 +-
 scripts/run-bats.sh                           |  17 +-
 scripts/update-repository.py                  |  11 -
 tests/features/common-build-runtime.feature   |  11 -
 .../features/common-custom-truststore.feature |   1 -
 .../features/common-dynamic-resources.feature |   2 -
 tests/features/common.feature                 |   4 -
 .../kogito-common-builder-jvm.feature         | 227 ------
 .../kogito-common-runtime-jvm.feature         |  80 ---
 .../kogito-common-runtime-native.feature      |  20 -
 tests/features/kogito-runtime-jvm.feature     |  13 -
 tests/features/kogito-runtime-native.feature  |  13 -
 .../kogito-s2i-builder-native.feature         | 137 ----
 tests/features/kogito-s2i-builder.feature     | 147 ----
 82 files changed, 6 insertions(+), 4798 deletions(-)
 delete mode 100644 kogito-base-builder-image.yaml
 delete mode 100644 kogito-runtime-jvm-image.yaml
 delete mode 100644 kogito-runtime-native-image.yaml
 delete mode 100644 kogito-s2i-builder-image.yaml
 delete mode 100644 modules/kogito-epel/7/configure.sh
 delete mode 100644 modules/kogito-epel/7/module.yaml
 delete mode 100644 modules/kogito-graalvm-installer/22.3-java-11/configure
 delete mode 100644 modules/kogito-graalvm-installer/22.3-java-11/module.yaml
 delete mode 100644 modules/kogito-graalvm-installer/23.0-java-17/configure
 delete mode 100644 modules/kogito-graalvm-installer/23.0-java-17/module.yaml
 delete mode 100644 modules/kogito-graalvm-scripts/22.3-java-11/configure
 delete mode 100644 modules/kogito-graalvm-scripts/22.3-java-11/module.yaml
 delete mode 100644 modules/kogito-graalvm-scripts/common/added/memory-limit.sh
 delete mode 100644 modules/kogito-graalvm-scripts/common/configure
 delete mode 100644 modules/kogito-graalvm-scripts/common/module.yaml
 delete mode 100644 modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats
 delete mode 100644 modules/kogito-image-dependencies/clean.sh
 delete mode 100644 modules/kogito-image-dependencies/module.yaml
 delete mode 100644 modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
 delete mode 100644 modules/kogito-kubernetes-client/configure
 delete mode 100644 modules/kogito-kubernetes-client/module.yaml
 delete mode 100644 modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
 delete mode 100644 modules/kogito-maven/3.8.x/module.yaml
 delete mode 100644 modules/kogito-maven/3.9.x/module.yaml
 delete mode 100644 modules/kogito-maven/maven-dnf-module/artifacts/maven.module
 delete mode 100644 modules/kogito-maven/maven-dnf-module/configure
 delete mode 100644 modules/kogito-maven/maven-dnf-module/module.yaml
 delete mode 100644 modules/kogito-openjdk/11-headless/clean.sh
 delete mode 100644 modules/kogito-openjdk/11-headless/module.yaml
 delete mode 100644 modules/kogito-openjdk/11/clean.sh
 delete mode 100644 modules/kogito-openjdk/11/module.yaml
 delete mode 100644 modules/kogito-openjdk/17-headless/clean.sh
 delete mode 100644 modules/kogito-openjdk/17-headless/module.yaml
 delete mode 100644 modules/kogito-openjdk/17/clean.sh
 delete mode 100644 modules/kogito-openjdk/17/module.yaml
 delete mode 100644 modules/kogito-persistence/added/kogito-persistence.sh
 delete mode 100644 modules/kogito-persistence/configure
 delete mode 100644 modules/kogito-persistence/module.yaml
 delete mode 100644 modules/kogito-persistence/tests/bats/kogito-persistence.bats
 delete mode 100644 modules/kogito-pkg-update/configure
 delete mode 100644 modules/kogito-pkg-update/module.yaml
 delete mode 100644 modules/kogito-runtime-jvm/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-runtime-jvm/configure
 delete mode 100644 modules/kogito-runtime-jvm/module.yaml
 delete mode 100755 modules/kogito-runtime-jvm/s2i/bin/assemble
 delete mode 100644 modules/kogito-runtime-jvm/s2i/bin/usage
 delete mode 100644 modules/kogito-runtime-native/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-runtime-native/configure
 delete mode 100644 modules/kogito-runtime-native/module.yaml
 delete mode 100755 modules/kogito-runtime-native/s2i/bin/assemble
 delete mode 100644 modules/kogito-runtime-native/s2i/bin/usage
 delete mode 100644 modules/kogito-s2i-builder/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-s2i-builder/configure
 delete mode 100644 modules/kogito-s2i-builder/module.yaml
 delete mode 100644 modules/kogito-s2i-builder/s2i/bin/assemble
 delete mode 100644 modules/kogito-s2i-builder/s2i/bin/usage
 delete mode 100644 modules/kogito-s2i-core/added/s2i-core
 delete mode 100644 modules/kogito-s2i-core/configure.sh
 delete mode 100644 modules/kogito-s2i-core/module.yaml
 delete mode 100644 modules/kogito-s2i-core/s2i/bin/assemble-runtime
 delete mode 100644 modules/kogito-s2i-core/s2i/bin/run
 delete mode 100644 modules/kogito-s2i-core/s2i/bin/save-artifacts
 delete mode 100755 modules/kogito-s2i-core/tests/bats/mocks/myapp-0.0.1-runner
 delete mode 100644 modules/kogito-s2i-core/tests/bats/s2i-core.bats
 delete mode 100644 tests/features/common-build-runtime.feature
 delete mode 100644 tests/features/kogito-common-builder-jvm.feature
 delete mode 100644 tests/features/kogito-common-runtime-jvm.feature
 delete mode 100644 tests/features/kogito-common-runtime-native.feature
 delete mode 100644 tests/features/kogito-runtime-jvm.feature
 delete mode 100644 tests/features/kogito-runtime-native.feature
 delete mode 100644 tests/features/kogito-s2i-builder-native.feature
 delete mode 100644 tests/features/kogito-s2i-builder.feature

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index b51a48cf360..892c0343b99 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -181,7 +181,6 @@ pipeline {
                     // Debug purpose in case of issue
                     sh 'cat tests/test-apps/clone-repo.sh'
                     sh 'cat scripts/setup-maven.sh'
-                    sh 'cat tests/features/kogito-s2i-builder.feature'
                 }
             }
         }
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 9511f9aadae..d03a30e151e 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,7 +3,7 @@ Many thanks for submitting your Pull Request :heart:!
 Please make sure your PR meets the following requirements:
 
 - [ ] You have read the [contributors guide](README.md#contributing-to-kogito-images-repository)
-- [ ] Pull Request title is properly formatted: `[KOGITO|RHPAM-XYZ] Subject`
+- [ ] Pull Request title is properly formatted: `[Issue XXXX] Subject`
 - [ ] Pull Request contains link to the JIRA issue
 - [ ] Pull Request contains description of the issue
 - [ ] Pull Request does not include fixes for issues other than the main ticket
diff --git a/README.md b/README.md
index f511a8d4081..1800b4a1190 100644
--- a/README.md
+++ b/README.md
@@ -27,29 +27,6 @@ Table of Contents
 - [Table of Contents](#table-of-contents)
   - [Kogito Images Requirements](#kogito-images-requirements)
   - [Kogito Images JVM Memory Management](#kogito-images-jvm-memory-management)
-  - [Kogito Runtime and Builder Images](#kogito-runtime-and-builder-images)
-    - [Kogito Builder Images](#kogito-builder-images)
-      - [Kogito SWF (Serverless Workflow) Builder Image usage](#kogito-swf-serverless-workflow-builder-image-usage)
-        - [Using as a builder](#using-as-a-builder)
-        - [Using for application development](#using-for-application-development)
-        - [Using the Kogito SWF Builder Image nightly image](#using-the-kogito-swf-builder-image-nightly-image)
-      - [Kogito s2i Builder Image usage](#kogito-s2i-builder-image-usage)
-      - [Kogito s2i Builder Image example](#kogito-s2i-builder-image-example)
-        - [S2i Builder Image Example with Quarkus](#s2i-builder-image-example-with-quarkus)
-        - [S2i Builder Image Example with Springboot](#s2i-builder-image-example-with-springboot)
-      - [Improving Build Time](#improving-build-time)
-        - [Using incremental builds](#using-incremental-builds)
-        - [Using a Maven mirror](#using-a-maven-mirror)
-    - [Kogito Runtime Images](#kogito-runtime-images)
-      - [Binary Builds](#binary-builds)
-        - [KJAR Maven Project](#kjar-maven-project)
-        - [Assets only](#assets-only)
-      - [Kogito Runtime JVM Image](#kogito-runtime-jvm-image)
-        - [Kogito Runtime JVM Image usage](#kogito-runtime-jvm-image-usage)
-        - [Kogito Runtime JVM Image examples](#kogito-runtime-jvm-image-examples)
-      - [Kogito Runtime Native Image](#kogito-runtime-native-image)
-        - [Kogito Runtime Native Image Usage](#kogito-runtime-native-image-usage)
-        - [Kogito Runtime Native Image Example](#kogito-runtime-native-image-example)
   - [Kogito Component Images](#kogito-component-images)
     - [Kogito Data Index Component Images](#kogito-data-index-component-images)
     - [Kogito Jobs Service Component Images](#kogito-jobs-service-component-images)
@@ -57,9 +34,6 @@ Table of Contents
     - [Kogito Management Console Component Image](#kogito-management-console-component-image)
     - [Kogito Task Console Component Image](#kogito-task-console-component-image)
     - [Kogito JIT Runner Component Image](#kogito-jit-runner-component-image)
-  - [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift)
-    - [Using released images](#using-released-images)
-    - [Pushing the built images to a local OCP registry:](#pushing-the-built-images-to-a-local-ocp-registry)
   - [Contributing to Kogito Images repository](#contributing-to-kogito-images-repository)
     - [Building Images](#building-images)
       - [Image Modules](#image-modules)
@@ -124,49 +98,6 @@ The build process will use 80% of the total memory reported by cgroups. For back
 `LIMIT_MEMORY` will be respected, but it is recommended unset it and let the memory be calculated automatic based
 on the available memory, it can be used in specific scenarios, like a CI test where it does not run on OpenShift cluster.
 
-
-## Kogito Runtime and Builder Images
-
-Today, the Kogito images are divided basically in 2 vectors, when we talk about images that would be used to assemble 
-or run Kogito applications: Runtime image and Builder image. 
-Those are described bellow.
-
-
-### Kogito Builder Images
-
-The Kogito Builder Images are responsible for building the project with Apache Maven and generating the binary that will 
-be used by the Kogito Runtime images to run the Kogito application.
-
-There are three builder images available:
-
-
-* [quay.io/kiegroup/kogito-base-builder](https://quay.io/kiegroup/kogito-base-builder)  
-The Kogito base Builder Image is equipped with the following components:
-  * OpenJDK 17.x
-  * Maven 3.9.3
-
-* [quay.io/kiegroup/kogito-swf-builder](https://quay.io/kiegroup/kogito-swf-builder)  
-  The Kogito SWF Builder Image extends the kogito-base-builder is equipped with the following components for faster builds:
-    * Quarkus dependencies
-    * kogito-quarkus-serverless-workflow extension dependencies
-    * kogito-addons-quarkus-knative-eventing extension dependencies
-
-* [quay.io/kiegroup/kogito-s2i-builder](https://quay.io/kiegroup/kogito-s2i-builder)
-
-Former name: `quay.io/kiegroup/kogito-builder`  
-The Kogito s2i builder image supports building applications based on Spring Boot and Quarkus. To define your runtime, specify the `RUNTIME_TYPE` environment variable. If var is not defined, it defaults to `quarkus`.
-When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a native image using GraalVM, which allows you to have lightweight and fast applications ready to run in the Cloud.
-
-The Kogito s2i Builder Image is equipped with the following components:
-
- * GraalVM 23+
- * OpenJDK 17+
- * Maven 3.9.3
- 
-For more information about what is installed on this image, take a look [here](kogito-s2i-builder-image.yaml) in the
-**modules.install** section. 
-
-
 #### SonataFlow Builder Image usage
 
 ##### Using as a builder
@@ -212,389 +143,6 @@ There are 2 environment variables that should not be changed when using it:
 
 That way, no new artifacts will be downloaded and you can directly use it.
 
-#### Kogito s2i Builder Image usage
-
-This image contains a helper option to better understand how to use it:
-
-```bash
-$ docker run -it quay.io/kiegroup/kogito-s2i-builder:latest /home/kogito/kogito-app-launch.sh -h
-```
-
-By default, quarkus is selected as runtime, and a normal java build will be performed. To perform a native build, just set the **NATIVE** build environment variable to **true**.
-
-See the next topic for an example.
- 
-
-#### Kogito s2i Builder Image example
-
-##### S2i Builder Image Example with Quarkus
-In this example, let's use a simple application based on Quarkus that is available in the [Kogito Examples](https://github.com/apache/incubator-kie-kogito-examples)
-repository: the *rules-quarkus-helloworld* example, with native compilation disabled.
-
-
-```bash
-$ s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
-    --ref main \
-    -e RUNTIME_TYPE=quarkus \
-    --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-s2i-builder:latest \
-    rules-example:1.0
-...
-[INFO] BUILD SUCCESS
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time:  08:37 s
-[INFO] Finished at: 2020-04-06T19:13:42Z
-[INFO] ------------------------------------------------------------------------
----> Build finished, installing application from path /tmp/src
----> Installing jar file
-'target/rules-quarkus-helloworld-runner.jar' -> '/home/kogito/bin/rules-quarkus-helloworld-runner.jar'
----> Copying application libraries
-INFO ---> [persistence] Copying persistence files...
-INFO ---> [persistence] Skip copying files, persistence directory does not exist...
-Build completed successfully
-```
-
-After the image is built, let's test it:
-
-```bash
-$ docker run -it -p 8080:8080 rules-example:1.0
- --/ __ \/ / / / _ | / _ \/ //_/ / / / __/ 
- -/ /_/ / /_/ / __ |/ , _/ ,< / /_/ /\ \   
---\___\_\____/_/ |_/_/|_/_/|_|\____/___/   
-2020-04-08 18:59:57,753 INFO  [io.quarkus] (main) rules-quarkus-helloworld 8.0.0-SNAPSHOT (powered by Quarkus 1.3.0.Final) started in 0.839s. Listening on: http://0.0.0.0:8080
-2020-04-08 18:59:57,755 INFO  [io.quarkus] (main) Profile prod activated. 
-2020-04-08 18:59:57,756 INFO  [io.quarkus] (main) Installed features: [cdi, kogito, resteasy, resteasy-jackson, resteasy-jsonb]
-```
-
-In a different shell, try the following command:
-```bash
-$ curl -H "Content-Type: application/json" -X POST -d '{"strings":["hello"]}' http://localhost:8080/hello
-
-# the service will return `["hello", "world"]`
-```
-
-
-
-##### S2i Builder Image Example with Springboot
-In this example, let's use a simple application based on Spring Boot that is available in the [Kogito Examples](https://github.com/apache/incubator-kie-kogito-examples)
-repository: the *process-springboot-example*.
-
-```bash
-$ s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
-    --ref main \
-    --context-dir kogito-springboot-examples/process-springboot-example \
-    -e RUNTIME_TYPE=springboot \
-    quay.io/kiegroup/kogito-s2i-builder:latest \
-    springboot-example:1.0
-```
-
-After the image is built, let's test it:
-
-```bash
-$ docker run -it -p 8080:8080 springboot-example:1.0
-```
-
-In a different shell, try the following commands:
-```bash
-$ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" \
-     -X POST http://localhost:8080/orders
-
-{"id":"10de03c0-828f-4f2e-bb3f-68c3ddfea7ec","approver":"john","order":{"orderNumber":"12345","shipped":false,"total":0.4231905542160477}}✔
-
-$ curl -X GET http://localhost:8080/orders
-$ curl -X DELETE http://localhost:8080/orders/10de03c0-828f-4f2e-bb3f-68c3ddfea7ec
-```
-
-#### Improving Build Time
-
-The time needed to build the application is rather long. This is mainly due to maven downloading all dependencies, which takes several minutes.
-
-
-##### Using incremental builds
-
-If you are planning to build many times the same application, you can use the incremental builds which will improve drastically the build time. 
-Let's start 2 builds with the incremental option enabled and compare the time spent to build each one:
-
-```bash
-# First incremental build
-$ time s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
-    --ref main \
-    -e RUNTIME_TYPE=quarkus
-    --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-s2i-builder:latest \
-    rules-example-incremental:1.0 \
-    --incremental \    
-    --env NATIVE=false
-...
-real	13m49.819s
-user	0m1.768s
-sys	0m1.429s
-```
-
-And now, let's run it again.
-
-```bash
-# Second incremental build
-$ time s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
-    --ref main \
-    -e RUNTIME_TYPE=quarkus
-    --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-s2i-builder:latest \
-    rules-example-incremental:1.0 \
-    --incremental \
-    --env NATIVE=false
-...
-real	0m57.582s
-user	0m1.628s
-sys	0m1.123s
-```
-
-In the second try, you can see the artifacts getting unpacked and reused from the previous build. 
-Now, pay also attention to the time spent to build it. There is a big difference. 
-In fact, an incremental build reuses the previously built image and it takes advantage of already downloaded artifacts. 
-This can significantly improve the build time.
-
-##### Using a Maven mirror
-
-Another option is to use a Maven Mirror.  
-This can be used together with incremental builds to speed up the build even more.  
-To make it possible we just need to set the **MAVEN_MIRROR_URL** environment variable when starting a new build, see the example below:
-
-
-```bash
-# Third incremental build, with Maven mirror option
-$ time s2i build https://github.com/apache/incubator-kie-kogito-examples.git \
-    --ref main \
-    -e RUNTIME_TYPE=quarkus
-    --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \
-    quay.io/kiegroup/kogito-s2i-builder:latest \
-    rules-example-incremental-1 \
-    --incremental \
-    --env NATIVE=false \
-    --env MAVEN_MIRROR_URL=http://nexus.apps.local.cloud/nexus/content/groups/public
-...
-real	0m49.658s
-user	0m0.968s
-sys	0m0.539s
-```
-
-Here you can see that the build time has again been reduced. 
-If the maven mirror already has all the dependencies there, the build time can be even faster.  
-Also, Maven generates lots of transfer logs for downloading/uploading of maven dependencies. By default, these logs are 
-disabled. To view these logs we need to set env variable **MAVEN_DOWNLOAD_OUTPUT** to true. 
-
-If a custom Maven Repository is required, the S2i images also support it.  
-In case the **MAVEN_REPO_URL** environment variable is provided a new Repository and Plugin Repository will be added to the internal `settings.xml` file.  
-If no repo-id is provided using the **MAVEN_REPO_ID** environment variable, a generated one will be used.  
-There is also the possibility to provide more than one custom Repository. In this case, we need to provide the repo **prefix** using the **MAVEN_REPOS** environment variable.  
-Example, if we want to add two new repositories, the following environment variables is needed:
-
-```bash
-MAVEN_REPOS="CENTRAL,COMPANY"
-CENTRAL_MAVEN_REPO_URL="http://central.severinolabs.com/group/public"
-CENTRAL_MAVEN_REPO_ID="my_cool_id_central"
-COMPANY_MAVEN_REPO_URL="http://company.severinolabs.com/group/public"
-COMPANY_MAVEN_REPO_ID="my_cool_id_company"
-``` 
-
-### Kogito Runtime Images
-
-The Kogito Runtime Images have 2 behaviors:
-* Run the artifacts built by the Kogito Builder Images
-* Run your pre-built local artifacts, via what we call a _Binary Build_. 
-For non-native built applications, they have a JRE installed to allow to execute Java applications.
-
-With this approach, we can have smaller and more compact images that do not include any of the build tools or artifacts (like the local maven repository for example).
-
-Today we have the following Kogito Runtime Images:
-
-* [quay.io/kiegroup/kogito-runtime-jvm](https://quay.io/kiegroup/kogito-runtime-jvm)
-* [quay.io/kiegroup/kogito-runtime-native](http://quay.io/kiegroup/kogito-runtime-native)
-
-#### Binary Builds
-
-A Binary Build allows you to quickly copy the built locally artifacts into the target *Kogito Runtime Image*, 
-saving the time needed to build the final image using the method with Kogito Builder Images.
-Below are the supported source structure:
-
-- KJAR Maven Project
-- Assets only
-
-Both methods are described below.
-
-##### KJAR Maven Project
-
-[KieJAR](https://developers.redhat.com/blog/2018/03/14/what-is-a-kjar/) stands for Knowledge Is Everything jar which is a custom JAR file 
-that contains Business Process or Rules and all needed dependencies and files to execute it on the target runtime, 
-either Quarkus or Spring Boot.
-
-If you don't have an already existing project, the best way to create a new one is to use Kogito Maven Archetypes 
-to generate project structure. 
-The available archetypes are:
-
-- [Kogito Quarkus Archetype](https://github.com/apache/incubator-kie-kogito-runtimes/tree/main/archetypes/kogito-quarkus-archetype)
-- [Kogito Spring Boot Archetype](https://github.com/apache/incubator-kie-kogito-runtimes/tree/main/archetypes/kogito-springboot-archetype)
-
-Note that, when building Quarkus based application that is **not** an *UberJAR* we also need to copy the **lib** directory 
-located inside the *target* directory.  
-Examples on how to use this feature can be found in the next topics.
-
-
-##### Assets only
-
-This source structure assumes that there is no maven project but only business assets, stored either directly in the top folder 
-or grouped into directories.
-
-Types of Business assets can be:
-
-- Business Process definition - bpmn2 or just bpmn files
-- Business Rule definition - drl files
-- Business Decision definition - dmn files
-
-Upon build, these assets will be copied to a generated maven project and built with Maven to produce a runnable binary. Default value of group id is "com.company", artifact id is "project" and version is "1.0-SNAPSHOT". To provide custom value we need to set the **PROJECT_GROUP_ID**, **PROJECT_ARTIFACT_ID** and **PROJECT_VERSION**.
-
-#### Kogito Runtime JVM Image
-
-This Kogito Runtime Image contains only the needed files to execute a pre built Kogito application and a JRE.
-The Image can run an application based on Quarkus or Springboot. Users can define `RUNTIME_TYPE` environment variable to switch between the two.
-
-
-##### Kogito Runtime JVM Image usage
-
-This image contains a helper option to better understand how to use it:
-
-```bash
-docker run -it quay.io/kiegroup/kogito-runtime-jvm:latest /home/kogito/kogito-app-launch.sh -h
-```
-
-
-##### Kogito Runtime JVM Image examples
-
-In the next few lines let's take a look on how this image can be used to receive an already built UberJAR. 
-To configure Quarkus to generate an UberJAR please follow the instructions described [here](https://quarkus.io/guides/maven-tooling#configuration-reference)
-
-For this example let's use the [process-quarkus-example](https://github.com/apache/incubator-kie-kogito-examples/tree/stable/kogito-quarkus-examples/process-quarkus-example).
-Once you have checked out the example on your local machine follow the steps below:
-
-**Example with UberJAR**
-```bash
-# build the example using uberjar reference
-$ mvn clean package -Dquarkus.package.uber-jar
-# inspect and run the generated uberjar, for instructions on how to use this example see its README file.
-$ java -jar target/jbpm-quarkus-example-runner.jar 
-
-# performing a source to image build to copy the artifacts to the runtime image
-$ s2i build target/ -e RUNTIME_TYPE=quarkus quay.io/kiegroup/kogito-runtime-jvm:latest process-quarkus-example
-
-# run the generated image
-$ docker run -p 8080:8080 -it process-quarkus-example
-
-# On another shell do a simple post request 
-curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
-
-# notice the container logs the following message:
-Order has been created Order[12345] with assigned approver JOHN
-```
-
-
-**Example with non UberJAR**
-For non uberjar the process is the same, but you only need to remove the property from Quarkus configuration to not generate uberjar.
-```bash
-$ mvn clean package
-```
-
-Note that this time there is a *lib* folder in the **target** directory. The s2i build will take care of copying it to the correct place. 
-Just perform a build:
-
-```bash
-$ s2i build target/ quay.io/kiegroup/kogito-runtime-jvm:latest process-quarkus-example-non-uberjar
-$ docker run -p 8080:8080 -it process-quarkus-example-non-uberjar
-
-# On another shell do a simple post request 
-$ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
-
-# notice the container logs the following message:
-Order has been created Order[12345] with assigned approver JOHN
-```
-**Runtime Image example with springboot**
-Let's try, here, the *process-springboot-example*: 
-
-```bash
-$ mvn clean package
-```
-
-An uberjar file has been generated into the **target directory**. 
-Let's use this uberjar to perform the build:
-
-```bash
-$ s2i build target/ -e RUNTIME_TYPE=springboot quay.io/kiegroup/kogito-runtime-jvm:latest spring-binary-example
------> [s2i-core] Running runtime assemble script
------> Binary build enabled, artifacts were uploaded directly to the image build
------> Cleaning up unneeded jar files
-removed 'process-springboot-example-tests.jar'
-removed 'process-springboot-example-sources.jar'
-removed 'process-springboot-example-test-sources.jar'
------> Copying uploaded files to /home/kogito
----> Installing application binaries
-'./process-springboot-example.jar' -> '/home/kogito/bin/process-springboot-example.jar'
-...
-
-# run the output image
-$ docker run -it -p 8080:8080 spring-binary-example
-
-# on another terminal, interact with the kogito service
-$ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
-
-# notice the container logs the following message:
-Order has been created Order[12345] with assigned approver JOHN
-```
-
-#### Kogito Runtime Native Image
-
-This Kogito Runtime Image contains only the needed files to execute a pre built Kogito application.
-
-
-##### Kogito Runtime Native Image Usage
-
-This image contains a helper option to better understand how to it:
-
-```bash
-docker run -it quay.io/kiegroup/kogito-runtime-native:latest /home/kogito/kogito-app-launch.sh -h
-```
-
-##### Kogito Runtime Native Image Example
-
-For this example, let's use the same as the previous one (process-quarkus-example). 
-But this time, let's perform a native build:
-
-```bash
-$ mvn clean package -Dnative
-```
-
-A binary has been generated into the **target directory**.
-Let's use this binary to perform the source-to-image build:
-
-```bash
-s2i build target/ -e RUNTIME_TYPE=quarkus quay.io/kiegroup/kogito-runtime-native:latest binary-test-example
------> [s2i-core] Running runtime assemble script
------> Binary build enabled, artifacts were uploaded directly to the image build
------> Found binary file, native build.
------> Cleaning up unneeded jar files
-...
----> Installing application binaries
-'./process-quarkus-example-runner' -> '/home/kogito/bin/process-quarkus-example-runner'
-...
-
-# run the output image
-$ docker run -it -p 8080:8080 binary-test-example
-
-# on another terminal, interact with the kogito service
-$ curl -d '{"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}}' -H "Content-Type: application/json" -X POST http://localhost:8080/orders
-
-# notice the container logs the following message:
-Order has been created Order[12345] with assigned approver JOHN
-```
-
 ## Kogito Component Images
 
 The Kogito Component Images can be considered as lightweight images that will complement the Kogito core engine 
@@ -789,199 +337,10 @@ You should notice a few debug messages being printed in the system output. You c
 
 To know what configurations this image accepts please take a look [here](kogito-jit-runner-image.yaml) on the **envs** section.
 
-## Using Kogito Images to Deploy Apps on OpenShift
-
-Once the images are built and imported into a registry (quay.io or any other registry), new applications can be built and deployed within a few steps.
-
-
-### Using released images
-
-As a first step, we need to make the Kogito Images available as Image Streams in OpenShift. If you have `cluster-admin` 
-rights you can deploy it into the **openshift** namespace, otherwise, deploy it into the namespace where you have permissions. 
-To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/apache/incubator-kie-kogito-images/main/kogito-imagestream.yaml).
-It points to the latest released version.
-
-Let's use the *kogito-quarkus-examples/rules-quarkus-helloworld* from [Kogito Examples](https://github.com/apache/incubator-kie-kogito-examples).
-
-```bash
-# creating a new namespace
-$ oc new-project rules-quarkus-helloworld
-Now using project "rules-quarkus-helloworld" on server "https://ocp.lab.cloud:8443".
-
-You can add applications to this project with the 'new-app' command. For example, try:
-
-    oc new-app centos/ruby-25-centos7~https://github.com/sclorg/ruby-ex.git
-
-to build a new example application in Ruby.
-
-# installing the imagestream on the current namespace
-$ oc create -f https://raw.githubusercontent.com/apache/incubator-kie-kogito-images/0.16.0/kogito-imagestream.yaml
-imagestream.image.openshift.io/kogito-runtime-native created
-imagestream.image.openshift.io/kogito-runtime-jvm created
-imagestream.image.openshift.io/kogito-s2i-builder created
-imagestream.image.openshift.io/kogito-data-index-ephemeral created
-imagestream.image.openshift.io/kogito-data-index-postgresql created
-imagestream.image.openshift.io/kogito-jobs-service-ephemeral created
-imagestream.image.openshift.io/kogito-jobs-service-postgresql created
-imagestream.image.openshift.io/kogito-jobs-service-allinone created
-imagestream.image.openshift.io/kogito-management-console created
-
-# performing a new build
-$ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-s2i-builder:latest \ 
-    https://github.com/apache/incubator-kie-kogito-examples.git#main --context-dir=kogito-quarkus-examples/rules-quarkus-helloworld \
-    --strategy=source --env NATIVE=false 
---> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-s2i-builder" under tag "latest" for "kogito-s2i-builder:latest"
-
-    Kogito based on Quarkus 
-    ----------------------- 
-    Platform for building Kogito based on Quarkus
-
-    Tags: builder, kogito, quarkus
-
-    * The source repository appears to match: jee
-    * A source build using source code from https://github.com/apache/incubator-kie-kogito-examples.git#main will be created
-      * The resulting image will be pushed to image stream tag "rules-quarkus-helloworld-builder:latest"
-      * Use 'start-build' to trigger a new build
-
---> Creating resources with label build=drools-helloworld-builder ...
-    imagestreamtag.image.openshift.io "rules-quarkus-helloworld-builder:latest" created
-    buildconfig.build.openshift.io "rules-quarkus-helloworld-builder" created
---> Success
-```
-
-The build has started, you can check the logs with the following command:
-
-```bash
-$ oc logs -f bc/rules-quarkus-helloworld-builder
-```
-
-Once the build is finished, you can now create a new build to copy the generated artifact from the source to image build
-to the Kogito Runtime Image. To do this, execute the following command:
-
-```bash
-$ oc new-build --name=rules-quarkus-helloworld-service --source-image=rules-quarkus-helloworld-builder \
-  --source-image-path=/home/kogito/bin:. --image-stream=kogito-runtime-jvm:latest
---> Found image 1608e71 (6 days old) in image stream "rules-quarkus-helloworld/kogito-runtime-jvm" under tag "latest" for "kogito-runtime-jvm:latest"
-
-    Kogito based on Quarkus JVM image 
-    --------------------------------- 
-    Runtime image for Kogito based on Quarkus JVM image
-
-    Tags: builder, runtime, kogito, quarkus, jvm
-
-    * A source build using <unknown> will be created
-      * The resulting image will be pushed to image stream tag "rules-quarkus-helloworld-service:latest"
-      * Use 'start-build' to trigger a new build
-
---> Creating resources with label build=drools-helloworld-service ...
-    imagestream.image.openshift.io "rules-quarkus-helloworld-service" created
-    buildconfig.build.openshift.io "rules-quarkus-helloworld-service" created
---> Success
-```
-
-Follow the logs with the following command:
-```bash
-$ oc logs -f bc/rules-quarkus-helloworld-service
-```
-
-Once the build gets finished, you need to create an application and use the service image created with the latest command.
-
-```bash
-$ oc new-app rules-quarkus-helloworld-service:latest
-  --> Found image 664b295 (3 minutes old) in image stream "rules-quarkus-helloworld/rules-quarkus-helloworld-service" under tag "latest" for "rules-quarkus-helloworld-service:latest"
-  
-      temp.builder.openshift.io/rules-quarkus-helloworld/rules-quarkus-helloworld-service-1:e8062a99 
-      --------------------------------------------------------------------------------------- 
-      Runtime image for Kogito based on Quarkus JVM image
-  
-      Tags: builder, runtime, kogito, quarkus, jvm
-  
-      * This image will be deployed in deployment config "rules-quarkus-helloworld-service"
-      * Port 8080/tcp will be load balanced by service "rules-quarkus-helloworld-service"
-        * Other containers can access this service through the hostname "rules-quarkus-helloworld-service"
-  
-  --> Creating resources ...
-      deploymentconfig.apps.openshift.io "rules-quarkus-helloworld-service" created
-      service "rules-quarkus-helloworld-service" created
-  --> Success
-      Application is not exposed. You can expose services to the outside world by executing one or more of the commands below:
-       'oc expose svc/rules-quarkus-helloworld-service' 
-      Run 'oc status' to view your app.
-```
-
-As described in the command output, to be able to access the application, we need to expose it to the external world. 
-For that, just execute the command listed in the output above, e.g.:
-
-```bash
-$ oc expose svc/rules-quarkus-helloworld-service
-```
-
-To see the route name, just execute the following command:
-
-```bash
-$ oc get routes
-NAME                               HOST/PORT                                                                     PATH      SERVICES                           PORT       TERMINATION   WILDCARD
-rules-quarkus-helloworld-service   rules-quarkus-helloworld-service-rules-quarkus-helloworld.apps.lab.cloud                rules-quarkus-helloworld-service   8080-tcp                 None
-```
-
-Now, with the service address in hand we can test our service:
-
-```bash
-$ curl -H "Content-Type: application/json" -X POST -d '{"strings":["hello"]}' \
-     http://rules-quarkus-helloworld-service-rules-quarkus-helloworld.apps.lab.cloud/hello
-```
-
-As output, you should see the following response:
-
-```json
-["hello","world"]
-```
-
-
-For more complex deployment, please use the [Kogito Cloud Operator](https://github.com/apache/incubator-kie-kogito-operator)
-
-
-
-### Pushing the built images to a local OCP registry:
-
-To be able to build the image it should be installed and available on OpenShift before it can be used.
-
-Suppose we have built the kogito-s2i-builder with the following command:
-
-```bash
-$ make build-image image_name=kogito-s2i-builder
-```
-
-We'll have as output the following image:
-
-```bash
-quay.io/kiegroup/kogito-s2i-builder:X.X.X
-```
-
-Then we need to tag the image properly. 
-Suppose your local registry is openshift.local.registry:8443, you should do:
-
-```bash
-$ docker tag quay.io/kiegroup/kogito-s2i-builder:X.X.X \
-    openshift.local.registry:8443/{NAMESPACE}/kogito-s2i-builder:X.X.X
-```
-
-Where the namespace is the place where you want the image to be available for usage. 
-Once the image is properly tagged, log in to the registry and push the new image:
-
-```bash
-$ docker login -u <USERNAME> -p <PASSWORD>  openshift.local.registry:8443
-$ docker push  openshift.local.registry:8443/{NAMESPACE}/kogito-s2i-builder:X.X.X
-```
-
-To deploy and test the new image, follow the same steps as described [here](#using-released-images)
-
-
 ## Contributing to Kogito Images repository
 
 Before proceeding please make sure you have checked the [requirements](#kogito-images-requirements).
 
-
 ### Building Images
 
 To build the images for local testing there is a [Makefile](./Makefile) which will do all the hard work for you.
@@ -1003,9 +362,6 @@ With this Makefile you can:
  
 - Build images individually, by default it will build and test each image
      ```bash
-     $ make build-image image_name=kogito-s2i-builder
-     $ make build-image image_name=kogito-runtime-jvm-ubi8
-     $ make build-image image_name=kogito-runtime-native
      $ make build-image image_name=kogito-data-index-ephemeral
      $ make build-image image_name=kogito-data-index-postgresql
      $ make build-image image_name=kogito-jobs-service-ephemeral
@@ -1070,26 +426,15 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-data-index-common](modules/kogito-data-index-common): Data Index common module.
 - [kogito-data-index-ephemeral](modules/kogito-data-index-ephemeral): Installs and Configure the ephemeral PostgreSQL data-index jar inside the image.
 - [kogito-data-index-postgresql](modules/kogito-data-index-postgresql): Installs and Configure the PostgreSQL data-index jar inside the image.
-- [kogito-epel](modules/kogito-epel): Configures the epel repository on the target image.
-- [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image.
-- [kogito-graalvm-scripts](modules/kogito-graalvm-scripts): Configures the GraalVM on the target image and provides custom configuration script. 
-- [kogito-image-dependencies](modules/kogito-image-dependencies): Installs rpm packages on the target image. Contains common dependencies for Kogito Images.
 - [kogito-jobs-service-common](modules/kogito-jobs-service-common): Job service common module
 - [kogito-jobs-service-ephemeral](modules/kogito-jobs-service-ephemeral): Installs and Configure the in-memory jobs-service jar inside the image
 - [kogito-jobs-service-postgresql](modules/kogito-jobs-service-postgresql): Installs and Configure the postgresql jobs-service jar inside the image
 - [kogito-jobs-service-allinone](modules/kogito-jobs-service-all-in-one): Provides the runner script that supports all jobs-service flavors
-- [kogito-kubernetes-client](modules/kogito-kubernetes-client): Provides a simple wrapper to interact with Kubernetes API.
 - [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
 - [kogito-logging](modules/kogito-logging): Provides common logging functions.
 - [kogito-management-console](modules/kogito-management-console): Installs and Configure the management-console jar inside the image
 - [kogito-jit-runner](modules/kogito-jit-runner): Installs and Configure the jit-runner jar inside the image
-- [kogito-maven](modules/kogito-maven): Installs and configure Maven on the S2I images, also provides custom configuration script.
-- [kogito-openjdk](modules/kogito-openjdk): Provides OpenJDK and JRE.
-- [kogito-persistence](modules/kogito-persistence): Provides the needed configuration scripts to properly configure the Kogito Services in the target image.
-- [kogito-runtime-native](modules/kogito-runtime-native): Main module for the quay.io/kiegroup/kogito-runtime-native image.
-- [kogito-runtime-jvm](modules/kogito-runtime-jvm): Main module for the quay.io/kiegroup/kogito-runtime-jvm image.
-- [kogito-s2i-builder](modules/kogito-s2i-builder): Main module for the quay.io/kiegroup/kogito-s2i-builder image.
-- [kogito-s2i-core](modules/kogito-s2i-core): Provides the source-to-image needed scripts and configurations.
+- [kogito-maven](modules/kogito-maven): Provides custom configuration script.
 
 
 For each image, we use a specific *-image.yaml file.
@@ -1102,10 +447,6 @@ Please inspect the image files to learn which modules are being installed on eac
 - [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml) 
 - [quay.io/kiegroup/kogito-management-console](kogito-management-console-image.yaml)
 - [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-image.yaml)
-- [quay.io/kiegroup/kogito-runtime-jvm](kogito-runtime-jvm-image.yaml)
-- [quay.io/kiegroup/kogito-runtime-native](kogito-runtime-native-image.yaml)
-- [quay.io/kiegroup/kogito-s2i-builder](kogito-s2i-builder-image.yaml)
-
 
 ### Testing Images
 
@@ -1129,12 +470,12 @@ See [Writing Behave Tests](#writing-behave-tests).
 
 Example:
 ```bash
-make build-image image_name=kogito-s2i-builder test_options=--wip
+make build-image image_name=kogito-swf-builder test_options=--wip
 ```
 
 Or by name:
 ```bash
-make build-image image_name=kogito-s2i-builder test_options=--name <Test Scenario Name>
+make build-image image_name=kogito-swf-builder test_options=--name <Test Scenario Name>
 ```
 
 You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
deleted file mode 100644
index 92964f745fb..00000000000
--- a/kogito-base-builder-image.yaml
+++ /dev/null
@@ -1,68 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-base-builder"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"
-
-labels:
-  - name: "io.openshift.s2i.scripts-url"
-    value: "image:///usr/local/s2i"
-  - name: "io.openshift.s2i.destination"
-    value: "/tmp"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-  - name: "io.quarkus.platform.version"
-    value: "3.2.10.Final"
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Platform for building Kogito based on JDK and Maven"
-  - name: "io.k8s.display-name"
-    value: "Kogito based on JDK and Maven"
-  - name: "io.openshift.tags"
-    value: "base-builder,kogito"
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.maven
-      version: "3.9.3"
-    - name: org.kie.kogito.maven.common
-    - name: org.kie.kogito.project.versions
-    - name: org.kie.kogito.security.custom.truststores
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 139458273b8..71fec5708c8 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -24,69 +24,6 @@ metadata:
     description: ImageStream definitions for Kogito images
     openshift.io/provider-display-name: Kie Group.
 items:
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-runtime-native
-      annotations:
-        openshift.io/display-name: Runtime image for Kogito based on Quarkus native image
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for Kogito based on Quarkus native image
-            iconClass: icon-jbpm
-            tags: runtime,kogito,quarkus
-            supports: quarkus
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-runtime-native:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-runtime-jvm
-      annotations:
-        openshift.io/display-name: Runtime image for Kogito based on Quarkus or Springboot JVM image
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for Kogito based on Quarkus or Springboot JVM image
-            iconClass: icon-jbpm
-            tags: runtime,kogito,quarkus,springboot,jvm
-            supports: quarkus
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-runtime-jvm:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-s2i-builder
-      annotations:
-        openshift.io/display-name: Platform for building Kogito based on Quarkus or Springboot
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Platform for building Kogito based on Quarkus or Springboot
-            iconClass: icon-jbpm
-            tags: s2i-builder,kogito,quarkus,springboot
-            supports: quarkus
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-s2i-builder:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -108,27 +45,6 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-swf-builder:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-base-builder
-      annotations:
-        openshift.io/display-name: Kogito base builder
-        openshift.io/provider-display-name: KIE Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Kogito base builder
-            iconClass: icon-jbpm
-            tags: kogito,jdk,maven
-            supports: quarkus
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
deleted file mode 100644
index a16aa13e787..00000000000
--- a/kogito-runtime-jvm-image.yaml
+++ /dev/null
@@ -1,83 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-runtime-jvm"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito based on Quarkus or Springboot JVM image"
-
-labels:
-  - name: "io.openshift.s2i.scripts-url"
-    value: "image:///usr/local/s2i"
-  - name: "io.openshift.s2i.destination"
-    value: "/tmp"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-  - name: "io.quarkus.platform.version"
-    value: "3.2.10.Final"
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
-  - name: "io.k8s.display-name"
-    value: "Kogito based on Quarkus or Spring Boot JVM image"
-  - name: "io.openshift.tags"
-    value: "runtime,kogito,quarkus,springboot,jvm"
-  - name: "io.openshift.s2i.assemble-input-files"
-    value: "/home/kogito/bin"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "RUNTIME_TYPE"
-    example: "springboot"
-    description: "Defines the runtime type of your Kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus."
-  - name: JAVA_OPTIONS
-    example: "-Dquarkus.log.level=DEBUG"
-    description: JVM options passed to the Java command.
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.openjdk.headless
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.project.versions
-    - name: org.kie.kogito.s2i.core
-    - name: org.kie.kogito.runtime.jvm
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml
deleted file mode 100644
index e75649ff54a..00000000000
--- a/kogito-runtime-native-image.yaml
+++ /dev/null
@@ -1,80 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-runtime-native"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Runtime image for Kogito based on Quarkus native image"
-
-labels:
-  - name: "io.openshift.s2i.scripts-url"
-    value: "image:///usr/local/s2i"
-  - name: "io.openshift.s2i.destination"
-    value: "/tmp"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-  - name: "io.quarkus.platform.version"
-    value: "3.2.10.Final"
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito based on Quarkus native image"
-  - name: "io.k8s.display-name"
-    value: "Kogito based on Quarkus native image"
-  - name: "io.openshift.tags"
-    value: "runtime,kogito,quarkus,native"
-  - name: "io.openshift.s2i.assemble-input-files"
-    value: "/home/kogito/bin"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: JAVA_OPTIONS
-    example: "-Dquarkus.log.level=DEBUG"
-    description: JVM options passed to the Java command.
-  - name: BINARY_BUILD
-    example: "true"
-    description: Enables binary builds for this image, meaning that the application binaries (e.g. maven target directory) will be uploaded to it.
-
-packages:
-  manager: microdnf
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.project.versions
-    - name: org.kie.kogito.s2i.core
-    - name: org.kie.kogito.runtime.native
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
deleted file mode 100644
index 10e7520b73b..00000000000
--- a/kogito-s2i-builder-image.yaml
+++ /dev/null
@@ -1,101 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-s2i-builder"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
-description: "Platform for building Kogito based on Quarkus or Springboot"
-
-labels:
-  - name: "io.openshift.s2i.scripts-url"
-    value: "image:///usr/local/s2i"
-  - name: "io.openshift.s2i.destination"
-    value: "/tmp"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-  - name: "io.quarkus.platform.version"
-    value: "3.2.10.Final"
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Platform for building Kogito based on Quarkus or Spring Boot"
-  - name: "io.k8s.display-name"
-    value: "Kogito based on Quarkus or Spring Boot"
-  - name: "io.openshift.tags"
-    value: "s2i-builder,kogito,quarkus,springboot"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "RUNTIME_TYPE"
-    example: "springboot"
-    description: "Defines the runtime type of your kogito application. Allowed values are 'springboot' or 'quarkus'. Default value is quarkus. Applies only at build time, except for binary builds, for runtime and binary builds, it is populated during runtime by identifying the runtime type based on the provided application jar."
-  - name: NATIVE
-    example: true
-    description: If set to true, perform a native build. Only supported for RUNTIME_TYPE is 'quarkus'.
-  - name: JAVA_OPTIONS
-    example: "-Dquarkus.log.level=DEBUG"
-    description: JVM options passed to the Java command.
-  - name: MAVEN_ARGS_APPEND
-    example: "-pl mymodule -am"
-    description: Additional Maven arguments
-  - name: ARTIFACT_DIR
-    example: mymodule/target
-    description: Path to target/ where the jar files are created for multi-module builds
-
-packages:
-  manager: microdnf
-  install:
-    - bc
-    - gcc
-    - gcc-c++
-    - glibc-devel
-    - zlib-devel
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.image.dependencies
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.graalvm.java17.installer
-      version: "23.0"
-    - name: org.kie.kogito.graalvm.common.scripts
-    - name: org.kie.kogito.openjdk
-      version: "17"
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.maven
-      version: "3.9.3"
-    - name: org.kie.kogito.maven.common
-    - name: org.kie.kogito.project.versions
-    - name: org.kie.kogito.s2i.core
-    - name: org.kie.kogito.s2i.builder
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
diff --git a/modules/kogito-epel/7/configure.sh b/modules/kogito-epel/7/configure.sh
deleted file mode 100644
index ee946345f6a..00000000000
--- a/modules/kogito-epel/7/configure.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-set -e
-
-rpm -i https://download.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-
-
-microdnf clean all
-rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-epel/7/module.yaml b/modules/kogito-epel/7/module.yaml
deleted file mode 100644
index 3a84cf27baa..00000000000
--- a/modules/kogito-epel/7/module.yaml
+++ /dev/null
@@ -1,24 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.epel
-version: "7"
-
-execute:
-  - script: configure.sh
diff --git a/modules/kogito-graalvm-installer/22.3-java-11/configure b/modules/kogito-graalvm-installer/22.3-java-11/configure
deleted file mode 100644
index 7ce473e7142..00000000000
--- a/modules/kogito-graalvm-installer/22.3-java-11/configure
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-architecture=$(uname -i)
-
-if [ "$architecture" = "x86_64" ]; then
-    arch='amd64'
-elif [ "$architecture" = "aarch64" ]; then
-    arch='aarch64'
-else
-    exit 0
-fi
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-tar xzf "${SOURCES_DIR}"/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}".tar.gz -C /usr/share
-mv /usr/share/graalvm-ce-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}" /usr/share/graalvm
-
-#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
-mkdir -p "${KOGITO_HOME}"/ssl-libs
-cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
-cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
diff --git a/modules/kogito-graalvm-installer/22.3-java-11/module.yaml b/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
deleted file mode 100644
index 5a5c81a54a4..00000000000
--- a/modules/kogito-graalvm-installer/22.3-java-11/module.yaml
+++ /dev/null
@@ -1,50 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.graalvm.java11.installer
-version: "22.3"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_HOME"
-    value: "/usr/share/graalvm"
-  #version without prefix ce
-  - name: "GRAALVM_VERSION"
-    value: "22.3.2"
-  - name: "GRAALVM_JAVA_VERSION"
-    value: "11"
-
-artifacts:
-  - name: graalvm-ce-java11-linux-amd64-22.3.2.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java11-linux-amd64-22.3.2.tar.gz
-    md5: 68c9e14932ac6c8606953b88aff89cf4
-  - name: graalvm-ce-java11-linux-aarch64-22.3.2.tar.gz
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java11-linux-aarch64-22.3.2.tar.gz
-    md5: 5cb31954ef5538057d83502c19492ad0
-  - name: native-image-installable-svm-java11-linux-amd64-22.3.2.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/native-image-installable-svm-java11-linux-amd64-22.3.2.jar
-    md5: dae44733baf47ffaadf7ef98959b5653
-  - name: native-image-installable-svm-java11-linux-aarch64-22.3.2.jar
-    url: https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/native-image-installable-svm-java11-linux-aarch64-22.3.2.jar
-    md5: 9d87d8650aa17e2ec375a587dc445651
-
-execute:
-  - script: configure
-
diff --git a/modules/kogito-graalvm-installer/23.0-java-17/configure b/modules/kogito-graalvm-installer/23.0-java-17/configure
deleted file mode 100644
index b88d4b06385..00000000000
--- a/modules/kogito-graalvm-installer/23.0-java-17/configure
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-architecture=$(uname -i)
-
-if [ "$architecture" = "x86_64" ]; then
-    arch='amd64'
-elif [ "$architecture" = "aarch64" ]; then
-    arch='aarch64'
-else
-    exit 0
-fi
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-tar xzf "${SOURCES_DIR}"/mandrel-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}"-Final.tar.gz -C /usr/share
-mv /usr/share/mandrel-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}-Final" /usr/share/graalvm
-
-#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image
-# Java 17 + Mandrel: libsunec.so is not distributed in Mandrel
-#mkdir -p "${KOGITO_HOME}"/ssl-libs
-#cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs
-cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/
diff --git a/modules/kogito-graalvm-installer/23.0-java-17/module.yaml b/modules/kogito-graalvm-installer/23.0-java-17/module.yaml
deleted file mode 100644
index 83cee0a3d4b..00000000000
--- a/modules/kogito-graalvm-installer/23.0-java-17/module.yaml
+++ /dev/null
@@ -1,51 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.graalvm.java17.installer
-version: "23.0"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_HOME"
-    value: "/usr/share/graalvm"
-  - name: "GRAALVM_VERSION"
-    value: "23.0.2.1"
-  - name: "GRAALVM_JAVA_VERSION"
-    value: "17"
-
-packages:
-  manager: microdnf
-  install:
-    - freetype-devel
-    - gcc
-    - glibc-devel
-    - libstdc++-static
-    - zlib-devel
-
-artifacts:
-  - name: mandrel-java17-linux-amd64-23.0.2.1-Final.tar.gz
-    url: https://github.com/graalvm/mandrel/releases/download/mandrel-23.0.2.1-Final/mandrel-java17-linux-amd64-23.0.2.1-Final.tar.gz
-    md5: b026ea8d357b13702f9cd05f3d87f64a
-  - name: mandrel-java17-linux-aarch64-23.0.2.1-Final.tar.gz
-    url: https://github.com/graalvm/mandrel/releases/download/mandrel-23.0.2.1-Final/mandrel-java17-linux-aarch64-23.0.2.1-Final.tar.gz
-    md5: e3143fe4bb21267087cca3ca66ae6af2
-
-execute:
-  - script: configure
diff --git a/modules/kogito-graalvm-scripts/22.3-java-11/configure b/modules/kogito-graalvm-scripts/22.3-java-11/configure
deleted file mode 100644
index b39969f7b7c..00000000000
--- a/modules/kogito-graalvm-scripts/22.3-java-11/configure
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-architecture=$(uname -i)
-arch=${architecture}
-
-if [ "$architecture" = "x86_64" ]; then
-    arch='amd64'
-elif [ "$architecture" = "aarch64" ]; then
-    arch='aarch64'
-else
-    exit 0
-fi
-
-SOURCES_DIR=/tmp/artifacts
-
-/usr/share/graalvm/bin/gu -L install "${SOURCES_DIR}"/native-image-installable-svm-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}".jar
diff --git a/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml b/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml
deleted file mode 100644
index 49a2e2b389a..00000000000
--- a/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml
+++ /dev/null
@@ -1,24 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.graalvm.scripts
-version: "22.3-java-11"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-graalvm-scripts/common/added/memory-limit.sh b/modules/kogito-graalvm-scripts/common/added/memory-limit.sh
deleted file mode 100644
index 7b5e53bc6b2..00000000000
--- a/modules/kogito-graalvm-scripts/common/added/memory-limit.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-#
-# Limit memory usage for Graal VM native builds
-# for more info access https://issues.jboss.org/browse/KOGITO-306
-#
-# For now we only limit the memory usage based on the LIMIT_MEMORY env which is set by the operator in bytes.
-# the default value is JVM builds 1Gi and for 4Gi for native builds
-#
-# TODO: rely on cgroups to detect the container limits to define the memory usage based on the total memory available on the container.
-
-# configure the GraalVM build memory usage limit based on the LIMIT_MEMORY env
-# its value must be in binary bytes.
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-source "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/container-limits
-
-function configure() {
-    # backwards compatibility, if LIMIT_MEMORY it is set honor it
-    if [ "${LIMIT_MEMORY}x" != "x" ]; then
-        CONTAINER_MAX_MEMORY="${LIMIT_MEMORY}"
-        log_info "Using backwards compatibility with LIMIT_MEMORY env, if you want to rely com cgroups, unset this env."
-    fi
-    if [[  "${CONTAINER_MAX_MEMORY}" =~ ^[-+]?[0-9]+{9}$ ]]; then
-        # native builds requires at least 1024m (1073741824=1024MB - 1 MB = 2^20 B in base 2)
-        local limit=1073741824
-        # only 80% of the actual limit will be used for the JVM
-        local jvm_limit_memory=$(awk -vn="${CONTAINER_MAX_MEMORY}" 'BEGIN{printf("%.0f\n",n*0.8)}')
-
-        if [ "${jvm_limit_memory}" -lt "${limit}" ]; then
-            limit=$(echo "scale=1; ${limit} / (80/100)" | bc -l)
-            printf "Available memory (${CONTAINER_MAX_MEMORY}) limit is too small (should be greater than %.0f bytes), native build will use all available memory.\n" "${limit}"
-        else
-            log_info "Limit memory for this container is set to ${CONTAINER_MAX_MEMORY}. Allocated memory for JVM will be set to ${jvm_limit_memory}."
-            export KOGITO_OPTS="${KOGITO_OPTS} -Dquarkus.native.native-image-xmx=${jvm_limit_memory}"
-        fi
-    else
-        log_warning "Not able to determine the available memory. Using all memory available."
-    fi
-}
-
diff --git a/modules/kogito-graalvm-scripts/common/configure b/modules/kogito-graalvm-scripts/common/configure
deleted file mode 100644
index 8d0a9cae070..00000000000
--- a/modules/kogito-graalvm-scripts/common/configure
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SCRIPT_DIR=$(dirname "${0}")
-
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
diff --git a/modules/kogito-graalvm-scripts/common/module.yaml b/modules/kogito-graalvm-scripts/common/module.yaml
deleted file mode 100644
index a9ec2e0a04b..00000000000
--- a/modules/kogito-graalvm-scripts/common/module.yaml
+++ /dev/null
@@ -1,24 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.graalvm.common.scripts
-version: "999-SNAPSHOT"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats b/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats
deleted file mode 100644
index 7037115807a..00000000000
--- a/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=/tmp/kogito
-export JBOSS_CONTAINER_JAVA_JVM_MODULE=${KOGITO_HOME}/launch
-mkdir -p "${KOGITO_HOME}"/launch
-cp $BATS_TEST_DIRNAME/../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-cp $BATS_TEST_DIRNAME/../../../../kogito-dynamic-resources/added/container-limits "${KOGITO_HOME}"/launch/
-
-# imports
-source $BATS_TEST_DIRNAME/../../added/memory-limit.sh
-
-@test "test a valid memory limit value" {
-    export LIMIT_MEMORY="1342177280"
-    local expected=" -Dquarkus.native.native-image-xmx=1073741824" # 80% of LIMIT_MEMORY, top expected by JVM
-    configure
-    echo "Expected: ${expected}"
-    echo "Result: ${KOGITO_OPTS}"
-    [ "${expected}" = "${KOGITO_OPTS}" ]
-}
-
-@test "test a result jvm memory with float points" {
-    export LIMIT_MEMORY="2147483648" # 80% is 1717986918.4
-    local expected=" -Dquarkus.native.native-image-xmx=1717986918"
-    configure
-    echo "Expected: ${expected}"
-    echo "Result: ${KOGITO_OPTS}"
-    [ "${expected}" = "${KOGITO_OPTS}" ]
-}
-
-@test "test a small memory limit value" {
-    export LIMIT_MEMORY="1073741600"
-    local expected="Available memory (1073741600) limit is too small"
-    run configure
-    local result="${lines[1]}"
-    echo "Expected: ${expected}"
-    echo "Result is ${result}"
-    [[ "${result}" == *"${expected}"* ]]
-}
-
-@test "test a invalid memory limit value" {
-    function log_warning() { echo "WARN ${1}"; }
-    export LIMIT_MEMORY="1024m"
-    local expected="WARN Not able to determine the available memory. Using all memory available."
-    run configure
-    echo "Expected: ${expected}"
-    echo "Result: ${lines[@]}"
-    [ "${lines[0]}" = "INFO Using backwards compatibility with LIMIT_MEMORY env, if you want to rely com cgroups, unset this env." ]
-    [ "${lines[1]}" = "WARN Not able to determine the available memory. Using all memory available." ]
-}
diff --git a/modules/kogito-image-dependencies/clean.sh b/modules/kogito-image-dependencies/clean.sh
deleted file mode 100644
index 5b184d1a00b..00000000000
--- a/modules/kogito-image-dependencies/clean.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-microdnf clean all
-rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml
deleted file mode 100644
index bae10fce552..00000000000
--- a/modules/kogito-image-dependencies/module.yaml
+++ /dev/null
@@ -1,33 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.image.dependencies
-version: "999-SNAPSHOT"
-description: holds common dependencies across images
-
-execute:
-  - script: clean.sh
-
-packages:
-  install:
-    - file
-    - shadow-utils
-    - tar
-    - gzip
-    - unzip
diff --git a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
deleted file mode 100644
index ad347c76221..00000000000
--- a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-# imports
-source "${KOGITO_HOME}"/launch/logging.sh
-
-# checks if this script is running on a Kubernetes environment
-function is_running_on_kubernetes() {
-    if [ -e /var/run/secrets/kubernetes.io/serviceaccount/token ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-# lists or gets a resource kind in the given api within the namespace and return a JSON response
-# ${1} api, e.g. "apis/apps" (for core APIs, use just "api")
-# ${2} resource, e.g. "deployments/${resource_name}". To list a resource, don't specify the resource name
-# ${3} labels (list only), restrict resources by these labels. e.g. app=myapp. Defaults to empty
-# ${4} fields (list only), restrict resources by these fields. e.g. metadata.name=${resource_name}. see: https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/
-# see: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.14/
-# to parse this response, use jq: https://stedolan.github.io/jq/tutorial/
-function list_or_get_k8s_resource() {
-    local api="${1}"
-    local resource="${2}"
-    local labels="${3}"
-    local fields="${4}"
-    
-    log_info "--> [k8s-client] Trying to fetch Kubernetes API ${api} for resource ${resource}"
-
-    if is_running_on_kubernetes; then 
-        namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
-        token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
-        response=$(curl -s -w "%{http_code}" --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
-            -H "Authorization: Bearer $token" \
-            -H 'Accept: application/json' \
-            "${KUBERNETES_SERVICE_PROTOCOL:-https}://${KUBERNETES_SERVICE_HOST:-kubernetes.default.svc}:${KUBERNETES_SERVICE_PORT:-443}/${api}/v1/namespaces/${namespace}/${resource}?labelSelector=${labels}\&fieldSelector=${fields}")
-        log_info "${response}"
-    else
-        log_info "--> [k8s-client] Not running on Kubernetes, skipping..."
-    fi
-}
-
-# sends a patch request to the Kubernetes API using JSON merge strategy
-# ${1} api, e.g. "apis/apps" (for core APIs, leave in blank)
-# ${2} resource, e.g. "deployments/${resource_name}"
-# ${3} json_body file in JSON Patch format: http://jsonpatch.com/ Example: [ { "op": "replace", "path": "/metadata/annotations", "value" : {} }, {"op": "replace", "path": "/data", "value": {"file1.proto", "file2.proto"}  } ]
-# see: https://kubernetes.io/docs/tasks/run-application/update-api-object-kubectl-patch/#use-a-json-merge-patch-to-update-a-deployment
-function patch_json_k8s_resource() {
-    local api="${1}"
-    local resource="${2}"
-    local file="${3}"
-    
-    log_info "--> [k8s-client] Trying to patch resource ${resource} in Kubernetes API ${api}"
-
-    if is_running_on_kubernetes; then
-        namespace=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
-        token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
-        response=$(curl --request PATCH -s -w "%{http_code}" --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
-            -H "Authorization: Bearer $token" \
-            -H 'Accept: application/json' \
-            -H 'Content-Type: application/json-patch+json' \
-            --data "@${file}" \
-            "${KUBERNETES_SERVICE_PROTOCOL:-https}://${KUBERNETES_SERVICE_HOST:-kubernetes.default.svc}:${KUBERNETES_SERVICE_PORT:-443}/${api}/v1/namespaces/${namespace}/${resource}")
-        echo "${response}"
-    else
-        log_info "--> [k8s-client] Not running on Kubernetes, skipping..."
-    fi
-}
\ No newline at end of file
diff --git a/modules/kogito-kubernetes-client/configure b/modules/kogito-kubernetes-client/configure
deleted file mode 100644
index edee947fd57..00000000000
--- a/modules/kogito-kubernetes-client/configure
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-SCRIPT_DIR=$(dirname "${0}")
-
-# kogito-kubernetes-client
-mkdir -p "${KOGITO_HOME}"/launch/
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
-chmod +x-w "${KOGITO_HOME}"/launch/kogito-kubernetes-client.sh
\ No newline at end of file
diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml
deleted file mode 100644
index 0b69f553a52..00000000000
--- a/modules/kogito-kubernetes-client/module.yaml
+++ /dev/null
@@ -1,24 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.kubernetes.client
-version: "999-SNAPSHOT"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats b/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
deleted file mode 100644
index 6f4df27e192..00000000000
--- a/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=$BATS_TMPDIR/kogito_home
-mkdir -p "${KOGITO_HOME}"/launch
-
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-
-# imports
-source $BATS_TEST_DIRNAME/../../added/kogito-kubernetes-client.sh
-
-@test "list_or_get_k8s_resource sanity check" {
-    run list_or_get_k8s_resource "" "configmaps/my-config-map"
-
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "INFO --> [k8s-client] Trying to fetch Kubernetes API  for resource configmaps/my-config-map" ]
-    [ "${lines[1]}" = "INFO --> [k8s-client] Not running on Kubernetes, skipping..." ]
-}
-
-@test "patch_json_k8s_resource sanity check" {
-    run patch_json_k8s_resource "" "configmaps/my-config-map" "{ spec: {data: []}}"
-
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "INFO --> [k8s-client] Trying to patch resource configmaps/my-config-map in Kubernetes API " ]
-    [ "${lines[1]}" = "INFO --> [k8s-client] Not running on Kubernetes, skipping..." ]
-}
\ No newline at end of file
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
deleted file mode 100644
index 2749d798b59..00000000000
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ /dev/null
@@ -1,32 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.maven
-version: "3.8.6"
-
-envs:
-  - name: "MAVEN_VERSION"
-    value: "3.8.6"
-
-# unfortunately by now the version needs to be hardcoded.
-artifacts:
-  - name: apache-maven-3.8.6-bin.tar.gz
-    url: https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz
-    md5: 0e07de4a7b5c84ebed737a2002f52019
-
diff --git a/modules/kogito-maven/3.9.x/module.yaml b/modules/kogito-maven/3.9.x/module.yaml
deleted file mode 100644
index dcd4b8a67bb..00000000000
--- a/modules/kogito-maven/3.9.x/module.yaml
+++ /dev/null
@@ -1,32 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.maven
-version: "3.9.3"
-
-envs:
-  - name: "MAVEN_VERSION"
-    value: "3.9.3"
-
-# unfortunately by now the version needs to be hardcoded.
-artifacts:
-  - name: apache-maven-3.9.3-bin.tar.gz
-    url: https://archive.apache.org/dist/maven/maven-3/3.9.3/binaries/apache-maven-3.9.3-bin.tar.gz
-    md5: f3fbff830d9a0dc2c6c99a76e27d0c01
-
diff --git a/modules/kogito-maven/maven-dnf-module/artifacts/maven.module b/modules/kogito-maven/maven-dnf-module/artifacts/maven.module
deleted file mode 100644
index 386b70bd684..00000000000
--- a/modules/kogito-maven/maven-dnf-module/artifacts/maven.module
+++ /dev/null
@@ -1,5 +0,0 @@
-[maven]
-name=maven
-stream=3.8
-profiles=
-state=enabled
\ No newline at end of file
diff --git a/modules/kogito-maven/maven-dnf-module/configure b/modules/kogito-maven/maven-dnf-module/configure
deleted file mode 100644
index fd40c2e4ce0..00000000000
--- a/modules/kogito-maven/maven-dnf-module/configure
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SCRIPT_DIR=$(dirname $0)
-ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
-
-cp ${ARTIFACTS_DIR}/maven.module /etc/dnf/modules.d/maven.module
\ No newline at end of file
diff --git a/modules/kogito-maven/maven-dnf-module/module.yaml b/modules/kogito-maven/maven-dnf-module/module.yaml
deleted file mode 100644
index 13daf59a28a..00000000000
--- a/modules/kogito-maven/maven-dnf-module/module.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.maven.dnf.module
-version: "3.8"
-description: Enables the AppStream RPM Module for Maven 3.8 packages.
-
-execute:
-  - script: configure
diff --git a/modules/kogito-openjdk/11-headless/clean.sh b/modules/kogito-openjdk/11-headless/clean.sh
deleted file mode 100644
index 5b184d1a00b..00000000000
--- a/modules/kogito-openjdk/11-headless/clean.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-microdnf clean all
-rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/11-headless/module.yaml b/modules/kogito-openjdk/11-headless/module.yaml
deleted file mode 100644
index bf78ddea605..00000000000
--- a/modules/kogito-openjdk/11-headless/module.yaml
+++ /dev/null
@@ -1,47 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.openjdk.headless
-version: "11"
-
-labels:
-  - name: "com.redhat.component"
-    value: "jboss-openjdk11-rhel8-container"
-  - name: "org.jboss.product"
-    value: "openjdk"
-  - name: "org.jboss.product.version"
-    value: "11"
-  - name: "org.jboss.product.openjdk.version"
-    value: "11"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/lib/jvm/java-11"
-  - name: "JAVA_VENDOR"
-    value: "openjdk"
-  - name: "JAVA_VERSION"
-    value: "11"
-
-execute:
-  - script: clean.sh
-
-packages:
-  install:
-    - tzdata-java # Fix for new openjdk installations. See https://bugzilla.redhat.com/show_bug.cgi?id=2224411
-    - java-11-openjdk-headless
diff --git a/modules/kogito-openjdk/11/clean.sh b/modules/kogito-openjdk/11/clean.sh
deleted file mode 100644
index 5b184d1a00b..00000000000
--- a/modules/kogito-openjdk/11/clean.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-microdnf clean all
-rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/11/module.yaml b/modules/kogito-openjdk/11/module.yaml
deleted file mode 100644
index c0f8e74eb33..00000000000
--- a/modules/kogito-openjdk/11/module.yaml
+++ /dev/null
@@ -1,48 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.openjdk
-version: "11"
-
-labels:
-  - name: "com.redhat.component"
-    value: "jboss-openjdk11-rhel8-container"
-  - name: "org.jboss.product"
-    value: "openjdk"
-  - name: "org.jboss.product.version"
-    value: "11"
-  - name: "org.jboss.product.openjdk.version"
-    value: "11"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/lib/jvm/java-11"
-  - name: "JAVA_VENDOR"
-    value: "openjdk"
-  - name: "JAVA_VERSION"
-    value: "11"
-
-execute:
-  - script: clean.sh
-
-packages:
-  install:
-    - tzdata-java # Fix for new openjdk installations. See https://bugzilla.redhat.com/show_bug.cgi?id=2224411
-    - java-11-openjdk-devel
-
diff --git a/modules/kogito-openjdk/17-headless/clean.sh b/modules/kogito-openjdk/17-headless/clean.sh
deleted file mode 100644
index 5b184d1a00b..00000000000
--- a/modules/kogito-openjdk/17-headless/clean.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-microdnf clean all
-rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/17-headless/module.yaml b/modules/kogito-openjdk/17-headless/module.yaml
deleted file mode 100644
index db55c4fe0c1..00000000000
--- a/modules/kogito-openjdk/17-headless/module.yaml
+++ /dev/null
@@ -1,47 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.openjdk.headless
-version: "17"
-
-labels:
-  - name: "org.jboss.product"
-    value: "openjdk"
-  - name: "org.jboss.product.version"
-    value: "17"
-  - name: "org.jboss.product.openjdk.version"
-    value: "17"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/lib/jvm/java-17"
-  - name: "JAVA_VENDOR"
-    value: "openjdk"
-  - name: "JAVA_VERSION"
-    value: "17"
-  # Same env set by the openjdk image for modules that won't use it
-  - name: JBOSS_CONTAINER_JAVA_JVM_MODULE
-    value: /opt/container/java/jvm
-
-execute:
-  - script: clean.sh
-
-packages:
-  install:
-    - java-17-openjdk-headless
diff --git a/modules/kogito-openjdk/17/clean.sh b/modules/kogito-openjdk/17/clean.sh
deleted file mode 100644
index f4c79eb5cde..00000000000
--- a/modules/kogito-openjdk/17/clean.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-microdnf clean all
-rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/modules/kogito-openjdk/17/module.yaml b/modules/kogito-openjdk/17/module.yaml
deleted file mode 100644
index 6cd287ddfba..00000000000
--- a/modules/kogito-openjdk/17/module.yaml
+++ /dev/null
@@ -1,47 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.openjdk
-version: "17"
-
-labels:
-  - name: "org.jboss.product"
-    value: "openjdk"
-  - name: "org.jboss.product.version"
-    value: "17"
-  - name: "org.jboss.product.openjdk.version"
-    value: "17"
-
-envs:
-  - name: "JAVA_HOME"
-    value: "/usr/lib/jvm/java-17"
-  - name: "JAVA_VENDOR"
-    value: "openjdk"
-  - name: "JAVA_VERSION"
-    value: "17"
-  # Same env set by the openjdk image for modules that won't use it
-  - name: JBOSS_CONTAINER_JAVA_JVM_MODULE
-    value: /opt/container/java/jvm
-
-execute:
-  - script: clean.sh
-
-packages:
-  install:
-    - java-17-openjdk-devel
diff --git a/modules/kogito-persistence/added/kogito-persistence.sh b/modules/kogito-persistence/added/kogito-persistence.sh
deleted file mode 100644
index a9cea6665bc..00000000000
--- a/modules/kogito-persistence/added/kogito-persistence.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-# imports
-source "${KOGITO_HOME}"/launch/kogito-kubernetes-client.sh
-source "${KOGITO_HOME}"/launch/logging.sh
-
-# copies the generated persistence files to
-# "${KOGITO_HOME}"/bin, that's the directory used to exchange files between builds
-# TODO: copy those files directly to the final dir only when bin is not used to exchange data anymore
-function copy_persistence_files() {
-    local persistenceDir="target"
-    if [ -n "${ARTIFACT_DIR}" ]; then
-        persistenceDir="${ARTIFACT_DIR}"
-    fi
-
-    log_info "---> [persistence] Copying persistence files..."
-    if [ -d /tmp/src/"${persistenceDir}"/classes/META-INF/resources/persistence/protobuf ]; then
-        cp -v /tmp/src/"${persistenceDir}"/classes/META-INF/resources/persistence/protobuf/* "${KOGITO_HOME}"/bin/
-        # we don't need this file to be indexed
-        rm -rfv "${KOGITO_HOME}"/bin/kogito-application.proto
-        move_persistence_files
-    else
-        log_info "---> [persistence] Skip copying files, persistence directory does not exist..."
-    fi
-}
-
-# move_persistence_files moves persistence files from "${KOGITO_HOME}"/bin to the final directory
-# where those files will be handled by the runtime image.
-# TODO: remove this function when s2i build move the KOGITO_HOME instead bin directory between images in chained builds
-function move_persistence_files() {
-    log_info "---> [persistence] Moving persistence files to final directory"
-    if ls "${KOGITO_HOME}"/bin/*.proto &>/dev/null; then
-        # copy to the final dir, so we keep bin clean
-        cp -v "${KOGITO_HOME}"/bin/*.proto "${KOGITO_HOME}"/data/protobufs/
-    else
-        log_info "---> [persistence] Skip copying files, ${KOGITO_HOME}/bin directory does not have proto files!"
-    fi
-}
diff --git a/modules/kogito-persistence/configure b/modules/kogito-persistence/configure
deleted file mode 100644
index 1ecd7ef1d3f..00000000000
--- a/modules/kogito-persistence/configure
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-SCRIPT_DIR=$(dirname "${0}")
-
-# kogito-persistence
-mkdir -p "${KOGITO_HOME}"/launch/
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
-chmod +x-w "${KOGITO_HOME}"/launch/kogito-persistence.sh
-
-mkdir -p "${KOGITO_HOME}"/data/protobufs
-chmod +w "${KOGITO_HOME}"/data/protobufs
diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml
deleted file mode 100644
index c65cb8f2b6a..00000000000
--- a/modules/kogito-persistence/module.yaml
+++ /dev/null
@@ -1,28 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.persistence
-version: "999-SNAPSHOT"
-
-modules:
-  install:
-    - name: org.kie.kogito.kubernetes.client
-
-execute:
-  - script: configure
diff --git a/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/modules/kogito-persistence/tests/bats/kogito-persistence.bats
deleted file mode 100644
index fdb026348dd..00000000000
--- a/modules/kogito-persistence/tests/bats/kogito-persistence.bats
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=$BATS_TMPDIR/kogito_home
-export MOCK_RESPONSE=""
-mkdir -p "${KOGITO_HOME}"/launch
-
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh "${KOGITO_HOME}"/launch/
-
-# imports
-source $BATS_TEST_DIRNAME/../../added/kogito-persistence.sh
-
-setup() {
-    export HOME="${KOGITO_HOME}"
-    mkdir -p "${KOGITO_HOME}"
-    mkdir -p "${KOGITO_HOME}"/bin
-    mkdir -p "${KOGITO_HOME}"/data/protobufs/
-    mkdir -p "${KOGITO_HOME}"/podinfo
-    echo "exampleapp-cm" > "${KOGITO_HOME}"/podinfo/protobufcm
-}
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"
-    rm -rf /tmp/src
-    rm -rf "${KOGITO_HOME}"/bin/*
-}
-
-@test "There's some proto files in the target directory" {
-    mkdir -p /tmp/src/target/classes/META-INF/resources/persistence/protobuf
-    touch /tmp/src/target/classes/META-INF/resources/persistence/protobuf/{file1.proto,kogito-application.proto}
-
-    run copy_persistence_files
-
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "INFO ---> [persistence] Copying persistence files..." ]
-    [ "${lines[1]}" = "'/tmp/src/target/classes/META-INF/resources/persistence/protobuf/file1.proto' -> '"${KOGITO_HOME}"/bin/file1.proto'" ]
-    [ "${lines[2]}" = "'/tmp/src/target/classes/META-INF/resources/persistence/protobuf/kogito-application.proto' -> '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
-    [ "${lines[3]}" = "removed '"${KOGITO_HOME}"/bin/kogito-application.proto'" ]
-    [ "${lines[4]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
-    [ "${lines[5]}" = "'"${KOGITO_HOME}"/bin/file1.proto' -> '"${KOGITO_HOME}"/data/protobufs/file1.proto'" ]
-}
-
-@test "There are no persistence files" {
-    KOGITO_HOME=/tmp/kogito
-
-    run copy_persistence_files
-
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "INFO ---> [persistence] Copying persistence files..." ]
-    [ "${lines[1]}" = "INFO ---> [persistence] Skip copying files, persistence directory does not exist..." ]
-}
-
-@test "There's some proto files in the bin directory" {
-    touch "${KOGITO_HOME}"/bin/file1.proto
-
-    run move_persistence_files
-
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
-    [ "${lines[1]}" = "'"${KOGITO_HOME}"/bin/file1.proto' -> '"${KOGITO_HOME}"/data/protobufs/file1.proto'" ]
-}
-
-@test "There's no proto files in the bin directory" {
-    run move_persistence_files
-
-    echo "result= ${lines[@]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "INFO ---> [persistence] Moving persistence files to final directory" ]
-    [ "${lines[1]}" = "INFO ---> [persistence] Skip copying files, "${KOGITO_HOME}"/bin directory does not have proto files!" ]
-}
diff --git a/modules/kogito-pkg-update/configure b/modules/kogito-pkg-update/configure
deleted file mode 100644
index 82dc65a5d75..00000000000
--- a/modules/kogito-pkg-update/configure
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-set -euo pipefail
-
-for candidate in yum dnf microdnf; do
-    if command -v "$candidate"; then
-        mgr="$(command -v "$candidate")"
-        "$mgr" update -y
-        "$mgr" -y clean all
-        exit
-    fi
-done
-
-echo "cannot find a package manager" >&2
-exit 1
diff --git a/modules/kogito-pkg-update/module.yaml b/modules/kogito-pkg-update/module.yaml
deleted file mode 100644
index f62beedc9a9..00000000000
--- a/modules/kogito-pkg-update/module.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.pkg-update
-version: "999-SNAPSHOT"
-description: "Perform a system update via the package manager."
-
-execute:
-  - script: configure
diff --git a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
deleted file mode 100644
index 0a2b12647ef..00000000000
--- a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-#
-# S2I run script for the 'kogito-runtime-jvm' images.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# Image help.
-if [[ "$1" == "-h" ]]; then
-    exec /usr/local/s2i/usage
-    exit 0
-fi
-set -e
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-    "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source ${S2I_MODULE_LOCATION}/s2i-core
-source "${KOGITO_HOME}"/launch/configure.sh
-
-runtime_type=$(get_runtime_type)
-
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-case ${runtime_type} in 
-    "quarkus") 
-        exec java ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_QUARKUS_JVM_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-            -Dquarkus.http.host=0.0.0.0 \
-            -Dquarkus.http.port=8080 \
-            -jar "${KOGITO_HOME}"/bin/*.jar
-    ;;
-    "springboot") 
-        exec java ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-            -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
-    ;;
-    *)
-        log_error "${runtime_type} is not supported."
-        exit 1
-esac
\ No newline at end of file
diff --git a/modules/kogito-runtime-jvm/configure b/modules/kogito-runtime-jvm/configure
deleted file mode 100644
index 6635e0e76dd..00000000000
--- a/modules/kogito-runtime-jvm/configure
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-# kogito-launch
-cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
-cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
-
-chmod 755 /usr/local/s2i/*
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
diff --git a/modules/kogito-runtime-jvm/module.yaml b/modules/kogito-runtime-jvm/module.yaml
deleted file mode 100644
index 23b538245a4..00000000000
--- a/modules/kogito-runtime-jvm/module.yaml
+++ /dev/null
@@ -1,24 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.runtime.jvm
-version: "999-SNAPSHOT"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-runtime-jvm/s2i/bin/assemble b/modules/kogito-runtime-jvm/s2i/bin/assemble
deleted file mode 100755
index 390579ce5c4..00000000000
--- a/modules/kogito-runtime-jvm/s2i/bin/assemble
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e
-#
-# 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.
-#
-# this script is used by OpenShift with chained builds
-# to transfer data from builder image into the runtime image
-
-source ${S2I_MODULE_LOCATION}/s2i-core
-runtime_assemble
-
diff --git a/modules/kogito-runtime-jvm/s2i/bin/usage b/modules/kogito-runtime-jvm/s2i/bin/usage
deleted file mode 100644
index 7a5201d0a11..00000000000
--- a/modules/kogito-runtime-jvm/s2i/bin/usage
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash -e
-#
-# 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.
-#
-IMAGE_NAME="quay.io/kiegroup/kogito-runtime-jvm"
-if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-    IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8"
-fi
-
-cat <<EOF
-This is the ${IMAGE_NAME} S2I runtime image:
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-Sample invocation:
-
-s2i build <binary path/URL> -e RUNTIME_TYPE=<quarkus|springboot> ${IMAGE_NAME} <application image>
-
-Where the binary path/URL is the built artifact that you want to copy to your image.
-RUNTIME_TYPE is the runtime your application is based on. Default value is 'quarkus'.
-Note that, for quarkus non Uberjar builds, you also must add the target/lib on the current directory
-so the s2i build can copy it into the image.
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/modules/kogito-runtime-native/added/kogito-app-launch.sh b/modules/kogito-runtime-native/added/kogito-app-launch.sh
deleted file mode 100644
index 234ea882096..00000000000
--- a/modules/kogito-runtime-native/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-#
-# S2I run script for the 'kogito-runtime-native' images.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# Image help.
-if [[ "$1" == "-h" ]]; then
-    exec /usr/local/s2i/usage
-    exit 0
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-# shellcheck disable=SC2086
-exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_NATIVE_PROPS} \
-    -Dquarkus.http.host=0.0.0.0 \
-    -Dquarkus.http.port=8080
diff --git a/modules/kogito-runtime-native/configure b/modules/kogito-runtime-native/configure
deleted file mode 100644
index 6635e0e76dd..00000000000
--- a/modules/kogito-runtime-native/configure
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-# kogito-launch
-cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
-cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
-
-chmod 755 /usr/local/s2i/*
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
diff --git a/modules/kogito-runtime-native/module.yaml b/modules/kogito-runtime-native/module.yaml
deleted file mode 100644
index c9dadd2d195..00000000000
--- a/modules/kogito-runtime-native/module.yaml
+++ /dev/null
@@ -1,24 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.runtime.native
-version: "999-SNAPSHOT"
-
-execute:
-  - script: configure
diff --git a/modules/kogito-runtime-native/s2i/bin/assemble b/modules/kogito-runtime-native/s2i/bin/assemble
deleted file mode 100755
index 390579ce5c4..00000000000
--- a/modules/kogito-runtime-native/s2i/bin/assemble
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e
-#
-# 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.
-#
-# this script is used by OpenShift with chained builds
-# to transfer data from builder image into the runtime image
-
-source ${S2I_MODULE_LOCATION}/s2i-core
-runtime_assemble
-
diff --git a/modules/kogito-runtime-native/s2i/bin/usage b/modules/kogito-runtime-native/s2i/bin/usage
deleted file mode 100644
index 1366d83c972..00000000000
--- a/modules/kogito-runtime-native/s2i/bin/usage
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-IMAGE_NAME="quay.io/kiegroup/kogito-runtime-native"
-if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-    IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-runtime-native-rhel8"
-fi
-
-cat <<EOF
-This is the ${IMAGE_NAME} S2I image:
-To use it, install S2I: https://github.com/openshift/source-to-image
-
-Sample invocation:
-
-s2i build <binary path/URL> -e RUNTIME_TYPE=<quarkus|springboot> ${IMAGE_NAME} <application image>
-
-Where the binary path/URL is the built artifact that you want to copy to your image.
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/modules/kogito-s2i-builder/added/kogito-app-launch.sh b/modules/kogito-s2i-builder/added/kogito-app-launch.sh
deleted file mode 100644
index 77ec66bf83a..00000000000
--- a/modules/kogito-s2i-builder/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-#
-# S2I run script for the 'kogito-s2i-builder' image.
-# The run script executes the server that runs your application.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-# Image help.
-if [[ "$1" == "-h" ]]; then
-    exec /usr/local/s2i/usage
-    exit 0
-fi
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-
-)
-
-source ${S2I_MODULE_LOCATION}/s2i-core
-source "${KOGITO_HOME}"/launch/configure.sh
-
-runtime_type=$(get_runtime_type)
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-#############################################
-
-case ${runtime_type} in 
-    "quarkus")  
-        if [ "${NATIVE^^}" == "TRUE" ]; then
-            if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-                log_warning "Container Image ${JBOSS_IMAGE_NAME} does not supports native builds, please refer to the documentation."
-                exit 10
-            fi
-            # shellcheck disable=SC2086
-            exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \
-                -Dquarkus.http.host=0.0.0.0 \
-                -Dquarkus.http.port=8080 \
-                -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts
-        else
-        # shellcheck disable=SC2086
-            exec java ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} -Dquarkus.http.host=0.0.0.0 \
-                -Dquarkus.http.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
-        fi
-    ;;
-    "springboot") # shellcheck disable=SC2086
-        exec java ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_SPRINGBOOT_S2I_PROPS} \
-            -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar "${KOGITO_HOME}"/bin/*.jar
-    ;;
-    *)
-        log_error "${runtime_type} is not supported."
-        exit 1
-esac
\ No newline at end of file
diff --git a/modules/kogito-s2i-builder/configure b/modules/kogito-s2i-builder/configure
deleted file mode 100644
index ebfe5a14b66..00000000000
--- a/modules/kogito-s2i-builder/configure
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-# kogito-launch
-cp -p "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"/
-chmod +x "${KOGITO_HOME}"/kogito-app-launch.sh
-
-cp -rv "${SCRIPT_DIR}"/s2i/bin/* /usr/local/s2i/
-
-chmod 755 /usr/local/s2i/*
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
diff --git a/modules/kogito-s2i-builder/module.yaml b/modules/kogito-s2i-builder/module.yaml
deleted file mode 100644
index 772cc9956c3..00000000000
--- a/modules/kogito-s2i-builder/module.yaml
+++ /dev/null
@@ -1,37 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.s2i.builder
-version: "999-SNAPSHOT"
-
-labels:
-  - name: "io.openshift.s2i.scripts-url"
-    value: "image:///usr/local/s2i"
-  - name: "io.openshift.s2i.destination"
-    value: "/tmp"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-execute:
-  - script: configure
-
-run:
-  user: 1001
-  cmd:
-    - "/usr/local/s2i/run"
diff --git a/modules/kogito-s2i-builder/s2i/bin/assemble b/modules/kogito-s2i-builder/s2i/bin/assemble
deleted file mode 100644
index be0aeec0d4c..00000000000
--- a/modules/kogito-s2i-builder/s2i/bin/assemble
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-#
-# S2I assemble script for the 'kogito-builder' image.
-# The 'assemble' script builds your application source so that it is ready to run.
-#
-# For more information refer to the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-set -e
-
-source ${S2I_MODULE_LOCATION}/s2i-core
-
-runtime_type=$(get_runtime_type)
-log_info "----> RUNTIME_TYPE has been set to $runtime_type"
-
-#############################################
-# Configure maven - for a complete list of
-# supported values, please refer the module.yaml
-# file.
-# Configure GraalVM memory limits
-
-case ${runtime_type} in 
-    "quarkus")
-        if [ "${NATIVE^^}" == "TRUE" ] && [[ ! "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-            CONFIGURE_SCRIPTS=(
-                "${KOGITO_HOME}"/launch/configure-maven.sh
-                "${KOGITO_HOME}"/launch/memory-limit.sh
-            )
-        else
-            CONFIGURE_SCRIPTS=(
-                "${KOGITO_HOME}"/launch/configure-maven.sh
-            )
-        fi
-    ;;
-    "springboot") 
-        CONFIGURE_SCRIPTS=(
-            "${KOGITO_HOME}"/launch/configure-maven.sh
-        )
-    ;;
-    *)
-        log_error "${runtime_type} is not supported."
-        exit 1
-esac
-
-
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-
-# incremental builds
-manage_incremental_build
-
-# kogito app build
-build_kogito_app "${runtime_type}"
-
-# copy kogito app to "${KOGITO_HOME}"/bin dir
-copy_kogito_app
-
-# handle persistence files
-copy_persistence_files
diff --git a/modules/kogito-s2i-builder/s2i/bin/usage b/modules/kogito-s2i-builder/s2i/bin/usage
deleted file mode 100644
index 416d0f117ab..00000000000
--- a/modules/kogito-s2i-builder/s2i/bin/usage
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-IMAGE_NAME="quay.io/kiegroup/kogito-s2i-builder"
-RUNTIME_JVM_IMAGE_NAME="quay.io/kiegroup/kogito-runtime-jvm"
-
-NATIVE_COMMANDS="For the native build, just set the NATIVE environment variable to "true" and use
-the quay.io/kiegroup/kogito-runtime-native image as runtime-image.
-In that way, a native build will be produced and copied to the runtime image.
-
-Example:
-
-$ s2i build -c /Development/project/ ${IMAGE_NAME} <application image> --env RUNTIME_TYPE=quarkus --runtime-image quay.io/kiegroup/kogito-runtime-native --env NATIVE=true"
-
-if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-    IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-builder-rhel8"
-    RUNTIME_JVM_IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8"
-    NATIVE_COMMANDS=""
-fi
-
-
-cat <<EOF
-This is the ${IMAGE_NAME} S2I image:
-
-Build native image based on project source either complete maven project or just set of business assets
-such as processes (BPMN), rules (DRL), decisions (DMN).
-
-To use it, install S2I: https://github.com/openshift/source-to-image.
-
-This image is intended only to build application binaries copied to runtime image when the build is finished.
-
-
-S2I command syntax:
-
-$ s2i build -c <source code path/URL> ${IMAGE_NAME} <application image> --runtime-image <image name>
-
-
-Sample invocation:
-
-$ s2i build -c /Development/project/ ${IMAGE_NAME} <application image> --env RUNTIME_TYPE=quarkus --runtime-image ${RUNTIME_JVM_IMAGE_NAME}
-
-By default, it generates a non-native build. Use the ${RUNTIME_JVM_IMAGE_NAME} image as runtime-image,
-in that way, a *runner.jar will be produced and copied to the runtime image.
-
-Example:
-
-$ s2i build -c /Development/project/ ${IMAGE_NAME} <application image> --env RUNTIME_TYPE=quarkus --runtime-image ${RUNTIME_JVM_IMAGE_NAME}
-
-echo -n ${NATIVE_COMMANDS}
-
-You can then run the resulting image via:
-docker run <application image>
-EOF
diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core
deleted file mode 100644
index 7a4070d1351..00000000000
--- a/modules/kogito-s2i-core/added/s2i-core
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-# imports
-source "${KOGITO_HOME}"/launch/logging.sh
-source "${KOGITO_HOME}"/launch/kogito-persistence.sh
-
-S2I_DESTINATION_DIR="${S2I_DESTINATION_DIR:-/tmp}"
-S2I_ARTIFACTS_DIR="${S2I_DESTINATION_DIR}/artifacts"
-S2I_SOURCE_DIR="${S2I_DESTINATION_DIR}/src"
-PROJECT_GROUP_ID="${PROJECT_GROUP_ID:-com.company}"
-PROJECT_ARTIFACT_ID="${PROJECT_ARTIFACT_ID:-project}"
-PROJECT_VERSION="${PROJECT_VERSION:-1.0-SNAPSHOT}"
-artifactDir="target"
-readonly QUARKUS_RUNTIME_TYPE="quarkus"
-readonly SPRINGBOOT_RUNTIME_TYPE="springboot"
-
-if [ ! -z "${ARTIFACT_DIR}" ]; then
-    artifactDir="${ARTIFACT_DIR}"
-fi
-
-# setup file permissions for injected content
-if [ -d "${S2I_ARTIFACTS_DIR}" ]; then
-    chmod -R ug+rwX "${S2I_ARTIFACTS_DIR}"
-fi
-
-
-function manage_incremental_build() {
-    if [ -d /tmp/artifacts ]; then
-        log_info "Expanding artifacts from incremental build..."
-        ( cd /tmp/artifacts && tar cf - . ) | ( cd ${HOME} && tar xvf - )
-        rm -rf /tmp/artifacts
-    fi
-}
-
-
-function assemble_runtime() {
-    # handle persistence files
-    move_persistence_files
-}
-
-
-# copy already built artifacts to the runtime image.
-function runtime_assemble() {
-    log_info "-----> [s2i-core] Running runtime assemble script"
-    cd ${S2I_DESTINATION_DIR}/src
-    if [ "${BINARY_BUILD^^}" == "TRUE" ] || ls | grep -E '*.jar|classes|maven*|*-runner|target|quarkus-app' 1> /dev/null 2>&1; then
-        log_info "-----> Binary build enabled, artifacts were uploaded directly to the image build"
-        if ls target 1> /dev/null 2>&1; then
-            log_info "-----> Entire target dir uploaded."
-            cd "target"    
-        fi
-
-        local result=$(file -b --mime-type *-runner | grep x-executable)
-        if [ "$result" == "application/x-executable" ]; then
-            log_info "-----> Found binary file, native build."
-            NATIVE="TRUE"
-
-        else
-            if ls | grep -E '*-runner.jar' 1> /dev/null 2>&1;then
-                log_info "-----> Found Quarkus runner.jar file, not native build."
-                NATIVE="FALSE"
-
-            elif ls | grep -E 'quarkus-app/*-run.jar' 1> /dev/null 2>&1;then
-                log_info "-----> Found Quarkus app.jar file, not native build."
-                NATIVE="FALSE"
-            fi
-        fi
-
-        log_info "-----> Cleaning up unneeded jar files"
-        rm -rfv *-tests.jar
-        rm -rfv *-sources.jar
-
-        log_info "-----> Copying uploaded files to "${KOGITO_HOME}""
-        artifactDir="."
-        ARTIFACT_DIR=$artifactDir
-        copy_kogito_app
-        copy_persistence_files
-    else
-        cp -Rv --parents ./* "${KOGITO_HOME}"/
-    fi
-    assemble_runtime
-    log_info "-----> Cleaning up s2i directory"
-    rm -rfv ${S2I_DESTINATION_DIR}/src/*
-}
-
-function build_kogito_app() {
-    local RUNTIME_TYPE="${1:-$QUARKUS_RUNTIME_TYPE}"
-    cd "${S2I_SOURCE_DIR}"
-
-    nativeBuild=""
-    if [ "${NATIVE^^}" == "TRUE" ]; then
-        if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-            log_warning "Container Image ${JBOSS_IMAGE_NAME} does not supports native builds, please refer to the documentation."
-            exit 10
-        else
-            nativeBuild="-Dnative"
-        fi
-    fi
-
-    if [ "${SCRIPT_DEBUG}" != "true" ]; then
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --batch-mode"
-    else 
-        set -x
-    fi
-
-    if [ -f "pom.xml" ]; then
-        log_info "---> Building application from source..."
-        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${MAVEN_SETTINGS_PATH}" \
-	    -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-	    -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-
-    else
-        log_info "---> Generating $RUNTIME_TYPE project structure for $PROJECT_ARTIFACT_ID..."
-        local quarkus_platform_version
-        if [ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]; then
-
-            local quarkus_plugin="${QUARKUS_PLUGIN:-io.quarkus.platform:quarkus-maven-plugin}"
-            if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-                quarkus_plugin="${QUARKUS_PLUGIN:-com.redhat.quarkus.platform:quarkus-maven-plugin}"
-            fi
-
-            IFS=':' read -ra GAV <<< "${quarkus_plugin}"
-            for i in "${GAV[@]}"; do
-                if [[ "$i" =~ ^[0-9]{0,2}\.[0-9]{0,3} ]]; then
-                    log_info "version [${i}] provided through QUARKUS_PLUGIN env."
-                    quarkus_platform_version=${i}
-                else
-                    quarkus_platform_version=${QUARKUS_PLATFORM_VERSION} || exit 1
-                fi
-            done
-
-            log_info "----> Using Quarkus ${quarkus_plugin}:${quarkus_platform_version} to bootstrap the application."
-
-            $MAVEN_HOME/bin/mvn -B ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
-                "${quarkus_plugin}":"${quarkus_platform_version}":create  \
-                    -DprojectGroupId=$PROJECT_GROUP_ID \
-                    -DprojectArtifactId=$PROJECT_ARTIFACT_ID \
-                    -DprojectVersion=$PROJECT_VERSION \
-                    -Dextensions="org.jbpm:jbpm-with-drools-quarkus:${KOGITO_VERSION},quarkus-smallrye-health,quarkus-smallrye-openapi,quarkus-resteasy,quarkus-resteasy-jackson"
-
-            if [ ! -z ${QUARKUS_EXTRA_EXTENSIONS} ]; then
-                log_info "----> Adding extra Quarkus extensions: ${QUARKUS_EXTRA_EXTENSIONS}"
-                $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
-				-f $PROJECT_ARTIFACT_ID/pom.xml \
-                                "${quarkus_plugin}":"${quarkus_platform_version}":add-extension \
-                                -Dextensions="${QUARKUS_EXTRA_EXTENSIONS}"
-            fi
-
-            # Fix as we cannot rely on Quarkus platform
-            # Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented
-            if [ ! -z ${KOGITO_VERSION} ]; then
-                echo "Replacing Kogito Platform BOM with version ${KOGITO_VERSION}"
-                # [ ]* -> is a regexp pattern to match any number of spaces
-                pattern_1="[ ]*<groupId>.*<\/groupId>"
-                pattern_2="[ ]*<artifactId>quarkus-kogito-bom<\/artifactId>\n"
-                pattern_3="[ ]*<version>.*<\/version>\n"
-                complete_pattern="$pattern_1\n$pattern_2$pattern_3"
-
-                replace_1="        <groupId>org.kie.kogito<\/groupId>\n"
-                replace_2="        <artifactId>kogito-bom<\/artifactId>\n"
-                replace_3="        <version>${KOGITO_VERSION}<\/version>\n"
-                complete_replace="$replace_1$replace_2$replace_3"
-
-                sed -i.bak -e "/$pattern_1/{
-                    N;N;N
-                    s/$complete_pattern/$complete_replace/
-                    }" ${PROJECT_ARTIFACT_ID}/pom.xml
-            fi
-
-        elif [ "${RUNTIME_TYPE}" == "${SPRINGBOOT_RUNTIME_TYPE}" ]; then
-            log_info "----> Using Spring Boot to bootstrap the application."
-            $MAVEN_HOME/bin/mvn archetype:generate -B -DinteractiveMode=false -DarchetypeGroupId=org.kie.kogito \
-                -DarchetypeArtifactId=kogito-spring-boot-archetype -DarchetypeVersion=$KOGITO_VERSION \
-                -DgroupId=$PROJECT_GROUP_ID -DartifactId=$PROJECT_ARTIFACT_ID -Dversion=$PROJECT_VERSION \
-                ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}"
-        else
-            log_error "---> Invalid RUNTIME_TYPE(${RUNTIME_TYPE}) provided, failing build..."
-            exit 1
-        fi
-
-        # remove resources generated by the archetype
-        log_info "--> Remove archetype generated resources"
-        rm -rfv $PROJECT_ARTIFACT_ID/src/main/resources/*.{bpm,bpmn2,dmn,drl}
-
-        local require_sw
-        # copy resources into the generated project
-        for item in *
-        do
-            if [ -d "${item}" ] && [ "${item}" == "$PROJECT_ARTIFACT_ID" ]; then
-                log_info "--> Skipping generated project ..."
-            else
-                log_info "--> Copying resource ${item}"
-                cp -Rv "${item}" $PROJECT_ARTIFACT_ID/src/main/resources
-
-                if [[ ${item} =~ .*\.sw\.(yaml|yml|json) ]]; then
-                    if [[ "${RUNTIME_TYPE}" == "${QUARKUS_RUNTIME_TYPE}" ]]; then
-                        log_info "--> Found Serverless Workflow file. Will add Kogito Quarkus Workflows extension to the project."
-                        require_sw="true"
-                    else
-                        log_warning "--> Builds from Serverless Workflow files are not supported for SpringBoot. Please build your project locally or use Quarkus."
-                        break
-                    fi
-                fi
-            fi
-        done
-
-        # move all project content into the current directory
-        mv -v $PROJECT_ARTIFACT_ID/* .
-
-        # add extension if needed
-        if [ "${require_sw}" == "true" ]; then
-            log_info "--> Adding Kogito Quarkus Workflows extension to the generated project."
-
-            # we must set the evaluate version since forceStdout is not available in previous versions
-            local quarkus_platform_version
-            quarkus_platform_version=${QUARKUS_PLATFORM_VERSION} || exit 1
-            log_info "--> Quarkus version is '$quarkus_platform_version'"
-
-            $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \
-                "${quarkus_plugin}":"${quarkus_platform_version}":add-extension \
-                -Dextensions="org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION}"
-        fi
-
-        $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${MAVEN_SETTINGS_PATH}" \
-            -DskipTests -Dmaven.test.skip -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -Dmaven.source.skip=true \
-            -Djacoco.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true -Dpmd.skip=true -Dfabric8.skip=true
-    fi
-
-    log_info "---> Build finished, installing application from path $(pwd)"
-}
-
-function copy_kogito_app() {
-
-    if [ "${NATIVE^^}" == "TRUE" ]; then
-        if ls $artifactDir/*-runner 1> /dev/null 2>&1; then
-            # quarkus native build binary
-            log_info "---> Installing native application binaries"
-            cp -v $artifactDir/*-runner "${KOGITO_HOME}"/bin/
-            chmod +x "${KOGITO_HOME}"/bin/*-runner
-        fi
-
-    elif ls $artifactDir/*-runner.jar 1> /dev/null 2>&1; then
-        # handle quarkus build files
-        log_info "---> Installing runner jar file"
-        cp -v $artifactDir/*-runner.jar "${KOGITO_HOME}"/bin
-        if [ -d "${artifactDir}/lib" ]; then
-            log_info "---> Copying application libraries"
-            cp -r $artifactDir/lib/ "${KOGITO_HOME}"/bin
-        fi
-
-    elif ls $artifactDir/quarkus-app/*-run.jar 1> /dev/null 2>&1; then
-        # handle quarkus 1.12+ build files
-        log_info "---> Installing Quarkus 1.12+ Application files"
-        # copy everything that resides on quarkus-app directory
-        cp -rv $artifactDir/quarkus-app/* "${KOGITO_HOME}"/bin
-
-    else
-        # handle normal java builds
-        log_info "---> Installing common application binaries"
-        cp -v $artifactDir/*.jar "${KOGITO_HOME}"/bin
-    fi
-}
-
-function get_runtime_type() {
-    allowed_runtime_values=("$QUARKUS_RUNTIME_TYPE" "$SPRINGBOOT_RUNTIME_TYPE")
-    local runtime_type="${QUARKUS_RUNTIME_TYPE}"
-
-    jar_2_inspect="${KOGITO_HOME}/bin/*.jar"
-    quarkus_main_class="io.quarkus.bootstrap.runner.QuarkusEntryPoint"
-    spring_main_class="org.springframework.boot.loader.JarLauncher"
-    if [ -f ${jar_2_inspect} ]; then
-        log_info "---> Binary build, trying to detect runtime type based on the provided application jar."
-        zipgrep "$quarkus_main_class" $jar_2_inspect > /dev/null
-        if [ $? = 0 ]; then
-            RUNTIME_TYPE="${QUARKUS_RUNTIME_TYPE}"
-        else
-            zipgrep "$spring_main_class" $jar_2_inspect > /dev/null
-            if [ $? = 0 ]; then
-                RUNTIME_TYPE="${SPRINGBOOT_RUNTIME_TYPE}"
-            fi
-        fi
-    fi
-
-    if [ "${RUNTIME_TYPE}x" = "x" ]; then
-        RUNTIME_TYPE=${RUNTIME_TYPE:-${runtime_type}}
-    fi
-
-    if [[ ! "${allowed_runtime_values[*]}" =~ ${RUNTIME_TYPE} ]]; then
-        log_warning "RUNTIME_TYPE ${RUNTIME_TYPE} is not allowed, the allowed types are [${allowed_runtime_values[*]}]. Application might fail"
-    fi
-
-    log_info "----> Setting RUNTIME_TYPE to ${RUNTIME_TYPE}"
-    echo "${RUNTIME_TYPE}"
-}
-
-function get_quarkus_platform_properties() {
-    local quarkus_platform_group_id="${QUARKUS_PLATFORM_GROUP_ID:-io.quarkus.platform}"
-    local quarkus_platform_artifact_id="${QUARKUS_PLATFORM_ARTIFACT_ID:-quarkus-bom}"
-    if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then
-        quarkus_platform_group_id="${QUARKUS_PLATFORM_GROUP_ID:-com.redhat.quarkus.platform}"
-        quarkus_platform_artifact_id="${QUARKUS_PLATFORM_ARTIFACT_ID:-quarkus-bom}"
-    fi
-
-    echo " -DplatformGroupId=${quarkus_platform_group_id} -DplatformArtifactId=${quarkus_platform_artifact_id} -DplatformVersion=${QUARKUS_PLATFORM_VERSION}"
-}
diff --git a/modules/kogito-s2i-core/configure.sh b/modules/kogito-s2i-core/configure.sh
deleted file mode 100644
index 3b2991106c6..00000000000
--- a/modules/kogito-s2i-core/configure.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-# Configure module
-set -e
-
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-mkdir "${S2I_MODULE_LOCATION}"
-
-cp -v "${ADDED_DIR}"/s2i-core "${S2I_MODULE_LOCATION}"
-cp -rv "${SCRIPT_DIR}"/s2i/bin/* "${S2I_MODULE_LOCATION}"
-chmod 755 "${S2I_MODULE_LOCATION}"/*
\ No newline at end of file
diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml
deleted file mode 100644
index d2e8b05aeb0..00000000000
--- a/modules/kogito-s2i-core/module.yaml
+++ /dev/null
@@ -1,85 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.s2i.core
-version: '999-SNAPSHOT'
-description: Kogito s2i core module. All s2i files shoul be placed here.
-
-labels:
-  - name: "io.openshift.s2i.scripts-url"
-    value: "image:///usr/local/s2i"
-  - name: "io.openshift.s2i.destination"
-    value: "/tmp"
-  - name: "io.openshift.s2i.assemble-input-files"
-    value: "/home/kogito/bin"
-
-envs:
-  - name: S2I_MODULE_LOCATION
-    value: "/usr/local/s2i"
-  - name: S2I_DESTINATION_DIR
-    description: ^ Root directory for S2I mount, as specified by the **io.openshift.s2i.destination** label.  This should not be overridden by end users.
-    example: /tmp
-
-  - name: S2I_ARTIFACTS_DIR
-    description: ^ Location mount for artifacts persisted with **save-artifacts** script, which are used with incremental builds.  This should not be overridden by end users.
-    example: "${S2I_DESTINATION_DIR}/artifacts}"
-
-  - name: S2I_SOURCE_DIR
-    description: ^ Location of mount for source code to be built.  This should not be overridden by end users.
-    example: "${S2I_DESTINATION_DIR}/src}"
-
-  - name: PROJECT_GROUP_ID
-    description: ^  Indicates the unique identifier of the organization or group that created the project.(default "com.company")
-    example: "com.company"
-
-  - name: PROJECT_ARTIFACT_ID
-    description: ^  Indicates the unique base name of the primary artifact being generated.(default "project")
-    example: "project"
-
-  - name: PROJECT_VERSION
-    description: ^  Indicates the version of the artifact generated by the project.(default "1.0-SNAPSHOT")
-    example: "1.0-SNAPSHOT"
-
-  - name: QUARKUS_PLUGIN
-    description: ^ Defines the maven artifact for Quarkus Maven plugin, defaults to io.quarkus:quarkus-maven-plugin. If no version specified it will be detected automatically based on the current Kogito version.
-    example: "io.quarkus:custom-plugin:custom.version"
-
-  - name: QUARKUS_PLATFORM_GROUP_ID
-    description: ^ Defines the Quarkus platform group id, defaults to io.quarkus.platform for community and com.redhat.quarkus.platform for product.
-    example: "io.quarkus.custom"
-
-  - name: QUARKUS_PLATFORM_ARTIFACT_ID
-    description: ^ Defines the Quarkus platform artifact id, defaults to quarkus-bom for community and product.
-    example: "quarkus-bom-custom"
-
-  - name: QUARKUS_EXTRA_EXTENSIONS
-    description: ^ Defines the Quarkus' extra extensions (as comma-separated list) to be added when performing build from assets.
-    example: "org.kie:kie-addons-quarkus-knative-eventing,quarkus-kubernetes"
-
-modules:
-  install:
-    - name: org.kie.kogito.persistence
-
-run:
-  cmd:
-    - "/usr/local/s2i/run"
-
-execute:
-  - script: configure.sh
-
diff --git a/modules/kogito-s2i-core/s2i/bin/assemble-runtime b/modules/kogito-s2i-core/s2i/bin/assemble-runtime
deleted file mode 100644
index e9b027587f4..00000000000
--- a/modules/kogito-s2i-core/s2i/bin/assemble-runtime
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash -e
-#
-# 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.
-#
-# S2I assemble-runtime script for the 'kogito-runtime-native' image.
-# The assemble-runtime script executes preparation for running the container on runtime image.
-#
-# For more information see the documentation:
-#	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
-#
-
-source ${S2I_MODULE_LOCATION}/s2i-core
-assemble_runtime
-
diff --git a/modules/kogito-s2i-core/s2i/bin/run b/modules/kogito-s2i-core/s2i/bin/run
deleted file mode 100644
index 3294dc1dbc8..00000000000
--- a/modules/kogito-s2i-core/s2i/bin/run
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-set -e
-exec "${KOGITO_HOME}"/kogito-app-launch.sh ${1}
\ No newline at end of file
diff --git a/modules/kogito-s2i-core/s2i/bin/save-artifacts b/modules/kogito-s2i-core/s2i/bin/save-artifacts
deleted file mode 100644
index 114e50a2aba..00000000000
--- a/modules/kogito-s2i-core/s2i/bin/save-artifacts
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#!/usr/bin/env bash
-#
-# 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.
-#
-cd ${HOME}
-tar cf - .m2
-
diff --git a/modules/kogito-s2i-core/tests/bats/mocks/myapp-0.0.1-runner b/modules/kogito-s2i-core/tests/bats/mocks/myapp-0.0.1-runner
deleted file mode 100755
index 7f45e1a0d050e21b8860c94430a33646acc5b5ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21736
zcmeHPdu$v>8K1k0W2Z^Z=e%&6fHz7Jj)T{a2FIbK-Su-V*|Bl#HW4J7^WEA$<$Pz|
z?NxS!L`p&>hX(vls{8{&NI^kGB7Z;>2?>(MYCuBBl~DO3pp-|{Kq0t5OQ9sk_s!0C
zce}S2g{mMGW@PU-^ZOn%^X=^H&g16uy@P$hK!8yQvL_g(l!(S5=gQdaA)XXiCtJ%j
zwvBCNs{vUB{~G5Ybz(%PgARjejgSigMZF7xe<7$r3ey@Au<Zn*R6?YvR}7kn3QA0(
z5r>U>RTvd%ChAA@yvTqk$rbWbP#J=vaYD34=n*Z|L*I<3j`+wEjvmpU2)$)NNe|tD
zdPjxcQK3h4QOFY|e`0m<e@XarDX2jT(;5=i!>>h(vKU5g*>Q|V6igx2Ty!^2F-Da1
zJ`H+U&Ib+T_EC{vCBIx0^&?8|X-Os~I(D}t<ITxLDmT|W*V)nBv0Kfi)plO*O;8YQ
zQ~mqLS#|H-kEI`f_Ny<PzGdEgapYY+vvi)<5%_2iWiX(;a2LmsNBJTDLBd)P+TbI&
z6EMXGXHbtA7Q2I)CdSRI9nIM0Of->V{euHt-DbPmu6_czQ#0w5;F@5`DQN&oh-D;y
z<{n9`LEeW&UMo*(JcjqCv@Y+I;8bU!B8l{X^nmn$^nmn$^nmn$^nmn$^uYg#2mVs~
zk$)H`|4?Imsp@wvj2U0NVh8if#>u6cYup3KZ~NoG!YfCNg<l&df4ed=HgNsQVx7i}
z>sJ*{uCE4?-~0_w|LY>kUz=2G8%}Zc#mkBYqWkb_Z@i2cX0hgn2;^UzT)Z|}6s~R1
z*blh;vv)XISTU~NdD6K0PRIznY`k*Mt}9rm78bnvnE#1=I+TUwHjWz$w{9QL=kqUD
zwEz-0e61`$lz-zi3SN$b&f$`>*EaMphJ5|$!87}IG&80@HL&oiK0dJUmOiF0{Bztm
z)4U1b1A{y7q7QF>=UzT<T)i8z8`^HvHk<%^Y;fVvg9~?h7GBr$n{FB>uLX>~zs&s}
z{rj22`e*gS`VrkMtpoQT=pp6zrEn+Enheqd(gV^1(gV^1(gV^1(gV^1(gV^1(gV^1
z@67{&!V0LPAJ`gt9M^hrtvs@l&yN7rfa2izZJ=|AznRaU19}4JYd|sJ`YVRO@lh6-
ziv+f=tFFN{YFwwpHT=te%I9%V&U&gNh_%B1&j90V@(@QE7;dv?AP-zqWqLUBT(Eon
z>OL?ecvyy6;9JP=3rD^Z90=EcIn*0g&aCPUH$Gq06K;KOwGr+-S=}GjQsGWL+^UBg
zyTVFWxV|eK=?d5I@_ZZA&w(Av8_mfeJs>?GJs>?GJs>?GJs>?GJs>?GJs>^sZ+ZaM
zf-x+M{nfMwmFPOog^S>?7wL0C?_rUqebQS+n)W$ABGL!NzGxgbVj%uo_ws3;4rxf7
zJ>NiQMVj_3H;VK_T#B(yLHXDd;`JiESx_R?BC;&>DPJ7VVt~!KJdi%D2=nq>6!Neb
z&C>xP2g6XFz99Gl{;v_*SMHZ#e|PsMl}6Yty;Io>dy?Cf_SUw&t)1<Al*Umjt{73<
z!JFH5GV~*k>v7X@zy4_8vFXk|=u<`9XQCfM84QkG)l@9zG0wQHqD)i&@YAfR7XZ3<
zj&2j*#$3w<$=)v5OdUIB#*)$OG-DfGyr$TsIh#q_R?JSMQ`lgr?FoB*!=qyZeTP^c
z)wZ~Fck!Ls2M?P1fdjoDHN5`-@IB?J#{J}lIR#$7?Ywz-Y^7%swmF%J&RFJbI+3!i
z4Cob}3$E9+dIMl}fYt%!!LjGmFJncMiK!Ig(x1EDSAUkZ<Ctv6{km+&AGCg<tQ}`%
zJC^PEgZF+bYsZ#s$Fd#&547V7-^XR`y~6iLnOueby-cpc^MfC%uJ89~TjAS%SbW3#
z$q<idS$?z5^GbZ8^1Jmv{M{=2J|gbjxS-PS@2}r!42eIX@7J4r$B+)se+=pOOwqj}
z>L)|<CtL3GY|@;{*Tvk5pPi#ZANTNM@RPx9{us{QM}~Mr{p=8rsGkhgXX}0HMfEu^
z%EJqHpGyb^_!oj&nM4ToJ}mj-A$HprU&U%des-!D%_o&+5`q~5ns;*J)y!|cCj{Q7
zc_O#`8b<R?ZX9}B;U_n~w$OLG@pX*agd2xetZ1bWkB3;ea2`M@GsJ3{;VU0uG;imY
zuVXY{=f*cMzxk&S%-qoL*xmB5%LINm;te6TnbrH^Ti7;VywD4}Ood?9PdVzg505pR
zFYqRx6Dk$nhl$`?M(;D?4OPIS0;hQ}lFwDZ&s4y_Spnz2)`9YP?cb;%|F;VGI;^md
zosSBf-Y2MzVV}UMuX0ev4pp#|tAL-afM2SB->87UTLEtfLdksU^{EQ@VS#(=drIKm
z`hE*=zjpFnz=LpF3iY$(pGyK?^gO>m7WlFUzX^B%W+kaTV>L0{;duG;wHYQOF<<8C
zBew${fG<7obE*OESN=-%>gRT9*{batFGuOc&(1i=;}@p4ADHBJ%KL$|koT7J3mh-+
zm(FrK<^98pfNual;4juN(ERLg09Snajqd{<0i68ImEiI{v=c1vKVRbZNvcSHCG2?n
zr8|HtMX^HcF5q>+^{htG3K&KnT7~n##r_$RJUk2$tQWnTErE|g!-zmT!Qao7hMg!6
z?Vs8+`Qde5{$jt;B9wHHM>}3W42gW{dx6$VMggx2ZZ6Ar2hZ2%J=K!SX7Es#7FYpj
zfzw>fj@``}D?S~yofBSK_O_^M@ed^7_?KA5Zd21tjiyrRiA2gwq!P9o^QKKJ758H5
zblUb}DCdW(xl}T7%u3GtDpX>s{2-Uytgli9o@&h{{EOvgfV!QCnHejYj+NHejl1jZ
z=DF+X=9T-w&G+$#TYwuV_lsMo+&^wUHv&+`F7=^X#^WzHlN)gR&5S1<r$ucGkJ3RW
z&L%9UD8(C9NetT&G`XyugI}q}Slr53Q;94r*qHVVEHb52Ru<0biKoq}WO^c+G~;$U
zlQpBcITlOL%qA_{imQ7b+uQChWKKf!HKUnKbRLRsXXcr+C=}1l%*=yINs2dgm#A%J
zvE`d)->5#+YxeH%F-=I}15uERGqdN=etl@5+s)xl1_)O6%w9uSFnUIr**`ekr4O3J
zeSHUd$ILOkYp@rs@^gw}*&Hu1Gp%^kjuOm`@#Bj$&3%3mN;&5jfvoE=Bk)-^ZB9p1
z@ubDffnkt}!_%D0T2SO-Zde&s;ogAUL^dnT^TU%&b8M(vID)C!`58Mp0o2Yobedv(
z#SNa)6f6a*Q>mOfkxRg_QVHlXIHY$CG~3ZB#(C4Ykf_GzQ((`bcE;g6V`Z|qj>yGC
z!UP^Xqft~~DlfijTXXP)<E;i>ntM*Qrp3*jj)MlJ91Z90IT{oPbJ3Xu^m9|#iNQsk
zO+v&m25w*~w6_^(Lr!UUh195RXA%=RXeg!cf%h86b$I;dfX@vcXgo#dx6wMhU~^fD
zBi#Z2xOPtZOF<1%#q-J@<*DKYUK_5^0jW}b8lT-31{IgIa~4`D)B}mPVXd9=r*T{j
zy#Fvz`RTn_<G_XMeu&|_j`V4~*C_N2A&G0k=qJ*reE?4ZhN7fT<HA{?k89<n0d16q
zBapzo1Ef#m#|uKA)}pEWBuDfZ=;K}lO4B&=qR>}FX5R7(m>q`*-V@TN@#wP9r~MC<
zzqkIUKo{#o<z)1I%O@QfoFwQD-ur*rqpt{kMd<T!MTrRk7m!7dK8=IVi3N7}!g2*~
z{x1l9s()d;tT<}k{HXq9^lKjd;yHVc1peltG<fsJ-z=0qe}<xQaYNyRU2#a^>dpTW
zaKi8}Zdc*^pU&a)%2S%?OQ4H;El8if;}42+3P}z`c%U@Vp8|^ap7d$lPv;yiiUv>Z
zgY?L+KL=eDA$^)3SP>trBnKiqkUr6009vYFm`7-J<moweQpM+&^ly3e>ASvO=zH&%
zs1BK9Z$J!fQTge+dfNl)uZaAGc)>2|f4qP=5z3$F-vOq*ODI9}9ELFXxrn1jSHJoc
z+CB*Z{gLJ*E(+tgKTC&y@*DXT_eD|N9S!F?XE^kTCqpVX$>L+`r~m4pBT?&7@Fdy4
E0BT_2<^TWy

diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats
deleted file mode 100644
index 40e71fddf36..00000000000
--- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats
+++ /dev/null
@@ -1,490 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=$BATS_TMPDIR/kogito_home
-mkdir -p "${KOGITO_HOME}"/{bin,launch}
-
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-cp $BATS_TEST_DIRNAME/../../../kogito-persistence/added/kogito-persistence.sh "${KOGITO_HOME}"/launch/
-cp $BATS_TEST_DIRNAME/../../../kogito-kubernetes-client/added/kogito-kubernetes-client.sh "${KOGITO_HOME}"/launch/
-
-# imports
-source $BATS_TEST_DIRNAME/../../added/s2i-core
-
-setup() {
-    export HOME="${KOGITO_HOME}"
-    mkdir -p target
-    function log_error() { echo "${1}"; }
-    function log_info() { echo "${1}"; }
-}
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"/bin
-    rm -rf /tmp/.s2i
-    rm -rf /tmp/src
-    rm -rf target
-    rm -rf "${KOGITO_HOME}"/bin/*
-}
-
-
-@test "test manage_incremental_builds" {
-    rm -rf /tmp/artifacts && mkdir /tmp/artifacts
-    touch /tmp/artifacts/{file,file1,file2,file3}
-    run manage_incremental_build
-
-    IFS=$'\n' sorted=($(sort <<<"${lines[*]}")); unset IFS
-    echo "result= ${sorted[@]}"
-
-    [ "$status" -eq 0 ]
-    if [ -z "${GITHUB_ACTIONS}" ]; then
-        [ "$status" -eq 0 ]
-        [ "${sorted[0]}" = "./" ]
-        [ "${sorted[1]}" = "Expanding artifacts from incremental build..." ]
-        [ "${sorted[2]}" = "./file" ]
-        [ "${sorted[3]}" = "./file1" ]
-        [ "${sorted[4]}" = "./file2" ]
-        [ "${sorted[5]}" = "./file3" ]
-    else
-        [ "${sorted[0]}" = "./" ]
-        [ "${sorted[1]}" = "./file" ]
-        [ "${sorted[2]}" = "./file1" ]
-        [ "${sorted[3]}" = "./file2" ]
-        [ "${sorted[4]}" = "./file3" ]
-        [ "${sorted[5]}" = "Expanding artifacts from incremental build..." ]
-    fi
-
-}
-
-@test "test assemble_runtime no binaries" {
-    run assemble_runtime
-    [ "$status" -eq 0 ]
-}
-
-@test "test runtime_assemble" {
-    mkdir -p "${KOGITO_HOME}"/bin
-    mkdir -p /tmp/src/bin
-    touch /tmp/src/bin/myapp.jar
-
-    run runtime_assemble
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[1]}" = "'./bin/myapp.jar' -> '"${KOGITO_HOME}"/./bin/myapp.jar'" ]
-}
-
-@test "test runtime_assemble with binary builds" {
-    mkdir -p "${KOGITO_HOME}"/bin
-    # emulating an upload
-    mkdir -p /tmp/src/
-    touch /tmp/src/myapp.jar
-    mkdir -p /tmp/src/lib
-    mkdir -p /tmp/src/classes
-    mkdir -p /tmp/src/maven-archiver
-
-    run runtime_assemble
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[5]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
-}
-
-@test "test runtime_assemble with binary builds with new Quarkus 1.12+ default builds" {
-    mkdir -p "${KOGITO_HOME}"/bin
-    # emulating an upload
-    mkdir -p /tmp/src/quarkus-app/{app,quarkus}
-    mkdir -p /tmp/src/quarkus-app/lib/{boot,main}
-
-    touch /tmp/src/quarkus-app/my-app-run.jar
-
-    touch /tmp/src/quarkus-app/lib/boot/my-boot-dependency-1.0.jar
-    touch /tmp/src/quarkus-app/lib/main/my-main-dependency-1.0.jar
-
-    touch /tmp/src/quarkus-app/quarkus/{generated-bytecode.jar,quarkus-application.dat}
-
-    touch /tmp/src/quarkus-app/app/my-1.0.jar
-
-    run runtime_assemble
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[5]}" = "'./quarkus-app/app' -> '/tmp/kogito_home/bin/app'" ]
-    [ "${lines[6]}" = "'./quarkus-app/app/my-1.0.jar' -> '/tmp/kogito_home/bin/app/my-1.0.jar'" ]
-    [ "${lines[7]}" = "'./quarkus-app/lib' -> '/tmp/kogito_home/bin/lib'" ]
-    [ "${lines[8]}" = "'./quarkus-app/lib/boot' -> '/tmp/kogito_home/bin/lib/boot'" ]
-    [ "${lines[9]}" = "'./quarkus-app/lib/boot/my-boot-dependency-1.0.jar' -> '/tmp/kogito_home/bin/lib/boot/my-boot-dependency-1.0.jar'" ]
-    [ "${lines[10]}" = "'./quarkus-app/lib/main' -> '/tmp/kogito_home/bin/lib/main'" ]
-    [ "${lines[11]}" = "'./quarkus-app/lib/main/my-main-dependency-1.0.jar' -> '/tmp/kogito_home/bin/lib/main/my-main-dependency-1.0.jar'" ]
-    [ "${lines[12]}" = "'./quarkus-app/my-app-run.jar' -> '/tmp/kogito_home/bin/my-app-run.jar'" ]
-    [ "${lines[13]}" = "'./quarkus-app/quarkus' -> '/tmp/kogito_home/bin/quarkus'" ]
-    [ "${lines[14]}" = "'./quarkus-app/quarkus/generated-bytecode.jar' -> '/tmp/kogito_home/bin/quarkus/generated-bytecode.jar'" ]
-    [ "${lines[15]}" = "'./quarkus-app/quarkus/quarkus-application.dat' -> '/tmp/kogito_home/bin/quarkus/quarkus-application.dat'" ]
-}
-
-@test "test runtime_assemble with binary builds native binary" {
-    mkdir -p "${KOGITO_HOME}"/bin
-    # emulating an upload
-    mkdir -p /tmp/src/
-    cp $BATS_TEST_DIRNAME/mocks/myapp-0.0.1-runner /tmp/src/myapp-0.0.1-runner
-
-    run runtime_assemble
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[6]}" = "'./myapp-0.0.1-runner' -> '"${KOGITO_HOME}"/bin/myapp-0.0.1-runner'" ]
-
-    # Only runner is located in bin directory
-    [ -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-runner" ]
-}
-
-@test "test runtime_assemble with binary builds entire target!" {
-    mkdir -p "${KOGITO_HOME}"/bin
-    # emulating an upload
-    mkdir -p /tmp/src/target
-    touch /tmp/src/target/myapp.jar
-    touch /tmp/src/target/myapp-sources.jar
-    mkdir -p /tmp/src/target/lib
-    mkdir -p /tmp/src/target/classes
-    mkdir -p /tmp/src/target/maven-archiver
-
-    run runtime_assemble
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[7]}" = "'./myapp.jar' -> '"${KOGITO_HOME}"/bin/myapp.jar'" ]
-}
-
-@test "test runtime_assemble with binary builds entire target with new Quarkus 1.12+ default builds" {
-    mkdir -p "${KOGITO_HOME}"/bin
-    # emulating an upload
-    mkdir -p /tmp/src/target/quarkus-app/{app,quarkus}
-    mkdir -p /tmp/src/target/quarkus-app/lib/{boot,main}
-
-    touch /tmp/src/target/quarkus-app/my-app-run.jar
-
-    touch /tmp/src/target/quarkus-app/lib/boot/my-boot-dependency-1.0.jar
-    touch /tmp/src/target/quarkus-app/lib/main/my-main-dependency-1.0.jar
-
-    touch /tmp/src/target/quarkus-app/quarkus/{generated-bytecode.jar,quarkus-application.dat}
-
-    touch /tmp/src/target/quarkus-app/app/my-1.0.jar
-
-    run runtime_assemble
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-    [ "${lines[6]}" = "'./quarkus-app/app' -> '/tmp/kogito_home/bin/app'" ]
-    [ "${lines[7]}" = "'./quarkus-app/app/my-1.0.jar' -> '/tmp/kogito_home/bin/app/my-1.0.jar'" ]
-    [ "${lines[8]}" = "'./quarkus-app/lib' -> '/tmp/kogito_home/bin/lib'" ]
-    [ "${lines[9]}" = "'./quarkus-app/lib/boot' -> '/tmp/kogito_home/bin/lib/boot'" ]
-    [ "${lines[10]}" = "'./quarkus-app/lib/boot/my-boot-dependency-1.0.jar' -> '/tmp/kogito_home/bin/lib/boot/my-boot-dependency-1.0.jar'" ]
-    [ "${lines[11]}" = "'./quarkus-app/lib/main' -> '/tmp/kogito_home/bin/lib/main'" ]
-    [ "${lines[12]}" = "'./quarkus-app/lib/main/my-main-dependency-1.0.jar' -> '/tmp/kogito_home/bin/lib/main/my-main-dependency-1.0.jar'" ]
-    [ "${lines[13]}" = "'./quarkus-app/my-app-run.jar' -> '/tmp/kogito_home/bin/my-app-run.jar'" ]
-    [ "${lines[14]}" = "'./quarkus-app/quarkus' -> '/tmp/kogito_home/bin/quarkus'" ]
-    [ "${lines[15]}" = "'./quarkus-app/quarkus/generated-bytecode.jar' -> '/tmp/kogito_home/bin/quarkus/generated-bytecode.jar'" ]
-    [ "${lines[16]}" = "'./quarkus-app/quarkus/quarkus-application.dat' -> '/tmp/kogito_home/bin/quarkus/quarkus-application.dat'" ]
-}
-
-# Check that the irrelevant binaries are excluded
-@test "test runtime_assemble with binary builds entire target SpringBoot build" {
-    mkdir -p "${KOGITO_HOME}"/bin
-    # emulating an upload
-    mkdir -p /tmp/src/target
-    touch /tmp/src/target/myapp-0.0.1.jar
-    touch /tmp/src/target/myapp-0.0.1.jar.original
-    touch /tmp/src/target/myapp-0.0.1-sources.jar
-    touch /tmp/src/target/myapp-0.0.1-tests.jar
-    touch /tmp/src/target/myapp-0.0.1-tests-sources.jar
-    mkdir -p /tmp/src/target/classes
-    mkdir -p /tmp/src/target/generated-sources
-    mkdir -p /tmp/src/target/maven-archiver
-
-    run runtime_assemble
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-
-    # Target directory is removed from initial location
-    [ ! -d "/tmp/src/target" ]
-
-    # Only expected runnable is located in bin directory
-    [ -f ""${KOGITO_HOME}"/bin/myapp-0.0.1.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1.jar.original" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-sources.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests-sources.jar" ]
-}
-
-# Check that the irrelevant binaries are excluded
-@test "test runtime_assemble with binary builds entire target Quarkus build" {
-    mkdir -p "${KOGITO_HOME}"/bin
-    # emulating an upload
-    mkdir -p /tmp/src/target
-    touch /tmp/src/target/myapp-0.0.1.jar
-    touch /tmp/src/target/myapp-0.0.1-runner.jar
-    touch /tmp/src/target/myapp-0.0.1-sources.jar
-    touch /tmp/src/target/myapp-0.0.1-tests.jar
-    touch /tmp/src/target/myapp-0.0.1-tests-sources.jar
-    mkdir -p /tmp/src/target/classes
-    mkdir -p /tmp/src/target/generated-sources
-    mkdir -p /tmp/src/target/lib
-    touch /tmp/src/target/lib/mydependency-0.0.1.jar
-
-    run runtime_assemble
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-
-    # Target directory is removed from initial location
-    [ ! -d "/tmp/src/target" ]
-
-    # Only runner and dependency is located in bin directory
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1.jar" ]
-    [ -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-runner.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-sources.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests-sources.jar" ]
-    [ -f ""${KOGITO_HOME}"/bin/lib/mydependency-0.0.1.jar" ]
-}
-
-# Check that the irrelevant binaries are excluded
-@test "test runtime_assemble with binary builds entire target Quarkus native build" {
-    mkdir -p "${KOGITO_HOME}"/bin
-    # emulating an upload
-    mkdir -p /tmp/src/target
-    touch /tmp/src/target/myapp-0.0.1.jar
-    cp $BATS_TEST_DIRNAME/mocks/myapp-0.0.1-runner /tmp/src/target/myapp-0.0.1-runner
-    touch /tmp/src/target/myapp-0.0.1-runner.jar
-    touch /tmp/src/target/myapp-0.0.1-sources.jar
-    touch /tmp/src/target/myapp-0.0.1-tests.jar
-    touch /tmp/src/target/myapp-0.0.1-tests-sources.jar
-    mkdir -p /tmp/src/target/classes
-    mkdir -p /tmp/src/target/generated-sources
-    mkdir -p /tmp/src/target/lib
-    touch /tmp/src/target/lib/mydependency-0.0.1.jar
-
-    run runtime_assemble
-
-    echo "result= ${lines[@]}"
-    [ "$status" -eq 0 ]
-
-    # Target directory is removed from initial location
-    [ ! -d "/tmp/src/target" ]
-
-    # Only runner and dependency is located in bin directory
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-runner.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-sources.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/myapp-0.0.1-tests-sources.jar" ]
-    [ ! -f ""${KOGITO_HOME}"/bin/lib/mydependency-0.0.1.jar" ]
-}
-
-@test "test copy_kogito_app default java build no jar file present" {
-    run copy_kogito_app
-
-    echo "result= ${lines[@]}"
-    echo "status= $status"
-    [ "$status" -eq 1 ]
-    [ "${lines[0]}" = "---> Installing common application binaries" ]
-    [ "${lines[1]}" = "cp: cannot stat 'target/*.jar': No such file or directory" ]
-}
-
-@test "test copy_kogito_app default java build jar file present" {
-    touch target/app.jar
-    run copy_kogito_app
-
-    rm -rf target/app.jar
-
-    echo "result= ${lines[@]}"
-    echo "status= $status"
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Installing common application binaries" ]
-    [ "${lines[1]}" = "'target/app.jar' -> '"${KOGITO_HOME}"/bin/app.jar'" ]
-}
-
-@test "test copy_kogito_app default quarkus java build no jar file present" {
-    NATIVE="false"
-    touch target/app-runner.jar
-    mkdir target/lib
-    touch target/lib/{lib.jar,lib1.jar}
-
-    run copy_kogito_app
-    rm -rf target/*
-
-    echo "result= ${lines[@]}"
-    echo "status= $status"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Installing runner jar file" ]
-    [ "${lines[1]}" = "'target/app-runner.jar' -> '"${KOGITO_HOME}"/bin/app-runner.jar'" ]
-    [ "${lines[2]}" = "---> Copying application libraries" ]
-}
-
-@test "test copy_kogito_app default quarkus java build uberJar runner file present" {
-    NATIVE="false"
-    touch target/app-runner.jar
-
-    run copy_kogito_app
-    rm -rf target/*
-
-    echo "result= ${lines[@]}"
-    echo "status= $status"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Installing runner jar file" ]
-    [ "${lines[1]}" = "'target/app-runner.jar' -> '"${KOGITO_HOME}"/bin/app-runner.jar'" ]
-}
-
-@test "test copy_kogito_app default quarkus native builds file present" {
-    NATIVE="true"
-    touch target/app-runner
-    mkdir target/lib
-    touch target/lib/{lib.jar,lib1.jar}
-
-    run copy_kogito_app
-    rm -rf target/*
-
-    echo "result= ${lines[@]}"
-    echo "status= $status"
-
-    echo "${lines[1]}"
-
-    [ "$status" -eq 0 ]
-    [ "${lines[0]}" = "---> Installing native application binaries" ]
-    [ "${lines[1]}" = "'target/app-runner' -> '"${KOGITO_HOME}"/bin/app-runner'" ]
-}
-
-@test "build_kogito_app only checks if it will generate the project in case there's no pom.xml" {
-    mkdir /tmp/src
-
-    run build_kogito_app
-    rm -rf target/*
-
-    echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating quarkus project structure for project..." ]
-}
-
-@test "build_kogito_app only checks if it will generate the springboot project in case there's no pom.xml" {
-    mkdir /tmp/src
-
-    run build_kogito_app $SPRINGBOOT_RUNTIME_TYPE
-    rm -rf target/*
-
-    echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating springboot project structure for project..." ]
-    [ "${lines[1]}" = "----> Using Spring Boot to bootstrap the application." ]
-}
-
-@test "build_kogito_app only checks if it will a build will be triggered if a pom is found" {
-    mkdir /tmp/src
-    touch /tmp/src/pom.xml
-
-    run build_kogito_app
-    rm -rf target/*
-
-    echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Building application from source..." ]
-}
-
-@test "build_kogito_app build a project from a JSON Serverless Workflow file" {
-    mkdir /tmp/src
-    touch /tmp/src/workflow.sw.json
-
-    run build_kogito_app
-    rm -rf target/*
-    echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating quarkus project structure for project..." ]
-}
-
-@test "build_kogito_app build a project from a YAML Serverless Workflow file" {
-    mkdir /tmp/src
-    touch /tmp/src/workflow.sw.yaml
-
-    run build_kogito_app
-    rm -rf target/*
-
-    echo "result= ${lines[@]}"
-    [ "${lines[0]}" = "---> Generating quarkus project structure for project..." ]
-}
-
-
-@test "test get_runtime_type to make sure it returns the expected runtime_type for Quarkus using binary build" {
-    echo "Main-Class: io.quarkus.bootstrap.runner.QuarkusEntryPoint" > /tmp/MANIFEST.MF
-    jar -0 -c --file $KOGITO_HOME/bin/my-app.jar -m /tmp/MANIFEST.MF
-
-    run get_runtime_type
-
-    echo "result: ${lines[@]}"
-    [ "${lines[2]}" = "quarkus" ]
-}
-
-@test "test get_runtime_type to make sure it returns the expected runtime_type for Springboot binary build" {
-    echo "Main-Class: org.springframework.boot.loader.JarLauncher" > /tmp/MANIFEST.MF
-    echo "public void hello(){}" > /tmp/hello.java
-    jar -0 -c --file $KOGITO_HOME/bin/my-app.jar -m /tmp/MANIFEST.MF
-    jar -0 -c --file /tmp/my-app.jar -m /tmp/MANIFEST.MF
-
-    run get_runtime_type
-
-    echo "result: ${lines[@]}"
-    [ "${lines[2]}" = "springboot" ]
-}
-
-
-@test "test if the Quarkus platform properties are correctly returned for community version" {
-    QUARKUS_PLATFORM_VERSION=1.2.3.4
-
-    result=$(get_quarkus_platform_properties)
-
-    expected=" -DplatformGroupId=io.quarkus.platform -DplatformArtifactId=quarkus-bom -DplatformVersion=1.2.3.4"
-
-    echo "result  : $result  `env | grep QUARKUS`"
-    echo "expected: $expected"
-    [ "${result}" = "${expected}" ]
-}
-
-@test "Check if the expected message is printed if native build is enabled" {
-    QUARKUS_PLATFORM_VERSION="1.2.3.4"
-    JBOSS_IMAGE_NAME="rhpam-7/kogito-builder"
-    NATIVE=true
-    mkdir /tmp/src
-    run build_kogito_app
-    echo "result   = $(echo ${lines[0]} |  sed -r 's/\x1B\[(;?[0-9]{1,3})+[mGK]//g')"
-    [ "$status" -eq 10 ]
-    # remove color from the log_warning func
-    [ "$(echo ${lines[0]} |  sed -r 's/\x1B\[(;?[0-9]{1,3})+[mGK]//g')" = "WARN Container Image rhpam-7/kogito-builder does not supports native builds, please refer to the documentation." ]
-}
-
-@test "test if the Quarkus platform properties are correctly returned for using custom values" {
-    QUARKUS_PLATFORM_VERSION="12"
-    QUARKUS_PLATFORM_GROUP_ID="groupId-1"
-    QUARKUS_PLATFORM_ARTIFACT_ID="artifactId-2"
-
-    result=$(get_quarkus_platform_properties)
-
-    expected=" -DplatformGroupId=groupId-1 -DplatformArtifactId=artifactId-2 -DplatformVersion=12"
-
-    echo "result  : $result"
-    echo "expected: $expected"
-    [ "${result}" = "${expected}" ]
-}
-
diff --git a/scripts/common.py b/scripts/common.py
index 9398669b7a3..39a61387b26 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -53,7 +53,7 @@
                               "kogito-management-console", "kogito-task-console"
                               }
 
-SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-base-builder", "kogito-swf-devmode"}
+SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-swf-devmode"}
 
 
 def yaml_loader():
@@ -311,24 +311,6 @@ def update_artifacts_version_in_behave_tests(artifacts_version):
     replacement = '| KOGITO_VERSION | {} | '.format(artifacts_version)
     update_in_behave_tests(pattern, replacement)
 
-
-def update_runtime_image_in_behave_tests(runtime_image_name, image_suffix):
-    """
-    Update a runtime image into behave tests
-    :param runtime_image_name: new full tag name of the runtime image
-    :param image_suffix: suffix of the runtime image to update
-    """
-    print("Set {0} runtime image to {1} in behave tests".format(image_suffix, runtime_image_name))
-    # pattern to change the KOGITO_VERSION
-    pattern = re.compile(r'(runtime-image quay.io/kiegroup/kogito-runtime-{}:latest)'.format(image_suffix))
-    replacement = 'runtime-image {}'.format(runtime_image_name)
-    update_in_behave_tests(pattern, replacement)
-
-    pattern = re.compile(r'(runtime-image rhpam-7/rhpam-kogito-runtime-{}-rhel8:latest)'.format(image_suffix))
-    replacement = 'runtime-image {}'.format(runtime_image_name)
-    update_in_behave_tests(pattern, replacement)
-
-
 def update_maven_repo_in_behave_tests(repo_url, replace_default_repository):
     """
     Update maven repository into behave tests
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index c7e1adecc3f..f17bf7402d6 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -29,29 +29,14 @@ else
     rm -rf bats-core
 fi
 
-echo "----> running bats on kogito-graalvm-scripts"
-./bats/bin/bats modules/kogito-graalvm-scripts/common/tests/bats
-
 echo "----> running bats on kogito-jobs-service-common"
 ./bats/bin/bats modules/kogito-jobs-service-common/tests/bats
 
-echo "----> running bats on kogito-kubernetes-client"
-./bats/bin/bats modules/kogito-kubernetes-client/tests/bats/
-
 echo "----> running bats on kogito-management-console"
 ./bats/bin/bats modules/kogito-management-console/tests/bats/
 
 echo "----> running bats on kogito-task-console"
 ./bats/bin/bats modules/kogito-task-console/tests/bats/
 
-echo "----> running bats on kogito-maven"
-./bats/bin/bats modules/kogito-maven/tests/bats
-
-echo "----> running bats on kogito-persistence"
-./bats/bin/bats modules/kogito-persistence/tests/bats
-
-echo "----> running bats on kogito-s2i-core"
-./bats/bin/bats modules/kogito-s2i-core/tests/bats
-
 echo "----> running bats on kogito-swf-builder"
-./bats/bin/bats modules/kogito-swf/common/scripts/tests/bats
\ No newline at end of file
+./bats/bin/bats modules/kogito-swf/common/scripts/tests/bats
diff --git a/scripts/update-repository.py b/scripts/update-repository.py
index 2583e409684..f854b37d9ba 100644
--- a/scripts/update-repository.py
+++ b/scripts/update-repository.py
@@ -50,11 +50,6 @@
                         help='To update the artifacts version for testing')
     parser.add_argument('--quarkus-platform-version', dest='quarkus_platform_version', help='Update Quarkus version for the tests')
 
-    parser.add_argument('--runtime-image-jvm', dest='runtime_image_jvm',
-                        help='To update the runtime jvm image name in behave tests\'s steps')
-    parser.add_argument('--runtime-image-native', dest='runtime_image_native',
-                        help='To update the runtime native image name in behave tests\'s steps')
-
     parser.add_argument('--tests-only', dest='tests_only', default=False, action='store_true', help='Update product modules/images')
     args = parser.parse_args()
 
@@ -93,9 +88,3 @@
             common.update_quarkus_platform_version_in_build(args.quarkus_platform_version)
         
         common.update_quarkus_platform_version_in_behave_tests_repository_paths(args.quarkus_platform_version)
-    
-    if args.runtime_image_jvm:
-        common.update_runtime_image_in_behave_tests(args.runtime_image_jvm, 'jvm')
-    
-    if args.runtime_image_native:
-        common.update_runtime_image_in_behave_tests(args.runtime_image_native, 'native')
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
deleted file mode 100644
index b543feba343..00000000000
--- a/tests/features/common-build-runtime.feature
+++ /dev/null
@@ -1,11 +0,0 @@
-@quay.io/kiegroup/kogito-s2i-builder
-@quay.io/kiegroup/kogito-runtime-native
-@quay.io/kiegroup/kogito-runtime-jvm
-Feature: Common tests for Kogito builder and runtime images
-
-  # This scenario launches a container that dies instantly, causing Cekit to hand trying to fetch logs
-  # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
-  @ignore 
-  Scenario: Verify if usage help is correctly called
-    When container is started with command bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh -h"
-    Then container log should contain This is the
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 4184dc17c8f..3aca41aa72e 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -1,4 +1,3 @@
-@quay.io/kiegroup/kogito-runtime-jvm 
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-task-console 
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index da33c0d0862..ae5eb11fbe5 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -1,7 +1,5 @@
 # Run only on images that won't die instantly
 # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
-#@quay.io/kiegroup/kogito-s2i-builder
-#@quay.io/kiegroup/kogito-runtime-jvm
 @quay.io/kiegroup/kogito-data-index-ephemeral
 #@quay.io/kiegroup/kogito-data-index-postgresql
 #@quay.io/kiegroup/kogito-jit-runner
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 4fcbdec223a..678ef79add4 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,6 +1,3 @@
-@quay.io/kiegroup/kogito-s2i-builder
-@quay.io/kiegroup/kogito-runtime-jvm
-@quay.io/kiegroup/kogito-runtime-native
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-jit-runner
@@ -9,7 +6,6 @@
 @quay.io/kiegroup/kogito-management-console
 @quay.io/kiegroup/kogito-task-console
 @quay.io/kiegroup/kogito-swf-builder
-@quay.io/kiegroup/kogito-base-builder
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature
deleted file mode 100644
index ab4bf871183..00000000000
--- a/tests/features/kogito-common-builder-jvm.feature
+++ /dev/null
@@ -1,227 +0,0 @@
-@quay.io/kiegroup/kogito-s2i-builder
-Feature: kogito-s2i-builder image JVM build tests
-
-  Scenario: verify if the maven and java installation are correct
-    When container is started with command bash
-    Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.9.3
-    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-17
-
-  Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
-      | variable     | value   |
-      | NATIVE       | false   |
-      | RUNTIME_TYPE | quarkus |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And file /home/kogito/cacerts should exist
-
-  Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
-      | variable     | value   |
-      | NATIVE       | false   |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And file /home/kogito/cacerts should exist
-
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable     | value                     |
-      | NATIVE       | false                     |
-      | RUNTIME_TYPE | quarkus                   |
-      | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And container log should contain DEBUG [io.qua.
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG
-
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable     | value   |
-      | RUNTIME_TYPE | quarkus |
-      | NATIVE       | false   |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-
-  @ignore
-  Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value                                                    |
-      | RUNTIME_TYPE      | quarkus                                                  |
-      | NATIVE            | false                                                    |
-      | ARTIFACT_DIR      | kogito-quarkus-examples/rules-quarkus-helloworld/target  |
-      | MAVEN_ARGS_APPEND | -pl :rules-quarkus-helloworld -am                         |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-
-  Scenario: Perform an incremental s2i build using quarkus runtime type
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
-      | variable     | value   |
-      | RUNTIME_TYPE | quarkus |
-      | NATIVE       | false   |
-    And s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
-      | variable     | value   |
-      | RUNTIME_TYPE | quarkus |
-      | NATIVE       | false   |
-    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And s2i build log should contain Expanding artifacts from incremental build...
-    And file /home/kogito/bin/quarkus-run.jar should exist
-    And check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-
-#### SpringBoot Scenarios
-
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected with debug enabled
-      Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-        | variable     | value        |
-        | RUNTIME_TYPE | springboot   |
-        | JAVA_OPTIONS | -Ddebug=true |
-      Then check that page is served
-        | property             | value                                                                         |
-        | port                 | 8080                                                                          |
-        | path                 | /orders                                                                       |
-        | wait                 | 80                                                                            |
-        | request_method       | POST                                                                          |
-        | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-        | content_type         | application/json                                                              |
-        | expected_status_code | 201                                                                           |
-      And file /home/kogito/bin/process-springboot-example.jar should exist
-      And container log should contain Started DemoApplication
-      And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-  
-  Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main
-      | variable            | value        |
-      | JAVA_OPTIONS        | -Ddebug=true |
-      | RUNTIME_TYPE        | springboot   |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain Started DemoApplication
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-  
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable     | value      |
-      | RUNTIME_TYPE | springboot |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain Tomcat initialized with port(s): 8080 (http)
-  
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value |
-      | JAVA_OPTIONS      | -Ddebug=true                       |
-      | RUNTIME_TYPE      | springboot                         |
-      | ARTIFACT_DIR      | kogito-springboot-examples/process-springboot-example/target  |
-      | MAVEN_ARGS_APPEND | -pl :process-springboot-example -am |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain Started DemoApplication
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
-  Scenario: Perform an incremental s2i build using springboot runtime type
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable     | value      |
-      | RUNTIME_TYPE | springboot |
-    And s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main
-      # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty.
-      | variable     | value      |
-      | RUNTIME_TYPE | springboot |
-    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And s2i build log should contain Expanding artifacts from incremental build...
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected with uber-jar package type built
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value                           |
-      | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar |
-      | RUNTIME_TYPE      | quarkus                         |
-    Then file /home/kogito/bin/process-quarkus-example-runner.jar should exist
diff --git a/tests/features/kogito-common-runtime-jvm.feature b/tests/features/kogito-common-runtime-jvm.feature
deleted file mode 100644
index 79b8c98b8b2..00000000000
--- a/tests/features/kogito-common-runtime-jvm.feature
+++ /dev/null
@@ -1,80 +0,0 @@
-@quay.io/kiegroup/kogito-runtime-jvm
-Feature: kogito-runtime-jvm feature.
-
-  Scenario: verify if the java installation is correct
-    When container is started with command bash
-    Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-17
-    And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk
-    And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 17
-
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus
-    Given s2i build /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld from target
-      | variable            | value                     |
-      | RUNTIME_TYPE        | quarkus                   |
-      | NATIVE              | false                     |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-
-  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port with quarkus
-    Given s2i build /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld from target
-      | variable            | value                     |
-      | RUNTIME_TYPE        | quarkus                   |
-      | NATIVE              | false                     |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-      | BINARY_BUILD        | true                      |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     | 
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/quarkus-run.jar should exist
-
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with springboot
-    Given s2i build /tmp/kogito-examples/kogito-springboot-examples/process-springboot-example from target
-      | variable            | value        |
-      | JAVA_OPTIONS        | -Ddebug=true |
-      | RUNTIME_TYPE        | springboot   |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
-
-  Scenario: Verify if the binary build (forcing) is finished as expected and if it is listening on the expected port with springboot
-    Given s2i build /tmp/kogito-examples/kogito-springboot-examples/process-springboot-example from target
-      | variable            | value        |
-      | JAVA_OPTIONS        | -Ddebug=true |
-      | BINARY_BUILD        | true         |
-      | RUNTIME_TYPE        | springboot   |
-    Then check that page is served
-      | property             | value                                                                         |
-      | port                 | 8080                                                                          |
-      | path                 | /orders                                                                       |
-      | wait                 | 80                                                                            |
-      | request_method       | POST                                                                          |
-      | request_body         | {"approver" : "john", "order" : {"orderNumber" : "12345", "shipped" : false}} |
-      | content_type         | application/json                                                              |
-      | expected_status_code | 201                                                                           |
-    And file /home/kogito/bin/process-springboot-example.jar should exist
-    And container log should contain DEBUG 1 --- [           main] o.s.boot.SpringApplication
-    And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true
diff --git a/tests/features/kogito-common-runtime-native.feature b/tests/features/kogito-common-runtime-native.feature
deleted file mode 100644
index 9715614ca70..00000000000
--- a/tests/features/kogito-common-runtime-native.feature
+++ /dev/null
@@ -1,20 +0,0 @@
-@quay.io/kiegroup/kogito-runtime-native
-Feature: Kogito-runtime-native feature.
-
-  Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus native
-    Given s2i build /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/ from target
-      | variable            | value                     |
-      | NATIVE              | true                      |
-      | BINARY_BUILD        | true                      |
-      | RUNTIME_TYPE        | quarkus                   |
-      | JAVA_OPTIONS        | -Dquarkus.log.level=DEBUG |
-    Then check that page is served
-      | property        | value                    |
-      | port            | 8080                     |
-      | path            | /hello                   |
-      | request_method  | POST                     |
-      | content_type    | application/json         |
-      | request_body    | {"strings":["hello"]}    |
-      | wait            | 80                       |
-      | expected_phrase | ["hello","world"]        |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
diff --git a/tests/features/kogito-runtime-jvm.feature b/tests/features/kogito-runtime-jvm.feature
deleted file mode 100644
index 98732c802fa..00000000000
--- a/tests/features/kogito-runtime-jvm.feature
+++ /dev/null
@@ -1,13 +0,0 @@
-@quay.io/kiegroup/kogito-runtime-jvm
-Feature: kogito-runtime-jvm feature.
-
-  Scenario: verify if all labels are correctly set on kogito-runtime-jvm image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus or Spring Boot JVM image
-    And the image should contain label io.k8s.display-name with value Kogito based on Quarkus or Spring Boot JVM image
-    And the image should contain label io.openshift.tags with value runtime,kogito,quarkus,springboot,jvm
-    And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
diff --git a/tests/features/kogito-runtime-native.feature b/tests/features/kogito-runtime-native.feature
deleted file mode 100644
index 314881abaff..00000000000
--- a/tests/features/kogito-runtime-native.feature
+++ /dev/null
@@ -1,13 +0,0 @@
-@quay.io/kiegroup/kogito-runtime-native
-Feature: Kogito-runtime-native feature.
-
-  Scenario: verify if all labels are correctly set on kogito-runtime-native image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-     And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-     And the image should contain label io.openshift.s2i.destination with value /tmp
-     And the image should contain label io.openshift.expose-services with value 8080:http
-     And the image should contain label io.k8s.description with value Runtime image for Kogito based on Quarkus native image
-     And the image should contain label io.k8s.display-name with value Kogito based on Quarkus native image
-     And the image should contain label io.openshift.tags with value runtime,kogito,quarkus,native
-     And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin
diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature
deleted file mode 100644
index 4019e6d4f04..00000000000
--- a/tests/features/kogito-s2i-builder-native.feature
+++ /dev/null
@@ -1,137 +0,0 @@
-@quay.io/kiegroup/kogito-s2i-builder
-Feature: kogito-s2i-builder image native build tests
-
-  Scenario: verify java cacerts and libsunec are available in the given kogito builder container.
-    When container is started with command bash
-    Then file /home/kogito/cacerts should exist
-
-  Scenario: verify if the maven and graal vm settings are correct on kogito-s2i-builder image for native
-    When container is started with command bash
-    Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven
-    And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.9.3
-    And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-17
-    And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm
-    And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 23.0.2.1
-
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected using native build and runtime image
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-      | variable     | value      |
-      | NATIVE       | true       |
-      | RUNTIME_TYPE | quarkus    |
-      | LIMIT_MEMORY | 3221225472 |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And s2i build log should contain -J-Xmx2576980378
-
-  Scenario: Verify if the s2i build is finished as expected using native build and no runtime image
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main
-      | variable | value          |
-      | NATIVE       | true       |
-      | RUNTIME_TYPE | quarkus    |
-      | LIMIT_MEMORY | 3221225472 |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And file /home/kogito/cacerts should exist
-    And s2i build log should contain -J-Xmx2576980378
-
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration.
-    Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-      | variable     | value      |
-      | NATIVE       | true       |
-      | RUNTIME_TYPE | quarkus    |
-      | LIMIT_MEMORY | 6442450944 |
-    Then check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And s2i build log should contain -J-Xmx5153960755
-
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-      | variable          | value         |
-      | RUNTIME_TYPE      | quarkus       |
-      | NATIVE            | true          |
-      | LIMIT_MEMORY      | 6442450944    |
-      | MAVEN_ARGS_APPEND | -Ppersistence |
-    When container integ- is started with command bash
-    Then file /home/kogito/bin/process-quarkus-example-runner should exist
-     And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-     And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-     And s2i build log should contain -J-Xmx5153960755
-
-  Scenario: Perform an incremental s2i build for native test
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
-      | variable     | value   |
-      | RUNTIME_TYPE | quarkus |
-      | NATIVE       | false   |
-    And s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main
-      | variable     | value      |
-      | RUNTIME_TYPE | quarkus    |
-      | NATIVE       | true       |
-      | LIMIT_MEMORY | 6442450944 |
-    Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts
-    And s2i build log should contain Expanding artifacts from incremental build...
-    And s2i build log should contain -J-Xmx5153960755
-    And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist
-    And check that page is served
-      | property        | value                 |
-      | port            | 8080                  |
-      | path            | /hello                |
-      | request_method  | POST                  |
-      | content_type    | application/json      |
-      | request_body    | {"strings":["hello"]} |
-      | wait            | 80                    |
-      | expected_phrase | ["hello","world"]     |    
-
-  @ignore
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest
-      | variable       | value          |
-      | RUNTIME_TYPE   | quarkus        |
-      | NATIVE         | true           |
-      | LIMIT_MEMORY   | 6442450944     |
-      | KOGITO_VERSION | 999-SNAPSHOT |      
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-    And check that page is served
-      | property        | value                           |
-      | port            | 8080                            |
-      | path            | /q/health/live                  |
-      | wait            | 80                              |
-      | request_method  | GET                             |
-      | content_type    | application/json                |
-      | request_body    | {"status": "UP", "checks": []}  |
-    And s2i build log should contain -J-Xmx5153960755
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
deleted file mode 100644
index 3031b628e84..00000000000
--- a/tests/features/kogito-s2i-builder.feature
+++ /dev/null
@@ -1,147 +0,0 @@
-@quay.io/kiegroup/kogito-s2i-builder
-Feature: kogito-s2i-builder image tests
-
-  Scenario: verify if all labels are correctly set on kogito-s2i-builder image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-    And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
-    And the image should contain label io.openshift.s2i.destination with value /tmp
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Platform for building Kogito based on Quarkus or Spring Boot
-    And the image should contain label io.k8s.display-name with value Kogito based on Quarkus or Spring Boot
-    And the image should contain label io.openshift.tags with value s2i-builder,kogito,quarkus,springboot
-
-  Scenario: verify if community builder image does not contain the red hat maven repositories
-    When container is started with command bash
-    Then file /home/kogito/.m2/settings.xml should not contain <id>redhat-maven-repositories</id>
-    And file /home/kogito/.m2/settings.xml should not contain <activeProfile>redhat-maven-repositories</activeProfile>
-    And file /home/kogito/.m2/settings.xml should not contain <id>redhat-ga-repository</id>
-    And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/ga/</url>
-    And file /home/kogito/.m2/settings.xml should not contain <id>redhat-ea-repository</id>
-    And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/earlyaccess/all/</url>
-    And file /home/kogito/.m2/settings.xml should not contain <id>redhat-techpreview-repository</id>
-    And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url>
-
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value         |
-      | NATIVE            | false         |
-      | RUNTIME_TYPE      | quarkus       |
-      | MAVEN_ARGS_APPEND | -Ppersistence |
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-
-  @ignore
-  Scenario: Verify if the s2i build is finished as expected with persistence enabled
-    Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable          | value         |
-      | MAVEN_ARGS_APPEND | -Ppersistence |
-      | RUNTIME_TYPE      | springboot    |
-    Then file /home/kogito/bin/process-springboot-example.jar should exist
-    And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto'
-    And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto'
-
-  @ignore
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable       | value          |
-      | RUNTIME_TYPE   | quarkus        |
-      | NATIVE         | false          |
-      | KOGITO_VERSION | 999-SNAPSHOT |      
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure for project...
-    And s2i build log should contain Using Quarkus io.quarkus.platform:quarkus-maven-plugin:
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-    And check that page is served
-      | property        | value                           |
-      | port            | 8080                            |
-      | path            | /q/health/live                  |
-      | wait            | 80                              |
-      | request_method  | GET                             |
-      | content_type    | application/json                |
-      | request_body    | {"status": "UP", "checks": []}  |
-
-  @ignore
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable            | value          |
-      | RUNTIME_TYPE        | quarkus        |
-      | NATIVE              | false          |
-      | KOGITO_VERSION | 999-SNAPSHOT |      
-      | PROJECT_GROUP_ID    | com.mycompany  |
-      | PROJECT_ARTIFACT_ID | myproject      |
-      | PROJECT_VERSION     | 2.0-SNAPSHOT   |
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure for myproject...
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-
-  @ignore
-  Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly
-    Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable                 | value                                                 |
-      | RUNTIME_TYPE             | quarkus                                               |
-      | NATIVE                   | false                                                 |
-      | KOGITO_VERSION | 999-SNAPSHOT |                   
-      | PROJECT_GROUP_ID         | com.mycompany                                         |
-      | PROJECT_ARTIFACT_ID      | myproject                                             |
-      | PROJECT_VERSION          | 2.0-SNAPSHOT                                          |
-      | K_SINK                   | http://localhost:8181                                 |
-      | QUARKUS_EXTRA_EXTENSIONS | org.kie:kie-addons-quarkus-knative-eventing |
-    Then file /home/kogito/bin/quarkus-run.jar should exist
-    And s2i build log should contain Generating quarkus project structure for myproject...
-    And s2i build log should contain Adding Kogito Quarkus Workflows extension to the generated project.
-    And check that page is served
-      | property              | value                         |
-      | port                  | 8080                          |
-      | path                  | /                             |
-      | wait                  | 80                            |
-      | expected_status_code  | 202                           |
-      | request_method        | POST                          |
-      | content_type          | application/cloudevents+json  |
-      | request_body          | {"specversion": "1.0", "datacontenttype": "application/json", "source": "behave", "type": "orderEvent", "id": "12345", "data": {"id":"f0643c68-609c-48aa-a820-5df423fa4fe0","country":"Brazil","total":10000,"description":"iPhone 12"}}|
-
-#### SpringBoot Scenarios
-
-  @ignore
-  Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot
-    Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest
-      | variable       | value          |
-      | KOGITO_VERSION | 999-SNAPSHOT |      
-      | RUNTIME_TYPE   | springboot     |
-    Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist
-    And s2i build log should contain Generating springboot project structure for project...
-    And check that page is served
-      | property        | value                                                                                            |
-      | port            | 8080                                                                                             |
-      | path            | /Traffic%20Violation                                                                             |
-      | wait            | 80                                                                                               |
-      | expected_phrase | Should the driver be suspended?                                                                  |
-      | request_method  | POST                                                                                             |
-      | content_type    | application/json                                                                                 |
-      | request_body    | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} |
-    And check that page is served
-      | property        | value            |
-      | port            | 8080             |
-      | path            | /actuator/health |
-      | wait            | 80               |
-      | request_method  | GET              |
-      | content_type    | application/json |
-      | request_body    | {"status":"UP"}  |

From 39bdc546f81efd0a0fe793ec487742ce24a6e50f Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Thu, 11 Apr 2024 12:48:10 -0300
Subject: [PATCH 672/709] Weekly job (#1757)

* Update Kogito version when build weekly image tags
---
 .ci/jenkins/Jenkinsfile.build-image   | 12 ++++++++++++
 .ci/jenkins/Jenkinsfile.weekly.deploy |  2 ++
 .ci/jenkins/dsl/jobs.groovy           |  1 +
 3 files changed, 15 insertions(+)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 892c0343b99..fec460acc49 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -94,6 +94,18 @@ pipeline {
                 }
             }
         }
+
+        stage('Update kogito version') {
+            when {
+                expression { params.UPDATE_KOGITO_VERSION != '' }
+            }
+            steps {
+                script {
+                    runPythonCommand("python scripts/manage-kogito-version.py --bump-to ${params.UPDATE_KOGITO_VERSION} --confirm")
+                }
+            }
+        }
+
         // Commented as we cannot fully rely on Quarkus platform
         // Should be uncommmented once https://issues.redhat.com/browse/KOGITO-9120 is implemented
         // stage('Setup Quarkus platform') {
diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
index cf648e8a7e6..8777eabeb54 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -202,6 +202,8 @@ void createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_URI', value: params.EXAMPLES_URI))
             buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_REF', value: params.EXAMPLES_REF))
 
+            buildParams.add(booleanParam(name: 'UPDATE_KOGITO_VERSION', value: getProjectVersion()))
+
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_CREDENTIALS', value: getDeployImageRegistryCredentials()))
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 5ed082bb9ad..886f40caf12 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -186,6 +186,7 @@ void setupBuildImageJob(JobType jobType) {
             stringParam('BUILD_KOGITO_APPS_URI', '', '(Optional) Git uri to the kogito-apps repository to use for tests.')
             stringParam('BUILD_KOGITO_APPS_REF', '', '(Optional) Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
             stringParam('QUARKUS_PLATFORM_URL', Utils.getMavenQuarkusPlatformRepositoryUrl(this), 'URL to the Quarkus platform to use. The version to use will be guessed from artifacts.')
+            stringParam('UPDATE_KOGITO_VERSION', '', '(Optional) Update kogito to a specific version in the project')
 
             // Test information
             booleanParam('SKIP_TESTS', false, 'Skip tests')

From 866d09ffa2cdbc90ee73d517ed1ff40e0433b0a8 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Thu, 11 Apr 2024 15:05:21 -0300
Subject: [PATCH 673/709] Reintroduce image Kogito Base Builder for Web Tools
 (#1754)

* Reintroduce image Kogito Base Builder for Web Tools

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Restore Makefile verbose options

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

---------

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 kogito-base-builder-image.yaml            | 63 +++++++++++++++++++++++
 kogito-data-index-ephemeral-image.yaml    |  2 +-
 kogito-data-index-postgresql-image.yaml   |  2 +-
 kogito-imagestream.yaml                   | 21 ++++++++
 kogito-jit-runner-image.yaml              |  2 +-
 kogito-jobs-service-allinone-image.yaml   |  2 +-
 kogito-jobs-service-ephemeral-image.yaml  |  2 +-
 kogito-jobs-service-postgresql-image.yaml |  2 +-
 kogito-management-console-image.yaml      |  2 +-
 kogito-swf-builder-image.yaml             |  4 +-
 kogito-swf-devmode-image.yaml             |  4 +-
 kogito-task-console-image.yaml            |  2 +-
 scripts/common.py                         |  2 +-
 tests/features/common.feature             |  1 +
 14 files changed, 98 insertions(+), 13 deletions(-)
 create mode 100644 kogito-base-builder-image.yaml

diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
new file mode 100644
index 00000000000..fc78545225a
--- /dev/null
+++ b/kogito-base-builder-image.yaml
@@ -0,0 +1,63 @@
+#
+# 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.
+#
+schema_version: 1
+
+name: "quay.io/kiegroup/kogito-base-builder"
+version: "999-SNAPSHOT"
+from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
+description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"
+
+labels:
+  - name: "io.openshift.s2i.scripts-url"
+    value: "image:///usr/local/s2i"
+  - name: "io.openshift.s2i.destination"
+    value: "/tmp"
+  - name: "io.openshift.expose-services"
+    value: "8080:http"
+  - name: "io.quarkus.platform.version"
+    value: "3.2.10.Final"
+  - name: "org.kie.kogito.version"
+    value: "999-SNAPSHOT"
+  - name: "maintainer"
+    value: "Apache KIE <dev@kie.apache.org>"
+  - name: "io.k8s.description"
+    value: "Platform for building Kogito based on JDK and Maven"
+  - name: "io.k8s.display-name"
+    value: "Kogito based on JDK and Maven"
+  - name: "io.openshift.tags"
+    value: "base-builder,kogito"
+
+packages:
+  manager: microdnf
+
+modules:
+  repositories:
+    - path: modules
+  install:
+    - name: org.kie.kogito.system.user
+    - name: org.kie.kogito.logging
+    - name: org.kie.kogito.launch.scripts
+    - name: org.kie.kogito.dynamic.resources
+    - name: org.kie.kogito.maven.common
+    - name: org.kie.kogito.project.versions
+    - name: org.kie.kogito.security.custom.truststores
+
+run:
+  workdir: "/home/kogito"
+  user: 1001
diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index 4801a69e00c..22eeecb4905 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-ephemeral"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
 labels:
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index 3f41ff43cde..048ae5c1548 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-data-index-postgresql"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
 
 
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 71fec5708c8..a9d24737c53 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -45,6 +45,27 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-swf-builder:999-SNAPSHOT
+  - kind: ImageStream
+    apiVersion: v1
+    metadata:
+      name: kogito-base-builder
+      annotations:
+        openshift.io/display-name: Kogito base builder
+        openshift.io/provider-display-name: KIE Group.
+    spec:
+      tags:
+        - name: '999-SNAPSHOT'
+          annotations:
+            description: Kogito base builder
+            iconClass: icon-jbpm
+            tags: kogito,jdk,maven
+            supports: quarkus
+            version: '999-SNAPSHOT'
+          referencePolicy:
+            type: Local
+          from:
+            kind: DockerImage
+            name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 0907088be30..61757a9f405 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jit-runner"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito JIT Runner"
 
 labels:
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index f2a99f7a79b..ea7c283d9eb 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-allinone"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
 
 labels:
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index d26ce19cb4e..c9b0b2e83b9 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito in memory Jobs Service"
 
 labels:
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index df50edcc405..48eaf58f0fd 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service based on Postgresql"
 
 labels:
diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml
index 62ee228466f..63e878ce9d6 100644
--- a/kogito-management-console-image.yaml
+++ b/kogito-management-console-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-management-console"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Management Console"
 
 labels:
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 5749630e2d1..59cad93c642 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -17,7 +17,7 @@
 # under the License.
 #
   - name: builder
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
     version: "999-SNAPSHOT"
     modules:
       repositories:
@@ -34,7 +34,7 @@
         - name: org.kie.kogito.swf.common.build
 
   - name: "quay.io/kiegroup/kogito-swf-builder"
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
     version: "999-SNAPSHOT"
     description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
 
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 2b61576ad5a..18e918c8edd 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -17,7 +17,7 @@
 # under the License.
 #
   - name: builder
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
     version: "999-SNAPSHOT"
     modules:
       repositories:
@@ -37,7 +37,7 @@
       manager: microdnf
 
   - name: "quay.io/kiegroup/kogito-swf-devmode"
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.18"
+    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
     version: "999-SNAPSHOT"
     description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
 
diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
index 2031de62f5c..39c89643dbd 100644
--- a/kogito-task-console-image.yaml
+++ b/kogito-task-console-image.yaml
@@ -20,7 +20,7 @@ schema_version: 1
 
 name: "quay.io/kiegroup/kogito-task-console"
 version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.18"
+from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Task Console"
 
 labels:
diff --git a/scripts/common.py b/scripts/common.py
index 39a61387b26..8d1770ff9d6 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -53,7 +53,7 @@
                               "kogito-management-console", "kogito-task-console"
                               }
 
-SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-swf-devmode"}
+SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-swf-devmode", "kogito-base-builder"}
 
 
 def yaml_loader():
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 678ef79add4..0f2ba31cffd 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -6,6 +6,7 @@
 @quay.io/kiegroup/kogito-management-console
 @quay.io/kiegroup/kogito-task-console
 @quay.io/kiegroup/kogito-swf-builder
+@quay.io/kiegroup/kogito-base-builder
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured

From e6f4d01430f1ac537592fed96759016a11823074 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Thu, 11 Apr 2024 18:06:23 -0300
Subject: [PATCH 674/709] Add kogito-base-builder image to the weekly deploy
 job (#1758)

---
 .ci/jenkins/dsl/jobs.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 886f40caf12..cad3d606cdf 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -348,7 +348,7 @@ void setupWeeklyDeployJob(JobType jobType) {
         QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
     ])
 
-    jobParams.env.put('IMAGES_LIST', 'kogito-swf-builder,kogito-swf-devmode')
+    jobParams.env.put('IMAGES_LIST', 'kogito-swf-builder,kogito-swf-devmode,kogito-base-builder')
 
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {

From 1e77d9e92e6e56ab3f6cac0cadc41deb2f5003c1 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Fri, 12 Apr 2024 08:17:05 -0300
Subject: [PATCH 675/709] Fix #1755 - Fix SpellSheck runner and warning in
 script files (#1756)

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 .github/workflows/kogito-images-pr-check.yml  | 23 +++++++++++--------
 .../added/configure-custom-truststore.sh      |  3 ++-
 .../kogito-launch-scripts/added/configure.sh  |  2 ++
 modules/kogito-maven/common/configure         |  2 +-
 .../common/build/added/cleanup_project.sh     |  2 +-
 .../common/scripts/added/add-extension.sh     |  3 ++-
 .../common/scripts/added/build-app.sh         |  3 ++-
 .../common/scripts/added/create-app.sh        |  3 ++-
 .../common/scripts/added/jvm-settings.sh      |  7 ++++--
 .../runtime/common/added/run-app-devmode.sh   |  3 ++-
 10 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
index 98a5199ba6f..31331b40459 100644
--- a/.github/workflows/kogito-images-pr-check.yml
+++ b/.github/workflows/kogito-images-pr-check.yml
@@ -10,11 +10,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install xmllint
         run: |
-          sudo apt-get update
-          sudo apt-get install libxml2-utils --fix-missing
+          sudo apt-get update &&\
+          sudo apt-get -y install --no-install-recommends --fix-missing \
+          libxml2-utils
       - name: Cache bats binaries
         uses: actions/cache@v1
         with:
@@ -25,7 +26,7 @@ jobs:
       - name: run bats
         run: |
           ./scripts/run-bats.sh
-          
+
   validate_kogito_imagestream:
     concurrency:
       group: ${{ github.repository.name }}_validate_kogito_imagestream-${{ github.head_ref }}
@@ -33,14 +34,14 @@ jobs:
     name: Validate Kogito imagestreams
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download openshift-validator-tool
         run: |
           wget https://github.com/jboss-container-images/jboss-kie-modules/raw/main/tools/openshift-template-validator/openshift-template-validator-linux-amd64
       - name: Add execution permission to openshift-validator-tool
         run: |
           chmod +x openshift-template-validator-linux-amd64
-          mv openshift-template-validator-linux-amd64 ${HOME} 	
+          mv openshift-template-validator-linux-amd64 ${HOME}
       - name: validate kogito imagestream
         run: |
           ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
@@ -53,11 +54,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Shellcheck
-        run: sudo apt install shellcheck
+        run: |
+          sudo apt-get update &&\
+          sudo apt-get -y install --no-install-recommends \
+          shellcheck
       - name: Check configure scripts
         run: |
           # Ignore SC2034 since we have many var which are unused in the script but can be used while deployment at runtime by setting env. For eg: ${KOGITO_QUARKUS_JVM_PROPS}
           # Ignore SC1090 since the source files in our case didn't need to be checked
-          shellcheck -e SC2034 -e SC1090 modules/**/configure modules/**/*.sh
\ No newline at end of file
+          shopt -s globstar nullglob
+          shellcheck -e SC2034 -e SC1090 -S warning modules/**/configure modules/**/*.sh
diff --git a/modules/kogito-custom-truststore/added/configure-custom-truststore.sh b/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
index f3c180f88a5..3438a0d4e5d 100755
--- a/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
+++ b/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -20,6 +20,7 @@
 set -e
 
 # imports
+# shellcheck source=/dev/null
 source "${KOGITO_HOME}"/launch/logging.sh
 
 function prepareEnv() {
diff --git a/modules/kogito-launch-scripts/added/configure.sh b/modules/kogito-launch-scripts/added/configure.sh
index 638e9bbcff7..8244ba32ff6 100644
--- a/modules/kogito-launch-scripts/added/configure.sh
+++ b/modules/kogito-launch-scripts/added/configure.sh
@@ -84,6 +84,7 @@ function prepareModule() {
 # $1 - module file
 # $2 - function name
 function executeModule() {
+  # shellcheck source=/dev/null
   source "$1"
   if [ -n "$(type -t "$2")" ]; then
     eval "$2"
@@ -93,6 +94,7 @@ function executeModule() {
 # Run through the list of scripts, executing the specified function for each.
 # $1 - function name
 function executeModules() {
+  # shellcheck disable=SC2048
   for module in ${CONFIGURE_SCRIPTS[*]}; do
     prepareModule
     executeModule "${module}" "${1}"
diff --git a/modules/kogito-maven/common/configure b/modules/kogito-maven/common/configure
index 7f53060455f..e28dccbbd17 100755
--- a/modules/kogito-maven/common/configure
+++ b/modules/kogito-maven/common/configure
@@ -25,7 +25,7 @@ SCRIPT_DIR=$(dirname "${0}")
 mvn_install_dir="/usr/share/maven"
 
 # Verify if mvn is installed
-if [ ! -d ${mvn_install_dir} ] && ! command -v mvn &> /dev/null ;
+if [ ! -d ${mvn_install_dir} ] && ! command -v mvn > /dev/null 2>&1 ;
 then
     echo "---> Maven not found, downloading and installing it"
     tar xzf "${SOURCES_DIR}"/apache-maven-"${MAVEN_VERSION}"-bin.tar.gz -C /usr/share
diff --git a/modules/kogito-swf/common/build/added/cleanup_project.sh b/modules/kogito-swf/common/build/added/cleanup_project.sh
index adfac1d52f9..69e0a61e975 100755
--- a/modules/kogito-swf/common/build/added/cleanup_project.sh
+++ b/modules/kogito-swf/common/build/added/cleanup_project.sh
@@ -35,7 +35,7 @@ rm -rfv "${PROJECT_ARTIFACT_ID}"/*.bak
 echo 'Clean Maven useless files'
 find "${KOGITO_HOME}"/.m2/repository -name _remote.repositories -type f -delete
 find "${KOGITO_HOME}"/.m2/repository -name _maven.repositories -type f -delete
-find "${KOGITO_HOME}"/.m2/repository -name *.lastUpdated -type f -delete
+find "${KOGITO_HOME}"/.m2/repository -name '*.lastUpdated' -type f -delete
 
 # Remove files that include build timestamps to have reproducible images
 find "${KOGITO_HOME}"/.m2/ -name resolver-status.properties -delete 
diff --git a/modules/kogito-swf/common/scripts/added/add-extension.sh b/modules/kogito-swf/common/scripts/added/add-extension.sh
index 82a023ace1b..6dc158d2a08 100755
--- a/modules/kogito-swf/common/scripts/added/add-extension.sh
+++ b/modules/kogito-swf/common/scripts/added/add-extension.sh
@@ -20,12 +20,13 @@
 
 set -e
 
-script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # extensions to be added, comma separated.
 extensions="$1"
 # parameter passed which will trigger or not the jvm/maven configuration.
 ignore_jvm_settings=${2:-false}
 
+# shellcheck source=/dev/null
 source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
index c85927c4bed..671d6e09b1e 100755
--- a/modules/kogito-swf/common/scripts/added/build-app.sh
+++ b/modules/kogito-swf/common/scripts/added/build-app.sh
@@ -20,12 +20,13 @@
 
 set -e
 
-script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 resources_path="$1"
 if [ -n "${resources_path}" ]; then
     resources_path="$(realpath "${resources_path}")"
 fi
 
+# shellcheck source=/dev/null
 source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
diff --git a/modules/kogito-swf/common/scripts/added/create-app.sh b/modules/kogito-swf/common/scripts/added/create-app.sh
index f965d9b78a9..ac8a5ebe627 100755
--- a/modules/kogito-swf/common/scripts/added/create-app.sh
+++ b/modules/kogito-swf/common/scripts/added/create-app.sh
@@ -20,8 +20,9 @@
 
 set -e
 
-script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
+# shellcheck source=/dev/null
 source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
diff --git a/modules/kogito-swf/common/scripts/added/jvm-settings.sh b/modules/kogito-swf/common/scripts/added/jvm-settings.sh
index b8a1fce9554..168e5321617 100755
--- a/modules/kogito-swf/common/scripts/added/jvm-settings.sh
+++ b/modules/kogito-swf/common/scripts/added/jvm-settings.sh
@@ -30,14 +30,17 @@
 
 set -e
 
+# shellcheck source=/dev/null
 source "${KOGITO_HOME}"/launch/logging.sh
 
 log_info "--> checking if .mvn/jvm.config exists."
 if [ -f ".mvn/jvm.config" ]; then
   log_info "---> .mvn/jvm.config exists."
-  export JAVA_OPTIONS=$(cat .mvn/jvm.config)
+  JAVA_OPTIONS=$(cat .mvn/jvm.config)
+  export JAVA_OPTIONS
 else
   log_info "---> .mvn/jvm.config does not exists, memory will be calculated based on container limits."
 fi
 
-export MAVEN_OPTS="${JAVA_OPTIONS} $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
\ No newline at end of file
+MAVEN_OPTS="${JAVA_OPTIONS} $("${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/java-default-options) $("${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/debug-options)"
+export MAVEN_OPTS
\ No newline at end of file
diff --git a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
index ba8edc6585d..6f5ec36109e 100755
--- a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
+++ b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
@@ -20,8 +20,9 @@
 
 set -e
 
-script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
+script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
+# shellcheck source=/dev/null
 source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then

From f248f49b710316375a0188e5759bb203bc2ed5f1 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Fri, 12 Apr 2024 08:20:22 -0300
Subject: [PATCH 676/709] Fix Week deploy job param type (#1759)

---
 .ci/jenkins/Jenkinsfile.weekly.deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
index 8777eabeb54..d165968744a 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -202,7 +202,7 @@ void createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_URI', value: params.EXAMPLES_URI))
             buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_REF', value: params.EXAMPLES_REF))
 
-            buildParams.add(booleanParam(name: 'UPDATE_KOGITO_VERSION', value: getProjectVersion()))
+            buildParams.add(string(name: 'UPDATE_KOGITO_VERSION', value: getProjectVersion()))
 
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))

From af98d962b1c50df07660ea6fd0a2201d47e0cea7 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Thu, 18 Apr 2024 10:04:15 -0300
Subject: [PATCH 677/709] Temporary removal of kogito-swf-{builder-,devmode}
 images from release pipelines (#1752)

---
 .ci/jenkins/Jenkinsfile.deploy  | 5 ++++-
 .ci/jenkins/Jenkinsfile.promote | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 2391a1ae8ce..e768cb7f09f 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -441,7 +441,10 @@ String[] getImages() {
     if (env.IMAGES_LIST) {
         return env.IMAGES_LIST.split(',')
     }
-    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
+    String images = sh(returnStdout: true, script: "make list | tr '\\n' ','").trim()
+    // Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
+    images = images.replace("kogito-swf-builder,", "").replace("kogito-swf-devmode,", "")
+    return images.split(',')
 }
 
 String getQuarkusPlatformVersion() {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index c3b2164b3fb..428a9bc92c5 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -366,6 +366,8 @@ String getNewImageTag() {
 
 String[] getImages() {
     String images = getOldImageNames() ?: env.IMAGES_LIST ?: runPythonCommand("make list | tr '\\n' ','", true).trim()
+    // Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
+    images = images.replace("kogito-swf-builder,", "").replace("kogito-swf-devmode,", "")
     return images.split(',')
 }
 

From 2731f4467b19f0d26f039c0d83194a5b6bfd865a Mon Sep 17 00:00:00 2001
From: Thiago Lugli <thiagoelg@users.noreply.github.com>
Date: Thu, 25 Apr 2024 11:00:22 -0300
Subject: [PATCH 678/709] [kie-issues#963] Remove all references to
 kogito-task-console and kogito-management-console (#1753)

* Remove all references to kogito-task-console and kogito-management-console

* Remove more kogito-task/management-console references
---
 Makefile                                      |  2 +-
 README.md                                     | 63 +----------------
 kogito-imagestream.yaml                       | 42 ------------
 kogito-management-console-image.yaml          | 67 -------------------
 kogito-task-console-image.yaml                | 66 ------------------
 .../added/kogito-app-launch.sh                | 48 -------------
 .../added/launch/kogito-management-console.sh | 49 --------------
 .../kogito-management-console/configure.sh    | 32 ---------
 modules/kogito-management-console/module.yaml | 33 ---------
 .../tests/bats/kogito-management-console.bats | 54 ---------------
 .../added/kogito-app-launch.sh                | 48 -------------
 .../added/launch/kogito-task-console.sh       | 50 --------------
 modules/kogito-task-console/configure         | 32 ---------
 modules/kogito-task-console/module.yaml       | 31 ---------
 .../tests/bats/kogito-task-console.bats       | 54 ---------------
 scripts/build-kogito-apps-components.sh       |  6 --
 scripts/common.py                             | 13 ++--
 scripts/run-bats.sh                           |  6 --
 .../features/common-custom-truststore.feature |  4 +-
 .../features/common-dynamic-resources.feature |  2 -
 tests/features/common.feature                 |  2 -
 .../kogito-management-console.feature         | 29 --------
 tests/features/kogito-task-console.feature    | 29 --------
 .../supporting-services-common.feature        |  2 -
 24 files changed, 9 insertions(+), 755 deletions(-)
 delete mode 100644 kogito-management-console-image.yaml
 delete mode 100644 kogito-task-console-image.yaml
 delete mode 100644 modules/kogito-management-console/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-management-console/added/launch/kogito-management-console.sh
 delete mode 100644 modules/kogito-management-console/configure.sh
 delete mode 100644 modules/kogito-management-console/module.yaml
 delete mode 100644 modules/kogito-management-console/tests/bats/kogito-management-console.bats
 delete mode 100644 modules/kogito-task-console/added/kogito-app-launch.sh
 delete mode 100644 modules/kogito-task-console/added/launch/kogito-task-console.sh
 delete mode 100644 modules/kogito-task-console/configure
 delete mode 100644 modules/kogito-task-console/module.yaml
 delete mode 100644 modules/kogito-task-console/tests/bats/kogito-task-console.bats
 delete mode 100644 tests/features/kogito-management-console.feature
 delete mode 100644 tests/features/kogito-task-console.feature

diff --git a/Makefile b/Makefile
index 7feb4fe5dbd..21a49659711 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ display-image-version:
 build: clone-repos _build
 
 _build:
-	@for f in $(shell make list); do make build-image image_name=$${iname}; done
+	@for f in $(shell make list); do make build-image image_name=$${f}; done
 
 
 .PHONY: build-image
diff --git a/README.md b/README.md
index 1800b4a1190..0543ac6311a 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,6 @@ Table of Contents
     - [Kogito Data Index Component Images](#kogito-data-index-component-images)
     - [Kogito Jobs Service Component Images](#kogito-jobs-service-component-images)
       - [Jobs Services All-in-one](#jobs-services-all-in-one)
-    - [Kogito Management Console Component Image](#kogito-management-console-component-image)
-    - [Kogito Task Console Component Image](#kogito-task-console-component-image)
     - [Kogito JIT Runner Component Image](#kogito-jit-runner-component-image)
   - [Contributing to Kogito Images repository](#contributing-to-kogito-images-repository)
     - [Building Images](#building-images)
@@ -154,8 +152,6 @@ Today we have the following Kogito Component Images:
 * [quay.io/kiegroup/kogito-jobs-service-ephemeral](https://quay.io/kiegroup/kogito-jobs-service-ephemeral) 
 * [quay.io/kiegroup/kogito-jobs-service-postgresql](https://quay.io/kiegroup/kogito-jobs-service-postgresql)
 * [quay.io/kiegroup/kogito-jobs-service-allinone](https://quay.io/kiegroup/kogito-jobs-service-allinone)
-* [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console)
-* [quay.io/kiegroup/kogito-task-console](https://quay.io/kiegroup/kogito-task-console)
 * [quay.io/kiegroup/kogito-jit-runner](https://quay.io/kiegroup/kogito-jit-runner)
 
 
@@ -264,60 +260,6 @@ The above command will spinup the Jobs-service so you can connect your applicati
 The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Jobs Service
 to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications
 
-
-### Kogito Management Console Component Image
-
-The Kogito Management Console allows you to have a intuitive way to manage your Kogito processes in execution.
-It depends on the Kogito Data Index Service on which the Console will connect to so it can be able to manage it.
-Keep in mind that when using the [Process Instance Management Add-on](https://docs.jboss.org/kogito/release/latest/html_single/#con_bpmn-process-instance-management_kogito-developing-process-services) 
-it will enable your Kogito service be manageable through REST API.
-
-
-To work correctly, the Kogito Management Console needs the Kogito Data Index Service url. If not provided, it will try to connect to the default one (http://localhost:8180).
-
-Basic usage:
-
-```bash
-$ docker run -it --env KOGITO_DATAINDEX_HTTP_URL=data-index-service-url:9090 quay.io/kiegroup/kogito-management-console:latest
-```
-
-To enable debug just use this env while running this image:
-
-```bash
-docker run -it --env SCRIPT_DEBUG=true --env KOGITO_DATAINDEX_HTTP_URL=data-index-service-url:9090 quay.io/kiegroup/kogito-management-console:latest
-```
-You should notice a few debug messages being printed in the system output.
-
-To know what configurations this image accepts please take a look [here](kogito-management-console-image.yaml) on the **envs** section.
-
-The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Management Console 
-to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
-
-### Kogito Task Console Component Image
-
-The Kogito Task Console allows you to have an intuitive way to work with User Tasks in Kogito processes.
-It depends on the Kogito Data Index Service on which the Console will connect to, so it can be able to manage it.
-
-To work correctly, the Kogito Task Console needs the Kogito Data Index Service url. If not provided, it will try to connect to the default one (http://localhost:8180).
-
-Basic usage:
-
-```bash
-$ docker run -it --env KOGITO_DATAINDEX_HTTP_URL=data-index-service-url:9090 quay.io/kiegroup/kogito-task-console:latest
-```
-
-To enable debug just use this env while running this image:
-
-```bash
-docker run -it --env SCRIPT_DEBUG=true --env KOGITO_DATAINDEX_HTTP_URL=data-index-service-url:9090 quay.io/kiegroup/kogito-task-console:latest
-```
-You should notice a few debug messages being printed in the system output.
-
-To know what configurations this image accepts please take a look [here](kogito-task-console-image.yaml) on the **envs** section.
-
-The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Task Console
-to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
-
 ### Kogito JIT Runner Component Image
 
 The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/apache/incubator-kie-kogito-apps/tree/main/jitexecutor).
@@ -367,7 +309,6 @@ With this Makefile you can:
      $ make build-image image_name=kogito-jobs-service-ephemeral
      $ make build-image image_name=kogito-jobs-service-postgresql
      $ make build-image image_name=kogito-jobs-service-allinone
-     $ make build-image image_name=kogito-management-console
      $ make build-image image_name=kogito-jit-runner
      ```
   
@@ -432,7 +373,6 @@ Below you can find all modules used to build the Kogito Images
 - [kogito-jobs-service-allinone](modules/kogito-jobs-service-all-in-one): Provides the runner script that supports all jobs-service flavors
 - [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
 - [kogito-logging](modules/kogito-logging): Provides common logging functions.
-- [kogito-management-console](modules/kogito-management-console): Installs and Configure the management-console jar inside the image
 - [kogito-jit-runner](modules/kogito-jit-runner): Installs and Configure the jit-runner jar inside the image
 - [kogito-maven](modules/kogito-maven): Provides custom configuration script.
 
@@ -444,8 +384,7 @@ Please inspect the image files to learn which modules are being installed on eac
 - [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml)
 - [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml) 
-- [quay.io/kiegroup/kogito-management-console](kogito-management-console-image.yaml)
+- [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml)
 - [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-image.yaml)
 
 ### Testing Images
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index a9d24737c53..85761440910 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -192,45 +192,3 @@ items:
           from:
             kind: DockerImage
             name: quay.io/kiegroup/kogito-jobs-service-allinone:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-management-console
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Management Console
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Management Console
-            iconClass: icon-jbpm
-            tags: kogito,management-console
-            supports: business process management
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-management-console:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-task-console
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Task Console
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Task Console
-            iconClass: icon-jbpm
-            tags: kogito,task-console
-            supports: business process management
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: quay.io/kiegroup/kogito-task-console:999-SNAPSHOT
diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml
deleted file mode 100644
index 63e878ce9d6..00000000000
--- a/kogito-management-console-image.yaml
+++ /dev/null
@@ -1,67 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-management-console"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
-description: "Runtime image for Kogito Management Console"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Management Console, manage your Business Process easily."
-  - name: "io.k8s.display-name"
-    value: "Kogito Management Console"
-  - name: "io.openshift.tags"
-    value: "kogito,management,management-console"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "KOGITO_DATAINDEX_HTTP_URL"
-    example: "http://data-index.service:8080"
-    description: "Data Index service address, defaults to http://localhost:8180."
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.management.console
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
-
diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
deleted file mode 100644
index 39c89643dbd..00000000000
--- a/kogito-task-console-image.yaml
+++ /dev/null
@@ -1,66 +0,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.
-#
-schema_version: 1
-
-name: "quay.io/kiegroup/kogito-task-console"
-version: "999-SNAPSHOT"
-from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
-description: "Runtime image for Kogito Task Console"
-
-labels:
-  - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
-  - name: "maintainer"
-    value: "Apache KIE <dev@kie.apache.org>"
-  - name: "io.k8s.description"
-    value: "Runtime image for Kogito Task Console, manage your Business Process easily."
-  - name: "io.k8s.display-name"
-    value: "Kogito Task Console"
-  - name: "io.openshift.tags"
-    value: "kogito,task,task-console"
-  - name: "io.openshift.expose-services"
-    value: "8080:http"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    example: "true"
-    description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization."
-  - name: "KOGITO_DATAINDEX_HTTP_URL"
-    example: "http://data-index.service:8080"
-    description: "Data Index service address, defaults to http://localhost:8180."
-
-modules:
-  repositories:
-    - path: modules
-  install:
-    - name: org.kie.kogito.system.user
-    - name: org.kie.kogito.logging
-    - name: org.kie.kogito.dynamic.resources
-    - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.task.console
-    - name: org.kie.kogito.security.custom.truststores
-
-ports:
-  - value: 8080
-
-run:
-  workdir: "/home/kogito"
-  user: 1001
-  cmd:
-    - "/home/kogito/kogito-app-launch.sh"
diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh
deleted file mode 100644
index e5d0f05fdb2..00000000000
--- a/modules/kogito-management-console/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-fi
-
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-management-console.sh
-  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_MANAGEMENT_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-management-console/added/launch/kogito-management-console.sh b/modules/kogito-management-console/added/launch/kogito-management-console.sh
deleted file mode 100644
index e0f9641394a..00000000000
--- a/modules/kogito-management-console/added/launch/kogito-management-console.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset KOGITO_DATAINDEX_HTTP_URL
-}
-
-function configure() {
-    configure_data_index_url
-}
-
-# Exit codes:
-#   10 - invalid url
-function configure_data_index_url {
-    url_simple_regex='(https?)://'
-    local dataIndexURL=${KOGITO_DATAINDEX_HTTP_URL}
-    if [ "${dataIndexURL}x" != "x" ]; then
-        if [[ ! "${dataIndexURL}x" =~ $url_simple_regex ]]; then
-            log_error "URL must start with http or https."
-            exit 10
-        fi
-    else
-        log_info "Data index url not set, default will be used: http://localhost:8180"
-        dataIndexURL="http://localhost:8180"
-    fi
-    KOGITO_MANAGEMENT_CONSOLE_PROPS="${KOGITO_MANAGEMENT_CONSOLE_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
-}
diff --git a/modules/kogito-management-console/configure.sh b/modules/kogito-management-console/configure.sh
deleted file mode 100644
index 19b6d5c35b7..00000000000
--- a/modules/kogito-management-console/configure.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml
deleted file mode 100644
index f00bb9ed018..00000000000
--- a/modules/kogito-management-console/module.yaml
+++ /dev/null
@@ -1,33 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.management.console
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/management-console
-    dest: /home/kogito/bin
-    name: quarkus-app
-
-execute:
-  - script: configure.sh
-
-
diff --git a/modules/kogito-management-console/tests/bats/kogito-management-console.bats b/modules/kogito-management-console/tests/bats/kogito-management-console.bats
deleted file mode 100644
index ee8c95f203b..00000000000
--- a/modules/kogito-management-console/tests/bats/kogito-management-console.bats
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=/tmp/kogito
-export HOME="${KOGITO_HOME}"
-mkdir -p "${KOGITO_HOME}"/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-management-console.sh
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"
-}
-
-@test "test if the default value for data-index url will be set" {
-    local expected=" -Dkogito.dataindex.http.url=http://localhost:8180"
-    configure_data_index_url
-    echo "Result is [${KOGITO_MANAGEMENT_CONSOLE_PROPS}] and expected is [${expected}]" >&2
-    [ "${expected}" = "${KOGITO_MANAGEMENT_CONSOLE_PROPS}" ]
-}
-
-@test "test if KOGITO_DATA_INDEX_URL will be correctly set " {
-    export KOGITO_DATAINDEX_HTTP_URL="http://10.10.10.10:8080"
-    local expected=" -Dkogito.dataindex.http.url=http://10.10.10.10:8080"
-    configure_data_index_url
-    echo "Result is [${KOGITO_MANAGEMENT_CONSOLE_PROPS}] and expected is [${expected}]" >&2
-    [ "${expected}" = "${KOGITO_MANAGEMENT_CONSOLE_PROPS}" ]
-}
-
-@test "test if a invalid value for data-index url will return the expected exit code" {
-    export KOGITO_DATAINDEX_HTTP_URL="a.b.c"
-    run configure_data_index_url
-    [ "${status}" == "10" ]
-}
-
diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh
deleted file mode 100644
index 538dc5490e8..00000000000
--- a/modules/kogito-task-console/added/kogito-app-launch.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    SHOW_JVM_SETTINGS="-XshowSettings:properties"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "JVM settings debug is enabled."
-fi
-
-
-# Configuration scripts
-# Any configuration script that needs to run on image startup must be added here.
-CONFIGURE_SCRIPTS=(
-  "${KOGITO_HOME}"/launch/kogito-task-console.sh
-  "${KOGITO_HOME}"/launch/configure-custom-truststore.sh
-)
-source "${KOGITO_HOME}"/launch/configure.sh
-#############################################
-
-DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)"
-
-# shellcheck disable=SC2086
-exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TASK_CONSOLE_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \
-        -Dquarkus.http.host=0.0.0.0 \
-        -Dquarkus.http.port=8080 \
-        -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar
\ No newline at end of file
diff --git a/modules/kogito-task-console/added/launch/kogito-task-console.sh b/modules/kogito-task-console/added/launch/kogito-task-console.sh
deleted file mode 100644
index 1b6a600e3f2..00000000000
--- a/modules/kogito-task-console/added/launch/kogito-task-console.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-function prepareEnv() {
-    # keep it on alphabetical order
-    unset KOGITO_DATAINDEX_HTTP_URL
-}
-
-function configure() {
-    configure_data_index_url
-}
-
-# Exit codes:
-#   10 - invalid url
-function configure_data_index_url {
-    url_simple_regex='(https?)://'
-    local dataIndexURL=${KOGITO_DATAINDEX_HTTP_URL}
-    if [ "${dataIndexURL}x" != "x" ]; then
-        if [[ ! "${dataIndexURL}x" =~ $url_simple_regex ]]; then
-            log_error "URL must start with http or https."
-            exit 10
-        fi
-    else
-        log_info "Data index url not set, default will be used: http://localhost:8180"
-        dataIndexURL="http://localhost:8180"
-    fi
-    KOGITO_TASK_CONSOLE_PROPS="${KOGITO_TASK_CONSOLE_PROPS} -Dkogito.dataindex.http.url=${dataIndexURL}"
-}
-
diff --git a/modules/kogito-task-console/configure b/modules/kogito-task-console/configure
deleted file mode 100644
index 19b6d5c35b7..00000000000
--- a/modules/kogito-task-console/configure
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SCRIPT_DIR=$(dirname "${0}")
-ADDED_DIR="${SCRIPT_DIR}"/added
-
-cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
-cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}"
-chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh
-
diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml
deleted file mode 100644
index 5f45b4668a2..00000000000
--- a/modules/kogito-task-console/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.task.console
-version: "999-SNAPSHOT"
-
-# see build-kogito-apps-components.sh script, responsible for build it.
-# called by the Makefile before builds
-artifacts:
-  - path: /tmp/build/task-console
-    dest: /home/kogito/bin
-    name: quarkus-app
-
-execute:
-  - script: configure
diff --git a/modules/kogito-task-console/tests/bats/kogito-task-console.bats b/modules/kogito-task-console/tests/bats/kogito-task-console.bats
deleted file mode 100644
index ac1de079f39..00000000000
--- a/modules/kogito-task-console/tests/bats/kogito-task-console.bats
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=/tmp/kogito
-export HOME="${KOGITO_HOME}"
-mkdir -p "${KOGITO_HOME}"/launch
-cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-
-# imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-task-console.sh
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"
-}
-
-@test "test if the default value for data-index url will be set" {
-    local expected=" -Dkogito.dataindex.http.url=http://localhost:8180"
-    configure_data_index_url
-    echo "Result is [${KOGITO_TASK_CONSOLE_PROPS}] and expected is [${expected}]" >&2
-    [ "${expected}" = "${KOGITO_TASK_CONSOLE_PROPS}" ]
-}
-
-@test "test if KOGITO_DATA_INDEX_URL will be correctly set " {
-    export KOGITO_DATAINDEX_HTTP_URL="http://10.10.10.10:8080"
-    local expected=" -Dkogito.dataindex.http.url=http://10.10.10.10:8080"
-    configure_data_index_url
-    echo "Result is [${KOGITO_TASK_CONSOLE_PROPS}] and expected is [${expected}]" >&2
-    [ "${expected}" = "${KOGITO_TASK_CONSOLE_PROPS}" ]
-}
-
-@test "test if a invalid value for data-index url will return the expected exit code" {
-    export KOGITO_DATAINDEX_HTTP_URL="a.b.c"
-    run configure_data_index_url
-    [ "${status}" == "10" ]
-}
-
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 4c80cd6c1bb..564506e4109 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -51,12 +51,6 @@ if [ ! -z "${CYPRESS_BINARY_URL}" ]; then
 fi
 
 case ${imageName} in
-    "kogito-management-console")
-        contextDir="management-console"
-        ;;
-    "kogito-task-console")
-        contextDir="task-console"
-        ;;
     "kogito-data-index-ephemeral")
         contextDir="data-index/data-index-service/data-index-service-inmemory"
         ;;
diff --git a/scripts/common.py b/scripts/common.py
index 8d1770ff9d6..9ccdeccc34f 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -46,11 +46,10 @@
 CLONE_REPO_SCRIPT = 'tests/test-apps/clone-repo.sh'
 SETUP_MAVEN_SCRIPT = 'scripts/setup-maven.sh'
 
-SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral", 
-                              "kogito-data-index-postgresql", 
+SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral",
+                              "kogito-data-index-postgresql",
                               "kogito-jit-runner", "kogito-jobs-service-ephemeral",
                               "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone",
-                              "kogito-management-console", "kogito-task-console"
                               }
 
 SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-swf-devmode", "kogito-base-builder"}
@@ -445,7 +444,7 @@ def update_env_value(env_name, env_value):
     for image_name in images:
         image_filename = "{}-image.yaml".format(image_name)
         update_env_value_in_file(image_filename, env_name, env_value)
-    
+
     for module_dir in modules:
         module_file = os.path.join(module_dir, "module.yaml")
         update_env_value_in_file(module_file, env_name, env_value)
@@ -519,7 +518,7 @@ def update_env_value_in_build_config_modules(env_name, new_value, ignore_empty =
 
 def update_label_value(label_name, label_value):
     """
-    Update label value in all module / image files 
+    Update label value in all module / image files
     :param label_name: label name to update
     :param label_value: value to set
     """
@@ -532,7 +531,7 @@ def update_label_value(label_name, label_value):
     for image_name in images:
         image_filename = "{}-image.yaml".format(image_name)
         update_label_value_in_file(image_filename, label_name, label_value)
-    
+
     for module_dir in modules:
         module_file = os.path.join(module_dir, "module.yaml")
         update_label_value_in_file(module_file, label_name, label_name)
@@ -548,7 +547,7 @@ def update_label_value_in_file(filename, label_name, label_value):
     try:
         with open(filename) as yaml_file:
             data = yaml_loader().load(yaml_file)
-            update_label_value_in_data(data, label_name, label_value)            
+            update_label_value_in_data(data, label_name, label_value)
 
         with open(filename, 'w') as yaml_file:
             yaml_loader().dump(data, yaml_file)
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index f17bf7402d6..109f8919c8b 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -32,11 +32,5 @@ fi
 echo "----> running bats on kogito-jobs-service-common"
 ./bats/bin/bats modules/kogito-jobs-service-common/tests/bats
 
-echo "----> running bats on kogito-management-console"
-./bats/bin/bats modules/kogito-management-console/tests/bats/
-
-echo "----> running bats on kogito-task-console"
-./bats/bin/bats modules/kogito-task-console/tests/bats/
-
 echo "----> running bats on kogito-swf-builder"
 ./bats/bin/bats modules/kogito-swf/common/scripts/tests/bats
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 3aca41aa72e..55b2ffa985d 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -1,8 +1,6 @@
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-postgresql
-@quay.io/kiegroup/kogito-task-console 
-@quay.io/kiegroup/kogito-management-console 
-@quay.io/kiegroup/kogito-jit-runner 
+@quay.io/kiegroup/kogito-jit-runner
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
 @quay.io/kiegroup/kogito-jobs-service-postgresql
 Feature: Common tests for Custom TrustStore configuration
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index ae5eb11fbe5..b08a2659991 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -5,8 +5,6 @@
 #@quay.io/kiegroup/kogito-jit-runner
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
 #@quay.io/kiegroup/kogito-jobs-service-postgresql
-#@quay.io/kiegroup/kogito-management-console
-#@quay.io/kiegroup/kogito-task-console
 Feature: Common tests for Kogito images
 
   Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 0f2ba31cffd..c3188be3698 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -3,8 +3,6 @@
 @quay.io/kiegroup/kogito-jit-runner
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
 @quay.io/kiegroup/kogito-jobs-service-postgresql
-@quay.io/kiegroup/kogito-management-console
-@quay.io/kiegroup/kogito-task-console
 @quay.io/kiegroup/kogito-swf-builder
 @quay.io/kiegroup/kogito-base-builder
 Feature: Common tests for Kogito images
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
deleted file mode 100644
index ad3aaef74a4..00000000000
--- a/tests/features/kogito-management-console.feature
+++ /dev/null
@@ -1,29 +0,0 @@
-@quay.io/kiegroup/kogito-management-console
-Feature: kogito-management-console feature
-
-  Scenario: verify if all labels are correctly set kogito-management-console image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Management Console, manage your Business Process easily.
-    And the image should contain label io.k8s.display-name with value Kogito Management Console
-    And the image should contain label io.openshift.tags with value kogito,management,management-console
-
-  Scenario: Verify if the debug is correctly enabled and test default http port
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then container log should contain -Dkogito.dataindex.http.url=http://localhost:8180 -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 Data index url not set, default will be used: http://localhost:8180
-    And container log should contain started in
-    And container log should not contain Application failed to start
-
-  Scenario: Verify if the debug is correctly enabled and set data-index url
-    When container is started with env
-      | variable                  | value            |
-      | SCRIPT_DEBUG              | true             |
-      | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
-    And container log should not contain Data index url not set, default will be used: http://localhost:8180
-    And container log should contain started in
-    And container log should not contain Application failed to start
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
deleted file mode 100644
index 78ba03764d2..00000000000
--- a/tests/features/kogito-task-console.feature
+++ /dev/null
@@ -1,29 +0,0 @@
-@quay.io/kiegroup/kogito-task-console
-Feature: kogito-task-console feature
-
-  Scenario: verify if all labels are correctly set on kogito-task-console image
-    Given image is built
-    Then the image should contain label maintainer with value Apache KIE <dev@kie.apache.org>
-    And the image should contain label io.openshift.expose-services with value 8080:http
-    And the image should contain label io.k8s.description with value Runtime image for Kogito Task Console, manage your Business Process easily.
-    And the image should contain label io.k8s.display-name with value Kogito Task Console
-    And the image should contain label io.openshift.tags with value kogito,task,task-console
-
-  Scenario: Verify if the debug is correctly enabled and test default http port
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then container log should contain -Dkogito.dataindex.http.url=http://localhost:8180 -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 Data index url not set, default will be used: http://localhost:8180
-    And container log should contain started in
-    And container log should not contain Application failed to start
-
-  Scenario: Verify if the debug is correctly enabled and set data-index url
-    When container is started with env
-      | variable                  | value            |
-      | SCRIPT_DEBUG              | true             |
-      | KOGITO_DATAINDEX_HTTP_URL | http://test:9090 |
-    Then container log should contain -Dkogito.dataindex.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar
-    And container log should not contain Data index url not set, default will be used: http://localhost:8180
-    And container log should contain started in
-    And container log should not contain Application failed to start
diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature
index 8b32e8ed90c..b2a39ec3018 100644
--- a/tests/features/supporting-services-common.feature
+++ b/tests/features/supporting-services-common.feature
@@ -1,5 +1,3 @@
-@quay.io/kiegroup/kogito-management-console
-@quay.io/kiegroup/kogito-task-console
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-jit-runner

From 692d990e03142825df8e18a83f78c8db766ca3e3 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Mon, 29 Apr 2024 17:42:02 -0300
Subject: [PATCH 679/709] Temporary removal of kogito-swf-{builder-,devmode}
 images from all Jenkins jobs (#1762)

---
 .ci/jenkins/Jenkinsfile.deploy  |  5 +-
 .ci/jenkins/Jenkinsfile.promote |  2 -
 .ci/jenkins/dsl/jobs.groovy     |  3 +-
 kogito-swf-builder-image.yaml   | 74 ----------------------------
 kogito-swf-devmode-image.yaml   | 85 ---------------------------------
 scripts/common.py               |  3 +-
 6 files changed, 5 insertions(+), 167 deletions(-)
 delete mode 100644 kogito-swf-builder-image.yaml
 delete mode 100644 kogito-swf-devmode-image.yaml

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index e768cb7f09f..2391a1ae8ce 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -441,10 +441,7 @@ String[] getImages() {
     if (env.IMAGES_LIST) {
         return env.IMAGES_LIST.split(',')
     }
-    String images = sh(returnStdout: true, script: "make list | tr '\\n' ','").trim()
-    // Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
-    images = images.replace("kogito-swf-builder,", "").replace("kogito-swf-devmode,", "")
-    return images.split(',')
+    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
 }
 
 String getQuarkusPlatformVersion() {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index 428a9bc92c5..c3b2164b3fb 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -366,8 +366,6 @@ String getNewImageTag() {
 
 String[] getImages() {
     String images = getOldImageNames() ?: env.IMAGES_LIST ?: runPythonCommand("make list | tr '\\n' ','", true).trim()
-    // Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
-    images = images.replace("kogito-swf-builder,", "").replace("kogito-swf-devmode,", "")
     return images.split(',')
 }
 
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index cad3d606cdf..bb89937154e 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -348,7 +348,8 @@ void setupWeeklyDeployJob(JobType jobType) {
         QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
     ])
 
-    jobParams.env.put('IMAGES_LIST', 'kogito-swf-builder,kogito-swf-devmode,kogito-base-builder')
+    // Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
+    jobParams.env.put('IMAGES_LIST', 'kogito-base-builder')
 
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
deleted file mode 100644
index 59cad93c642..00000000000
--- a/kogito-swf-builder-image.yaml
+++ /dev/null
@@ -1,74 +0,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.
-#
-  - name: builder
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
-    version: "999-SNAPSHOT"
-    modules:
-      repositories:
-        - path: modules
-      install:
-        - name: org.kie.kogito.system.user
-        - name: org.kie.kogito.logging
-        - name: org.kie.kogito.launch.scripts
-        - name: org.kie.kogito.dynamic.resources
-        - name: org.kie.kogito.maven.common
-        - name: org.kie.kogito.project.versions
-        - name: org.kie.kogito.swf.common.scripts
-        - name: org.kie.kogito.swf.builder.build-config
-        - name: org.kie.kogito.swf.common.build
-
-  - name: "quay.io/kiegroup/kogito-swf-builder"
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
-    version: "999-SNAPSHOT"
-    description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
-
-    labels:
-      - name: "io.openshift.s2i.scripts-url"
-        value: "image:///usr/local/s2i"
-      - name: "io.openshift.s2i.destination"
-        value: "/tmp"
-      - name: "io.quarkus.platform.version"
-        value: "3.2.10.Final"
-      - name: "org.kie.kogito.version"
-        value: "999-SNAPSHOT"
-      - name: "maintainer"
-        value: "Apache KIE <dev@kie.apache.org>"
-      - name: "io.k8s.description"
-        value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled."
-      - name: "io.k8s.display-name"
-        value: "Kogito SWF Builder"
-      - name: "io.openshift.tags"
-        value: "kogito,builder,serverless,workflow"
-
-    modules:
-      repositories:
-        - path: modules
-      install:
-        - name: org.kie.kogito.system.user
-        - name: org.kie.kogito.logging
-        - name: org.kie.kogito.launch.scripts
-        - name: org.kie.kogito.dynamic.resources
-        - name: org.kie.kogito.maven.common
-        - name: org.kie.kogito.project.versions
-        - name: org.kie.kogito.swf.common.scripts
-        - name: org.kie.kogito.swf.builder.runtime.community
-
-    run:
-      workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
-      user: 1001
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
deleted file mode 100644
index 18e918c8edd..00000000000
--- a/kogito-swf-devmode-image.yaml
+++ /dev/null
@@ -1,85 +0,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.
-#
-  - name: builder
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
-    version: "999-SNAPSHOT"
-    modules:
-      repositories:
-        - path: modules
-      install:
-        - name: org.kie.kogito.system.user
-        - name: org.kie.kogito.logging
-        - name: org.kie.kogito.launch.scripts
-        - name: org.kie.kogito.dynamic.resources
-        - name: org.kie.kogito.maven.common
-        - name: org.kie.kogito.project.versions
-        - name: org.kie.kogito.swf.common.scripts
-        - name: org.kie.kogito.swf.devmode.build-config
-        - name: org.kie.kogito.swf.common.build
-
-    packages:
-      manager: microdnf
-
-  - name: "quay.io/kiegroup/kogito-swf-devmode"
-    from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
-    version: "999-SNAPSHOT"
-    description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
-
-    labels:
-      - name: "io.quarkus.platform.version"
-        value: "3.2.10.Final"
-      - name: "org.kie.kogito.version"
-        value: "999-SNAPSHOT"
-      - name: "maintainer"
-        value: "Apache KIE <dev@kie.apache.org>"
-      - name: "io.k8s.description"
-        value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled."
-      - name: "io.k8s.display-name"
-        value: "Kogito SWF Builder"
-      - name: "io.openshift.tags"
-        value: "kogito,development,serverless,workflow"
-      - name: "io.openshift.expose-services"
-        value: "8080:http,5005:http"
-
-    packages:
-      manager: microdnf
-
-    modules:
-      repositories:
-        - path: modules
-      install:
-        - name: org.kie.kogito.system.user
-        - name: org.kie.kogito.logging
-        - name: org.kie.kogito.launch.scripts
-        - name: org.kie.kogito.dynamic.resources
-        - name: org.kie.kogito.maven.common
-        - name: org.kie.kogito.project.versions
-        - name: org.kie.kogito.swf.common.scripts
-        - name: org.kie.kogito.swf.devmode.runtime.common
-        - name: org.kie.kogito.swf.devmode.runtime.community
-
-    ports:
-      - value: 8080
-      - value: 5005
-
-    run:
-      workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
-      user: 1001
-      cmd:
-        - "/home/kogito/launch/run-app-devmode.sh"
diff --git a/scripts/common.py b/scripts/common.py
index 9ccdeccc34f..37f2ed90262 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -52,7 +52,8 @@
                               "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone",
                               }
 
-SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-swf-devmode", "kogito-base-builder"}
+# Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
+SWF_BUILDER_IMAGES = {"kogito-base-builder"}
 
 
 def yaml_loader():

From a595d8cf3e528229a75c7bad9757efa91fb01d81 Mon Sep 17 00:00:00 2001
From: Alex Porcelli <alex@porcelli.me>
Date: Thu, 2 May 2024 17:39:02 +0200
Subject: [PATCH 680/709] Upgrade to and align with Quarkus 3.8.4 LTS release.
 (#1760)

---
 kogito-base-builder-image.yaml              | 2 +-
 modules/kogito-project-versions/module.yaml | 2 +-
 scripts/README.md                           | 4 ++--
 tests/features/kogito-swf-common.feature    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index fc78545225a..743c819243f 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -31,7 +31,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "3.2.10.Final"
+    value: "3.8.4"
   - name: "org.kie.kogito.version"
     value: "999-SNAPSHOT"
   - name: "maintainer"
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index c2f2068df71..d92717d232d 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -26,5 +26,5 @@ envs:
     value: "999-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "3.2.10.Final"
+    value: "3.8.4"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
diff --git a/scripts/README.md b/scripts/README.md
index 54326805091..fb29cdb847d 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -158,10 +158,10 @@ This will set the default artifacts version.
 ##### Update quarkus version
 
 ```bash
-$ python update-repository.py --quarkus-platform-version 3.2.10.Final
+$ python update-repository.py --quarkus-platform-version 3.8.4
 ```
 
-This will set the image quarkus version to 3.2.10.Final.
+This will set the image quarkus version to 3.8.4.
 
 ##### Update Examples URI and Ref
 
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index f69a482add3..9f0c54e899b 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -4,7 +4,7 @@ Feature: Serverless Workflow images common
 
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
-    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.2.10.Final/quarkus-bom-3.2.10.Final.pom should exist
+    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.8.4/quarkus-bom-3.8.4.pom should exist
       And file /home/kogito/.m2/repository/org/apache/kie/sonataflow/sonataflow-quarkus/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From 38ccde1966c55eff04bdadaf3bad3299fe6d1575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= <tiborzimanyi@ibm.com>
Date: Thu, 9 May 2024 17:52:25 +0200
Subject: [PATCH 681/709] [kie-issues@1167] Add license headers to files
 (#1763)

---
 .github/bot-files/comments.yml                | 19 ++++++++++++++++++
 .github/bot-files/labels.yml                  | 20 ++++++++++++++++++-
 .github/bot-files/reviewers.yml               | 20 ++++++++++++++++++-
 .github/pull_request_template.md              | 19 ++++++++++++++++++
 .github/workflows/jenkins-tests-PR.yml        | 19 ++++++++++++++++++
 .github/workflows/kogito-images-pr-check.yml  | 19 ++++++++++++++++++
 .github/workflows/pr-backporting.yml          | 19 ++++++++++++++++++
 Makefile                                      | 19 ++++++++++++++++++
 README.md                                     | 19 ++++++++++++++++++
 RELEASE_NOTES.md                              | 18 +++++++++++++++++
 contrib/jobs-service/sql/init.sql             | 19 ++++++++++++++++++
 modules/kogito-custom-truststore/README.md    | 19 ++++++++++++++++++
 .../kogito-maven/common/maven/settings.xml    | 19 ++++++++++++++++++
 scripts/README.md                             | 19 ++++++++++++++++++
 .../features/common-custom-truststore.feature | 19 ++++++++++++++++++
 .../features/common-dynamic-resources.feature | 19 ++++++++++++++++++
 tests/features/common.feature                 | 19 ++++++++++++++++++
 .../kogito-data-index-common.feature          | 19 ++++++++++++++++++
 .../kogito-data-index-ephemeral.feature       | 19 ++++++++++++++++++
 .../kogito-data-index-postgresql.feature      | 19 ++++++++++++++++++
 .../kogito-jobs-service-all-in-one.feature    | 19 ++++++++++++++++++
 .../kogito-jobs-service-common.feature        | 19 ++++++++++++++++++
 .../kogito-jobs-service-ephemeral.feature     | 19 ++++++++++++++++++
 .../kogito-jobs-service-postgresql.feature    | 19 ++++++++++++++++++
 .../kogito-common-postresql-services.feature  | 19 ++++++++++++++++++
 tests/features/kogito-jit-runner.feature      | 19 ++++++++++++++++++
 tests/features/kogito-swf-builder.feature     | 19 ++++++++++++++++++
 tests/features/kogito-swf-common.feature      | 19 ++++++++++++++++++
 tests/features/kogito-swf-devmode.feature     | 19 ++++++++++++++++++
 .../supporting-services-common.feature        | 19 ++++++++++++++++++
 tests/shell/README.md                         | 19 ++++++++++++++++++
 .../greet-with-inputschema/Dockerfile         | 19 ++++++++++++++++++
 .../resources/greet/Dockerfile                | 19 ++++++++++++++++++
 .../kogito-swf-devmode/src/RunTests.java      | 17 ++++++++++++++++
 tests/test-apps/application.properties        | 19 ++++++++++++++++++
 35 files changed, 662 insertions(+), 2 deletions(-)

diff --git a/.github/bot-files/comments.yml b/.github/bot-files/comments.yml
index f2dd55c2d48..8bee795c9a8 100644
--- a/.github/bot-files/comments.yml
+++ b/.github/bot-files/comments.yml
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 prFirstTimeContributor: Welcome to the Kogito Community!. Please make sure you've read the [contributors' guide](README.md#contributing-to-kogito-images-repository)
 
 prCiTrigger: /jenkins test
diff --git a/.github/bot-files/labels.yml b/.github/bot-files/labels.yml
index 23e3e638400..49056435593 100644
--- a/.github/bot-files/labels.yml
+++ b/.github/bot-files/labels.yml
@@ -1,5 +1,23 @@
+#
+# 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.
+#
+
 # we don't need path labels here but the bot expects atleast one row inside it.
-# This compulsion will be removed after https://issues.redhat.com/browse/KOGITO-3026
 
 labels:
   - paths:
diff --git a/.github/bot-files/reviewers.yml b/.github/bot-files/reviewers.yml
index 60ddc278dc8..02670968ecb 100644
--- a/.github/bot-files/reviewers.yml
+++ b/.github/bot-files/reviewers.yml
@@ -1,5 +1,23 @@
+#
+# 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.
+#
+
 # we don't need path reviewers here but the bot expects atleast one row inside it.
-# This compulsion will be removed after https://issues.redhat.com/browse/KOGITO-3026
 
 review:
   - paths:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d03a30e151e..72277e817ae 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +1,22 @@
+<!--
+  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.
+  -->
+
 Many thanks for submitting your Pull Request :heart:! 
 
 Please make sure your PR meets the following requirements:
diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
index d9bb4083b45..0146f9b41c3 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 name: Jenkins Tests
diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
index 31331b40459..a309c7c61e8 100644
--- a/.github/workflows/kogito-images-pr-check.yml
+++ b/.github/workflows/kogito-images-pr-check.yml
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 name: Images PR check
 
 on: pull_request
diff --git a/.github/workflows/pr-backporting.yml b/.github/workflows/pr-backporting.yml
index e700524572f..eac84bc0f51 100644
--- a/.github/workflows/pr-backporting.yml
+++ b/.github/workflows/pr-backporting.yml
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 name: Pull Request Backporting
 
 on:
diff --git a/Makefile b/Makefile
index 21a49659711..e4a449c2e79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 IMAGE_VERSION := $(shell python scripts/retrieve_version.py)
 SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
 KOGITO_APPS_TARGET_BRANCH ?= main
diff --git a/README.md b/README.md
index 0543ac6311a..5c2fbb9dd0c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,22 @@
+<!--
+  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.
+  -->
+
 Kogito
 ------
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 42c9735b6a5..72f7c80fc71 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,21 @@
+<!--
+  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.
+  -->
 
 <!-- Keep them in alphabetical order -->
 ## Enhancements
diff --git a/contrib/jobs-service/sql/init.sql b/contrib/jobs-service/sql/init.sql
index ee1a94650d7..1d27d5affa8 100644
--- a/contrib/jobs-service/sql/init.sql
+++ b/contrib/jobs-service/sql/init.sql
@@ -1,3 +1,22 @@
+--
+-- 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.
+--
+
 CREATE ROLE "kogito-user" WITH
     LOGIN
     SUPERUSER
diff --git a/modules/kogito-custom-truststore/README.md b/modules/kogito-custom-truststore/README.md
index bdb7c0bff16..e213a4a9807 100644
--- a/modules/kogito-custom-truststore/README.md
+++ b/modules/kogito-custom-truststore/README.md
@@ -1,3 +1,22 @@
+<!--
+  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.
+  -->
+
 # Kogito Custom TrustStore Module
 
 This module adds the possibility to override the default Java TrustStore in the JVM process for any Kogito Service.
diff --git a/modules/kogito-maven/common/maven/settings.xml b/modules/kogito-maven/common/maven/settings.xml
index 233a6a6b76f..be7ff0e496f 100644
--- a/modules/kogito-maven/common/maven/settings.xml
+++ b/modules/kogito-maven/common/maven/settings.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ 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.
+  -->
+
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
diff --git a/scripts/README.md b/scripts/README.md
index fb29cdb847d..c661b6a6dca 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -1,3 +1,22 @@
+<!--
+  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.
+  -->
+
 ### Kogito helper scripts
 
 On this directory you can find some python scripts used to help with some repetitive tasks.
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 55b2ffa985d..e50c083f9f6 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-jit-runner
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index b08a2659991..1eed9e5755d 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 # Run only on images that won't die instantly
 # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
 @quay.io/kiegroup/kogito-data-index-ephemeral
diff --git a/tests/features/common.feature b/tests/features/common.feature
index c3188be3698..49e9e504073 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-jit-runner
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index a4de284fb46..5ae57d3fe02 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-postgresql
 Feature: Kogito-data-index common feature.
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
index f5006657088..794384512d1 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-data-index-ephemeral
 Feature: Kogito-data-index ephemeral postgresql feature.
 
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
index 2d3a1da77ff..e8b643d0296 100644
--- a/tests/features/data-index/kogito-data-index-postgresql.feature
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-data-index-postgresql
 Feature: Kogito-data-index postgresql feature.
 
diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
index 39541519072..bd3c5490b79 100644
--- a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-jobs-service-allinone
 Feature: Kogito-jobs-service-all-in-one feature.
 
diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature
index 34e21b0a369..fa2f7212be0 100644
--- a/tests/features/jobs-service/kogito-jobs-service-common.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-common.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
 @quay.io/kiegroup/kogito-jobs-service-postgresql
 @quay.io/kiegroup/kogito-jobs-service-allinone
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index a6658a4b982..9a86f1d30c2 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-jobs-service-ephemeral
 Feature: Kogito-jobs-service-ephemeral feature.
 
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index 2b89a2807cb..e946bda32e7 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-jobs-service-postgresql
 Feature: Kogito-jobs-service-postgresql feature.
 
diff --git a/tests/features/kogito-common-postresql-services.feature b/tests/features/kogito-common-postresql-services.feature
index cf77b26fdd0..f24bb33c3d8 100644
--- a/tests/features/kogito-common-postresql-services.feature
+++ b/tests/features/kogito-common-postresql-services.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-data-index-postgresql
 Feature: Kogito-data-index postgresql feature.
 
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index bb5b21e4d1b..98875e2f2d3 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-jit-runner
 Feature: Kogito-jit-runner feature.
 
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index acae47c9ca3..3de371f3345 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-swf-builder
 Feature: Serverless Workflow builder images
 
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 9f0c54e899b..16a016de1b7 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-swf-builder
 @quay.io/kiegroup/kogito-swf-devmode
 Feature: Serverless Workflow images common
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index c17ff1f9e69..8bb40087a39 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-swf-devmode
 Feature: Serverless Workflow devmode images
 
diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature
index b2a39ec3018..bcec895e8dd 100644
--- a/tests/features/supporting-services-common.feature
+++ b/tests/features/supporting-services-common.feature
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 @quay.io/kiegroup/kogito-data-index-ephemeral
 @quay.io/kiegroup/kogito-data-index-postgresql
 @quay.io/kiegroup/kogito-jit-runner
diff --git a/tests/shell/README.md b/tests/shell/README.md
index 687dc4d2fa1..3e5f6908042 100644
--- a/tests/shell/README.md
+++ b/tests/shell/README.md
@@ -1,3 +1,22 @@
+<!--
+  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.
+  -->
+
 # Tests in Shell
 
 ## Running Tests With JBang
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
index 2172c7129d0..6279486d481 100644
--- a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0"
 
 FROM ${BUILDER_IMAGE_TAG} AS builder
diff --git a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
index 2172c7129d0..6279486d481 100644
--- a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0"
 
 FROM ${BUILDER_IMAGE_TAG} AS builder
diff --git a/tests/shell/kogito-swf-devmode/src/RunTests.java b/tests/shell/kogito-swf-devmode/src/RunTests.java
index 9971e8229cf..893c445df65 100644
--- a/tests/shell/kogito-swf-devmode/src/RunTests.java
+++ b/tests/shell/kogito-swf-devmode/src/RunTests.java
@@ -1,5 +1,22 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
+// 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.
+
 //DEPS org.slf4j:slf4j-simple:2.0.9
 
 // Junit console to start the test engine:
diff --git a/tests/test-apps/application.properties b/tests/test-apps/application.properties
index 893b32bf115..399172eadb8 100644
--- a/tests/test-apps/application.properties
+++ b/tests/test-apps/application.properties
@@ -1 +1,20 @@
+#
+# 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.
+#
+
 quarkus.http.port=10000
\ No newline at end of file

From cf369713e52eab357328ceed332ef47f958d22d0 Mon Sep 17 00:00:00 2001
From: Jason Porter <lightguard.jp@gmail.com>
Date: Thu, 9 May 2024 12:32:41 -0600
Subject: [PATCH 682/709] Adding required DISCLAIMER file (#1765)

INCUBATOR projects are required to have a DISCLAIMER file for their
releases.

Signed-off-by: Jason Porter <lightguard.jp@gmail.com>
---
 DISCLAIMER | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 DISCLAIMER

diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 00000000000..a07e390bd5d
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,23 @@
+Apache KIE (incubating) is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the name of Apache Incubator. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
+Some of the incubating project’s releases may not be fully compliant with ASF
+policy. For example, releases may have incomplete or un-reviewed licensing
+conditions. What follows is a list of known issues the project is currently
+aware of (note that this list, by definition, is likely to be incomplete):
+
+* Hibernate, an LGPL project, is being used. Hibernate is in the process of 
+  relicensing to ASL v2
+* Some files, particularly test files, and those not supporting comments, may
+  be missing the ASF Licensing Header
+
+If you are planning to incorporate this work into your product/project, please
+be aware that you will need to conduct a thorough licensing review to determine
+the overall implications of including this work. For the current status of this
+project through the Apache Incubator visit:
+https://incubator.apache.org/projects/kie.html

From cebc805d162f4337384f7c2605d32530626060bd Mon Sep 17 00:00:00 2001
From: Alex Porcelli <alex@porcelli.me>
Date: Thu, 9 May 2024 20:34:16 +0200
Subject: [PATCH 683/709] kie-issues#1167 Missing Apache headers for xsd file.
 (#1764)

---
 .gitignore | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4c20af005d5..028be8b7cdb 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,19 @@
+# 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.
 /target
 /local
 target/

From f36b74507a232e51695398f03a9a0b9d4079a930 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Thu, 16 May 2024 10:23:33 -0300
Subject: [PATCH 684/709] (no-issue) Add CODEOWNERS file (#1766)

* (no-issue) Add CODEOWNERS file

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Fix asf.yaml file to include branch protection

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

---------

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 .asf.yaml          | 5 +++++
 .github/CODEOWNERS | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.asf.yaml b/.asf.yaml
index e5d1ef5d6d0..4a7211326a3 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -19,3 +19,8 @@
 github:
   features:
     issues: true
+  protected_branches:
+    main:
+      required_pull_request_reviews:
+        require_code_owner_reviews: true
+        required_approving_review_count: 1
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..0dacb00c5a3
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*       @ricardozanini @wmedvede

From 7becdbf3937a9a8e9235746ff0014c4f3fd02340 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Wed, 22 May 2024 16:14:33 -0300
Subject: [PATCH 685/709] Rename quay to docker in image bundles (#1768)

* Rename quay to docker in image bundles

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Move kogito-swf dir to sonataflow

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Rename tests from kogito-swf to sonataflow

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Rename tests from kogito-swf to sonataflow

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

* Adding dockerhub correct URL; renaming ImageStream builder's name

Signed-off-by: Ricardo Zanini <zanini@redhat.com>

---------

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 .ci/jenkins/Jenkinsfile.build-image           |  2 +-
 .ci/jenkins/dsl/jobs.groovy                   |  2 +-
 Makefile                                      | 10 ++--
 README.md                                     | 58 +++++++++----------
 .../container-compose-postgresql.yaml         |  2 +-
 kogito-base-builder-image.yaml                |  2 +-
 kogito-data-index-ephemeral-image.yaml        |  2 +-
 kogito-data-index-postgresql-image.yaml       |  2 +-
 kogito-imagestream.yaml                       | 18 +++---
 kogito-jit-runner-image.yaml                  |  2 +-
 kogito-jobs-service-allinone-image.yaml       |  2 +-
 kogito-jobs-service-ephemeral-image.yaml      |  2 +-
 kogito-jobs-service-postgresql-image.yaml     |  2 +-
 .../builder/build-config/module.yaml          |  0
 .../builder/runtime/community/configure.sh    |  4 +-
 .../builder/runtime/community/module.yaml     |  4 +-
 .../common/build/added/cleanup_project.sh     |  0
 .../common/build/added/zip_files.sh           |  8 +--
 .../common/build/configure.sh                 |  0
 .../common/build/module.yaml                  |  0
 .../common/scripts/added/add-extension.sh     |  0
 .../common/scripts/added/build-app.sh         |  0
 .../common/scripts/added/configure-jvm-mvn.sh |  0
 .../common/scripts/added/create-app.sh        |  0
 .../common/scripts/added/jvm-settings.sh      |  0
 .../common/scripts/configure.sh               |  0
 .../common/scripts/module.yaml                |  0
 .../bats/sonataflow-builder-build-app.bats}   |  2 +-
 .../sonataflow-builder-jvm-settings.bats}     |  0
 .../devmode/build-config/module.yaml          |  0
 .../runtime/common/added/run-app-devmode.sh   |  0
 .../devmode/runtime/common/configure.sh       |  0
 .../devmode/runtime/common/module.yaml        |  0
 .../devmode/runtime/community/configure.sh    |  4 +-
 .../devmode/runtime/community/module.yaml     |  4 +-
 scripts/README.md                             |  2 +-
 scripts/common.py                             |  2 +-
 scripts/push-local-registry.sh                |  2 +-
 scripts/push-staging.py                       |  4 +-
 scripts/run-bats.sh                           |  4 +-
 .../features/common-custom-truststore.feature | 10 ++--
 .../features/common-dynamic-resources.feature | 10 ++--
 tests/features/common.feature                 | 14 ++---
 .../kogito-data-index-common.feature          |  4 +-
 .../kogito-data-index-ephemeral.feature       |  2 +-
 .../kogito-data-index-postgresql.feature      |  2 +-
 .../kogito-jobs-service-all-in-one.feature    |  2 +-
 .../kogito-jobs-service-common.feature        |  6 +-
 .../kogito-jobs-service-ephemeral.feature     |  2 +-
 .../kogito-jobs-service-postgresql.feature    |  2 +-
 .../kogito-common-postresql-services.feature  |  2 +-
 tests/features/kogito-jit-runner.feature      |  2 +-
 tests/features/kogito-swf-builder.feature     |  2 +-
 tests/features/kogito-swf-common.feature      |  4 +-
 tests/features/kogito-swf-devmode.feature     |  2 +-
 .../supporting-services-common.feature        |  6 +-
 tests/shell/README.md                         |  4 +-
 .../.vscode/launch.json                       |  0
 .../.vscode/settings.json                     |  0
 .../greet-with-inputschema/.mvn/jvm.config    |  0
 .../greet-with-inputschema/Dockerfile         |  2 +-
 .../greet-with-inputschema/greet.sw.json      |  0
 .../greet-with-inputschema/schemas/input.json |  0
 .../resources/greet/.mvn/jvm.config           |  0
 .../resources/greet/Dockerfile                |  2 +-
 .../resources/greet/greet.sw.json             |  0
 .../src/RunTests.java                         |  0
 .../.vscode/launch.json                       |  0
 .../.vscode/settings.json                     |  0
 .../resources/greet.sw.json                   |  0
 .../src/RunTests.java                         |  0
 71 files changed, 113 insertions(+), 113 deletions(-)
 rename modules/{kogito-swf => sonataflow}/builder/build-config/module.yaml (100%)
 rename modules/{kogito-swf => sonataflow}/builder/runtime/community/configure.sh (89%)
 rename modules/{kogito-swf => sonataflow}/builder/runtime/community/module.yaml (89%)
 rename modules/{kogito-swf => sonataflow}/common/build/added/cleanup_project.sh (100%)
 rename modules/{kogito-swf => sonataflow}/common/build/added/zip_files.sh (83%)
 rename modules/{kogito-swf => sonataflow}/common/build/configure.sh (100%)
 rename modules/{kogito-swf => sonataflow}/common/build/module.yaml (100%)
 rename modules/{kogito-swf => sonataflow}/common/scripts/added/add-extension.sh (100%)
 rename modules/{kogito-swf => sonataflow}/common/scripts/added/build-app.sh (100%)
 rename modules/{kogito-swf => sonataflow}/common/scripts/added/configure-jvm-mvn.sh (100%)
 rename modules/{kogito-swf => sonataflow}/common/scripts/added/create-app.sh (100%)
 rename modules/{kogito-swf => sonataflow}/common/scripts/added/jvm-settings.sh (100%)
 rename modules/{kogito-swf => sonataflow}/common/scripts/configure.sh (100%)
 rename modules/{kogito-swf => sonataflow}/common/scripts/module.yaml (100%)
 rename modules/{kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats => sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats} (93%)
 rename modules/{kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats => sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats} (100%)
 rename modules/{kogito-swf => sonataflow}/devmode/build-config/module.yaml (100%)
 rename modules/{kogito-swf => sonataflow}/devmode/runtime/common/added/run-app-devmode.sh (100%)
 rename modules/{kogito-swf => sonataflow}/devmode/runtime/common/configure.sh (100%)
 rename modules/{kogito-swf => sonataflow}/devmode/runtime/common/module.yaml (100%)
 rename modules/{kogito-swf => sonataflow}/devmode/runtime/community/configure.sh (90%)
 rename modules/{kogito-swf => sonataflow}/devmode/runtime/community/module.yaml (94%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/.vscode/launch.json (100%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/.vscode/settings.json (100%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet-with-inputschema/.mvn/jvm.config (100%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet-with-inputschema/Dockerfile (96%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet-with-inputschema/greet.sw.json (100%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet-with-inputschema/schemas/input.json (100%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet/.mvn/jvm.config (100%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet/Dockerfile (96%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet/greet.sw.json (100%)
 rename tests/shell/{kogito-swf-builder => sonataflow-builder}/src/RunTests.java (100%)
 rename tests/shell/{kogito-swf-devmode => sonataflow-devmode}/.vscode/launch.json (100%)
 rename tests/shell/{kogito-swf-devmode => sonataflow-devmode}/.vscode/settings.json (100%)
 rename tests/shell/{kogito-swf-devmode => sonataflow-devmode}/resources/greet.sw.json (100%)
 rename tests/shell/{kogito-swf-devmode => sonataflow-devmode}/src/RunTests.java (100%)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index fec460acc49..4a425f3cc7f 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -204,7 +204,7 @@ pipeline {
                 script {
                     updateGithubCommitStatus('PENDING', 'Tests in progress')
 
-                    String testImageTag = "quay.io/kiegroup/${getBuildImageName()}:${getImageVersion()}"
+                    String testImageTag = "docker.io/apache/incubator-kie-${getBuildImageName()}:${getImageVersion()}"
                     String builtImageTag = getBuiltImageTag()
                     // Pull and tag to test image
                     sh """
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index bb89937154e..baf84e3c9d8 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -348,7 +348,7 @@ void setupWeeklyDeployJob(JobType jobType) {
         QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
     ])
 
-    // Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
+    // Temporary removal of sonataflow-* images that have been moved to kie-tools for the Apache 10 release
     jobParams.env.put('IMAGES_LIST', 'kogito-base-builder')
 
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
diff --git a/Makefile b/Makefile
index e4a449c2e79..c41914ce838 100644
--- a/Makefile
+++ b/Makefile
@@ -65,13 +65,13 @@ endif
 # tag with shortened version
 ifneq ($(ignore_tag),true)
     ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
-	    ${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
+	    ${BUILD_ENGINE} tag docker.io/apache/incubator-kie-${image_name}:${IMAGE_VERSION} docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}
     endif
 endif
 # if ignore_test is set to true, ignore the tests
 ifneq ($(ignore_test),true)
 	${CEKIT_CMD} --descriptor ${image_name}-image.yaml test behave ${test_options}
-	tests/shell/run.sh ${image_name} "quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}"
+	tests/shell/run.sh ${image_name} "docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}"
 endif
 
 
@@ -85,11 +85,11 @@ _push:
 .PHONY: push-image
 image_name=
 push-image:
-	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:${IMAGE_VERSION}
-	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:latest
+	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:${IMAGE_VERSION}
+	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:latest
 ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
 	@echo "${SHORTENED_LATEST_VERSION} will be pushed"
-	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}
+	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}
 endif
 
 
diff --git a/README.md b/README.md
index 5c2fbb9dd0c..a2eafada409 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ The main purpose of this image is to be used within the Kogito Serverless Operat
 an example on how to use it:
 
 ```bash
-FROM quay.io/kiegroup/kogito-swf-builder:latest AS builder
+FROM docker.io/apache/incubator-kie-sonataflow-builder:latest AS builder
 
 # Copy all files from current directory to the builder context
 COPY * ./resources/
@@ -143,7 +143,7 @@ If you run the image, it will start an empty [Kogito Serverless Workflow](https:
 To run the image for testing your local workflow files, run:
 
 ```shell
-docker run -it --rm -p 8080:8080 -v <local_workflow_path>:/home/kogito/serverless-workflow-project/src/main/resources/workflows quay.io/kiegroup/kogito-swf-builder:latest
+docker run -it --rm -p 8080:8080 -v <local_workflow_path>:/home/kogito/serverless-workflow-project/src/main/resources/workflows docker.io/apache/incubator-kie-sonataflow-builder:latest
 ```
 
 Replace `<local_workflow_path>` with your local filesystem containing your workflow files. You can test with the [example application](https://kiegroup.github.io/kogito-docs/serverlessworkflow/latest/getting-started/create-your-first-workflow-service.html#proc-creating-workflow).
@@ -166,12 +166,12 @@ The Kogito Component Images can be considered as lightweight images that will co
 by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications.
 Today we have the following Kogito Component Images:
 
-* [quay.io/kiegroup/kogito-data-index-ephemeral](https://quay.io/kiegroup/kogito-data-index-ephemeral)
-* [quay.io/kiegroup/kogito-data-index-postgresql](https://quay.io/kiegroup/kogito-data-index-postgresql)
-* [quay.io/kiegroup/kogito-jobs-service-ephemeral](https://quay.io/kiegroup/kogito-jobs-service-ephemeral) 
-* [quay.io/kiegroup/kogito-jobs-service-postgresql](https://quay.io/kiegroup/kogito-jobs-service-postgresql)
-* [quay.io/kiegroup/kogito-jobs-service-allinone](https://quay.io/kiegroup/kogito-jobs-service-allinone)
-* [quay.io/kiegroup/kogito-jit-runner](https://quay.io/kiegroup/kogito-jit-runner)
+* [docker.io/apache/incubator-kie-kogito-data-index-ephemeral](https://hub.docker.com/r/apache/incubator-kie-kogito-data-index-ephemeral)
+* [docker.io/apache/incubator-kie-kogito-data-index-postgresql](https://hub.docker.com/r/apache/incubator-kie-kogito-data-index-postgresql)
+* [docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-ephemeral) 
+* [docker.io/apache/incubator-kie-kogito-jobs-service-postgresql](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-postgresql)
+* [docker.io/apache/incubator-kie-kogito-jobs-service-allinone](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-allinone)
+* [docker.io/apache/incubator-kie-kogito-jit-runner](https://hub.docker.com/r/apache/incubator-kie-kogito-jit-runner)
 
 
 ### Kogito Data Index Component Images
@@ -181,14 +181,14 @@ For more information please visit this (link)(https://docs.jboss.org/kogito/rele
 The Data Index Service depends on a PostgreSQL instance.
 The Persistence service can be switched by using its corresponding image
 
-- Ephemeral PostgreSQL: quay.io/kiegroup/kogito-data-index-ephemeral
+- Ephemeral PostgreSQL: docker.io/apache/incubator-kie-kogito-data-index-ephemeral
   [image.yaml](kogito-data-index-ephemeral-image.yaml)
-- PostgreSQL: quay.io/kiegroup/kogito-data-index-postgresql
+- PostgreSQL: docker.io/apache/incubator-kie-kogito-data-index-postgresql
   [image.yaml](kogito-data-index-postgresql-image.yaml)
 
 Basic usage with Ephemeral PostgreSQL:
 ```bash
-$ docker run -it quay.io/kiegroup/kogito-data-index-ephemeral:latest
+$ docker run -it docker.io/apache/incubator-kie-kogito-data-index-ephemeral:latest
 ```
 
 Basic usage with PostgreSQL:
@@ -196,13 +196,13 @@ Basic usage with PostgreSQL:
 $ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus"  \
     --env QUARKUS_DATASOURCE_USERNAME="kogito" \
     --env QUARKUS_DATASOURCE_PASSWORD="secret" \
-    quay.io/kiegroup/kogito-data-index-postgresql:latest
+    docker.io/apache/incubator-kie-kogito-data-index-postgresql:latest
 ```
 
 To enable debug just use this env while running this image:
 
 ```bash
-$ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-data-index-postgresql:latest
+$ docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-data-index-postgresql:latest
 ```
 You should notice a few debug messages present in the system output.
 
@@ -226,13 +226,13 @@ Today, the Jobs service contains four images:
 Basic usage:
 
 ```bash
-$ docker run -it quay.io/kiegroup/kogito-jobs-service-ephemeral:latest
+$ docker run -it docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:latest
 ```
 
 To enable debug on the Jobs Service images, set the ` SCRIPT_DEBUG` to `true`, example: 
 
 ```bash
-docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-postgresql:latest
+docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:latest
 ```
 
 You should notice a few debug messages being printed in the system output.
@@ -258,13 +258,13 @@ using either environment variables or system properties.
 
 Using environment variables:
 ```bash
-podman run -it -e VARIABLE_NAME=value quay.io/kiegroup/kogito-jobs-service-allinone:latest
+podman run -it -e VARIABLE_NAME=value docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest
 ```
 
 Using system properties:
 ```bash
 podman run -it -e JAVA_OPTIONS='-Dmy.sys.prop1=value1 -Dmy.sys.prop2=value2' \
-  quay.io/kiegroup/kogito-jobs-service-allinone:latest
+  docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest
 ```
 
 For convenience there are `container-compose` files that can be used to start the Jobs Service with the desired
@@ -286,13 +286,13 @@ The Kogito JIT Runner provides a tool that allows you to submit a DMN model and
 Basic usage:
 
 ```bash
-$ docker run -it quay.io/kiegroup/kogito-jit-runner:latest
+$ docker run -it docker.io/apache/incubator-kie-kogito-jit-runner:latest
 ```
 
 To enable debug just use this env while running this image:
 
 ```bash
-docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jit-runner:latest
+docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-jit-runner:latest
 ```
 You should notice a few debug messages being printed in the system output. You can then visit `localhost:8080/index.html` to test the service.
 
@@ -399,12 +399,12 @@ Below you can find all modules used to build the Kogito Images
 For each image, we use a specific *-image.yaml file.
 Please inspect the image files to learn which modules are being installed on each image:
 
-- [quay.io/kiegroup/kogito-data-index-ephemeral](kogito-data-index-ephemeral-image.yaml)
-- [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml)
-- [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml)
-- [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-image.yaml)
+- [docker.io/apache/incubator-kie-kogito-data-index-ephemeral](kogito-data-index-ephemeral-image.yaml)
+- [docker.io/apache/incubator-kie-kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml)
+- [docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml)
+- [docker.io/apache/incubator-kie-kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml)
+- [docker.io/apache/incubator-kie-kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml)
+- [docker.io/apache/incubator-kie-kogito-jit-runner](kogito-jit-runner-image.yaml)
 
 ### Testing Images
 
@@ -428,12 +428,12 @@ See [Writing Behave Tests](#writing-behave-tests).
 
 Example:
 ```bash
-make build-image image_name=kogito-swf-builder test_options=--wip
+make build-image image_name=sonataflow-builder test_options=--wip
 ```
 
 Or by name:
 ```bash
-make build-image image_name=kogito-swf-builder test_options=--name <Test Scenario Name>
+make build-image image_name=sonataflow-builder test_options=--name <Test Scenario Name>
 ```
 
 You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
@@ -497,12 +497,12 @@ this can be easily done by adding the **@wip** tag on the behave test that you a
 All images have already test feature files. If a new image is being created, a new feature file will need to be created
 and the very first line of this file would need to contain a tag with the image name.
 
-For example, if we are creating a new image called quay.io/kiegroup/kogito-moon-service, we would have a feature called
+For example, if we are creating a new image called docker.io/apache/incubator-kie-kogito-moon-service, we would have a feature called
 **kogito-moon-service.feature** under the **tests/features** directory and this file will look like with the following
 example:
 
 ```text
-@quay.io/kiegroup/kogito-data-index-postgresql
+@docker.io/apache/incubator-kie-kogito-data-index-postgresql
 Feature: Kogito-data-index-postgresql feature.
     ...
     Scenarios......
diff --git a/contrib/jobs-service/container-compose-postgresql.yaml b/contrib/jobs-service/container-compose-postgresql.yaml
index 4f2b8026fa9..e3d1b9c4481 100644
--- a/contrib/jobs-service/container-compose-postgresql.yaml
+++ b/contrib/jobs-service/container-compose-postgresql.yaml
@@ -34,7 +34,7 @@ services:
       - POSTGRES_PASSWORD=postgres
 
   jobs-service-all-in-one:
-    image: quay.io/kiegroup/kogito-jobs-service-allinone:latest
+    image: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest
     container_name: jobs-service
     ports:
       - "8080:8080"
diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index 743c819243f..371fd399a29 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-base-builder"
+name: "docker.io/apache/incubator-kie-kogito-base-builder"
 version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
 description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"
diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index 22eeecb4905..bdce50eb741 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-data-index-ephemeral"
+name: "docker.io/apache/incubator-kie-kogito-data-index-ephemeral"
 version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index 048ae5c1548..9ba9a817fbf 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-data-index-postgresql"
+name: "docker.io/apache/incubator-kie-kogito-data-index-postgresql"
 version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
index 85761440910..89fde58bf29 100644
--- a/kogito-imagestream.yaml
+++ b/kogito-imagestream.yaml
@@ -27,7 +27,7 @@ items:
   - kind: ImageStream
     apiVersion: v1
     metadata:
-      name: kogito-swf-builder
+      name: kie-sonataflow-builder
       annotations:
         openshift.io/display-name: Kogito Serverless Workflow builder with basic Quarkus SWF extensions preinstalled
         openshift.io/provider-display-name: KIE Group.
@@ -44,7 +44,7 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-swf-builder:999-SNAPSHOT
+            name: docker.io/apache/incubator-kie-sonataflow-builder:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -65,7 +65,7 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT
+            name: docker.io/apache/incubator-kie-kogito-base-builder:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -86,7 +86,7 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-ephemeral:999-SNAPSHOT
+            name: docker.io/apache/incubator-kie-kogito-data-index-ephemeral:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -107,7 +107,7 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-data-index-postgresql:999-SNAPSHOT
+            name: docker.io/apache/incubator-kie-kogito-data-index-postgresql:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -128,7 +128,7 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jit-runner:999-SNAPSHOT
+            name: docker.io/apache/incubator-kie-kogito-jit-runner:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -149,7 +149,7 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-ephemeral:999-SNAPSHOT
+            name: docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -170,7 +170,7 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-postgresql:999-SNAPSHOT
+            name: docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:999-SNAPSHOT
   - kind: ImageStream
     apiVersion: v1
     metadata:
@@ -191,4 +191,4 @@ items:
             type: Local
           from:
             kind: DockerImage
-            name: quay.io/kiegroup/kogito-jobs-service-allinone:999-SNAPSHOT
+            name: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:999-SNAPSHOT
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 61757a9f405..1971fd9b584 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-jit-runner"
+name: "docker.io/apache/incubator-kie-kogito-jit-runner"
 version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito JIT Runner"
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index ea7c283d9eb..9b9c6619a4e 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-jobs-service-allinone"
+name: "docker.io/apache/incubator-kie-kogito-jobs-service-allinone"
 version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index c9b0b2e83b9..7d8b0ca5033 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-jobs-service-ephemeral"
+name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral"
 version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito in memory Jobs Service"
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index 48eaf58f0fd..9d3f357d381 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 
-name: "quay.io/kiegroup/kogito-jobs-service-postgresql"
+name: "docker.io/apache/incubator-kie-kogito-jobs-service-postgresql"
 version: "999-SNAPSHOT"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service based on Postgresql"
diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/sonataflow/builder/build-config/module.yaml
similarity index 100%
rename from modules/kogito-swf/builder/build-config/module.yaml
rename to modules/sonataflow/builder/build-config/module.yaml
diff --git a/modules/kogito-swf/builder/runtime/community/configure.sh b/modules/sonataflow/builder/runtime/community/configure.sh
similarity index 89%
rename from modules/kogito-swf/builder/runtime/community/configure.sh
rename to modules/sonataflow/builder/runtime/community/configure.sh
index 8d26bb5940e..e209d625fdc 100644
--- a/modules/kogito-swf/builder/runtime/community/configure.sh
+++ b/modules/sonataflow/builder/runtime/community/configure.sh
@@ -26,8 +26,8 @@ mkdir -p "${KOGITO_HOME}"/.m2/repository
 mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
 
 # Unzip Quarkus app and Maven repository
-tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
-tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
+tar xf "${SOURCES_DIR}"/sonataflow-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+tar xf "${SOURCES_DIR}"/sonataflow-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/builder/runtime/community/module.yaml b/modules/sonataflow/builder/runtime/community/module.yaml
similarity index 89%
rename from modules/kogito-swf/builder/runtime/community/module.yaml
rename to modules/sonataflow/builder/runtime/community/module.yaml
index 4562b12ed59..c0f4b06880f 100644
--- a/modules/kogito-swf/builder/runtime/community/module.yaml
+++ b/modules/sonataflow/builder/runtime/community/module.yaml
@@ -23,9 +23,9 @@ description: "Kogito Serverless Workflow builder runtime module"
 
 artifacts:
   - image: builder
-    path: /home/kogito/build_output/kogito-swf-quarkus-app.tar
+    path: /home/kogito/build_output/sonataflow-quarkus-app.tar
   - image: builder
-    path: /home/kogito/build_output/kogito-swf-maven-repo.tar
+    path: /home/kogito/build_output/sonataflow-maven-repo.tar
 
 execute:
   - script: configure.sh
diff --git a/modules/kogito-swf/common/build/added/cleanup_project.sh b/modules/sonataflow/common/build/added/cleanup_project.sh
similarity index 100%
rename from modules/kogito-swf/common/build/added/cleanup_project.sh
rename to modules/sonataflow/common/build/added/cleanup_project.sh
diff --git a/modules/kogito-swf/common/build/added/zip_files.sh b/modules/sonataflow/common/build/added/zip_files.sh
similarity index 83%
rename from modules/kogito-swf/common/build/added/zip_files.sh
rename to modules/sonataflow/common/build/added/zip_files.sh
index 3e68296ef2c..57394e692f6 100755
--- a/modules/kogito-swf/common/build/added/zip_files.sh
+++ b/modules/sonataflow/common/build/added/zip_files.sh
@@ -25,10 +25,10 @@ BUILD_OUTPUT="${KOGITO_HOME}"/build_output/
 mkdir -p "${BUILD_OUTPUT}"
 
 echo "Zip and copy scaffold project"
-tar cf kogito-swf-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" .
-cp -v kogito-swf-quarkus-app.tar "${BUILD_OUTPUT}"
+tar cf sonataflow-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" .
+cp -v sonataflow-quarkus-app.tar "${BUILD_OUTPUT}"
 
 echo "Zip and copy maven repo"
 cd "${KOGITO_HOME}"/.m2/repository/
-tar cf kogito-swf-maven-repo.tar .
-cp -v kogito-swf-maven-repo.tar "${BUILD_OUTPUT}"
\ No newline at end of file
+tar cf sonataflow-maven-repo.tar .
+cp -v sonataflow-maven-repo.tar "${BUILD_OUTPUT}"
\ No newline at end of file
diff --git a/modules/kogito-swf/common/build/configure.sh b/modules/sonataflow/common/build/configure.sh
similarity index 100%
rename from modules/kogito-swf/common/build/configure.sh
rename to modules/sonataflow/common/build/configure.sh
diff --git a/modules/kogito-swf/common/build/module.yaml b/modules/sonataflow/common/build/module.yaml
similarity index 100%
rename from modules/kogito-swf/common/build/module.yaml
rename to modules/sonataflow/common/build/module.yaml
diff --git a/modules/kogito-swf/common/scripts/added/add-extension.sh b/modules/sonataflow/common/scripts/added/add-extension.sh
similarity index 100%
rename from modules/kogito-swf/common/scripts/added/add-extension.sh
rename to modules/sonataflow/common/scripts/added/add-extension.sh
diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/sonataflow/common/scripts/added/build-app.sh
similarity index 100%
rename from modules/kogito-swf/common/scripts/added/build-app.sh
rename to modules/sonataflow/common/scripts/added/build-app.sh
diff --git a/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh b/modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh
similarity index 100%
rename from modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh
rename to modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh
diff --git a/modules/kogito-swf/common/scripts/added/create-app.sh b/modules/sonataflow/common/scripts/added/create-app.sh
similarity index 100%
rename from modules/kogito-swf/common/scripts/added/create-app.sh
rename to modules/sonataflow/common/scripts/added/create-app.sh
diff --git a/modules/kogito-swf/common/scripts/added/jvm-settings.sh b/modules/sonataflow/common/scripts/added/jvm-settings.sh
similarity index 100%
rename from modules/kogito-swf/common/scripts/added/jvm-settings.sh
rename to modules/sonataflow/common/scripts/added/jvm-settings.sh
diff --git a/modules/kogito-swf/common/scripts/configure.sh b/modules/sonataflow/common/scripts/configure.sh
similarity index 100%
rename from modules/kogito-swf/common/scripts/configure.sh
rename to modules/sonataflow/common/scripts/configure.sh
diff --git a/modules/kogito-swf/common/scripts/module.yaml b/modules/sonataflow/common/scripts/module.yaml
similarity index 100%
rename from modules/kogito-swf/common/scripts/module.yaml
rename to modules/sonataflow/common/scripts/module.yaml
diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats b/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats
similarity index 93%
rename from modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
rename to modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats
index 9ffce5d374c..620a2085113 100644
--- a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
+++ b/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats
@@ -35,7 +35,7 @@ teardown() {
 
 @test "verify copy resources is working" {
     TEMPD=$(mktemp -d)
-    cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/kogito-swf-builder/resources/greet-with-inputschema/* ${TEMPD}
+    cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/sonataflow-builder/resources/greet-with-inputschema/* ${TEMPD}
 
     # We don't care about the errors to try to execute and build the program, just the copy matters
     source ${KOGITO_HOME}/launch/build-app.sh ${TEMPD} || true
diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats
similarity index 100%
rename from modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
rename to modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats
diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/sonataflow/devmode/build-config/module.yaml
similarity index 100%
rename from modules/kogito-swf/devmode/build-config/module.yaml
rename to modules/sonataflow/devmode/build-config/module.yaml
diff --git a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh b/modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh
similarity index 100%
rename from modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh
rename to modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh
diff --git a/modules/kogito-swf/devmode/runtime/common/configure.sh b/modules/sonataflow/devmode/runtime/common/configure.sh
similarity index 100%
rename from modules/kogito-swf/devmode/runtime/common/configure.sh
rename to modules/sonataflow/devmode/runtime/common/configure.sh
diff --git a/modules/kogito-swf/devmode/runtime/common/module.yaml b/modules/sonataflow/devmode/runtime/common/module.yaml
similarity index 100%
rename from modules/kogito-swf/devmode/runtime/common/module.yaml
rename to modules/sonataflow/devmode/runtime/common/module.yaml
diff --git a/modules/kogito-swf/devmode/runtime/community/configure.sh b/modules/sonataflow/devmode/runtime/community/configure.sh
similarity index 90%
rename from modules/kogito-swf/devmode/runtime/community/configure.sh
rename to modules/sonataflow/devmode/runtime/community/configure.sh
index 7404a5c1e5f..63966569e98 100644
--- a/modules/kogito-swf/devmode/runtime/community/configure.sh
+++ b/modules/sonataflow/devmode/runtime/community/configure.sh
@@ -27,8 +27,8 @@ mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
 mkdir -p "${KOGITO_HOME}"/.m2/repository
 
 # Unzip Quarkus app and Maven repository
-tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
-tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
+tar xf "${SOURCES_DIR}"/sonataflow-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+tar xf "${SOURCES_DIR}"/sonataflow-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/kogito-swf/devmode/runtime/community/module.yaml b/modules/sonataflow/devmode/runtime/community/module.yaml
similarity index 94%
rename from modules/kogito-swf/devmode/runtime/community/module.yaml
rename to modules/sonataflow/devmode/runtime/community/module.yaml
index ca49e2dcacd..9a3ef179d3d 100644
--- a/modules/kogito-swf/devmode/runtime/community/module.yaml
+++ b/modules/sonataflow/devmode/runtime/community/module.yaml
@@ -43,9 +43,9 @@ envs:
 
 artifacts:
   - image: builder
-    path: /home/kogito/build_output/kogito-swf-quarkus-app.tar
+    path: /home/kogito/build_output/sonataflow-quarkus-app.tar
   - image: builder
-    path: /home/kogito/build_output/kogito-swf-maven-repo.tar
+    path: /home/kogito/build_output/sonataflow-maven-repo.tar
 
 execute:
   - script: configure.sh
diff --git a/scripts/README.md b/scripts/README.md
index c661b6a6dca..6fcb6ddbe72 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -91,7 +91,7 @@ This script will help you while building images and test in a local OpenShift Cl
 images built in your local registry with the tag following the patter: X.Z, e.g. 0.10:
 
 ```text
-quay.io/kiegroup/kogito-jobs-service-ephemeral:0.10
+docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:0.10
 ```
 
 The [Makefile](../Makefile) has an option to do it, it can be invoked as the following sample:
diff --git a/scripts/common.py b/scripts/common.py
index 37f2ed90262..e65129542f1 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -52,7 +52,7 @@
                               "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone",
                               }
 
-# Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
+# Temporary removal of sonataflow-* images that have been moved to kie-tools for the Apache 10 release
 SWF_BUILDER_IMAGES = {"kogito-base-builder"}
 
 
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index 1a3d1615dc2..ce9672b337d 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -42,7 +42,7 @@ echo "Images version ${version} will be pushed to registry ${registry}"
 
 while read image; do
     echo "tagging image ${image} to ${registry}/${namespace}/${image}:${version}"
-    ${BUILD_ENGINE} tag quay.io/kiegroup/${image}:${version} ${registry}/${namespace}/${image}:${version}
+    ${BUILD_ENGINE} tag docker.io/apache/incubator-kie-${image}:${version} ${registry}/${namespace}/${image}:${version}
     echo "Deleting imagestream ${image} if exists `oc delete oc -n ${namespace} ${image}`"
     ${BUILD_ENGINE} push ${registry}/${namespace}/${image}:${version}
 done <<<$(python scripts/list-images.py)
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 94d9dc18422..de30a74410e 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -37,8 +37,8 @@
 import argparse
 
 IMAGES_NEXT_RC_TAG = []
-QUAY_KOGITO_ORG_PLACE_HOLDER = "quay.io/kiegroup/{}:{}"
-QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG = "quay.io/kiegroup/{}"
+QUAY_KOGITO_ORG_PLACE_HOLDER = "docker.io/apache/incubator-kie-{}:{}"
+QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG = "docker.io/apache/incubator-kie-{}"
 
 
 def find_next_tag(override_tags):
diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh
index 109f8919c8b..ce2ddc45d2a 100755
--- a/scripts/run-bats.sh
+++ b/scripts/run-bats.sh
@@ -32,5 +32,5 @@ fi
 echo "----> running bats on kogito-jobs-service-common"
 ./bats/bin/bats modules/kogito-jobs-service-common/tests/bats
 
-echo "----> running bats on kogito-swf-builder"
-./bats/bin/bats modules/kogito-swf/common/scripts/tests/bats
+echo "----> running bats on sonataflow-builder"
+./bats/bin/bats modules/sonataflow/common/scripts/tests/bats
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index e50c083f9f6..f908ebf4edf 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -17,11 +17,11 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-data-index-ephemeral
-@quay.io/kiegroup/kogito-data-index-postgresql
-@quay.io/kiegroup/kogito-jit-runner
-@quay.io/kiegroup/kogito-jobs-service-ephemeral
-@quay.io/kiegroup/kogito-jobs-service-postgresql
+@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
+@docker.io/apache/incubator-kie-kogito-data-index-postgresql
+@docker.io/apache/incubator-kie-kogito-jit-runner
+@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
+@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
 Feature: Common tests for Custom TrustStore configuration
   # This test sets an invalid certificate to the container, it fails to start, and if timing is bad cekit hangs on 'Running command ps -C java in container'
   # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index 1eed9e5755d..d3b9e345855 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -19,11 +19,11 @@
 
 # Run only on images that won't die instantly
 # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
-@quay.io/kiegroup/kogito-data-index-ephemeral
-#@quay.io/kiegroup/kogito-data-index-postgresql
-#@quay.io/kiegroup/kogito-jit-runner
-@quay.io/kiegroup/kogito-jobs-service-ephemeral
-#@quay.io/kiegroup/kogito-jobs-service-postgresql
+@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
+#@docker.io/apache/incubator-kie-kogito-data-index-postgresql
+#@docker.io/apache/incubator-kie-kogito-jit-runner
+@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
+#@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
 Feature: Common tests for Kogito images
 
   Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
diff --git a/tests/features/common.feature b/tests/features/common.feature
index 49e9e504073..0197394c274 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -17,13 +17,13 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-data-index-ephemeral
-@quay.io/kiegroup/kogito-data-index-postgresql
-@quay.io/kiegroup/kogito-jit-runner
-@quay.io/kiegroup/kogito-jobs-service-ephemeral
-@quay.io/kiegroup/kogito-jobs-service-postgresql
-@quay.io/kiegroup/kogito-swf-builder
-@quay.io/kiegroup/kogito-base-builder
+@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
+@docker.io/apache/incubator-kie-kogito-data-index-postgresql
+@docker.io/apache/incubator-kie-kogito-jit-runner
+@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
+@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
+@docker.io/apache/incubator-kie-sonataflow-builder
+@docker.io/apache/incubator-kie-kogito-base-builder
 Feature: Common tests for Kogito images
 
   Scenario: Verify if Kogito user is correctly configured
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature
index 5ae57d3fe02..dedb8ddbb3a 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/tests/features/data-index/kogito-data-index-common.feature
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-data-index-ephemeral
-@quay.io/kiegroup/kogito-data-index-postgresql
+@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
+@docker.io/apache/incubator-kie-kogito-data-index-postgresql
 Feature: Kogito-data-index common feature.
 
   Scenario: Verify if the debug is correctly enabled and test default http port
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
index 794384512d1..b37b7931034 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-data-index-ephemeral
+@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
 Feature: Kogito-data-index ephemeral postgresql feature.
 
   Scenario: verify if all labels are correctly set on kogito-data-index-ephemeral image
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
index e8b643d0296..ced19dc790a 100644
--- a/tests/features/data-index/kogito-data-index-postgresql.feature
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-data-index-postgresql
+@docker.io/apache/incubator-kie-kogito-data-index-postgresql
 Feature: Kogito-data-index postgresql feature.
 
   Scenario: verify if all labels are correctly set on kogito-data-index-postgresql image
diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
index bd3c5490b79..8d897bdf35f 100644
--- a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-jobs-service-allinone
+@docker.io/apache/incubator-kie-kogito-jobs-service-allinone
 Feature: Kogito-jobs-service-all-in-one feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature
index fa2f7212be0..d7ec38d23b1 100644
--- a/tests/features/jobs-service/kogito-jobs-service-common.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-common.feature
@@ -17,9 +17,9 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-jobs-service-ephemeral
-@quay.io/kiegroup/kogito-jobs-service-postgresql
-@quay.io/kiegroup/kogito-jobs-service-allinone
+@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
+@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
+@docker.io/apache/incubator-kie-kogito-jobs-service-allinone
 Feature: Kogito-jobs-service common feature.
 
   Scenario: verify if the events is correctly enabled
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index 9a86f1d30c2..bb0102bc084 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-jobs-service-ephemeral
+@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
 Feature: Kogito-jobs-service-ephemeral feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index e946bda32e7..4c601a9d361 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-jobs-service-postgresql
+@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
 Feature: Kogito-jobs-service-postgresql feature.
 
   Scenario: verify if all labels are correctly set kogito-jobs-service image image
diff --git a/tests/features/kogito-common-postresql-services.feature b/tests/features/kogito-common-postresql-services.feature
index f24bb33c3d8..a4146f52bb7 100644
--- a/tests/features/kogito-common-postresql-services.feature
+++ b/tests/features/kogito-common-postresql-services.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-data-index-postgresql
+@docker.io/apache/incubator-kie-kogito-data-index-postgresql
 Feature: Kogito-data-index postgresql feature.
 
   Scenario: verify if of container is correctly started with postgresql parameters
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index 98875e2f2d3..4c6e51aed3b 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-jit-runner
+@docker.io/apache/incubator-kie-kogito-jit-runner
 Feature: Kogito-jit-runner feature.
 
   Scenario: verify if all labels are correctly set on kogito-jit-runner image
diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature
index 3de371f3345..2fe570b55f8 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-swf-builder
+@docker.io/apache/incubator-kie-sonataflow-builder
 Feature: Serverless Workflow builder images
 
   Scenario: Verify that the application is built and started correctly
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 16a016de1b7..2474f53a7d4 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-swf-builder
-@quay.io/kiegroup/kogito-swf-devmode
+@docker.io/apache/incubator-kie-sonataflow-builder
+@docker.io/apache/incubator-kie-sonataflow-devmode
 Feature: Serverless Workflow images common
 
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index 8bb40087a39..d008dab0060 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-swf-devmode
+@docker.io/apache/incubator-kie-sonataflow-devmode
 Feature: Serverless Workflow devmode images
 
   Scenario: Verify if container starts in devmode by default
diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature
index bcec895e8dd..568fda55b84 100644
--- a/tests/features/supporting-services-common.feature
+++ b/tests/features/supporting-services-common.feature
@@ -17,9 +17,9 @@
 # under the License.
 #
 
-@quay.io/kiegroup/kogito-data-index-ephemeral
-@quay.io/kiegroup/kogito-data-index-postgresql
-@quay.io/kiegroup/kogito-jit-runner
+@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
+@docker.io/apache/incubator-kie-kogito-data-index-postgresql
+@docker.io/apache/incubator-kie-kogito-jit-runner
 Feature: kogito supporting services common feature
 
 Scenario: Verify if the application jar exists
diff --git a/tests/shell/README.md b/tests/shell/README.md
index 3e5f6908042..571e1abb30a 100644
--- a/tests/shell/README.md
+++ b/tests/shell/README.md
@@ -25,12 +25,12 @@
 - Install VSCode Red Hat's Java plugin
 - Install VSCode JBang plugin
 
-You can then edit the files in `kogito-swf-builder` and `kogito-swf-devmode` with intellisense.
+You can then edit the files in `sonataflow-builder` and `sonataflow-devmode` with intellisense.
 
 The `run.sh` should be used to run the tests since it must set a few env vars. To run from your terminal, try:
 
 ```shell
-tests/shell/run.sh kogito-swf-devmode quay.io/kiegroup/kogito-swf-devmode:999-SNAPSHOT
+tests/shell/run.sh sonataflow-devmode docker.io/apache/incubator-kie-sonataflow-devmode:999-SNAPSHOT
 ```
 
 The first argument is the test case to run and the second, the image.
diff --git a/tests/shell/kogito-swf-builder/.vscode/launch.json b/tests/shell/sonataflow-builder/.vscode/launch.json
similarity index 100%
rename from tests/shell/kogito-swf-builder/.vscode/launch.json
rename to tests/shell/sonataflow-builder/.vscode/launch.json
diff --git a/tests/shell/kogito-swf-builder/.vscode/settings.json b/tests/shell/sonataflow-builder/.vscode/settings.json
similarity index 100%
rename from tests/shell/kogito-swf-builder/.vscode/settings.json
rename to tests/shell/sonataflow-builder/.vscode/settings.json
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/.mvn/jvm.config b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/.mvn/jvm.config
similarity index 100%
rename from tests/shell/kogito-swf-builder/resources/greet-with-inputschema/.mvn/jvm.config
rename to tests/shell/sonataflow-builder/resources/greet-with-inputschema/.mvn/jvm.config
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
similarity index 96%
rename from tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
rename to tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
index 6279486d481..da41c621fd8 100644
--- a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
+++ b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0"
+ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:2.0"
 
 FROM ${BUILDER_IMAGE_TAG} AS builder
 
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/greet.sw.json b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
similarity index 100%
rename from tests/shell/kogito-swf-builder/resources/greet-with-inputschema/greet.sw.json
rename to tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/schemas/input.json b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
similarity index 100%
rename from tests/shell/kogito-swf-builder/resources/greet-with-inputschema/schemas/input.json
rename to tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
diff --git a/tests/shell/kogito-swf-builder/resources/greet/.mvn/jvm.config b/tests/shell/sonataflow-builder/resources/greet/.mvn/jvm.config
similarity index 100%
rename from tests/shell/kogito-swf-builder/resources/greet/.mvn/jvm.config
rename to tests/shell/sonataflow-builder/resources/greet/.mvn/jvm.config
diff --git a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile b/tests/shell/sonataflow-builder/resources/greet/Dockerfile
similarity index 96%
rename from tests/shell/kogito-swf-builder/resources/greet/Dockerfile
rename to tests/shell/sonataflow-builder/resources/greet/Dockerfile
index 6279486d481..da41c621fd8 100644
--- a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile
+++ b/tests/shell/sonataflow-builder/resources/greet/Dockerfile
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0"
+ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:2.0"
 
 FROM ${BUILDER_IMAGE_TAG} AS builder
 
diff --git a/tests/shell/kogito-swf-builder/resources/greet/greet.sw.json b/tests/shell/sonataflow-builder/resources/greet/greet.sw.json
similarity index 100%
rename from tests/shell/kogito-swf-builder/resources/greet/greet.sw.json
rename to tests/shell/sonataflow-builder/resources/greet/greet.sw.json
diff --git a/tests/shell/kogito-swf-builder/src/RunTests.java b/tests/shell/sonataflow-builder/src/RunTests.java
similarity index 100%
rename from tests/shell/kogito-swf-builder/src/RunTests.java
rename to tests/shell/sonataflow-builder/src/RunTests.java
diff --git a/tests/shell/kogito-swf-devmode/.vscode/launch.json b/tests/shell/sonataflow-devmode/.vscode/launch.json
similarity index 100%
rename from tests/shell/kogito-swf-devmode/.vscode/launch.json
rename to tests/shell/sonataflow-devmode/.vscode/launch.json
diff --git a/tests/shell/kogito-swf-devmode/.vscode/settings.json b/tests/shell/sonataflow-devmode/.vscode/settings.json
similarity index 100%
rename from tests/shell/kogito-swf-devmode/.vscode/settings.json
rename to tests/shell/sonataflow-devmode/.vscode/settings.json
diff --git a/tests/shell/kogito-swf-devmode/resources/greet.sw.json b/tests/shell/sonataflow-devmode/resources/greet.sw.json
similarity index 100%
rename from tests/shell/kogito-swf-devmode/resources/greet.sw.json
rename to tests/shell/sonataflow-devmode/resources/greet.sw.json
diff --git a/tests/shell/kogito-swf-devmode/src/RunTests.java b/tests/shell/sonataflow-devmode/src/RunTests.java
similarity index 100%
rename from tests/shell/kogito-swf-devmode/src/RunTests.java
rename to tests/shell/sonataflow-devmode/src/RunTests.java

From f64adbbe001982037c999f32b522adaa6092241e Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Thu, 23 May 2024 13:41:22 -0300
Subject: [PATCH 686/709] NO-ISSUE: Make the weekly Jenkins job build all
 images (#1769)

* Make the weekly Jenkins job build all images

* Add cloud images binding
---
 .ci/jenkins/dsl/jobs.groovy | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index baf84e3c9d8..eb7535ff916 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -347,10 +347,9 @@ void setupWeeklyDeployJob(JobType jobType) {
 
         QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
     ])
-
-    // Temporary removal of sonataflow-* images that have been moved to kie-tools for the Apache 10 release
-    jobParams.env.put('IMAGES_LIST', 'kogito-base-builder')
-
+    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
+        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
+    }
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
             stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')

From 63b10d9d22b94c038d4685cd68287f99037904e5 Mon Sep 17 00:00:00 2001
From: Jan Stastny <ststnjn@gmail.com>
Date: Mon, 27 May 2024 11:37:36 +0200
Subject: [PATCH 687/709] kie-issues#1250: prepare for release branch,gpg,svn
 (#1770)

* kie-issues#1250: prepare for release branch,gpg,svn

* change docker save command

Co-authored-by: Rodrigo Antunes <contato@rodrigoantunes.com.br>

* Update .ci/jenkins/Jenkinsfile.build-image

Co-authored-by: Rodrigo Antunes <contato@rodrigoantunes.com.br>

* fix DSL

---------

Co-authored-by: jstastny-cz <jan.stastny@ibm.com>
Co-authored-by: Rodrigo Antunes <contato@rodrigoantunes.com.br>
---
 .ci/jenkins/Jenkinsfile.build-image | 44 +++++++++++++++++++++++++++++
 .ci/jenkins/Jenkinsfile.deploy      |  6 +++-
 .ci/jenkins/dsl/jobs.groovy         |  8 ++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 4a425f3cc7f..2d5845416a6 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -222,6 +222,31 @@ pipeline {
                 }
             }
         }
+        stage('Export, Sign and Archive Image and signature') {
+            when {
+                expression { return shouldExportAndGpgSign() }
+            }
+            steps {
+                script {
+                    def resultingFileName = "${getFinalImageName()}.tar.gz"
+                    def signatureFileName = "${resultingFileName}.asc"
+                    sh """
+                        docker pull ${getBuiltImageTag()}
+                        docker save ${getBuiltImageTag()} | gzip > ${resultingFileName}
+                    """
+                    release.gpgImportKeyFromFileWithPassword(getReleaseGpgSignKeyCredsId(), getReleaseGpgSignPassphraseCredsId())
+                    release.gpgSignFileDetachedSignatureWithPassword(resultingFileName, signatureFileName, getReleaseGpgSignPassphraseCredsId())
+                    release.svnUploadFileToRepository(getReleaseSvnRepository(), getReleaseSvnCredsId(), getReleaseVersion(), resultingFileName, signatureFileName)
+                }
+            }
+            post {
+                always {
+                    script {
+                        archiveArtifacts(artifacts: '**/*.tar.gz,**/*.tar.gz.asc', fingerprint: false, allowEmptyArchive: true)
+                    }
+                }
+            }
+        }
     }
     post {
         always {
@@ -372,6 +397,10 @@ boolean shouldDeployImage() {
     return params.DEPLOY_IMAGE
 }
 
+boolean shouldExportAndGpgSign() {
+    return params.EXPORT_AND_GPG_SIGN_IMAGE
+}
+
 String getBuildKogitoAppsRef() {
     return params.BUILD_KOGITO_APPS_REF
 }
@@ -427,3 +456,18 @@ String getTriggeringProjectName() {
     }
     return ""
 }
+String getReleaseGpgSignKeyCredsId() {
+    return env.RELEASE_GPG_SIGN_KEY_CREDS_ID
+}
+
+String getReleaseGpgSignPassphraseCredsId() {
+    return env.RELEASE_GPG_SIGN_PASSPHRASE_CREDS_ID
+}
+
+String getReleaseSvnRepository() {
+    return env.RELEASE_SVN_REPOSITORY
+}
+
+String getReleaseSvnCredsId() {
+    return env.RELEASE_SVN_CREDS_ID
+}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 2391a1ae8ce..8ee24f81233 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -300,7 +300,7 @@ void createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_URI', value: params.EXAMPLES_URI))
             buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_REF', value: params.EXAMPLES_REF))
 
-            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
+            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: isDeployImage()))
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_CREDENTIALS', value: getDeployImageRegistryCredentials()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: getDeployImageRegistry()))
@@ -354,6 +354,10 @@ List getTestFailedImages() {
 // Deploy image information
 ////////////////////////////////////////////////////////////////////////
 
+boolean isDeployImage() {
+    return !env.DISABLE_IMAGES_DEPLOY
+}
+
 boolean isDeployImageInOpenshiftRegistry() {
     return params.IMAGE_USE_OPENSHIFT_REGISTRY
 }
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index eb7535ff916..9f997b07e23 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -115,6 +115,8 @@ void setupDeployJob(JobType jobType) {
         DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
 
         QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
+
+        DISABLE_IMAGES_DEPLOY: (jobType==JobType.NIGHTLY) ? true : Utils.isImagesDeployDisabled(this)
     ])
     if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
         jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
@@ -167,6 +169,11 @@ void setupBuildImageJob(JobType jobType) {
 
         GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
         GIT_AUTHOR_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+
+        RELEASE_GPG_SIGN_KEY_CREDS_ID: Utils.getReleaseGpgSignKeyCredentialsId(this),
+        RELEASE_GPG_SIGN_PASSPHRASE_CREDS_ID: Utils.getReleaseGpgSignPassphraseCredentialsId(this),
+        RELEASE_SVN_REPOSITORY: Utils.getReleaseSvnCredentialsId(this),
+        RELEASE_SVN_CREDS_ID: Utils.getReleaseSvnStagingRepository(this)
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         logRotator {
@@ -202,6 +209,7 @@ void setupBuildImageJob(JobType jobType) {
             stringParam('DEPLOY_IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
             stringParam('DEPLOY_IMAGE_TAG', '', 'Image tag to use to deploy images')
             booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
+            booleanParam('EXPORT_AND_GPG_SIGN_IMAGE', jobType == JobType.RELEASE, 'Set to true if should images be exported and signed.')
         }
     }
 }

From 431715cd7251579c3d8ae3fc956239f5d51f8a44 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Tue, 28 May 2024 14:19:19 -0300
Subject: [PATCH 688/709] Add @jstastny-cz and @rodrigonull to CODEOWNERS
 (#1771)

---
 .github/CODEOWNERS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0dacb00c5a3..d4de8727c2e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,5 @@
+# General changes
 *       @ricardozanini @wmedvede
+
+# Work on CI/Jenkins
+.ci @ricardozanini @jstastny-cz @rodrigonull

From a4ca76db27e0a65caf96cdfac9385634f069847c Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Thu, 20 Jun 2024 09:26:53 -0300
Subject: [PATCH 689/709] kie-issues#1214: Replace explicit references to
 quay.io images across CI pipelines (#1772)

* Update CI pipelines for the Apache 10 release

* Create a new tag

* Add git tag name and image artifact release version paramters

* Fix typo

* Add new apache dockerhub credentials ids
---
 .ci/jenkins/Jenkinsfile.build-image   | 39 +++++++++------------
 .ci/jenkins/Jenkinsfile.deploy        | 25 +++++++++++---
 .ci/jenkins/Jenkinsfile.promote       | 50 +++++++++++----------------
 .ci/jenkins/Jenkinsfile.weekly.deploy | 11 ++++--
 .ci/jenkins/dsl/jobs.groovy           | 32 ++++++++++-------
 5 files changed, 86 insertions(+), 71 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 2d5845416a6..de59f6e4e0e 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -16,11 +16,9 @@
  */
 @Library('jenkins-pipeline-shared-libraries')_
 
-QUAY_REGISTRY = 'quay.io'
-
 pipeline {
     agent {
-        docker { 
+        docker {
             image env.AGENT_DOCKER_BUILDER_IMAGE
             args env.AGENT_DOCKER_BUILDER_ARGS
             label util.avoidFaultyNodes()
@@ -68,8 +66,8 @@ pipeline {
                         if (isDeployImageInOpenshiftRegistry()) {
                             cloud.loginOpenShift(getOpenShiftAPI(), env.OPENSHIFT_CREDS_KEY)
                             cloud.loginOpenshiftRegistry(env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
-                        } else if (getDeployImageRegistryCredentials()) {
-                            cloud.loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials(), env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
+                        } else if (getDeployImageRegistryUserCredentialsId() && getDeployImageRegistryTokenCredentialsId()) {
+                            cloud.loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryUserCredentialsId(), getDeployImageRegistryTokenCredentialsId(), env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
                         }
                     }
                 }
@@ -149,18 +147,6 @@ pipeline {
             }
             steps {
                 script {
-                    // Make public if quay registry
-                    if (getDeployImageRegistry() == QUAY_REGISTRY) {
-                        String namespace = getDeployImageNamespace()
-                        String repository = getFinalImageName()
-                        echo "Check and set public if needed Quay repository ${namespace}/${repository}"
-                        try {
-                            cloud.makeQuayImagePublic(namespace, repository, [ usernamePassword: getDeployImageRegistryCredentials()])
-                        } catch (err) {
-                            echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
-                        }
-                    }
-
                     int retries = Integer.parseInt(env.MAX_REGISTRY_RETRIES)
                     String imageTag = getBuiltImageTag()
                     if (isDeployLatestTag()) {
@@ -228,7 +214,7 @@ pipeline {
             }
             steps {
                 script {
-                    def resultingFileName = "${getFinalImageName()}.tar.gz"
+                    def resultingFileName = "incubator-kie-${getImageArtifactReleaseVersion()}-${getBuildImageName()}.tar.gz"
                     def signatureFileName = "${resultingFileName}.asc"
                     sh """
                         docker pull ${getBuiltImageTag()}
@@ -236,7 +222,7 @@ pipeline {
                     """
                     release.gpgImportKeyFromFileWithPassword(getReleaseGpgSignKeyCredsId(), getReleaseGpgSignPassphraseCredsId())
                     release.gpgSignFileDetachedSignatureWithPassword(resultingFileName, signatureFileName, getReleaseGpgSignPassphraseCredsId())
-                    release.svnUploadFileToRepository(getReleaseSvnRepository(), getReleaseSvnCredsId(), getReleaseVersion(), resultingFileName, signatureFileName)
+                    release.svnUploadFileToRepository(getReleaseSvnRepository(), getReleaseSvnCredsId(), getImageArtifactReleaseVersion(), resultingFileName, signatureFileName)
                 }
             }
             post {
@@ -309,8 +295,12 @@ boolean isDeployImageInOpenshiftRegistry() {
     return params.DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getDeployImageRegistryCredentials() {
-    return params.DEPLOY_IMAGE_REGISTRY_CREDENTIALS
+String getDeployImageRegistryUserCredentialsId() {
+    return params.DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID
+}
+
+String getDeployImageRegistryTokenCredentialsId() {
+    return params.DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
 }
 
 String getDeployImageRegistry() {
@@ -328,9 +318,8 @@ String getDeployImageNameSuffix() {
 String getDeployImageTag() {
     if (params.DEPLOY_IMAGE_TAG != '') {
         return params.DEPLOY_IMAGE_TAG
-    } else {
-        return sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
     }
+    return sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
 }
 
 String getFinalImageName() {
@@ -471,3 +460,7 @@ String getReleaseSvnRepository() {
 String getReleaseSvnCredsId() {
     return env.RELEASE_SVN_CREDS_ID
 }
+
+String getImageArtifactReleaseVersion() {
+    return env.IMAGE_ARTIFACT_RELEASE_VERSION
+}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 8ee24f81233..396fa00dc29 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -213,6 +213,11 @@ pipeline {
                         }
                         String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getGitAuthorPushCredsId())
                         deployProperties["${getRepoName()}.pr.link"] = prLink
+
+                        // Create a new tag
+                        githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
+                        githubscm.tagRepository(getGitTagName())
+                        githubscm.pushRemoteTag('origin', getGitTagName(), getGitAuthorPushCredsId())
                     }
                 }
             }
@@ -223,10 +228,12 @@ pipeline {
                         setDeployPropertyIfNeeded("${getRepoName()}.pr.source.ref", getPRBranch())
                         setDeployPropertyIfNeeded("${getRepoName()}.pr.target.uri", "https://github.com/${getGitAuthor()}/${getRepoName()}")
                         setDeployPropertyIfNeeded("${getRepoName()}.pr.target.ref", getBuildBranch())
+                        setDeployPropertyIfNeeded("${getRepoName()}.tag.name", getGitTagName())
                     }
                 }
             }
         }
+
         stage('Finalize') {
             steps {
                 script {
@@ -302,12 +309,14 @@ void createBuildAndTestStageClosure(String image) {
 
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: isDeployImage()))
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_CREDENTIALS', value: getDeployImageRegistryCredentials()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID', value: getDeployImageRegistryUserCredentialsId()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', value: getDeployImageRegistryTokenCredentialsId()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: getDeployImageRegistry()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: getDeployImageNamespace()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: getDeployImageNameSuffix()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_TAG', value: getDeployImageTag()))
             buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: isDeployLatestTag()))
+            buildParams.add(string(name: 'IMAGE_ARTIFACT_RELEASE_VERSION', value: getGitTagName()))
 
             def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
             if (job.result != 'SUCCESS') {
@@ -362,8 +371,12 @@ boolean isDeployImageInOpenshiftRegistry() {
     return params.IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getDeployImageRegistryCredentials() {
-    return params.IMAGE_REGISTRY_CREDENTIALS
+String getDeployImageRegistryUserCredentialsId() {
+    return params.IMAGE_REGISTRY_USER_CREDENTIALS_ID
+}
+
+String getDeployImageRegistryTokenCredentialsId() {
+    return params.IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
 }
 
 String getDeployImageRegistry() {
@@ -450,4 +463,8 @@ String[] getImages() {
 
 String getQuarkusPlatformVersion() {
     return params.QUARKUS_PLATFORM_VERSION
-}
\ No newline at end of file
+}
+
+String getGitTagName() {
+    return params.GIT_TAG_NAME
+}
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index c3b2164b3fb..8497669a095 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -64,15 +64,15 @@ pipeline {
                     // Login old registry
                     if (isOldImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
-                    } else if (getOldImageRegistryCredentials() != '') {
-                        loginContainerRegistry(getOldImageRegistry(), getOldImageRegistryCredentials())
+                    } else if (getOldImageRegistryUserCredentialsId() != '' && getOldImageRegistryTokenCredentialsId() != '') {
+                        loginContainerRegistry(getOldImageRegistry(), getOldImageRegistryUserCredentialsId(), getOldImageRegistryTokenCredentialsId())
                     }
 
                     // Login new registry
                     if (isNewImageInOpenshiftRegistry()) {
                         loginOpenshiftRegistry()
-                    } else if (getNewImageRegistryCredentials() != '') {
-                        loginContainerRegistry(getNewImageRegistry(), getNewImageRegistryCredentials())
+                    } else if (getNewImageRegistryUserCredentialsId() != '' && getNewImageRegistryTokenCredentialsId() != '') {
+                        loginContainerRegistry(getNewImageRegistry(), getNewImageRegistryUserCredentialsId(), getNewImageRegistryTokenCredentialsId())
                     }
 
                     dir(getRepoName()) {
@@ -173,20 +173,6 @@ void promoteImage(String oldImageName, String newImageName) {
     cloud.skopeoCopyRegistryImages(oldImageName, newImageName, Integer.parseInt(env.MAX_REGISTRY_RETRIES))
 }
 
-// Set images public on quay. Useful when new images are introduced.
-void makeQuayNewImagesPublic() {
-    String namespace = getNewImageNamespace()
-    for (String imageName : getImages()) {
-        String repository = getFinalImageName(imageName, getNewImageNameSuffix())
-        echo "Check and set public if needed Quay repository ${namespace}/${repository}"
-        try {
-            cloud.makeQuayImagePublic(namespace, repository, [ usernamePassword: getNewImageRegistryCredentials()])
-        } catch (err) {
-            echo "[ERROR] Cannot set image quay.io/${namespace}/${repository} as visible"
-        }
-    }
-}
-
 String getOldImageFullTag(String imageName) {
     return "${getOldImageRegistry()}/${getOldImageNamespace()}/${getFinalImageName(imageName, getOldImageNameSuffix())}:${getOldImageTag()}"
 }
@@ -226,9 +212,11 @@ void loginOpenshiftRegistry() {
     sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${env.OPENSHIFT_REGISTRY}"
 }
 
-void loginContainerRegistry(String registry, String credsId) {
-    withCredentials([usernamePassword(credentialsId: credsId, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
-        sh "${env.CONTAINER_ENGINE} login -u ${REGISTRY_USER} -p ${REGISTRY_PWD} ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${registry}"
+void loginContainerRegistry(String registry, String userCredsId, String tokenCredsId) {
+    withCredentials([string(credentialsId: userCredsId, variable: 'DOCKER_USER')]) {
+        withCredentials([string(credentialsId: tokenCredsId, variable: 'DOCKER_TOKEN')]) {
+            sh "${env.CONTAINER_ENGINE} login -u ${DOCKER_USER} -p ${DOCKER_TOKEN} ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${registry}"
+        }
     }
 }
 
@@ -296,10 +284,6 @@ String getGitAuthorPushCredsId() {
     return env.GIT_AUTHOR_PUSH_CREDS_ID
 }
 
-boolean isQuayRegistry(String registry) {
-    return registry == 'quay.io'
-}
-
 ////////////////////////////////////////////////////////////////////////
 // Old image information
 ////////////////////////////////////////////////////////////////////////
@@ -312,8 +296,12 @@ boolean isOldImageInOpenshiftRegistry() {
     return params.BASE_IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getOldImageRegistryCredentials() {
-    return params.BASE_IMAGE_REGISTRY_CREDENTIALS
+String getOldImageRegistryUserCredentialsId() {
+    return params.BASE_IMAGE_REGISTRY_USER_CREDENTIALS_ID
+}
+
+String getOldImageRegistryTokenCredentialsId() {
+    return params.BASE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
 }
 
 String getOldImageRegistry() {
@@ -344,8 +332,12 @@ boolean isNewImageInOpenshiftRegistry() {
     return params.PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getNewImageRegistryCredentials() {
-    return params.PROMOTE_IMAGE_REGISTRY_CREDENTIALS
+String getNewImageRegistryUserCredentialsId() {
+    return params.PROMOTE_IMAGE_REGISTRY_USER_CREDENTIALS_ID
+}
+
+String getNewImageRegistryTokenCredentialsId() {
+    return params.PROMOTE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
 }
 
 String getNewImageRegistry() {
diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
index d165968744a..fd03c959b31 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -206,7 +206,8 @@ void createBuildAndTestStageClosure(String image) {
 
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
             buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_CREDENTIALS', value: getDeployImageRegistryCredentials()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID', value: getDeployImageRegistryUserCredentialsId()))
+            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', value: getDeployImageRegistryTokenCredentialsId()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: getDeployImageRegistry()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: getDeployImageNamespace()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: getDeployImageNameSuffix()))
@@ -262,8 +263,12 @@ boolean isDeployImageInOpenshiftRegistry() {
     return params.IMAGE_USE_OPENSHIFT_REGISTRY
 }
 
-String getDeployImageRegistryCredentials() {
-    return params.IMAGE_REGISTRY_CREDENTIALS
+String getDeployImageRegistryUserCredentialsId() {
+    return params.IMAGE_REGISTRY_USER_CREDENTIALS_ID
+}
+
+String getDeployImageRegistryTokenCredentialsId() {
+    return params.IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
 }
 
 String getDeployImageRegistry() {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 9f997b07e23..4997d4bede9 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -136,8 +136,9 @@ void setupDeployJob(JobType jobType) {
             stringParam('EXAMPLES_REF', '', 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
 
             // Deploy information
-            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_USER_CREDENTIALS_ID, IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Image registry user credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Image registry token credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
             stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
             stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
             stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
@@ -149,6 +150,7 @@ void setupDeployJob(JobType jobType) {
             stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
             if (jobType == JobType.RELEASE) {
                 stringParam('QUARKUS_PLATFORM_VERSION', '', 'Allow to override the Quarkus Platform version')
+                stringParam('GIT_TAG_NAME', '', 'Git tag to be created')
             }
 
             stringParam('KOGITO_PR_BRANCH', '', 'PR branch name')
@@ -202,14 +204,16 @@ void setupBuildImageJob(JobType jobType) {
 
             // Deploy information
             booleanParam('DEPLOY_IMAGE', false, 'Should we deploy image to given deploy registry ?')
-            booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('DEPLOY_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID, DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, DEPLOY_IMAGE_REGISTRY and DEPLOY_IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Image registry user credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Image registry token credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
             stringParam('DEPLOY_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
             stringParam('DEPLOY_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
             stringParam('DEPLOY_IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
             stringParam('DEPLOY_IMAGE_TAG', '', 'Image tag to use to deploy images')
             booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
             booleanParam('EXPORT_AND_GPG_SIGN_IMAGE', jobType == JobType.RELEASE, 'Set to true if should images be exported and signed.')
+            stringParam('IMAGE_ARTIFACT_RELEASE_VERSION', '', 'Set the release version to be attached to the images artifacts names')
         }
     }
 }
@@ -258,8 +262,9 @@ void setupBuildAndTestJob(JobType jobType) {
 
             // Deploy information
             booleanParam('DEPLOY_IMAGE', false, 'Should we deploy image to given deploy registry ?')
-            booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('DEPLOY_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID, DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, DEPLOY_IMAGE_REGISTRY and DEPLOY_IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Image registry user credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Image registry token credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
             stringParam('DEPLOY_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
             stringParam('DEPLOY_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
             stringParam('DEPLOY_IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
@@ -300,8 +305,9 @@ void setupPromoteJob(JobType jobType) {
             stringParam('DEPLOY_BUILD_URL', '', 'URL to jenkins deploy build to retrieve the `deployment.properties` file. If base parameters are defined, they will override the `deployment.properties` information')
 
             // Base images information which can override `deployment.properties`
-            booleanParam('BASE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Override `deployment.properties`. Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Override `deployment.properties`. Base Image registry credentials to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
+            booleanParam('BASE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Override `deployment.properties`. Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_USER_CREDENTIALS_ID, BASE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('BASE_IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Override `deployment.properties`. Base Image registry user credentials id to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
+            stringParam('BASE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Override `deployment.properties`. Base Image registry token credentials id to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
             stringParam('BASE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Override `deployment.properties`. Base image registry')
             stringParam('BASE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Override `deployment.properties`. Base image namespace')
             stringParam('BASE_IMAGE_NAMES', '', 'Override `deployment.properties`. Comma separated list of images')
@@ -309,8 +315,9 @@ void setupPromoteJob(JobType jobType) {
             stringParam('BASE_IMAGE_TAG', '', 'Override `deployment.properties`. Base image tag')
 
             // Promote images information
-            booleanParam('PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Promote Image registry credentials to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
+            booleanParam('PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_USER_CREDENTIALS_ID, PROMOTE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('PROMOTE_IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Promote Image registry user credentials id to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
+            stringParam('PROMOTE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Promote Image registry token credentials id to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
             stringParam('PROMOTE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Promote image registry')
             stringParam('PROMOTE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Promote image namespace')
             stringParam('PROMOTE_IMAGE_NAME_SUFFIX', '', 'Promote image name suffix')
@@ -373,8 +380,9 @@ void setupWeeklyDeployJob(JobType jobType) {
             stringParam('EXAMPLES_REF', '', 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
 
             // Deploy information
-            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_USER_CREDENTIALS_ID, IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
+            stringParam('IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Image registry user credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+            stringParam('IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Image registry token credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
             stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
             stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
             stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')

From 530f498ed3cac40220249f0b7bacf4c2e24bc511 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Fri, 21 Jun 2024 08:22:28 -0300
Subject: [PATCH 690/709] Fix dockerhub image name (#1774)

---
 .ci/jenkins/Jenkinsfile.build-image | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index de59f6e4e0e..83a3f5621eb 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -278,9 +278,8 @@ String getImageVersion() {
 String getBuiltImageTag(String imageTag = '') {
     if (shouldDeployImage()) {
         return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName()}:${imageTag ?: getDeployImageTag()}"
-    } else {
-        return "${env.localRegistryUrl}/${getBuildImageName()}:${githubscm.getCommitHash()}"
     }
+    return "${env.localRegistryUrl}/${getBuildImageName()}:${githubscm.getCommitHash()}"
 }
 
 void runPythonCommand(String cmd, boolean stdout = false) {
@@ -323,7 +322,7 @@ String getDeployImageTag() {
 }
 
 String getFinalImageName() {
-    return getBuildImageName() + (getDeployImageNameSuffix() ? "-${getDeployImageNameSuffix()}" : '')
+    return "incubator-kie-" + getBuildImageName() + (getDeployImageNameSuffix() ? "-${getDeployImageNameSuffix()}" : '')
 }
 
 boolean isDeployLatestTag() {

From 1d3c476a35beb12a03fe92fd6a741f7409c7a8bb Mon Sep 17 00:00:00 2001
From: Jan Stastny <ststnjn@gmail.com>
Date: Tue, 2 Jul 2024 09:25:18 +0200
Subject: [PATCH 691/709] incubator-kie-kogito-images#1729: PR checks forks
 with different naming (#1776)

* incubator-kie-kogito-images#1729: PR checks forks with different naming

* add missing method

---------

Co-authored-by: jstastny-cz <jan.stastny@ibm.com>
---
 .ci/jenkins/Jenkinsfile.build-and-test | 42 +++++++++++++++++++-------
 .ci/jenkins/Jenkinsfile.build-image    | 10 ++++--
 .ci/jenkins/dsl/jobs.groovy            |  1 +
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
index da1a49fbd88..f673d3dacad 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -38,7 +38,15 @@ pipeline {
                     dir(getRepoName()) {
                         // TODO Test pupose
                         deleteDir()
-                        githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorTokenCredentialsId(), usernamePassword: getGitAuthorCredentialsId()])
+                        if (getTargetBranch()) {
+                            echo 'Got a target branch ... Trying to merge the source with the target'
+                            githubscm.checkoutIfExists(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getTargetBranch(), true, [ token: getGitAuthorTokenCredentialsId(), usernamePassword: getGitAuthorCredentialsId() ])
+                            githubscm.prepareCommitStatusInformationForPullRequest(getSourceRepository(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getGitAuthorCredentialsId())
+                        } else {
+                            echo 'No target branch ... Checking out simply'
+                            githubscm.checkout(githubscm.resolveRepository(getSourceRepository(), getSourceAuthor(), getSourceBranch(), false, getGitAuthorCredentialsId()))
+                            githubscm.prepareCommitStatusInformation(getSourceRepository(), getSourceAuthor(), getSourceBranch(), getGitAuthorCredentialsId())
+                        }
                     }
                 }
             }
@@ -62,7 +70,6 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getGitAuthorCredentialsId())
                         parallelStages = [:]
                         for(String image : getImages()){
                             parallelStages[image] = createBuildAndTestStageClosure(image)
@@ -88,8 +95,9 @@ Closure createBuildAndTestStageClosure(String image) {
             List buildParams = []
             buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${getChangeId()} - ${image}: ${getChangeUrl()}"))
             buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
-            buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
-            buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
+            buildParams.add(string(name: 'SOURCE_AUTHOR', value: getSourceAuthor()))
+            buildParams.add(string(name: 'SOURCE_REPOSITORY', value: getSourceRepository()))
+            buildParams.add(string(name: 'SOURCE_BRANCH', value: getSourceBranch()))
             buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
             buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
 
@@ -115,30 +123,42 @@ String[] getImages() {
     return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
 }
 
-String getChangeAuthor() {
-    return SOURCE_AUTHOR
+String getSourceAuthor() {
+    return params.SOURCE_AUTHOR
+}
+
+String getSourceBranch() {
+    return params.SOURCE_BRANCH
 }
 
-String getChangeBranch() {
-    return SOURCE_BRANCH
+String getSourceRepository() {
+    return params.SOURCE_REPOSITORY
 }
 
 String getChangeTarget() {
-    return TARGET_BRANCH
+    return params.TARGET_BRANCH
 }
 
 String getChangeId() {
-    return CHANGE_ID
+    return params.CHANGE_ID
 }
 
 String getChangeUrl() {
-    return CHANGE_URL
+    return params.CHANGE_URL
 }
 
 String getRepoName() {
     return env.REPO_NAME
 }
 
+String getTargetAuthor() {
+    return env.TARGET_AUTHOR
+}
+
+String getTargetBranch() {
+    return params.TARGET_BRANCH
+}
+
 String getGitAuthorCredentialsId() {
     return env.GIT_AUTHOR_CREDS_ID
 }
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 83a3f5621eb..0a02478ece0 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -52,11 +52,11 @@ pipeline {
                     if (getTargetBranch()) {
                         echo 'Got a target branch ... Trying to merge the source with the target'
                         githubscm.checkoutIfExists(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getTargetBranch(), true, [ token: getGitAuthorTokenCredentialsId(), usernamePassword: getGitAuthorCredentialsId() ])
-                        githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getGitAuthorCredentialsId())
+                        githubscm.prepareCommitStatusInformationForPullRequest(getSourceRepository(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getGitAuthorCredentialsId())
                     } else {
                         echo 'No target branch ... Checking out simply'
-                        checkout(githubscm.resolveRepository(getRepoName(), getSourceAuthor(), getSourceBranch(), false, getGitAuthorCredentialsId()))
-                        githubscm.prepareCommitStatusInformation(getRepoName(), getSourceAuthor(), getSourceBranch(), getGitAuthorCredentialsId())
+                        checkout(githubscm.resolveRepository(getSourceRepository(), getSourceAuthor(), getSourceBranch(), false, getGitAuthorCredentialsId()))
+                        githubscm.prepareCommitStatusInformation(getSourceRepository(), getSourceAuthor(), getSourceBranch(), getGitAuthorCredentialsId())
                     }
                     githubscm.setUserConfig('robot', 'kie.apache.org', true)
                     updateGithubCommitStatus('PENDING', 'Started')
@@ -361,6 +361,10 @@ String getSourceAuthor() {
     return params.SOURCE_AUTHOR
 }
 
+String getSourceRepository() {
+    return params.SOURCE_REPOSITORY
+}
+
 String getSourceBranch() {
     return params.SOURCE_BRANCH
 }
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 4997d4bede9..d815d4fd6f6 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -187,6 +187,7 @@ void setupBuildImageJob(JobType jobType) {
             stringParam('BUILD_IMAGE_NAME', '', 'Image name to build. Mandatory parameter.')
 
             stringParam('SOURCE_AUTHOR', Utils.getGitAuthor(this), 'Build author')
+            stringParam('SOURCE_REPOSITORY', Utils.getRepoName(this), 'Build repository name')
             stringParam('SOURCE_BRANCH', Utils.getGitBranch(this), 'Build branch name')
             stringParam('TARGET_BRANCH', '', '(Optional) In case of a PR to merge with target branch, please provide the target branch')
 

From 14d75ad329492cc5b9e7a1ffe74cb798597ae69a Mon Sep 17 00:00:00 2001
From: Jan Stastny <ststnjn@gmail.com>
Date: Wed, 3 Jul 2024 15:29:19 +0200
Subject: [PATCH 692/709] incubator-kie-kogito-images#1729: parameterize
 jobParams of build-image job (#1777)

Co-authored-by: jstastny-cz <jan.stastny@ibm.com>
---
 .ci/jenkins/dsl/jobs.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index d815d4fd6f6..c3eb80a0225 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -163,6 +163,7 @@ void setupBuildImageJob(JobType jobType) {
     def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.build-image', jobType, "${jenkins_path}/Jenkinsfile.build-image", 'Kogito Images Build single image')
     // Use jenkinsfile from the build branch
     jobParams.git.author = '${SOURCE_AUTHOR}'
+    jobParams.git.repository = '${SOURCE_REPOSITORY}'
     jobParams.git.branch = '${SOURCE_BRANCH}'
     JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
     jobParams.env.putAll([

From 9665943f156f698cde2022ddd1eef8222dc6807a Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Tue, 16 Jul 2024 11:18:16 -0300
Subject: [PATCH 693/709] Adjust pipelines to use the gpg key provided by
 Apache to sign the artifacts (#1778)

---
 .ci/jenkins/Jenkinsfile.build-image | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 0a02478ece0..eef73851600 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -220,8 +220,8 @@ pipeline {
                         docker pull ${getBuiltImageTag()}
                         docker save ${getBuiltImageTag()} | gzip > ${resultingFileName}
                     """
-                    release.gpgImportKeyFromFileWithPassword(getReleaseGpgSignKeyCredsId(), getReleaseGpgSignPassphraseCredsId())
-                    release.gpgSignFileDetachedSignatureWithPassword(resultingFileName, signatureFileName, getReleaseGpgSignPassphraseCredsId())
+                    release.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
+                    release.gpgSignFileDetachedSignatureWithoutPassword(resultingFileName, signatureFileName)
                     release.svnUploadFileToRepository(getReleaseSvnRepository(), getReleaseSvnCredsId(), getImageArtifactReleaseVersion(), resultingFileName, signatureFileName)
                 }
             }

From 5b61f2adcf698273fe2805d1e637225c958ad9ca Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Fri, 19 Jul 2024 12:01:34 -0300
Subject: [PATCH 694/709] [10.0.x] NO-ISSUE: Set 10.0.x-YYYYMMDD image tags on
 weekly deploy job (#1783)

* Set 10.0.x-YYYYMMDD image tags on weekly deploy job

* Set 10.0.x-YYYYMMDD image tags on weekly deploy job
---
 .ci/jenkins/Jenkinsfile.weekly.deploy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
index fd03c959b31..abf7109b6de 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -212,7 +212,7 @@ void createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: getDeployImageNamespace()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: getDeployImageNameSuffix()))
             buildParams.add(string(name: 'DEPLOY_IMAGE_TAG', value: getDeployImageTag()))
-            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: isDeployLatestTag()))
+            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: false))
 
             def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
             if (job.result != 'SUCCESS') {
@@ -281,7 +281,7 @@ String getDeployImageNameSuffix() {
     return params.IMAGE_NAME_SUFFIX
 }
 String getDeployImageTag() {
-    return getProjectVersion(false)
+    return getBuildBranch() + "-" + getProjectVersionDate()
 }
 
 boolean isDeployLatestTag() {

From 6911aabff2160562a8fb4e217f7c3da4de2b603f Mon Sep 17 00:00:00 2001
From: Jan Stastny <ststnjn@gmail.com>
Date: Wed, 17 Jul 2024 14:45:26 +0200
Subject: [PATCH 695/709] NO-ISSUE: fix setup-branch cleanWs problem

Co-authored-by: jstastny-cz <jan.stastny@ibm.com>
---
 .ci/jenkins/Jenkinsfile.setup-branch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 5c5e06c85a6..10bcead4147 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -39,7 +39,7 @@ pipeline {
         stage('Initialization') {
             steps {
                 script {
-                    cleanWs()
+                    cleanWs(disableDeferredWipeout: true)
 
                     if (params.DISPLAY_NAME) {
                         currentBuild.displayName = params.DISPLAY_NAME

From cb62445ca7ff6916e742d0ecaa1455b467957c9d Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Wed, 17 Jul 2024 16:23:35 -0300
Subject: [PATCH 696/709] NO-ISSUE: Do not publish images reduced tags

---
 .ci/jenkins/Jenkinsfile.build-image | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index eef73851600..5782b0cf9ae 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -153,12 +153,6 @@ pipeline {
                         latestTag = getTriggeringProjectName().contains('weekly') ? 'weekly-latest' : 'latest'
                         cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag(latestTag), retries)
                     }
-                    try {
-                        String reducedTag = cloud.getReducedTag(getDeployImageTag())
-                        cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag(reducedTag), retries)
-                    } catch (err) {
-                        echo "Reduced tag cannot be applied: ${err}"
-                    }
                 }
             }
         }

From 7d6a8281f9aaf347c94fd8a8c399da2a40967877 Mon Sep 17 00:00:00 2001
From: Jan Stastny <ststnjn@gmail.com>
Date: Fri, 19 Jul 2024 14:58:00 +0200
Subject: [PATCH 697/709] NO-ISSUE: set build branch as a tag

Co-authored-by: jstastny-cz <jan.stastny@ibm.com>
---
 .ci/jenkins/Jenkinsfile.setup-branch | 2 +-
 scripts/manage-kogito-version.py     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 10bcead4147..ade24b15649 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -53,7 +53,7 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getKogitoVersion()} --confirm"
+                        versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getBuildBranch()} --confirm"
                         versionCmd += " --examples-ref nightly-${getBuildBranch()}"
                         if (getKogitoArtifactsVersion()) {
                             versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index 10950d2222d..733d94a7492 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -51,8 +51,8 @@
 
     if args.bump_to:
         # validate if the provided version is valid.
-        # e.g. 1.10.0, 1.0.0-rc1, 999-snapshot or 999-20240101-snapshot
-        pattern = r'(\d+.\d+.)?(\d+$|\d+-rc\d+$|\d+(-\d{8})?-snapshot$)'
+        # e.g. 1.10.0, 10.0.x, 1.0.0-rc1, 999-snapshot or 999-20240101-snapshot
+        pattern = r'(\d+.\d+.)?(x$|\d+$|\d+-rc\d+$|\d+(-\d{8})?-snapshot$)'
         regex = re.compile(pattern, re.IGNORECASE)
         valid = regex.match(args.bump_to)
         examples_ref = ""

From 6dce73d44df5518a4ba69669cce27c8a874187e9 Mon Sep 17 00:00:00 2001
From: Jan Stastny <ststnjn@gmail.com>
Date: Tue, 23 Jul 2024 01:18:15 +0200
Subject: [PATCH 698/709] NO-ISSUE: isolate pr checks between branches

---
 .ci/jenkins/Jenkinsfile.setup-branch | 8 +++++++-
 .ci/jenkins/dsl/jobs.groovy          | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index ade24b15649..e6d5b1027ed 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -103,8 +103,14 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
+                        githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
+                        def mainBranchPrCheckJenkinsfile = '.ci/jenkins/Jenkinsfile'
+                        def newBranchPrCheckJenkinsfile = ".ci/jenkins/Jenkinsfile.pr.${getBuildBranch()}"
+                        if (!isMainBranch() && fileExists(mainBranchPrCheckJenkinsfile)) {
+                            sh "mv ${mainBranchPrCheckJenkinsfile} ${newBranchPrCheckJenkinsfile}"
+                            sh "git add ${newBranchPrCheckJenkinsfile}"
+                        }
                         if (githubscm.isThereAnyChanges()) {
-                            githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
                             githubscm.commitChanges("[${getBuildBranch()}] Update version to ${getKogitoVersion()}")
                             githubscm.pushObject('origin', getBuildBranch(), getGitAuthorPushCredsId())
                         } else {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index c3eb80a0225..526ad31305f 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -64,7 +64,8 @@ void setupPrJob() {
     setupBuildAndTestJob(JobType.PULL_REQUEST)
 
     // Branch Source Plugin multibranchPipelineJob
-    Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile", JobType.PULL_REQUEST.getName())
+    def triggeringJenkinsfileName = Utils.isMainBranch(this) ? "Jenkinsfile" : "Jenkinsfile.pr.${Utils.getGitBranch(this)}"
+    KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/${triggeringJenkinsfileName}", JobType.PULL_REQUEST.getName())
 }
 
 void createSetupBranchJob() {

From 0a9719707bbffec3232b509d26a4e4aa22e9bc4c Mon Sep 17 00:00:00 2001
From: jstastny-cz <jan.stastny@ibm.com>
Date: Tue, 23 Jul 2024 10:03:57 +0200
Subject: [PATCH 699/709] NO-ISSUE: fix env.DISABLE_IMAGES_DEPLOY evaluation

---
 .ci/jenkins/Jenkinsfile.deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 396fa00dc29..0f1dcd5c891 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -364,7 +364,7 @@ List getTestFailedImages() {
 ////////////////////////////////////////////////////////////////////////
 
 boolean isDeployImage() {
-    return !env.DISABLE_IMAGES_DEPLOY
+    return !Boolean.valueOf(env.DISABLE_IMAGES_DEPLOY)
 }
 
 boolean isDeployImageInOpenshiftRegistry() {

From 8358e9e22758b0c913a21c1bcfe4659a6a1dedb8 Mon Sep 17 00:00:00 2001
From: nmirasch <neus.miras@gmail.com>
Date: Tue, 6 Aug 2024 15:03:33 +0200
Subject: [PATCH 700/709] Remove dev-v1 reference from test (#1767)

---
 tests/features/kogito-swf-devmode.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature
index d008dab0060..f257c1579a4 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -133,7 +133,7 @@ Feature: Serverless Workflow devmode images
     Then check that page is served
       | property             | value                                                              |
       | port                 | 8080                                                               |
-      | path                 | /q/dev-v1/org.kie.kogito-addons-quarkus-data-index-inmemory/dataindex |
+      | path                 | /q/dev-ui/org.kie.kogito-addons-quarkus-data-index-inmemory/data-index-graphql-ui |
       | request_method       | GET                                                                |
       | wait                 | 480                                                                |
       | expected_status_code | 200                                                                |

From d1ce6c97b7f6da3f26a44549c82c193e63464bf6 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Fri, 23 Aug 2024 09:11:46 -0300
Subject: [PATCH 701/709] Set image tags = branch name (main) (#1795)

---
 kogito-base-builder-image.yaml                            | 2 +-
 kogito-data-index-ephemeral-image.yaml                    | 2 +-
 kogito-data-index-postgresql-image.yaml                   | 2 +-
 kogito-jit-runner-image.yaml                              | 2 +-
 kogito-jobs-service-allinone-image.yaml                   | 2 +-
 kogito-jobs-service-ephemeral-image.yaml                  | 2 +-
 kogito-jobs-service-postgresql-image.yaml                 | 2 +-
 modules/kogito-custom-truststore/module.yaml              | 2 +-
 modules/kogito-data-index-common/module.yaml              | 2 +-
 modules/kogito-data-index-ephemeral/community/module.yaml | 2 +-
 modules/kogito-data-index-postgresql/module.yaml          | 2 +-
 modules/kogito-dynamic-resources/module.yaml              | 2 +-
 modules/kogito-jit-runner/module.yaml                     | 2 +-
 modules/kogito-jobs-service-all-in-one/module.yaml        | 2 +-
 modules/kogito-jobs-service-common/module.yaml            | 2 +-
 modules/kogito-jobs-service-ephemeral/module.yaml         | 2 +-
 modules/kogito-jobs-service-postgresql/module.yaml        | 2 +-
 modules/kogito-launch-scripts/module.yaml                 | 2 +-
 modules/kogito-logging/module.yaml                        | 2 +-
 modules/kogito-maven/common/module.yaml                   | 2 +-
 modules/kogito-project-versions/module.yaml               | 2 +-
 modules/kogito-system-user/module.yaml                    | 2 +-
 modules/sonataflow/builder/build-config/module.yaml       | 2 +-
 modules/sonataflow/builder/runtime/community/module.yaml  | 2 +-
 modules/sonataflow/common/build/module.yaml               | 2 +-
 modules/sonataflow/common/scripts/module.yaml             | 2 +-
 modules/sonataflow/devmode/build-config/module.yaml       | 2 +-
 modules/sonataflow/devmode/runtime/common/module.yaml     | 2 +-
 modules/sonataflow/devmode/runtime/community/module.yaml  | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index 371fd399a29..955d933e21c 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-base-builder"
-version: "999-SNAPSHOT"
+version: "main"
 from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
 description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !"
 
diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index bdce50eb741..0666b2988b8 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-data-index-ephemeral"
-version: "999-SNAPSHOT"
+version: "main"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
 
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index 9ba9a817fbf..43c87494d8c 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-data-index-postgresql"
-version: "999-SNAPSHOT"
+version: "main"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
 
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 1971fd9b584..b624d9a5435 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-jit-runner"
-version: "999-SNAPSHOT"
+version: "main"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito JIT Runner"
 
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index 9b9c6619a4e..99853944375 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-jobs-service-allinone"
-version: "999-SNAPSHOT"
+version: "main"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
 
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index 7d8b0ca5033..abbdc62803c 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral"
-version: "999-SNAPSHOT"
+version: "main"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito in memory Jobs Service"
 
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index 9d3f357d381..c73c34f3754 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -19,7 +19,7 @@
 schema_version: 1
 
 name: "docker.io/apache/incubator-kie-kogito-jobs-service-postgresql"
-version: "999-SNAPSHOT"
+version: "main"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service based on Postgresql"
 
diff --git a/modules/kogito-custom-truststore/module.yaml b/modules/kogito-custom-truststore/module.yaml
index aa895428b56..a608b6bf988 100644
--- a/modules/kogito-custom-truststore/module.yaml
+++ b/modules/kogito-custom-truststore/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.security.custom.truststores
-version: "999-SNAPSHOT"
+version: "main"
 description: "Adds the capability of configuring a custom Java Truststore to replace the original cacerts"
 
 envs:
diff --git a/modules/kogito-data-index-common/module.yaml b/modules/kogito-data-index-common/module.yaml
index a71ecc59efa..c820da3bd1a 100644
--- a/modules/kogito-data-index-common/module.yaml
+++ b/modules/kogito-data-index-common/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.dataindex.common
-version: "999-SNAPSHOT"
+version: "main"
 description: "Common modules for data-index persistence provider images, any addition that is common must be added in this module"
 
 envs:
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml
index 5a975f60802..935d1582b35 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/modules/kogito-data-index-ephemeral/community/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.dataindex.community.ephemeral
-version: "999-SNAPSHOT"
+version: "main"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml
index d5037af8661..43c9fe6d9e9 100644
--- a/modules/kogito-data-index-postgresql/module.yaml
+++ b/modules/kogito-data-index-postgresql/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.dataindex.postgresql
-version: "999-SNAPSHOT"
+version: "main"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml
index 7699783d876..c4d5726d4ec 100644
--- a/modules/kogito-dynamic-resources/module.yaml
+++ b/modules/kogito-dynamic-resources/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.dynamic.resources
-version: "999-SNAPSHOT"
+version: "main"
 
 description: -| Module retrieved from https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash However it contains a few customizations to fit Kogito needs.
 
diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml
index 9928adf7d15..db1d8ec4666 100644
--- a/modules/kogito-jit-runner/module.yaml
+++ b/modules/kogito-jit-runner/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jit-runner
-version: "999-SNAPSHOT"
+version: "main"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml
index 1ef0ffff538..1963808b63d 100644
--- a/modules/kogito-jobs-service-all-in-one/module.yaml
+++ b/modules/kogito-jobs-service-all-in-one/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jobs.service.allinone
-version: "999-SNAPSHOT"
+version: "main"
 
 artifacts:
   - path: /tmp/build/jobs-service-inmemory-all-in-one
diff --git a/modules/kogito-jobs-service-common/module.yaml b/modules/kogito-jobs-service-common/module.yaml
index 83ad300e86c..9ea6355e8cd 100644
--- a/modules/kogito-jobs-service-common/module.yaml
+++ b/modules/kogito-jobs-service-common/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jobs.service.common
-version: "999-SNAPSHOT"
+version: "main"
 description: "This module needs to be run last, if adding it, add in the last position."
 
 execute:
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml
index 1aeac43518b..b320c789219 100644
--- a/modules/kogito-jobs-service-ephemeral/module.yaml
+++ b/modules/kogito-jobs-service-ephemeral/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jobs.service.ephemeral
-version: "999-SNAPSHOT"
+version: "main"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml
index 95da8e909ff..6bdc6b692cc 100644
--- a/modules/kogito-jobs-service-postgresql/module.yaml
+++ b/modules/kogito-jobs-service-postgresql/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.jobs.service.postgresql
-version: "999-SNAPSHOT"
+version: "main"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
 # called by the Makefile before builds
diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml
index f1f932236c4..e875cf36849 100644
--- a/modules/kogito-launch-scripts/module.yaml
+++ b/modules/kogito-launch-scripts/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.launch.scripts
-version: "999-SNAPSHOT"
+version: "main"
 
 execute:
   - script: configure
diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml
index 119f26c80d3..85c04ff8703 100644
--- a/modules/kogito-logging/module.yaml
+++ b/modules/kogito-logging/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.logging
-version: "999-SNAPSHOT"
+version: "main"
 
 execute:
   - script: configure
diff --git a/modules/kogito-maven/common/module.yaml b/modules/kogito-maven/common/module.yaml
index 0c28db9b277..4d980b42270 100644
--- a/modules/kogito-maven/common/module.yaml
+++ b/modules/kogito-maven/common/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.maven.common
-version: "999-SNAPSHOT"
+version: "main"
 
 envs:
   - name: "MAVEN_VERSION"
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index d92717d232d..0cc8096281d 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.project.versions
-version: "999-SNAPSHOT"
+version: "main"
 description: "Kogito Project versions information"
 
 envs:
diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml
index 75b6ff8aea4..6f9b79ef8d5 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/modules/kogito-system-user/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.system.user
-version: "999-SNAPSHOT"
+version: "main"
 
 execute:
   - script: add-user
diff --git a/modules/sonataflow/builder/build-config/module.yaml b/modules/sonataflow/builder/build-config/module.yaml
index f233d8ca128..b13a31fae23 100644
--- a/modules/sonataflow/builder/build-config/module.yaml
+++ b/modules/sonataflow/builder/build-config/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.swf.builder.build-config
-version: "999-SNAPSHOT"
+version: "main"
 description: "Kogito Serverless Workflow builder image build configuration"
 
 envs:
diff --git a/modules/sonataflow/builder/runtime/community/module.yaml b/modules/sonataflow/builder/runtime/community/module.yaml
index c0f4b06880f..b105bd50e77 100644
--- a/modules/sonataflow/builder/runtime/community/module.yaml
+++ b/modules/sonataflow/builder/runtime/community/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.swf.builder.runtime.community
-version: "999-SNAPSHOT"
+version: "main"
 description: "Kogito Serverless Workflow builder runtime module"
 
 artifacts:
diff --git a/modules/sonataflow/common/build/module.yaml b/modules/sonataflow/common/build/module.yaml
index 84c1dfbe695..5e5f96fe044 100644
--- a/modules/sonataflow/common/build/module.yaml
+++ b/modules/sonataflow/common/build/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.swf.common.build
-version: "999-SNAPSHOT"
+version: "main"
 description: "Kogito Serverless Workflow image build process"
 
 execute:
diff --git a/modules/sonataflow/common/scripts/module.yaml b/modules/sonataflow/common/scripts/module.yaml
index dd90f59eb48..94c07984a1a 100644
--- a/modules/sonataflow/common/scripts/module.yaml
+++ b/modules/sonataflow/common/scripts/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.swf.common.scripts
-version: "999-SNAPSHOT"
+version: "main"
 description: "Kogito Serverless Workflow image common scripts"
 
 envs:
diff --git a/modules/sonataflow/devmode/build-config/module.yaml b/modules/sonataflow/devmode/build-config/module.yaml
index b67edb9bdb7..0804a28ea6d 100644
--- a/modules/sonataflow/devmode/build-config/module.yaml
+++ b/modules/sonataflow/devmode/build-config/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.swf.devmode.build-config
-version: "999-SNAPSHOT"
+version: "main"
 description: "Kogito Serverless Workflow devmode image build configuration"
 
 envs:
diff --git a/modules/sonataflow/devmode/runtime/common/module.yaml b/modules/sonataflow/devmode/runtime/common/module.yaml
index cad1b7061b5..c39b8dde286 100644
--- a/modules/sonataflow/devmode/runtime/common/module.yaml
+++ b/modules/sonataflow/devmode/runtime/common/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.swf.devmode.runtime.common
-version: "999-SNAPSHOT"
+version: "main"
 description: "Kogito Serverless Workflow devmode common module"
 
 execute:
diff --git a/modules/sonataflow/devmode/runtime/community/module.yaml b/modules/sonataflow/devmode/runtime/community/module.yaml
index 9a3ef179d3d..df1f25d9ddb 100644
--- a/modules/sonataflow/devmode/runtime/community/module.yaml
+++ b/modules/sonataflow/devmode/runtime/community/module.yaml
@@ -18,7 +18,7 @@
 #
 schema_version: 1
 name: org.kie.kogito.swf.devmode.runtime.community
-version: "999-SNAPSHOT"
+version: "main"
 description: "Kogito Serverless Workflow devmode with required extensions"
 
 envs:

From 38632d2126a062eeb3a78c920b24e4d024130007 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Mon, 26 Aug 2024 08:07:15 -0300
Subject: [PATCH 702/709] Restrict images deploy only for release jobs (#1796)

---
 .ci/jenkins/dsl/jobs.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 526ad31305f..09827dc0a81 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -117,7 +117,7 @@ void setupDeployJob(JobType jobType) {
 
         QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
 
-        DISABLE_IMAGES_DEPLOY: (jobType==JobType.NIGHTLY) ? true : Utils.isImagesDeployDisabled(this)
+        DISABLE_IMAGES_DEPLOY: (jobType == JobType.RELEASE) ? true : Utils.isImagesDeployDisabled(this)
     ])
     if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
         jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))

From 475225acf4f740cf7848fe2247bf616c9d15cc4e Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Mon, 26 Aug 2024 17:43:06 -0300
Subject: [PATCH 703/709] Fix weekly image tags (#1798)

---
 .ci/jenkins/Jenkinsfile.build-image   |  2 +-
 .ci/jenkins/Jenkinsfile.weekly.deploy | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 5782b0cf9ae..aea006cea81 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -150,7 +150,7 @@ pipeline {
                     int retries = Integer.parseInt(env.MAX_REGISTRY_RETRIES)
                     String imageTag = getBuiltImageTag()
                     if (isDeployLatestTag()) {
-                        latestTag = getTriggeringProjectName().contains('weekly') ? 'weekly-latest' : 'latest'
+                        latestTag = 'latest'
                         cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag(latestTag), retries)
                     }
                 }
diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
index abf7109b6de..fa762daf078 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -126,7 +126,7 @@ pipeline {
         stage('Create and push a new tag') {
             steps {
                 script {
-                    projectVersion = getProjectVersion(false)
+                    projectVersion = getProjectVersion()
                     dir(getRepoName()) {
                         githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
                         githubscm.tagRepository(projectVersion)
@@ -281,11 +281,7 @@ String getDeployImageNameSuffix() {
     return params.IMAGE_NAME_SUFFIX
 }
 String getDeployImageTag() {
-    return getBuildBranch() + "-" + getProjectVersionDate()
-}
-
-boolean isDeployLatestTag() {
-    return params.DEPLOY_WITH_LATEST_TAG
+    return getProjectVersion()
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -346,10 +342,6 @@ String getProjectVersionDate() {
     return projectVersionDate.replace('-', '')
 }
 
-String getProjectVersion(boolean keepSnapshotSuffix = true) {
-    def projectVersion = env.PROJECT_VERSION
-    if (keepSnapshotSuffix) {
-        return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}-SNAPSHOT")
-    }
-    return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}")
+String getProjectVersion() {
+    return env.PROJECT_VERSION + '-' + getProjectVersionDate()
 }

From 69b6c2db9daedc905a059e721e3b481bb63996f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= <tiborzimanyi@ibm.com>
Date: Wed, 4 Sep 2024 23:36:29 +0200
Subject: [PATCH 704/709] Update to Quarkus 3.8.6. (#1801)

---
 kogito-base-builder-image.yaml              | 2 +-
 modules/kogito-project-versions/module.yaml | 2 +-
 scripts/README.md                           | 4 ++--
 tests/features/kogito-swf-common.feature    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index 955d933e21c..ebdb55dab1c 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -31,7 +31,7 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "3.8.4"
+    value: "3.8.6"
   - name: "org.kie.kogito.version"
     value: "999-SNAPSHOT"
   - name: "maintainer"
diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml
index 0cc8096281d..bc3f82808ec 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/modules/kogito-project-versions/module.yaml
@@ -26,5 +26,5 @@ envs:
     value: "999-SNAPSHOT"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "3.8.4"
+    value: "3.8.6"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
diff --git a/scripts/README.md b/scripts/README.md
index 6fcb6ddbe72..17077cf5273 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -177,10 +177,10 @@ This will set the default artifacts version.
 ##### Update quarkus version
 
 ```bash
-$ python update-repository.py --quarkus-platform-version 3.8.4
+$ python update-repository.py --quarkus-platform-version 3.8.6
 ```
 
-This will set the image quarkus version to 3.8.4.
+This will set the image quarkus version to 3.8.6.
 
 ##### Update Examples URI and Ref
 
diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature
index 2474f53a7d4..57dc3f0a56b 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -23,7 +23,7 @@ Feature: Serverless Workflow images common
 
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
-    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.8.4/quarkus-bom-3.8.4.pom should exist
+    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.8.6/quarkus-bom-3.8.6.pom should exist
       And file /home/kogito/.m2/repository/org/apache/kie/sonataflow/sonataflow-quarkus/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes

From 6d694d2bfa8ff6bb764af02a9d6223319653151a Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Tue, 10 Sep 2024 11:13:10 -0300
Subject: [PATCH 705/709] NO-ISSUE: Fix Git tag creation in the weekly deploy
 Jenkins job execution

---
 .ci/jenkins/Jenkinsfile.weekly.deploy | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
index fa762daf078..5ae76b2bb49 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -128,7 +128,13 @@ pipeline {
                 script {
                     projectVersion = getProjectVersion()
                     dir(getRepoName()) {
-                        githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
+                        if (githubscm.isThereAnyChanges()) {
+                            def commitMsg = "[${getBuildBranch()}] Update version to ${projectVersion}"
+                            githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
+                            githubscm.commitChanges(commitMsg, { githubscm.findAndStageNotIgnoredFiles('pom.xml') })
+                        } else {
+                            println '[WARN] no changes to commit'
+                        }
                         githubscm.tagRepository(projectVersion)
                         githubscm.pushRemoteTag('origin', projectVersion, getGitAuthorPushCredsId())
                     }

From c7083c56f730c9102c53de4bed9c19950b5b8ac0 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Mon, 16 Sep 2024 08:44:22 -0300
Subject: [PATCH 706/709] Fix git commit for tag creation on the weekly deploy
 Jenkins job (#1803)

---
 .ci/jenkins/Jenkinsfile.weekly.deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
index 5ae76b2bb49..41b0e21b35d 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -131,7 +131,7 @@ pipeline {
                         if (githubscm.isThereAnyChanges()) {
                             def commitMsg = "[${getBuildBranch()}] Update version to ${projectVersion}"
                             githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
-                            githubscm.commitChanges(commitMsg, { githubscm.findAndStageNotIgnoredFiles('pom.xml') })
+                            githubscm.commitChanges(commitMsg)
                         } else {
                             println '[WARN] no changes to commit'
                         }

From 64ca6c9c730722b04b8f3afd0cfc797a01fed962 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <ricardozanini@gmail.com>
Date: Mon, 23 Sep 2024 15:37:02 -0400
Subject: [PATCH 707/709] Migrate kogito-images to kie-tools package format

Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com>
---
 .asf.yaml                                     |  26 -
 .ci/jenkins/Jenkinsfile                       |  75 ---
 .ci/jenkins/Jenkinsfile.build-and-test        | 168 -----
 .ci/jenkins/Jenkinsfile.build-image           | 463 -------------
 .ci/jenkins/Jenkinsfile.deploy                | 470 -------------
 .ci/jenkins/Jenkinsfile.promote               | 366 ----------
 .ci/jenkins/Jenkinsfile.setup-branch          | 204 ------
 .ci/jenkins/Jenkinsfile.weekly.deploy         | 353 ----------
 .ci/jenkins/dsl/jobs.groovy                   | 399 -----------
 .ci/jenkins/dsl/test.sh                       |  25 -
 .github/CODEOWNERS                            |   5 -
 .github/bot-files/reviewers.yml               |  32 -
 .github/pull_request_template.md              |  56 --
 .github/workflows/jenkins-tests-PR.yml        |  41 --
 .github/workflows/kogito-images-pr-check.yml  |  87 ---
 .github/workflows/pr-backporting.yml          |  59 --
 .gitignore                                    | 334 ++++++++-
 DISCLAIMER                                    |  23 -
 LICENSE                                       | 201 ------
 Makefile                                      | 117 ----
 README.md                                     | 576 ----------------
 RELEASE_NOTES.md                              |  26 -
 container.yaml                                |  25 -
 content_sets.yaml                             |  42 --
 .../container-compose-postgresql.yaml         |  48 --
 contrib/jobs-service/sql/init.sql             |  39 --
 docsimg/kogito.png                            | Bin 33218 -> 0 bytes
 kogito-imagestream.yaml                       | 194 ------
 .../kogito-base-builder-image/env/index.js    |  53 ++
 packages/kogito-base-builder-image/install.js |  64 ++
 .../kogito-base-builder-image/package.json    |  48 ++
 ...cubator-kie-kogito-base-builder-image.yaml |   4 +-
 .../env/index.js                              |  53 ++
 .../install.js                                |  67 ++
 .../package.json                              |  48 ++
 ...kie-kogito-data-index-ephemeral-image.yaml |   4 +-
 .../added/kogito-app-launch.sh                |   0
 .../kogito-data-index-ephemeral}/configure    |   0
 .../kogito-data-index-ephemeral}/module.yaml  |   2 +-
 .../features/kogito-data-index-common.feature |  19 +-
 .../kogito-data-index-ephemeral.feature       |   1 -
 .../env/index.js                              |  53 ++
 .../install.js                                |  67 ++
 .../package.json                              |  48 ++
 ...ie-kogito-data-index-postgresql-image.yaml |   5 +-
 .../added/kogito-app-launch.sh                |   0
 .../kogito-data-index-postgresql/configure    |   0
 .../kogito-data-index-postgresql/module.yaml  |   0
 .../kogito-common-postresql-services.feature  |   0
 .../kogito-data-index-common.feature          |   1 -
 .../kogito-data-index-postgresql.feature      |   0
 packages/kogito-jit-runner-image/env/index.js |  53 ++
 packages/kogito-jit-runner-image/install.js   |  64 ++
 packages/kogito-jit-runner-image/package.json |  48 ++
 ...incubator-kie-kogito-jit-runner-image.yaml |   2 +-
 .../added/kogito-app-launch.sh                |   0
 .../modules}/kogito-jit-runner/configure      |   0
 .../modules}/kogito-jit-runner/module.yaml    |   0
 .../tests}/features/kogito-jit-runner.feature |   0
 .../env/index.js                              |  53 ++
 .../install.js                                |  67 ++
 .../package.json                              |  48 ++
 ...ie-kogito-jobs-service-allinone-image.yaml |   4 +-
 .../added/kogito-app-launch.sh                |   0
 .../kogito-jobs-service-all-in-one/configure  |   0
 .../module.yaml                               |   0
 .../kogito-jobs-service-all-in-one.feature    |   0
 .../kogito-jobs-service-common.feature        |  31 +
 .../env/index.js                              |  53 ++
 .../install.js                                |  67 ++
 .../package.json                              |  48 ++
 ...e-kogito-jobs-service-ephemeral-image.yaml |   2 +-
 .../modules}/added/kogito-app-launch.sh       |   0
 .../resources/modules}/configure              |   0
 .../resources/modules}/module.yaml            |   0
 .../kogito-jobs-service-common.feature        |   4 +-
 .../kogito-jobs-service-ephemeral.feature     |   0
 .../env/index.js                              |  53 ++
 .../install.js                                |  67 ++
 .../package.json                              |  48 ++
 ...-kogito-jobs-service-postgresql-image.yaml |   2 +-
 .../added/kogito-app-launch.sh                |   0
 .../kogito-jobs-service-postgresql/configure  |   0
 .../module.yaml                               |   0
 .../kogito-jobs-service-common.feature        |  23 +-
 .../kogito-jobs-service-postgresql.feature    |   0
 packages/sonataflow-builder-image/.gitignore  |   1 +
 packages/sonataflow-builder-image/README.md   | 104 +++
 .../sonataflow-builder-image/env/index.js     |  53 ++
 packages/sonataflow-builder-image/install.js  |  73 ++
 .../sonataflow-builder-image/package.json     |  54 ++
 ...ncubator-kie-sonataflow-builder-image.yaml |  74 ++
 .../builder/build-config/module.yaml          |   6 +-
 .../builder/runtime/community/configure.sh    |   4 +-
 .../builder/runtime/community/module.yaml     |   8 +-
 .../bats/sonataflow-builder-build-app.bats    |  10 +-
 .../features/sonataflow-builder-2.feature     |  22 +-
 .../tests/features/sonataflow-builder.feature |  19 -
 .../sonataflow-builder/.vscode/launch.json    |  22 +
 .../sonataflow-builder/.vscode/settings.json  |  13 +
 .../greet-with-inputschema/Dockerfile         |  22 +-
 .../greet-with-inputschema/greet.sw.json      |   2 +-
 .../greet-with-inputschema/schemas/input.json |   7 +-
 .../resources/greet/Dockerfile                |  22 +-
 .../resources/greet/greet.sw.json             |   0
 .../sonataflow-builder/src/RunTests.java      |   0
 packages/sonataflow-devmode-image/README.md   | 104 +++
 .../sonataflow-devmode-image/env/index.js     |  59 ++
 packages/sonataflow-devmode-image/install.js  |  64 ++
 .../sonataflow-devmode-image/package.json     |  50 ++
 ...ncubator-kie-sonataflow-devmode-image.yaml |  85 +++
 .../sonataflow/devmode/build-config/configure |  20 +-
 .../devmode/build-config/module.yaml          |  15 +-
 .../runtime/common/added/run-app-devmode.sh   |   0
 .../devmode/runtime/common/configure.sh       |   0
 .../devmode/runtime/common/module.yaml        |   2 +-
 .../devmode/runtime/community/configure.sh    |   4 +-
 .../devmode/runtime/community/module.yaml     |   6 +-
 .../features/sonataflow-devmode-2.feature     |  14 +
 .../tests/features/sonataflow-devmode.feature |  45 +-
 .../sonataflow-devmode/.vscode/launch.json    |  22 +
 .../sonataflow-devmode/.vscode/settings.json  |  13 +
 .../resources/greet.sw.json                   |   0
 .../sonataflow-devmode/src/RunTests.java      |  34 +-
 packages/sonataflow-image-common/.gitignore   |   2 +
 packages/sonataflow-image-common/README.md    |  83 +++
 packages/sonataflow-image-common/env/index.js |  27 +
 packages/sonataflow-image-common/install.js   |  40 ++
 packages/sonataflow-image-common/package.json |  36 +
 .../resources/Makefile                        |  85 +++
 .../kogito-custom-truststore/README.md        |   2 +-
 .../added/configure-custom-truststore.sh      |   0
 .../kogito-custom-truststore/configure        |   0
 .../kogito-custom-truststore/module.yaml      |   0
 .../tests/bats/kogito-custom-truststore.bats  |   9 +-
 .../added/kogito-data-index-common.sh         |   1 +
 .../kogito-data-index-common/configure        |   0
 .../kogito-data-index-common/module.yaml      |   0
 .../tests/bats/kogito-data-index-common.bats  |  12 +-
 .../added/container-limits                    |   0
 .../added/debug-options                       |   0
 .../added/java-default-options                |   0
 .../kogito-dynamic-resources/configure        |   0
 .../kogito-dynamic-resources/module.yaml      |   0
 .../bats/sonataflow-builder-jvm-settings.bats |   6 +-
 .../launch/kogito-jobs-service-common.sh      |   0
 .../kogito-jobs-service-common/configure      |   0
 .../kogito-jobs-service-common/module.yaml    |   0
 .../bats/kogito-jobs-service-common.bats      |   0
 .../kogito-launch-scripts/added/configure.sh  |   0
 .../modules}/kogito-launch-scripts/configure  |   0
 .../kogito-launch-scripts/module.yaml         |   0
 .../modules}/kogito-logging/added/logging.sh  |   0
 .../modules}/kogito-logging/configure         |   0
 .../modules}/kogito-logging/module.yaml       |   0
 .../common/added/configure-maven.sh           |   0
 .../modules}/kogito-maven/common/configure    |   0
 .../kogito-maven/common/maven/settings.xml    |  30 +-
 .../modules}/kogito-maven/common/module.yaml  |   2 +-
 .../tests/bats/maven-settings.bats            |   0
 .../kogito-project-versions/module.yaml       |   7 +-
 .../modules}/kogito-system-user/add-user      |   0
 .../modules}/kogito-system-user/module.yaml   |   1 -
 .../common/build/added/cleanup_project.sh     |   0
 .../common/build/added/zip_files.sh           |   8 +-
 .../sonataflow/common/build/configure.sh      |   0
 .../sonataflow/common/build/module.yaml       |   2 +-
 .../common/scripts/added/add-extension.sh     |   0
 .../common/scripts/added/build-app.sh         |   0
 .../common/scripts/added/configure-jvm-mvn.sh |   0
 .../common/scripts/added/create-app.sh        |   7 +-
 .../common/scripts/added/jvm-settings.sh      |   0
 .../sonataflow/common/scripts/configure.sh    |   0
 .../sonataflow/common/scripts/module.yaml     |   4 +-
 .../resources/scripts/README.md               |  72 ++
 .../scripts}/build-kogito-apps-components.sh  |  22 +-
 .../resources/scripts/common.py               | 304 +++++++++
 .../resources/scripts/install_bats.sh         |  10 +-
 .../resources/scripts}/retrieve_version.py    |   8 +-
 .../resources/scripts/run-bats.sh             |  16 +-
 .../resources/scripts}/setup-maven.sh         |   0
 .../resources/scripts/versions_manager.py     |  52 ++
 .../resources/tests/shell/README.md           |  36 +
 .../resources/tests}/shell/run.sh             |   0
 scripts/README.md                             | 191 ------
 scripts/common.py                             | 631 ------------------
 scripts/list-images.py                        |  55 --
 scripts/manage-kogito-version.py              |  90 ---
 scripts/push-local-registry.sh                |  49 --
 scripts/push-staging.py                       | 161 -----
 scripts/update-repository.py                  |  90 ---
 .../features/common-custom-truststore.feature |  35 -
 .../features/common-dynamic-resources.feature |  71 --
 tests/shell/README.md                         |  40 --
 .../sonataflow-builder/.vscode/launch.json    |  22 -
 .../sonataflow-builder/.vscode/settings.json  |  18 -
 .../greet-with-inputschema/.mvn/jvm.config    |   1 -
 .../resources/greet/.mvn/jvm.config           |   1 -
 .../sonataflow-devmode/.vscode/launch.json    |  22 -
 .../sonataflow-devmode/.vscode/settings.json  |  18 -
 tests/test-apps/application.properties        |  20 -
 tests/test-apps/clone-repo.sh                 |  93 ---
 202 files changed, 3246 insertions(+), 6027 deletions(-)
 delete mode 100644 .asf.yaml
 delete mode 100644 .ci/jenkins/Jenkinsfile
 delete mode 100644 .ci/jenkins/Jenkinsfile.build-and-test
 delete mode 100644 .ci/jenkins/Jenkinsfile.build-image
 delete mode 100644 .ci/jenkins/Jenkinsfile.deploy
 delete mode 100644 .ci/jenkins/Jenkinsfile.promote
 delete mode 100644 .ci/jenkins/Jenkinsfile.setup-branch
 delete mode 100644 .ci/jenkins/Jenkinsfile.weekly.deploy
 delete mode 100644 .ci/jenkins/dsl/jobs.groovy
 delete mode 100755 .ci/jenkins/dsl/test.sh
 delete mode 100644 .github/CODEOWNERS
 delete mode 100644 .github/bot-files/reviewers.yml
 delete mode 100644 .github/pull_request_template.md
 delete mode 100644 .github/workflows/jenkins-tests-PR.yml
 delete mode 100644 .github/workflows/kogito-images-pr-check.yml
 delete mode 100644 .github/workflows/pr-backporting.yml
 delete mode 100644 DISCLAIMER
 delete mode 100644 LICENSE
 delete mode 100644 Makefile
 delete mode 100644 README.md
 delete mode 100644 RELEASE_NOTES.md
 delete mode 100644 container.yaml
 delete mode 100644 content_sets.yaml
 delete mode 100644 contrib/jobs-service/container-compose-postgresql.yaml
 delete mode 100644 contrib/jobs-service/sql/init.sql
 delete mode 100644 docsimg/kogito.png
 delete mode 100644 kogito-imagestream.yaml
 create mode 100644 packages/kogito-base-builder-image/env/index.js
 create mode 100644 packages/kogito-base-builder-image/install.js
 create mode 100644 packages/kogito-base-builder-image/package.json
 rename kogito-base-builder-image.yaml => packages/kogito-base-builder-image/resources/incubator-kie-kogito-base-builder-image.yaml (95%)
 create mode 100644 packages/kogito-data-index-ephemeral-image/env/index.js
 create mode 100644 packages/kogito-data-index-ephemeral-image/install.js
 create mode 100644 packages/kogito-data-index-ephemeral-image/package.json
 rename kogito-data-index-ephemeral-image.yaml => packages/kogito-data-index-ephemeral-image/resources/incubator-kie-kogito-data-index-ephemeral-image.yaml (96%)
 rename {modules/kogito-data-index-ephemeral/community => packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral}/added/kogito-app-launch.sh (100%)
 rename {modules/kogito-data-index-ephemeral/community => packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral}/configure (100%)
 rename {modules/kogito-data-index-ephemeral/community => packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral}/module.yaml (95%)
 rename tests/features/supporting-services-common.feature => packages/kogito-data-index-ephemeral-image/test-resources/tests/features/kogito-data-index-common.feature (52%)
 rename {tests/features/data-index => packages/kogito-data-index-ephemeral-image/test-resources/tests/features}/kogito-data-index-ephemeral.feature (99%)
 create mode 100644 packages/kogito-data-index-postgresql-image/env/index.js
 create mode 100644 packages/kogito-data-index-postgresql-image/install.js
 create mode 100644 packages/kogito-data-index-postgresql-image/package.json
 rename kogito-data-index-postgresql-image.yaml => packages/kogito-data-index-postgresql-image/resources/incubator-kie-kogito-data-index-postgresql-image.yaml (94%)
 rename {modules => packages/kogito-data-index-postgresql-image/resources/modules}/kogito-data-index-postgresql/added/kogito-app-launch.sh (100%)
 rename {modules => packages/kogito-data-index-postgresql-image/resources/modules}/kogito-data-index-postgresql/configure (100%)
 rename {modules => packages/kogito-data-index-postgresql-image/resources/modules}/kogito-data-index-postgresql/module.yaml (100%)
 rename {tests => packages/kogito-data-index-postgresql-image/test-resources/tests}/features/kogito-common-postresql-services.feature (100%)
 rename {tests/features/data-index => packages/kogito-data-index-postgresql-image/test-resources/tests/features}/kogito-data-index-common.feature (96%)
 rename {tests/features/data-index => packages/kogito-data-index-postgresql-image/test-resources/tests/features}/kogito-data-index-postgresql.feature (100%)
 create mode 100644 packages/kogito-jit-runner-image/env/index.js
 create mode 100644 packages/kogito-jit-runner-image/install.js
 create mode 100644 packages/kogito-jit-runner-image/package.json
 rename kogito-jit-runner-image.yaml => packages/kogito-jit-runner-image/resources/incubator-kie-kogito-jit-runner-image.yaml (97%)
 rename {modules => packages/kogito-jit-runner-image/resources/modules}/kogito-jit-runner/added/kogito-app-launch.sh (100%)
 rename {modules => packages/kogito-jit-runner-image/resources/modules}/kogito-jit-runner/configure (100%)
 rename {modules => packages/kogito-jit-runner-image/resources/modules}/kogito-jit-runner/module.yaml (100%)
 rename {tests => packages/kogito-jit-runner-image/test-resources/tests}/features/kogito-jit-runner.feature (100%)
 create mode 100644 packages/kogito-jobs-service-allinone-image/env/index.js
 create mode 100644 packages/kogito-jobs-service-allinone-image/install.js
 create mode 100644 packages/kogito-jobs-service-allinone-image/package.json
 rename kogito-jobs-service-allinone-image.yaml => packages/kogito-jobs-service-allinone-image/resources/incubator-kie-kogito-jobs-service-allinone-image.yaml (95%)
 rename {modules => packages/kogito-jobs-service-allinone-image/resources/modules}/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh (100%)
 rename {modules => packages/kogito-jobs-service-allinone-image/resources/modules}/kogito-jobs-service-all-in-one/configure (100%)
 rename {modules => packages/kogito-jobs-service-allinone-image/resources/modules}/kogito-jobs-service-all-in-one/module.yaml (100%)
 rename {tests/features/jobs-service => packages/kogito-jobs-service-allinone-image/test-resources/tests/features}/kogito-jobs-service-all-in-one.feature (100%)
 create mode 100644 packages/kogito-jobs-service-allinone-image/test-resources/tests/features/kogito-jobs-service-common.feature
 create mode 100644 packages/kogito-jobs-service-ephemeral-image/env/index.js
 create mode 100644 packages/kogito-jobs-service-ephemeral-image/install.js
 create mode 100644 packages/kogito-jobs-service-ephemeral-image/package.json
 rename kogito-jobs-service-ephemeral-image.yaml => packages/kogito-jobs-service-ephemeral-image/resources/incubator-kie-kogito-jobs-service-ephemeral-image.yaml (97%)
 rename {modules/kogito-jobs-service-ephemeral => packages/kogito-jobs-service-ephemeral-image/resources/modules}/added/kogito-app-launch.sh (100%)
 rename {modules/kogito-jobs-service-ephemeral => packages/kogito-jobs-service-ephemeral-image/resources/modules}/configure (100%)
 rename {modules/kogito-jobs-service-ephemeral => packages/kogito-jobs-service-ephemeral-image/resources/modules}/module.yaml (100%)
 rename {tests/features/jobs-service => packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features}/kogito-jobs-service-common.feature (92%)
 rename {tests/features/jobs-service => packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features}/kogito-jobs-service-ephemeral.feature (100%)
 create mode 100644 packages/kogito-jobs-service-postgresql-image/env/index.js
 create mode 100644 packages/kogito-jobs-service-postgresql-image/install.js
 create mode 100644 packages/kogito-jobs-service-postgresql-image/package.json
 rename kogito-jobs-service-postgresql-image.yaml => packages/kogito-jobs-service-postgresql-image/resources/incubator-kie-kogito-jobs-service-postgresql-image.yaml (97%)
 rename {modules => packages/kogito-jobs-service-postgresql-image/resources/modules}/kogito-jobs-service-postgresql/added/kogito-app-launch.sh (100%)
 rename {modules => packages/kogito-jobs-service-postgresql-image/resources/modules}/kogito-jobs-service-postgresql/configure (100%)
 rename {modules => packages/kogito-jobs-service-postgresql-image/resources/modules}/kogito-jobs-service-postgresql/module.yaml (100%)
 rename tests/features/common.feature => packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-common.feature (52%)
 rename {tests/features/jobs-service => packages/kogito-jobs-service-postgresql-image/test-resources/tests/features}/kogito-jobs-service-postgresql.feature (100%)
 create mode 100644 packages/sonataflow-builder-image/.gitignore
 create mode 100644 packages/sonataflow-builder-image/README.md
 create mode 100644 packages/sonataflow-builder-image/env/index.js
 create mode 100644 packages/sonataflow-builder-image/install.js
 create mode 100644 packages/sonataflow-builder-image/package.json
 create mode 100644 packages/sonataflow-builder-image/resources/incubator-kie-sonataflow-builder-image.yaml
 rename {modules => packages/sonataflow-builder-image/resources/modules}/sonataflow/builder/build-config/module.yaml (84%)
 rename {modules => packages/sonataflow-builder-image/resources/modules}/sonataflow/builder/runtime/community/configure.sh (89%)
 rename {modules => packages/sonataflow-builder-image/resources/modules}/sonataflow/builder/runtime/community/module.yaml (79%)
 rename {modules/sonataflow/common/scripts => packages/sonataflow-builder-image/resources/modules/sonataflow/builder}/tests/bats/sonataflow-builder-build-app.bats (78%)
 rename tests/features/kogito-swf-common.feature => packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder-2.feature (50%)
 rename tests/features/kogito-swf-builder.feature => packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder.feature (75%)
 create mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/launch.json
 create mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/settings.json
 rename {tests => packages/sonataflow-builder-image/test-resources/tests}/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile (65%)
 rename {tests => packages/sonataflow-builder-image/test-resources/tests}/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json (99%)
 rename {tests => packages/sonataflow-builder-image/test-resources/tests}/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json (80%)
 rename {tests => packages/sonataflow-builder-image/test-resources/tests}/shell/sonataflow-builder/resources/greet/Dockerfile (65%)
 rename {tests => packages/sonataflow-builder-image/test-resources/tests}/shell/sonataflow-builder/resources/greet/greet.sw.json (100%)
 rename {tests => packages/sonataflow-builder-image/test-resources/tests}/shell/sonataflow-builder/src/RunTests.java (100%)
 create mode 100644 packages/sonataflow-devmode-image/README.md
 create mode 100644 packages/sonataflow-devmode-image/env/index.js
 create mode 100644 packages/sonataflow-devmode-image/install.js
 create mode 100644 packages/sonataflow-devmode-image/package.json
 create mode 100644 packages/sonataflow-devmode-image/resources/incubator-kie-sonataflow-devmode-image.yaml
 rename .github/bot-files/comments.yml => packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure (52%)
 rename {modules => packages/sonataflow-devmode-image/resources/modules}/sonataflow/devmode/build-config/module.yaml (62%)
 rename {modules => packages/sonataflow-devmode-image/resources/modules}/sonataflow/devmode/runtime/common/added/run-app-devmode.sh (100%)
 rename {modules => packages/sonataflow-devmode-image/resources/modules}/sonataflow/devmode/runtime/common/configure.sh (100%)
 rename {modules => packages/sonataflow-devmode-image/resources/modules}/sonataflow/devmode/runtime/common/module.yaml (95%)
 rename {modules => packages/sonataflow-devmode-image/resources/modules}/sonataflow/devmode/runtime/community/configure.sh (90%)
 rename {modules => packages/sonataflow-devmode-image/resources/modules}/sonataflow/devmode/runtime/community/module.yaml (92%)
 create mode 100644 packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode-2.feature
 rename tests/features/kogito-swf-devmode.feature => packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode.feature (86%)
 create mode 100644 packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/launch.json
 create mode 100644 packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/settings.json
 rename {tests => packages/sonataflow-devmode-image/test-resources/tests}/shell/sonataflow-devmode/resources/greet.sw.json (100%)
 rename {tests => packages/sonataflow-devmode-image/test-resources/tests}/shell/sonataflow-devmode/src/RunTests.java (80%)
 create mode 100644 packages/sonataflow-image-common/.gitignore
 create mode 100644 packages/sonataflow-image-common/README.md
 create mode 100644 packages/sonataflow-image-common/env/index.js
 create mode 100644 packages/sonataflow-image-common/install.js
 create mode 100644 packages/sonataflow-image-common/package.json
 create mode 100644 packages/sonataflow-image-common/resources/Makefile
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-custom-truststore/README.md (96%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-custom-truststore/added/configure-custom-truststore.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-custom-truststore/configure (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-custom-truststore/module.yaml (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats (97%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-data-index-common/added/kogito-data-index-common.sh (99%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-data-index-common/configure (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-data-index-common/module.yaml (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-data-index-common/tests/bats/kogito-data-index-common.bats (92%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-dynamic-resources/added/container-limits (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-dynamic-resources/added/debug-options (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-dynamic-resources/added/java-default-options (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-dynamic-resources/configure (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-dynamic-resources/module.yaml (100%)
 rename {modules/sonataflow/common/scripts => packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources}/tests/bats/sonataflow-builder-jvm-settings.bats (88%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-jobs-service-common/configure (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-jobs-service-common/module.yaml (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-launch-scripts/added/configure.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-launch-scripts/configure (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-launch-scripts/module.yaml (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-logging/added/logging.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-logging/configure (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-logging/module.yaml (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-maven/common/added/configure-maven.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-maven/common/configure (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-maven/common/maven/settings.xml (62%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-maven/common/module.yaml (99%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-maven/tests/bats/maven-settings.bats (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-project-versions/module.yaml (78%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-system-user/add-user (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/kogito-system-user/module.yaml (99%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/build/added/cleanup_project.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/build/added/zip_files.sh (83%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/build/configure.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/build/module.yaml (96%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/scripts/added/add-extension.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/scripts/added/build-app.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/scripts/added/configure-jvm-mvn.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/scripts/added/create-app.sh (97%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/scripts/added/jvm-settings.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/scripts/configure.sh (100%)
 rename {modules => packages/sonataflow-image-common/resources/modules}/sonataflow/common/scripts/module.yaml (93%)
 create mode 100644 packages/sonataflow-image-common/resources/scripts/README.md
 rename {scripts => packages/sonataflow-image-common/resources/scripts}/build-kogito-apps-components.sh (86%)
 create mode 100644 packages/sonataflow-image-common/resources/scripts/common.py
 rename scripts/run-bats.sh => packages/sonataflow-image-common/resources/scripts/install_bats.sh (72%)
 rename {scripts => packages/sonataflow-image-common/resources/scripts}/retrieve_version.py (87%)
 rename .github/bot-files/labels.yml => packages/sonataflow-image-common/resources/scripts/run-bats.sh (73%)
 mode change 100644 => 100755
 rename {scripts => packages/sonataflow-image-common/resources/scripts}/setup-maven.sh (100%)
 create mode 100644 packages/sonataflow-image-common/resources/scripts/versions_manager.py
 create mode 100644 packages/sonataflow-image-common/resources/tests/shell/README.md
 rename {tests => packages/sonataflow-image-common/resources/tests}/shell/run.sh (100%)
 delete mode 100644 scripts/README.md
 delete mode 100644 scripts/common.py
 delete mode 100644 scripts/list-images.py
 delete mode 100644 scripts/manage-kogito-version.py
 delete mode 100644 scripts/push-local-registry.sh
 delete mode 100644 scripts/push-staging.py
 delete mode 100644 scripts/update-repository.py
 delete mode 100644 tests/features/common-custom-truststore.feature
 delete mode 100644 tests/features/common-dynamic-resources.feature
 delete mode 100644 tests/shell/README.md
 delete mode 100644 tests/shell/sonataflow-builder/.vscode/launch.json
 delete mode 100644 tests/shell/sonataflow-builder/.vscode/settings.json
 delete mode 100644 tests/shell/sonataflow-builder/resources/greet-with-inputschema/.mvn/jvm.config
 delete mode 100644 tests/shell/sonataflow-builder/resources/greet/.mvn/jvm.config
 delete mode 100644 tests/shell/sonataflow-devmode/.vscode/launch.json
 delete mode 100644 tests/shell/sonataflow-devmode/.vscode/settings.json
 delete mode 100644 tests/test-apps/application.properties
 delete mode 100755 tests/test-apps/clone-repo.sh

diff --git a/.asf.yaml b/.asf.yaml
deleted file mode 100644
index 4a7211326a3..00000000000
--- a/.asf.yaml
+++ /dev/null
@@ -1,26 +0,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.
-#
-github:
-  features:
-    issues: true
-  protected_branches:
-    main:
-      required_pull_request_reviews:
-        require_code_owner_reviews: true
-        required_approving_review_count: 1
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
deleted file mode 100644
index 5780e5cc5eb..00000000000
--- a/.ci/jenkins/Jenkinsfile
+++ /dev/null
@@ -1,75 +0,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.
- */
-@Library('jenkins-pipeline-shared-libraries')_
-
-pipeline {
-    agent {
-        label util.avoidFaultyNodes('ubuntu')
-    }
-    options {
-        timeout(time: 240, unit: 'MINUTES')
-        disableConcurrentBuilds(abortPrevious: true)
-        skipDefaultCheckout()
-    }
-    stages {
-        stage("Invoke build-and-test") {
-            steps {
-                script {
-                    sh 'printenv'
-                    List buildParams = []
-                    buildParams.add(string(name: 'DISPLAY_NAME', value: "PR #${CHANGE_ID}: ${CHANGE_URL}"))
-                    buildParams.add(string(name: 'CHANGE_ID', value: CHANGE_ID))
-                    buildParams.add(string(name: 'CHANGE_URL', value: CHANGE_URL))
-                    buildParams.add(string(name: 'SOURCE_REPOSITORY', value: getChangeRepository()))
-                    buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
-                    buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
-                    buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
-                    buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
-                    // Keep executing so we can cancel all if needed
-                    def job = build(job: "../kogito-images.build-and-test", wait: true, parameters: buildParams, propagate: false)
-                    if (job.result != 'SUCCESS') {
-                        if (job.result == 'UNSTABLE') {
-                            unstable("Tests on images seems to have failed: ${job.absoluteUrl}")
-                        } else {
-                            error("Error building images. Please check the logs of the job: ${job.absoluteUrl}")
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-String getChangeAuthor() {
-    return pullrequest.getAuthorAndRepoForPr().split('/')[0]
-}
-
-String getChangeRepository() {
-    return pullrequest.getAuthorAndRepoForPr().split('/')[1]
-}
-
-String getChangeBranch() {
-    return CHANGE_BRANCH
-}
-
-String getChangeTarget() {
-    return CHANGE_TARGET
-}
-
-String getGitAuthorCredentialsId() {
-    return env.AUTHOR_CREDS_ID
-}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
deleted file mode 100644
index f673d3dacad..00000000000
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ /dev/null
@@ -1,168 +0,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.
- */
-@Library('jenkins-pipeline-shared-libraries')_
-
-pipeline {
-    agent {
-        docker { 
-            image env.AGENT_DOCKER_BUILDER_IMAGE
-            args env.AGENT_DOCKER_BUILDER_ARGS
-            label util.avoidFaultyNodes()
-        }
-    }
-    options {
-        timeout(time: 240, unit: 'MINUTES')
-        skipDefaultCheckout()
-    }
-    stages {
-        stage('Initialization') {
-            steps {
-                script {
-                    util.waitForDocker()
-                    sh 'printenv'
-                    
-                    dir(getRepoName()) {
-                        // TODO Test pupose
-                        deleteDir()
-                        if (getTargetBranch()) {
-                            echo 'Got a target branch ... Trying to merge the source with the target'
-                            githubscm.checkoutIfExists(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getTargetBranch(), true, [ token: getGitAuthorTokenCredentialsId(), usernamePassword: getGitAuthorCredentialsId() ])
-                            githubscm.prepareCommitStatusInformationForPullRequest(getSourceRepository(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getGitAuthorCredentialsId())
-                        } else {
-                            echo 'No target branch ... Checking out simply'
-                            githubscm.checkout(githubscm.resolveRepository(getSourceRepository(), getSourceAuthor(), getSourceBranch(), false, getGitAuthorCredentialsId()))
-                            githubscm.prepareCommitStatusInformation(getSourceRepository(), getSourceAuthor(), getSourceBranch(), getGitAuthorCredentialsId())
-                        }
-                    }
-                }
-            }
-        }
-        stage('Validate CeKit Image and Modules descriptors') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        sh '''
-                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
-                            tar -xzvf cekit-image-validator-runner.tgz
-                            chmod +x cekit-image-validator-runner
-                        '''
-                        sh './cekit-image-validator-runner modules/'
-                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
-                    }
-                }
-            }
-        }
-        stage('Build & Test Images') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        parallelStages = [:]
-                        for(String image : getImages()){
-                            parallelStages[image] = createBuildAndTestStageClosure(image)
-                        }
-                        parallel parallelStages
-                    }
-                }
-            }
-        }
-    }
-    post {
-        unsuccessful {
-            script {
-                pullrequest.postComment(util.getMarkdownTestSummary('PR', '', "${BUILD_URL}", 'GITHUB'))
-            }
-        }
-    }
-}
-
-Closure createBuildAndTestStageClosure(String image) {
-    return {
-        stage("Build&Test ${image}") {
-            List buildParams = []
-            buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${getChangeId()} - ${image}: ${getChangeUrl()}"))
-            buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
-            buildParams.add(string(name: 'SOURCE_AUTHOR', value: getSourceAuthor()))
-            buildParams.add(string(name: 'SOURCE_REPOSITORY', value: getSourceRepository()))
-            buildParams.add(string(name: 'SOURCE_BRANCH', value: getSourceBranch()))
-            buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
-            buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
-
-            githubscm.updateGithubCommitStatus(image, 'PENDING', 'Queued', getRepoName())
-
-            // Keep executing so we can cancel all if needed
-            def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
-            if (job.result != 'SUCCESS') {
-                if (job.result == 'UNSTABLE') {
-                    unstable("Tests on ${image} seems to have failed")
-                } else {
-                    error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
-                }
-            }
-        }
-    }
-}
-
-String[] getImages() {
-    if (env.IMAGES_LIST) {
-        return env.IMAGES_LIST.split(',')
-    }
-    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
-}
-
-String getSourceAuthor() {
-    return params.SOURCE_AUTHOR
-}
-
-String getSourceBranch() {
-    return params.SOURCE_BRANCH
-}
-
-String getSourceRepository() {
-    return params.SOURCE_REPOSITORY
-}
-
-String getChangeTarget() {
-    return params.TARGET_BRANCH
-}
-
-String getChangeId() {
-    return params.CHANGE_ID
-}
-
-String getChangeUrl() {
-    return params.CHANGE_URL
-}
-
-String getRepoName() {
-    return env.REPO_NAME
-}
-
-String getTargetAuthor() {
-    return env.TARGET_AUTHOR
-}
-
-String getTargetBranch() {
-    return params.TARGET_BRANCH
-}
-
-String getGitAuthorCredentialsId() {
-    return env.GIT_AUTHOR_CREDS_ID
-}
-
-String getGitAuthorTokenCredentialsId() {
-    return env.GIT_AUTHOR_TOKEN_CREDS_ID
-}
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
deleted file mode 100644
index aea006cea81..00000000000
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ /dev/null
@@ -1,463 +0,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.
- */
-@Library('jenkins-pipeline-shared-libraries')_
-
-pipeline {
-    agent {
-        docker {
-            image env.AGENT_DOCKER_BUILDER_IMAGE
-            args env.AGENT_DOCKER_BUILDER_ARGS
-            label util.avoidFaultyNodes()
-            alwaysPull true
-        }
-    }
-    options {
-        timeout(time: 150, unit: 'MINUTES')
-        skipDefaultCheckout()
-    }
-    environment {
-        // Linked to node label
-        // Use docker due to multiplatform build
-        CONTAINER_ENGINE = 'docker'
-        CONTAINER_ENGINE_TLS_OPTIONS = ''
-
-        OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
-
-        IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64'
-    }
-    stages {
-        stage('Initialization') {
-            steps {
-                script {
-                    util.waitForDocker()
-                    sh 'printenv'
-
-                    assert getBuildImageName() : 'Please provide `BUILD_IMAGE_NAME` parameter'
-                    currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
-
-                    if (getTargetBranch()) {
-                        echo 'Got a target branch ... Trying to merge the source with the target'
-                        githubscm.checkoutIfExists(getRepoName(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getTargetBranch(), true, [ token: getGitAuthorTokenCredentialsId(), usernamePassword: getGitAuthorCredentialsId() ])
-                        githubscm.prepareCommitStatusInformationForPullRequest(getSourceRepository(), getSourceAuthor(), getSourceBranch(), getTargetAuthor(), getGitAuthorCredentialsId())
-                    } else {
-                        echo 'No target branch ... Checking out simply'
-                        checkout(githubscm.resolveRepository(getSourceRepository(), getSourceAuthor(), getSourceBranch(), false, getGitAuthorCredentialsId()))
-                        githubscm.prepareCommitStatusInformation(getSourceRepository(), getSourceAuthor(), getSourceBranch(), getGitAuthorCredentialsId())
-                    }
-                    githubscm.setUserConfig('robot', 'kie.apache.org', true)
-                    updateGithubCommitStatus('PENDING', 'Started')
-
-                    // Login to final registry if deploy is needed
-                    if (shouldDeployImage()) {
-                        if (isDeployImageInOpenshiftRegistry()) {
-                            cloud.loginOpenShift(getOpenShiftAPI(), env.OPENSHIFT_CREDS_KEY)
-                            cloud.loginOpenshiftRegistry(env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
-                        } else if (getDeployImageRegistryUserCredentialsId() && getDeployImageRegistryTokenCredentialsId()) {
-                            cloud.loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryUserCredentialsId(), getDeployImageRegistryTokenCredentialsId(), env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
-                        }
-                    }
-                }
-            }
-        }
-        stage('Prepare environment') {
-            steps {
-                script {
-                    // Set the mirror url only if exist
-                    if (env.MAVEN_MIRROR_REPOSITORY) {
-                        echo "Setup Maven mirror url to '${env.MAVEN_MIRROR_REPOSITORY}'"
-                        env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
-
-                        // Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
-                        runPythonCommand("python scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
-                    }
-
-                    if (getMavenArtifactRepository()) {
-                        echo "Setup Repository url to '${getMavenArtifactRepository()}'"
-                        runPythonCommand("python scripts/update-repository.py  --repo-url ${getMavenArtifactRepository()}")
-                    }
-                }
-            }
-        }
-
-        stage('Update kogito version') {
-            when {
-                expression { params.UPDATE_KOGITO_VERSION != '' }
-            }
-            steps {
-                script {
-                    runPythonCommand("python scripts/manage-kogito-version.py --bump-to ${params.UPDATE_KOGITO_VERSION} --confirm")
-                }
-            }
-        }
-
-        // Commented as we cannot fully rely on Quarkus platform
-        // Should be uncommmented once https://issues.redhat.com/browse/KOGITO-9120 is implemented
-        // stage('Setup Quarkus platform') {
-        //     steps {
-        //         script {
-        //             if (getQuarkusPlatformURL()) {
-        //                 String kogitoVersion = sh(returnStdout: true, script: 'make display-kogito-version')
-        //                 String quarkusPlatformVersion = "kogito-${kogitoVersion}"
-        //                 if (getMavenArtifactRepository()) {
-        //                     echo "[WARN] Artifacts repository defined in env will override the quarkus platform URL in tests. Make sure the platform artifacts are available on that artifacts repository (you can use a maven group)"
-        //                 }
-        //                 // Setup quarkus platform repo configuration
-        //                 runPythonCommand("python scripts/update-repository.py --repo-url ${getQuarkusPlatformURL()} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
-        //             }
-        //         }
-        //     }
-        // }
-        stage('Build image') {
-            steps {
-                script {
-                    updateGithubCommitStatus('PENDING', 'Build in progress')
-
-                    int freePort = cloud.findFreePort()
-                    env.localRegistryUrl = cloud.startLocalRegistry(freePort)
-                    cloud.prepareForDockerMultiplatformBuild([env.localRegistryUrl],[cloud.getDockerIOMirrorRegistryConfig()], false)
-
-                    // Generate the Dockerfile
-                    runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_test=true ignore_tag=true build_options='--dry-run'")
-
-                    // Build multiplatform from generated Dockerfile
-                    String squashMessage = "${getBuildImageName()}:${getImageVersion()} squashed"
-                    dir('target/image') {
-                        cloud.dockerBuildMultiPlatformImages(getBuiltImageTag(), getImageBuildPlatforms(), shouldDeployImage(), squashMessage, false, true)
-                    }
-                }
-            }
-        }
-        stage('Push tags') {
-            when {
-                expression { return shouldDeployImage() }
-            }
-            steps {
-                script {
-                    int retries = Integer.parseInt(env.MAX_REGISTRY_RETRIES)
-                    String imageTag = getBuiltImageTag()
-                    if (isDeployLatestTag()) {
-                        latestTag = 'latest'
-                        cloud.skopeoCopyRegistryImages(imageTag, getBuiltImageTag(latestTag), retries)
-                    }
-                }
-            }
-        }
-        stage('Setup for testing') {
-            when {
-                expression { return !shouldSkipTests() }
-            }
-            steps {
-                script {
-                    updateTestsCommand = 'python scripts/update-repository.py --tests-only'
-                    updateTestsCommand += getMavenArtifactRepository() ? " --repo-url ${getMavenArtifactRepository()}" : ''
-                    updateTestsCommand += getTestsKogitoExamplesRef() ? " --examples-ref ${getTestsKogitoExamplesRef()}" : ''
-                    updateTestsCommand += getTestsKogitoExamplesURI() ? " --examples-uri ${getTestsKogitoExamplesURI()}" : ''
-
-                    // Launch update tests
-                    runPythonCommand(updateTestsCommand)
-
-                    // Debug purpose in case of issue
-                    sh 'cat tests/test-apps/clone-repo.sh'
-                    sh 'cat scripts/setup-maven.sh'
-                }
-            }
-        }
-        stage('Test image') {
-            when {
-                expression { return !shouldSkipTests() }
-            }
-            steps {
-                script {
-                    updateGithubCommitStatus('PENDING', 'Tests in progress')
-
-                    String testImageTag = "docker.io/apache/incubator-kie-${getBuildImageName()}:${getImageVersion()}"
-                    String builtImageTag = getBuiltImageTag()
-                    // Pull and tag to test image
-                    sh """
-                        docker pull ${builtImageTag}
-                        docker tag ${builtImageTag} ${testImageTag}
-                    """
-                    try {
-                        runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_build=true")
-                    } catch (err) {
-                        unstable "Testing error(s) for image ${getBuildImageName()}"
-                    } finally {
-                        junit testResults: 'target/**/*.xml', allowEmptyResults: true
-                        archiveArtifacts artifacts: 'target/**/*.xml, **/*.txt, **/*.log', allowEmptyArchive: true
-                    }
-                }
-            }
-        }
-        stage('Export, Sign and Archive Image and signature') {
-            when {
-                expression { return shouldExportAndGpgSign() }
-            }
-            steps {
-                script {
-                    def resultingFileName = "incubator-kie-${getImageArtifactReleaseVersion()}-${getBuildImageName()}.tar.gz"
-                    def signatureFileName = "${resultingFileName}.asc"
-                    sh """
-                        docker pull ${getBuiltImageTag()}
-                        docker save ${getBuiltImageTag()} | gzip > ${resultingFileName}
-                    """
-                    release.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
-                    release.gpgSignFileDetachedSignatureWithoutPassword(resultingFileName, signatureFileName)
-                    release.svnUploadFileToRepository(getReleaseSvnRepository(), getReleaseSvnCredsId(), getImageArtifactReleaseVersion(), resultingFileName, signatureFileName)
-                }
-            }
-            post {
-                always {
-                    script {
-                        archiveArtifacts(artifacts: '**/*.tar.gz,**/*.tar.gz.asc', fingerprint: false, allowEmptyArchive: true)
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            script {
-                updateGithubCommitStatusFromBuildResult()
-                collectContainerLogs()
-                archiveArtifacts artifacts: '**/*-build.log, **/*.log', allowEmptyArchive: true
-            }
-        }
-        cleanup {
-            script {
-                cleanWs()
-            }
-        }
-    }
-}
-
-void collectContainerLogs() {
-    sh '''#!/bin/bash
-        for container in $(docker container ls --format "{{.Names}}"); do echo "[$container:START]"; docker logs $container; echo "[$container:END]"; done &> containers.log
-    '''
-}
-
-String getMakeBuildImageArgs() {
-    List args = []
-    if (getBuildKogitoAppsRef()) {
-        args.add("KOGITO_APPS_TARGET_BRANCH=${getBuildKogitoAppsRef()}")
-    }
-    if (getBuildKogitoAppsURI()) {
-        args.add("KOGITO_APPS_TARGET_URI=${getBuildKogitoAppsURI()}")
-    }
-    args.add("BUILD_ENGINE=${CONTAINER_ENGINE}")
-    if (env.CONTAINER_ENGINE_TLS_OPTIONS) {
-        args.add("BUILD_ENGINE_TLS_OPTIONS=${CONTAINER_ENGINE_TLS_OPTIONS}")
-    }
-    return args.join(' ')
-}
-
-String getImageVersion() {
-    return runPythonCommand('make display-image-version', true).trim()
-}
-
-String getBuiltImageTag(String imageTag = '') {
-    if (shouldDeployImage()) {
-        return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName()}:${imageTag ?: getDeployImageTag()}"
-    }
-    return "${env.localRegistryUrl}/${getBuildImageName()}:${githubscm.getCommitHash()}"
-}
-
-void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(returnStdout: stdout, script: cmd)
-}
-
-////////////////////////////////////////////////////////////////////////
-// Deploy image information
-////////////////////////////////////////////////////////////////////////
-
-boolean isDeployImageInOpenshiftRegistry() {
-    return params.DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY
-}
-
-String getDeployImageRegistryUserCredentialsId() {
-    return params.DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID
-}
-
-String getDeployImageRegistryTokenCredentialsId() {
-    return params.DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
-}
-
-String getDeployImageRegistry() {
-    return isDeployImageInOpenshiftRegistry() ? getOpenShiftRegistry() : params.DEPLOY_IMAGE_REGISTRY
-}
-
-String getDeployImageNamespace() {
-    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.DEPLOY_IMAGE_NAMESPACE
-}
-
-String getDeployImageNameSuffix() {
-    return params.DEPLOY_IMAGE_NAME_SUFFIX
-}
-
-String getDeployImageTag() {
-    if (params.DEPLOY_IMAGE_TAG != '') {
-        return params.DEPLOY_IMAGE_TAG
-    }
-    return sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-}
-
-String getFinalImageName() {
-    return "incubator-kie-" + getBuildImageName() + (getDeployImageNameSuffix() ? "-${getDeployImageNameSuffix()}" : '')
-}
-
-boolean isDeployLatestTag() {
-    return params.DEPLOY_WITH_LATEST_TAG
-}
-
-////////////////////////////////////////////////////////////////////////
-// utils
-////////////////////////////////////////////////////////////////////////
-
-String getOpenShiftRegistry() {
-    String registry = ''
-    withCredentials([string(credentialsId: 'OPENSHIFT_REGISTRY', variable: 'OPENSHIFT_REGISTRY')]) {
-        registry = env.OPENSHIFT_REGISTRY
-    }
-    return registry
-}
-
-String getOpenShiftAPI() {
-    String openShiftAPI = ''
-    withCredentials([string(credentialsId: 'OPENSHIFT_API', variable: 'OPENSHIFT_API')]) {
-        openShiftAPI = env.OPENSHIFT_API
-    }
-    return openShiftAPI
-}
-
-String getRepoName() {
-    return env.REPO_NAME
-}
-
-String getBuildImageName() {
-    return params.BUILD_IMAGE_NAME
-}
-
-String getSourceAuthor() {
-    return params.SOURCE_AUTHOR
-}
-
-String getSourceRepository() {
-    return params.SOURCE_REPOSITORY
-}
-
-String getSourceBranch() {
-    return params.SOURCE_BRANCH
-}
-
-String getTargetAuthor() {
-    return env.TARGET_AUTHOR
-}
-
-String getTargetBranch() {
-    return params.TARGET_BRANCH
-}
-
-String getGitAuthorCredentialsId() {
-    return env.GIT_AUTHOR_CREDS_ID
-}
-
-String getGitAuthorTokenCredentialsId() {
-    return env.GIT_AUTHOR_TOKEN_CREDS_ID
-}
-
-boolean shouldDeployImage() {
-    return params.DEPLOY_IMAGE
-}
-
-boolean shouldExportAndGpgSign() {
-    return params.EXPORT_AND_GPG_SIGN_IMAGE
-}
-
-String getBuildKogitoAppsRef() {
-    return params.BUILD_KOGITO_APPS_REF
-}
-
-String getBuildKogitoAppsURI() {
-    return params.BUILD_KOGITO_APPS_URI
-}
-
-String getTestsKogitoExamplesRef() {
-    return params.TESTS_KOGITO_EXAMPLES_REF
-}
-
-String getTestsKogitoExamplesURI() {
-    return params.TESTS_KOGITO_EXAMPLES_URI
-}
-
-boolean shouldSkipTests() {
-    return params.SKIP_TESTS
-}
-
-List getImageBuildPlatforms() {
-    return "${IMAGE_BUILD_PLATFORMS}".split(',') as List
-}
-
-String getMavenArtifactRepository() {
-    return params.MAVEN_ARTIFACTS_REPOSITORY
-}
-
-String getQuarkusPlatformURL() {
-    return params.QUARKUS_PLATFORM_URL
-}
-
-def updateGithubCommitStatus(String state, String message) {
-    githubscm.updateGithubCommitStatus(getBuildImageName(), state, message)
-}
-
-def updateGithubCommitStatusFromBuildResult() {
-    githubscm.updateGithubCommitStatusFromBuildResult(getBuildImageName())
-}
-
-Map getRepositoryInfo() {
-    return [
-        repository: getRepoName(),
-        author: getSourceAuthor(),
-        branch: getSourceBranch(),
-        credentials_id: getGitAuthorCredentialsId(),
-    ]
-}
-
-String getTriggeringProjectName() {
-    if (currentBuild.upstreamBuilds) {
-        return currentBuild.upstreamBuilds[0].projectName
-    }
-    return ""
-}
-String getReleaseGpgSignKeyCredsId() {
-    return env.RELEASE_GPG_SIGN_KEY_CREDS_ID
-}
-
-String getReleaseGpgSignPassphraseCredsId() {
-    return env.RELEASE_GPG_SIGN_PASSPHRASE_CREDS_ID
-}
-
-String getReleaseSvnRepository() {
-    return env.RELEASE_SVN_REPOSITORY
-}
-
-String getReleaseSvnCredsId() {
-    return env.RELEASE_SVN_CREDS_ID
-}
-
-String getImageArtifactReleaseVersion() {
-    return env.IMAGE_ARTIFACT_RELEASE_VERSION
-}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
deleted file mode 100644
index 0f1dcd5c891..00000000000
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ /dev/null
@@ -1,470 +0,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.
- */
-@Library('jenkins-pipeline-shared-libraries')_
-
-deployProperties = [:]
-
-changesDone = false
-
-BUILT_IMAGES = Collections.synchronizedList([])
-BUILD_FAILED_IMAGES = Collections.synchronizedList([])
-TEST_FAILED_IMAGES = Collections.synchronizedList([])
-
-pipeline {
-    agent {
-        docker { 
-            image env.AGENT_DOCKER_BUILDER_IMAGE
-            args env.AGENT_DOCKER_BUILDER_ARGS
-            label util.avoidFaultyNodes()
-        }
-    }
-
-    options {
-        timeout(time: 240, unit: 'MINUTES')
-        skipDefaultCheckout()
-    }
-
-    environment {
-        KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-    }
-
-    stages {
-        stage('Initialization') {
-            steps {
-                script {
-                    util.waitForDocker()
-                    currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
-
-                    dir(getRepoName()) {
-                        checkoutRepo()
-                    }
-
-                    if (isRelease()) {
-                        // Verify version is set and if on right release branch
-                        assert getProjectVersion()
-                        assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())
-                    }
-                }
-            }
-            post {
-                always {
-                    script {
-                        setDeployPropertyIfNeeded('git.branch', getBuildBranch())
-                        setDeployPropertyIfNeeded('git.author', getGitAuthor())
-                        setDeployPropertyIfNeeded('project.version', getProjectVersion())
-                        setDeployPropertyIfNeeded('release', isRelease())
-                        setDeployPropertyIfNeeded('kogito_artifacts.version', getKogitoArtifactsVersion())
-                    }
-                }
-            }
-        }
-
-        stage('Prepare for PR') {
-            when {
-                expression { return isRelease() }
-            }
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        if (githubscm.isBranchExist('origin', getPRBranch())) {
-                            githubscm.removeRemoteBranch('origin', getPRBranch(), getGitAuthorPushCredsId())
-                        }
-                        githubscm.createBranch(getPRBranch())
-                    }
-                }
-            }
-        }
-
-        stage('Setup Quarkus platform version') {
-            when {
-                expression { isRelease() }
-            }
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        if (getQuarkusPlatformVersion()) {
-                            sh "python scripts/update-repository.py --quarkus-platform-version ${getQuarkusPlatformVersion()}"
-
-                            commitAndPushChanges("Update Quarkus Platform version to ${getQuarkusPlatformVersion()}")
-                        } else {
-                            echo 'No new quarkus version given for the release. Statu quo ...'
-                        }
-                    }
-                }
-            }
-        }
-
-        stage('Update project version') {
-            when {
-                expression { return isRelease() }
-            }
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
-                        if (getBuildBranch() != 'main') {
-                            versionCmd += " --examples-ref ${!isRelease() ? 'nightly-' : ''}${getBuildBranch()}"
-                        }
-                        if (getKogitoArtifactsVersion()) {
-                            versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
-                        }
-                        sh versionCmd
-
-                        commitAndPushChanges("Update project version to ${getProjectVersion()}")
-                    }
-                }
-            }
-        }
-
-        stage('Validate CeKit Image and Modules descriptors') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        sh '''
-                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
-                            tar -xzvf cekit-image-validator-runner.tgz
-                            chmod +x cekit-image-validator-runner
-                        '''
-                        sh './cekit-image-validator-runner modules/'
-                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
-                    }
-                }
-            }
-        }
-
-        stage('Build, Push & Test Images') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        parallelStages = [:]
-                        getImages().each { image ->
-                            parallelStages["Build&Test ${image}"] = createBuildAndTestStageClosure(image)
-                        }
-                        parallel parallelStages
-                    }
-                }
-            }
-            post {
-                always {
-                    script {
-                        // Store image deployment information
-                        String imgPrefix = "${getRepoName()}.image"
-                        setDeployPropertyIfNeeded("${imgPrefix}.registry", getDeployImageRegistry())
-                        setDeployPropertyIfNeeded("${imgPrefix}.namespace", getDeployImageNamespace())
-                        setDeployPropertyIfNeeded("${imgPrefix}.names", getBuiltImages().join(','))
-                        setDeployPropertyIfNeeded("${imgPrefix}.name-suffix", getDeployImageNameSuffix())
-                        setDeployPropertyIfNeeded("${imgPrefix}.tag", getDeployImageTag())
-                    }
-                }
-            }
-        }
-
-        stage('Create PR') {
-            when {
-                expression {
-                    return changesDone && isRelease()
-                }
-            }
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        def commitMsg = "[${getBuildBranch()}] Update Maven artifacts"
-                        def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}."
-                        if (isRelease()) {
-                            commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()}"
-                            prBody += '\nPlease do not merge, it should be merged automatically.'
-                        } else if (currentBuild.currentResult != 'SUCCESS') {
-                            commitMsg += " (${currentBuild.currentResult})"
-                            prBody += '\n\nSuccessful images:\n'
-                            getBuiltImages().each {
-                                prBody += "- ${it}\n"
-                            }
-                            if (getBuildFailedImages()) {
-                                prBody += '\nBuild failures on those images:\n'
-                                getBuildFailedImages().each {
-                                    prBody += "- ${it}\n"
-                                }
-                            } else {
-                                prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
-                            }
-                            if (getTestFailedImages()) {
-                                prBody += '\nTest failures on those images:\n'
-                                getTestFailedImages().each {
-                                    prBody += "- ${it}\n"
-                                }
-                            } else {
-                                prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
-                            }
-                            prBody += '\nSee build url above for more information'
-                        }
-                        String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getGitAuthorPushCredsId())
-                        deployProperties["${getRepoName()}.pr.link"] = prLink
-
-                        // Create a new tag
-                        githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
-                        githubscm.tagRepository(getGitTagName())
-                        githubscm.pushRemoteTag('origin', getGitTagName(), getGitAuthorPushCredsId())
-                    }
-                }
-            }
-            post {
-                always {
-                    script {
-                        setDeployPropertyIfNeeded("${getRepoName()}.pr.source.uri", "https://github.com/${getGitAuthor()}/${getRepoName()}")
-                        setDeployPropertyIfNeeded("${getRepoName()}.pr.source.ref", getPRBranch())
-                        setDeployPropertyIfNeeded("${getRepoName()}.pr.target.uri", "https://github.com/${getGitAuthor()}/${getRepoName()}")
-                        setDeployPropertyIfNeeded("${getRepoName()}.pr.target.ref", getBuildBranch())
-                        setDeployPropertyIfNeeded("${getRepoName()}.tag.name", getGitTagName())
-                    }
-                }
-            }
-        }
-
-        stage('Finalize') {
-            steps {
-                script {
-                    if (getBuildFailedImages()) {
-                        currentBuild.currentResult = 'FAILURE'
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            script {
-                def propertiesStr = deployProperties.collect { entry -> "${entry.key}=${entry.value}" }.join('\n')
-                writeFile(file : env.PROPERTIES_FILE_NAME , text : propertiesStr)
-                archiveArtifacts artifacts: env.PROPERTIES_FILE_NAME, allowEmptyArchive:true
-            }
-        }
-        cleanup {
-            cleanWs()
-        }
-        unsuccessful {
-            sendUnsuccessfulNotification()
-        }
-    }
-}
-
-void sendUnsuccessfulNotification() {
-    if (params.SEND_NOTIFICATION) {
-        mailer.sendMarkdownTestSummaryNotification('Deploy', getNotificationSubject(), [env.KOGITO_CI_EMAIL_TO])
-    } else {
-        echo 'No notification sent per configuration'
-    }
-}
-
-void sendNotification(String body) {
-    emailext body: body,
-        subject: getNotificationSubject(),
-        to: env.KOGITO_CI_EMAIL_TO
-}
-
-String getNotificationSubject() {
-    return "[${getBuildBranch()}] Kogito Images"
-}
-
-void checkoutRepo() {
-    deleteDir()
-    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsId()))
-}
-
-void commitAndPushChanges(String commitMsg) {
-    githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
-    githubscm.commitChanges(commitMsg)
-    githubscm.pushObject('origin', getPRBranch(), getGitAuthorPushCredsId())
-    changesDone = true
-}
-
-void createBuildAndTestStageClosure(String image) {
-    return  {
-        stage("Build&Test ${image}") {
-            List buildParams = []
-            buildParams.add(string(name: 'DISPLAY_NAME', value: "${params.DISPLAY_NAME} - ${image}"))
-            buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
-            buildParams.add(string(name: 'SOURCE_AUTHOR', value: isRelease() ? getGitAuthor() : getGitAuthor()))
-            buildParams.add(string(name: 'SOURCE_BRANCH', value: isRelease() ? getPRBranch() : getBuildBranch()))
-
-            buildParams.add(string(name: 'MAVEN_ARTIFACTS_REPOSITORY', value: env.MAVEN_ARTIFACT_REPOSITORY ?: (isRelease() ? env.DEFAULT_STAGING_REPOSITORY : '')))
-            buildParams.add(string(name: 'BUILD_KOGITO_APPS_URI', value: params.APPS_URI))
-            buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: params.APPS_REF))
-            buildParams.add(booleanParam(name: 'SKIP_TESTS', value: params.SKIP_TESTS))
-            buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_URI', value: params.EXAMPLES_URI))
-            buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_REF', value: params.EXAMPLES_REF))
-
-            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: isDeployImage()))
-            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID', value: getDeployImageRegistryUserCredentialsId()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', value: getDeployImageRegistryTokenCredentialsId()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: getDeployImageRegistry()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: getDeployImageNamespace()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: getDeployImageNameSuffix()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_TAG', value: getDeployImageTag()))
-            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: isDeployLatestTag()))
-            buildParams.add(string(name: 'IMAGE_ARTIFACT_RELEASE_VERSION', value: getGitTagName()))
-
-            def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
-            if (job.result != 'SUCCESS') {
-                if (job.result == 'UNSTABLE') {
-                    registerTestFailedImage(image)
-                    unstable("Tests on ${image} seems to have failed")
-                    registerBuiltImage(image)
-                } else {
-                    registerBuildFailedImage(image)
-                    error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
-                }
-            } else {
-                registerBuiltImage(image)
-            }
-        }
-    }
-}
-
-void registerBuiltImage(String imageName) {
-    BUILT_IMAGES.add(imageName)
-}
-
-void registerBuildFailedImage(String imageName) {
-    BUILD_FAILED_IMAGES.add(imageName)
-}
-
-void registerTestFailedImage(String imageName) {
-    TEST_FAILED_IMAGES.add(imageName)
-}
-
-List getBuiltImages() {
-    return BUILT_IMAGES
-}
-
-List getBuildFailedImages() {
-    return BUILD_FAILED_IMAGES
-}
-
-List getTestFailedImages() {
-    return TEST_FAILED_IMAGES
-}
-
-////////////////////////////////////////////////////////////////////////
-// Deploy image information
-////////////////////////////////////////////////////////////////////////
-
-boolean isDeployImage() {
-    return !Boolean.valueOf(env.DISABLE_IMAGES_DEPLOY)
-}
-
-boolean isDeployImageInOpenshiftRegistry() {
-    return params.IMAGE_USE_OPENSHIFT_REGISTRY
-}
-
-String getDeployImageRegistryUserCredentialsId() {
-    return params.IMAGE_REGISTRY_USER_CREDENTIALS_ID
-}
-
-String getDeployImageRegistryTokenCredentialsId() {
-    return params.IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
-}
-
-String getDeployImageRegistry() {
-    return isDeployImageInOpenshiftRegistry() ? getOpenShiftRegistry() : params.IMAGE_REGISTRY
-}
-String getDeployImageNamespace() {
-    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
-}
-String getDeployImageNameSuffix() {
-    return params.IMAGE_NAME_SUFFIX
-}
-String getDeployImageTag() {
-    if (params.IMAGE_TAG != '') {
-        return params.IMAGE_TAG
-    } else {
-        return sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-    }
-}
-
-boolean isDeployLatestTag() {
-    return params.DEPLOY_WITH_LATEST_TAG
-}
-
-////////////////////////////////////////////////////////////////////////
-// utils
-////////////////////////////////////////////////////////////////////////
-
-boolean isRelease() {
-    return env.RELEASE ? env.RELEASE.toBoolean() : false
-}
-
-String getRepoName() {
-    return env.REPO_NAME
-}
-
-String getBuildBranch() {
-    return params.BUILD_BRANCH_NAME
-}
-
-String getGitAuthor() {
-    return "${GIT_AUTHOR}"
-}
-
-String getGitAuthorCredsId() {
-    return env.GIT_AUTHOR_CREDS_ID
-}
-
-String getGitAuthorPushCredsId() {
-    return env.GIT_AUTHOR_PUSH_CREDS_ID
-}
-
-String getPRBranch() {
-    return params.KOGITO_PR_BRANCH
-}
-
-String getProjectVersion() {
-    return params.PROJECT_VERSION
-}
-
-String getKogitoArtifactsVersion() {
-    return params.KOGITO_ARTIFACTS_VERSION
-}
-
-String getOpenShiftRegistry() {
-    String registry = ''
-    withCredentials([string(credentialsId: 'OPENSHIFT_REGISTRY', variable: 'OPENSHIFT_REGISTRY')]) {
-        registry = env.OPENSHIFT_REGISTRY
-    }
-    return registry
-}
-
-void setDeployPropertyIfNeeded(String key, def value) {
-    if (value) {
-        deployProperties[key] = value
-    }
-}
-
-String[] getImages() {
-    if (env.IMAGES_LIST) {
-        return env.IMAGES_LIST.split(',')
-    }
-    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
-}
-
-String getQuarkusPlatformVersion() {
-    return params.QUARKUS_PLATFORM_VERSION
-}
-
-String getGitTagName() {
-    return params.GIT_TAG_NAME
-}
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
deleted file mode 100644
index 8497669a095..00000000000
--- a/.ci/jenkins/Jenkinsfile.promote
+++ /dev/null
@@ -1,366 +0,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.
- */
- 
-// Promote images
-@Library('jenkins-pipeline-shared-libraries')_
-
-deployProperties = [:]
-
-pipeline {
-    agent {
-        docker { 
-            image env.AGENT_DOCKER_BUILDER_IMAGE
-            args env.AGENT_DOCKER_BUILDER_ARGS
-            label util.avoidFaultyNodes()
-        }
-    }
-
-    options {
-        timeout(time: 120, unit: 'MINUTES')
-        skipDefaultCheckout()
-    }
-
-    environment {
-        KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-
-        CONTAINER_ENGINE = 'docker'
-        CONTAINER_ENGINE_TLS_OPTIONS = ''
-
-        OPENSHIFT_API = credentials('OPENSHIFT_API')
-        OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
-        OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
-
-        PR_BRANCH_HASH = "${util.generateHash(10)}"
-    }
-
-    stages {
-        stage('Initialization') {
-            steps {
-                script {
-                    if (params.DISPLAY_NAME) {
-                        currentBuild.displayName = params.DISPLAY_NAME
-                    }
-                    util.waitForDocker()
-
-                    readDeployProperties()
-
-                    assert getProjectVersion()
-                    assert getBuildBranch() == util.getReleaseBranchFromVersion(getProjectVersion())
-
-                    // Login old registry
-                    if (isOldImageInOpenshiftRegistry()) {
-                        loginOpenshiftRegistry()
-                    } else if (getOldImageRegistryUserCredentialsId() != '' && getOldImageRegistryTokenCredentialsId() != '') {
-                        loginContainerRegistry(getOldImageRegistry(), getOldImageRegistryUserCredentialsId(), getOldImageRegistryTokenCredentialsId())
-                    }
-
-                    // Login new registry
-                    if (isNewImageInOpenshiftRegistry()) {
-                        loginOpenshiftRegistry()
-                    } else if (getNewImageRegistryUserCredentialsId() != '' && getNewImageRegistryTokenCredentialsId() != '') {
-                        loginContainerRegistry(getNewImageRegistry(), getNewImageRegistryUserCredentialsId(), getNewImageRegistryTokenCredentialsId())
-                    }
-
-                    dir(getRepoName()) {
-                        checkoutRepo()
-                    }
-                }
-            }
-        }
-
-        stage('Promote images') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        promoteImages()
-                    }
-                }
-            }
-        }
-
-        stage('Merge PR and tag') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        // Merge PR
-                        String prLink = getDeployProperty("${getRepoName()}.pr.link")
-                        if (prLink) {
-                            githubscm.mergePR(prLink, getGitAuthorPushCredsId())
-                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorPushCredsId())
-                        }
-                    }
-                }
-            }
-        }
-
-        stage('Create release') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        if (githubscm.isReleaseExist(getGitTag(), getGitAuthorCredsId())) {
-                            githubscm.deleteReleaseAndTag(getGitTag(), getGitAuthorPushCredsId())
-                        }
-                        githubscm.createReleaseWithGeneratedReleaseNotes(getGitTag(), getBuildBranch(), githubscm.getPreviousTagFromVersion(getGitTag()), getGitAuthorPushCredsId())
-                        githubscm.updateReleaseBody(getGitTag(), getGitAuthorPushCredsId())
-                    }
-                }
-            }
-        }
-    }
-    post {
-        unsuccessful {
-            sendUnsuccessfulNotification()
-        }
-        cleanup {
-            clean()
-        }
-    }
-}
-
-void sendUnsuccessfulNotification() {
-    if (params.SEND_NOTIFICATION) {
-        mailer.sendMarkdownTestSummaryNotification('Promote', getNotificationSubject(), [env.KOGITO_CI_EMAIL_TO])
-    } else {
-        echo 'No notification sent per configuration'
-    }
-}
-
-void sendNotification(String body) {
-    emailext body: body,
-        subject: getNotificationSubject()
-    to: env.KOGITO_CI_EMAIL_TO
-}
-
-String getNotificationSubject() {
-    return "[${getBuildBranch()}] Kogito Images"
-}
-
-void checkoutRepo() {
-    deleteDir()
-    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsId()))
-    // need to manually checkout branch since on a detached branch after checkout command
-    sh "git checkout ${getBuildBranch()}"
-}
-
-void promoteImages() {
-    for (String imageName : getImages()) {
-        promoteImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, getNewImageTag()))
-        if (isDeployLatestTag()) {
-            promoteImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, 'latest'))
-        }
-        String reducedTag = getReducedTag()
-        if (reducedTag) {
-            promoteImage(getOldImageFullTag(imageName), getNewImageFullTag(imageName, reducedTag))
-        }
-    }
-}
-
-void promoteImage(String oldImageName, String newImageName) {
-    cloud.skopeoCopyRegistryImages(oldImageName, newImageName, Integer.parseInt(env.MAX_REGISTRY_RETRIES))
-}
-
-String getOldImageFullTag(String imageName) {
-    return "${getOldImageRegistry()}/${getOldImageNamespace()}/${getFinalImageName(imageName, getOldImageNameSuffix())}:${getOldImageTag()}"
-}
-
-String getNewImageFullTag(String imageName, String tag) {
-    return "${getNewImageRegistry()}/${getNewImageNamespace()}/${getFinalImageName(imageName, getNewImageNameSuffix())}:${tag}"
-}
-
-String getFinalImageName(String imageName, String suffix) {
-    return suffix ? "${imageName}-${suffix}" : imageName
-}
-
-boolean isDeployLatestTag() {
-    return params.DEPLOY_WITH_LATEST_TAG
-}
-
-String getReducedTag() {
-    try {
-        String version = getNewImageTag()
-        String[] versionSplit = version.split("\\.")
-        return "${versionSplit[0]}.${versionSplit[1]}"
-    } catch (error) {
-        echo "${getNewImageTag()} cannot be reduced to the format X.Y"
-    }
-    return ''
-}
-
-void loginOpenshift() {
-    withCredentials([usernamePassword(credentialsId: env.OPENSHIFT_CREDS_KEY, usernameVariable: 'OC_USER', passwordVariable: 'OC_PWD')]) {
-        sh "oc login --username=${OC_USER} --password=${OC_PWD} --server=${env.OPENSHIFT_API} --insecure-skip-tls-verify"
-    }
-}
-
-void loginOpenshiftRegistry() {
-    loginOpenshift()
-    // username can be anything. See https://docs.openshift.com/container-platform/4.4/registry/accessing-the-registry.html#registry-accessing-directly_accessing-the-registry
-    sh "set +x && ${env.CONTAINER_ENGINE} login -u anything -p \$(oc whoami -t) ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${env.OPENSHIFT_REGISTRY}"
-}
-
-void loginContainerRegistry(String registry, String userCredsId, String tokenCredsId) {
-    withCredentials([string(credentialsId: userCredsId, variable: 'DOCKER_USER')]) {
-        withCredentials([string(credentialsId: tokenCredsId, variable: 'DOCKER_TOKEN')]) {
-            sh "${env.CONTAINER_ENGINE} login -u ${DOCKER_USER} -p ${DOCKER_TOKEN} ${env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''} ${registry}"
-        }
-    }
-}
-
-void readDeployProperties() {
-    String deployUrl = params.DEPLOY_BUILD_URL
-    if (deployUrl != '') {
-        if (!deployUrl.endsWith('/')) {
-            deployUrl += '/'
-        }
-        sh "wget ${deployUrl}artifact/deployment.properties"
-        deployProperties = readProperties file: 'deployment.properties'
-        echo deployProperties.collect { entry -> "${entry.key}=${entry.value}" }.join('\n')
-    }
-}
-boolean hasDeployProperty(String key) {
-    return deployProperties[key] != null
-}
-String getDeployProperty(String key) {
-    if (hasDeployProperty(key)) {
-        return deployProperties[key]
-    }
-    return ''
-}
-String getParamOrDeployProperty(String paramKey, String deployPropertyKey) {
-    if (params[paramKey] != '') {
-        return params[paramKey]
-    }
-    return getDeployProperty(deployPropertyKey)
-}
-
-////////////////////////////////////////////////////////////////////////
-// Utils
-////////////////////////////////////////////////////////////////////////
-
-String getRepoName() {
-    return env.REPO_NAME
-}
-
-String getProjectVersion() {
-    return getParamOrDeployProperty('PROJECT_VERSION' , 'project.version')
-}
-
-String getKogitoArtifactsVersion() {
-    artifactsVersion = getParamOrDeployProperty('KOGITO_ARTIFACTS_VERSION' , 'kogito_artifacts.version')
-    return artifactsVersion ?: getProjectVersion()
-}
-
-String getGitTag() {
-    return params.GIT_TAG != '' ? params.GIT_TAG : getProjectVersion()
-}
-
-String getBuildBranch() {
-    return params.BUILD_BRANCH_NAME
-}
-
-String getGitAuthor() {
-    return env.GIT_AUTHOR
-}
-
-String getGitAuthorCredsId() {
-    return env.GIT_AUTHOR_CREDS_ID
-}
-
-String getGitAuthorPushCredsId() {
-    return env.GIT_AUTHOR_PUSH_CREDS_ID
-}
-
-////////////////////////////////////////////////////////////////////////
-// Old image information
-////////////////////////////////////////////////////////////////////////
-
-String getOldImagePrefix() {
-    return "${getRepoName()}.image"
-}
-
-boolean isOldImageInOpenshiftRegistry() {
-    return params.BASE_IMAGE_USE_OPENSHIFT_REGISTRY
-}
-
-String getOldImageRegistryUserCredentialsId() {
-    return params.BASE_IMAGE_REGISTRY_USER_CREDENTIALS_ID
-}
-
-String getOldImageRegistryTokenCredentialsId() {
-    return params.BASE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
-}
-
-String getOldImageRegistry() {
-    return isOldImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : getParamOrDeployProperty('BASE_IMAGE_REGISTRY' , "${getOldImagePrefix()}.registry")
-}
-
-String getOldImageNamespace() {
-    return isOldImageInOpenshiftRegistry() ? 'openshift' : getParamOrDeployProperty('BASE_IMAGE_NAMESPACE' , "${getOldImagePrefix()}.namespace")
-}
-
-String getOldImageNames() {
-    return getParamOrDeployProperty('BASE_IMAGE_NAMES' , "${getOldImagePrefix()}.names")
-}
-
-String getOldImageNameSuffix() {
-    return getParamOrDeployProperty('BASE_IMAGE_NAME_SUFFIX' , "${getOldImagePrefix()}.name-suffix")
-}
-
-String getOldImageTag() {
-    return getParamOrDeployProperty('BASE_IMAGE_TAG' , "${getOldImagePrefix()}.tag")
-}
-
-////////////////////////////////////////////////////////////////////////
-// New image information
-////////////////////////////////////////////////////////////////////////
-
-boolean isNewImageInOpenshiftRegistry() {
-    return params.PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY
-}
-
-String getNewImageRegistryUserCredentialsId() {
-    return params.PROMOTE_IMAGE_REGISTRY_USER_CREDENTIALS_ID
-}
-
-String getNewImageRegistryTokenCredentialsId() {
-    return params.PROMOTE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
-}
-
-String getNewImageRegistry() {
-    return isNewImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.PROMOTE_IMAGE_REGISTRY
-}
-
-String getNewImageNamespace() {
-    return isNewImageInOpenshiftRegistry() ? 'openshift' : params.PROMOTE_IMAGE_NAMESPACE
-}
-
-String getNewImageNameSuffix() {
-    return params.PROMOTE_IMAGE_NAME_SUFFIX
-}
-
-String getNewImageTag() {
-    return params.PROMOTE_IMAGE_TAG
-}
-
-String[] getImages() {
-    String images = getOldImageNames() ?: env.IMAGES_LIST ?: runPythonCommand("make list | tr '\\n' ','", true).trim()
-    return images.split(',')
-}
-
-void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(returnStdout: stdout, script: cmd)
-}
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
deleted file mode 100644
index e6d5b1027ed..00000000000
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ /dev/null
@@ -1,204 +0,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.
- */
- 
-import org.jenkinsci.plugins.workflow.libs.Library
-@Library('jenkins-pipeline-shared-libraries')_
-
-pipeline {
-    agent {
-        docker { 
-            image env.AGENT_DOCKER_BUILDER_IMAGE
-            args env.AGENT_DOCKER_BUILDER_ARGS
-            label util.avoidFaultyNodes()
-        }
-    }
-
-    options {
-        timeout(time: 120, unit: 'MINUTES')
-    }
-
-    environment {
-        KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-    }
-
-    stages {
-        stage('Initialization') {
-            steps {
-                script {
-                    cleanWs(disableDeferredWipeout: true)
-
-                    if (params.DISPLAY_NAME) {
-                        currentBuild.displayName = params.DISPLAY_NAME
-                    }
-
-                    checkoutRepo(getRepoName(), getBuildBranch())
-                }
-            }
-        }
-        stage('Update project version') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getBuildBranch()} --confirm"
-                        versionCmd += " --examples-ref nightly-${getBuildBranch()}"
-                        if (getKogitoArtifactsVersion()) {
-                            versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
-                        }
-                        runPythonCommand(versionCmd)
-                    }
-                }
-            }
-        }
-        stage('Validate CeKit Image and Modules descriptors') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        sh '''
-                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
-                            tar -xzvf cekit-image-validator-runner.tgz
-                            chmod +x cekit-image-validator-runner
-                        '''
-                        sh './cekit-image-validator-runner modules/'
-                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
-                    }
-                }
-            }
-            post {
-                always {
-                    dir(getRepoName()) {
-                        sh 'rm -rf cekit-image-validator-runner*'
-                    }
-                }
-            }
-        }
-        stage('Clean release notes') {
-            when {
-                expression { isMainBranch() }
-            }
-            steps {
-                script {
-                    String releaseNotesFilename = 'RELEASE_NOTES.md'
-                    dir(getRepoName()) {
-                        sh "rm -rf ${releaseNotesFilename}"
-                        writeFile(file: releaseNotesFilename, text: getCleanedReleaseNotes())
-                    }
-                }
-            }
-        }
-        stage('Update branch') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
-                        def mainBranchPrCheckJenkinsfile = '.ci/jenkins/Jenkinsfile'
-                        def newBranchPrCheckJenkinsfile = ".ci/jenkins/Jenkinsfile.pr.${getBuildBranch()}"
-                        if (!isMainBranch() && fileExists(mainBranchPrCheckJenkinsfile)) {
-                            sh "mv ${mainBranchPrCheckJenkinsfile} ${newBranchPrCheckJenkinsfile}"
-                            sh "git add ${newBranchPrCheckJenkinsfile}"
-                        }
-                        if (githubscm.isThereAnyChanges()) {
-                            githubscm.commitChanges("[${getBuildBranch()}] Update version to ${getKogitoVersion()}")
-                            githubscm.pushObject('origin', getBuildBranch(), getGitAuthorPushCredsId())
-                        } else {
-                            println '[WARN] no changes to commit'
-                        }
-                    }
-                }
-            }
-        }
-    }
-    post {
-        unsuccessful {
-            sendUnsuccessfulNotification()
-        }
-        cleanup {
-            cleanWs()
-        }
-    }
-}
-
-void sendUnsuccessfulNotification() {
-    if (params.SEND_NOTIFICATION) {
-        mailer.sendMarkdownTestSummaryNotification('Setup branch', "[${getBuildBranch()}] Kogito Images", [env.KOGITO_CI_EMAIL_TO])
-    } else {
-        echo 'No notification sent per configuration'
-    }
-}
-
-void checkoutRepo(String repository, String branch) {
-    dir(repository) {
-        deleteDir()
-        checkout(githubscm.resolveRepository(repository, getGitAuthor(), branch, false, getGitAuthorCredsId()))
-        sh "git checkout ${branch}"
-    }
-}
-
-////////////////////////////////////////////////////////////////////////
-// utils
-////////////////////////////////////////////////////////////////////////
-
-String getRepoName() {
-    return env.REPO_NAME
-}
-
-String getBuildBranch() {
-    return params.BUILD_BRANCH_NAME
-}
-
-String getGitAuthor() {
-    return "${GIT_AUTHOR}"
-}
-
-String getGitAuthorCredsId() {
-    return "${GIT_AUTHOR_CREDS_ID}"
-}
-
-String getGitAuthorPushCredsId() {
-    return "${GIT_AUTHOR_PUSH_CREDS_ID}"
-}
-
-String getKogitoVersion() {
-    return params.KOGITO_VERSION
-}
-
-String getKogitoArtifactsVersion() {
-    return params.KOGITO_ARTIFACTS_VERSION
-}
-
-String[] getImages() {
-    return runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
-}
-
-boolean isMainBranch() {
-    return env.IS_MAIN_BRANCH?.toBoolean()
-}
-
-String getCleanedReleaseNotes() {
-    return '''
-<!-- Keep them in alphabetical order -->
-## Enhancements
-
-## Bug Fixes
-
-## Known Issues
-
-'''
-}
-
-void runPythonCommand(String cmd, boolean stdout = false) {
-    return sh(returnStdout: stdout, script: cmd)
-}
\ No newline at end of file
diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
deleted file mode 100644
index 41b0e21b35d..00000000000
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ /dev/null
@@ -1,353 +0,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.
- */
-@Library('jenkins-pipeline-shared-libraries')_
-
-deployProperties = [:]
-
-changesDone = false
-
-BUILT_IMAGES = Collections.synchronizedList([])
-BUILD_FAILED_IMAGES = Collections.synchronizedList([])
-TEST_FAILED_IMAGES = Collections.synchronizedList([])
-
-pipeline {
-    agent {
-        docker {
-            image env.AGENT_DOCKER_BUILDER_IMAGE
-            args env.AGENT_DOCKER_BUILDER_ARGS
-            label util.avoidFaultyNodes()
-        }
-    }
-
-    options {
-        timeout(time: 240, unit: 'MINUTES')
-        skipDefaultCheckout()
-    }
-
-    environment {
-        KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-    }
-
-    stages {
-        stage('Initialization') {
-            steps {
-                script {
-                    util.waitForDocker()
-                    currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
-
-                    dir(getRepoName()) {
-                        checkoutRepo()
-                        env.PROJECT_VERSION = sh(returnStdout: true, script: "python scripts/retrieve_version.py").trim()
-                    }
-                }
-            }
-            post {
-                always {
-                    script {
-                        setDeployPropertyIfNeeded('git.branch', getBuildBranch())
-                        setDeployPropertyIfNeeded('git.author', getGitAuthor())
-                        setDeployPropertyIfNeeded('project.version', getProjectVersion())
-                    }
-                }
-            }
-        }
-
-        stage('Update project version') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
-                        if (getBuildBranch() != 'main') {
-                            versionCmd += " --examples-ref 'nightly-'${getBuildBranch()}"
-                        }
-                        sh versionCmd
-                    }
-                }
-            }
-        }
-
-        stage('Validate CeKit Image and Modules descriptors') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        sh '''
-                            curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
-                            tar -xzvf cekit-image-validator-runner.tgz
-                            chmod +x cekit-image-validator-runner
-                        '''
-                        sh './cekit-image-validator-runner modules/'
-                        getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
-                    }
-                }
-            }
-        }
-
-        stage('Build, Push & Test Images') {
-            steps {
-                script {
-                    dir(getRepoName()) {
-                        parallelStages = [:]
-                        getImages().each { image ->
-                            parallelStages["Build&Test ${image}"] = createBuildAndTestStageClosure(image)
-                        }
-                        parallel parallelStages
-                    }
-                }
-            }
-            post {
-                always {
-                    script {
-                        // Store image deployment information
-                        String imgPrefix = "${getRepoName()}.image"
-                        setDeployPropertyIfNeeded("${imgPrefix}.registry", getDeployImageRegistry())
-                        setDeployPropertyIfNeeded("${imgPrefix}.namespace", getDeployImageNamespace())
-                        setDeployPropertyIfNeeded("${imgPrefix}.names", getBuiltImages().join(','))
-                        setDeployPropertyIfNeeded("${imgPrefix}.name-suffix", getDeployImageNameSuffix())
-                        setDeployPropertyIfNeeded("${imgPrefix}.tag", getDeployImageTag())
-                    }
-                }
-            }
-        }
-
-        stage('Create and push a new tag') {
-            steps {
-                script {
-                    projectVersion = getProjectVersion()
-                    dir(getRepoName()) {
-                        if (githubscm.isThereAnyChanges()) {
-                            def commitMsg = "[${getBuildBranch()}] Update version to ${projectVersion}"
-                            githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
-                            githubscm.commitChanges(commitMsg)
-                        } else {
-                            println '[WARN] no changes to commit'
-                        }
-                        githubscm.tagRepository(projectVersion)
-                        githubscm.pushRemoteTag('origin', projectVersion, getGitAuthorPushCredsId())
-                    }
-                }
-            }
-        }
-
-        stage('Finalize') {
-            steps {
-                script {
-                    if (getBuildFailedImages()) {
-                        currentBuild.currentResult = 'FAILURE'
-                    }
-                }
-            }
-        }
-    }
-    post {
-        always {
-            script {
-                def propertiesStr = deployProperties.collect { entry -> "${entry.key}=${entry.value}" }.join('\n')
-                writeFile(file : env.PROPERTIES_FILE_NAME , text : propertiesStr)
-                archiveArtifacts artifacts: env.PROPERTIES_FILE_NAME, allowEmptyArchive:true
-            }
-        }
-        cleanup {
-            cleanWs()
-        }
-        unsuccessful {
-            sendUnsuccessfulNotification()
-        }
-    }
-}
-
-void sendUnsuccessfulNotification() {
-    if (params.SEND_NOTIFICATION) {
-        mailer.sendMarkdownTestSummaryNotification('Deploy', getNotificationSubject(), [env.KOGITO_CI_EMAIL_TO])
-    } else {
-        echo 'No notification sent per configuration'
-    }
-}
-
-void sendNotification(String body) {
-    emailext body: body,
-        subject: getNotificationSubject(),
-        to: env.KOGITO_CI_EMAIL_TO
-}
-
-String getNotificationSubject() {
-    return "[${getBuildBranch()}] Kogito Images"
-}
-
-void checkoutRepo() {
-    deleteDir()
-    checkout(githubscm.resolveRepository(getRepoName(), getGitAuthor(), getBuildBranch(), false, getGitAuthorCredsId()))
-}
-
-void createBuildAndTestStageClosure(String image) {
-    return  {
-        stage("Build&Test ${image}") {
-            List buildParams = []
-            buildParams.add(string(name: 'DISPLAY_NAME', value: "${params.DISPLAY_NAME} - ${image}"))
-            buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
-            buildParams.add(string(name: 'SOURCE_AUTHOR', value: getGitAuthor()))
-            buildParams.add(string(name: 'SOURCE_BRANCH', value: getBuildBranch()))
-
-            buildParams.add(string(name: 'MAVEN_ARTIFACTS_REPOSITORY', value: env.MAVEN_ARTIFACT_REPOSITORY))
-            buildParams.add(string(name: 'BUILD_KOGITO_APPS_URI', value: params.APPS_URI))
-            buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: params.APPS_REF))
-            buildParams.add(booleanParam(name: 'SKIP_TESTS', value: params.SKIP_TESTS))
-            buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_URI', value: params.EXAMPLES_URI))
-            buildParams.add(string(name: 'TESTS_KOGITO_EXAMPLES_REF', value: params.EXAMPLES_REF))
-
-            buildParams.add(string(name: 'UPDATE_KOGITO_VERSION', value: getProjectVersion()))
-
-            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE', value: true))
-            buildParams.add(booleanParam(name: 'DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', value: isDeployImageInOpenshiftRegistry()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID', value: getDeployImageRegistryUserCredentialsId()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', value: getDeployImageRegistryTokenCredentialsId()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_REGISTRY', value: getDeployImageRegistry()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_NAMESPACE', value: getDeployImageNamespace()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_NAME_SUFFIX', value: getDeployImageNameSuffix()))
-            buildParams.add(string(name: 'DEPLOY_IMAGE_TAG', value: getDeployImageTag()))
-            buildParams.add(booleanParam(name: 'DEPLOY_WITH_LATEST_TAG', value: false))
-
-            def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
-            if (job.result != 'SUCCESS') {
-                if (job.result == 'UNSTABLE') {
-                    registerTestFailedImage(image)
-                    unstable("Tests on ${image} seems to have failed")
-                    registerBuiltImage(image)
-                } else {
-                    registerBuildFailedImage(image)
-                    error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
-                }
-            } else {
-                registerBuiltImage(image)
-            }
-        }
-    }
-}
-
-void registerBuiltImage(String imageName) {
-    BUILT_IMAGES.add(imageName)
-}
-
-void registerBuildFailedImage(String imageName) {
-    BUILD_FAILED_IMAGES.add(imageName)
-}
-
-void registerTestFailedImage(String imageName) {
-    TEST_FAILED_IMAGES.add(imageName)
-}
-
-List getBuiltImages() {
-    return BUILT_IMAGES
-}
-
-List getBuildFailedImages() {
-    return BUILD_FAILED_IMAGES
-}
-
-List getTestFailedImages() {
-    return TEST_FAILED_IMAGES
-}
-
-////////////////////////////////////////////////////////////////////////
-// Deploy image information
-////////////////////////////////////////////////////////////////////////
-
-boolean isDeployImageInOpenshiftRegistry() {
-    return params.IMAGE_USE_OPENSHIFT_REGISTRY
-}
-
-String getDeployImageRegistryUserCredentialsId() {
-    return params.IMAGE_REGISTRY_USER_CREDENTIALS_ID
-}
-
-String getDeployImageRegistryTokenCredentialsId() {
-    return params.IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID
-}
-
-String getDeployImageRegistry() {
-    return isDeployImageInOpenshiftRegistry() ? getOpenShiftRegistry() : params.IMAGE_REGISTRY
-}
-String getDeployImageNamespace() {
-    return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
-}
-String getDeployImageNameSuffix() {
-    return params.IMAGE_NAME_SUFFIX
-}
-String getDeployImageTag() {
-    return getProjectVersion()
-}
-
-////////////////////////////////////////////////////////////////////////
-// utils
-////////////////////////////////////////////////////////////////////////
-
-String getRepoName() {
-    return env.REPO_NAME
-}
-
-String getBuildBranch() {
-    return params.BUILD_BRANCH_NAME
-}
-
-String getGitAuthor() {
-    return "${GIT_AUTHOR}"
-}
-
-String getGitAuthorCredsId() {
-    return env.GIT_AUTHOR_CREDS_ID
-}
-
-String getGitAuthorPushCredsId() {
-    return env.GIT_AUTHOR_PUSH_CREDS_ID
-}
-
-String getOpenShiftRegistry() {
-    String registry = ''
-    withCredentials([string(credentialsId: 'OPENSHIFT_REGISTRY', variable: 'OPENSHIFT_REGISTRY')]) {
-        registry = env.OPENSHIFT_REGISTRY
-    }
-    return registry
-}
-
-void setDeployPropertyIfNeeded(String key, def value) {
-    if (value) {
-        deployProperties[key] = value
-    }
-}
-
-String[] getImages() {
-    if (env.IMAGES_LIST) {
-        return env.IMAGES_LIST.split(',')
-    }
-    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
-}
-
-String getQuarkusPlatformVersion() {
-    return params.QUARKUS_PLATFORM_VERSION
-}
-
-String getCheckoutDatetime() {
-    return params.GIT_CHECKOUT_DATETIME
-}
-
-String getProjectVersionDate() {
-    def projectVersionDate = (getCheckoutDatetime() =~ /(\d{4}-\d{2}-\d{2})/)[0][0]
-    return projectVersionDate.replace('-', '')
-}
-
-String getProjectVersion() {
-    return env.PROJECT_VERSION + '-' + getProjectVersionDate()
-}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
deleted file mode 100644
index 09827dc0a81..00000000000
--- a/.ci/jenkins/dsl/jobs.groovy
+++ /dev/null
@@ -1,399 +0,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.
- */
- 
-/*
-* This file is describing all the Jenkins jobs in the DSL format (see https://plugins.jenkins.io/job-dsl/)
-* needed by the Kogito pipelines.
-*
-* The main part of Jenkins job generation is defined into the https://github.com/apache/incubator-kie-kogito-pipelines repository.
-*
-* This file is making use of shared libraries defined in
-* https://github.com/apache/incubator-kie-kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
-*/
-
-import org.kie.jenkins.jobdsl.model.JobType
-import org.kie.jenkins.jobdsl.utils.JobParamsUtils
-import org.kie.jenkins.jobdsl.KogitoJobTemplate
-import org.kie.jenkins.jobdsl.KogitoJobUtils
-import org.kie.jenkins.jobdsl.Utils
-
-jenkins_path = '.ci/jenkins'
-
-// PR checks
-setupPrJob()
-
-// Init branch
-createSetupBranchJob()
-
-// Nightly jobs
-setupDeployJob(JobType.NIGHTLY)
-KogitoJobUtils.createEnvironmentIntegrationBranchNightlyJob(this, 'quarkus-lts')
-
-// Weekly jobs
-setupWeeklyDeployJob(JobType.OTHER)
-
-// Release jobs
-setupDeployJob(JobType.RELEASE)
-setupPromoteJob(JobType.RELEASE)
-
-// Update quarkus on community
-setupQuarkusUpdateJob()
-
-/////////////////////////////////////////////////////////////////
-// Methods
-/////////////////////////////////////////////////////////////////
-
-void setupPrJob() {
-    setupBuildImageJob(JobType.PULL_REQUEST)
-    setupBuildAndTestJob(JobType.PULL_REQUEST)
-
-    // Branch Source Plugin multibranchPipelineJob
-    def triggeringJenkinsfileName = Utils.isMainBranch(this) ? "Jenkinsfile" : "Jenkinsfile.pr.${Utils.getGitBranch(this)}"
-    KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/${triggeringJenkinsfileName}", JobType.PULL_REQUEST.getName())
-}
-
-void createSetupBranchJob() {
-    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
-    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
-    jobParams.env.putAll([
-        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
-
-        JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
-
-        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
-
-        IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}"
-    ])
-    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
-        parameters {
-            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
-
-            stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
-
-            // Release information
-            stringParam('KOGITO_VERSION', '', 'Kogito version to set.')
-            stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Kogito Artifacts version to set')
-
-            booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
-        }
-    }
-}
-
-void setupDeployJob(JobType jobType) {
-    setupBuildImageJob(jobType)
-
-    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-deploy', jobType, "${jenkins_path}/Jenkinsfile.deploy", 'Kogito Images Deploy')
-    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
-    jobParams.env.putAll([
-        PROPERTIES_FILE_NAME: 'deployment.properties',
-
-        MAX_REGISTRY_RETRIES: 3,
-
-        JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
-
-        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
-        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
-
-        MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
-        DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
-
-        QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
-
-        DISABLE_IMAGES_DEPLOY: (jobType == JobType.RELEASE) ? true : Utils.isImagesDeployDisabled(this)
-    ])
-    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
-        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
-    }
-    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
-        parameters {
-            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
-
-            stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
-
-            stringParam('APPS_URI', '', 'Git uri to the kogito-apps repository to use for tests.')
-            stringParam('APPS_REF', '', 'Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
-
-            // Build&Test information
-            booleanParam('SKIP_TESTS', false, 'Skip tests')
-            stringParam('EXAMPLES_URI', '', 'Git uri to the kogito-examples repository to use for tests.')
-            stringParam('EXAMPLES_REF', '', 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
-
-            // Deploy information
-            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_USER_CREDENTIALS_ID, IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Image registry user credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-            stringParam('IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Image registry token credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-            stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
-            stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
-            stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
-            stringParam('IMAGE_TAG', '', 'Image tag to use to deploy images')
-            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
-
-            // Release information
-            stringParam('PROJECT_VERSION', '', 'Optional if not RELEASE. If RELEASE, cannot be empty.')
-            stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
-            if (jobType == JobType.RELEASE) {
-                stringParam('QUARKUS_PLATFORM_VERSION', '', 'Allow to override the Quarkus Platform version')
-                stringParam('GIT_TAG_NAME', '', 'Git tag to be created')
-            }
-
-            stringParam('KOGITO_PR_BRANCH', '', 'PR branch name')
-            booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
-        }
-    }
-}
-
-void setupBuildImageJob(JobType jobType) {
-    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.build-image', jobType, "${jenkins_path}/Jenkinsfile.build-image", 'Kogito Images Build single image')
-    // Use jenkinsfile from the build branch
-    jobParams.git.author = '${SOURCE_AUTHOR}'
-    jobParams.git.repository = '${SOURCE_REPOSITORY}'
-    jobParams.git.branch = '${SOURCE_BRANCH}'
-    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
-    jobParams.env.putAll([
-        MAX_REGISTRY_RETRIES: 3,
-        TARGET_AUTHOR: Utils.getGitAuthor(this), // In case of a PR to merge with target branch
-
-        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GIT_AUTHOR_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
-
-        RELEASE_GPG_SIGN_KEY_CREDS_ID: Utils.getReleaseGpgSignKeyCredentialsId(this),
-        RELEASE_GPG_SIGN_PASSPHRASE_CREDS_ID: Utils.getReleaseGpgSignPassphraseCredentialsId(this),
-        RELEASE_SVN_REPOSITORY: Utils.getReleaseSvnCredentialsId(this),
-        RELEASE_SVN_CREDS_ID: Utils.getReleaseSvnStagingRepository(this)
-    ])
-    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
-        logRotator {
-            daysToKeep(10)
-        }
-        parameters {
-            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
-
-            stringParam('BUILD_IMAGE_NAME', '', 'Image name to build. Mandatory parameter.')
-
-            stringParam('SOURCE_AUTHOR', Utils.getGitAuthor(this), 'Build author')
-            stringParam('SOURCE_REPOSITORY', Utils.getRepoName(this), 'Build repository name')
-            stringParam('SOURCE_BRANCH', Utils.getGitBranch(this), 'Build branch name')
-            stringParam('TARGET_BRANCH', '', '(Optional) In case of a PR to merge with target branch, please provide the target branch')
-
-            // Build information
-            stringParam('MAVEN_ARTIFACTS_REPOSITORY', "${MAVEN_ARTIFACTS_REPOSITORY}")
-            stringParam('BUILD_KOGITO_APPS_URI', '', '(Optional) Git uri to the kogito-apps repository to use for tests.')
-            stringParam('BUILD_KOGITO_APPS_REF', '', '(Optional) Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
-            stringParam('QUARKUS_PLATFORM_URL', Utils.getMavenQuarkusPlatformRepositoryUrl(this), 'URL to the Quarkus platform to use. The version to use will be guessed from artifacts.')
-            stringParam('UPDATE_KOGITO_VERSION', '', '(Optional) Update kogito to a specific version in the project')
-
-            // Test information
-            booleanParam('SKIP_TESTS', false, 'Skip tests')
-            stringParam('TESTS_KOGITO_EXAMPLES_URI', '', '(Optional) Git uri to the kogito-examples repository to use for tests.')
-            stringParam('TESTS_KOGITO_EXAMPLES_REF', '', '(Optional) Git reference (branch/tag) to the kogito-examples repository to use for tests.')
-
-            // Deploy information
-            booleanParam('DEPLOY_IMAGE', false, 'Should we deploy image to given deploy registry ?')
-            booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID, DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, DEPLOY_IMAGE_REGISTRY and DEPLOY_IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Image registry user credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-            stringParam('DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Image registry token credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-            stringParam('DEPLOY_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
-            stringParam('DEPLOY_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
-            stringParam('DEPLOY_IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
-            stringParam('DEPLOY_IMAGE_TAG', '', 'Image tag to use to deploy images')
-            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
-            booleanParam('EXPORT_AND_GPG_SIGN_IMAGE', jobType == JobType.RELEASE, 'Set to true if should images be exported and signed.')
-            stringParam('IMAGE_ARTIFACT_RELEASE_VERSION', '', 'Set the release version to be attached to the images artifacts names')
-        }
-    }
-}
-
-void setupBuildAndTestJob(JobType jobType) {
-    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.build-and-test', jobType, "${jenkins_path}/Jenkinsfile.build-and-test", 'Kogito Images Build And test images')
-    // Use jenkinsfile from the build branch
-    jobParams.git.author = '${SOURCE_AUTHOR}'
-    jobParams.git.repository = '${SOURCE_REPOSITORY}'
-    jobParams.git.branch = '${SOURCE_BRANCH}'
-    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
-    jobParams.env.putAll([
-        MAX_REGISTRY_RETRIES: 3,
-        TARGET_AUTHOR: Utils.getGitAuthor(this), // In case of a PR to merge with target branch
-
-        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GIT_AUTHOR_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
-    ])
-    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
-        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
-    }
-    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
-        logRotator {
-            daysToKeep(10)
-        }
-        parameters {
-            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
-
-            stringParam('SOURCE_AUTHOR', Utils.getGitAuthor(this), 'Build author')
-            stringParam('SOURCE_REPOSITORY', Utils.getRepoName(this), 'Build repository name')
-            stringParam('SOURCE_BRANCH', Utils.getGitBranch(this), 'Build branch name')
-            stringParam('TARGET_BRANCH', '', '(Optional) In case of a PR to merge with target branch, please provide the target branch')
-            stringParam('CHANGE_ID', '', 'CHANGE_ID coming from Branch Source Plugin')
-            stringParam('CHANGE_URL', '', 'CHANGE_URL coming from Branch Source Plugin')
-
-            // Build information
-            stringParam('MAVEN_ARTIFACTS_REPOSITORY', "${MAVEN_ARTIFACTS_REPOSITORY}")
-            stringParam('BUILD_KOGITO_APPS_URI', '', '(Optional) Git uri to the kogito-apps repository to use for tests.')
-            stringParam('BUILD_KOGITO_APPS_REF', '', '(Optional) Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
-            stringParam('QUARKUS_PLATFORM_URL', Utils.getMavenQuarkusPlatformRepositoryUrl(this), 'URL to the Quarkus platform to use. The version to use will be guessed from artifacts.')
-
-            // Test information
-            booleanParam('SKIP_TESTS', false, 'Skip tests')
-            stringParam('TESTS_KOGITO_EXAMPLES_URI', '', '(Optional) Git uri to the kogito-examples repository to use for tests.')
-            stringParam('TESTS_KOGITO_EXAMPLES_REF', '', '(Optional) Git reference (branch/tag) to the kogito-examples repository to use for tests.')
-
-            // Deploy information
-            booleanParam('DEPLOY_IMAGE', false, 'Should we deploy image to given deploy registry ?')
-            booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID, DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, DEPLOY_IMAGE_REGISTRY and DEPLOY_IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('DEPLOY_IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Image registry user credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-            stringParam('DEPLOY_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Image registry token credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-            stringParam('DEPLOY_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
-            stringParam('DEPLOY_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
-            stringParam('DEPLOY_IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
-            stringParam('DEPLOY_IMAGE_TAG', '', 'Image tag to use to deploy images')
-            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
-        }
-    }
-}
-
-void setupPromoteJob(JobType jobType) {
-    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-promote', jobType, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote')
-    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
-    jobParams.env.putAll([
-        PROPERTIES_FILE_NAME: 'deployment.properties',
-
-        MAX_REGISTRY_RETRIES: 3,
-
-        JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
-
-        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
-
-        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
-
-        DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
-        MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
-    ])
-    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
-        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
-    }
-    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
-        parameters {
-            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
-
-            stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
-
-            // Deploy job url to retrieve deployment.properties
-            stringParam('DEPLOY_BUILD_URL', '', 'URL to jenkins deploy build to retrieve the `deployment.properties` file. If base parameters are defined, they will override the `deployment.properties` information')
-
-            // Base images information which can override `deployment.properties`
-            booleanParam('BASE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Override `deployment.properties`. Set to true if base image should be retrieved from Openshift registry.In this case, BASE_IMAGE_REGISTRY_USER_CREDENTIALS_ID, BASE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('BASE_IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Override `deployment.properties`. Base Image registry user credentials id to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
-            stringParam('BASE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Override `deployment.properties`. Base Image registry token credentials id to use to deploy images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
-            stringParam('BASE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Override `deployment.properties`. Base image registry')
-            stringParam('BASE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Override `deployment.properties`. Base image namespace')
-            stringParam('BASE_IMAGE_NAMES', '', 'Override `deployment.properties`. Comma separated list of images')
-            stringParam('BASE_IMAGE_NAME_SUFFIX', '', 'Override `deployment.properties`. Base image name suffix')
-            stringParam('BASE_IMAGE_TAG', '', 'Override `deployment.properties`. Base image tag')
-
-            // Promote images information
-            booleanParam('PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if base image should be deployed in Openshift registry.In this case, PROMOTE_IMAGE_REGISTRY_USER_CREDENTIALS_ID, PROMOTE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, PROMOTE_IMAGE_REGISTRY and PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('PROMOTE_IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Promote Image registry user credentials id to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
-            stringParam('PROMOTE_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Promote Image registry token credentials id to use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
-            stringParam('PROMOTE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Promote image registry')
-            stringParam('PROMOTE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Promote image namespace')
-            stringParam('PROMOTE_IMAGE_NAME_SUFFIX', '', 'Promote image name suffix')
-            stringParam('PROMOTE_IMAGE_TAG', '', 'Promote image tag')
-            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
-
-            // Release information which can override `deployment.properties`
-            stringParam('PROJECT_VERSION', '', 'Override `deployment.properties`. Optional if not RELEASE. If RELEASE, cannot be empty.')
-            stringParam('KOGITO_ARTIFACTS_VERSION', '', 'Optional. If artifacts\' version is different from PROJECT_VERSION.')
-            stringParam('GIT_TAG', '', 'Git tag to set, if different from PROJECT_VERSION')
-            stringParam('RELEASE_NOTES', '', 'Release notes to be added. If none provided, a default one will be given.')
-
-            booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
-        }
-    }
-}
-
-void setupQuarkusUpdateJob() {
-    KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
-        "python scripts/update-repository.py --quarkus-platform-version %new_version%"
-    ])
-}
-
-void setupWeeklyDeployJob(JobType jobType) {
-    setupBuildImageJob(jobType)
-
-    def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.weekly-deploy', jobType, "${jenkins_path}/Jenkinsfile.weekly.deploy", 'Kogito Images Weekly Deploy')
-    JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
-    jobParams.env.putAll([
-        PROPERTIES_FILE_NAME: 'deployment.properties',
-
-        MAX_REGISTRY_RETRIES: 3,
-
-        JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
-
-        GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
-        GIT_AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-        GIT_AUTHOR_PUSH_CREDS_ID: "${GIT_AUTHOR_PUSH_CREDENTIALS_ID}",
-
-        MAVEN_ARTIFACT_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
-        DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
-
-        QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
-    ])
-    if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
-        jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
-    }
-    KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
-        parameters {
-            stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
-
-            stringParam('BUILD_BRANCH_NAME', "${GIT_BRANCH}", 'Set the Git branch to checkout')
-
-            stringParam('APPS_URI', '', 'Git uri to the kogito-apps repository to use for tests.')
-            stringParam('APPS_REF', '', 'Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
-
-            // Build&Test information
-            booleanParam('SKIP_TESTS', false, 'Skip tests')
-            stringParam('EXAMPLES_URI', '', 'Git uri to the kogito-examples repository to use for tests.')
-            stringParam('EXAMPLES_REF', '', 'Git reference (branch/tag) to the kogito-examples repository to use for tests.')
-
-            // Deploy information
-            booleanParam('IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_USER_CREDENTIALS_ID, IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
-            stringParam('IMAGE_REGISTRY_USER_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_USER_CREDENTIALS_ID}", 'Image registry user credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-            stringParam('IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID', "${CLOUD_IMAGE_REGISTRY_TOKEN_CREDENTIALS_ID}", 'Image registry token credentials id to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
-            stringParam('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
-            stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
-            stringParam('IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
-            booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
-
-            stringParam('GIT_CHECKOUT_DATETIME', '', 'Git checkout date and time - (Y-m-d H:i)')
-
-            booleanParam('SEND_NOTIFICATION', false, 'In case you want the pipeline to send a notification on CI channel for this run.')
-        }
-    }
-}
diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
deleted file mode 100755
index a15d034b0f7..00000000000
--- a/.ci/jenkins/dsl/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e
-#
-# 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.
-#
-
-file=$(mktemp)
-# For more usage of the script, use ./test.sh -h
-curl -o ${file} https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
-chmod u+x ${file}
-${file} $@
\ No newline at end of file
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index d4de8727c2e..00000000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-# General changes
-*       @ricardozanini @wmedvede
-
-# Work on CI/Jenkins
-.ci @ricardozanini @jstastny-cz @rodrigonull
diff --git a/.github/bot-files/reviewers.yml b/.github/bot-files/reviewers.yml
deleted file mode 100644
index 02670968ecb..00000000000
--- a/.github/bot-files/reviewers.yml
+++ /dev/null
@@ -1,32 +0,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.
-#
-
-# we don't need path reviewers here but the bot expects atleast one row inside it.
-
-review:
-  - paths:
-      - Jenkinsfile*
-      - .ci
-      - .github
-    reviewers:
-      - radtriste
-      - msmagnanijr
-default:
-  - spolti
-  - vaibhavjainwiz
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 72277e817ae..00000000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,56 +0,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.
-  -->
-
-Many thanks for submitting your Pull Request :heart:! 
-
-Please make sure your PR meets the following requirements:
-
-- [ ] You have read the [contributors guide](README.md#contributing-to-kogito-images-repository)
-- [ ] Pull Request title is properly formatted: `[Issue XXXX] Subject`
-- [ ] Pull Request contains link to the JIRA issue
-- [ ] Pull Request contains description of the issue
-- [ ] Pull Request does not include fixes for issues other than the main ticket
-- [ ] Your feature/bug fix has a testcase that verifies it
-- [ ] You've tested the new feature/bug fix in an actual OpenShift cluster
-- [ ] You've added a [RELEASE_NOTES.md](RELEASE_NOTES.md) entry regarding this change
-
-<details>
-<summary>
-How to retest this PR or trigger a specific build:
-</summary>
-
-- <b>(Re)run Jenkins tests</b>  
-  Please add comment: <b>Jenkins [test|retest] this</b>
-</details>
-
-<details>
-<summary>
-How to backport a pull request to a different branch?
-</summary>
-
-In order to automatically create a **backporting pull request** please add one or more labels having the following format `backport-<branch-name>`, where `<branch-name>` is the name of the branch where the pull request must be backported to (e.g., `backport-7.67.x` to backport the original PR to the `7.67.x` branch).
-
-> **NOTE**: **backporting** is an action aiming to move a change (usually a commit) from a branch (usually the main one) to another one, which is generally referring to a still maintained release branch. Keeping it simple: it is about to move a specific change or a set of them from one branch to another.
-
-Once the original pull request is successfully merged, the automated action will create one backporting pull request per each label (with the previous format) that has been added.
-
-If something goes wrong, the author will be notified and at this point a manual backporting is needed.
-
-> **NOTE**: this automated backporting is triggered whenever a pull request on `main` branch is labeled or closed, but both conditions must be satisfied to get the new PR created.
-</details>
\ No newline at end of file
diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml
deleted file mode 100644
index 0146f9b41c3..00000000000
--- a/.github/workflows/jenkins-tests-PR.yml
+++ /dev/null
@@ -1,41 +0,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.
-#
-
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-name: Jenkins Tests
-on:
-  pull_request:
-    paths: 
-    - '.ci/jenkins/**'
-    - '.github/workflows/jenkins-tests-PR.yml'
-
-jobs:
-  dsl-tests:
-    concurrency:
-      group: ${{ github.repository.name }}_dsl_tests-${{ github.head_ref }}
-      cancel-in-progress: true
-    runs-on: ubuntu-latest
-    steps:
-    - name: DSL tests
-      uses: apache/incubator-kie-kogito-pipelines/.ci/actions/dsl-tests@main
-      with:
-        main-config-file-repo: apache/incubator-kie-kogito-pipelines
-        main-config-file-path: .ci/jenkins/config/main.yaml
-        branch-config-file-repo: apache/incubator-kie-kogito-pipelines
diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml
deleted file mode 100644
index a309c7c61e8..00000000000
--- a/.github/workflows/kogito-images-pr-check.yml
+++ /dev/null
@@ -1,87 +0,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.
-#
-
-name: Images PR check
-
-on: pull_request
-jobs:
-  bats_test:
-    concurrency:
-      group: ${{ github.repository.name }}_bats_test-${{ github.head_ref }}
-      cancel-in-progress: true
-    name: Bats Tests
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install xmllint
-        run: |
-          sudo apt-get update &&\
-          sudo apt-get -y install --no-install-recommends --fix-missing \
-          libxml2-utils
-      - name: Cache bats binaries
-        uses: actions/cache@v1
-        with:
-          path: $GITHUB_WORKSPACE/bats/
-          key: ${{ runner.os }}-bats-binaries
-          restore-keys: |
-            ${{ runner.os }}-bats-binaries
-      - name: run bats
-        run: |
-          ./scripts/run-bats.sh
-
-  validate_kogito_imagestream:
-    concurrency:
-      group: ${{ github.repository.name }}_validate_kogito_imagestream-${{ github.head_ref }}
-      cancel-in-progress: true
-    name: Validate Kogito imagestreams
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download openshift-validator-tool
-        run: |
-          wget https://github.com/jboss-container-images/jboss-kie-modules/raw/main/tools/openshift-template-validator/openshift-template-validator-linux-amd64
-      - name: Add execution permission to openshift-validator-tool
-        run: |
-          chmod +x openshift-template-validator-linux-amd64
-          mv openshift-template-validator-linux-amd64 ${HOME}
-      - name: validate kogito imagestream
-        run: |
-          ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml
-
-  shellcheck:
-    concurrency:
-      group: ${{ github.repository.name }}_shellcheck-${{ github.head_ref }}
-      cancel-in-progress: true
-    name: ShellCheck
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Shellcheck
-        run: |
-          sudo apt-get update &&\
-          sudo apt-get -y install --no-install-recommends \
-          shellcheck
-      - name: Check configure scripts
-        run: |
-          # Ignore SC2034 since we have many var which are unused in the script but can be used while deployment at runtime by setting env. For eg: ${KOGITO_QUARKUS_JVM_PROPS}
-          # Ignore SC1090 since the source files in our case didn't need to be checked
-          shopt -s globstar nullglob
-          shellcheck -e SC2034 -e SC1090 -S warning modules/**/configure modules/**/*.sh
diff --git a/.github/workflows/pr-backporting.yml b/.github/workflows/pr-backporting.yml
deleted file mode 100644
index eac84bc0f51..00000000000
--- a/.github/workflows/pr-backporting.yml
+++ /dev/null
@@ -1,59 +0,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.
-#
-
-name: Pull Request Backporting
-
-on:
-  pull_request_target:
-    types: [closed, labeled]
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  compute-targets:
-    if: ${{ github.event.pull_request.state == 'closed' && github.event.pull_request.merged }}
-    runs-on: ubuntu-latest
-    outputs:
-      target-branches: ${{ steps.set-targets.outputs.targets }}
-    env:
-      LABELS: ${{ toJSON(github.event.pull_request.labels) }}
-    steps:
-      - name: Set target branches
-        id: set-targets
-        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/parse-labels@main
-        with:
-          labels: ${LABELS}
-  
-  backporting:
-    if: ${{ github.event.pull_request.state == 'closed' && github.event.pull_request.merged && needs.compute-targets.outputs.target-branches != '[]' }}
-    name: "[${{ matrix.target-branch }}] - Backporting"
-    runs-on: ubuntu-latest
-    needs: compute-targets
-    strategy:
-      matrix: 
-        target-branch: ${{ fromJSON(needs.compute-targets.outputs.target-branches) }}
-      fail-fast: false
-    env:
-      REVIEWERS: ${{ toJSON(github.event.pull_request.requested_reviewers) }}
-    steps:
-      - name: Backporting
-        uses: apache/incubator-kie-kogito-pipelines/.ci/actions/backporting@main
-        with:
-          target-branch: ${{ matrix.target-branch }}
-          additional-reviewers: ${REVIEWERS}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 028be8b7cdb..08f2f807cab 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+###
 # 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
@@ -14,37 +15,320 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-/target
-/local
-target/
 
-# bats
-bats/*
+## ci
+!/.ci
+
+## node
+**/node_modules/
+**/dist/
+**/dist-dev/
+**/dist-dev-webapp/
+**/dist-tests/
+**/dist-tests-e2e/
+**/dist-storybook/
+**/e2e-tests-tmp/
+**/coverage/
+**/target/
+**/.dashbuilder/
+**/out/
+**/.DS_Store
+*.log
+.classpath
+.project
+**/.settings/
+package-lock.json
+
+## chrome-extension-pack-kogito-kie-editors
+**/logs/
+**/screenshots/
+
+# builds
+**/build
+**/.rpt2_cache
+
+# misc
+**/.env
+**/.env.local
+**/.env.development.local
+**/.env.test.local
+**/.env.production.local
+!packages/kie-sandbox-distribution/.env
+
+## kie-editors-standalone
+**/e2e-tests/**/videos
+**/e2e-tests/**/screenshots
+**/e2e-tests/**/results
+**/e2e-tests/**/downloads
+
+## online-editor
+**/videos/
+!packages/online-editor/build
+
+## serverless-logic-web-tools
+!packages/serverless-logic-web-tools/build
+
+## runtime-tools-task-console-webapp
+!packages/runtime-tools-task-console-webapp/build
+
+## runtime-tools-management-console-webapp
+!packages/runtime-tools-management-console-webapp/build
+
+## dev-deployment-dmn-form-webapp
+!packages/dev-deployment-dmn-form-webapp/build
+
+## vscode-*
+**/.vscode-test/
+**/.vscode-test-web/
+*.vsix
+*.dockerimage
+**/test-resources/
+**/vscode*-tmp
+
 
 # Eclipse, Netbeans and IntelliJ files
-/.*
-!.gitignore
-!.github
-!.ci
-/nbproject
-/*.ipr
-/*.iws
-*.iml
-*/*.iml
-.idea/
+**/nbproject
+**/.classpath
+**/.project
+**/.settings
 
-# Repository wide ignore mac DS_Store files
+**/jitexecutor
+
+# Language Server Extension
+packages/dmn-vscode-extension/server
+packages/bpmn-vscode-extension/server
+packages/kie-editors-dev-vscode-extension/server
+packages/vscode-java-code-completion-extension-plugin/vscode-java-code-completion-extension-plugin-core/lib
+
+# imported from kogito-editors-java
+.settings
+.metadata/*
+.gwt-tmp/
+target/
+bin/
+.errai/
 .DS_Store
+*.releaseBackup
+*.versionsBackup
+release.properties
+.gwt
+/war/WEB-INF/classes/
+packages/stunner-editors/errai-ioc/war/WEB-INF/classes/
+packages/stunner-editors/errai-tools/war/
+*/**/war/WEB-INF/classes
+*/**/war/AsyncDemo/
+*/**/war/ClientService/
+*/**/war/HelloWorld/
+*/**/war/QueryService/
+*/**/war/RPCDemo/
+*/**/war/Serialization/
+*/**/war/StockDemo/
+*.JUnit/
+*/**/gwt-unitCache/
+*/**/class_list.txt
+*.jpage
+packages/stunner-editors/**/.factorypath
+packages/stunner-editors/**/dependency-reduced-pom.xml
+packages/stunner-editors/**/org.kie.workbench.screens
+packages/stunner-editors/**/org.kie.workbench.widgets
+packages/stunner-editors/**/org.kie.workbench.forms
+packages/stunner-editors/**/videos/**
+packages/stunner-editors/**/*.mp4
+packages/stunner-editors/**/.netlify
+packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/java/org/
+packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/js/SCESIM.js
+packages/stunner-editors/drools-wb-screens/drools-wb-scenario-simulation-editor/drools-wb-scenario-simulation-editor-kogito-marshaller/src/main/resources/org/drools/workbench/scenariosimulation/kogito/marshaller/js/Jsonix-all.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/main/webapp/kogito-editors-js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/main/webapp/org.kie.workbench.common.dmn.showcase.DMNKogitoRuntimeWebapp/
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/main/webapp/model/DC.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/main/webapp/model/DI.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/main/webapp/model/DMN12.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/main/webapp/model/DMNDI12.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/main/webapp/model/KIE.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/main/webapp/model/Jsonix-all.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-runtime/src/main/webapp/model/MainJs.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/mapper/JSIName.java
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/mapper/JsUtils.java
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/model/MainJs.java
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/model/callbacks/
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/model/dc/
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/model/di/
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/model/dmn12/
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/model/dmndi12/
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/model/kie/
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/DC.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/DI.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/DMNDI12.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/DMN12.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/KIE.js
+packages/stunner-editors/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/js/Jsonix-all.js
+packages/stunner-editors/**/src/main/webapp/org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoTesting/
+packages/stunner-editors/**/src/main/webapp/org.drools.workbench.screens.scenariosimulation.webapp.DroolsWorkbenchScenarioSimulationKogitoRuntime/
+packages/stunner-editors/**/src/main/webapp/org.kie.workbench.common.stunner.kogito.StunnerStandaloneShowcase/
+packages/stunner-editors/**/src/main/webapp/org.kie.workbench.common.stunner.kogito.KogitoBPMNEditor/
+packages/stunner-editors/**/src/main/webapp/org.kie.workbench.common.dmn.showcase.DMNShowcase/
+packages/stunner-editors/**/src/main/webapp/WEB-INF/classes/
+packages/stunner-editors/**/src/main/webapp/WEB-INF/deploy/
+packages/stunner-editors/**/src/main/webapp/WEB-INF/lib/
+packages/stunner-editors/**/src/main/webapp/WEB-INF/model/
+packages/stunner-editors/**/src/main/webapp/model/
+packages/stunner-editors/**/kie-wb-common-dmn-webapp
+packages/stunner-editors/.idea
+
+# serverless-workflow-diagram-editor
+packages/serverless-workflow-diagram-editor/**/dependency-reduced-pom.xml
+packages/serverless-workflow-diagram-editor/**/src/main/webapp/WEB-INF/classes/
+packages/serverless-workflow-diagram-editor/**/src/main/webapp/WEB-INF/deploy/
+packages/serverless-workflow-diagram-editor/**/src/main/webapp/WEB-INF/lib/
+packages/serverless-workflow-diagram-editor/**/src/main/webapp/WEB-INF/model/
+packages/serverless-workflow-diagram-editor/**/src/main/webapp/model/
+packages/serverless-workflow-diagram-editor/kie-wb-common-stunner/kie-wb-common-stunner-client/kie-wb-common-stunner-lienzo/src/main/resources/org/kie/workbench/common/stunner/client/lienzo/resources/
+
+
+# dashbuilder
+packages/dashbuilder/**/org.uberfire
+packages/dashbuilder/**/org.dashbuilder
+packages/dashbuilder/**/WEB-INF/classes/
+packages/dashbuilder/dashboard.zip
+packages/dashbuilder/nbproject
+packages/dashbuilder/uberfire-docs/src/main/asciidoc/*.html
+packages/dashbuilder/**/org.dashbuilder.DashbuilderAuthoring
+packages/dashbuilder/**/gwt-unitCache
+packages/dashbuilder/dashbuilder-authoring/src/main/webapp/WEB-INF/lib/
+packages/dashbuilder/dashbuilder-authoring/src/main/webapp/WEB-INF/classes/
+packages/dashbuilder/**/dependency-reduced-pom.xml
+packages/dashbuilder/dashbuilder-runtime-parent/dashbuilder-runtime-client/src/main/webapp/dashbuilder/component
+**/.apt_generated/
+**/.apt_generated_tests/
+
+#kie-sandbox-fs
+packages/kie-sandbox-fs/dist
+packages/kie-sandbox-fs/coverage
+packages/kie-sandbox-fs/junit
+packages/kie-sandbox-fs/*-0.0.0-development.tgz
+
+# sonataflow-operator
+# These files are generated by Cekit, we can ignore the operator-sdk ones.
+packages/sonataflow-operator/bundle.Dockerfile
+packages/sonataflow-operator/Dockerfile
+# Test binary, built with `go test -c`
+packages/sonataflow-operator/**/*.test
+# Output of the go coverage tool, specifically when used with LiteIDE
+packages/sonataflow-operator/**/*.out
+# Build
+packages/sonataflow-operator/bin/
+packages/sonataflow-operator/target/
+packages/sonataflow-operator/e2e-test-report.xml
+
+#angular
+**/.angular
+
+#maven
+.flattened-pom.xml
+**/mvnw
+**/mvnw.cmd
+**/.mvn
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+.idea/artifacts
+.idea/compiler.xml
+.idea/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+*.iml
+*.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+# xml-parser-ts-codegen on some packages
+packages/bpmn-marshaller/**/ts-gen
+packages/dmn-marshaller/**/ts-gen
+packages/scesim-marshaller/**/ts-gen
 
-# Original jbpm ignores
-*~
+# kogito-sf-{builder|devmode}-image: excluding module build folders
+!packages/sonataflow-image-common/resources/**/build
+!packages/sonataflow-builder-image/resources/**/build
+!packages/sonataflow-devmode-image/resources/**/build
+!packages/sonataflow-image-common/test-resources/
+!packages/sonataflow-builder-image/test-resources/
+!packages/sonataflow-devmode-image/test-resources/
 
-# Test info
-/settings*.xml
-/lib-jdbc/
-*.db
-*.tlog
+!packages/kogito-data-index-ephemeral-image/test-resources/
+!packages/kogito-data-index-postgresql-image/test-resources/
+!packages/kogito-jobs-service-ephemeral-image/test-resources/
+!packages/kogito-jobs-service-postgresql-image/test-resources/
+!packages/kogito-jobs-service-allinone-image/test-resources/
+!packages/kogito-jit-runner-image/test-resources/
 
-# python
-scripts/__pycache__
+__pycache__
+packages/python-venv/venv
 
+# devbox
+.devbox
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index a07e390bd5d..00000000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,23 +0,0 @@
-Apache KIE (incubating) is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the name of Apache Incubator. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-Some of the incubating project’s releases may not be fully compliant with ASF
-policy. For example, releases may have incomplete or un-reviewed licensing
-conditions. What follows is a list of known issues the project is currently
-aware of (note that this list, by definition, is likely to be incomplete):
-
-* Hibernate, an LGPL project, is being used. Hibernate is in the process of 
-  relicensing to ASL v2
-* Some files, particularly test files, and those not supporting comments, may
-  be missing the ASF Licensing Header
-
-If you are planning to incorporate this work into your product/project, please
-be aware that you will need to conduct a thorough licensing review to determine
-the overall implications of including this work. For the current status of this
-project through the Apache Incubator visit:
-https://incubator.apache.org/projects/kie.html
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index f49a4e16e68..00000000000
--- a/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c41914ce838..00000000000
--- a/Makefile
+++ /dev/null
@@ -1,117 +0,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.
-#
-
-IMAGE_VERSION := $(shell python scripts/retrieve_version.py)
-SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}')
-KOGITO_APPS_TARGET_BRANCH ?= main
-KOGITO_APPS_TARGET_URI ?= https://github.com/apache/incubator-kie-kogito-apps.git
-BUILD_ENGINE ?= docker
-BUILD_ENGINE_TLS_OPTIONS ?= ''
-.DEFAULT_GOAL := build
-CEKIT_CMD := cekit -v ${cekit_option}
-NATIVE := true
-
-clone-repos:
-# if the ignore_test env is not defined or false, proceed with the tests, as first step prepare the examples to be used
-ifneq ($(ignore_test),true)
-ifneq ($(ignore_test_prepare),true)
-	cd tests/test-apps && export CONTAINER_ENGINE=$(BUILD_ENGINE) && bash clone-repo.sh $(NATIVE) $(image_name)
-	cd ../..
-endif
-endif
-
-.PHONY: list
-list:
-	@python scripts/list-images.py $(arg)
-
-.PHONY: display-image-version
-display-image-version:
-	@echo $(IMAGE_VERSION)
-
-# Build all images
-.PHONY: build
-# start to build the images
-build: clone-repos _build
-
-_build:
-	@for f in $(shell make list); do make build-image image_name=$${f}; done
-
-
-.PHONY: build-image
-image_name=
-build-image: clone-repos _build-image
-
-_build-image:
-ifneq ($(ignore_build),true)
-	scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI};
-	${CEKIT_CMD} --descriptor ${image_name}-image.yaml build ${build_options} ${BUILD_ENGINE}
-endif
-# tag with shortened version
-ifneq ($(ignore_tag),true)
-    ifneq ($(findstring rc,$(IMAGE_VERSION)),rc)
-	    ${BUILD_ENGINE} tag docker.io/apache/incubator-kie-${image_name}:${IMAGE_VERSION} docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}
-    endif
-endif
-# if ignore_test is set to true, ignore the tests
-ifneq ($(ignore_test),true)
-	${CEKIT_CMD} --descriptor ${image_name}-image.yaml test behave ${test_options}
-	tests/shell/run.sh ${image_name} "docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}"
-endif
-
-
-# push images to quay.io, this requires permissions under kiegroup organization
-.PHONY: push
-push: build _push
-
-_push:
-	@for f in $(shell make list); do make push-image image_name=$${f}; done
-
-.PHONY: push-image
-image_name=
-push-image:
-	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:${IMAGE_VERSION}
-	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:latest
-ifneq ($(findstring rc,$(IMAGE_VERSION)), rc)
-	@echo "${SHORTENED_LATEST_VERSION} will be pushed"
-	${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}
-endif
-
-
-# push staging images to quay.io, done before release, this requires permissions under kiegroup organization
-# to force updating an existing tag instead create a new one, use `$ make push-staging override=-o`
-.PHONY: push-staging
-push-staging: build _push-staging
-_push-staging:
-	python scripts/push-staging.py ${override}
-
-
-# push to local registry, useful to push the built images to local registry
-# requires parameter: REGISTRY: my-custom-registry:[port]
-# requires pre built images, if no images, run make build first
-# the shortened version will be used so operator can fetch it from the local namespace.
-# use the NS env to set the current namespace, if no set openshift will be used
-# example:  make push-local-registry REGISTRY=docker-registry-default.apps.spolti.cloud NS=spolti-1
-.PHONY: push-local-registry
-push-local-registry:
-	/bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}
-
-# run bat tests locally
-.PHONY: bats
-bats:
-	./scripts/run-bats.sh
diff --git a/README.md b/README.md
deleted file mode 100644
index a2eafada409..00000000000
--- a/README.md
+++ /dev/null
@@ -1,576 +0,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.
-  -->
-
-Kogito
-------
-
-**Kogito** is the next generation of business automation platform focused on cloud-native development, deployment and execution.
-
-<p align="center"><img width=55% height=55% src="docsimg/kogito.png"></p>
-
-[![GitHub Stars](https://img.shields.io/github/stars/apache/incubator-kie-kogito-images.svg)](https://github.com/apache/incubator-kie-kogito-images/stargazers)
-[![GitHub Forks](https://img.shields.io/github/forks/apache/incubator-kie-kogito-images.svg)](https://github.com/apache/incubator-kie-kogito-images/network/members)
-[![Pull Requests](https://img.shields.io/github/issues-pr/apache/incubator-kie-kogito-images.svg?style=flat-square)](https://github.com/apache/incubator-kie-kogito-images/pulls)
-[![Contributors](https://img.shields.io/github/contributors/apache/incubator-kie-kogito-images.svg?style=flat-square)](https://github.com/apache/incubator-kie-kogito-images/graphs/contributors)
-[![License](https://img.shields.io/github/license/apache/incubator-kie-kogito-images.svg)](https://github.com/apache/incubator-kie-kogito-images/blob/main/LICENSE)
-[![Twitter Follow](https://img.shields.io/twitter/follow/kogito_kie.svg?label=Follow&style=social)](https://twitter.com/kogito_kie?lang=en)
-
-
-# Kogito Container Images
-
-To be able to efficiently execute Kogito services on the Cloud there's a need to have Container Images so it can be played
-smoothly on any Kubernetes cluster. There are a few sets images which are divided in three different groups which are 
-the components, the builder images and the runtime images.
-
-
-Table of Contents
-=================
-
-- [Kogito Container Images](#kogito-container-images)
-- [Table of Contents](#table-of-contents)
-  - [Kogito Images Requirements](#kogito-images-requirements)
-  - [Kogito Images JVM Memory Management](#kogito-images-jvm-memory-management)
-  - [Kogito Component Images](#kogito-component-images)
-    - [Kogito Data Index Component Images](#kogito-data-index-component-images)
-    - [Kogito Jobs Service Component Images](#kogito-jobs-service-component-images)
-      - [Jobs Services All-in-one](#jobs-services-all-in-one)
-    - [Kogito JIT Runner Component Image](#kogito-jit-runner-component-image)
-  - [Contributing to Kogito Images repository](#contributing-to-kogito-images-repository)
-    - [Building Images](#building-images)
-      - [Image Modules](#image-modules)
-    - [Testing Images](#testing-images)
-      - [Behave tests](#behave-tests)
-        - [Running Behave tests](#running-behave-tests)
-        - [Writing Behave tests](#writing-behave-tests)
-      - [Bats tests](#bats-tests)
-        - [Running Bats tests](#running-bats-tests)
-        - [Writing Bats tests](#writing-bats-tests)
-    - [Reporting new issues](#reporting-new-issues)
-
-         
-## Kogito Images Requirements 
-
-To interact with Kogito images, you would need to install the needed dependencies so that the images can be built and tested.
-
-* Mandatory dependencies:
-    * Moby Engine or Docker CE
-        * Podman can be use to build the images, but at this moment CeKit does not support it, so images build with podman
-            cannot be tested with CeKit.
-    * [CeKit 4.8.0+](https://docs.cekit.io/en/latest/): 
-        * CeKit also has its own dependencies:
-            * python packages: docker, docker-squash, odcs-client. 
-            * All of those can be handled with pip, including CeKit.
-            * if any dependency is missing CeKit will tell which one.
-    * [Bats](https://github.com/sstephenson/bats) 
-    * Java 17 or higher
-    * Maven 3.9.3 or higher
-            
-* Optional dependencies:
-    * [source-to-image](https://github.com/openshift/source-to-image)
-        * used to perform local s2i images using some of the [builder images](#builder-images)
-    * [GraalVM 23+](https://github.com/graalvm/mandrel/releases) Java 17 or higher
-        * Useful to test Kogito apps on native mode before create a Container image with it.
-    * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html)
-        
-
-## Kogito Images JVM Memory Management
-
-All the Kogito Container Images contains a base module that will calculate the JVM max (Xmx) and min (Xms) values based
-on the container memory limits. To auto tune it, you can use the following environment variables to instruct the scripts
-what value the min and max should have:
-
-- JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in **JAVA_OPTIONS**. This is used to calculate a default 
-  maximal heap memory based on a containers restriction. If used in a container without any memory constraints for the
-  container then this option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio of the 
-  container available memory as set here. The default is `50` which means 50% of the available memory is used as an 
-  upper boundary. You can skip this mechanism by setting this value to `0` in which case no `-Xmx` option is added. 
-
-- JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in **JAVA_OPTIONS**. This is used to calculate a 
-  default initial heap memory based on the maximum heap memory. If used in a container without any memory constraints 
-  for the container then this option has no effect. If there is a memory constraint then `-Xms` is set to a ratio 
-  of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` is used as the initial heap size. 
-  You can skip this mechanism by setting this value to `0` in which case no `-Xms` option is added.
-
-For a complete list ov environment variables that can be used to configure the JVM, please check the [dynamic resources](modules/kogito-dynamic-resources/module.yaml) module      
-  
-When performing Quarkus native builds, by default, it will rely on the cgroups memory report to determine the amount of memory
-that will be used by the builder container. On OpenShift or k8s, it can be defined by setting the memory limit.
-The build process will use 80% of the total memory reported by cgroups. For backwards compatibility, the env
-`LIMIT_MEMORY` will be respected, but it is recommended unset it and let the memory be calculated automatic based
-on the available memory, it can be used in specific scenarios, like a CI test where it does not run on OpenShift cluster.
-
-#### SonataFlow Builder Image usage
-
-##### Using as a builder
-
-The main purpose of this image is to be used within the Kogito Serverless Operator as a builder image, below you can find
-an example on how to use it:
-
-```bash
-FROM docker.io/apache/incubator-kie-sonataflow-builder:latest AS builder
-
-# Copy all files from current directory to the builder context
-COPY * ./resources/
-
-# Build app with given resources
-RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
-#=============================
-# Runtime Run
-CMD /usr/bin/java -jar target/quarkus-app/quarkus-run.jar
-#=============================
-```
-
-##### Using for application development
-
-If you run the image, it will start an empty [Kogito Serverless Workflow](https://kiegroup.github.io/kogito-docs/serverlessworkflow/latest/index.html) application with [Quarkus Devmode](https://quarkus.io/guides/maven-tooling#dev-mode). This allows you to develop and to run quick tests locally without having to setup Maven or Java on your machine. You can have your workflows in your local file system mounted in the image so that you can see test the application live.
-
-To run the image for testing your local workflow files, run:
-
-```shell
-docker run -it --rm -p 8080:8080 -v <local_workflow_path>:/home/kogito/serverless-workflow-project/src/main/resources/workflows docker.io/apache/incubator-kie-sonataflow-builder:latest
-```
-
-Replace `<local_workflow_path>` with your local filesystem containing your workflow files. You can test with the [example application](https://kiegroup.github.io/kogito-docs/serverlessworkflow/latest/getting-started/create-your-first-workflow-service.html#proc-creating-workflow).
-
-After the image bootstrap, you can access [http://localhost:8080/q/swagger-ui](http://localhost:8080/q/swagger-ui) and test the workflow application right away!
-
-##### Using the SonataFlow Builder Image nightly image
-
-The nightly builder image has been built and optimized with an internal nightly build of the Quarkus Platform.  
-There are 2 environment variables that should not be changed when using it:
-
-- QUARKUS_PLATFORM_VERSION = kogito-${KOGITO_VERSION}
-- MAVEN_REPO_URL = https://repository.jboss.org/nexus/content/repositories/kogito-internal-repository/
-
-That way, no new artifacts will be downloaded and you can directly use it.
-
-## Kogito Component Images
-
-The Kogito Component Images can be considered as lightweight images that will complement the Kogito core engine 
-by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications.
-Today we have the following Kogito Component Images:
-
-* [docker.io/apache/incubator-kie-kogito-data-index-ephemeral](https://hub.docker.com/r/apache/incubator-kie-kogito-data-index-ephemeral)
-* [docker.io/apache/incubator-kie-kogito-data-index-postgresql](https://hub.docker.com/r/apache/incubator-kie-kogito-data-index-postgresql)
-* [docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-ephemeral) 
-* [docker.io/apache/incubator-kie-kogito-jobs-service-postgresql](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-postgresql)
-* [docker.io/apache/incubator-kie-kogito-jobs-service-allinone](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-allinone)
-* [docker.io/apache/incubator-kie-kogito-jit-runner](https://hub.docker.com/r/apache/incubator-kie-kogito-jit-runner)
-
-
-### Kogito Data Index Component Images
-
-The Data Index Service aims at capturing and indexing data produced by one more Kogito runtime services. 
-For more information please visit this (link)(https://docs.jboss.org/kogito/release/latest/html_single/#proc-kogito-travel-agency-enable-data-index_kogito-deploying-on-openshift). 
-The Data Index Service depends on a PostgreSQL instance.
-The Persistence service can be switched by using its corresponding image
-
-- Ephemeral PostgreSQL: docker.io/apache/incubator-kie-kogito-data-index-ephemeral
-  [image.yaml](kogito-data-index-ephemeral-image.yaml)
-- PostgreSQL: docker.io/apache/incubator-kie-kogito-data-index-postgresql
-  [image.yaml](kogito-data-index-postgresql-image.yaml)
-
-Basic usage with Ephemeral PostgreSQL:
-```bash
-$ docker run -it docker.io/apache/incubator-kie-kogito-data-index-ephemeral:latest
-```
-
-Basic usage with PostgreSQL:
-```bash
-$ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus"  \
-    --env QUARKUS_DATASOURCE_USERNAME="kogito" \
-    --env QUARKUS_DATASOURCE_PASSWORD="secret" \
-    docker.io/apache/incubator-kie-kogito-data-index-postgresql:latest
-```
-
-To enable debug just use this env while running this image:
-
-```bash
-$ docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-data-index-postgresql:latest
-```
-You should notice a few debug messages present in the system output.
-
-
-The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Data Index Service 
-to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications.
-
-### Kogito Jobs Service Component Images
-
-The Kogito Jobs Service is a dedicated lightweight service responsible for scheduling jobs that aim at firing at a given time. 
-It does not execute the job itself, but it triggers a callback that could be an HTTP request on a given endpoint specified 
-on the job request, or any other callback that could be supported by the service. 
-For more information please visit this [link](https://github.com/apache/incubator-kie-kogito-runtimes/wiki/Job-Service).
-
-Today, the Jobs service contains four images:
-
-- [ephemeral](kogito-jobs-service-ephemeral-image.yaml)
-- [postgresql](kogito-jobs-service-postgresql-image.yaml)
-- [all-in-one](kogito-jobs-service-allinone-image.yaml)
-
-Basic usage:
-
-```bash
-$ docker run -it docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:latest
-```
-
-To enable debug on the Jobs Service images, set the ` SCRIPT_DEBUG` to `true`, example: 
-
-```bash
-docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:latest
-```
-
-You should notice a few debug messages being printed in the system output.
-
-The ephemeral image does not have external dependencies like a backend persistence provider, it uses in-memory persistence
-while working with Jobs Services `postgresql` variant, it will need to have a PostgreSQL server previously running.
-
-#### Jobs Services All-in-one 
-
-The Jobs Services All in One image provides the option to run any supported variant that we have at disposal, which are:
-
-- PostgreSQL
-- Ephemeral (default if no variant is specified)
-
-There are 3 exposed environment variables that can be used to configure the behaviour, which are:
-
-- SCRIPT_DEBUG: enable debug level of the image and its operations
-- ENABLE_EVENTS: enable the events add-on
-- JOBS_SERVICE_PERSISTENCE: select which persistence variant to use
-
-Note: As the Jobs Services are built on top of Quarkus, we can also set any configuration supported by Quarkus
-using either environment variables or system properties.
-
-Using environment variables:
-```bash
-podman run -it -e VARIABLE_NAME=value docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest
-```
-
-Using system properties:
-```bash
-podman run -it -e JAVA_OPTIONS='-Dmy.sys.prop1=value1 -Dmy.sys.prop2=value2' \
-  docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest
-```
-
-For convenience there are `container-compose` files that can be used to start the Jobs Service with the desired
-persistence variant, to use execute the following command:
-
-```bash
-podman-compose -f contrib/jobs-service/container-compose-<variant>.yaml up
-```
-
-The above command will spinup the Jobs-service so you can connect your application.
-
-The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Jobs Service
-to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications
-
-### Kogito JIT Runner Component Image
-
-The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/apache/incubator-kie-kogito-apps/tree/main/jitexecutor).
-
-Basic usage:
-
-```bash
-$ docker run -it docker.io/apache/incubator-kie-kogito-jit-runner:latest
-```
-
-To enable debug just use this env while running this image:
-
-```bash
-docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-jit-runner:latest
-```
-You should notice a few debug messages being printed in the system output. You can then visit `localhost:8080/index.html` to test the service.
-
-To know what configurations this image accepts please take a look [here](kogito-jit-runner-image.yaml) on the **envs** section.
-
-## Contributing to Kogito Images repository
-
-Before proceeding please make sure you have checked the [requirements](#kogito-images-requirements).
-
-### Building Images
-
-To build the images for local testing there is a [Makefile](./Makefile) which will do all the hard work for you.
-With this Makefile you can:
-
-- Build and test all images with only one command:
-     ```bash
-     $ make
-     ```
-     If there's no need to run the tests just set the *ignore_test* env to true, e.g.:
-     ```bash
-     $ make ignore_test=true
-     ```
-
-- Test all images with only one command, no build triggered, set the *ignore_build* env to true, e.g.:
-     ```bash
-     $ make ignore_build=true
-     ```
- 
-- Build images individually, by default it will build and test each image
-     ```bash
-     $ make build-image image_name=kogito-data-index-ephemeral
-     $ make build-image image_name=kogito-data-index-postgresql
-     $ make build-image image_name=kogito-jobs-service-ephemeral
-     $ make build-image image_name=kogito-jobs-service-postgresql
-     $ make build-image image_name=kogito-jobs-service-allinone
-     $ make build-image image_name=kogito-jit-runner
-     ```
-  
-     We can ignore the build or the tests while interacting with a specific image as well, to build only:
-     ```bash
-     $ make ignore_test=true image_name={image_name}
-
-     ```
-     
-     Or to test only:
-     ```bash
-     $ make ignore_build=true image_name={image_name}
-     ```      
-     
-- Build and Push the Images to quay or a repo for you preference, for this you need to edit the Makefile accordingly: 
-      ```bash
-      $ make push
-      ```
-      It will create 3 tags:
-        - X.Y
-        - X.Y.z
-        - latest
-        
-      to push a single image:
-      ```bash
-      $ make push-image image_name={image_name}
-      ```     
-        
-- Push staging images (release candidates, a.k.a rcX tags), the following command will build and push RC images to quay. 
-      ```bash
-      $ make push-staging
-      ```
-      To override an existing tag use:
-      ```bash
-      $ make push-staging override=-o
-      ```
-      It uses the [push-staging.py](scripts/push-staging.py) script to handle the images.
-
-- Push images to a local registry for testing 
-      ```bash
-      $ make push-local-registry REGISTRY=docker-registry-default.apps.spolti.cloud NS=spolti-1
-      ```
-      It uses the [push-local-registry.sh](scripts/push-local-registry.sh) script properly tag the images and push to the
-      desired registry.
-
-- You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
-
-#### Image Modules
-
-CeKit can use modules to better separate concerns and reuse these modules on different images. 
-On the Kogito Images we have several CeKit modules that are used during builds. 
-To better understand the CeKit Modules, please visit this [link](https://docs.cekit.io/en/latest/handbook/modules).
-
-Below you can find all modules used to build the Kogito Images
-
-- [kogito-data-index-common](modules/kogito-data-index-common): Data Index common module.
-- [kogito-data-index-ephemeral](modules/kogito-data-index-ephemeral): Installs and Configure the ephemeral PostgreSQL data-index jar inside the image.
-- [kogito-data-index-postgresql](modules/kogito-data-index-postgresql): Installs and Configure the PostgreSQL data-index jar inside the image.
-- [kogito-jobs-service-common](modules/kogito-jobs-service-common): Job service common module
-- [kogito-jobs-service-ephemeral](modules/kogito-jobs-service-ephemeral): Installs and Configure the in-memory jobs-service jar inside the image
-- [kogito-jobs-service-postgresql](modules/kogito-jobs-service-postgresql): Installs and Configure the postgresql jobs-service jar inside the image
-- [kogito-jobs-service-allinone](modules/kogito-jobs-service-all-in-one): Provides the runner script that supports all jobs-service flavors
-- [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images
-- [kogito-logging](modules/kogito-logging): Provides common logging functions.
-- [kogito-jit-runner](modules/kogito-jit-runner): Installs and Configure the jit-runner jar inside the image
-- [kogito-maven](modules/kogito-maven): Provides custom configuration script.
-
-
-For each image, we use a specific *-image.yaml file.
-Please inspect the image files to learn which modules are being installed on each image:
-
-- [docker.io/apache/incubator-kie-kogito-data-index-ephemeral](kogito-data-index-ephemeral-image.yaml)
-- [docker.io/apache/incubator-kie-kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml)
-- [docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml)
-- [docker.io/apache/incubator-kie-kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml)
-- [docker.io/apache/incubator-kie-kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml)
-- [docker.io/apache/incubator-kie-kogito-jit-runner](kogito-jit-runner-image.yaml)
-
-### Testing Images
-
-There is two kind of tests, **behave** and **bats** tests.
-
-#### Behave tests
-
-For more information about behave tests please refer this [link](https://docs.cekit.io/en/latest/handbook/testing/behave.html)
-
-##### Running Behave tests
-
-To run all behave tests:
-
-```bash
-make test
-```
-
-
-CeKit also allows you to run a specific test.
-See [Writing Behave Tests](#writing-behave-tests).
-
-Example:
-```bash
-make build-image image_name=sonataflow-builder test_options=--wip
-```
-
-Or by name:
-```bash
-make build-image image_name=sonataflow-builder test_options=--name <Test Scenario Name>
-```
-
-You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`.
-
-##### Writing Behave tests
-
-
-With the Cekit extension of behave we can run, practically, any kind of test on the containers, even source to image tests.
-There are a few options that you can use to define what action and what kind of validations/verifications your test must do.
-The behave test structure looks like:
-
-```bash
-Feature my cool feature
-    Scenario test my cool feature - it should print Hello and World on logs
-  	  Given/when image is built/container is ready
-	  Then container log should contain Hello
-	  And container log should contain World
-```
-
-One feature can have as many scenarios as you want.
-But one Scenario can have one action defined by the keywords given or when, the most common options for this are:
-
- - **Given s2i build {app_git_repo}**
- - **When container is ready**
- - **When container is started with env** \
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| variable&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| value |\
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| JBPM_LOOP_LEVEL_DISABLED&nbsp;&nbsp;&nbsp;| true &nbsp;&nbsp;| \
- In this test, we can specify any valid environment variable or a set of them.
- - **When container is started with args**: Most useful when you want to pass some docker argument, i.e. memory limit for the container.
-
-The **Then** clause is used to do your validations, test something, look for a keyword in the logs, etc. 
-If you need to validate more than one thing you can add a new line with the **And** keyword, like this example:
-
-```bash
-Scenario test my cool feature - it should print Hello and World on logs
-  	  Given/when image is built/container is ready
-	  Then container log should contain Hello
-	   And container log should contain World
-	   And container log should not contain World!!
-	   And file /opt/eap/standalone/deployments/bar.jar should not exist
-```
-
-The most common sentences are:
-
- - **Then/And file {file} should exist**
- - **Then/And file {file} should not exist**
- - **Then/And s2i build log should not contain {string}**
- - **Then/And run {bash command} in container and check its output for {command_output}**
- - **Then/And container log should contain {string}**
- - **Then/And container log should not contain {string}**
-
-
-CeKit allow us to use tags, it is very useful to segregate tests, if we want to run only the tests for the 
-given image, we need to annotate the test specific or the entire feature with the image name, for example, 
-we have the common tests that needs to run against almost all images, instead to add the same tests for every 
-image feature, we create a common feature and annotate it with the images we want that
-specific test or feature to run, an example can be found on [this common test](tests/features/common.feature)
-For example, suppose you are working on a new feature and add tests to cover your changes. You don't want to run all existing tests, 
-this can be easily done by adding the **@wip** tag on the behave test that you are creating.
-
-All images have already test feature files. If a new image is being created, a new feature file will need to be created
-and the very first line of this file would need to contain a tag with the image name.
-
-For example, if we are creating a new image called docker.io/apache/incubator-kie-kogito-moon-service, we would have a feature called
-**kogito-moon-service.feature** under the **tests/features** directory and this file will look like with the following
-example:
-
-```text
-@docker.io/apache/incubator-kie-kogito-data-index-postgresql
-Feature: Kogito-data-index-postgresql feature.
-    ...
-    Scenarios......
-```
-
-For a complete list of all available sentences, please refer the CeKit source code:
-https://github.com/cekit/behave-test-steps/tree/v1/steps
-
-
-#### Bats tests
-
-What is Bats tests ? 
-From Google: Bats is a TAP-compliant testing framework for Bash.
-It provides a simple way to verify that the UNIX programs you write behave as expected.  
-A Bats test file is a Bash script with special syntax for defining test cases.  
-Under the hood, each test case is just a function with a description.
-
-##### Running Bats tests
-
-To run the bats tests, we need to specify which module and test we want to run.  
-As an example, let's execute the tests from the [kogito-s2i-core](modules/kogito-s2i-core) module:
-
-```bash
- $ bats modules/kogito-s2i-core/tests/bats/s2i-core.bats 
- ✓ test manage_incremental_builds
- ✓ test assemble_runtime no binaries
- ✓ test runtime_assemble
- ✓ test runtime_assemble with binary builds
- ✓ test runtime_assemble with binary builds entire target!
- ✓ test copy_kogito_app default java build no jar file present
- ✓ test copy_kogito_app default java build jar file present
- ✓ test copy_kogito_app default quarkus java build no jar file present
- ✓ test copy_kogito_app default quarkus java build uberJar runner file present
- ✓ test copy_kogito_app default quarkus native builds file present
- ✓ build_kogito_app only checks if it will generate the project in case there's no pom.xml
- ✓ build_kogito_app only checks if it will a build will be triggered if a pom is found
-
-16 tests, 0 failures
-```
-
-##### Writing Bats tests
-
-The best way to start to interact with Bats tests is to take a look on its [documentation](https://github.com/sstephenson/bats) 
-and after use the existing ones as example.
-
-[Here](modules/kogito-jobs-service-common/tests/bats) you can find a basic example about how our Bats tests
-are structured.
-
-
-### Reporting new issues
-
-For the Kogito Images, we use the [Jira issue tracker](https://issues.redhat.com/projects/KOGITO) under the **KOGITO** project.
-And to specify that the issue is specific to the Kogito images, there is a component called **Image** that 
-should be added for any issue related to this repository.
-
-When submitting the Pull Request with the fix for the reported issue, and for a better readability, we use the following pattern:
-
-
-- Pull Requests targeting only main branch:  
-```text
-[KOGITO-XXXX] - Description of the Issue
-```
-
-- But if the Pull Request also needs to be part of a different branch/version and is cherry picked from main: 
-```text
-Master PR:
-[main][KOGITO-XXXX] - Description of the Issue
-
-0.9.x PR cherry picker from main:
-[0.9.x][KOGITO-XXXX] - Description of the Issue
-```
\ No newline at end of file
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
deleted file mode 100644
index 72f7c80fc71..00000000000
--- a/RELEASE_NOTES.md
+++ /dev/null
@@ -1,26 +0,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.
-  -->
-
-<!-- Keep them in alphabetical order -->
-## Enhancements
-
-## Bug Fixes
-
-## Known Issues
-
diff --git a/container.yaml b/container.yaml
deleted file mode 100644
index 064e9952f73..00000000000
--- a/container.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
----
-platforms:
-  only:
-    - x86_64
-    - aarch64
-compose:
-  pulp_repos: true
diff --git a/content_sets.yaml b/content_sets.yaml
deleted file mode 100644
index c57d57bc30d..00000000000
--- a/content_sets.yaml
+++ /dev/null
@@ -1,42 +0,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.
-#
-# This is a file defining which content sets (yum repositories) are needed to
-# update content in this image. Data provided here helps determine which images
-# are vulnerable to specific CVEs. Generally you should only need to update this
-# file when:
-#    1. You start depending on a new product
-#    2. You are preparing new product release and your content sets will change
-#
-# See https://mojo.redhat.com/docs/DOC-1023066 for more information on
-# maintaining this file and the format and examples
-#
-# You should have one top level item for each architecture being built. Most
-# likely this will be x86_64 and ppc64le initially.
----
-x86_64:
-  - rhel-8-for-x86_64-baseos-rpms
-  - rhel-8-for-x86_64-appstream-rpms
-  - rhocp-4.7-for-rhel-8-x86_64-rpms
-ppc64le:
-  - rhel-8-for-ppc64le-baseos-rpms
-  - rhel-8-for-ppc64le-appstream-rpms
-  - rhocp-4.7-for-rhel-8-ppc64le-rpms
-aarch64:
-  - rhel-8-for-aarch64-baseos-rpms
-  - rhel-8-for-aarch64-appstream-rpms
diff --git a/contrib/jobs-service/container-compose-postgresql.yaml b/contrib/jobs-service/container-compose-postgresql.yaml
deleted file mode 100644
index e3d1b9c4481..00000000000
--- a/contrib/jobs-service/container-compose-postgresql.yaml
+++ /dev/null
@@ -1,48 +0,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.
-#
-services:
-  postgres:
-    image: postgres:13.4-alpine3.14
-    container_name: postgres
-    ports:
-      - "5432:5432"
-    volumes:
-      - ./sql:/docker-entrypoint-initdb.d/
-    healthcheck:
-      test: [ "CMD", "pg_isready", "-q", "-d", "kogito", "-U", "kogito-user" ]
-      timeout: 45s
-      interval: 10s
-      retries: 50
-    environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-
-  jobs-service-all-in-one:
-    image: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest
-    container_name: jobs-service
-    ports:
-      - "8080:8080"
-    depends_on:
-      - postgres
-    environment:
-      JOBS_SERVICE_PERSISTENCE: postgresql
-      QUARKUS_DATASOURCE_JDBC_URL: "jdbc:postgresql://postgres:5432/kogito"
-      QUARKUS_DATASOURCE_USERNAME: kogito-user
-      QUARKUS_DATASOURCE_PASSWORD: kogito-pass
-      KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false"
\ No newline at end of file
diff --git a/contrib/jobs-service/sql/init.sql b/contrib/jobs-service/sql/init.sql
deleted file mode 100644
index 1d27d5affa8..00000000000
--- a/contrib/jobs-service/sql/init.sql
+++ /dev/null
@@ -1,39 +0,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.
---
-
-CREATE ROLE "kogito-user" WITH
-    LOGIN
-    SUPERUSER
-    INHERIT
-    CREATEDB
-    CREATEROLE
-    NOREPLICATION
-    PASSWORD 'kogito-pass';
-
-CREATE DATABASE kogito
-    WITH
-    OWNER = "kogito-user"
-    ENCODING = 'UTF8'
-    LC_COLLATE = 'en_US.utf8'
-    LC_CTYPE = 'en_US.utf8'
-    TABLESPACE = pg_default
-    CONNECTION LIMIT = -1;
-
-GRANT ALL PRIVILEGES ON DATABASE kogito TO "kogito-user";
-GRANT ALL PRIVILEGES ON DATABASE kogito TO postgres;
diff --git a/docsimg/kogito.png b/docsimg/kogito.png
deleted file mode 100644
index 2f5fead8a8fa855ad04b64b8519002f0747d87c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33218
zcmXtAby!s2)4#hkNC?ucAOaF1-67H;Eg>i%(%rF3tE99_N=TQ|u?s37C?K$Ohjd8S
z?!FhkzxNM?=kc65bLLEbX0C5^wN*%o8HfP@AXQU+qz3?a;I9xTLVWN?a@MUM;141<
z)u)~SKtg%-2QoAhatQ!zfZ8Jk1Ha6z8InwM!}q&r)CR6#qBiagcJ>(}%|?zvtvA!}
z-+C~bk=Y9f9xi+rzH@s~l_xBgC5pY6Ng$jnGV|xDWWd^u?go1L==iE(76lFw!Z0B%
zC~ng*5pFEL64xWa#ls7K9>-|)s&)g^>}IVmx;;ndrJEs_Mfwb?1#|IqU|3jMy4=ZO
zgXew<ETplav1>yNI&YzG{Jd1JG%Lp+WE}uH-<bg8BZi6OXp$q=vt62{m=p#*^$Ha1
z*%Ng&c|q}MGbZ77O8M#!&BPVzB}V827PN0j>_v+<_E+D)1w+Uz<cf+LuMtqJ1b0E(
zeMMH$a1!Ahv4$zI0V4Rps3iI7;*<@>9lrL?%^O#1;TGO_aLHRHl_{n#rZdWW-*$AY
zA&5xfHcyGq?+O)!BX7$MU#$bi^*ygyo8L8E!f%MRN(`|^e&-1|REC-322;JuS?zRl
zt+5NM!nt1UT`UQV$Y7Rn0zSH1i;Eh#u#Zl?Cc^)dcnD<QTaJMu{=#!e>~RLwMA)v^
z|19MJoHls8HY)<yqY0KKbe}wEG$IIh>^=)%6Y&}p^B{4Z&dzLC6`5BIk-fg8YJUVI
zmkjG7>e3VCO+EFRUOFsyoo9OV=9I5eWlsey`+tOq7{q{Iey3vDl;JA#8p=7c={ORK
zN`!=0r^+jK-2fQHFB$tJEjY)O?u8bJcvDLjVzbE5L(Rcr_7U)_RRD+82%zgKVxGL1
z4Xan9GqG`4=hw1`ELN{DH85y@x^Aqi?oD+br*`gJ@7a32Ll;p4Mb^=8^Q8$BaixhV
zQWPsK^s;#AQ;nxd8q}bgJzBi~UI>bMQ>Sh2B_syFD2on^$;z8kyWXs5iwl>`XiPIM
zzdQ7>T8g(LwNlfp82dGFO^y~XTraZu<(2ZBzD*fYaA2i|iCiE-!3)@)&|mF_vu)i3
zHYze5OVmsI63HO?^m=PnrDo9~>_)IOFSq);6*3E;^633*=xl_b#s#O%%56VNT%SAm
z7$07n>P@7heZMa%Fy@Ew^b_WDYCUnk7vW?$`VSK$b1EL0Kbq6JUhL2y1&mC|HtaLq
zeSrecm-;SMR3_c>P}olqzxHrVP_RegW(4d_9x=r=SCR(!a3>wjQSWbUKUVUl-xpOX
zekMcH(2Kq7=3&OgAAXp)C*Xbv#l2db`#2Rc&lXNZx$52bsd6J_-qk<6t)7z^H(-W;
z610tqd5t(m3YBV9-8Cl>rA)wvbKbx|9!_oi@cUjfpS1~Kc<9gX2%1%^kSnrb@)qv?
zE$%pr3=BJb+AB~0J0rmLkLAQq&zH(yc63%X^^Fxu(FGq4Op7Ga%UE2~Hb#po!@iV0
zU`7g+cgFuMs_g8%FDrO`oYNa9(kJ`5<D?f%xr}3eXsVG2qxpoQarB9w!Lms8+Y{dF
zWe)PdT9=0fb(%QQSB~){cnnKCm4m+e%*=@4+VIpY)n}Z?Q6b|$E~u|pi@b&+MYDy=
zK6o3Nyx`Csp?bOd_o(c>recV8y@na#ORC_k2RytBeAkPg9??8|YL~`Qhc-C*!dNhL
zUvz>$YrNj74fRoQR5l8Jy+}8_;h&9!VeFUSC$46xrHEGdI~%A^4R~|KT=)pRRmVGd
zBOXim<MKUMz7&uroqbV8Yg*XfRI#x!tZlHH<zM}wZq8=u7=OrUSJ)JNGD?Yg`bGGq
z$o&3emP_|7$i*&3A{|S9eOBim(6ilN7^?mq$dNa9FxMKAP{%s^Fqg&uum4eJAHs0c
z@;okJP0Va$G)pQD@lio(=v(=u`a_GSqxl!39dV4H_8aQBxNPvK8m=mJk<xR>^&J!m
zmnHx0H~K;r6zw3_YMABst96F_@J&bhh}u|XHRg--w3(9-&9x^$7H2v^LY`lc9ig&O
z8>Ks956e%o(s;2Y919&^1`q{1!OLnOA7-d;h}lmpll!&*b_>nFRMLDDv>HOalF>Zz
zb}0$jkpj60Hw-$^B*P@Wol*L5qOZd2Q7w5ss5J7g`<MQO*sf!cMWMjV(CY0TOS|&x
zo5LSSlmNGe?`rAk1fyNKZcse-#D3E$?a)FPCCHwHolksWL?ur}_2#|kWtN&YGnX1w
z8pPo=q7y@MmW*z(?C>4O9myPxZheen)O%FFTdz5x^E<~s(NxebP4c)$3AIr1aN}G;
zW?h3f&YMIXw4F!z4c7+`5`H2^de<{<Y8VcB&oyfWqu<8FPTjq2c7wNp{_$g%JD8tE
zv~g8L83u9m?D%FO;kQvA8v5Xgf9i2J$9P0gFv?EWz<EeZ!)`s37yL;iV>b#b{8IbF
zSBFxeYnj4n@ZgRXnxn1j9o`$s;Q}Z_3*irM>Tg!f9rD&apE}lUxVc&w;MCYKPQ|zO
z%tJ;~g0x=`J?Ry{Hbb{HpAb;L+vUDV4%-ldvwrcQx#l_J6Cbj_{$p>%;8c~^+miC+
z?Kh4&bOr*Ke;e4H@65_jJUYqTbX-=e<*wFtC3?o#J5NsE>pmSy&^6o6IL4lCzP-P?
zE&~cdq>Ja8Af4eYpq{5Nn{k`OX$`S;=kZE5xd3@vX$WR7xxL}$Truwly&09t&>QO&
zQ?*B8yBp6{rhHci#C4fP0$(mp`7R|w<Y4Ih7K`APyoK3C1MB~cF}8#WD7Bc<A+XT;
zn7aMOcg8KXh9%5(+9&$_JL1^$JKH_Ei)q{Z<Bmfu#Y4Ha%LD$q*vCesCp0Z_hSz)v
z7Bv`5&pTy=8ce7S(tOewkSb%+h31`(xH~IE!Cw6E4Vf3Z)DQS5eZ9I^!4@yqscdRv
z<7e`$?Evf`z*+`(NMNr(pki741G0u-tEy<b&e*@STzqBipHgX_G3+x-@J{4Dj9?`C
z!K>P%laeZI1q#A)loTqZ612n1k64LX0PVTv+O&Z#YAuLS0L2fU!jYtZ7)3pf)3cAM
z4W$Cld=%WO5)I7wBsSdYHfp$Hrx@PfaC`Thit>;X1>@iNc2EB!=dHuR@CUDQf(N)k
z&KETr#09#{T>hu~MB9~sK}#uMb|g>CmHbMn(q(^e>c05?d1l}^)6r@-a|OTOT#5Eh
zw)AepjC)Qq_MaVtEIgICFZ5&OgHffuZ-Mv*-Mugmf1P5?b<&Wl9f%8eFebcbC_2_0
zpjbFmx%xqeZj;?jdPbN|Z~cV!Gt27zLq?5T__N2z$*A%hH*8IhUuh%u%PK9C$#0y{
ztYZnTL@Lkxm;@-KozE@fk^gs^jxlAPmHcKxuCSwTsY~wcFVS<6#!+(IvK5hOI{l7(
zzb-Mvvv%d{lTxS>S(l7vFF*K{v<zj}kCV&u7%29MgwLp#fHr#nT}cb54u*+U8POH-
z+R7bswIl;X^<(CoCB!K|zwols^=ut)B{p=$DDgK<9_^)_fJ}|i{XZ#J`t2Anu*wX1
z_BD1;PN?5gFneu7Qe<Fl8yBHzoa6IC;#HEueS1P|#I#Nm!UG}aZT`_ckS0R<R0;n?
zoD6Gp6LW2w6a&SO+)?Lp6R#s*EZ=zgzGJ!oKf%kV>>W=h!w~P5Ltvmc=$+~=w0myU
zGoMh_OpAB+s^DCYM}XOSU*P&)58~*7jna=v?%|w6b~*tuk*b|{OM2C%CLGXT1}u!o
z`iB@U<2ca7u84MBmW&6Eh@V~C_MYgoUGifV%ae*JbJv!3m&OM1SLM(vdhidi^ninQ
z8Bm4zVo)hW{La8u&D)4U?P$@sKSZZ#VDU}&FO3!JjMq-6XBWOXysnPgyb}&A8zYwV
zogTyCo3Y+8Q7L-LV+mB()b4{h+XzamEEbgb><giJb^~@}ySPI0Bj1@?tA^CO+#BTg
z4CC!d961Zn(~H{HGPiQj-7ueE9b(Ws7{~r+g}Ptdagb}_jg?*QiUF~arg-;IPwh9v
zXbsUnMJFELHjMWTaerDG716`-SJ#q@esK7td^oF-@sREIwS*GkL^$#mkxNdz*@tv3
zi<=E}n|Y`E-I&{_p=?7WI;Harc^j_x|0E{PCIpF7SEU>9M{Pu*<a~k$GV58cDX?vp
zmH-Blz_eAlX)S1ABWQ9t`el6qLsPv9YMv6^lxKcVw~vg=NM?OYHxP@9xed55&wtUe
zb-F!P**Q)De^%PK*CCJoqs4BB2X7{JYjO`)Hpc2(R#(*+I7W)Q8{u2^Jen@oJk?VF
z%4rhi6!923rAq+oF$$vpwPez9vUF7#0c?(?6@WoASNfL+xq99lZQY90dZ;ufcXTwl
z4{lrBh!~M_VCC5(UHz~X?_|D}yrfWRp^WZ4Lr|J^9kT4#926L!Ai00PO0FiEwcC|P
z-cAW+qrCl-W(@RheT}4diPSjnlPdIt%N3mK;O~nIFE{tnUG0NEexeT)2YO0OQQbqS
z429n}XeS8k5w#)0uALY&5@}orT)aLR<6nNOMgRQ{jz1F**$GWnJi|5Hxlcw+A;so8
zYnQunr|wM*+>d0zy}Be(!6Q06;+)b))KJU}!7RwlBA6HShWjy1&U*}rU$Yxm^cT=I
zUY~w7ZS}^0T}_}?_l%D4_Cn5$I;(LNY0B(#Ldcxd!Ti40qOQd;!o@v!AZ=4Y>3S<N
zEPw|{-9d@il$+je>nY&jHsCL7BE%-G+`%<JGmeP^A84ML9=S9qDPwhAM*t>z#z1kI
zcc$}1G7l0=5$wvN6-%26O8Z1R<)qA`;6jn&BOR=Z8@rf~H80-}cPL&TB>X9W7vRJ-
zuMG5+V3+w>Ajxe|U)D^B-SW5z?KS#mOPg&C(!t-6{<>nDeo|CGKyq#VK+G)7K~5UQ
z-b-s#5~C5eQM#4=ksgW@WidAA30pjg-y4X#hr4w;*-);DOs!bVYmX9orGmdB{?{v)
zqLwp#_tlAv^vm24#GpxpK06bE;TrwDqv4G!mY#`_l9P9zW3(*rO6GquikS>uydx)&
zl2=enIUWd7YpV{9b~kGy#7?(h7r3a%A+|B67GmbM<<X0-Mzao_tt{Q83$wQ&Y#V8P
zzN)7_4Fh&=xg&En_dDsCF+U|#J&^<FrJ;IqyWZegdzCwUNa{33UYg*)$E^5)BdV(D
z%kmTx@y+|zFoo0A3<GG$>LLjxx`>?|lL(O#dexoB9)N|s4&S><JBzip0Ns;4Q|GG(
z9t*DPo@gk0Z@{Hq)zHXsnY>+0`M5)7!U03hx}~~&p?+ius-_JxK8|l->E4EdBB1*v
zB?4APgas*4ByoW6z3GrGFc<9V-{Sn*hS!$T3~v0)jejA>E<M}VsHw`@TyEm<Q}a=@
z9O?dpULQO9>ZQS`TZfxaieiw?=9)VgYvF?&lmMu{1gUys^kOErQR=+y2jTPCn(y^8
zAF<X|WumjKE|^3=fRQ)U)MI3!hV{s{Aw;fc@O%Td@o@CMnf4JYJYadBSwB@Tn41tw
zLzZ&xp94lldEKN^(0ohndQ9pbg^8|P&=3>(@;9vn*6hYbXc>D82#qf242b01Be#B|
zq_}y2s1_<VegbtY(e^49o;I_gybJ%ZzNf>3HHC&86JB4r{5w?M0=4AD_WF>Y<Oj7S
zg7bLPlIT5$lcJvu<(EU-Sf$ST#B<}jH%-QR)-Q12PQ`@SNoa_C1Pl}yp=lB|oDxdo
zoglzf;QQX-!P#B(%;NErWH&X%yAf)4AN1*_HDb<HeA6#>&W_`zc2o<DZApzbLlppB
zkxn^~0vr7seE5gqP&To0Oij(-Bqww##>HK&k%OJ8lT+zwQpSy-2|3J{n!o26=v_HC
zjOWr}Fhu_Rzxel4O&Va@;p=Umz6xKp6?&!bgPKmu=6FtgW0ayo1pkRK+X%T$=dppY
zzDb&Il9oP~>LjD$Ph5a51z^C*xiE)+%|wCnBE$-;{In;{z|h`|(YEtnVzJqDo%{07
zBMz*DZlG1)S6Q@+AL~-kzgV*7t-jH(_Cn7)Zqfp#1eA=?`kitq4M<+AP$ErzJs_1e
z#MSo8+}MD#=E!$6BpKCE`F75j%;l%ib}H*d%(#+5kQ3gqusGKoSOW?hL9A{y1x0I;
z418?BwN^F8RID6by|pO^1F*3nC(zbzBrB*(wqmaKVslrF7WTRw#?5I~FL#lx|6;~}
zf_Te=r~1aPH&W$yqdrx+-e8mQI&I*Xm(n~1Qy{p3dNWkF69GC12+>mI#i+A(dpa(+
zdjsZK@Z_6~;Lj_u-UZQ4GiiL&?m=fefqhdR7JJfyp9@RM2A#{H@W)p~fbnD#VC~Df
zz*T@QkLK31_4~;;_i)sa9lg}<H-Trg%Qc+{5~zo2xCKvOn}3+-d^jvi36;p^Tdl?w
zWVn_wvXX-rXbCpN8k)BKUF|YWvI#3aWGYXOP;N6GJQ3jSMFRrjVx#%*thAw$A2Da2
z$)omSHK^wmt*Pae?p$7_g<Bdzz@ZVEYf3OsZvVN+wAok5Ct`1iN{7UD_D1QuB!@P`
zPO=yRdH3vGuz4t!v<6E{U9<Lo%15B->s}SI?k!4AIQZ3!3#=fu`Ny}f9zAd7XxWlo
zp=-(VeAA<mojumsy}_XuT}Q9mnbT+%T3BjOs^OgE@B@r)8Z+MC3`?=K2`LSq0;?Z2
zkN|`89%u18$Zv8_*seH~r{OS!tbHw238N{oNn-nEC}J_q;^2{Ej6uDyW}Zm=Ze&%$
z?=3>{2!HU#w3n7YT^vD{Y&$pHZEbJ&FVZq8245X5b6wITDyreZ`(+0;5=UV_eyph9
zO}B}8$&{XzXuav$#aTmr`UQJB(Dgw}DE4uuS2rOLivQnBHPT7}UQK8*Vyw3G%WU_L
zTCgwsqbA{U8Rt{ti!OLOfj+wEy=;i}%w3{k=4kj<I03`0|D>TpNe%BW3b=B#nb9zz
zjOQyj|Df+dbtSPTo!~GFwH?%8GKQVZWy*<BLPJ)zPUtr41xe{%NnbkxxLgSlP-y)A
zkk50w*>$F<erNjWi7y(gbNZDuPC3J$Eox2%zv}DTU~HIqUOq*05;FE0pm@dh-)2iS
zT=;gEdgse+v8Q}3drYf3DK~5y!FsbRpw5POt&TQl_1xtSFb3mz_OWGi_kL=bj)kXq
zao70;K3ouVlO)%s2OyFNfr=As%lWS$f5$>c%jQCXQQu3})y##JkZ*D&=P4Tl0crz3
zsprl@54zdI9nzS*8*5w?TJ5<3J@)k7#A>-&0sV{ra%;BD7kF^~b3Zle8GpMhr}C-0
z;dDka$B$;_l<W1HvkhXaRgdg4!2~dHNQHX7Fh*N!^nS4%GhQOG<fU1DiUZjxM*VaQ
zG$Bya=#wAe<r=QCh<0mG&ybeEoXSy)y~=it?R|u?ObvQ?rUL6S>-ogGrL?vlb<SYK
zEd@ejZ(pl?C#4wh^%=x(@n$rGW4+qZoQ`Ol$%*efz7$#fG&X5HJO(b!14BGNht2!e
zzoAfhw(x7O4&TGIgp7wYUc|C#ALTfmT~06h;jkt0jpbl5&8!IqkZ1pn%woN#;y=hF
z=Tpf4{%?~Y9xKr6^C*4M2y5Y^SShUvd95l^d>B!le)uWn%?N)TlNV6M3jY8~yyE)d
z<TJv^0gD(jbi-DsXRNo?iX~tC5!3f9Rpxt}e7Hd4yFOn{)Nsi4>%f7VfYEC+^vT3Y
z=Ax|?Q74yS-VkH$Gd;Yud|Ea@^HDU+5t_5prp;|AXar_AaC`;8gkAe+t{i>03@lve
zH|058Tvb`ALirefP2xZqwBB|iB5?{a#<6CgjN$k<gMhWt4Q`jCIh5VsIFVevX&!k?
zaP@5fS1<NDQBX~2hz!wzftbJwJ8^yR0TvTDGpA6B<(JvLZ_P}%4i-;FbBN1>mG$<z
zB*Yy<xMk}WbaP;{EkWA893me95`l}Yfa>NA+br((w)O784_*kYz<dEysDVf~p#KLc
zP=Rn)qj)X_q!5(_4~$}Ui!n-d1u6xaZ`(217n=e71;o1ezsGk(nnH%FVnqPmD><gD
zub&KA)(3{MoA90Mv@h;f8mS-MNI8Efu}&_ZvFHK;%ZOv_KDRZWz5CsAJ#@6G8k~zN
zf0Nx1epODRR?X|_yNSM+fgaJ^8vPNd&Wi?F9V}i}G~u6nVxTVbImJ{`;Z%&qo&^@j
zKUeeEm>dfC?jV4JVe#n<wz_TmHKk8a1S;Uk73rf{nAG2%=9~u5(C8i2YMBKcl)8xF
z^Wep0&XqL4@DBi^pbBK2KinINXpaucXf-2v3s@PJ18$8CYX!a?Vn%be<(!=THlVZA
zt<niu8`#9O2sq8<xu6$x;*JW&$>{3pK$5xZd#-B8lPCQ5y{N!?)~RPjDoq3REQ=aO
z_4GrZZ#l|Y6hOY^h=Qj)7M9S;G+0CbkijtufT-)#1vHgolGT6YBs?LKm_<f8SG5(5
zA`Tg?gN1cm7<r;KP)Tp<WyXR&?R0zooh!d*>}Rw&j&p20d^}lJS|w}0<7CYzw6c9s
zoKG(E-GsKA_2EDOOvdoR&Bob{VOZ;?tarzSw#ewxxx>K5hxkxB(81nPQ#<8Kg|&jH
z8|CWSN$%INd#*%(U(f)Ipw}52Cj)+PHU#NZXo+W@bvgTvh{PG9bkQf@0*`OdsYH1T
zw6+?`$bAh?sEZEyQn+)mq9@UM-YGZ21RbTqaJMnHnu1y7ix&eCt)mA;TmE^wiGR@}
z<>=4bn7KPjKkR>Blu{+Ux4Se;m2GI$uQ;DJjy-bdSxT<>M-`l4+9Q~Gm9W0R&f>0N
z2?}sQho1XR0wa_0lR`IunIXodocZ1nt#q&}n>grbwY3`ydDh=n&FT66n0VC=7V@#R
zrdc>AlV<4Oy=Hxu7hmkeb}&+PMt=$|D%h>s7IJj<0~o5-izat;ZC{JqR;f8)eueu~
zF=BmEZ5)I2Ai1sl7M2%jee>_hH{^*az?Wor%0KsKd*LKE0<J7$A<p|MlN>kK-p^0`
zxb4*j&v&d!=`Fh{d(M(yn<i&EU6NaE{Ps7niVZ7_ma!Jpn+x7g#Xv|`%qWy$?Tx?h
zMNmH&7PY!wM6E?FtBFW7go4U#r3Ic)DquRbc4iz$4%*5^?H=*!K6C$m*iChu!jPi-
zIHuFw$ako&x14(Jqv%N3y=WTu%YzT+Wmv1X&(dosFcbf_r<O>2-Z>*!p3&B0p`pXn
z<e)XeAJ<P?pMLhDW&=3xmH>n6sYFB{C*=+}^AXSLIATkEPoZ6+Mue)Tb^}@`=++&W
zS%6ixS4H|*VYdl{;s!HjhG~yi5low^)s3-dE}?%u!MJebZztUVqGJtX3S2)pEu<pX
zF%OEC;yGPVx4J}ya5*l&XoQeCkaoI)_JLYA4lxW~w7dwu@$ua@BIp$XG&O8b=hl_k
zr9}#fe;PJ{z$G~!;64JuDNFkep2M?7_1mGzmlDTtG^(WH%g9B%tG*}s`#dt&teWmI
zHP!u|hXZ9fGDn#kfj)z$zKL6ox5E|Mea>EV$`SBij#g|;i;x#nC5Rh<P`$$q{CCdn
z<mi2R?>TFolBpcO$&*BeQY>7)kmIuD73k+K2mxfhZdikIQ&9KFeJx!4d7aykT%*IM
zclp?pFPpA{wzFFm)30aeV$ug>s??UZA_!c-SWifGm1nf9Z6o*~GR)hDgZPON1@!=L
zTSb-4H24p<3QaRsp@bw?s{&t<ZmnCr<%2)spaC5E;;4afLv%OCLpH&tAeBJk5YelM
z!e4jbgwyls5e^bWY#B-cNNm`K9GjrzW%AtAZwNy4%Cn9Y?Z<*^3U~oSd8%X}BJ^s-
zf1%47tQ|($09Rob&{Gl{U?B^tYNx(;z~hlr{bmpwy(E1&FW*@Hu+oR@6rxq_kYEsF
zbsW+b@f-qSCZUxIn1PBmi_mDd=l;lQUqdC#yIFGc=b6JM>&LFM4V%pR0d4Q8o8+b3
zu7O(4f!3@?Yh?r@hr6=X+ss|2h254@Dx~Ot6<z0}*r1r^)jG8<$rrrfi=I)C<K6}f
zldIymg$MxJ%U9kLBq|$0<x7si$L=xcXo+KF9PAm~i3qlwS%M8rZ+eS3R?ThKh&t|W
zI~>nGHxK%N*nR2UEp01<TYdu@af!VbQEpUWDfcd}O2<&3wSA7o@~Dsbw}YAT>qc~f
zt6@T0{lE@ZE2HrvNB<0%eG2H^!u)H80DJa=)poGB8YtjhZ3r=8AsiYpY}DrVu5h<j
z*9zRMmUP~oOWzGTFvAwdkFVCvkS|AYBWBQZB*!zgQr~-tr`YFv_5^NGcE;a$;Ydoa
z67@RO@NFvfo0Hb|^kg25=w`6Zl9we9A>~fr%}@s|2KgN{^l(tGqToJXp1dPuyEzJ#
zuj9ovpB*tYDNgBS6f1f(uths^Hk>p6>I)q-iUGrEYxCMf3x0aG>ao#hRz$za?Xh&#
z1N}`7^blXw9S(O_Ycz2DCXL8b&ezpIlA=XG0>{C79uRo=Zx)~p7^5%aW}}8hzyc?!
zp_Kx1Vro4Br^Zz~^aDi)@w>GFjSZ?;el~!5!O{#_MF46DoA3|$9dg<c2uD`{Q2ZI@
zvk_udG9+Rvr80Rhi5NnJ?Yc`HzJFOTD0z;7JijUpa%F2tO+r-sL(WA7Z?eiKnHvB+
zGXzf0Cl!$~WRtJTpQksnvn|Yh@6V|hIcyP6ihz-LuaP73uONjh%ZHfloE`8Y?m#$t
z)vjS^$KhL0mIv!`9zBsYC`KqH#&Go)+EVq~Of2YtLsd0SKM#P~Lzq+vJ*4iO5!c<Y
zI~RaIk{|(4AK9$}83Ld_wde+(x+r)A45jf$bRHD}lcyWHh50kW1W+`G>LCv2Tl)Xa
zq!9a`+vBKa4g<Q|P0Wop({zdC%#Ga3Ewm{PO7fkE$wDi}YR!vnj!T@dC*WTIn*^AW
zt&m+n^w`Of46Bgbp>PEd=_Zje*D867`_u_r@%s^YQ_EoJEdG77Gl3VA0u=G)?Me)h
z0z{{r>>!1Lq@AaM?^Z6_Kg=ZqPWzO=V{pHR$cl{6LQmtLJ4M)0yK;)ey{eE<7o4<>
znPU)U(*FsUzlu9n>DfJj<%I*4W27nPQfD$m$h%dL+^a|Z6AS?@{c!o0y+E{wv7Vg`
z;o6-`Gwg;}-F94X>`~+L+~uD>&nyH7#2F{86k)5^R@ShOLkL`XBNs5d<Yym`aSBiC
z@t3ofHPGY04QFxWkN&1vO{j}^`?|^#Rrb$fpIS4cVib{{T!<acODWJ7Y_xVKXb9t`
zz%($w$)%-Kf_)Dby0%5L#xEH^&$-?hIw|mOY%pO$zXW6p*e;XFRSbjyKu9U%^E$H9
zkRbHP0Jpd4C=j#>67OO{V6=^|;IlXb1!#qd82EnC2eI~^TF<-K{-cIp97GUTnO<ks
zANMY&&b#k=4>%_GhFVZUY;IwGBDkBy`gyR}gU@o$gDOb(%|W#xJUZ1DkgN3YsLgyU
z$0p59gk26N-DL&fzy8oREI-`bH*e3kAm4p8)-nIeX7yu4uw$bjJ~BENihMmwb6+91
zHB{Z!>a$+y#Hk{Qb`Hbkh+*s}q01PKo6z_h*xQv#$P;Z$RzT3|E$f*ib{Vy=(evbl
z`d}^!x>yxMP)QCBccnsBA%v!h5G$L;hI_7`X23Cu63N7B%=6XnFN?56zh5m_a%dBZ
z8=ca+(?iuQdsEG_aN&L9e@P<vz*0>uf*0DJ{GTVc3R{DS-(0_0obo}kBmKu+9A29Z
zo+0bjJpsx{c-<jx=Do`pRl>DTT=Qzb1?U~qOt2C-x^mZnT3_`V-@v^`4auz^G*KJp
zPWEkt85Em|ELaw#QB+Uv2`t{mP1#VUFI|Km<vawAt~3+?bgOb30F|rJ8~y+wTaa^l
z199bCPsp{5<>q9S+p0a2&N1<AaaB(O-u|->#6DxL8*p6dzLRRr|9P)jPvexf<fW8b
z#e(JcA3pO`$HCse#$*(>>k$z6<bTN4>pLJvWxAaUqJ5>RYbR}%4aH{l+7$uNa@-e`
zl&RsL_=Z#TJVzF}rFy?<VS=!6*7%n8dOD}H^a8l$VwW-FWDuQ<eX~MQR;zNZ@~2SW
zC>XGys&LBH{9iHVR%lC7edPS6woNF-O*0I^n-kI?x%kevq)d!e*ZWi~&8%LFKU!Z!
zHYmxorlz9knP1);Dva{uDKe%j>eFOFVAP8f(HO_SfqOfBcTH2_)c22k31Ywm4-^kY
z>{nd)C@)|eSm>JCkrVf(it>Y6ZpJ8^;F~=GJ$mR}YK*c|6g>VMs3oN%l;@vgmy3}J
zMbJ=UB12fOYQL!TG(ga`oMWr_=ahw9kxWqFFw}d<T7tJ@P8FQ6a6|vwXg4N%;6jd~
z6=g|NJ*9o4h~)T&=&99uSb<v}ALam+M?Pf6RJi}aiv9=jv2lW>>c?i{_d8fF_CI(D
zS)XK&77rhNt8nNUU3{4R;j=8(ynp?qVoYq6w0QV<;{6(eyTft_Y!kd_vYrj#HS6sQ
z2DZPjG~&?x2Oq%;3iF_Y0dhh_sX>R>WWI`8=CKZ&G528qK4I_U{LiTkY|)y}?$FP^
z^CHYBxOe#x49dLN_A*&GSm2)nP?jr)1pw9Tq>$VrVr2e_&ycY*`OqEyk`N!YL>}>p
zu={y7J&I%y=V;hXm4qy3B;5L1-vOsQs4lnnWyn;l$VU+1R=AlL0lV2GN2yK;9ql(f
z<<frN`px7EoLC;22Zj$Z%IkC1Z+TtMY{``Hb&(Q%lslugOW-EPDk>A2NTo02h%aty
zL*;n@h>FJ<*_p)^q}kw*J7RfViUS3TYt(RUMMC3_IL&ENiOU!YsL_D;>E~&@Q9emH
zfz>-Q>}X@-ICXdgY=-FyFq997WC2X)qWpGj#L!p{O{v`pIgwE%>PYwveEN?GdpZ&~
z$|vw|j2qs>)ZtwkTvdM{Oft9!nJ-s64$pUX-O87h5f^C8hEct{xTyJ@z(0pgJR^hz
zM}o5G5SfBQG_Il|05p#5nZXmLS4F_uILE)JLfTd=4(xh{xGC(NOxqH!NnPs4hdF}x
zlKS6z8mB8Uyz>4-f$sUKbOl4Mb@NT#oeH5ds+g86ycAbly$ucnUQ#`r!G#+DP@?~!
z$9bh5Py(e1G+Qk{Of=pe4w%*37sW(BpE(x8a8RG<D<WaiTQ{v`xUns^gMr{1fW~M2
zI}Dr`g0izEmbW9nA-w<dR>u)cfGIgk!3PcK9kY5wjq%1gChqb1?_jUL`T5h7EbGSi
zf=Qguas+<g_{6nX-qyhAm_`Be@pDBgAVu#Co-^R>guaq-ZAl&ua`+h2Rs;61Z?%Lp
zw-GDRa&VykwuTx^8x#HQ54;pFL({CxrR^?A;byj-@OFLRjDW~Pui@d<S|$t_B(vI@
zuEglZwG0dfq(;Oj5cj>T(vSJPB{({~Sl^`cv?59KZ4Bs1)d|;LZ9Jfc%WM9pgh3=i
zS5tc8C6XS(stV|tyiM~+kvGlj^S?KiO9lvFau!jrcNB_9d)G4^P!NfMsgREUL`e~*
z%L`-~F#iTKSL@$VuLL8VK5NDF6*+4t&&jcZF433Jud}_1!BMo4csaEEKZi^4wgK;4
zU7U#N<@S-3^>3Q>37_uPqm6Q|RRTG>N1X^pvWv(X7KR)!Xb?kOr4~C3oKh>3FQqHh
zR%8gIK^lvFD^ffI1dcLdOe3&ftc>mkt8hD%PU)(QOmRRps6X!<`GXi@+bwaF*a5o|
zSJlm1XibUttr&M%UG@=RPz^8ln_8)@(5>Zof1b6g48*5h5t)Ct?_VIi#sv}#K!zo)
zmBC}0amcYzgjfn<=6&VoeTu;zIer&!z!YcQ8s_{XI#eWx?v<0|n&TMklXVSe370af
zFXQ1q8s<Pp0(G=G=szoNFFTIye%n?<uo?#mh%5%5Q3uOb*Wc`q3n#g9VfxOkgZb{_
zYTga^a4!$%TiH6x)FWU=2RETRC!=z7*XmOA1QrT{$}g9q+$b;|jLh}-M_`jOhwq(7
zmHvKG@Ej|(IN>G6U%^2#biUu}U6GpPjqiv&&#10Y#!kr0>%ssFvBkzauki;dcxGer
zvAZ1D62bjo2}#y*!Np+zihpAImG*w(<?UWz*w!u_+3q5xx!jrYZ3^*gQG4zEGg;yY
z%^b+saOQ?S<Xd_3Bah_4Wf{k}XXcS`M$4Sic)w+fu4Yb8FtN+bxJ}pWu;!9*@>y7S
zW6oOR1qkc?%KF7-4z@%x$Gih1I})txFu<USV6qFhB>tEolV`+WPl|c_H{&&{%&HC<
ziv`*?a$m{j)1-*Jwcw`+vCkN2z-u#jmI32gb}ujFPld`%nURx|zOk!MZJeipP{uN>
z;YR6~6PVA}kKvR7r=OXOp^}wW&Q)t!!2E9(9oq;PlAoIEY~Sw5+nhAz^MSYE<AuFv
z=|mn5qBtW{f(M<3VQCws24~0#B|1X3I3W+&L34LmH_snu@;av9kQ6xbTtw)v4VRy5
z{)QXOWC^ZN92qnIE$#Mg4wmT8x@<n*m_B+|uQ;Z}b2pg`%K=yju9LsPv^*g^&Br^T
zYbYF748Bcll|JK|+1w1Gj-*<~D?Xp^yOpFx2=VfCB3~HsKx!Ys#<xa0EI*WLsSK9~
z{^b8-HuQ-+6L$~@D;kJt(GR)lc0Y9$r|hUnet^!Bu^_4fxbgF+evUDYevW`K&TO?U
zY!gQ@KI1Uze5ia?|H+Z@`iBXfvOr3vT(CE;`BK(q*ZGYxO~@hAlF^Y{g;n0_);W&d
z8sao20#?m#9jZ|`={0ZpYej0gbKFCb9^vKsGfbA|3ymx<`U@wzr1JNQlu=VLu~)0b
z!*RY3vQu$j5}l<LJJLee9LHFjCzHNQSo&5p#w_XR!p%!I@yE%+pA=pk&$IZI^Dpub
zNNMrIiLZ2ho74+QSHQ5BPq3Tcj$V}JRmjDK<;biVZ(OeHfRa*3(of0X)4^!5oB1RY
zLjqqS=C>r$c(hf5IS#sr2gg6jS7e0EneFG*Bv4SO*$+~o-|_H%HQJ<t)jLQQBz#*5
z)v?eq_4<|Sb((ql;B$jce$CgHr{;+F0}qac*Dm%{?+6Ux20!29>w0V1AF_~Hy<660
zN?72Ui5rTL{%g0w#{K45B<L>hVa;%y3r9eoXTd&y?g2Nhdbf}>G|&<Och7MJ<Ex`&
zE<tr4Z?g~^AD47+vnfgO$ILYlukuK}kO;1ws-|^TN#udI6!tzs2p~V*?0%jfvi8eN
z`tPX)#LB#tJV7lxW_7vg&%!G=#VP17wdA{@DY$C;Dn)Ixa>5qqpo?2aJ)40#CWUtm
zpQ~&ie2{$J%eztVH$79cz?)l}bN(usCWdTQ;QsPB{mjQCaSFV0v)?%T^J&-hvpb0(
zgqekwp>?r};mN%_)S-Cw_*^kdZU%oI7!P%uQ?A;Z@8JpZ@L)=53?0EqI%xO=1CuGx
zBar!|Cz0&T6LTo$n*63Qp}l$aa31f%<)`_$SXzK0@?R%HwT;~hCj$01N5_ghi+ju8
zXh&a2cf-<U8X61sTkfqT2Sd|0l!HSnH8gZ`2iJ@Cf8cM3Jmn>VvJOoR5I;ze00Z|{
z-Xio@o%BPIr#yW6hiASIBBX9j(#(rm<K-visz*f|VC+-Cq_WRv-T^$YVk(r8<5C|N
zj$}zII$Uo|<9k~i#l!`Ab5oh^_`NFGeFggpvMODIw%?jj71P?M#?&Q}^s)ZG+}jDP
z#LywNX?s;JzXKfhCMg2S@u>iCF#A+K?1Lc{6dZe1E+vI9-n*o_YSB~@<E*R5$;Yb2
z$APs{F_)#sb5U8M3YT<>n4Ff$wVwr!-pZV%V@wAbOX7G)yo}|#b@lB}0|%jrJOB~!
zB>kTvGN2RD^N8Il9L#C1sBy89UHCCSNU9{W__#<smdK}`D^$k5MqxUe?^1LwoVJ!x
zcJ$CFF>Vvm2%2j*NRkiLg3}sQNyZIun8?pOCV?zPz~0p;BJoMFw-jU&>HRHM@KV%Z
z3>HV-h9QBUdhb^mW0i{JDE{R=l=vN>s>;`9=}!(Y82rG?m}&y74Pz?ty=K!t0u=9`
zfI0e2Fx`)WlQLnrL$pIRpQ?*c9@4M|Tr_eTW5*%}N$zn3%>Pot)ip9V`<-Sbvp^+}
zvj~l)HEa{(;(iTOgZ<-Pfj|y+Vn{ME_VyD(zl-Tr28m03Fr|7w{EeW!%dlo8{TXbh
zZk-~LB4n&)JfEN+nXP=D!MGcK7eNlkF9@vkfOI7&^Eco|>p|8oiPw(h+EFG-qN;o8
zHm9`jDE79{IU=KsnqSDaAT~H?fH6gO0`ZYg_L;I-SPSD3(cskY(T(-G>MG~34gLOq
zaQu7$<n*u29mANin6Nxtcz@YjmOy7#Yf{yZT-ZHP){_h#c{a1j!=J1SxLg+<O-(mp
z_}-k83_QA7i~_hE04~ELWrQ3*GNR+BatG*6ack%QWj%w+hdc}2dOFl&s2cZ(Kr3@A
z+D`3GBwR9xf#dR^$Q&)x>ofnao&cxk^;;6b!wZsu-=fjs5tP7R5Y)^ATT`_q;*XUH
zh2RxwC4&^~xgj}Eza4w-nm%49>e&U@mWtc8BORTy$o;rkOGicw_x5A{UPv8_j@E9e
z2n-ndy3AODwWi+Lll~81^_dZK^&@0o$B(;YH?Zx}W-~{<!XgD15-ectxe;rRc*3O<
zJbQY6fAX}sA?7RYvAn3rW*!>}m~~X`G1w7sU6kBr&t<rGWLJATeNRAqKbwtJD8K#c
z#pt`v<V#H?SPAo>i6Jj&Dz323i$B971ld{nMlM-;WU?y>m%b-mPgkav9fuxu{<^~|
zTM~qIoe=duu|D5Vv)_pQ{I`UJMXHdA;^hoU)$Z!{%`3}l!mCx&CX8vVpXm4*!ed)Y
z3C{kT#PHOA{3i=S7ppiW9IH5QveTm}fB;?*#BQomY~B5LR=Z%<R~Go}qwwGSq^tAx
z&4WN-Wkt{vgkEE(Zd2lCpPahCCx=*`qNn0SqQ`GTZPGKHZutd2%#Th+8}u3w7R&h^
zQ(*8mO=*X@Ag2na=?)snTf;MhkojXd%$u4t&X^pD7t^`-Z(H6;^`xwf+&UOo={1C*
z60Hs%4%l3voribZT&%gk*K@{01H(E5s=}w*Rh*)Xp)H*R10#)Xe{uk}7(ep<h>u`U
zYCFEllr@k1*<|aj<-CtET^@H;GmJMQOo+x<uroGC4W9V1Q$b1UvP1_qEv|gan*yMK
zK@j(^W_uTTYjai2UkWpL=vFe(yX`|9O)h38Tif~WL_LQJjO!UTpE<eWJYk5oq*l-V
zZtBx;5PlOj#-Vw5-r;HSqo%Q|@kr~BMDo~x48UNNHXAOsMzrscc{0;`5PJWpGW~h*
zRo3YkXXY>;NceheBdpu9Z-?d&Ecgttu3#8aaUJfbLd`KZYis#WIaco0E7U)L1-Q*N
zPGxi-w9Wnc<pi8Av$kSR>s8@$;1@~TN_6l^Qan17ud%Pl5>f_@-&AR>Z`LW~jPwyz
zX0FA1hsm+izsesFnerwaUfg-k!SgOTgjI<0(XPAZ#!~Ih0jovau<Rmv2OIo*;iZgt
zz^+C9obTp2v&p|~#w@D)n(NA)FJ+qAMEZBx<{-IaJfAE<Fu5j;+P#QLV`W-kl(ou5
z;?TWn;r)$^(>~G)LuYH2K5KeX|3aSHQDPmE<<*9PlPo~bMU}v5KjtzIU{!CDxRfuE
zJDQ?kjGS%Gs#oCO^cruy`!i7^I=Thtk%axIoa+oXiTQ_NlXqo-y@evLpH&RFFJ~|b
zyTmCVqV6R8E;%1JFUHEXQ9`~a4V}!d1?38qoXkF$^_&88FS}lTGSSUBE$`J=q|AUi
zy!PKw2?)~PdJxAk@Vf=pBtPS|7rK%EkX6K`L9Mf5@jxZ5?B;{!9Ma!(-ZM2mU_+mV
z2ut%gR0V9?Y6k4$ou>5Cd>3)&shN)=yLqm6i={lNddSfBBS!Ga2(>pQKFuKkTv*z&
zq_hV$;5u2)m(C;WCy92;MOf+_X0DU(WYJG{kt5le-3nJ^{8Z=0UJTKicYPX=T4u`4
z%_&oS%iq4dWS)5<gZn)&{NF`%5u@W%w@FzkD*szK0q)Js^ELXJS|h1^2%!$Kl0Dba
z0-NmULFsB|2f~xrvT%7cI8!!Knf&fkr6kdl9I|wZ`s`cgKhvzSl7%B*L-k+{Rn8Ur
z?A9QzKzHw`&pr6vti!ElW$q7yS!r(&N|LX$AL?$TpDbrnl->uml2TD!oR8~!pPok$
zlu(7?N_XcF73U{4$$PFG66Ak&8!FB(ZF){W?U|QNWsdwZ!@C;i5s3)jU!D3~eDE*>
zk}c$~G8268IBEO)i8P30J@8DHgq>4$ZL2-4snN1%Yigg3w3Y}#I9pFAxdcxglPq8!
zvfnCBxQQ`b8<i<iByoS?Dgn1>-nCq#g1H)~^N~9<ma$a-$^TZj5(;}|n#b#*5{M-X
z+mT3(>e?Jzf17O80A0VJF|6>}TzXj1cK>E&wmUu#$BK(iLP%ESjsqRozgkn0i~4j@
zmpBVM3VvFdgHR-{*Ety(W+(s~q~j)Dc_n3Ri0>}P`@eZL!6wUO%Eg<SY#-51VfUTo
zF_iIYrH<FsVQ>}GCyc{4b6%P4kju|HrOBUVUCTeecQTU$F}%oq!g%H#zM@KQi6I@!
zqkV57`fk4k%lETyDPG9QyXTu1iWn`V&bl;-&d;mM!u`vR%OWei`0(40JZ3;s=!tO)
zMZlDe*4ZXC>eS5XZ$LHlg6+%kk*iHzAi{^ay9NOZ#>)sY2&<)N!ThC(PqQCLLRpzN
zCQ;y3#SkjS@Sq7#{52IVy&(IyyS0lgAIXiIy#0B>gct><lvP90`I=SZK4pb1KJxC;
zKPV^tng}zi7u4v<p!RK-<}FZBq-N7?Bl;$H^wKiPwu|(+Nok-y`+auTqbBXn(yyA;
zsl4mwHs>-B*A}N?LmzhHrqz_z?A<?R1N!us5;0z*DQ~<x;7|pLNnSfapTr&kh@fZL
z`(sfRiZmOZ`??Ky0wvzOZr=#ti~SWBjE?qHc(55pJBjyXypW}LwS0~7Y`WKosIP=-
z%A0TXYOmfGvhB5)g)_t}0)z&iOF=lqPY%fvY<LSYh>~Z2mX%h$GX7ONaa7555(gu3
zKjPT4Sm~#3L)OpZgX8iW4~G=$r02Rfh|K`PIw8NT5Uke9o@%i6EX!V?vsPZ!03eu=
zjGA@6kYMz9CrtF!93Pfi5FkVhmBX4>GHu1F>^R=K1i>lW%&M>XLWC*L@7QykNR`aS
z6Xmhe3D%I-MZl<=aVq2;UPAroc<RfdUe?J@=y=BvGS_<Ho7$t8h8!&)7)l5~L8-AX
zKZ6|&{oX9W$7RTLK~xJP?VhL3;w4U&Iu@2ej#g(4yW%i)BelFpjVqXpkViO?Z4=BT
zrcB7+M>td3Oias~@%dwH9I9{w?c@SXC2m|E7vZfSb$D<&50ex1cFGdwT{(!LbLc+2
zm5cZF^Cy2T@q9C*rmbiQJDLN+DbUYFMz-r~@g6K!gv8zc9!gzyNR#s`g0FdK<Mt9h
zmIft-HyHK;-u<GqOxxkf6Vi;R^;95<cJT)?#$j8Bw)QOzJNq-Yk^p0P6)|$Yo;2jl
zn1J3fFG*LcQ<SJy@eazK5<g_)$NK+RI$+j|f4uYAK%n<{T{yA2RxEZM5lF~4NC2(X
z28Z&PBXDQQ-QLWG5QE>7J$q$*k#4(ggGkzGp?QH^434QIV^{hp-)4%y7Bz1a(43zr
z^O}W)c6|zb7(Gh7d>bA3&=cBrZ`^$Q3|<8YHX`MrrGw#Y6Bur4pL+Zt;oBw8QnrWn
zv?Tt}yqp7z*VcVBDFuYh>Mb)y8M;egGBTw-|LhglDDAqn$QLhUtzb2UAgeqDt7%U6
zFT*?|4dddk1kGBcaAtP&4)f5rG@&+)M{@0hibzhB0YndC!oJKSUvi%8To!r+>$_1>
zB)wi^VV17Mfr5!S5&4*qvSLDIIB773giWkg2|LOJDqcSfRgEtm1{T5!<dx)IA?EN@
zuCiLwNK+Ct69p7X|5*Tt6h6&QOnt6FMI?-yxfg`=zfyw?hBdDbY-K<pPh6>-SV6OP
zJwNR74ORFi>FHSqUY-$_8!B%_F4~Fc4S};C`#O+(J<&{yG;psgebR||O$Je7@cXk^
zLo8U36Woa)j)2Q65v~X2KIg}Oe7Hnf!ZjaZ2$$sn!e{v#orZr|b+QuOxjw1EWkU2R
zpE)c@Fga``BtlTymWdC9o80GK!SSDSUdG_kNg5<k#p~{x72z78$ErhPWY@_{<USwd
z$XTFidzHb%o`Bbypf)+0^NypzD0}H36KCzZNh5>7?nGH6jb;^$x60sY@LzgtxR$L)
z<zbPh;gLx2zD?a+fgJc<((RK0RB(!e?t}+(XWG0DdH=)FQqF<&)_O8syw{KIL@s02
zlFM}EepTeM=2GS1R%}Aa3bF=e$d%6goel(Vif35A+jDgS@B1>2@lgD$X|xro24Wye
z2yQ>kgVZzvvV#vVP1th{;AfM>_fgTcD`Uz((j$~uGvzGN!6zysrDc@{ViuQwOa?w`
z*|GX$Y;c=by0n}l${hRsVP~)wLL6I->WG^5AWV}Vb#9glYreKU^TDc|TF{!xo#ftR
zpJ>um5{QofRz7R4%y|TVgnd~pbz95L==-s^3vyKKLe1q<iy7%2i`F1zGoi1!b2kvA
z%{n5T4ycEJ9g}{7O^H=>iD{-B%A_jN3D2hu&!9cWNv5uC#aOYOw_m)CsmQ_u6OGFA
z{F^dH{z2Aa#%-dzuOU*8^d8F5QUd$UVPcU4wfyrUZA{z$#C-+J7dp?SE%PHF@?%5|
zWpDE=113LxwN$|M{mXJ=jc4EbhiOaCJTr0OnL+taB<6gIl+t(PFCe`?U**)iEr{@l
zY|CvZ5Nkz-u+YZ&qU4_E1<gD5*dx46>DC0ffx0CbaX~Qo?SMZ^e;`08NqP+*1-!@=
zp$t$>M2X5hqt10|ORY$+RAeQ>_6K-`_-~f*>4|W;JZ$j)|5<?NA0mS6vPFI5c^cFj
z@1jE6dp7SaWE<SAk8_vfpfLCPOTSX}u2lXbDu%N6s><kBe10YiYhs_3Xf?q8^z>TW
zQi`3rPiPNin}6Gotsi=V^9uxdNZY8t<6AtPphsFfohc3u>G}j?QIhyuf#6!Vc7Nj@
z9@t0tsm%C+Cb9h6brKo&pyTHFlX)2sonN_q8rMa-BeE&mhCfCP>MYi@Xd7{XSTce<
z&P&*)(5+|GKuDOOF}+iE0xe(7MZ}CUM3Zn;^qB9#bTI9_l$U%VV=cXqf`~v=QmH(V
zDChiFYTVv`Z0r@=6oSOzOHAZXj&g=lv-o)=y^-X?Z&B@m+IX|%d#2>*p4!UcW91Q^
z8zKR7h?=z!c;N#VpPxT2^a!cRIMJE;_~+jORH=9&Bm5C_-xwL%cIU*?2x@t)M&?kJ
zIP#mU`0-gHo+mJkacZ&FT4t#FDc3hyr$jc*^9!{-E_Pj+<=xbVDN`~iZ#aTvK*sLG
zXU_DeBMV-rXg$8hJ-dfs*W8##XDO=V$&ux9#`?q9sv0=?#Vd|HC*NFFt0lUlNBuP`
z0Wl<xX*;89X$Zdg1+m5`9cGs1U<S42<k{L3{jf_iem9yYB_j?(mGiTr?JA*e9eJL|
zr*r8+Zcny0xXjpdEB1841STkX6--9v1S;<lUd|dCr-U~bbk<D_7o`T0b&+BoC$Z_)
z<M)X!7L?67MZ%w~SWdGf?q~LTKDFPGA{TD&hw=b_RLzej7>wu9K%uE~T+Q1Lc(pTj
zIMl{V!ze>`gB8<@`MhsGM8W?m;Vtf;ntuz-s_bnQ!zV7l1m3r^8Sz8@ED9eyx+%B?
z0en=4j?8h!lP(@t9lL$H6jxQ28X+W<d#7Zu+vt>QVY*l6ndvO0W4Lq<CI6LzMh<c5
zLO+}KjA;mR8Ai_CH-EMxkzueWmgICN&Fx=`(o4pMA7KB{Z;m(m`|L5}+4B3(jE;B0
z-8BdS2ss#o#=)<1C>Va&Wg`9Mt#q>#fza09Z-eH#LvPf~%W&RB2i}R0H3S@}I?sR#
z`BJJ*8v7-`8Zq}55#UGhN86!#siLNd9PEQKIx_hzGnc$e^`<>=G9r7UUzw%-IhaQ?
z*!Z|T9mP7tvqMYDveUAtAb~T_H+l};@y4j(aK@4R0qM^^t(fKjkG{SZY~(Am`UqXh
z!T4i_368nl4>1CICzwSA!`3CTy5Ln-$}<-bM(UO>{JYyS(b#6nD_VcmtxoI-PLlWe
zDw}Y1tx2#YuMdtDX@)_Wl6m8rSDz8aovD~!4U_(fd-sHOE>Gi485;Gj)SNlMa`T@{
zN(02qq2DDa!_7&8ii_%tIilgT@-9?YW^T8mtQc7tpLsR!%Q+w=-a7^7g}F+S02YS?
zjyVr}a=!4&jg-h9Rk(JO!8i`z?d?<=7nLBSys|#**N??k(I;HpoRxljAvway`TvS~
z??5)+?+y5gAgEOxR1r#PYj&tjN)^?jYLA*-_TD6DwWU^#sugPQy*IVms=Y_l-jom$
zN#4ij`+MKlUqPOG-{)NCoa>y&>YZkKRDRD<MuZl*0(aki_u%S<I(=uw)-%?CzMPDi
zKeBtS%l`0&BhjCXj>JnWA4X40ILzA2#Fu(hpF-v?V*Ar}x4kpg2LmYu!o`P(#(pi?
z_wdExyMPuLI{<TNd<5%b1VgPRS}8Y{C|UHNx!T;*NGW)3xU89{Z!^=Ej_qceT^BIu
zza8kx#O^DTjV%>Sc8@Q6Q38hg^}s;Cw$wmDydA4)_1jmLxCcJdY9$Jozh;RKM^WWe
zQa7K`7^p|8=HX@5%S<f)qB+iKL!@80FGmx09SaRxxtUvIE@Gk9H&p%o%(gLzLo<79
z|M%S&sQVFDcSn(3bPKnr@iI_UFK$&RpKO!akM?6Som%wt%%*6i`oL*ZsQZPkl!@OU
z{jx6f#ooltWiE%sXq%EupT?V}+wQ}i@T##*(M@aPTCCU;8^p)P;!*n0=vK)Z5wp4d
zq>(aik&_CABqsunLSh=V4yEzB=%aw}@f_{M(JG{?`}@H+?JrY!qPrKgUQ$87q<7fN
zeGPQm^OtY+RrdE&aP;Mn(4c4qk93SMbQIeXV^fz2Q&hb)enqqI>Rp;xtu-r6c#6Ti
z>ygEWyi0JxFBe_j4T0`3dYU}<kG%%gTEAbXUh)5`ckxusT&RgJhA-I6I_l@cl|PS*
z@opTT`z&=`*oEiGHO{^-Ce6VXELHyu-Nk>z|H7|{&Ea&(nMeV`DJMo{SHbr93XFmk
zArs{ukN^29RX%dx@a^n(W3Sk{e4x^dC_&`5vKK<{NQ;&Y<Y-@{OeL<p^|fP&*HUdy
z=Tn`iu>1FZ(c$pn;gWZ(n6Ba|U(cA+<XnN<9%1|Gxk4)B;}30j;_BEVsDIqsY=xuD
z-UIC)$}VQX=h<q~gXAp^CU-xC7I^u=1V0gz*U^UP?rU)Z@oU2V1$R&8QCn$v(OEyV
z=C(Y%=LsOWi`pP0DW^w<Gi$9s7Nhlh#n@QGLH+nf?7K5uuu%#djahu4IGU-5n4A+F
zO@qm~mE%XkhKne{Q6ODfY@exXaY1!asMj~wU=vCTt@%#vXoqHKD_<lW+$HK;nuQs3
z%rr^62M`gOu0_JhwEt->9Z&=>Jy;#lbF-GA)TtLW(T+ocw6}`B3y11=D4*EWb{lNa
zl7EyrR70LmLMgdH&)i9?)NS-`&O4FY>)dm%uRDC{j_kLJW=f3*bt{35nu4-#)pyUv
zNbJXjR^P${y4J?BFQrPalbUe+AnWG|#b2}xOMdSGXSq*@!k~1A8WlH$oB3la0U`n#
zz={kvlpd^o36KxoS^3$laNAkv6}<m0v&g3RPf0IF)sX(xLDMtvTpG~M9b>Y|`SJXF
zlo}JY8r@&C@4laal(4j#OUniWStsRzH>V#dh{Bw%4n9wZheZ5ZC9JbsQN8u!ilGCV
z#L@5@hps~Pw<l<rSX7fJMVCgxaP!v3eq5er%x=#hZ~O_nw})S|*;Yj{?}0LtP6W$y
zdZ3c6EKtQMdDBI<hZw39w7(t`v#utU3epk$fj|Uk^=M%SnFfB)BJWd{hD#sqTJ`hz
z_kzUYu7v|X^I)!v?~a3Nx!0}%l>tLyxD*(>?O~LYvf|~u8`$j&IjIY>r-ad!zAhux
zRPP<B92|ddD#}^a9EY2Qt8IBnZgGw>{r(gf%EiqMA|N{p-`-rm)V-1njOKU05CgS$
zoAQy$L2rQYKd&vQcH3wNALQfYQQv3)Ru1WIgMzQ`gh0^yti&I3-OUI@TwV3{k+LVT
z2fK!0D(HZ&6I?9wz-k${@vwftzP9^X@>0Y<E2CsPC_g|+aRIc;{XkdQjDfwKJVr(8
zuV#Gz>fKL^J*#Cs-0WbFt0J_2U|*IGJdI8y%h}JuJK6PXSBB#E#!M&qPx{)IZT>aP
zy_|V99kdSX-1v97J0tjNqaVgbuJNz8C`RAsVg1B?W3_y(5~)?<a?yIZvYc8Gtb6*7
z+4X7wYH_xMRds%_T~5b+?{>|#FNKwk=mi5x0O|MQodv<MywQxg(iHNBXkKNQ;{La8
zH8=H_i0}s&5!E%<Sr&!AXgl(3B~jN(j*rPPp!Zi(G_d2?PlzgW2-86wT@=yJX(UJr
zVtCeD{pf}96aWe}z$B(C`L~}D-T#^;*t(H344X;;AlceuCDARzTlzqKE`_uUvVr&;
z455bnl7CU$Rc=akv`n6g^QzLXQpAu1t9MU>59CqjCxZluJoaDGP6StxwI&c7f}~Sr
z(YME3+=#O+eAUqFFc+kyaU9cmU|6G75C>_^;uBdK;oaH}Twfx7*V_;TSSzd9Z11az
zkAY^3&<Di*AjG6YvNgKK=zTL$Vj+Xc{2^ZHv1W6oavPemFCzb7#2E&+D>OvF5!_m5
zeSpk~(5_o1v{lj<-5;mrkBu`kQx5_t1s!vNenJFlL?8H*B0g+Tp{AIY8H}JsSvNRW
zd2Fc$6zoiWJ+&(-(jD>#Y*YMB*NYEW{AW#J$Y`m%$#%9m6wEZnJw)K^3YfCeWn=Zv
z{rvk>TaV*pN)DWXi)+>FLx2V#F$4TU@2W44ov8uEg1MhoaV7b6Ke@#i*9o4>A8ZJp
z4;BeK5@QQd%ytJ6oS#TZ)qJxsr-OK5n_2u}7v8|yb|(izZochMG>7p-{!rgzb-tMV
z9701W1d1VFkW*zAr@~Vjz(_?IA;ykS0_VC0`}}aS5KQhOF4{<Tdo4Jm5FNYWW;=Hc
z!jQ&fgYS_%3`Fv^`*?t4omPFIPP=WbrNYtQTzYe`TT77k&vn1*!n(Wy1kL}txI(wU
zrK=Bs40qSGt$$O#eXoEw#9(q+L=8EDFV0oL2mjWp$>`2Ui@|TNM^5F=phaPKbUX<e
zok;-ZYRZnfk-ae1PPze7fB%=Fg+i5I_ZpyX_dx%%Q$2h>JaF#U{j7^bVD|gQPsSjy
zs=|C#`JGXSc|nr=E31vB#cr!vowzfUXG4;~h|XFScE<f*+mChsHnn&S7{DX#sG67h
zNp{I4Y-qc>=7Usp1VOx7if(`w%&h_4!5?OroYX)z4wy2x{^h569Gwa9#=wO6H+K@q
zk8>W~R^hZLth*L0xsk^a)^mBt2hTbulVE3_oc+H!grW<5e;6cv#0Gw@V3_s1G#{jt
zg6+3vritQ8f#9G*K0CqCd$$61fVA7s>QW!*{ip8_nTU5j>E@UEtvA>{t#c{lDtFhZ
zjv9OHgSpN*mX${~`|$|g>Wju0jJqv&o;(k)vgx%o`~`f;<Q&_u&NWLaqu^Hcxnr0c
z=h5eLgJx6}WKtnG?Q{X779+0-nPjZ!)nU#^1^Kb37dB+^3H9y2cF9<IE8*hGLvk2+
zeza!v7sZ&fU_n3fC{9WJ0S@2<yVEGwtLtjHK?)LR%r=9{=7_BTA)P7S_==7XxR<T>
z0=K1R4|qNK#nY82I3!v;_gFTMv?<%vEX(&Nez7dGh-}8UE{|GJi5$@n2hXlFIBK=!
zbi0nDEdMTgR?N3;B}C|%+v}MK=KRKprMYb0scEiYFa!wy0Eh+KQGvwG03#+37L(8U
zsR7Q>J_Texw?fZf{|tsE$fA}RO!FB@NL_t4&jIZE#+ik&Ia<FNX!fJ!z&+7-z>O6X
zLWkh?SKNWs1_hw>{-uU%?fty~M2WxXx4^tA`~e0rql6j9lEQk&)Zu*GU-FB5e&mq|
zCySbFw$7td<Pr`xhe^vqGQP%mw4_E4!>f}mu}e7e|Lnf5rf)CFeh4Xi9re?T%j@`j
z)!OeVr7~Ad>E@k9#p)O{uN|qb`g0LMZt}U%o4mRTKKnb{fpZ7qpwE31k%y)pMR=SC
zDBipQ(}SciZ?QQ%wu%1osXw3yR{e<Ann|y~)rUN5(nvM+Z`D-`d49UKo)dmp`{;;F
z=qs2WWo>q^V4tdU#gUH;d2W;(#H#tmk$qPJRu1_6ffz=BY)`bZ0dE)E=7q`8b9*_<
zx7v-AI}m>FrW%@8Ti7;fZNc=7O0X!v<Ri+=k60*3oymmH4*|PX$+Cwp8;$H!avnUU
zH!ACRouKO*vnb{yM1fMc=xiMo4h-M}U1r)~S8a<`5jrKs6*f%qIw>7DV;LFITr;H&
zio26$<ZO-|`w9Gh?)0bYAL-tz?{yU!dy;V(8C$=JAJB8gB;H^l#u?8R7uDlGD=V{?
zLJlcy_T@H<gk%Y8Ct%sX1p%mSlWx^d<`|z{Pll<te2kfq|Bdl7we+A2`j@8=h(bgq
z9D1qEM#G;t)^zl)5eNCSZptj>Sq5622TuQ9d(tjjQ+gAJ(|AcWpM2#|(==SEx>YYk
zyDBP5*{5^V>ige|&juup7u0PI#`H&Gj9+lwUHbL?M(sVNcH|@{BbSVAw$Ey1-bTu9
z!hMSYk8x2_MlrDWdssskbBaTjY<ho%i2nMlE3v{^+EM_Nf=uHm>XiDRp3V68w@s2j
z3olyuP6p=le`OOUU!-t&%ReVEFRdy#7D}hp;9Vi-5xfWP=R@dPmri8iH_+o*<rGdk
zh2Odo&pB6<AG;gK@wssbC!hSmA+?IveDO7+IUZ3T&N+qz$MyehiLGIUm+uDHV4C=^
z;1=fE9=LxhGfKHjc1y*NA1=bGGol9u#_!LcxEgKN_ltkela0~_q3sRhxaqrWEMDhK
zv2`5jHZF~3|1@uVFavMgn*YEO>$npn(W}tq@!NwpTS3RB$Mkw7{g7(?u5s0l_r|w+
zQtHg>JjQ}<gA109Cz0eEOex%_1(7-~KMy2~9F@H_UT(O^X&`Y88_k+bh2*TVmG<-s
zCg*?le*Pb+qJVW+ZfyPSfz@)Uj7weenzeNsXrWz!)7vLoJUwNg#@pjc7TP7EE-(P5
z9NfagM-pQuQTEjtx(m8WAxIr{e1B2%LHDu+$Eqn=;pYSR456Kg^i=p{gTba#81u|?
z?qJyE`YUn1<YG_NzF^VjH-&W|B)gtj{nU&bh|(Tn5}UXAUJX)X-V|mh_2&!BmBcI`
zoIJVKcyQ%WMKFNKI53Rv_jNi$L{EG`s}$x|n6urY8JUn^9JUxK>G!)N-uzjJU(dt2
zD$%Bg%4UeAswlcPm$>=J-CHo<J7AXH@6`RB#jeJTT{Ke1TT-nk^VYM74?g_L-R{4!
zSC&Ine@#7?{lwfV!h?gF<P#vTve*Y+13k3J@?4-0E(2z<!9{5Jf35D`69heLnry5b
z8?Onwphx0$p{~-cf=40B+RFlRry@54O#Rmi%$}PO{+TXEf&6tlmI1XA**wP61KX14
z`o*WnpQDMq1yEKFk2kZCycz=>-7}tCYYWqRfh?+0v#(2J=2Zq4z1xkx_)(*T@A$PD
zDEDCjX7sRKOfJX2DKeP+w07^Z1r&}A6nh3qfPl2e-PLlx7vJ2d(he^qcNi65G_F$Q
z6|xLH-&u`Rco1h6(i87=!aEvp$No5WY|MoTF-a{%mU&v@DrHd9GMjusog13jE&?V=
z1fbNRe)syMDNPcNvPXT6L(6uel5>xa8=+UugV3Mj&Py4T)$K5Ud8H1RKlc-PQJVXk
z4{Wy<Li;y;?d}PQmeHLV#fLDy^w7xdXy=~T7wgLcx>h<TFTXYxYjYm=rXp|Q7*A*6
z9@!gZ(sX0fp!Y>y1r1eIT_XZ<+J@^egFAXN=^MAM$ZH;dU`dYHK3Gk$8oXor@`|M`
zEbZ_0WBC`NbHOoxL7M}2V*SM!Riu!1bmi{nssS~zO3>w_?b-6I<zDj&OX0XoW9B0r
z2*o6iz&oWt`NZp>Q13C0D_A}Vl^I3!?wz#V>|N}}#k)nQG#sOt-i4nFx|uy4=(S7E
zVPOP{kfmr)H(B+?ja`9x6XxD<3^Pf#PFu;jAO$W|O9jI2TmxZR*p)Td+FiizkLt&b
zaCws7QL$RNV{AW{&aFLMqR>24p7}m_UG1?{5q&scJ85X^STIo+;F2aVgB+qS^q-~P
z)VD<W1}53Jo>6AL3+&9Xt?_=@w)4m5+Zvth)G6Iyj@%u%1&)(YmavarHeXLeZ?_;O
z{90hFpD&HH<4#6)!n{7wL(UXMeQo>XePnalN+{*sw^z5!JI=?<X&sQ3!k>|s4P!j=
zzr}Rz_~VXk3AyQKv?$iIq`E0E^~b6yI$3sl7nM|3@rvE{vKEBK`ZE?fGJW8uA<d~C
z#$_G-lUqH}0rW~MaVaE=ekmY9u<*x%7>K#0t}le1;_Vn5@%3sAw@AKV;ND4b`wkyv
zVPtWt$<jX&yIk2wbsM_U!~9gLVWMLjalUMO`BRCZD@YK~-9(>0;4A}^TvYD6mW+=U
zHU;RDb`5<U^($~53aZY;g5lADt1&;x#P(fG@qJ>z?mkjsZ=;w;%#fZQlXPIrAut@q
z`6m7xbw`u3{1b}Fp}Z1}4+hHDc=RmNM$ltz+_ti4NskNlBO<8$eD}-z7GGs?VhaXO
z5=iD72jWy(RJ2ZDDGmm%>Bp*~V>=+%Akz69Kg&pGE0|+ytSPd>IiIO8S^G!w<j4N~
zzQS)u@njwS8rkCbz8Cr=kisZ10&-(T$^XuiKAjL8=KSGHq=&fev5XyIa-IFobDJsS
z58*9e_3ofLUca~f@oeDFeRFOr?Exky<xm0y-@IXFzWLJh&U2!EdcT2l!TaXePrO=G
zL%}Z!Z)SkLE`1FnTA;{rGfANviBbC&JLQeN-Q_cN=Jeah>~`6hPP$A<R=wXWuj>!S
z)kZ<T(=Q#Wd4Yb}S%ZVW2GtN~?sL$&+?g0lZP=`NoHTj#{A$znIZxfV@X|lHvRtea
zoMN4FZKLIS9+DfexJTqletpfiPZ~PGS<!uh05h}?W0JK(oJ>H3v}_}cS&~=PY|m6p
zILc$qDVV8m#P6(hG$}MkS2vYKo@M)R=**Q1*L8CSG5tZqA0DDzB(@VlP?wPjPqUMw
z#}10awAys;u0wASjb$+m`GD<WL%xlw&(W2F+f*(>EUE$@z%*M^Mad6;{WI=2qf3T*
zJh;oC|H%@jgXWx!h{^>k<hq|=sa>DRX|ZQsNix~uu&JO}3v^%?>jmr&JyZg#_5G>I
z+X=4-qNT`M&<tt;8D(mwO(&=y1*AXnTVkWGlUW;yu5)IL3nm{L_K6~3xT&jNG$P2u
zrw^Fq*O&P~;s4I%P&!<oq*)VBYnmVXcSC`d>`_Hm@5A6e)O~Xli3nZe&RII)dQN3<
z-M@L=^XKY~mWmiQ3QHm&`3g^O)h94XcM6)yS@OtfT;Wry_*TtoD-lVzKMA82E()Zh
zMy9-eQcIH!;g14aP4{`Kz+d<Kbl~Wt(2dl8g~I_T1t0I?de=>o&GOjIE_*dF6bOdH
zevuO?f1jE0?*HcopX%n)-$Y;4VQN19K2_^p5VtG(7yYi6$60*4KChq@tf;`&u6GTf
z9S+aW()_(0C|@%U8nU)_I;w_zPiwyVG&8Z(UlgW~?@441>0=W(rKS68U^j*fW=cO)
z-_+tu8$6_PidLIL*3sOJK=_dJ20{171chA_h<(8D#h72rr#$VzuOkDLw5EJfUmoAf
z+iUn+9{IKAY9yGWwG^Pr_O{^Kvs*jOjV}}b%MYu7%N3b~3taGt;WzfXj&0aq_bm7Z
z-PMJAc|=rzyc}A+Ul#Kxa1ni@pPSB|S8~3RHMILHbguqv5ylAK`_R<U+sX+Z=qvG{
zb>ROtpPTN@=JoV8N$aUf?R@*K5+_Sl@~PqZp0ZrGOOJEPLTT6YFJiiHqVVsu-p_tV
zVl3=B0UvVFm=gXd3M{H}$h5Cb#d?j_kuSFav?%k*2NeX{;zZDyd^%IN@grmPYjC5F
zGS9re9vL~7Kl($i<f%5U(F5TvxKmm4M?Ytq=<5#Vn&fBjJL(gf4w;reHH}7<?hfiR
zX^Ebawm1G^p6cOt5==-nrdLEyuZB1Nd7bKEbJBn3twU8nlaD!3bhIfrSiEJ01si}T
z?w-qD#k}EjYQdd^XUu%L0b0+C;GIcryt+_L&V`#N&V}JAavP1l{PM(R7Wxd)a^Cn*
z+SJ%>pqA=aYWNo)82(*l&gu~X6+F0(Te4MYI*-`HiiC|m&Qng^{Vyjo5@+@tA$<7}
zLzop6m`C<LPo$U|v_*Y4vB%$?RD)UxXfK<Yy@!e|xPFDlDNer!KOKq3f?>iK5kfcF
zUYzo?>dUkzOz{ejIn(r4<H)=Jr&JggcV`apFXjYrW9+2x?59lIQQPhPvbf~>O;+-4
z2euo!!2<mb&${8xUUlVSZp*Di1yaXRll3&?09&TwYcW(oTE^R9W20f0OATxYAorFc
zYc<7go<P*%jB?y7Gj51Ed$6A)HvS$f<TlWNr=S7ec8Z0f=3c*)XwAj(I)EE#R?Cv`
zzV@lhy=Tn1ZgCT;EY?$gLi>*DG{*|Qj#nk#RX)YTexe8b7Dk?re81bTihZHBcMJJ_
zE>M$cr%vz{rlv(s&pn5!A^!ro^T^X7`W(%fB0*4G;pd5-%l7n4i*(7`fk|%Y4n?gM
zkg|YVw~XC-M(k&X(y)5D%(qO{Me=V`<RhNlq~G_yRes2-szB?p<S&W}(-;a(7t`9v
zk?Tnch0v3<7T-rX`vOLqevva6HHGpY%DR?uVBPa?`*Ou~$KUsVm~UOX<aI|*3ao8X
zxf-x!n_3O#kiKERqrVkMomLa}f_0B~dvJPT$o%&O>F)To2cis`a2Xz*j+@=xDys0~
zco*3SO&rl`Lo|vry%AQTIw%#Zi^pl**sZYQf;&SI1R|LNL%MqF3imarvK<3V?Hp~n
zL;Z2a1KiBHLC~ePweaHE9mabf!4z)4V<9U1n<RG{$<f;DVm>k|G*GsOWrLdd!`l}g
zEBs)vvd5J@fDty6<=g+w77|1(D2eH@%}7M`yUG;gQ}#dUc0;R5Rv``%;nJtPEPhn;
zGlqA=#dTEheTNrCH0`vVr&KRxKAC!2K5m(jaJQrPcE=~_0RwBnJ*~9JT4Ci24oXt%
zjt)yPq|iOlSW>(^Sn=WL?(q0pI#yNs6pZ0P5c%t<*Sg%1>4W_+Bd83V4d>}P`(IJ6
z(azu}o0orTJ&Xy>BAaIDKp&4{K*w693DqaOB;A~p8jSrT7yICqJzkAp)nk^32R6KD
zERJ$Sv+wPp8DD9rj;^z;OTdF;*u5ZT{(hAycITcbdGh+X8>fQnbi~`8d7$I1X*f3y
zbXbyQ@~C5P)*4=i<WMSoy3hy!|Emj-qJ601#1ScrWTaR;%i|MRM?lpcD74PkRBdp(
z&lEI7REZnWB!G9B@(#eeaG+$a3P)VxnHPD7L>y7+QQf$_j)`PQw-i9AcEs_Yrf>)V
zm87skgK9GW<9x_h;pS3VW?tLB`IJd4PE%aiK~=Ei_?1>AfaYET7)skxe~@rV`%;=s
zCbJf@miBEz(ASNYkEA)CLkb=I>T&ubPWtb#05FF%oToBOOr4#FlK$RlQYl^&OuVeF
zUsoD)vgQu4JNHMC*?^HG(oo4^SD#Qmqsl?GM~OmMfsSf(^|fgOw@c=41c=XQCTwQD
zKwQc}JHL?D>5C0b_k%VA+KxVHdRrPi+qTs_Y(SEtkU|HvBtYszP+$l$e+tv-O!0pK
z6SyV8_+I5t?mf^Q1oFJ2it<1T3(|A1JBmpL?2w)U!mb4dHh$iZ*HQ{E2eH}hQj+as
zG<`|m)V;A#YRp)_zpc)`A(3_P5-eTs@P%Ny!C1lb!}wM4K>Me#`A0mhVfprkcHL?4
zesk1+r7_4xR_+%;w*{Dpu_@p&ETG9h;ruYD)mEfAmm^oLl)vBqqjhcfrPs+X<~DqL
zPv9%ZrG>;?UK78hfjL=-<QGu+2x>E1zpw3lR&6%N>4P#7_NOmoz~XdON9}nWYvQ!*
z#BAH#9+C^?en?#!NTAqa-~dyMqePGOp4P<Cyq$8i&W(S33Ks1w5~u@}ni{$6;r7Ho
zn~fdU>$D?$2FC8AasR=Sxfh$hE~W1R?o24Pt6kY~UU{37?NYE?a^La(n4&;`MVQz`
zClwW7LDvXRqicevF+S4=h1~;+5gi=W$h68X<DRwIjKR|qxIXrNWfYWnBS8c-WVLQR
z!&YN2b%g`$q4H?DB6z{jZc|OpNmI@DruM$TR3@Qu9w*&7y;X@aE`V$JOY?S%E!@{6
z1vHpHAKv@Y&4Y};nROPraVPU`jw*@TX-7Jc;zm_?1D_K<U$J>$8z${Dhklj)(-HJ=
zFO$*L-Ml58k*NVw2AcTkwSt=f`}3SRjq?j?y52Wb=eOzVp#h}*`u%+7cD+%Xbzylq
zh`tU3)daNs6r!WATFE96VwHFLJ99gsFjL_n>)IjA{GEd-1IIP*-R)S+c^=co#E-=s
zyR^qRBej}$c}7hjV7>5nEEo)Gr5lrH%wJKoKK}6M+jEj@`imIE-X!b&JTpiCEDkz{
z=@Z{7=S{uE-Efs#=U)D_JIGYC0db8GE-5B8(r|8!&=aGXwezn}?oGY+5w!JvV0;nO
z2~ljcvCZQN!~3mfu{<#|Wr_$OEoG9An0L{P{ElNdXYU>XlC*(gu|n><!iM+)VuU;F
zw1Pve@3vvywPQg__G9Rts!uCO43MBcl_^x#xBT_zeNZt6)0Z8hF@0mnhL+s6gbm|=
zshXyIX+vK{?795@DZ8s}?6_}#M`)QyE;y=79&eB_bHvVC_jqp(WVi>8zmUCn=xWcy
zC6V_}OsA--%vFd`_rTiapEeE7B0Y4sVxQ~eef^f}nLBV-^{G1G9&)c-CvN^`Z|wa~
z(hf1Rx{tFL<D;1=&kL~HiRk?>YJa@-UO&=X!$-RN?qbVo<E|7Y@}A90rjbSG<nfk+
z=9bkGq$!T<x;k?7TVs>hx2%VwsZh71TlhvvZ=LK1^s_$xAUrpCEtpa-{%Y7^kKE;`
z?yPe*Nv!!)rpNuZYnFZOm@@O1V`Jm#Cwu+neQ-oa(71KS3U|~z6QTutBz4EAqV9rQ
z38Qg^vz%BKD}{a1G3J+6|E!n{U?oL;FcJ;_mec&q<5hPomdsFpP9!|YocWm`690VZ
zev-Jpe&0b(f7d^nn$=r#Iyo!GzL#iPm)8HaeSaUL2X%G1H?kl&rpu{kaqv$)BW%N;
z-2kr^B2qtq!`8X-7`&bG!g>m;$fH829+*G(^c%6Cu*mDT7>#E74s2O$mWEaZ9kw<W
z!|;igGPFj-zf#zM2C=n4Osg2gT&Tf4)3(@WsdGnXN(GJ&J#6U8Br{F)R9%&*??Biw
zRW08p9e)j5IUN;@Ch*^2%VXr8Hd%vKx{SN5-6-Ae7KOGkqT-J>e|MfQ-f+k-4?vWQ
z+wEl8pA2HEOilpyYGd^|e__9p?xtyNrIzx5PR^B@Neh}<%}5Gge85T&H;vtfPa4;-
zkNK@iE~mGlKDM#Fgs~lfKH0!jJO@dZIhZi@{MLlSu-0KN50PPZT`OFO$xb7M2I~mZ
zMz%Up>S25vJ0e7C09I?vKiSKe1Mc0x;#W=S`<L7rxQOzZVdSiNTMmn_)B(fw0m3rX
zJxm8*W;k!(fGMCtW?AqE8@HkAMt=RSIxF`++q=iFwIL?z;}#+uv(%-uS6nh#FPcm}
zXfz%d?O*pvE4B?RYuw%Nb-0aP28S*C6W=q%iLxLc)R6CrCd)W#G}c%$ZrwDJdZUCV
zqxvSMptVl;&)z5P?|0Bu?<Qm|E+9U0tU+aS{ZV=v%yGOtKCzvhR>2L21y>c<c3OX>
ztNkPT(cB0jNiDZVuLb;WkSrS;WJ+t=V!(@wGuv%!-l4H3c$;dh>oemgkEROCFGIDv
zhjCX~gNx1OoN~JfJBI^=U7sMFkuk>gLltr)ED%bCstc7!SsHVaQat(H`+TL^Q#8?0
z?ieNR?}{a-n^hkIkNYu98clP=ia4>a5f+dHF&G~3XMotxMlbJwSFmdcpelhHEB#fo
z5t6w4L4G6Vp7$2JY6HoL{+xUQwUVa^()7>9dsYzsD`Rz(2N!JO9u)dx`o2#(o6w&c
zEX9W#4*K#EQJTMrzhynQyd?b8*@?(C{Q+pgJ#YFuZ&ug!UsUm&ZVsKJM+tg0X}mC$
z$+L3{W2Bn2SqvV|;8AX}Wb_n2><`@Z5}qn}Ynuf@4Za_PRu|_Cpii8e^kuF9)N{3N
zy*fmA;$lh4lY2Da0S=DhYR&9HU!eW-vNeKoJ)TD^Q2oYZw3un-6i2|;*r#;8q1BR~
z-!X<P370t8@ns?}!p3Y$yd$gjgQ!u1Yj3F(5uW1R-Yn(=z(9S`-yuVOrE|^1)36n+
z%<45<cOXfDUeO1L;eJp@xx$ic9GW2j$Sa1SnT$^hw}yKg^ehK=3y*TIW2*mFy#XzE
zwIq{|RN9X*!IRsYsVlV#yiDwX(KLpqo2>=8Vuv%xz$SLS2iv^0!_|7QOPbmu%vH>$
z$+q#piROQ4xfSt17EIXXgWQXuh`WO48zpm!WXRf{jqk?4>t?DprydGGdRVq2r~5@`
zuUwF#9q<Ga3cNJ7{zO}a583i}b1beIWq@lES^(Q)LY`VlFn?{6s>Yt$TY45RIG<7?
zMDODuq4h=nsF3;2>*W*Za<AIoJzl~_ZM}Izz@r@G5qw2%!skK(<cc*c?RkUiQo^EV
z!2a+j9CV2M!Qx3dOsid)w)Le}#Cthpk_9U_iUvGEFSUzC;kn{o-(Il=S7{HQ)Lc<)
zec0C^tIOWH=7tm9Z9DpcTVDtH1k|)Z%H}GFn6hwo+C&tVY{3?@28m5Grf{Tf7T!6T
zrk6tjJ}zlYPL9o5<@IJNk#TpTN9E5M(vm6Op+152rUowgFll5bb8UV*CSbWCX%*e)
z`DkJTTA?JS?kOf!GCV|lhYLYl`;s{VdNx9JVU#;4Fpf>Y_V9`!@1D54G`##RS|<A4
z<Z_o~K6L<A5DSS#`0RsKH2f$9poJ9*5x8}bu%prURT;<ii*@emmr@Np1bx!0ZnbU>
zu5AaqK2sXy)X;$dq=r`xxfwmnBqJ@3)?f#cZW;%4PHo7yqD1bXKhFf#R=Ss=*YiH7
zGY?Gmvod;p*<(V8riTSp$n89mwU%@8HJL4hK85UzoMvhCiEd!oUe|=Bw)k}FL^i&O
zXx`sYC8Da2$h~{83CCD)PE6N(;t|trsV!oLd%No+r!F}w6$GZ%Y*5NHDl4}36kRrQ
z5W<(QEzxLg1vM*(`1l_~Dtll9W#<%MDZEr*Mcp0_dqxlYWX8Mm*9?>ukjbp!yp!is
zor_yxOFuSjYT!<PvEO?9iKSKKU5T$G<~reDb_@?ctV8I1NPMmF+|w5O9lKx8(YaW(
zEyF1hr*7%i2Rl`Y&02|{W^B?2&ZkkaayiodwmJSfrPk6h#FR!j0i-VrE4~7P2mW#o
zZ}mj<S=1e0@}%m~f|w&BsWj_mczONbo=MXq|J}(zJj8y7?Azil?qVE2$^MaX3VK5h
z$zq`1kM5ZA`D>oI*bF>MZ!ofBEMi<fcRk7T)?B7c=}!|P`Ub7_k!nv|XLC!yTXSWB
z(Kk!}&WTZ1TGOlz5_Wn5z8tpxxOdp&c#Snwg%0S$D79{;B$|!#^8Lx~976MV-^|i1
zLUUT3t+kaSdD}61y5jd3q7nnHdG__R_*8{%nBQ;PJqh03tI@s?b0^(jktKhY&t>KH
z6vYn}kTuLEszwT_?`(PP1_uBs)qWc_;X%AD-#BhT&Hb>~1REgT1w{=cmL|kq7l3VT
z<n+=uY-Z8r>t}49+-=<5gPF3$t4GkODRTEe%njOy_HxvX&zREQ1+%ECi*180|C6vq
zk2)<xKOE)!oyqCcO~PDv+;yv+{b`ITvSWDme9eLMmU`)C<nSe+>ssa2J&XDvmCKDP
z0xy{ERs&*b!HU@?nEUvyEcMyN_@SDyup%OogS_20W?p%Ako)hXJ@O%O!1s6*W;&)0
zx^G_uF8oEn=Xd<lmrQ6|w)BQg4K$bn)K%3zEz33?AMURjn|<I=*(_=p8!|<jSW}64
zq&pyTRu%a8a>=DDaz0xS^R(v&{&J5NwjPQ~Io$NObvfNXZD?usZWtvZ$Ei2te$g2R
z4_3*c?nFHbTD<_pJ~PT~XfhO`bhBxGE@KAN_6Ewg2A?SAvDb}4$}`^7m93r5*Cfnr
z)x8uL^IAtcN8})HoEljbQJH_ox*^2KfrqUtLFWRWSDVtDe&`Xl%9JyEQM}M=Hnm?R
zu>*JFSUO(5E1>ypdamgWm*|WYX@8ttweS4%wtlzF0)N+-`MovBX-8ba%9^oyG5k=R
z{do8vjGLCFwAZ0^J6@g;(5z+TT$NyUnN%P1EcJE&!m1Rlz3D2R<1mH8-=RR-!kA)A
z(Fi&ARF&punF~-hj7u?>n_nLnKIM1#GVj>65_T4ggiaB3|L8V;7m4yvY3_x%a6HFP
zRNGHlE(d3k9sOB8KSto!Ic3I(shP5JNFjzcH1>259LDYP8>4v*yM}n<TICNx7fp%t
z#gWtFVioxo=6XtOi|vXE;aE1^XC$HZ51IlJZ1lNB={fz+%m6jx3zRMvd%NiO{;VF>
z-7ElgCS0pJfA!W2UDha#?9S>CaV**X35E7mD5ATgC7v4T#sN`H-YWjZ`grKlQF2yG
z_-sANd0)~gA>;+i8;#BOmgIC(pd4x&5zu12e$bK`Q~g>S&u+Kw+r=S60w!Mdy>I(o
z?0EEYiFI`Bfn&3Jj*KNZ>y$)=uLWN2rea*7e$Ws_GNy}<yRZHFLPF(XZi#E>5is<$
zzTNG-&89J_*)P2^Hr~{#er=mNv0kt=d5F`HVKz`#;A2_X&c~RHHsix81NXzqXFZM0
zV{16*{JR0=Z}Z>HjmDwp@T9FJX_07Pz;A*{GN!=G)n`;hQ0?Et0dkEL#ZX!Ff<8J`
zfp4omfE(tMXJb%N)$M;js`Q%s1MN5ZX|lVW1290}^QG|GsK25DtZ?$vouXanOO=SM
z-uI)|UpS6g6y26rlZ(_i+NpnnX=&dKG#A!#bCYA<!WuvBAh;F}uRnBn5_AOpQ#*Iv
z6(^wZviYRyOP%|4b&r1x->{XLq-Qh1tk!<IXl2roY}}|&+nFl8pW%Sa@M^}Fl)<46
z#l?wM;jR+!;Etu>D3yLVV9w0mby3NzIskaHMuGga*tCA$hZrYJNFJp3PkVBD7%v)I
zEP#Do0TKd*9yw4&N&6`B9+!*bXhnJ`Hv@Iv_k7w0Ow?t5gibL@F4}xrIw{cqeZni6
z*u7iZ5xXm#C~Pdxb&{%<MlMlsJ_3HaVWyH^|GxTFM0v;c$@5?Zd3p#yogKD%X*T6$
zWre*_%aT&7&hO3UYWdV8v$w|ci%N1YkZm9O=f&B&Z8gWVzaBbIu#4U8z0mrQs{36q
zIpjr}A>q=h?=y8w($^r|T4f2WkQRX2;vp%Vg8o|z%FoI3{{KJTN6tvjO`#=y0LPi*
zuspQsMl&_X_)w}s_Eid?>ygZ~$Yyk65;nM1kH}prj@`Am>M!|bBf1H(hq>JbWAr$(
z*oJ8xSlnO>XnOCNX+N9x+-bY4>ykgii*aPj?~xb4ny_2o3NKb}^4(mRZxQVN)Pved
z--E-#7snMMz&-dj40~vk5<^4{^$K*mXoASTnJ^Ii3Ri3zy?X_QC*vj7)36{M{5@EM
z@gU*`8KvFUPN2Y#>y>N*nM#F<ZDL9i0JlXt&Uy@L_39<SHn5k@PDdf}*t^IbEFg4%
z6)Z`du1>kD>7OBc6o8N#3ni(F2?Va!Mncs4F`zk^D2ODvF3ETQ-Yixq)&uMCS)+EE
zpVGniAl&?VFjSyMpV?qQYdLkG#u4-<^T&;7);`__k8hwA_j3XdStnopE$Itnt?qWW
zm~43{NEfHK!NbG=0A*L^ZYd3ze@>=3yNMXiaCCuJDkGg?3AD>bKu^DK9Yg*Tt8id=
zur}Tzy{`mHBC$mfkEOOO<^+rqO{I&opz@OYV5Rq{r_WF4Al$@cy0eCMLDMxk1O?;8
z%mY%Px0J5Uoo+k!1<EPA;!@C8Hy#X=C2F5Rhu;ss{{4$pB=h@f$@7EP*Ki<-j9VQn
z7o3*@K_&S89u+XcLuACwJScY7ZZCIU8Dcs<Gg|U^6*fY=gTIp<ogOgFr)91>VsNS3
zj2_Oir!lE5H~)L(Lg6<b4haeb@bOcO4A9|b5Qv5TG&6A(!9nHEH0pAS%+uvS0-oz4
zC~%yp*CDZ`d+*0FTcik%@qxwWZyer?;Nqly;h+H1UV+=r@&NtXUQnJ%XTe4qvj72t
z0d0&^LY!U=ywuOpdH4YjXvgQExe)6oGCr2+1R3XK?5XaRJ+QPJN-PCPo><LZ?z#ry
z27d5~|EK&`T`p--v-kX)SBiFYLe#?d%0&I<X2_ksKJsty<d7OeC!f=*m~2uT;qBT<
zOmB0*(%IXTxF;7|`g()`)F<a^s1q-EaWjahb65QeMl<1igx7yO2#_SX?7ktgMB||k
zpxNSDJPl&d!o|Os!lTpwiYuDSExS8JLL0~c_oKXN2wOH0^>P~)izsD2;fJZ>W`;`|
zZFWdYR0n+}aSlfyqL)Z?0wF+QH~Z?)z(GwKsCaV0fs_`5l34t2zY10xiukO}2~bxO
z3Ui65yTy!jQpm$lDddv!!7-<&8{zEeg;VB|UA7bRn!NcL<d9DpNM~0AKq!2fAqp7O
zP#`|vIS){eVWB?Y)6t80H`j91lPPmCC%u}(0|x?a7?b}dZ|*-=kNXkKi2|52bUXkD
zz7eJy7fMznj`a%8lfpGpl|G<VXi1E={qVEGr2rn3f0@_bdIt3yxYm_<$+-vu=9YJ=
zpkhyChVtt|1(aC)^a+q?wFBwduc->)1N0e*dlg;(%z%%ED;_}cXx@onN}{NKE7$$5
z%4-;4BE#bIB#4G}&yH7=-ihMPb*EdS`|pQhZ@)5YSKx(!n=5qi-{ykYQ6a1Q)-<@a
zs+;{}`^y?==MxpSu&WXz%ZL__I}9=Y*AwPMABZc-gUgTzBGtV6-fHAey{h;+dr^tY
zo6*J);6mJ{o3w0)?b59|J-N%t*toK2yXo>yj)~{@JTWIyACRGcRRR3|`*UyE_Ws(w
zz7DpO54L1@z(Gg+eDEt=*#jC8?Llse+v}Le(E+sFzzm{z;pzINJ2?c1<FrS?$yhK`
zg68hT`8rYi#DanqSk4QHafcZvqCnF4dUGr<6hMs(TeXND9!q6WWc_aaI0ypTB57|=
z-*%>D3lD$-aY_Raq6)l}87N{%zg+mt=IVwyysS$m%a<1!$rqc5<5jjRlj!kbr<t1c
zHq7I*T|`~{$@+M>D*<=^xHplVVkl5H$S<8wAeoW>RBY*ZcdVxfJlwnh2RKykJN~0=
zu3>kXe8Q2W9OS*_e!nqLFJ)h&0i{odz~%o}7pVs;6o-I>@ZSS_j(L%XRXQ0Lzg`V9
z;o}6&j$2o)0xa5;{vL}0eD44!#1zw7(Yk<h1QsfP^u9ld(Bc(Yp%6@eoQvEGVD}-t
zk`~8A&VXk#%F>5Vx4mT+dKyar8>6SW(hBg{aySV5ph8(Q1B_|}$o0y}%_XKZ@Z$Yz
zm-|l<5bWGZvt~&dj>1{#tB!gd3exuArexD!AyL(v_F^d<{(PTP7&LGYy3AWc0a!i&
zB(H&L<%3D1ff61f$TaiXVYa$&s{001K0^FYR@Q3CRNe`80$j5v;F^_(IbvuO8n6_4
zlTWLg&nu0ondA5YzK?*@6PHUR`9#zoM!K>pxE8hF$ee6UNNP*=(W$WV4k&<nKHg@`
zSkub`{WW>oh8^vDB~>#9$)PiJz()qiJllIbL~b1Rp5u7vE6Xk{76L!4P=C9A5;Gqu
zm<mdq;r;htOzt7y{_bxJ+M!-jElv50w!pywzDU4{q7v@(>W3A>C&Gw;yhUm)dF~+|
z0!p1fji+$(H*gFcE)SE>?pBohiK1G*>s;c%@W2>zDOa6<lF-%T^X6bX1}MNOs1mLf
z)Ee|lp?em68hf%b{<sVa&CXqQd;#+tH~{NC-VyCG&rg3~zA|QB-!N3O$HxK+uvQ96
z)NNHIg)}egagl>HC9`j;3TfC=;{WHM<QN{9k38!hWz9cWElzV#;Ur{$Hlv+5dbIO|
zD+UQ^WdU3GsoVJN9(W!+#!X-C5^>5qS04==cy29p)*@q_ZQt&7kDk5iH_i!es{Y|!
zricHlf5k1Wsh~7x?SlL_1W@=lZxT_{)poZr{%dW~pzC6FcWv4+$D;LvCWzAjgbrx`
zR+!I%_1nH?2OzeeS2o$a@c?ZWWd|yNF9;Ch0ex~sZPCL-RE>SZsNZHA?01gm*2kF|
zuJsc_Ti*Dv*nIGR^Kf4RFZd?cmcQe*WX$<B)xFo)YbO_DzCl{KC{eWFKwOJ)&;ajM
z4cGbTCeUI8eR&lMC1(S{o_ePwwy@Nl70+xN9Qi8b&u;{hEL|-OK5}J<$c)`2IgJV2
zfuihb0O4p50g$qG+!V}D?xMvb1BeCiI#VA~1R5VFRaVb_f|1P50@1@2aADooM5=0h
zFt#aFR-X&EH|}rioqHefQvHLk-Mfqyz?_Ey5%xx5{_{(f>(u;26zu3?->hfA9}eVp
zW*&IsZuyX;#gY6jXD>2yIFk#~*pAMyDFz1USI~)GhQ<!e-#d1x;?KPqi9Tx%PJuYL
zd}}WD2wLw^B^v&!YBf?Be0z5*wcGeq=;r8s9tMWH%L#kS&QB{wqudIp{mXaI8gCx&
z*H($2X7IxRp@+bm+u)UZUe4_lE_9qve++iKrrE6ZWih{{r*(LghS>1Vbkp<(V^A|{
zxPy!@#VkVvfhZ436l0HWV?K4@pChPrW>y=<pm-02Jl3B=P_Bi>cR$Q20Hqv|G+yu=
zleFbx4_7S}r=;hD3*y1{d7T<z%)v=!4nlg~b3m&DB`RVt0CD9}ndoMJCmZJ&4}6mo
z1Aea+s07O~+)5g;T7v<SLBPN>P`$?libSg!4VWUar{GQg{4E3}&szLE415U$ha#{h
zxeZHJ8?3C7yeEE~u?nuDc{`|&=*92nDS@S(BY1!(fm#Y_D&s#xtXsS3<&a=6|12d{
z^TEg|Dwqa%{xBF3Vfe7>&^!I?VQwDqlGYb)VkxA<&pJ>B5){u4W*{pO)pZ6teMn#f
zERRIfh7*p?0gSxBlQNS|!A%OmFd~ZK|CD+uy-HAut5;o_WDMws1WX<QAgeQUbv-Rg
zNT}3EdOm~ezauy{z}x1UY*d!0v#tZm*TN!5t1~6)N;(mIp&Hkdb<LTv2!-M&;1Wx|
zyV*8oV{=^d<xqeE7(xMJRxX!B!}X0;-N)fCe}DsGJUck`k6t1^a=v<b0CdO$+;TL)
z-CO$qK*MHj|C+iF>3<uo3Y%qE8)QgGh~L3ys9XiKLjbYGGuindO+Bm-G;f8TfX!)#
zIJEvK-DCo^KLgAU6w+1^xW~o<1bnnF_|K?Y(l-sp{HIU)G-BO|-dlJm%8eKJ@pOvm
zMp$9fWqH90c9OF)3%HiN`|q`#(i5%P7RSdpktQZE6g@Za@EvIX8Mtg&KKMVm7WK?W
z$Y3mo;KlH{u!xoDA3>l%fD~y<)3dD~C=1J`MuOV_N)Xlu^F1qvwW4isz?vSyegEPH
z?DOV?vT<-rU5_02g;q>3LaI#rI?dKO(9#AdQEQP$P>p??&A#`v|Lyx4Ool>YWN0;8
zV-E&^NCn|?$<Zjd-WeRwCW`65ofRt`D2=k|%Ax+Hd<e_)-T@2mKU918K&SrptBAa2
z5XVv==&$Sl`^iojQQm6vX0LmJ671RPyfl}|pMj-$s@Zjwa7G|a0K{{A`u|>qtikL+
z=}B=`6Z=ApXe{{L<>%FRwZ?|k+3};iI0~SY8p8c3J6MsAMz*$>tZytsdi9?L09=R_
zjm;LPp>H;s;$))?m@NUN?Wh!h3IvzN&P}UlMw*B^gKZR+VB35eu#c+DY^SbMU$jc!
zevU>tDnnZ?g?ItLBW2)Y*)PzcLLE3=wF>g+E~UN&ADGaPp{%jteshn59$P;k_c1=i
z_YwJ~*|_*t!|y-xKx-!0i>0-t7`WB|F!Ti4@nQlzvuA?^e+Pe}Ea8h^&;9RnCM$&d
tf1jc(DN+CXga`#QE&liM?aR+6$hNMKidAoJqq9G$DQi3|Rx}U#e*o~Q3F80&

diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml
deleted file mode 100644
index 89fde58bf29..00000000000
--- a/kogito-imagestream.yaml
+++ /dev/null
@@ -1,194 +0,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.
-#
-kind: ImageStreamList
-apiVersion: v1
-metadata:
-  name: kogito-image-streams
-  annotations:
-    description: ImageStream definitions for Kogito images
-    openshift.io/provider-display-name: Kie Group.
-items:
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kie-sonataflow-builder
-      annotations:
-        openshift.io/display-name: Kogito Serverless Workflow builder with basic Quarkus SWF extensions preinstalled
-        openshift.io/provider-display-name: KIE Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Kogito Serverless Workflow builder with minimum Quarkus extensions libraries preinstalled
-            iconClass: icon-jbpm
-            tags: kogito,quarkus,swf,maven
-            supports: quarkus
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: docker.io/apache/incubator-kie-sonataflow-builder:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-base-builder
-      annotations:
-        openshift.io/display-name: Kogito base builder
-        openshift.io/provider-display-name: KIE Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Kogito base builder
-            iconClass: icon-jbpm
-            tags: kogito,jdk,maven
-            supports: quarkus
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-base-builder:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-data-index-ephemeral
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Data Index Service for ephemeral PostgreSQL persistence provider
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Data Index Service with ephemeral PostgreSQL
-            iconClass: icon-jbpm
-            tags: kogito,data-index,data-index-ephemeral
-            supports: persistence backed by ephemeral PostgreSQL Server
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-data-index-ephemeral:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-data-index-postgresql
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito Data Index Service for PostgreSQL persistence provider
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito Data Index Service with PostgreSQL
-            iconClass: icon-jbpm
-            tags: kogito,data-index,data-index-postgresql
-            supports: persistence backed by PostgreSQL server
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-data-index-postgresql:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-jit-runner
-      annotations:
-        openshift.io/display-name: Runtime image for the Kogito JIT Runner
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for the Kogito JIT Runner
-            iconClass: icon-jbpm
-            tags: kogito,jit-runner
-            supports: JIT Runner
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-jit-runner:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-jobs-service-ephemeral
-      annotations:
-        openshift.io/display-name: Runtime image for Kogito in memory Jobs Service
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for Kogito in memory Jobs Service
-            iconClass: icon-jbpm
-            tags: kogito,jobs-service
-            supports: out-of-box process timers
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-jobs-service-postgresql
-      annotations:
-        openshift.io/display-name: Runtime image for Kogito Jobs Service based on Postgresql
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: Runtime image for Kogito Jobs Service based on Postgresql
-            iconClass: icon-jbpm
-            tags: kogito,jobs-service
-            supports: out-of-box process timers
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:999-SNAPSHOT
-  - kind: ImageStream
-    apiVersion: v1
-    metadata:
-      name: kogito-jobs-service-allinone
-      annotations:
-        openshift.io/display-name: All in One Runtime image for Kogito Jobs Service
-        openshift.io/provider-display-name: Kie Group.
-    spec:
-      tags:
-        - name: '999-SNAPSHOT'
-          annotations:
-            description: All in One Runtime image for Kogito Jobs Service
-            iconClass: icon-jbpm
-            tags: kogito,jobs-service, all-in-one
-            supports: out-of-box process timers
-            version: '999-SNAPSHOT'
-          referencePolicy:
-            type: Local
-          from:
-            kind: DockerImage
-            name: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:999-SNAPSHOT
diff --git a/packages/kogito-base-builder-image/env/index.js b/packages/kogito-base-builder-image/env/index.js
new file mode 100644
index 00000000000..c9e804e2c1a
--- /dev/null
+++ b/packages/kogito-base-builder-image/env/index.js
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
+
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
+  vars: varsWithName({
+    KOGITO_BASE_BUILDER_IMAGE__registry: {
+      default: "docker.io",
+      description: "The image registry.",
+    },
+    KOGITO_BASE_BUILDER_IMAGE__account: {
+      default: "apache",
+      description: "The image registry account.",
+    },
+    KOGITO_BASE_BUILDER_IMAGE__name: {
+      default: "incubator-kie-kogito-base-builder",
+      description: "The image name.",
+    },
+    KOGITO_BASE_BUILDER_IMAGE__buildTag: {
+      default: rootEnv.env.root.streamName,
+      description: "The image tag.",
+    },
+  }),
+  get env() {
+    return {
+      kogitoBaseBuilderImage: {
+        registry: getOrDefault(this.vars.KOGITO_BASE_BUILDER_IMAGE__registry),
+        account: getOrDefault(this.vars.KOGITO_BASE_BUILDER_IMAGE__account),
+        name: getOrDefault(this.vars.KOGITO_BASE_BUILDER_IMAGE__name),
+        buildTag: getOrDefault(this.vars.KOGITO_BASE_BUILDER_IMAGE__buildTag),
+      },
+    };
+  },
+});
diff --git a/packages/kogito-base-builder-image/install.js b/packages/kogito-base-builder-image/install.js
new file mode 100644
index 00000000000..fa67779a3bb
--- /dev/null
+++ b/packages/kogito-base-builder-image/install.js
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
+const replaceInFile = require("replace-in-file");
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.kogitoBaseBuilderImage.buildTag} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Find and read the -image.yaml file
+const resourcesPath = path.resolve(__dirname, "./resources");
+const files = fs.readdirSync(resourcesPath);
+const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
+if (imageYamlFiles.length !== 1) {
+  throw new Error("There should only be one -image.yaml file on ./resources!");
+}
+const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
+let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
+
+const imageUrl = `${buildEnv.env.kogitoBaseBuilderImage.registry}/${buildEnv.env.kogitoBaseBuilderImage.account}/${buildEnv.env.kogitoBaseBuilderImage.name}`;
+
+// Replace the whole string between quotes ("") with the image name
+imageYaml = imageYaml.replace(/(?<=")(.*kogito-base-builder.*)(?=")/gm, imageUrl);
+
+// Write file and then rename it to match the image name
+fs.writeFileSync(originalYamlPath, imageYaml);
+fs.renameSync(originalYamlPath, path.join(resourcesPath, `${buildEnv.env.kogitoBaseBuilderImage.name}-image.yaml`));
+
+// Replace image URL in .feature files
+replaceInFile.sync({
+  files: ["**/*.feature"],
+  from: /@docker.io\/apache\/.*/g,
+  to: `@${imageUrl}`,
+});
diff --git a/packages/kogito-base-builder-image/package.json b/packages/kogito-base-builder-image/package.json
new file mode 100644
index 00000000000..a37a291e1df
--- /dev/null
+++ b/packages/kogito-base-builder-image/package.json
@@ -0,0 +1,48 @@
+{
+  "private": true,
+  "name": "@kie/kogito-base-builder-image",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "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: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",
+    "copy-test-assets": "run-script-os",
+    "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",
+    "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: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",
+    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env kogitoBaseBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env kogitoBaseBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env kogitoBaseBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env kogitoBaseBuilderImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)"
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "@kie-tools/sonataflow-image-common": "workspace:*",
+    "cross-env": "^7.0.3",
+    "replace-in-file": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "make",
+      "s2i"
+    ]
+  }
+}
diff --git a/kogito-base-builder-image.yaml b/packages/kogito-base-builder-image/resources/incubator-kie-kogito-base-builder-image.yaml
similarity index 95%
rename from kogito-base-builder-image.yaml
rename to packages/kogito-base-builder-image/resources/incubator-kie-kogito-base-builder-image.yaml
index ebdb55dab1c..627f891be91 100644
--- a/kogito-base-builder-image.yaml
+++ b/packages/kogito-base-builder-image/resources/incubator-kie-kogito-base-builder-image.yaml
@@ -31,9 +31,9 @@ labels:
   - name: "io.openshift.expose-services"
     value: "8080:http"
   - name: "io.quarkus.platform.version"
-    value: "3.8.6"
+    value: "### SET ME DURING BUILD PROCESS ###"
   - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
+    value: "### SET ME DURING BUILD PROCESS ###"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
diff --git a/packages/kogito-data-index-ephemeral-image/env/index.js b/packages/kogito-data-index-ephemeral-image/env/index.js
new file mode 100644
index 00000000000..ea84bbde4e6
--- /dev/null
+++ b/packages/kogito-data-index-ephemeral-image/env/index.js
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
+
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
+  vars: varsWithName({
+    KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__registry: {
+      default: "docker.io",
+      description: "The image registry.",
+    },
+    KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__account: {
+      default: "apache",
+      description: "The image registry account.",
+    },
+    KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__name: {
+      default: "incubator-kie-kogito-data-index-ephemeral",
+      description: "The image name.",
+    },
+    KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__buildTag: {
+      default: rootEnv.env.root.streamName,
+      description: "The image tag.",
+    },
+  }),
+  get env() {
+    return {
+      kogitoDataIndexEphemeralImage: {
+        registry: getOrDefault(this.vars.KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__registry),
+        account: getOrDefault(this.vars.KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__account),
+        name: getOrDefault(this.vars.KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__name),
+        buildTag: getOrDefault(this.vars.KOGITO_DATA_INDEX_EPHEMERAL_IMAGE__buildTag),
+      },
+    };
+  },
+});
diff --git a/packages/kogito-data-index-ephemeral-image/install.js b/packages/kogito-data-index-ephemeral-image/install.js
new file mode 100644
index 00000000000..c650f3bac2a
--- /dev/null
+++ b/packages/kogito-data-index-ephemeral-image/install.js
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
+const replaceInFile = require("replace-in-file");
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.kogitoDataIndexEphemeralImage.buildTag} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Find and read the -image.yaml file
+const resourcesPath = path.resolve(__dirname, "./resources");
+const files = fs.readdirSync(resourcesPath);
+const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
+if (imageYamlFiles.length !== 1) {
+  throw new Error("There should only be one -image.yaml file on ./resources!");
+}
+const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
+let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
+
+const imageUrl = `${buildEnv.env.kogitoDataIndexEphemeralImage.registry}/${buildEnv.env.kogitoDataIndexEphemeralImage.account}/${buildEnv.env.kogitoDataIndexEphemeralImage.name}`;
+
+// Replace the whole string between quotes ("") with the image name
+imageYaml = imageYaml.replace(/(?<=")(.*kogito-data-index-ephemeral.*)(?=")/gm, imageUrl);
+
+// Write file and then rename it to match the image name
+fs.writeFileSync(originalYamlPath, imageYaml);
+fs.renameSync(
+  originalYamlPath,
+  path.join(resourcesPath, `${buildEnv.env.kogitoDataIndexEphemeralImage.name}-image.yaml`)
+);
+
+// Replace image URL in .feature files
+replaceInFile.sync({
+  files: ["**/*.feature"],
+  from: /@docker.io\/apache\/.*/g,
+  to: `@${imageUrl}`,
+});
diff --git a/packages/kogito-data-index-ephemeral-image/package.json b/packages/kogito-data-index-ephemeral-image/package.json
new file mode 100644
index 00000000000..6a1c11fecda
--- /dev/null
+++ b/packages/kogito-data-index-ephemeral-image/package.json
@@ -0,0 +1,48 @@
+{
+  "private": true,
+  "name": "@kie/kogito-data-index-ephemeral-image",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "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: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",
+    "copy-test-assets": "run-script-os",
+    "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: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: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",
+    "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 quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)"
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "@kie-tools/sonataflow-image-common": "workspace:*",
+    "cross-env": "^7.0.3",
+    "replace-in-file": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "make",
+      "s2i"
+    ]
+  }
+}
diff --git a/kogito-data-index-ephemeral-image.yaml b/packages/kogito-data-index-ephemeral-image/resources/incubator-kie-kogito-data-index-ephemeral-image.yaml
similarity index 96%
rename from kogito-data-index-ephemeral-image.yaml
rename to packages/kogito-data-index-ephemeral-image/resources/incubator-kie-kogito-data-index-ephemeral-image.yaml
index 0666b2988b8..5c414019813 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/packages/kogito-data-index-ephemeral-image/resources/incubator-kie-kogito-data-index-ephemeral-image.yaml
@@ -25,7 +25,7 @@ description: "Runtime image for Kogito Data Index Service for ephemeral PostgreS
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
+    value: "### SET ME DURING BUILD PROCESS ###"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
@@ -53,7 +53,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
-    - name: org.kie.kogito.dataindex.community.ephemeral
+    - name: org.kie.kogito.dataindex.ephemeral
     - name: org.kie.kogito.dataindex.common
     - name: org.kie.kogito.security.custom.truststores
 
diff --git a/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh b/packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
similarity index 100%
rename from modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh
rename to packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/added/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-ephemeral/community/configure b/packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/configure
similarity index 100%
rename from modules/kogito-data-index-ephemeral/community/configure
rename to packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/configure
diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/module.yaml
similarity index 95%
rename from modules/kogito-data-index-ephemeral/community/module.yaml
rename to packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/module.yaml
index 935d1582b35..94e22660e5b 100644
--- a/modules/kogito-data-index-ephemeral/community/module.yaml
+++ b/packages/kogito-data-index-ephemeral-image/resources/modules/kogito-data-index-ephemeral/module.yaml
@@ -17,7 +17,7 @@
 # under the License.
 #
 schema_version: 1
-name: org.kie.kogito.dataindex.community.ephemeral
+name: org.kie.kogito.dataindex.ephemeral
 version: "main"
 
 # see build-kogito-apps-components.sh script, responsible for build it.
diff --git a/tests/features/supporting-services-common.feature b/packages/kogito-data-index-ephemeral-image/test-resources/tests/features/kogito-data-index-common.feature
similarity index 52%
rename from tests/features/supporting-services-common.feature
rename to packages/kogito-data-index-ephemeral-image/test-resources/tests/features/kogito-data-index-common.feature
index 568fda55b84..d5a359d17dd 100644
--- a/tests/features/supporting-services-common.feature
+++ b/packages/kogito-data-index-ephemeral-image/test-resources/tests/features/kogito-data-index-common.feature
@@ -18,10 +18,17 @@
 #
 
 @docker.io/apache/incubator-kie-kogito-data-index-ephemeral
-@docker.io/apache/incubator-kie-kogito-data-index-postgresql
-@docker.io/apache/incubator-kie-kogito-jit-runner
-Feature: kogito supporting services common feature
+Feature: Kogito-data-index common feature.
 
-Scenario: Verify if the application jar exists
-  When container is started with command bash
-  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
\ No newline at end of file
+  Scenario: Verify if the debug is correctly enabled and test default http port
+    When container is started with env
+      | variable               | value   |
+      | SCRIPT_DEBUG           | true    |
+    Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
+
+  Scenario: check if a provided data index quarkus profile is correctly set on data index
+    When container is started with env
+      | variable                           | value               |
+      | SCRIPT_DEBUG                       | true                |
+      | KOGITO_DATA_INDEX_QUARKUS_PROFILE  | http-events-support |
+    Then container log should contain -Dquarkus.profile=http-events-support
\ No newline at end of file
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/packages/kogito-data-index-ephemeral-image/test-resources/tests/features/kogito-data-index-ephemeral.feature
similarity index 99%
rename from tests/features/data-index/kogito-data-index-ephemeral.feature
rename to packages/kogito-data-index-ephemeral-image/test-resources/tests/features/kogito-data-index-ephemeral.feature
index b37b7931034..f7e817c3c16 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/packages/kogito-data-index-ephemeral-image/test-resources/tests/features/kogito-data-index-ephemeral.feature
@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-
 @docker.io/apache/incubator-kie-kogito-data-index-ephemeral
 Feature: Kogito-data-index ephemeral postgresql feature.
 
diff --git a/packages/kogito-data-index-postgresql-image/env/index.js b/packages/kogito-data-index-postgresql-image/env/index.js
new file mode 100644
index 00000000000..2b6e41af30d
--- /dev/null
+++ b/packages/kogito-data-index-postgresql-image/env/index.js
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
+
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
+  vars: varsWithName({
+    KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__registry: {
+      default: "docker.io",
+      description: "The image registry.",
+    },
+    KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__account: {
+      default: "apache",
+      description: "The image registry account.",
+    },
+    KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__name: {
+      default: "incubator-kie-kogito-data-index-postgresql",
+      description: "The image name.",
+    },
+    KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__buildTag: {
+      default: rootEnv.env.root.streamName,
+      description: "The image tag.",
+    },
+  }),
+  get env() {
+    return {
+      kogitoDataIndexPostgresqlImage: {
+        registry: getOrDefault(this.vars.KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__registry),
+        account: getOrDefault(this.vars.KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__account),
+        name: getOrDefault(this.vars.KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__name),
+        buildTag: getOrDefault(this.vars.KOGITO_DATA_INDEX_POSTGRESQL_IMAGE__buildTag),
+      },
+    };
+  },
+});
diff --git a/packages/kogito-data-index-postgresql-image/install.js b/packages/kogito-data-index-postgresql-image/install.js
new file mode 100644
index 00000000000..319a9b8ebd4
--- /dev/null
+++ b/packages/kogito-data-index-postgresql-image/install.js
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
+const replaceInFile = require("replace-in-file");
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.kogitoDataIndexPostgresqlImage.buildTag} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Find and read the -image.yaml file
+const resourcesPath = path.resolve(__dirname, "./resources");
+const files = fs.readdirSync(resourcesPath);
+const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
+if (imageYamlFiles.length !== 1) {
+  throw new Error("There should only be one -image.yaml file on ./resources!");
+}
+const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
+let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
+
+const imageUrl = `${buildEnv.env.kogitoDataIndexPostgresqlImage.registry}/${buildEnv.env.kogitoDataIndexPostgresqlImage.account}/${buildEnv.env.kogitoDataIndexPostgresqlImage.name}`;
+
+// Replace the whole string between quotes ("") with the image name
+imageYaml = imageYaml.replace(/(?<=")(.*kogito-data-index-postgresql.*)(?=")/gm, imageUrl);
+
+// Write file and then rename it to match the image name
+fs.writeFileSync(originalYamlPath, imageYaml);
+fs.renameSync(
+  originalYamlPath,
+  path.join(resourcesPath, `${buildEnv.env.kogitoDataIndexPostgresqlImage.name}-image.yaml`)
+);
+
+// Replace image URL in .feature files
+replaceInFile.sync({
+  files: ["**/*.feature"],
+  from: /@docker.io\/apache\/.*/g,
+  to: `@${imageUrl}`,
+});
diff --git a/packages/kogito-data-index-postgresql-image/package.json b/packages/kogito-data-index-postgresql-image/package.json
new file mode 100644
index 00000000000..395aa2ec045
--- /dev/null
+++ b/packages/kogito-data-index-postgresql-image/package.json
@@ -0,0 +1,48 @@
+{
+  "private": true,
+  "name": "@kie/kogito-data-index-postgresql-image",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "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: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",
+    "copy-test-assets": "run-script-os",
+    "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: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: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",
+    "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 quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)"
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "@kie-tools/sonataflow-image-common": "workspace:*",
+    "cross-env": "^7.0.3",
+    "replace-in-file": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "make",
+      "s2i"
+    ]
+  }
+}
diff --git a/kogito-data-index-postgresql-image.yaml b/packages/kogito-data-index-postgresql-image/resources/incubator-kie-kogito-data-index-postgresql-image.yaml
similarity index 94%
rename from kogito-data-index-postgresql-image.yaml
rename to packages/kogito-data-index-postgresql-image/resources/incubator-kie-kogito-data-index-postgresql-image.yaml
index 43c87494d8c..6baa79e3a5b 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/packages/kogito-data-index-postgresql-image/resources/incubator-kie-kogito-data-index-postgresql-image.yaml
@@ -18,15 +18,14 @@
 #
 schema_version: 1
 
-name: "docker.io/apache/incubator-kie-kogito-data-index-postgresql"
+name: "docker.io/apache/incubator-kie-kogito-data-index-ephemeral"
 version: "main"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
 
-
 labels:
   - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
+    value: "### SET ME DURING BUILD PROCESS ###"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
diff --git a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh b/packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
similarity index 100%
rename from modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
rename to packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh
diff --git a/modules/kogito-data-index-postgresql/configure b/packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/configure
similarity index 100%
rename from modules/kogito-data-index-postgresql/configure
rename to packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/configure
diff --git a/modules/kogito-data-index-postgresql/module.yaml b/packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/module.yaml
similarity index 100%
rename from modules/kogito-data-index-postgresql/module.yaml
rename to packages/kogito-data-index-postgresql-image/resources/modules/kogito-data-index-postgresql/module.yaml
diff --git a/tests/features/kogito-common-postresql-services.feature b/packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-common-postresql-services.feature
similarity index 100%
rename from tests/features/kogito-common-postresql-services.feature
rename to packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-common-postresql-services.feature
diff --git a/tests/features/data-index/kogito-data-index-common.feature b/packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-data-index-common.feature
similarity index 96%
rename from tests/features/data-index/kogito-data-index-common.feature
rename to packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-data-index-common.feature
index dedb8ddbb3a..fae736f08d5 100644
--- a/tests/features/data-index/kogito-data-index-common.feature
+++ b/packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-data-index-common.feature
@@ -17,7 +17,6 @@
 # under the License.
 #
 
-@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
 @docker.io/apache/incubator-kie-kogito-data-index-postgresql
 Feature: Kogito-data-index common feature.
 
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-data-index-postgresql.feature
similarity index 100%
rename from tests/features/data-index/kogito-data-index-postgresql.feature
rename to packages/kogito-data-index-postgresql-image/test-resources/tests/features/kogito-data-index-postgresql.feature
diff --git a/packages/kogito-jit-runner-image/env/index.js b/packages/kogito-jit-runner-image/env/index.js
new file mode 100644
index 00000000000..a7772148f10
--- /dev/null
+++ b/packages/kogito-jit-runner-image/env/index.js
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
+
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
+  vars: varsWithName({
+    KOGITO_JIT_RUNNER_IMAGE__registry: {
+      default: "docker.io",
+      description: "The image registry.",
+    },
+    KOGITO_JIT_RUNNER_IMAGE__account: {
+      default: "apache",
+      description: "The image registry account.",
+    },
+    KOGITO_JIT_RUNNER_IMAGE__name: {
+      default: "incubator-kie-kogito-jit-runner",
+      description: "The image name.",
+    },
+    KOGITO_JIT_RUNNER_IMAGE__buildTag: {
+      default: rootEnv.env.root.streamName,
+      description: "The image tag.",
+    },
+  }),
+  get env() {
+    return {
+      kogitoJitRunnerImage: {
+        registry: getOrDefault(this.vars.KOGITO_JIT_RUNNER_IMAGE__registry),
+        account: getOrDefault(this.vars.KOGITO_JIT_RUNNER_IMAGE__account),
+        name: getOrDefault(this.vars.KOGITO_JIT_RUNNER_IMAGE__name),
+        buildTag: getOrDefault(this.vars.KOGITO_JIT_RUNNER_IMAGE__buildTag),
+      },
+    };
+  },
+});
diff --git a/packages/kogito-jit-runner-image/install.js b/packages/kogito-jit-runner-image/install.js
new file mode 100644
index 00000000000..2d2789e493b
--- /dev/null
+++ b/packages/kogito-jit-runner-image/install.js
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
+const replaceInFile = require("replace-in-file");
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.kogitoJitRunnerImage.buildTag} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Find and read the -image.yaml file
+const resourcesPath = path.resolve(__dirname, "./resources");
+const files = fs.readdirSync(resourcesPath);
+const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
+if (imageYamlFiles.length !== 1) {
+  throw new Error("There should only be one -image.yaml file on ./resources!");
+}
+const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
+let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
+
+const imageUrl = `${buildEnv.env.kogitoJitRunnerImage.registry}/${buildEnv.env.kogitoJitRunnerImage.account}/${buildEnv.env.kogitoJitRunnerImage.name}`;
+
+// Replace the whole string between quotes ("") with the image name
+imageYaml = imageYaml.replace(/(?<=")(.*kogito-jit-runner.*)(?=")/gm, imageUrl);
+
+// Write file and then rename it to match the image name
+fs.writeFileSync(originalYamlPath, imageYaml);
+fs.renameSync(originalYamlPath, path.join(resourcesPath, `${buildEnv.env.kogitoJitRunnerImage.name}-image.yaml`));
+
+// Replace image URL in .feature files
+replaceInFile.sync({
+  files: ["**/*.feature"],
+  from: /@docker.io\/apache\/.*/g,
+  to: `@${imageUrl}`,
+});
diff --git a/packages/kogito-jit-runner-image/package.json b/packages/kogito-jit-runner-image/package.json
new file mode 100644
index 00000000000..2b9dfd3be58
--- /dev/null
+++ b/packages/kogito-jit-runner-image/package.json
@@ -0,0 +1,48 @@
+{
+  "private": true,
+  "name": "@kie/kogito-jit-runner-image",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "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: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",
+    "copy-test-assets": "run-script-os",
+    "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: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: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",
+    "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 quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)"
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "@kie-tools/sonataflow-image-common": "workspace:*",
+    "cross-env": "^7.0.3",
+    "replace-in-file": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "make",
+      "s2i"
+    ]
+  }
+}
diff --git a/kogito-jit-runner-image.yaml b/packages/kogito-jit-runner-image/resources/incubator-kie-kogito-jit-runner-image.yaml
similarity index 97%
rename from kogito-jit-runner-image.yaml
rename to packages/kogito-jit-runner-image/resources/incubator-kie-kogito-jit-runner-image.yaml
index b624d9a5435..e6b453f6112 100644
--- a/kogito-jit-runner-image.yaml
+++ b/packages/kogito-jit-runner-image/resources/incubator-kie-kogito-jit-runner-image.yaml
@@ -25,7 +25,7 @@ description: "Runtime image for Kogito JIT Runner"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
+    value: "### SET ME DURING BUILD PROCESS ###"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
diff --git a/modules/kogito-jit-runner/added/kogito-app-launch.sh b/packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/added/kogito-app-launch.sh
similarity index 100%
rename from modules/kogito-jit-runner/added/kogito-app-launch.sh
rename to packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/added/kogito-app-launch.sh
diff --git a/modules/kogito-jit-runner/configure b/packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/configure
similarity index 100%
rename from modules/kogito-jit-runner/configure
rename to packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/configure
diff --git a/modules/kogito-jit-runner/module.yaml b/packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/module.yaml
similarity index 100%
rename from modules/kogito-jit-runner/module.yaml
rename to packages/kogito-jit-runner-image/resources/modules/kogito-jit-runner/module.yaml
diff --git a/tests/features/kogito-jit-runner.feature b/packages/kogito-jit-runner-image/test-resources/tests/features/kogito-jit-runner.feature
similarity index 100%
rename from tests/features/kogito-jit-runner.feature
rename to packages/kogito-jit-runner-image/test-resources/tests/features/kogito-jit-runner.feature
diff --git a/packages/kogito-jobs-service-allinone-image/env/index.js b/packages/kogito-jobs-service-allinone-image/env/index.js
new file mode 100644
index 00000000000..dd1f166123d
--- /dev/null
+++ b/packages/kogito-jobs-service-allinone-image/env/index.js
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
+
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
+  vars: varsWithName({
+    KOGITO_JOBS_SERVICE_ALLINONE_IMAGE__registry: {
+      default: "docker.io",
+      description: "The image registry.",
+    },
+    KOGITO_JOBS_SERVICE_ALLINONE_IMAGE__account: {
+      default: "apache",
+      description: "The image registry account.",
+    },
+    KOGITO_JOBS_SERVICE_ALLINONE_IMAGE__name: {
+      default: "incubator-kie-kogito-jobs-service-allinone",
+      description: "The image name.",
+    },
+    KOGITO_JOBS_SERVICE_ALLINONE_IMAGE__buildTag: {
+      default: rootEnv.env.root.streamName,
+      description: "The image tag.",
+    },
+  }),
+  get env() {
+    return {
+      kogitoJobsServiceAllInOneImage: {
+        registry: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_ALLINONE_IMAGE__registry),
+        account: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_ALLINONE_IMAGE__account),
+        name: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_ALLINONE_IMAGE__name),
+        buildTag: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_ALLINONE_IMAGE__buildTag),
+      },
+    };
+  },
+});
diff --git a/packages/kogito-jobs-service-allinone-image/install.js b/packages/kogito-jobs-service-allinone-image/install.js
new file mode 100644
index 00000000000..8ea16c03076
--- /dev/null
+++ b/packages/kogito-jobs-service-allinone-image/install.js
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
+const replaceInFile = require("replace-in-file");
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.kogitoJobsServiceAllInOneImage.buildTag} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Find and read the -image.yaml file
+const resourcesPath = path.resolve(__dirname, "./resources");
+const files = fs.readdirSync(resourcesPath);
+const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
+if (imageYamlFiles.length !== 1) {
+  throw new Error("There should only be one -image.yaml file on ./resources!");
+}
+const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
+let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
+
+const imageUrl = `${buildEnv.env.kogitoJobsServiceAllInOneImage.registry}/${buildEnv.env.kogitoJobsServiceAllInOneImage.account}/${buildEnv.env.kogitoJobsServiceAllInOneImage.name}`;
+
+// Replace the whole string between quotes ("") with the image name
+imageYaml = imageYaml.replace(/(?<=")(.*kogito-jobs-service-allinone.*)(?=")/gm, imageUrl);
+
+// Write file and then rename it to match the image name
+fs.writeFileSync(originalYamlPath, imageYaml);
+fs.renameSync(
+  originalYamlPath,
+  path.join(resourcesPath, `${buildEnv.env.kogitoJobsServiceAllInOneImage.name}-image.yaml`)
+);
+
+// Replace image URL in .feature files
+replaceInFile.sync({
+  files: ["**/*.feature"],
+  from: /@docker.io\/apache\/.*/g,
+  to: `@${imageUrl}`,
+});
diff --git a/packages/kogito-jobs-service-allinone-image/package.json b/packages/kogito-jobs-service-allinone-image/package.json
new file mode 100644
index 00000000000..154e99af83f
--- /dev/null
+++ b/packages/kogito-jobs-service-allinone-image/package.json
@@ -0,0 +1,48 @@
+{
+  "private": true,
+  "name": "@kie/kogito-jobs-service-allinone-image",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "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: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",
+    "copy-test-assets": "run-script-os",
+    "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: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: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",
+    "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 quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)"
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "@kie-tools/sonataflow-image-common": "workspace:*",
+    "cross-env": "^7.0.3",
+    "replace-in-file": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "make",
+      "s2i"
+    ]
+  }
+}
diff --git a/kogito-jobs-service-allinone-image.yaml b/packages/kogito-jobs-service-allinone-image/resources/incubator-kie-kogito-jobs-service-allinone-image.yaml
similarity index 95%
rename from kogito-jobs-service-allinone-image.yaml
rename to packages/kogito-jobs-service-allinone-image/resources/incubator-kie-kogito-jobs-service-allinone-image.yaml
index 99853944375..eb63de643ee 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/packages/kogito-jobs-service-allinone-image/resources/incubator-kie-kogito-jobs-service-allinone-image.yaml
@@ -18,14 +18,14 @@
 #
 schema_version: 1
 
-name: "docker.io/apache/incubator-kie-kogito-jobs-service-allinone"
+name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral"
 version: "main"
 from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19"
 description: "Runtime image for Kogito Jobs Service with all available jdbc providers"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
+    value: "### SET ME DURING BUILD PROCESS ###"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
diff --git a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh b/packages/kogito-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
similarity index 100%
rename from modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
rename to packages/kogito-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh
diff --git a/modules/kogito-jobs-service-all-in-one/configure b/packages/kogito-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/configure
similarity index 100%
rename from modules/kogito-jobs-service-all-in-one/configure
rename to packages/kogito-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/configure
diff --git a/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
similarity index 100%
rename from modules/kogito-jobs-service-all-in-one/module.yaml
rename to packages/kogito-jobs-service-allinone-image/resources/modules/kogito-jobs-service-all-in-one/module.yaml
diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature b/packages/kogito-jobs-service-allinone-image/test-resources/tests/features/kogito-jobs-service-all-in-one.feature
similarity index 100%
rename from tests/features/jobs-service/kogito-jobs-service-all-in-one.feature
rename to packages/kogito-jobs-service-allinone-image/test-resources/tests/features/kogito-jobs-service-all-in-one.feature
diff --git a/packages/kogito-jobs-service-allinone-image/test-resources/tests/features/kogito-jobs-service-common.feature b/packages/kogito-jobs-service-allinone-image/test-resources/tests/features/kogito-jobs-service-common.feature
new file mode 100644
index 00000000000..81743a49b80
--- /dev/null
+++ b/packages/kogito-jobs-service-allinone-image/test-resources/tests/features/kogito-jobs-service-common.feature
@@ -0,0 +1,31 @@
+#
+# 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.
+#
+
+@docker.io/apache/incubator-kie-kogito-jobs-service-allinone
+@docker.io/apache/incubator-kie-kogito-jobs-service-allinone
+@docker.io/apache/incubator-kie-kogito-jobs-service-allinone
+Feature: Kogito-jobs-service common feature.
+
+  Scenario: verify if the events is correctly enabled
+    When container is started with env
+      | variable                | value                                     |
+      | SCRIPT_DEBUG            | true                                      |
+      | ENABLE_EVENTS           | true                                      |
+      | KOGITO_JOBS_PROPS       | -Dkafka.bootstrap.servers=localhost:11111 |
+    Then container log should contain -Dkafka.bootstrap.servers=localhost:11111 -Dquarkus.profile=events-support -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar
diff --git a/packages/kogito-jobs-service-ephemeral-image/env/index.js b/packages/kogito-jobs-service-ephemeral-image/env/index.js
new file mode 100644
index 00000000000..fdd58dfdd07
--- /dev/null
+++ b/packages/kogito-jobs-service-ephemeral-image/env/index.js
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
+
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
+  vars: varsWithName({
+    KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__registry: {
+      default: "docker.io",
+      description: "The image registry.",
+    },
+    KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__account: {
+      default: "apache",
+      description: "The image registry account.",
+    },
+    KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__name: {
+      default: "incubator-kie-kogito-jobs-service-ephemeral",
+      description: "The image name.",
+    },
+    KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__buildTag: {
+      default: rootEnv.env.root.streamName,
+      description: "The image tag.",
+    },
+  }),
+  get env() {
+    return {
+      kogitoJobsServiceEphemeralImage: {
+        registry: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__registry),
+        account: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__account),
+        name: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__name),
+        buildTag: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_EPHEMERAL_IMAGE__buildTag),
+      },
+    };
+  },
+});
diff --git a/packages/kogito-jobs-service-ephemeral-image/install.js b/packages/kogito-jobs-service-ephemeral-image/install.js
new file mode 100644
index 00000000000..ac33c6ae754
--- /dev/null
+++ b/packages/kogito-jobs-service-ephemeral-image/install.js
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
+const replaceInFile = require("replace-in-file");
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.kogitoJobsServiceEphemeralImage.buildTag} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Find and read the -image.yaml file
+const resourcesPath = path.resolve(__dirname, "./resources");
+const files = fs.readdirSync(resourcesPath);
+const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
+if (imageYamlFiles.length !== 1) {
+  throw new Error("There should only be one -image.yaml file on ./resources!");
+}
+const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
+let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
+
+const imageUrl = `${buildEnv.env.kogitoJobsServiceEphemeralImage.registry}/${buildEnv.env.kogitoJobsServiceEphemeralImage.account}/${buildEnv.env.kogitoJobsServiceEphemeralImage.name}`;
+
+// Replace the whole string between quotes ("") with the image name
+imageYaml = imageYaml.replace(/(?<=")(.*kogito-jobs-service-ephemeral.*)(?=")/gm, imageUrl);
+
+// Write file and then rename it to match the image name
+fs.writeFileSync(originalYamlPath, imageYaml);
+fs.renameSync(
+  originalYamlPath,
+  path.join(resourcesPath, `${buildEnv.env.kogitoJobsServiceEphemeralImage.name}-image.yaml`)
+);
+
+// Replace image URL in .feature files
+replaceInFile.sync({
+  files: ["**/*.feature"],
+  from: /@docker.io\/apache\/.*/g,
+  to: `@${imageUrl}`,
+});
diff --git a/packages/kogito-jobs-service-ephemeral-image/package.json b/packages/kogito-jobs-service-ephemeral-image/package.json
new file mode 100644
index 00000000000..02135e4034a
--- /dev/null
+++ b/packages/kogito-jobs-service-ephemeral-image/package.json
@@ -0,0 +1,48 @@
+{
+  "private": true,
+  "name": "@kie/kogito-jobs-service-ephemeral-image",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "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: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",
+    "copy-test-assets": "run-script-os",
+    "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: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: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",
+    "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 quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)"
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "@kie-tools/sonataflow-image-common": "workspace:*",
+    "cross-env": "^7.0.3",
+    "replace-in-file": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "make",
+      "s2i"
+    ]
+  }
+}
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/packages/kogito-jobs-service-ephemeral-image/resources/incubator-kie-kogito-jobs-service-ephemeral-image.yaml
similarity index 97%
rename from kogito-jobs-service-ephemeral-image.yaml
rename to packages/kogito-jobs-service-ephemeral-image/resources/incubator-kie-kogito-jobs-service-ephemeral-image.yaml
index abbdc62803c..92536ef40f5 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/packages/kogito-jobs-service-ephemeral-image/resources/incubator-kie-kogito-jobs-service-ephemeral-image.yaml
@@ -25,7 +25,7 @@ description: "Runtime image for Kogito in memory Jobs Service"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
+    value: "### SET ME DURING BUILD PROCESS ###"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
diff --git a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh b/packages/kogito-jobs-service-ephemeral-image/resources/modules/added/kogito-app-launch.sh
similarity index 100%
rename from modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh
rename to packages/kogito-jobs-service-ephemeral-image/resources/modules/added/kogito-app-launch.sh
diff --git a/modules/kogito-jobs-service-ephemeral/configure b/packages/kogito-jobs-service-ephemeral-image/resources/modules/configure
similarity index 100%
rename from modules/kogito-jobs-service-ephemeral/configure
rename to packages/kogito-jobs-service-ephemeral-image/resources/modules/configure
diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/packages/kogito-jobs-service-ephemeral-image/resources/modules/module.yaml
similarity index 100%
rename from modules/kogito-jobs-service-ephemeral/module.yaml
rename to packages/kogito-jobs-service-ephemeral-image/resources/modules/module.yaml
diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features/kogito-jobs-service-common.feature
similarity index 92%
rename from tests/features/jobs-service/kogito-jobs-service-common.feature
rename to packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features/kogito-jobs-service-common.feature
index d7ec38d23b1..56a431c9c5f 100644
--- a/tests/features/jobs-service/kogito-jobs-service-common.feature
+++ b/packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features/kogito-jobs-service-common.feature
@@ -18,8 +18,8 @@
 #
 
 @docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
-@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
-@docker.io/apache/incubator-kie-kogito-jobs-service-allinone
+@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
+@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
 Feature: Kogito-jobs-service common feature.
 
   Scenario: verify if the events is correctly enabled
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features/kogito-jobs-service-ephemeral.feature
similarity index 100%
rename from tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
rename to packages/kogito-jobs-service-ephemeral-image/test-resources/tests/features/kogito-jobs-service-ephemeral.feature
diff --git a/packages/kogito-jobs-service-postgresql-image/env/index.js b/packages/kogito-jobs-service-postgresql-image/env/index.js
new file mode 100644
index 00000000000..538378a7353
--- /dev/null
+++ b/packages/kogito-jobs-service-postgresql-image/env/index.js
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
+
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
+  vars: varsWithName({
+    KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__registry: {
+      default: "docker.io",
+      description: "The image registry.",
+    },
+    KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__account: {
+      default: "apache",
+      description: "The image registry account.",
+    },
+    KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__name: {
+      default: "incubator-kie-kogito-jobs-service-postgresql",
+      description: "The image name.",
+    },
+    KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__buildTag: {
+      default: rootEnv.env.root.streamName,
+      description: "The image tag.",
+    },
+  }),
+  get env() {
+    return {
+      kogitoJobsServicePostgresqlImage: {
+        registry: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__registry),
+        account: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__account),
+        name: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__name),
+        buildTag: getOrDefault(this.vars.KOGITO_JOBS_SERVICE_POSTGRESQL_IMAGE__buildTag),
+      },
+    };
+  },
+});
diff --git a/packages/kogito-jobs-service-postgresql-image/install.js b/packages/kogito-jobs-service-postgresql-image/install.js
new file mode 100644
index 00000000000..e975ea5c3d7
--- /dev/null
+++ b/packages/kogito-jobs-service-postgresql-image/install.js
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
+const replaceInFile = require("replace-in-file");
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.kogitoJobsServicePostgresqlImage.buildTag} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Find and read the -image.yaml file
+const resourcesPath = path.resolve(__dirname, "./resources");
+const files = fs.readdirSync(resourcesPath);
+const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
+if (imageYamlFiles.length !== 1) {
+  throw new Error("There should only be one -image.yaml file on ./resources!");
+}
+const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
+let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
+
+const imageUrl = `${buildEnv.env.kogitoJobsServicePostgresqlImage.registry}/${buildEnv.env.kogitoJobsServicePostgresqlImage.account}/${buildEnv.env.kogitoJobsServicePostgresqlImage.name}`;
+
+// Replace the whole string between quotes ("") with the image name
+imageYaml = imageYaml.replace(/(?<=")(.*kogito-jobs-service-postgresql.*)(?=")/gm, imageUrl);
+
+// Write file and then rename it to match the image name
+fs.writeFileSync(originalYamlPath, imageYaml);
+fs.renameSync(
+  originalYamlPath,
+  path.join(resourcesPath, `${buildEnv.env.kogitoJobsServicePostgresqlImage.name}-image.yaml`)
+);
+
+// Replace image URL in .feature files
+replaceInFile.sync({
+  files: ["**/*.feature"],
+  from: /@docker.io\/apache\/.*/g,
+  to: `@${imageUrl}`,
+});
diff --git a/packages/kogito-jobs-service-postgresql-image/package.json b/packages/kogito-jobs-service-postgresql-image/package.json
new file mode 100644
index 00000000000..602f4b3356d
--- /dev/null
+++ b/packages/kogito-jobs-service-postgresql-image/package.json
@@ -0,0 +1,48 @@
+{
+  "private": true,
+  "name": "@kie/kogito-jobs-service-postgresql-image",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "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: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",
+    "copy-test-assets": "run-script-os",
+    "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: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: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",
+    "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 quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)"
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "@kie-tools/sonataflow-image-common": "workspace:*",
+    "cross-env": "^7.0.3",
+    "replace-in-file": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "make",
+      "s2i"
+    ]
+  }
+}
diff --git a/kogito-jobs-service-postgresql-image.yaml b/packages/kogito-jobs-service-postgresql-image/resources/incubator-kie-kogito-jobs-service-postgresql-image.yaml
similarity index 97%
rename from kogito-jobs-service-postgresql-image.yaml
rename to packages/kogito-jobs-service-postgresql-image/resources/incubator-kie-kogito-jobs-service-postgresql-image.yaml
index c73c34f3754..8458b48a849 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/packages/kogito-jobs-service-postgresql-image/resources/incubator-kie-kogito-jobs-service-postgresql-image.yaml
@@ -25,7 +25,7 @@ description: "Runtime image for Kogito Jobs Service based on Postgresql"
 
 labels:
   - name: "org.kie.kogito.version"
-    value: "999-SNAPSHOT"
+    value: "### SET ME DURING BUILD PROCESS ###"
   - name: "maintainer"
     value: "Apache KIE <dev@kie.apache.org>"
   - name: "io.k8s.description"
diff --git a/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
similarity index 100%
rename from modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
rename to packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh
diff --git a/modules/kogito-jobs-service-postgresql/configure b/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/configure
similarity index 100%
rename from modules/kogito-jobs-service-postgresql/configure
rename to packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/configure
diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/module.yaml
similarity index 100%
rename from modules/kogito-jobs-service-postgresql/module.yaml
rename to packages/kogito-jobs-service-postgresql-image/resources/modules/kogito-jobs-service-postgresql/module.yaml
diff --git a/tests/features/common.feature b/packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-common.feature
similarity index 52%
rename from tests/features/common.feature
rename to packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-common.feature
index 0197394c274..6c9ad4a7738 100644
--- a/tests/features/common.feature
+++ b/packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-common.feature
@@ -17,18 +17,15 @@
 # under the License.
 #
 
-@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
-@docker.io/apache/incubator-kie-kogito-data-index-postgresql
-@docker.io/apache/incubator-kie-kogito-jit-runner
-@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
 @docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
-@docker.io/apache/incubator-kie-sonataflow-builder
-@docker.io/apache/incubator-kie-kogito-base-builder
-Feature: Common tests for Kogito images
-
-  Scenario: Verify if Kogito user is correctly configured
-    When container is started with command sh
-    Then run sh -c 'echo $USER' in container and check its output for kogito
-     And run sh -c 'echo $HOME' in container and check its output for /home/kogito
-     And run sh -c 'id' in container and check its output for uid=1001(kogito) gid=0(root) groups=0(root),1001(kogito)
+@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
+@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
+Feature: Kogito-jobs-service common feature.
 
+  Scenario: verify if the events is correctly enabled
+    When container is started with env
+      | variable                | value                                     |
+      | SCRIPT_DEBUG            | true                                      |
+      | ENABLE_EVENTS           | true                                      |
+      | KOGITO_JOBS_PROPS       | -Dkafka.bootstrap.servers=localhost:11111 |
+    Then container log should contain -Dkafka.bootstrap.servers=localhost:11111 -Dquarkus.profile=events-support -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-postgresql.feature
similarity index 100%
rename from tests/features/jobs-service/kogito-jobs-service-postgresql.feature
rename to packages/kogito-jobs-service-postgresql-image/test-resources/tests/features/kogito-jobs-service-postgresql.feature
diff --git a/packages/sonataflow-builder-image/.gitignore b/packages/sonataflow-builder-image/.gitignore
new file mode 100644
index 00000000000..82ed5072e72
--- /dev/null
+++ b/packages/sonataflow-builder-image/.gitignore
@@ -0,0 +1 @@
+bats-home
\ No newline at end of file
diff --git a/packages/sonataflow-builder-image/README.md b/packages/sonataflow-builder-image/README.md
new file mode 100644
index 00000000000..79e20e3cefc
--- /dev/null
+++ b/packages/sonataflow-builder-image/README.md
@@ -0,0 +1,104 @@
+<!--
+   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.
+-->
+
+# sonataflow-builder
+
+This package contains the `cekit` image descriptor (`sonataflow-builder-image.yaml`) and modules needed to build the `sonataflow-builder`
+image along with the modules and scripts provided in `@kie-tools/sonataflow-image-common`.
+
+## Additional requirements
+
+- **python3** with the following packages installed:
+  - `behave` `lxml` `docker` `docker-squash` `elementPath` `pyyaml` `ruamel.yaml` `python-dateutil` `Jinja2` `pykwalify` `colorlog` `click`
+- **cekit 4.12.0**: [docs.cekit.io](https://docs.cekit.io/en/latest/index.html)
+- **s2i**: [source-to-image](https://github.com/openshift/source-to-image)
+- **make**
+- **docker**
+
+## Build
+
+- Enable the image to be built:
+
+  ```bash
+  export KIE_TOOLS_BUILD__buildContainerImages=true
+  ```
+
+- (Optional) The image name and tags can be customized by setting the following environment variables:
+
+  ```bash
+  export SONATAFLOW_BUILDER_IMAGE__registry=<registry>
+  export SONATAFLOW_BUILDER_IMAGE__account=<account>
+  export SONATAFLOW_BUILDER_IMAGE__name=<image-name>
+  export SONATAFLOW_BUILDER_IMAGE__buildTag=<image-tag>
+  ```
+
+  > Default values can be found [here](./env/index.js).
+
+- After optionally setting up the environment variables, run the following in the root folder of the repository to build the package:
+
+  ```bash
+  pnpm -F @kie-tools/sonataflow-builder-image build:prod
+  ```
+
+- Then check if the image is correctly stored:
+
+  ```bash
+  docker images
+  ```
+
+## Testing the generated image (only for Linux)
+
+- With the image generated, run:
+
+  ```bash
+  pnpm -F @kie-tools/sonataflow-builder-image image:test
+  ```
+
+## Envs
+
+|                 Name                 |                    Description                     |                          Default                          |
+| :----------------------------------: | :------------------------------------------------: | :-------------------------------------------------------: |
+| `SONATAFLOW_BUILDER_IMAGE__registry` | Registry where the generated image will be pushed. |                        "docker.io"                        |
+| `SONATAFLOW_BUILDER_IMAGE__account`  |        Account where image will be stored.         |                         "apache"                          |
+|   `SONATAFLOW_BUILDER_IMAGE__name`   |              SWF Builder Image name.               |                   "sonataflow-builder"                    |
+| `SONATAFLOW_BUILDER_IMAGE__buildTag` |                    Tag to use .                    | $KIE_TOOLS_BUILD\_\_streamName (E.g., "main" or "10.0.x") |
+
+---
+
+Apache KIE (incubating) is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the name of Apache Incubator. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
+Some of the incubating project’s releases may not be fully compliant with ASF
+policy. For example, releases may have incomplete or un-reviewed licensing
+conditions. What follows is a list of known issues the project is currently
+aware of (note that this list, by definition, is likely to be incomplete):
+
+- Hibernate, an LGPL project, is being used. Hibernate is in the process of
+  relicensing to ASL v2
+- Some files, particularly test files, and those not supporting comments, may
+  be missing the ASF Licensing Header
+
+If you are planning to incorporate this work into your product/project, please
+be aware that you will need to conduct a thorough licensing review to determine
+the overall implications of including this work. For the current status of this
+project through the Apache Incubator visit:
+https://incubator.apache.org/projects/kie.html
diff --git a/packages/sonataflow-builder-image/env/index.js b/packages/sonataflow-builder-image/env/index.js
new file mode 100644
index 00000000000..36e3cc1181e
--- /dev/null
+++ b/packages/sonataflow-builder-image/env/index.js
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
+
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
+  vars: varsWithName({
+    SONATAFLOW_BUILDER_IMAGE__registry: {
+      default: "docker.io",
+      description: "The image registry.",
+    },
+    SONATAFLOW_BUILDER_IMAGE__account: {
+      default: "apache",
+      description: "The image registry account.",
+    },
+    SONATAFLOW_BUILDER_IMAGE__name: {
+      default: "incubator-kie-sonataflow-builder",
+      description: "The image name.",
+    },
+    SONATAFLOW_BUILDER_IMAGE__buildTag: {
+      default: rootEnv.env.root.streamName,
+      description: "The image tag.",
+    },
+  }),
+  get env() {
+    return {
+      sonataflowBuilderImage: {
+        registry: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__registry),
+        account: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__account),
+        name: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__name),
+        buildTag: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__buildTag),
+      },
+    };
+  },
+});
diff --git a/packages/sonataflow-builder-image/install.js b/packages/sonataflow-builder-image/install.js
new file mode 100644
index 00000000000..00f6c3a3bbf
--- /dev/null
+++ b/packages/sonataflow-builder-image/install.js
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
+const replaceInFile = require("replace-in-file");
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowBuilderImage.buildTag} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Creates a symlink to the bats installation dir
+try {
+  fs.symlinkSync(`${sonataflowImageCommonDir}/bats-home`, path.resolve(__dirname, "./bats-home"), "dir");
+} catch (err) {
+  if (err.code !== "EEXIST") {
+    throw err;
+  }
+}
+
+// Find and read the -image.yaml file
+const resourcesPath = path.resolve(__dirname, "./resources");
+const files = fs.readdirSync(resourcesPath);
+const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
+if (imageYamlFiles.length !== 1) {
+  throw new Error("There should only be one -image.yaml file on ./resources!");
+}
+const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
+let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
+
+const imageUrl = `${buildEnv.env.sonataflowBuilderImage.registry}/${buildEnv.env.sonataflowBuilderImage.account}/${buildEnv.env.sonataflowBuilderImage.name}`;
+
+// Replace the whole string between quotes ("") with the image name
+imageYaml = imageYaml.replace(/(?<=")(.*sonataflow-builder.*)(?=")/gm, imageUrl);
+
+// Write file and then rename it to match the image name
+fs.writeFileSync(originalYamlPath, imageYaml);
+fs.renameSync(originalYamlPath, path.join(resourcesPath, `${buildEnv.env.sonataflowBuilderImage.name}-image.yaml`));
+
+// Replace image URL in .feature files
+replaceInFile.sync({
+  files: ["**/*.feature"],
+  from: /@docker.io\/apache\/.*/g,
+  to: `@${imageUrl}`,
+});
diff --git a/packages/sonataflow-builder-image/package.json b/packages/sonataflow-builder-image/package.json
new file mode 100644
index 00000000000..0aa076fbad9
--- /dev/null
+++ b/packages/sonataflow-builder-image/package.json
@@ -0,0 +1,54 @@
+{
+  "private": true,
+  "name": "@kie-tools/sonataflow-builder-image",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "url": "https://github.com/apache/incubator-kie-tools/issues"
+  },
+  "scripts": {
+    "build:dev": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm test\" \"pnpm image:build\"",
+    "build:prod": "pnpm build:dev && pnpm image:test",
+    "copy-assets": "run-script-os",
+    "copy-assets:linux:darwin": "rimraf build && rsync -av --exclude '*.bats' ./node_modules/@kie-tools/sonataflow-image-common/resources/ build && cp -R resources/* build",
+    "copy-test-assets": "run-script-os",
+    "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",
+    "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 \"cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test:darwin:win32": "echo \"Tests skipped on macOS and Windows\"",
+    "image:test:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
+    "install": "node install.js && pnpm format",
+    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowBuilderImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)",
+    "test": "run-script-os",
+    "test:cleanup": "mv dist-tests/report.xml dist-tests/junit-report.xml || true",
+    "test:linux:darwin": "run-script-if --bool \"$(build-env tests.run)\" --then \"pnpm test:setup\" \"pnpm test:run\" --finally \"pnpm test:cleanup\"",
+    "test:run": "make -C ./build bats || $(build-env tests.ignoreFailures)",
+    "test:setup": "pnpm copy-assets && pnpm copy-test-assets && mkdir -p dist-tests && rm -rf dist-tests/*",
+    "test:win32": "echo \"Tests are skipped in Windows\""
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "@kie-tools/sonataflow-image-common": "workspace:*",
+    "cross-env": "^7.0.3",
+    "replace-in-file": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "make",
+      "s2i"
+    ]
+  }
+}
diff --git a/packages/sonataflow-builder-image/resources/incubator-kie-sonataflow-builder-image.yaml b/packages/sonataflow-builder-image/resources/incubator-kie-sonataflow-builder-image.yaml
new file mode 100644
index 00000000000..5955cbad3a6
--- /dev/null
+++ b/packages/sonataflow-builder-image/resources/incubator-kie-sonataflow-builder-image.yaml
@@ -0,0 +1,74 @@
+#
+# 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.
+#
+- name: builder
+  from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
+  version: "main"
+  modules:
+    repositories:
+      - path: modules
+    install:
+      - name: org.kie.kogito.system.user
+      - name: org.kie.kogito.logging
+      - name: org.kie.kogito.launch.scripts
+      - name: org.kie.kogito.dynamic.resources
+      - name: org.kie.kogito.maven.common
+      - name: org.kie.kogito.project.versions
+      - name: org.kie.sonataflow.common.scripts
+      - name: org.kie.sonataflow.builder.build-config
+      - name: org.kie.sonataflow.common.build
+
+- name: "docker.io/apache/incubator-kie-sonataflow-builder"
+  from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
+  version: "main"
+  description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
+
+  labels:
+    - name: "io.openshift.s2i.scripts-url"
+      value: "image:///usr/local/s2i"
+    - name: "io.openshift.s2i.destination"
+      value: "/tmp"
+    - name: "io.quarkus.platform.version"
+      value: "### SET ME DURING BUILD PROCESS ###"
+    - name: "org.kie.kogito.version"
+      value: "### SET ME DURING BUILD PROCESS ###"
+    - name: "maintainer"
+      value: "Apache KIE <dev@kie.apache.org>"
+    - name: "io.k8s.description"
+      value: "Sonataflow base builder with Quarkus extensions libraries preinstalled."
+    - name: "io.k8s.display-name"
+      value: "Sonataflow Builder"
+    - name: "io.openshift.tags"
+      value: "kogito,builder,serverless,workflow"
+
+  modules:
+    repositories:
+      - path: modules
+    install:
+      - name: org.kie.kogito.system.user
+      - name: org.kie.kogito.logging
+      - name: org.kie.kogito.launch.scripts
+      - name: org.kie.kogito.dynamic.resources
+      - name: org.kie.kogito.maven.common
+      - name: org.kie.kogito.project.versions
+      - name: org.kie.sonataflow.common.scripts
+      - name: org.kie.sonataflow.builder.runtime.community
+
+  run:
+    workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
+    user: 1001
diff --git a/modules/sonataflow/builder/build-config/module.yaml b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/build-config/module.yaml
similarity index 84%
rename from modules/sonataflow/builder/build-config/module.yaml
rename to packages/sonataflow-builder-image/resources/modules/sonataflow/builder/build-config/module.yaml
index b13a31fae23..02f5a3682c7 100644
--- a/modules/sonataflow/builder/build-config/module.yaml
+++ b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/build-config/module.yaml
@@ -17,13 +17,13 @@
 # under the License.
 #
 schema_version: 1
-name: org.kie.kogito.swf.builder.build-config
+name: org.kie.sonataflow.builder.build-config
 version: "main"
-description: "Kogito Serverless Workflow builder image build configuration"
+description: "Sonataflow builder image build configuration"
 
 envs:
   - name: "SCRIPT_DEBUG"
     value: "false"
   - name: QUARKUS_EXTENSIONS
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: quarkus-kubernetes,smallrye-health,org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie:kie-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie:kie-addons-quarkus-events-process:${KOGITO_VERSION},org.kie:kie-addons-quarkus-process-management:${KOGITO_VERSION},org.kie:kie-addons-quarkus-source-files:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-jobs-knative-eventing:${KOGITO_VERSION}
+    value: quarkus-kubernetes,smallrye-health,org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie:kie-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie:kie-addons-quarkus-events-process:${KOGITO_VERSION},org.kie:kie-addons-quarkus-process-management:${KOGITO_VERSION},org.kie:kie-addons-quarkus-source-files:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-jobs-knative-eventing:${KOGITO_VERSION},org.kie:kie-addons-quarkus-monitoring-prometheus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-monitoring-sonataflow:${KOGITO_VERSION}
diff --git a/modules/sonataflow/builder/runtime/community/configure.sh b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/configure.sh
similarity index 89%
rename from modules/sonataflow/builder/runtime/community/configure.sh
rename to packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/configure.sh
index e209d625fdc..8d26bb5940e 100644
--- a/modules/sonataflow/builder/runtime/community/configure.sh
+++ b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/configure.sh
@@ -26,8 +26,8 @@ mkdir -p "${KOGITO_HOME}"/.m2/repository
 mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
 
 # Unzip Quarkus app and Maven repository
-tar xf "${SOURCES_DIR}"/sonataflow-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
-tar xf "${SOURCES_DIR}"/sonataflow-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
+tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/sonataflow/builder/runtime/community/module.yaml b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/module.yaml
similarity index 79%
rename from modules/sonataflow/builder/runtime/community/module.yaml
rename to packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/module.yaml
index b105bd50e77..96f4388f0d5 100644
--- a/modules/sonataflow/builder/runtime/community/module.yaml
+++ b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/module.yaml
@@ -17,15 +17,15 @@
 # under the License.
 #
 schema_version: 1
-name: org.kie.kogito.swf.builder.runtime.community
+name: org.kie.sonataflow.builder.runtime.community
 version: "main"
-description: "Kogito Serverless Workflow builder runtime module"
+description: "Sonataflow builder runtime module"
 
 artifacts:
   - image: builder
-    path: /home/kogito/build_output/sonataflow-quarkus-app.tar
+    path: /home/kogito/build_output/kogito-swf-quarkus-app.tar
   - image: builder
-    path: /home/kogito/build_output/sonataflow-maven-repo.tar
+    path: /home/kogito/build_output/kogito-swf-maven-repo.tar
 
 execute:
   - script: configure.sh
diff --git a/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/tests/bats/sonataflow-builder-build-app.bats
similarity index 78%
rename from modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats
rename to packages/sonataflow-builder-image/resources/modules/sonataflow/builder/tests/bats/sonataflow-builder-build-app.bats
index 620a2085113..7fb2843cc17 100644
--- a/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats
+++ b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/tests/bats/sonataflow-builder-build-app.bats
@@ -23,9 +23,9 @@ setup() {
     export HOME="${KOGITO_HOME}"
     mkdir -p "${KOGITO_HOME}"/launch
     mkdir -p "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/
-    cp $BATS_TEST_DIRNAME/../../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-    cp $BATS_TEST_DIRNAME/../../added/jvm-settings.sh "${KOGITO_HOME}"/launch/
-    cp $BATS_TEST_DIRNAME/../../added/build-app.sh "${KOGITO_HOME}"/launch/
+    cp $BATS_TEST_DIRNAME/../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+    cp $BATS_TEST_DIRNAME/../../../common/scripts/added/jvm-settings.sh "${KOGITO_HOME}"/launch/
+    cp $BATS_TEST_DIRNAME/../../../common/scripts/added/build-app.sh "${KOGITO_HOME}"/launch/
 }
 
 teardown() {
@@ -35,11 +35,11 @@ teardown() {
 
 @test "verify copy resources is working" {
     TEMPD=$(mktemp -d)
-    cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/sonataflow-builder/resources/greet-with-inputschema/* ${TEMPD}
+    cp -r $BATS_TEST_DIRNAME/../../../../../tests/shell/sonataflow-builder/resources/greet-with-inputschema/* ${TEMPD}
 
     # We don't care about the errors to try to execute and build the program, just the copy matters
     source ${KOGITO_HOME}/launch/build-app.sh ${TEMPD} || true
-    
+
     [[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/greet.sw.json ]]
     [[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/schemas/input.json ]]
 }
diff --git a/tests/features/kogito-swf-common.feature b/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder-2.feature
similarity index 50%
rename from tests/features/kogito-swf-common.feature
rename to packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder-2.feature
index 57dc3f0a56b..7cb7705d987 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder-2.feature
@@ -1,29 +1,9 @@
-#
-# 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.
-#
-
 @docker.io/apache/incubator-kie-sonataflow-builder
-@docker.io/apache/incubator-kie-sonataflow-devmode
 Feature: Serverless Workflow images common
 
   Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
     When container is started with command bash
-    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.8.6/quarkus-bom-3.8.6.pom should exist
+    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom should exist and be a directory
       And file /home/kogito/.m2/repository/org/apache/kie/sonataflow/sonataflow-quarkus/ should exist and be a directory
 
   # This check should be enabled again once a similar check is done on runtimes
diff --git a/tests/features/kogito-swf-builder.feature b/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder.feature
similarity index 75%
rename from tests/features/kogito-swf-builder.feature
rename to packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder.feature
index 2fe570b55f8..a4e1bdfcf6b 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder.feature
@@ -1,22 +1,3 @@
-#
-# 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.
-#
-
 @docker.io/apache/incubator-kie-sonataflow-builder
 Feature: Serverless Workflow builder images
 
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/launch.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/launch.json
new file mode 100644
index 00000000000..82cbbc6179c
--- /dev/null
+++ b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "java",
+      "name": "RunTests-port-4004",
+      "request": "attach",
+      "hostName": "localhost",
+      "port": 4004
+    },
+    {
+      "type": "java",
+      "name": "Debug (Launch) - RunTests",
+      "request": "launch",
+      "mainClass": "RunTests",
+      "projectName": "RunTests"
+    }
+  ]
+}
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/settings.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/settings.json
new file mode 100644
index 00000000000..b57ea44670f
--- /dev/null
+++ b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/settings.json
@@ -0,0 +1,13 @@
+{
+  "java.import.gradle.enabled": false,
+  "java.import.maven.enabled": false,
+  "java.eclipse.downloadSources": true,
+  "files.exclude": {
+    "bin/": true,
+    ".eclipse/": true,
+    ".project": true,
+    ".classpath": true,
+    "build.gradle": true
+  },
+  "java.completion.importOrder": ["", "javax", "java", "#"]
+}
diff --git a/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
similarity index 65%
rename from tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
rename to packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
index da41c621fd8..247563dc256 100644
--- a/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
+++ b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
@@ -1,23 +1,5 @@
-#
-# 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.
-#
-
-ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:2.0"
+ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:main"
+# This argument is overriden by run.sh script based on the image tag set on the Makefile
 
 FROM ${BUILDER_IMAGE_TAG} AS builder
 
diff --git a/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
similarity index 99%
rename from tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
rename to packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
index 183e2101f26..5e3c8b0d00d 100644
--- a/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
+++ b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
@@ -86,4 +86,4 @@
       "type": "custom"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
similarity index 80%
rename from tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
rename to packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
index 1874fd25b3e..965e88ea634 100644
--- a/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
+++ b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
@@ -9,8 +9,5 @@
       "type": "string"
     }
   },
-  "required": [
-    "language",
-    "name"
-  ]
-}
\ No newline at end of file
+  "required": ["language", "name"]
+}
diff --git a/tests/shell/sonataflow-builder/resources/greet/Dockerfile b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/Dockerfile
similarity index 65%
rename from tests/shell/sonataflow-builder/resources/greet/Dockerfile
rename to packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/Dockerfile
index da41c621fd8..247563dc256 100644
--- a/tests/shell/sonataflow-builder/resources/greet/Dockerfile
+++ b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/Dockerfile
@@ -1,23 +1,5 @@
-#
-# 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.
-#
-
-ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:2.0"
+ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:main"
+# This argument is overriden by run.sh script based on the image tag set on the Makefile
 
 FROM ${BUILDER_IMAGE_TAG} AS builder
 
diff --git a/tests/shell/sonataflow-builder/resources/greet/greet.sw.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/greet.sw.json
similarity index 100%
rename from tests/shell/sonataflow-builder/resources/greet/greet.sw.json
rename to packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/greet.sw.json
diff --git a/tests/shell/sonataflow-builder/src/RunTests.java b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/src/RunTests.java
similarity index 100%
rename from tests/shell/sonataflow-builder/src/RunTests.java
rename to packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/src/RunTests.java
diff --git a/packages/sonataflow-devmode-image/README.md b/packages/sonataflow-devmode-image/README.md
new file mode 100644
index 00000000000..fd140d5a66f
--- /dev/null
+++ b/packages/sonataflow-devmode-image/README.md
@@ -0,0 +1,104 @@
+<!--
+   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.
+-->
+
+# sonataflow-devmode
+
+This package contains the `cekit` image descriptor (`sonataflow-devmode-image.yaml`) and modules needed to build the `sonataflow-devmode`
+image along with the modules and scripts provided in `@kie-tools/sonataflow-image-common`.
+
+## Additional requirements
+
+- **python3** with the following packages installed:
+  - `behave` `lxml` `docker` `docker-squash` `elementPath` `pyyaml` `ruamel.yaml` `python-dateutil` `Jinja2` `pykwalify` `colorlog` `click`
+- **cekit 4.12.0**: [docs.cekit.io](https://docs.cekit.io/en/latest/index.html)
+- **s2i**: [source-to-image](https://github.com/openshift/source-to-image)
+- **make**
+- **docker**
+
+## Build
+
+- Enable the image to be built:
+
+  ```bash
+  export KIE_TOOLS_BUILD__buildContainerImages=true
+  ```
+
+- (Optional) The image name and tags can be customized by setting the following environment variables:
+
+  ```bash
+  export SONATAFLOW_DEVMODE_IMAGE__registry=<registry>
+  export SONATAFLOW_DEVMODE_IMAGE__account=<account>
+  export SONATAFLOW_DEVMODE_IMAGE__name=<image-name>
+  export SONATAFLOW_DEVMODE_IMAGE__buildTag=<image-tag>
+  ```
+
+  > Default values can be found [here](./env/index.js).
+
+- After optionally setting up the environment variables, run the following in the root folder of the repository to build the package:
+
+  ```bash
+  pnpm -F @kie-tools/sonataflow-devmode-image build:prod
+  ```
+
+- Then check if the image is correctly stored:
+
+  ```bash
+  docker images
+  ```
+
+## Testing the generated image (only for Linux)
+
+- With the image generated, run:
+
+  ```bash
+  pnpm -F @kie-tools/sonataflow-devmode-image image:test
+  ```
+
+## Envs
+
+|                 Name                 |                    Description                     |                          Default                          |
+| :----------------------------------: | :------------------------------------------------: | :-------------------------------------------------------: |
+| `SONATAFLOW_DEVMODE_IMAGE__registry` | Registry where the generated image will be pushed. |                        "docker.io"                        |
+| `SONATAFLOW_DEVMODE_IMAGE__account`  |        Account where image will be stored.         |                         "apache"                          |
+|   `SONATAFLOW_DEVMODE_IMAGE__name`   |              SWF DevMode Image name.               |                   "sonataflow-devmode"                    |
+| `SONATAFLOW_DEVMODE_IMAGE__buildTag` |                    Tag to use .                    | $KIE_TOOLS_BUILD\_\_streamName (E.g., "main" or "10.0.x") |
+
+---
+
+Apache KIE (incubating) is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the name of Apache Incubator. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
+Some of the incubating project’s releases may not be fully compliant with ASF
+policy. For example, releases may have incomplete or un-reviewed licensing
+conditions. What follows is a list of known issues the project is currently
+aware of (note that this list, by definition, is likely to be incomplete):
+
+- Hibernate, an LGPL project, is being used. Hibernate is in the process of
+  relicensing to ASL v2
+- Some files, particularly test files, and those not supporting comments, may
+  be missing the ASF Licensing Header
+
+If you are planning to incorporate this work into your product/project, please
+be aware that you will need to conduct a thorough licensing review to determine
+the overall implications of including this work. For the current status of this
+project through the Apache Incubator visit:
+https://incubator.apache.org/projects/kie.html
diff --git a/packages/sonataflow-devmode-image/env/index.js b/packages/sonataflow-devmode-image/env/index.js
new file mode 100644
index 00000000000..6b741da955c
--- /dev/null
+++ b/packages/sonataflow-devmode-image/env/index.js
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
+const sonataFlowQuarkusDevUiEnv = require("@kie-tools/sonataflow-quarkus-devui/env");
+
+const rootEnv = require("@kie-tools/root-env/env");
+
+module.exports = composeEnv([rootEnv], {
+  vars: varsWithName({
+    SONATAFLOW_DEVMODE_IMAGE__registry: {
+      default: "docker.io",
+      description: "E.g., `docker.io` or `quay.io`.",
+    },
+    SONATAFLOW_DEVMODE_IMAGE__account: {
+      default: "apache",
+      description: "E.g,. `apache` or `kie-tools-bot`",
+    },
+    SONATAFLOW_DEVMODE_IMAGE__name: {
+      default: "incubator-kie-sonataflow-devmode",
+      description: "Name of the image itself.",
+    },
+    SONATAFLOW_DEVMODE_IMAGE__buildTag: {
+      default: rootEnv.env.root.streamName,
+      description: "Tag version of this image. E.g., `main` or `10.0.x` or `10.0.0",
+    },
+    SONATAFLOW_DEVMODE_IMAGE__sonataflowQuarkusDevUiVersion: {
+      default: sonataFlowQuarkusDevUiEnv.env.sonataflowQuarkusDevuiExtension.version,
+      description: "SonataFlow Quarkus Dev UI version",
+    },
+  }),
+  get env() {
+    return {
+      sonataflowDevModeImage: {
+        registry: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__registry),
+        account: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__account),
+        name: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__name),
+        buildTag: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__buildTag),
+        sonataflowQuarkusDevUiVersion: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__sonataflowQuarkusDevUiVersion),
+      },
+    };
+  },
+});
diff --git a/packages/sonataflow-devmode-image/install.js b/packages/sonataflow-devmode-image/install.js
new file mode 100644
index 00000000000..f701da5c030
--- /dev/null
+++ b/packages/sonataflow-devmode-image/install.js
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+const fs = require("fs");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
+const replaceInFile = require("replace-in-file");
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowDevModeImage.buildTag} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Find and read the -image.yaml file
+const resourcesPath = path.resolve(__dirname, "./resources");
+const files = fs.readdirSync(resourcesPath);
+const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
+if (imageYamlFiles.length !== 1) {
+  throw new Error("There should only be one -image.yaml file on ./resources!");
+}
+const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
+let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
+
+const imageUrl = `${buildEnv.env.sonataflowDevModeImage.registry}/${buildEnv.env.sonataflowDevModeImage.account}/${buildEnv.env.sonataflowDevModeImage.name}`;
+
+// Replace the whole string between quotes ("") with the image name
+imageYaml = imageYaml.replace(/(?<=")(.*sonataflow-devmode.*)(?=")/gm, imageUrl);
+
+// Write file and then rename it to match the image name
+fs.writeFileSync(originalYamlPath, imageYaml);
+fs.renameSync(originalYamlPath, path.join(resourcesPath, `${buildEnv.env.sonataflowDevModeImage.name}-image.yaml`));
+
+// Replace image URL in .feature files
+replaceInFile.sync({
+  files: ["**/*.feature"],
+  from: /@docker.io\/apache\/.*/g,
+  to: `@${imageUrl}`,
+});
diff --git a/packages/sonataflow-devmode-image/package.json b/packages/sonataflow-devmode-image/package.json
new file mode 100644
index 00000000000..ad81bbc3e58
--- /dev/null
+++ b/packages/sonataflow-devmode-image/package.json
@@ -0,0 +1,50 @@
+{
+  "private": true,
+  "name": "@kie-tools/sonataflow-devmode-image",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "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: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 && pnpm copy-devui-repo",
+    "copy-devui-repo": "tar -C ~/.m2/repository/org/apache/kie/ -cvf build/modules/sonataflow/devmode/build-config/sonataflow-quarkus-devui-maven-repo.tar sonataflow && tar -C ~/.m2/repository/org/kie/ -cvf build/modules/sonataflow/devmode/build-config/kie-tools-maven-base-maven-repo.tar kie-tools-maven-base",
+    "copy-test-assets": "run-script-os",
+    "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: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 \"cp -r build/target/test/results dist-tests-e2e/\"",
+    "image:test: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",
+    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowDevModeImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowDevModeImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowDevModeImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowDevModeImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version) SONATAFLOW_QUARKUS_DEVUI_VERSION=$(build-env sonataflowDevModeImage.sonataflowQuarkusDevUiVersion)"
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "@kie-tools/sonataflow-image-common": "workspace:*",
+    "@kie-tools/sonataflow-quarkus-devui": "workspace:*",
+    "cross-env": "^7.0.3",
+    "replace-in-file": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "make",
+      "s2i"
+    ]
+  }
+}
diff --git a/packages/sonataflow-devmode-image/resources/incubator-kie-sonataflow-devmode-image.yaml b/packages/sonataflow-devmode-image/resources/incubator-kie-sonataflow-devmode-image.yaml
new file mode 100644
index 00000000000..8bd15fb6bfd
--- /dev/null
+++ b/packages/sonataflow-devmode-image/resources/incubator-kie-sonataflow-devmode-image.yaml
@@ -0,0 +1,85 @@
+#
+# 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.
+#
+- name: builder
+  from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
+  version: "main"
+  modules:
+    repositories:
+      - path: modules
+    install:
+      - name: org.kie.kogito.system.user
+      - name: org.kie.kogito.logging
+      - name: org.kie.kogito.launch.scripts
+      - name: org.kie.kogito.dynamic.resources
+      - name: org.kie.kogito.maven.common
+      - name: org.kie.kogito.project.versions
+      - name: org.kie.sonataflow.common.scripts
+      - name: org.kie.sonataflow.devmode.build-config
+      - name: org.kie.sonataflow.common.build
+
+  packages:
+    manager: microdnf
+
+- name: "docker.io/apache/incubator-kie-sonataflow-devmode"
+  from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
+  version: "main"
+  description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
+
+  labels:
+    - name: "io.quarkus.platform.version"
+      value: "### SET ME DURING BUILD PROCESS ###"
+    - name: "org.kie.kogito.version"
+      value: "### SET ME DURING BUILD PROCESS ###"
+    - name: "maintainer"
+      value: "Apache KIE <dev@kie.apache.org>"
+    - name: "io.k8s.description"
+      value: "Sonataflow DevMode with Quarkus extensions libraries preinstalled."
+    - name: "io.k8s.display-name"
+      value: "Sonataflow DevMode"
+    - name: "io.openshift.tags"
+      value: "kogito,development,serverless,workflow"
+    - name: "io.openshift.expose-services"
+      value: "8080:http,5005:http"
+
+  packages:
+    manager: microdnf
+
+  modules:
+    repositories:
+      - path: modules
+    install:
+      - name: org.kie.kogito.system.user
+      - name: org.kie.kogito.logging
+      - name: org.kie.kogito.launch.scripts
+      - name: org.kie.kogito.dynamic.resources
+      - name: org.kie.kogito.maven.common
+      - name: org.kie.kogito.project.versions
+      - name: org.kie.sonataflow.common.scripts
+      - name: org.kie.sonataflow.devmode.runtime.common
+      - name: org.kie.sonataflow.devmode.runtime.community
+
+  ports:
+    - value: 8080
+    - value: 5005
+
+  run:
+    workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
+    user: 1001
+    cmd:
+      - "/home/kogito/launch/run-app-devmode.sh"
diff --git a/.github/bot-files/comments.yml b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure
similarity index 52%
rename from .github/bot-files/comments.yml
rename to packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure
index 8bee795c9a8..8c27f782926 100644
--- a/.github/bot-files/comments.yml
+++ b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,11 +17,22 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+set -e
 
-prFirstTimeContributor: Welcome to the Kogito Community!. Please make sure you've read the [contributors' guide](README.md#contributing-to-kogito-images-repository)
+# mvn install:install-file \
+#    -Dfile=/tmp/artifacts/sonataflow-quarkus-devui.jar \
+#    -DgroupId=org.apache.kie.sonataflow \
+#    -DartifactId=sonataflow-quarkus-devui \
+#    -Dversion=$SONATAFLOW_QUARKUS_DEVUI_VERSION \
+#    -Dpackaging=jar \
+#    -DgeneratePom=true
 
-prCiTrigger: /jenkins test
+ls -la /tmp/artifacts
 
-prEdit: Change detected in the PR, requesting reviews and running pipeline(if required) again
+mkdir -p "${KOGITO_HOME}"/.m2/repository/org/apache/kie/
+mkdir -p "${KOGITO_HOME}"/.m2/repository/org/kie/
+tar xf /tmp/artifacts/sonataflow-quarkus-devui-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository/org/apache/kie/
+tar xf /tmp/artifacts/kie-tools-maven-base-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository/org/kie/
+
+find "${KOGITO_HOME}"/.m2/repository -name _remote.repositories | xargs rm
 
-prReopen: PR reopened. requesting reviews and running pipeline(if required) again
\ No newline at end of file
diff --git a/modules/sonataflow/devmode/build-config/module.yaml b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/module.yaml
similarity index 62%
rename from modules/sonataflow/devmode/build-config/module.yaml
rename to packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/module.yaml
index 0804a28ea6d..36ea5dcdd06 100644
--- a/modules/sonataflow/devmode/build-config/module.yaml
+++ b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/module.yaml
@@ -17,14 +17,23 @@
 # under the License.
 #
 schema_version: 1
-name: org.kie.kogito.swf.devmode.build-config
+name: org.kie.sonataflow.devmode.build-config
 version: "main"
 description: "Kogito Serverless Workflow devmode image build configuration"
 
 envs:
   - name: "SCRIPT_DEBUG"
-    value: "true"
+    value: "false"
   - name: QUARKUS_EXTENSIONS
     # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
     # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION},smallrye-health,org.apache.kie.sonataflow:sonataflow-quarkus-devui:${KOGITO_VERSION},org.kie:kie-addons-quarkus-source-files:${KOGITO_VERSION},org.kie:kie-addons-quarkus-process-management:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-jobs-service-embedded:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-data-index-inmemory:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie:kie-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION}
+    value: org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION},smallrye-health,org.apache.kie.sonataflow:sonataflow-quarkus-devui:${SONATAFLOW_QUARKUS_DEVUI_VERSION},org.kie:kie-addons-quarkus-source-files:${KOGITO_VERSION},org.kie:kie-addons-quarkus-process-management:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-jobs-service-embedded:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-data-index-inmemory:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie:kie-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION}
+
+artifacts:
+  - name: sonataflow-quarkus-devui-maven-repo.tar
+    path: ./sonataflow-quarkus-devui-maven-repo.tar
+  - name: kie-tools-maven-base-maven-repo.tar
+    path: ./kie-tools-maven-base-maven-repo.tar
+
+execute:
+  - script: configure
diff --git a/modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh
similarity index 100%
rename from modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh
rename to packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh
diff --git a/modules/sonataflow/devmode/runtime/common/configure.sh b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/configure.sh
similarity index 100%
rename from modules/sonataflow/devmode/runtime/common/configure.sh
rename to packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/configure.sh
diff --git a/modules/sonataflow/devmode/runtime/common/module.yaml b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/module.yaml
similarity index 95%
rename from modules/sonataflow/devmode/runtime/common/module.yaml
rename to packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/module.yaml
index c39b8dde286..b511ab1e9a5 100644
--- a/modules/sonataflow/devmode/runtime/common/module.yaml
+++ b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/module.yaml
@@ -17,7 +17,7 @@
 # under the License.
 #
 schema_version: 1
-name: org.kie.kogito.swf.devmode.runtime.common
+name: org.kie.sonataflow.devmode.runtime.common
 version: "main"
 description: "Kogito Serverless Workflow devmode common module"
 
diff --git a/modules/sonataflow/devmode/runtime/community/configure.sh b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/configure.sh
similarity index 90%
rename from modules/sonataflow/devmode/runtime/community/configure.sh
rename to packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/configure.sh
index 63966569e98..7404a5c1e5f 100644
--- a/modules/sonataflow/devmode/runtime/community/configure.sh
+++ b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/configure.sh
@@ -27,8 +27,8 @@ mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
 mkdir -p "${KOGITO_HOME}"/.m2/repository
 
 # Unzip Quarkus app and Maven repository
-tar xf "${SOURCES_DIR}"/sonataflow-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
-tar xf "${SOURCES_DIR}"/sonataflow-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
+tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
+tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
 
 chown -R 1001:0 "${KOGITO_HOME}"
 chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/modules/sonataflow/devmode/runtime/community/module.yaml b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/module.yaml
similarity index 92%
rename from modules/sonataflow/devmode/runtime/community/module.yaml
rename to packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/module.yaml
index df1f25d9ddb..c8cff54bfb0 100644
--- a/modules/sonataflow/devmode/runtime/community/module.yaml
+++ b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/module.yaml
@@ -17,7 +17,7 @@
 # under the License.
 #
 schema_version: 1
-name: org.kie.kogito.swf.devmode.runtime.community
+name: org.kie.sonataflow.devmode.runtime.community
 version: "main"
 description: "Kogito Serverless Workflow devmode with required extensions"
 
@@ -43,9 +43,9 @@ envs:
 
 artifacts:
   - image: builder
-    path: /home/kogito/build_output/sonataflow-quarkus-app.tar
+    path: /home/kogito/build_output/kogito-swf-quarkus-app.tar
   - image: builder
-    path: /home/kogito/build_output/sonataflow-maven-repo.tar
+    path: /home/kogito/build_output/kogito-swf-maven-repo.tar
 
 execute:
   - script: configure.sh
diff --git a/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode-2.feature b/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode-2.feature
new file mode 100644
index 00000000000..e6359d75340
--- /dev/null
+++ b/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode-2.feature
@@ -0,0 +1,14 @@
+@docker.io/apache/incubator-kie-sonataflow-devmode
+Feature: Serverless Workflow images common
+
+  Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
+    When container is started with command bash
+    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom should exist and be a directory
+      And file /home/kogito/.m2/repository/org/apache/kie/sonataflow/sonataflow-quarkus/ should exist and be a directory
+
+  # This check should be enabled again once a similar check is done on runtimes
+  # to make sure we only have one version of quarkus bom ...
+  # See https://issues.redhat.com/browse/KOGITO-8555 to enable again
+  # Scenario: verify if there is no dependencies with multiple versions in /home/kogito/.m2/repository
+  #   When container is started with command bash
+  #   Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
diff --git a/tests/features/kogito-swf-devmode.feature b/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode.feature
similarity index 86%
rename from tests/features/kogito-swf-devmode.feature
rename to packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode.feature
index f257c1579a4..7ba91ee955e 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode.feature
@@ -1,22 +1,3 @@
-#
-# 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.
-#
-
 @docker.io/apache/incubator-kie-sonataflow-devmode
 Feature: Serverless Workflow devmode images
 
@@ -67,7 +48,7 @@ Feature: Serverless Workflow devmode images
       | property             | value             |
       | port                 | 8080              |
       | path                 | /q/health/ready   |
-      | wait                 | 480               |
+      | wait                 | 960               |
       | request_method       | GET               |
       | expected_status_code | 200               |
     And container log should contain -Duser.home=/home/kogito
@@ -131,19 +112,19 @@ Feature: Serverless Workflow devmode images
       | variable                    | value |
       | QUARKUS_DEVSERVICES_ENABLED | false |
     Then check that page is served
-      | property             | value                                                              |
-      | port                 | 8080                                                               |
-      | path                 | /q/dev-ui/org.kie.kogito-addons-quarkus-data-index-inmemory/data-index-graphql-ui |
-      | request_method       | GET                                                                |
-      | wait                 | 480                                                                |
-      | expected_status_code | 200                                                                |
+      | property             | value                                                                 |
+      | port                 | 8080                                                                  |
+      | path                 | /q/dev-ui/org.kie.kogito-addons-quarkus-data-index-inmemory/dataindex |
+      | request_method       | GET                                                                   |
+      | wait                 | 480                                                                   |
+      | expected_status_code | 200                                                                   |
     And check that page is served
-      | property             | value                                                                            |
-      | port                 | 8080                                                                             |
+      | property             | value                                                                  |
+      | port                 | 8080                                                                   |
       | path                 | /q/dev-ui/org.apache.kie.sonataflow.sonataflow-quarkus-devui/workflows |
-      | request_method       | GET                                                                              |
-      | wait                 | 480                                                                              |
-      | expected_status_code | 200                                                                              |
+      | request_method       | GET                                                                    |
+      | wait                 | 480                                                                    |
+      | expected_status_code | 200                                                                    |
 
   Scenario: Verify if container starts in devmode with service discovery enabled
     When container is started with env
@@ -157,7 +138,7 @@ Feature: Serverless Workflow devmode images
       | request_method       | GET               |
       | expected_status_code | 200               |
     And container log should contain kogito-addon-microprofile-config-service-catalog-extension
-    
+
   Scenario: Verify if container have the KOGITO_CODEGEN_PROCESS_FAILONERROR env set to false
     When container is started with command bash
     Then run sh -c 'echo $KOGITO_CODEGEN_PROCESS_FAILONERROR' in container and immediately check its output for false
diff --git a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/launch.json b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/launch.json
new file mode 100644
index 00000000000..82cbbc6179c
--- /dev/null
+++ b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "java",
+      "name": "RunTests-port-4004",
+      "request": "attach",
+      "hostName": "localhost",
+      "port": 4004
+    },
+    {
+      "type": "java",
+      "name": "Debug (Launch) - RunTests",
+      "request": "launch",
+      "mainClass": "RunTests",
+      "projectName": "RunTests"
+    }
+  ]
+}
diff --git a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/settings.json b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/settings.json
new file mode 100644
index 00000000000..b57ea44670f
--- /dev/null
+++ b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/settings.json
@@ -0,0 +1,13 @@
+{
+  "java.import.gradle.enabled": false,
+  "java.import.maven.enabled": false,
+  "java.eclipse.downloadSources": true,
+  "files.exclude": {
+    "bin/": true,
+    ".eclipse/": true,
+    ".project": true,
+    ".classpath": true,
+    "build.gradle": true
+  },
+  "java.completion.importOrder": ["", "javax", "java", "#"]
+}
diff --git a/tests/shell/sonataflow-devmode/resources/greet.sw.json b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/resources/greet.sw.json
similarity index 100%
rename from tests/shell/sonataflow-devmode/resources/greet.sw.json
rename to packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/resources/greet.sw.json
diff --git a/tests/shell/sonataflow-devmode/src/RunTests.java b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
similarity index 80%
rename from tests/shell/sonataflow-devmode/src/RunTests.java
rename to packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
index 893c445df65..473be499be2 100644
--- a/tests/shell/sonataflow-devmode/src/RunTests.java
+++ b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
@@ -1,21 +1,23 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
-// 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.
+/*
+ * 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.
+ */
 
 //DEPS org.slf4j:slf4j-simple:2.0.9
 
diff --git a/packages/sonataflow-image-common/.gitignore b/packages/sonataflow-image-common/.gitignore
new file mode 100644
index 00000000000..4f8d39e1f12
--- /dev/null
+++ b/packages/sonataflow-image-common/.gitignore
@@ -0,0 +1,2 @@
+bin/
+bats-home/
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/README.md b/packages/sonataflow-image-common/README.md
new file mode 100644
index 00000000000..d6bf1235a9c
--- /dev/null
+++ b/packages/sonataflow-image-common/README.md
@@ -0,0 +1,83 @@
+<!--
+   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.
+-->
+
+# sonataflow-image-common
+
+This package contains the necessary resources to help other modules to build the `sonataflow-{builder|devmode}` images.
+
+The contents of this package are:
+
+- [Makefile](./resources/Makefile): convenience tool to help building and testing the images.
+- [Cekit Modules](./resources/modules): Common Cekit Module descriptors to be used when building the images.
+- [Utility Scripts](./resources/scripts): Utility scripts to be used during the image building process or bootstraping packages
+- [Testing infra](./resources/tests): Testing infra to help testing the generated images
+
+## Requirements
+
+- **python3** with the following packages installed:
+  - `behave` `lxml` `docker` `docker-squash` `elementPath` `pyyaml` `ruamel.yaml` `python-dateutil` `Jinja2` `pykwalify` `colorlog` `click`
+- **cekit 4.12.0**: [docs.cekit.io](https://docs.cekit.io/en/latest/index.html)
+- **make**
+- **docker**
+
+## Using the Makefile
+
+To build and tests the images the package provides a convenient `Makefile` that will do the hard work for you. It relies in the following Envs (or arguments):
+
+- `KOGITO_IMAGE_NAME`: (required) Specifies the image name to build. It should match the image descriptor.
+- `KOGITO_IMAGE_REGISTRY`: Image registry to use, defaults to 'docker.io'
+- `KOGITO_IMAGE_REGISTRY_ACCOUNT`: Image registry account to use, defaults to 'apache'
+- `KOGITO_IMAGE_TAG`: Custom tag for the image. If not provided it will use the version in the image descriptor.
+
+- `QUARKUS_PLATFORM_VERSION`: (required) Quarkus platform version to use inside the image.
+- `KOGITO_VERSION`: (required) Kogito platform version to use inside the image.
+
+- `CEKIT_BUILD_OPTIONS`: extra build options, please refer to [docs.cekit.io](https://docs.cekit.io/en/latest/index.html)
+- `BUILD_ENGINE`: (docker/podman) engine used to build the image, defaults to docker
+- `BUILD_ENGINE_OPTIONS`: extra build options to pass to the build engine
+
+- `KOGITO_APPS_TARGET_BRANCH`: Target branch from where to pull the Kogito Apps code, defaults to `main`
+- `KOGITO_APPS_TARGET_URI`: Target repository URI from where to pull the Kogito Apps code, defaults to 'https://github.com/apache/incubator-kie-kogito-apps.git'
+
+## Building images..
+
+- Copy your image descriptor and modules along with the contents of the `resources` into a separate folder (eg: `/tmp/build`)
+- ***
+
+Apache KIE (incubating) is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the name of Apache Incubator. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
+Some of the incubating project’s releases may not be fully compliant with ASF
+policy. For example, releases may have incomplete or un-reviewed licensing
+conditions. What follows is a list of known issues the project is currently
+aware of (note that this list, by definition, is likely to be incomplete):
+
+- Hibernate, an LGPL project, is being used. Hibernate is in the process of
+  relicensing to ASL v2
+- Some files, particularly test files, and those not supporting comments, may
+  be missing the ASF Licensing Header
+
+If you are planning to incorporate this work into your product/project, please
+be aware that you will need to conduct a thorough licensing review to determine
+the overall implications of including this work. For the current status of this
+project through the Apache Incubator visit:
+https://incubator.apache.org/projects/kie.html
diff --git a/packages/sonataflow-image-common/env/index.js b/packages/sonataflow-image-common/env/index.js
new file mode 100644
index 00000000000..61bc742bd66
--- /dev/null
+++ b/packages/sonataflow-image-common/env/index.js
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+const { varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
+
+module.exports = composeEnv([require("@kie-tools/root-env/env")], {
+  vars: varsWithName({}),
+  get env() {
+    return {};
+  },
+});
diff --git a/packages/sonataflow-image-common/install.js b/packages/sonataflow-image-common/install.js
new file mode 100644
index 00000000000..d50e66e5a08
--- /dev/null
+++ b/packages/sonataflow-image-common/install.js
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+const { execSync } = require("child_process");
+
+const buildEnv = require("./env");
+const path = require("path");
+const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
+
+const activateCmd =
+  process.platform === "win32"
+    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
+    : `. ${pythonVenvDir}/venv/bin/activate`;
+
+execSync(
+  `${activateCmd} && \
+  python3 ./resources/scripts/versions_manager.py --bump-to ${buildEnv.env.root.streamName} --source-folder ./resources`,
+  { stdio: "inherit" }
+);
+
+// Install bats
+if (process.platform !== "win32") {
+  execSync(`. ./resources/scripts/install_bats.sh`, { stdio: "inherit" });
+}
diff --git a/packages/sonataflow-image-common/package.json b/packages/sonataflow-image-common/package.json
new file mode 100644
index 00000000000..fa075f37ab8
--- /dev/null
+++ b/packages/sonataflow-image-common/package.json
@@ -0,0 +1,36 @@
+{
+  "private": true,
+  "name": "@kie-tools/sonataflow-image-common",
+  "version": "0.0.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/apache/incubator-kie-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/apache/incubator-kie-tools.git"
+  },
+  "bugs": {
+    "url": "https://github.com/apache/incubator-kie-tools/issues"
+  },
+  "scripts": {
+    "build:prod": "run-script-if --bool \"$(build-env tests.run)\" --then \"pnpm test\"",
+    "install": "node install.js",
+    "test": "run-script-os",
+    "test:linux:darwin": "mkdir -p dist-tests && rm -rf dist-tests/* && make -C ./resources bats || $(build-env tests.ignoreFailures) && mv dist-tests/report.xml dist-tests/junit-report.xml || true",
+    "test:win32": "echo \"Tests are skipped in Windows\""
+  },
+  "devDependencies": {
+    "@kie-tools/python-venv": "workspace:*",
+    "@kie-tools/root-env": "workspace:*",
+    "run-script-os": "^1.1.6"
+  },
+  "kieTools": {
+    "requiredPreinstalledCliCommands": [
+      "python3",
+      "pip3",
+      "make",
+      "s2i",
+      "xmllint"
+    ]
+  }
+}
diff --git a/packages/sonataflow-image-common/resources/Makefile b/packages/sonataflow-image-common/resources/Makefile
new file mode 100644
index 00000000000..3bf56946c3e
--- /dev/null
+++ b/packages/sonataflow-image-common/resources/Makefile
@@ -0,0 +1,85 @@
+# 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.
+
+.DEFAULT_GOAL 				:= build
+
+# Image build envs
+CEKIT_BUILD_OPTIONS 		?=
+CEKIT_CMD 					:= cekit ${CEKIT_BUILD_OPTIONS}
+BUILD_ENGINE 				?= docker
+BUILD_ENGINE_OPTIONS 	 	?=
+
+# SWF Image creation envs
+KOGITO_IMAGE_NAME				?= # Image name
+KOGITO_IMAGE_REGISTRY 			?= 'docker.io'
+KOGITO_IMAGE_REGISTRY_ACCOUNT 	?= 'apache'
+KOGITO_IMAGE_TAG 				?= $(shell pnpm build-env root.streamName) # Setting a default value if KOGITO_IMAGE_TAG env is not present
+KOGITO_FULL_IMAGE_NAME 			:= $(KOGITO_IMAGE_REGISTRY)/$(KOGITO_IMAGE_REGISTRY_ACCOUNT)/$(KOGITO_IMAGE_NAME)
+KOGITO_IMAGE_FILENAME			:= ${KOGITO_IMAGE_NAME}-image.yaml
+
+# Services Applications Image Build
+KOGITO_APPS_TARGET_URI 		?= 'https://github.com/apache/incubator-kie-kogito-apps.git'
+
+_check_kogito_image_name:
+ifndef KOGITO_IMAGE_NAME
+	$(error Cannot build image, please provide a valid image name using the KOGITO_IMAGE_NAME env)
+endif
+
+# Check if there are Quarkus and Kogito version envs
+_check_versions:
+ifndef QUARKUS_PLATFORM_VERSION
+	$(error Cannot build image, please provide a valid Quarkus version using the QUARKUS_PLATFORM_VERSION env)
+endif
+ifndef KOGITO_VERSION
+	$(error Cannot build image, please provide a valid Kogito version using the KOGITO_VERSION env)
+endif
+
+# Upgrade Quarkus & Kogito versions in the images and modules
+_run_version_manager:
+ifneq ($(SONATAFLOW_QUARKUS_DEVUI_VERSION),)
+	python3 scripts/versions_manager.py --quarkus-version ${QUARKUS_PLATFORM_VERSION} --kogito-version ${KOGITO_VERSION} --sonataflow-quarkus-devui-version ${SONATAFLOW_QUARKUS_DEVUI_VERSION}
+else
+	python3 scripts/versions_manager.py --quarkus-version ${QUARKUS_PLATFORM_VERSION} --kogito-version ${KOGITO_VERSION}
+endif
+
+_fix_platform_versions: _check_versions _run_version_manager
+
+# Building the SWF image with Cekit
+_cekit_build:
+	${CEKIT_CMD} --descriptor ${KOGITO_IMAGE_FILENAME} build ${CEKIT_BUILD_OPTIONS} ${BUILD_ENGINE} ${BUILD_ENGINE_OPTIONS} --tag ${KOGITO_FULL_IMAGE_NAME}:${KOGITO_IMAGE_TAG}
+
+_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:
+	tests/shell/run.sh ${KOGITO_IMAGE_NAME} ${KOGITO_FULL_IMAGE_NAME}:${KOGITO_IMAGE_TAG}
+	${CEKIT_CMD} --descriptor ${KOGITO_IMAGE_FILENAME} test behave
+
+.PHONY build: _check_kogito_image_name _fix_platform_versions _cekit_build
+
+# run bat tests locally
+bats:
+	@./scripts/run-bats.sh
diff --git a/modules/kogito-custom-truststore/README.md b/packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/README.md
similarity index 96%
rename from modules/kogito-custom-truststore/README.md
rename to packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/README.md
index e213a4a9807..0e314ba075d 100644
--- a/modules/kogito-custom-truststore/README.md
+++ b/packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/README.md
@@ -24,7 +24,7 @@ This module adds the possibility to override the default Java TrustStore in the
 ## How to Use
 
 1. Add the self-signed certificates or your in-house certificates to the default JKS `cacerts` (or you can start a new one from scratch).
-[Keystore Explorer](https://keystore-explorer.org/) is a great tool to manipulate JKS
+   [Keystore Explorer](https://keystore-explorer.org/) is a great tool to manipulate JKS
 
 2. Mount your file anywhere in your system using `docker volume`:
 
diff --git a/modules/kogito-custom-truststore/added/configure-custom-truststore.sh b/packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
similarity index 100%
rename from modules/kogito-custom-truststore/added/configure-custom-truststore.sh
rename to packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/added/configure-custom-truststore.sh
diff --git a/modules/kogito-custom-truststore/configure b/packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/configure
similarity index 100%
rename from modules/kogito-custom-truststore/configure
rename to packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/configure
diff --git a/modules/kogito-custom-truststore/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/module.yaml
similarity index 100%
rename from modules/kogito-custom-truststore/module.yaml
rename to packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/module.yaml
diff --git a/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats b/packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
similarity index 97%
rename from modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
rename to packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
index 0ac34266fb5..8ed0c4ac7a2 100644
--- a/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
+++ b/packages/sonataflow-image-common/resources/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats
@@ -31,11 +31,11 @@ teardown() {
 }
 
 @test "fail case when the custom certificate is not present in the expected path" {
+    prepareEnv
+
     local expected=1
     export CUSTOM_TRUSTSTORE=my-cert.jks
 
-    prepareEnv
-    preConfigure
     run configure
 
     echo "Result is [$status] and expected is [${expected}]" >&2
@@ -45,6 +45,8 @@ teardown() {
 }
 
 @test "success case when the custom certificate is present in the expected path" {
+    prepareEnv
+
     local expected=0
     local pathExpected="${KOGITO_HOME}/certs/custom-truststore/my-cert.jks"
 
@@ -52,8 +54,6 @@ teardown() {
     touch ${KOGITO_HOME}/certs/custom-truststore/my-cert.jks
     CUSTOM_TRUSTSTORE=my-cert.jks
 
-    prepareEnv
-    preConfigure
     run configure
 
     echo "Result is [$status] and expected is [${expected}]" >&2
@@ -66,7 +66,6 @@ teardown() {
     local expected=0
 
     prepareEnv
-    preConfigure
     run configure
 
     echo "Result is [$status] and expected is [${expected}]" >&2
diff --git a/modules/kogito-data-index-common/added/kogito-data-index-common.sh b/packages/sonataflow-image-common/resources/modules/kogito-data-index-common/added/kogito-data-index-common.sh
similarity index 99%
rename from modules/kogito-data-index-common/added/kogito-data-index-common.sh
rename to packages/sonataflow-image-common/resources/modules/kogito-data-index-common/added/kogito-data-index-common.sh
index 373ada7efde..273aa713abb 100644
--- a/modules/kogito-data-index-common/added/kogito-data-index-common.sh
+++ b/packages/sonataflow-image-common/resources/modules/kogito-data-index-common/added/kogito-data-index-common.sh
@@ -25,6 +25,7 @@ function prepareEnv() {
     # keep it on alphabetical order
     unset KOGITO_DATA_INDEX_QUARKUS_PROFILE
 }
+
 function configure() {
     configure_data_index_quarkus_profile
 }
diff --git a/modules/kogito-data-index-common/configure b/packages/sonataflow-image-common/resources/modules/kogito-data-index-common/configure
similarity index 100%
rename from modules/kogito-data-index-common/configure
rename to packages/sonataflow-image-common/resources/modules/kogito-data-index-common/configure
diff --git a/modules/kogito-data-index-common/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-data-index-common/module.yaml
similarity index 100%
rename from modules/kogito-data-index-common/module.yaml
rename to packages/sonataflow-image-common/resources/modules/kogito-data-index-common/module.yaml
diff --git a/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats b/packages/sonataflow-image-common/resources/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
similarity index 92%
rename from modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
rename to packages/sonataflow-image-common/resources/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
index 312815753c5..e660056d9df 100644
--- a/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
+++ b/packages/sonataflow-image-common/resources/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats
@@ -25,7 +25,7 @@ mkdir -p "${KOGITO_HOME}"/launch
 cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
 
 # imports
-load $BATS_TEST_DIRNAME/../../added/launch/kogito-data-index-common.sh
+load $BATS_TEST_DIRNAME/../../added/kogito-data-index-common.sh
 
 
 teardown() {
@@ -33,15 +33,21 @@ teardown() {
 }
 
 @test "check if the default quarkus profile is correctly set on data index" {
-    local expected=" -Dquarkus.profile=kafka-events-support"
+    local expected=" -Dquarkus.profile="
+
+    prepareEnv
+    
     configure_data_index_quarkus_profile
     echo "Result is [${KOGITO_DATA_INDEX_PROPS}] and expected is [${expected}]"
     [ "${expected}" = "${KOGITO_DATA_INDEX_PROPS}" ]
 }
 
 @test "check if a provided data index quarkus profile is correctly set on data index" {
-    export KOGITO_DATA_INDEX_QUARKUS_PROFILE="http-events-support"
     local expected=" -Dquarkus.profile=http-events-support"
+
+    prepareEnv
+    export KOGITO_DATA_INDEX_QUARKUS_PROFILE="http-events-support"
+
     configure_data_index_quarkus_profile
     echo "Result is [${KOGITO_DATA_INDEX_PROPS}] and expected is [${expected}]"
     [ "${expected}" = "${KOGITO_DATA_INDEX_PROPS}" ]
diff --git a/modules/kogito-dynamic-resources/added/container-limits b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/container-limits
similarity index 100%
rename from modules/kogito-dynamic-resources/added/container-limits
rename to packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/container-limits
diff --git a/modules/kogito-dynamic-resources/added/debug-options b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/debug-options
similarity index 100%
rename from modules/kogito-dynamic-resources/added/debug-options
rename to packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/debug-options
diff --git a/modules/kogito-dynamic-resources/added/java-default-options b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/java-default-options
similarity index 100%
rename from modules/kogito-dynamic-resources/added/java-default-options
rename to packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/java-default-options
diff --git a/modules/kogito-dynamic-resources/configure b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/configure
similarity index 100%
rename from modules/kogito-dynamic-resources/configure
rename to packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/configure
diff --git a/modules/kogito-dynamic-resources/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/module.yaml
similarity index 100%
rename from modules/kogito-dynamic-resources/module.yaml
rename to packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/module.yaml
diff --git a/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/tests/bats/sonataflow-builder-jvm-settings.bats
similarity index 88%
rename from modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats
rename to packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/tests/bats/sonataflow-builder-jvm-settings.bats
index a0487e8d477..d483bef80d3 100644
--- a/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats
+++ b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/tests/bats/sonataflow-builder-jvm-settings.bats
@@ -24,10 +24,10 @@ export HOME="${KOGITO_HOME}"
 export JBOSS_CONTAINER_JAVA_JVM_MODULE=/tmp/container/java/jvm
 mkdir -p "${KOGITO_HOME}"/launch
 mkdir -p "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
-cp $BATS_TEST_DIRNAME/../../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-cp -r $BATS_TEST_DIRNAME/../../../../../kogito-dynamic-resources/added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
+cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+cp -r $BATS_TEST_DIRNAME/../../added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
 chmod -R +x "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
-cp $BATS_TEST_DIRNAME/../../added/jvm-settings.sh "${KOGITO_HOME}"/launch/
+cp $BATS_TEST_DIRNAME/../../../sonataflow/common/scripts/added/jvm-settings.sh "${KOGITO_HOME}"/launch/
 
 teardown() {
     rm -rf "${KOGITO_HOME}"
diff --git a/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh b/packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh
similarity index 100%
rename from modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh
rename to packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh
diff --git a/modules/kogito-jobs-service-common/configure b/packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/configure
similarity index 100%
rename from modules/kogito-jobs-service-common/configure
rename to packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/configure
diff --git a/modules/kogito-jobs-service-common/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/module.yaml
similarity index 100%
rename from modules/kogito-jobs-service-common/module.yaml
rename to packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/module.yaml
diff --git a/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats b/packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats
similarity index 100%
rename from modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats
rename to packages/sonataflow-image-common/resources/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats
diff --git a/modules/kogito-launch-scripts/added/configure.sh b/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/added/configure.sh
similarity index 100%
rename from modules/kogito-launch-scripts/added/configure.sh
rename to packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/added/configure.sh
diff --git a/modules/kogito-launch-scripts/configure b/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/configure
similarity index 100%
rename from modules/kogito-launch-scripts/configure
rename to packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/configure
diff --git a/modules/kogito-launch-scripts/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/module.yaml
similarity index 100%
rename from modules/kogito-launch-scripts/module.yaml
rename to packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/module.yaml
diff --git a/modules/kogito-logging/added/logging.sh b/packages/sonataflow-image-common/resources/modules/kogito-logging/added/logging.sh
similarity index 100%
rename from modules/kogito-logging/added/logging.sh
rename to packages/sonataflow-image-common/resources/modules/kogito-logging/added/logging.sh
diff --git a/modules/kogito-logging/configure b/packages/sonataflow-image-common/resources/modules/kogito-logging/configure
similarity index 100%
rename from modules/kogito-logging/configure
rename to packages/sonataflow-image-common/resources/modules/kogito-logging/configure
diff --git a/modules/kogito-logging/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-logging/module.yaml
similarity index 100%
rename from modules/kogito-logging/module.yaml
rename to packages/sonataflow-image-common/resources/modules/kogito-logging/module.yaml
diff --git a/modules/kogito-maven/common/added/configure-maven.sh b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/added/configure-maven.sh
similarity index 100%
rename from modules/kogito-maven/common/added/configure-maven.sh
rename to packages/sonataflow-image-common/resources/modules/kogito-maven/common/added/configure-maven.sh
diff --git a/modules/kogito-maven/common/configure b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/configure
similarity index 100%
rename from modules/kogito-maven/common/configure
rename to packages/sonataflow-image-common/resources/modules/kogito-maven/common/configure
diff --git a/modules/kogito-maven/common/maven/settings.xml b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/maven/settings.xml
similarity index 62%
rename from modules/kogito-maven/common/maven/settings.xml
rename to packages/sonataflow-image-common/resources/modules/kogito-maven/common/maven/settings.xml
index be7ff0e496f..eae20db74b4 100644
--- a/modules/kogito-maven/common/maven/settings.xml
+++ b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/maven/settings.xml
@@ -1,27 +1,9 @@
-<!--
-  ~ 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.
-  -->
-
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-
+<settings
+  xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd"
+>
   <mirrors>
     <!-- ### configured mirrors ### -->
   </mirrors>
diff --git a/modules/kogito-maven/common/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/module.yaml
similarity index 99%
rename from modules/kogito-maven/common/module.yaml
rename to packages/sonataflow-image-common/resources/modules/kogito-maven/common/module.yaml
index 4d980b42270..0644818dc27 100644
--- a/modules/kogito-maven/common/module.yaml
+++ b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/module.yaml
@@ -27,7 +27,7 @@ envs:
     value: "/usr/share/maven"
   - name: "MAVEN_SETTINGS_PATH"
     description: "The location of the settings.xml file"
-    value: '${KOGITO_HOME}/.m2/settings.xml'
+    value: "${KOGITO_HOME}/.m2/settings.xml"
   - name: "HTTP_PROXY"
     description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
     example: "http://127.0.0.1:8080"
diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/packages/sonataflow-image-common/resources/modules/kogito-maven/tests/bats/maven-settings.bats
similarity index 100%
rename from modules/kogito-maven/tests/bats/maven-settings.bats
rename to packages/sonataflow-image-common/resources/modules/kogito-maven/tests/bats/maven-settings.bats
diff --git a/modules/kogito-project-versions/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-project-versions/module.yaml
similarity index 78%
rename from modules/kogito-project-versions/module.yaml
rename to packages/sonataflow-image-common/resources/modules/kogito-project-versions/module.yaml
index bc3f82808ec..b710330fb63 100644
--- a/modules/kogito-project-versions/module.yaml
+++ b/packages/sonataflow-image-common/resources/modules/kogito-project-versions/module.yaml
@@ -23,8 +23,11 @@ description: "Kogito Project versions information"
 
 envs:
   - name: "KOGITO_VERSION"
-    value: "999-SNAPSHOT"
+    value: "### SET ME DURING BUILD PROCESS ###"
     description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
   - name: "QUARKUS_PLATFORM_VERSION"
-    value: "3.8.6"
+    value: "### SET ME DURING BUILD PROCESS ###"
     description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
+  - name: "SONATAFLOW_QUARKUS_DEVUI_VERSION"
+    value: "### SET ME DURING BUILD PROCESS ###"
+    description: Defines the SonataFlow Quarkus Dev UI version to be used by the devmode image. Not intended to be changed by end user.
diff --git a/modules/kogito-system-user/add-user b/packages/sonataflow-image-common/resources/modules/kogito-system-user/add-user
similarity index 100%
rename from modules/kogito-system-user/add-user
rename to packages/sonataflow-image-common/resources/modules/kogito-system-user/add-user
diff --git a/modules/kogito-system-user/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-system-user/module.yaml
similarity index 99%
rename from modules/kogito-system-user/module.yaml
rename to packages/sonataflow-image-common/resources/modules/kogito-system-user/module.yaml
index 6f9b79ef8d5..7d4258aa0bd 100644
--- a/modules/kogito-system-user/module.yaml
+++ b/packages/sonataflow-image-common/resources/modules/kogito-system-user/module.yaml
@@ -31,4 +31,3 @@ envs:
     value: "/home/kogito"
   - name: "USER"
     value: "kogito"
-
diff --git a/modules/sonataflow/common/build/added/cleanup_project.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/cleanup_project.sh
similarity index 100%
rename from modules/sonataflow/common/build/added/cleanup_project.sh
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/cleanup_project.sh
diff --git a/modules/sonataflow/common/build/added/zip_files.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/zip_files.sh
similarity index 83%
rename from modules/sonataflow/common/build/added/zip_files.sh
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/zip_files.sh
index 57394e692f6..3e68296ef2c 100755
--- a/modules/sonataflow/common/build/added/zip_files.sh
+++ b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/zip_files.sh
@@ -25,10 +25,10 @@ BUILD_OUTPUT="${KOGITO_HOME}"/build_output/
 mkdir -p "${BUILD_OUTPUT}"
 
 echo "Zip and copy scaffold project"
-tar cf sonataflow-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" .
-cp -v sonataflow-quarkus-app.tar "${BUILD_OUTPUT}"
+tar cf kogito-swf-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" .
+cp -v kogito-swf-quarkus-app.tar "${BUILD_OUTPUT}"
 
 echo "Zip and copy maven repo"
 cd "${KOGITO_HOME}"/.m2/repository/
-tar cf sonataflow-maven-repo.tar .
-cp -v sonataflow-maven-repo.tar "${BUILD_OUTPUT}"
\ No newline at end of file
+tar cf kogito-swf-maven-repo.tar .
+cp -v kogito-swf-maven-repo.tar "${BUILD_OUTPUT}"
\ No newline at end of file
diff --git a/modules/sonataflow/common/build/configure.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/configure.sh
similarity index 100%
rename from modules/sonataflow/common/build/configure.sh
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/build/configure.sh
diff --git a/modules/sonataflow/common/build/module.yaml b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/module.yaml
similarity index 96%
rename from modules/sonataflow/common/build/module.yaml
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/build/module.yaml
index 5e5f96fe044..c9be6d46703 100644
--- a/modules/sonataflow/common/build/module.yaml
+++ b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/module.yaml
@@ -17,7 +17,7 @@
 # under the License.
 #
 schema_version: 1
-name: org.kie.kogito.swf.common.build
+name: org.kie.sonataflow.common.build
 version: "main"
 description: "Kogito Serverless Workflow image build process"
 
diff --git a/modules/sonataflow/common/scripts/added/add-extension.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/add-extension.sh
similarity index 100%
rename from modules/sonataflow/common/scripts/added/add-extension.sh
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/add-extension.sh
diff --git a/modules/sonataflow/common/scripts/added/build-app.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/build-app.sh
similarity index 100%
rename from modules/sonataflow/common/scripts/added/build-app.sh
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/build-app.sh
diff --git a/modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh
similarity index 100%
rename from modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh
diff --git a/modules/sonataflow/common/scripts/added/create-app.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/create-app.sh
similarity index 97%
rename from modules/sonataflow/common/scripts/added/create-app.sh
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/create-app.sh
index ac8a5ebe627..9d99b521704 100755
--- a/modules/sonataflow/common/scripts/added/create-app.sh
+++ b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/create-app.sh
@@ -27,7 +27,7 @@ source "${script_dir_path}"/logging.sh
 
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
-    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
+    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode"
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
     printenv
 fi
@@ -124,6 +124,9 @@ if [ "${SCRIPT_DEBUG^^}" = "TRUE" ]; then
     cat pom.xml
 fi
 
+ls -la "${KOGITO_HOME}"/.m2/repository/org/apache/kie/
+ls -la "${KOGITO_HOME}"/.m2/repository/org/kie/
+
 # we force the dependencies download beforehand, so we won't have problems when running or building our apps in offline mode
 # see:
 #   https://quarkus.io/guides/maven-tooling#downloading-maven-artifact-dependencies-for-offline-development-and-testing
@@ -139,4 +142,4 @@ fi
 "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
   -nsu \
   -s "${MAVEN_SETTINGS_PATH}" \
-  clean 
+  clean
diff --git a/modules/sonataflow/common/scripts/added/jvm-settings.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/jvm-settings.sh
similarity index 100%
rename from modules/sonataflow/common/scripts/added/jvm-settings.sh
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/jvm-settings.sh
diff --git a/modules/sonataflow/common/scripts/configure.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/configure.sh
similarity index 100%
rename from modules/sonataflow/common/scripts/configure.sh
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/configure.sh
diff --git a/modules/sonataflow/common/scripts/module.yaml b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/module.yaml
similarity index 93%
rename from modules/sonataflow/common/scripts/module.yaml
rename to packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/module.yaml
index 94c07984a1a..0278c6fc05b 100644
--- a/modules/sonataflow/common/scripts/module.yaml
+++ b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/module.yaml
@@ -17,13 +17,13 @@
 # under the License.
 #
 schema_version: 1
-name: org.kie.kogito.swf.common.scripts
+name: org.kie.sonataflow.common.scripts
 version: "main"
 description: "Kogito Serverless Workflow image common scripts"
 
 envs:
   - name: QUARKUS_EXTENSIONS
-    example: 'quarkus-kubernetes,org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION}'
+    example: "quarkus-kubernetes,org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION}"
     description: To add extension to your application
 
   - name: PROJECT_GROUP_ID
diff --git a/packages/sonataflow-image-common/resources/scripts/README.md b/packages/sonataflow-image-common/resources/scripts/README.md
new file mode 100644
index 00000000000..34a4fcd0c85
--- /dev/null
+++ b/packages/sonataflow-image-common/resources/scripts/README.md
@@ -0,0 +1,72 @@
+<!--
+   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.
+-->
+<!--
+   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.
+-->
+
+# sonataflow-image-common utility scripts
+
+This directory contains a set of python scripts used to help to perform some tasks during the build and configuration of the `kogito-swf` images:
+
+## Common script
+
+The [common.py](common.py) defines the basic functions that will be used by other scripts
+
+## Retrieve Versions script
+
+The [retrieve_versions.py](retrieve_version.py) script is used to read the actual image version from the
+`kogito-project-versions` module during the image build process.
+
+## Versions Manager
+
+The [versions_manager.py](versions_manager.py) script offers a CLI that helps upgrading versions properties in
+the images yaml descriptor or cekit modules. This script is being used during the image build time, but it's also used
+to update the images / cekit modules versions when bootstraping the `@kie-tools` repo.
+
+Usage:
+
+- Bumping images / cekit modules versions of a package in `@kie-tools`
+  Args:
+
+  - `--bump-to`: bumps the image and module versions (in the `resources` folder) to the specified version.
+  - `--source-folder`: specifies the path to the `resources` folder.
+
+- Upgrading platform dependencies in all images / modules envs and labels during the image build process.
+  Args:
+- `--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/scripts/build-kogito-apps-components.sh b/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh
similarity index 86%
rename from scripts/build-kogito-apps-components.sh
rename to packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh
index 564506e4109..3a592f1bd1a 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh
@@ -32,7 +32,12 @@ KOGITO_APPS_FOLDER_NAME="kogito-apps"
 
 # Read entries before sourcing
 imageName="${1}"
-gitBranch="${2:-main}"
+gitBranch="${2}"
+if [ -z "${gitBranch}" ]; then
+    echo "The gitBranch argument is required"
+    exit 1
+fi
+gitBranch=${gitBranch//-[sS][nN][aA][pP][sS][hH][oO][tT]/}
 gitUri="${3:-https://github.com/apache/${KOGITO_APPS_REPO_NAME}.git}"
 contextDir=""
 shift $#
@@ -51,24 +56,24 @@ if [ ! -z "${CYPRESS_BINARY_URL}" ]; then
 fi
 
 case ${imageName} in
-    "kogito-data-index-ephemeral")
+    "incubator-kie-kogito-data-index-ephemeral")
         contextDir="data-index/data-index-service/data-index-service-inmemory"
         ;;
-    "kogito-data-index-postgresql")
+    "incubator-kie-kogito-data-index-postgresql")
         contextDir="data-index/data-index-service/data-index-service-postgresql"
         ;;
-    "kogito-jobs-service-ephemeral")
+    "incubator-kie-kogito-jobs-service-ephemeral")
         contextDir="jobs-service/jobs-service-inmemory"
         ;;
-    "kogito-jobs-service-postgresql")
+    "incubator-kie-kogito-jobs-service-postgresql")
         contextDir="jobs-service/jobs-service-postgresql"
         ;;
-    "kogito-jobs-service-allinone")
+    "incubator-kie-kogito-jobs-service-allinone")
         extended_context="-all-in-one"
         contextDir="jobs-service/jobs-service-inmemory"
         contextDir="${contextDir} jobs-service/jobs-service-postgresql"
         ;;
-    "kogito-jit-runner")
+    "incubator-kie-kogito-jit-runner")
         contextDir="jitexecutor/jitexecutor-runner"
         ;;
     *)
@@ -77,6 +82,9 @@ case ${imageName} in
         ;;
 esac
 
+# FIXME: Instead of pulling the repo we might pull from Apache Maven repository instead (either staging on release, or snapshot on daily basis)
+# FIXME: The kogito-apps must publish the Quarkus App we build here in order for this to work.
+
 for ctx in ${contextDir}; do
     target_tmp_dir="/tmp/build/$(basename ${ctx})${extended_context}"
     build_target_dir="/tmp/$(basename ${ctx})${extended_context}"
diff --git a/packages/sonataflow-image-common/resources/scripts/common.py b/packages/sonataflow-image-common/resources/scripts/common.py
new file mode 100644
index 00000000000..30cbdc44c93
--- /dev/null
+++ b/packages/sonataflow-image-common/resources/scripts/common.py
@@ -0,0 +1,304 @@
+import os
+import re
+import glob
+
+from ruamel.yaml import YAML
+
+MODULE_FILENAME = "module.yaml"
+MODULES_DIR = "modules"
+PROJECT_VERSIONS_MODULE = "modules/kogito-project-versions/module.yaml"
+
+KOGITO_VERSION_ENV_KEY = "KOGITO_VERSION"
+KOGITO_VERSION_LABEL_NAME = "org.kie.kogito.version"
+
+QUARKUS_PLATFORM_VERSION_ENV_KEY = "QUARKUS_PLATFORM_VERSION"
+QUARKUS_PLATFORM_VERSION_LABEL_NAME = "io.quarkus.platform.version"
+
+SONATAFLOW_QUARKUS_DEVUI_VERSION_ENV_KEY = "SONATAFLOW_QUARKUS_DEVUI_VERSION"
+
+
+def yaml_loader():
+    """
+    default yaml Loader
+    :return: yaml object
+    """
+    yaml = YAML()
+    yaml.preserve_quotes = True
+    yaml.width = 1024
+    yaml.indent(mapping=2, sequence=4, offset=2)
+    return yaml
+
+def retrieve_version():
+    """
+    Retrieve the project version from project data file
+    """
+    return get_project_versions_module_data()['version']
+
+def get_all_images(source_folder = None):
+    """
+    Retrieve all images in current dir
+    """
+    root_folder = "." if source_folder is None else source_folder
+    return glob.glob("{}/*-image.yaml".format(root_folder))
+
+def get_project_versions_module_data():
+    """
+    Get a specific field value from project versions module file
+    """
+    try:
+        project_versions_module_file = os.path.join(PROJECT_VERSIONS_MODULE)
+        with open(project_versions_module_file) as project_versions_data:
+            return yaml_loader().load(project_versions_data)
+
+    except TypeError:
+        raise
+
+def get_all_module_dirs(source_folder = None):
+    """
+    Retrieve the module directories
+    :param source_folder: folder where resources are stored
+    """
+
+    root_folder = "." if source_folder is None else source_folder
+    modules_dir = "{}/{}".format(root_folder, MODULES_DIR)
+
+    modules = []
+
+    # r=>root, d=>directories, f=>files
+    for r, d, f in os.walk(modules_dir):
+        for item in f:
+            if MODULE_FILENAME == item:
+                modules.append(os.path.dirname(os.path.join(r, item)))
+                print("[sonataflow-image-common] Processing modules of '" + os.path.dirname(os.path.join(r, item)) + "'")
+
+    return modules
+
+def update_image_and_modules_version(target_version, source_folder = None):
+    """
+    Update every Kogito module.yaml to the given version.
+    :param target_version: version used to update all Kogito module.yaml files
+    :param source_folder: folder where resources are stored
+    """
+    print("Images and Modules version will be updated to {0}".format(target_version))
+    update_images_version(target_version, source_folder)
+    update_modules_version(target_version, source_folder)
+
+
+def update_modules_version(target_version, source_folder = None):
+    """
+    Update every Kogito module.yaml to the given version.
+    :param target_version: version used to update all Kogito module.yaml files
+    :param source_folder: folder where resources are stored
+    """
+    modules = get_all_module_dirs(source_folder)
+
+    for module_dir in modules:
+        update_module_version(module_dir, target_version)
+
+
+def update_module_version(module_dir, target_version):
+    """
+    Set Kogito module.yaml to given version.
+    :param module_dir: directory where cekit modules are hold
+    :param target_version: version to set into the module
+    """
+    try:
+        module_file = os.path.join(module_dir, MODULE_FILENAME)
+        with open(module_file) as module:
+            data = yaml_loader().load(module)
+            print("Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
+            data['version'] = target_version
+
+        with open(module_file, 'w') as module:
+            yaml_loader().dump(data, module)
+
+    except TypeError:
+        raise
+
+def update_images_version(target_version, source_folder = None):
+    """
+    Update image.yml files version tag.
+    :param target_version: version used to update
+    :param source_folder: folder where resources are stored
+    """
+    for image_filename in get_all_images(source_folder):
+        update_image_version_tag_in_yaml_file(target_version, image_filename)
+
+
+def update_image_version_tag_in_yaml_file(target_version, yaml_file):
+    """
+    Update root version tag in yaml file.
+    :param target_version: version to set
+    :param yaml_file: yaml file to update
+    """
+    print("Updating Image main file version from file {0} to version {1}".format(yaml_file, target_version))
+    try:
+        with open(yaml_file) as image:
+            data = yaml_loader().load(image)
+            update_field_in_dict(data, 'version', target_version)
+
+        with open(yaml_file, 'w') as image:
+            yaml_loader().dump(data, image)
+    except TypeError as err:
+        print("Unexpected error:", err)
+
+def update_kogito_platform_version(kogito_platform_version):
+    """
+    Update kogito_platform_version version into images/modules
+    :param kogito_platform_version: kogito version to set
+    """
+    print("Setting Kogito Platform version: " + kogito_platform_version)
+    update_env_value(KOGITO_VERSION_ENV_KEY, kogito_platform_version)
+    update_label_value(KOGITO_VERSION_LABEL_NAME, kogito_platform_version)
+
+def update_quarkus_platform_version(quarkus_platform_version):
+    """
+    Update quarkus_platform_version version into images/modules
+    :param quarkus_platform_version: quarkus version to set
+    """
+    print("Setting Quarkus version: " + quarkus_platform_version)
+    update_env_value(QUARKUS_PLATFORM_VERSION_ENV_KEY, quarkus_platform_version)
+    update_label_value(QUARKUS_PLATFORM_VERSION_LABEL_NAME, quarkus_platform_version)
+
+def update_sonataflow_quarkus_devui_version(sonataflow_quarkus_devui_version):
+    """
+    Update sonataflow_quarkus_devui_version version into images/modules
+    :param sonataflow_quarkus_devui_version: sonataflow quarkus devui version to set
+    """
+    print("Setting SonataFlow Quarkus DevUI version: " + sonataflow_quarkus_devui_version)
+    update_env_value(SONATAFLOW_QUARKUS_DEVUI_VERSION_ENV_KEY, sonataflow_quarkus_devui_version)
+
+def update_env_value(env_name, env_value):
+    """
+    Update environment value into the given yaml module/image file
+    :param env_name: environment variable name to update
+    :param env_value: value to set
+    """
+
+    images = get_all_images()
+    modules = get_all_module_dirs()
+
+    for image_filename in images:
+        update_env_value_in_file(image_filename, env_name, env_value)
+
+    for module_dir in modules:
+        module_file = os.path.join(module_dir, "module.yaml")
+        update_env_value_in_file(module_file, env_name, env_value)
+
+def update_env_value_in_file(filename, env_name, env_value):
+    """
+    Update environment value into the given yaml module/image file
+    :param filename: filename to update
+    :param env_name: environment variable name to update
+    :param env_value: value to set
+    """
+    print("Updating {0} label {1} with value {2}".format(filename, env_name, env_value))
+    try:
+        with open(filename) as yaml_file:
+            data = yaml_loader().load(yaml_file)
+            update_env_value_in_data(data, env_name, env_value)
+
+        with open(filename, 'w') as yaml_file:
+            yaml_loader().dump(data, yaml_file)
+
+    except TypeError:
+        raise
+
+
+def update_env_value_in_data(data, env_name, env_value, ignore_empty = False):
+    """
+    Update environment variable value in data dict if exists
+    :param data: dict to update
+    :param env_name: environment variable name
+    :param env_value: environment variable value to set
+    :param ignore_empty: Whether previous value should be present to set the new value
+    """
+    if isinstance(data, list):
+        for data_item in data:
+            update_env_value_in_data(data_item, env_name, env_value, ignore_empty)
+    else:
+        if ignore_empty:
+            if 'envs' not in data:
+                data['envs'] = []
+            data['envs'] += [ dict(name=env_name, value=env_value) ]
+        elif 'envs' in data:
+            for _, env in enumerate(data['envs'], start=0):
+                if env['name'] == env_name:
+                    update_field_in_dict(env, 'value', env_value, ignore_empty)
+
+def update_field_in_dict(data, key, new_value, ignore_empty = False):
+    """
+    Update version field in given data dict
+    :param data: dictionary to update
+    :param key: key to lookup
+    :param new_value: value to set
+    :param ignore_empty: Whether previous value should be present to set the new value
+    """
+    if isinstance(data, list):
+        for data_item in data:
+            update_field_in_dict(data_item, key, new_value, ignore_empty)
+    else:
+        if ignore_empty or key in data:
+            data[key] = new_value
+        else:
+            print("Field " + key + " not found, returning...")
+
+def update_label_value(label_name, label_value):
+    """
+    Update label value in all modules and images
+    :param label_name: label name to update
+    :param label_value: value to set
+    """
+
+    images = get_all_images()
+    modules = get_all_module_dirs()
+
+    for image_filename in images:
+        print("updating image: " + image_filename)
+        update_label_value_in_file(image_filename, label_name, label_value)
+
+    for module_dir in modules:
+        module_file = os.path.join(module_dir, "module.yaml")
+        update_label_value_in_file(module_file, label_name, label_name)
+
+def update_label_value_in_file(filename, label_name, label_value):
+    """
+    Update label value into the given yaml module/image file
+    :param filename: filename to update
+    :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))
+    try:
+        with open(filename) as yaml_file:
+            data = yaml_loader().load(yaml_file)
+            update_label_value_in_data(data, label_name, label_value)
+
+        with open(filename, 'w') as yaml_file:
+            yaml_loader().dump(data, yaml_file)
+
+    except TypeError:
+        raise
+
+
+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
+    :param label_name: label name
+    :param label_value: label value to set
+    :param ignore_empty: Whether previous value should be present to set the new value
+    """
+    if isinstance(data, list):
+        for data_item in data:
+            update_label_value_in_data(data_item, label_name, label_value, ignore_empty)
+    else:
+        if ignore_empty:
+            if 'labels' not in data:
+                data['labels'] = []
+            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:
+                    update_field_in_dict(label, 'value', label_value, ignore_empty)
+
diff --git a/scripts/run-bats.sh b/packages/sonataflow-image-common/resources/scripts/install_bats.sh
similarity index 72%
rename from scripts/run-bats.sh
rename to packages/sonataflow-image-common/resources/scripts/install_bats.sh
index ce2ddc45d2a..652a11f757a 100755
--- a/scripts/run-bats.sh
+++ b/packages/sonataflow-image-common/resources/scripts/install_bats.sh
@@ -21,16 +21,10 @@
 
 set -e
 
-if [[ $(command -v ./bats/bin/bats) ]]; then    #skip if bats already installed else will install the bats
+if [[ $(command -v ./bats-home/bin/bats) ]]; then    #skip if bats already installed else will install the bats
     echo "---> bats already available running tests"
 else
     git clone https://github.com/bats-core/bats-core.git
-    ./bats-core/install.sh bats
+    ./bats-core/install.sh bats-home
     rm -rf bats-core
 fi
-
-echo "----> running bats on kogito-jobs-service-common"
-./bats/bin/bats modules/kogito-jobs-service-common/tests/bats
-
-echo "----> running bats on sonataflow-builder"
-./bats/bin/bats modules/sonataflow/common/scripts/tests/bats
diff --git a/scripts/retrieve_version.py b/packages/sonataflow-image-common/resources/scripts/retrieve_version.py
similarity index 87%
rename from scripts/retrieve_version.py
rename to packages/sonataflow-image-common/resources/scripts/retrieve_version.py
index 2a87cba9628..d741e2454b4 100644
--- a/scripts/retrieve_version.py
+++ b/packages/sonataflow-image-common/resources/scripts/retrieve_version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -18,16 +18,14 @@
 # under the License.
 #
 
-#Script responsible to update the tests with 
+#Script responsible to update the tests with
 #Should be run from root directory of the repository
-#Sample usage:  python scripts/retrieve_version.py
+#Sample usage:  python3 scripts/retrieve_version.py
 
 import sys
 sys.dont_write_bytecode = True
 
 import common
 
-import argparse
-
 if __name__ == "__main__":
     print(common.retrieve_version())
diff --git a/.github/bot-files/labels.yml b/packages/sonataflow-image-common/resources/scripts/run-bats.sh
old mode 100644
new mode 100755
similarity index 73%
rename from .github/bot-files/labels.yml
rename to packages/sonataflow-image-common/resources/scripts/run-bats.sh
index 49056435593..c44be7ae477
--- a/.github/bot-files/labels.yml
+++ b/packages/sonataflow-image-common/resources/scripts/run-bats.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -17,13 +18,12 @@
 # under the License.
 #
 
-# we don't need path labels here but the bot expects atleast one row inside it.
 
-labels:
-  - paths:
-      - anything/**
-    labels:
-      - "won't trigger"
+set -e
 
-default:
-  - 'needs review :mag:'
\ No newline at end of file
+script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+tests_output_path="${script_dir_path}/../../dist-tests"
+
+echo "----> running bats"
+./../bats-home/bin/bats -r modules --formatter junit --report-formatter junit --output "${tests_output_path}"
diff --git a/scripts/setup-maven.sh b/packages/sonataflow-image-common/resources/scripts/setup-maven.sh
similarity index 100%
rename from scripts/setup-maven.sh
rename to packages/sonataflow-image-common/resources/scripts/setup-maven.sh
diff --git a/packages/sonataflow-image-common/resources/scripts/versions_manager.py b/packages/sonataflow-image-common/resources/scripts/versions_manager.py
new file mode 100644
index 00000000000..d71f18a8917
--- /dev/null
+++ b/packages/sonataflow-image-common/resources/scripts/versions_manager.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+#
+# 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.
+#
+
+#Script responsible to update the tests with
+#Should be run from root directory of the repository
+#Sample usage:  python3 scripts/retrieve_version.py
+
+import sys
+import argparse
+import common
+import re
+
+sys.dont_write_bytecode = True
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Kie Tools - SWF Image Version Manager')
+    parser.add_argument('--bump-to', dest='bump_to', help='Bump all images and yamls to the next version')
+    parser.add_argument('--source-folder', dest='source_folder')
+    parser.add_argument('--quarkus-version', dest='quarkus_version', help='Sets the image Quarkus Version')
+    parser.add_argument('--kogito-version', dest='kogito_version', help='Sets the image Kogito Version')
+    parser.add_argument('--sonataflow-quarkus-devui-version', dest='sonataflow_quarkus_devui_version', help='Sets the image SonataFlow Quarkus DevUI Version', required=False)
+
+    args = parser.parse_args()
+
+    if args.bump_to is None and args.kogito_version is None and args.quarkus_version is None:
+        print(parser.print_usage())
+    else:
+        if args.bump_to is not None:
+            common.update_image_and_modules_version(args.bump_to, args.source_folder)
+        if args.kogito_version is not None:
+            common.update_kogito_platform_version(args.kogito_version)
+        if args.quarkus_version is not None:
+            common.update_quarkus_platform_version(args.quarkus_version)
+        if args.sonataflow_quarkus_devui_version is not None:
+            common.update_sonataflow_quarkus_devui_version(args.sonataflow_quarkus_devui_version)
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/tests/shell/README.md b/packages/sonataflow-image-common/resources/tests/shell/README.md
new file mode 100644
index 00000000000..c330c3b8ec6
--- /dev/null
+++ b/packages/sonataflow-image-common/resources/tests/shell/README.md
@@ -0,0 +1,36 @@
+<!--
+   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.
+-->
+
+# Tests in Shell
+
+## Running Tests With JBang
+
+- Install JBang
+- Install VSCode Red Hat's Java plugin
+- Install VSCode JBang plugin
+
+The `run.sh` should be used to run the tests since it must set a few env vars. To run from your terminal, try:
+
+```shell
+tests/shell/run.sh sonataflow-devmode docker.io/apache/sonataflow-devmode:999-20240620-SNAPSHOT
+```
+
+The first argument is the test case to run and the second, the image.
+
+Under the hood, it uses [Junit's Console Launcher](https://junit.org/junit5/docs/current/user-guide/#running-tests-console-launcher) tool to run the tests from the command line.
+
+Update this file with new findings, and don't remove the `.vscode` folder. It's useful to run JBang from the IDE.
diff --git a/tests/shell/run.sh b/packages/sonataflow-image-common/resources/tests/shell/run.sh
similarity index 100%
rename from tests/shell/run.sh
rename to packages/sonataflow-image-common/resources/tests/shell/run.sh
diff --git a/scripts/README.md b/scripts/README.md
deleted file mode 100644
index 17077cf5273..00000000000
--- a/scripts/README.md
+++ /dev/null
@@ -1,191 +0,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.
-  -->
-
-### Kogito helper scripts
-
-On this directory you can find some python scripts used to help with some repetitive tasks.
-
-Today we have these scripts:
-
-- [common.py](common.py)
-- [list-images.py](list-images.py)
-- [manage-kogito-version.py](manage-kogito-version.py)
-- [push-local-registry.sh](push-local-registry.sh)
-- [push-staging.py](push-staging.py)
-- [run-bats.sh](run-bats.sh)
-- [update-repository.py](update-repository.py)
-
-
-### Common script
-
-The `common.py` script defines some common functions for the scripts.
-
-
-### List Images Script
-
-Utilitary script used to retrieve all images that can be built on this repo, there is possible to retrieve
-the community image list:
-
-```bash
-$ python list-images.py
-```
-
-### Managing Kogito images version script
-
-The manage-kogito-version script will help when we need to update the current version due a new release.
-
-#### Script dependencies
-
-The `manage-kogito-version.py` has one dependency that needs to be manually installed:
-
-```bash
-$ pip install -U ruamel.yaml
-```
-
-This script has also a dependency on `common.py`.
-
-#### Usage
-
-Its default behavior is pretty simple:
-
-```bash
-$ python manage-kogito-version.py --bump-to 1.0.0  
-```
-
-This will set images' version, artifacts reference version and examples reference to 1.0.0.
-
-You can also set a custom version for artifacts and/or a custom reference to the kogito-examples repository:
-
-```bash
-$ python manage-kogito-version.py --bump-to 0.10.2 --artifacts-version 0.10.5 --examples-ref 0.10.x
-```
-
-The command above will update all the needed files to the given version(s).  
-These changes include updates on
-
- - all cekit modules
- - *-image.yaml files descriptor for each container image
- - kogito-imagestream.yaml
- - tests files for default values
- 
-
-### Pushing Images to a local registry
-
-This script will help you while building images and test in a local OpenShift Cluster. It requires you to already have
-images built in your local registry with the tag following the patter: X.Z, e.g. 0.10:
-
-```text
-docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:0.10
-```
-
-The [Makefile](../Makefile) has an option to do it, it can be invoked as the following sample:
-
-```bash
-$ make push-local-registry REGISTRY=docker-registry-default.apps.test.cloud NS=test-1
-```
-
-Where **NS** stands for the namespace where the images will be available.
-
-To execute the script directly:
-
-```bash
-$ /bin/sh scripts/push-local-registry.sh my_registry_address 0.10 my_namespace
-```
-
-### Pushing staging images
-
-Staging images are the release candidates which are pushed mainly after big changes that has direct impact on how
-the images will behave and also when new functionality is added.
-
-The script updates the version on:
-
-- all cekit modules
-- *-image.yaml files descriptor for each container image
-- kogito-imagestream.yaml
-
-
-#### Script dependencies
-
-The `push-staging.py` has a few dependencies that probably needs to be manually installed:
-
-```bash
-$ pip install -U docker yaml
-$ pip install -U ruamel.yaml
-```
-
-#### Usage
-
-This script is called as the last step of the `make push-staging` command defined on the [Makefile](../Makefile).
-
-It will look for the current RC images available on [quay.io](https://quay.io/organization/kiegroup) to increase the rc tag 
-accordingly then push the new tag so it can be tested by others. 
-If there is no need to update the tag, there is the option to override it, just set the flag "-o".
-
-
-### Update tests script
-
-The `update-repository` script allows you to change some build & test information in the repository.
-
-#### Script dependencies
-
-The `update-repository.py` has some dependencies that needs to be manually installed:
-
-```bash
-$ pip install -U ruamel.yaml
-```
-
-#### Usage
-
-##### Update repository url
-
-```bash
-$ python update-repository.py --repo-url 'https://maven-repository.mirror.com/public'
-```
-
-This will add this repository as an extra repository for artifacts to be retrieved from into the behave tests, next to the default JBoss repository.
-
-You can also completely replace the main Jboss repository:
-
-```bash
-$ python update-repository.py --repo-url 'https://maven-repository.mirror.com/public' --replace-jboss-repo
-```
-
-##### Update artifacts version
-
-```bash
-$ python update-repository.py --artifacts-version 1.0.0
-```
-
-This will set the default artifacts version.
-
-##### Update quarkus version
-
-```bash
-$ python update-repository.py --quarkus-platform-version 3.8.6
-```
-
-This will set the image quarkus version to 3.8.6.
-
-##### Update Examples URI and Ref
-
-```bash
-$ python update-repository.py --examples-uri https://github.com/<yournamespace>/kogito-examples --examples-ref 1.0.0
-```
-
-This will update the examples uri and/or the ref for the tests.
diff --git a/scripts/common.py b/scripts/common.py
deleted file mode 100644
index e65129542f1..00000000000
--- a/scripts/common.py
+++ /dev/null
@@ -1,631 +0,0 @@
-#!/usr/bin/python
-#
-# 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.
-#
-
-# This script defines some common function that are used by manage-kogito-version.py and push-staging.py script
-
-
-import os
-import re
-
-from ruamel.yaml import YAML
-
-MODULE_FILENAME = "module.yaml"
-MODULES_DIR = "modules"
-
-COMMUNITY_PREFIX = 'kogito-'
-
-# imagestream file that contains all images, this file aldo needs to be updated.
-PROJECT_VERSIONS_MODULE = "modules/kogito-project-versions/module.yaml"
-IMAGE_STREAM_FILENAME = "kogito-imagestream.yaml"
-KOGITO_VERSION_ENV_KEY = "KOGITO_VERSION"
-KOGITO_VERSION_LABEL_NAME = "org.kie.kogito.version"
-
-QUARKUS_PLATFORM_VERSION_ENV_KEY = "QUARKUS_PLATFORM_VERSION"
-QUARKUS_PLATFORM_VERSION_LABEL_NAME = "io.quarkus.platform.version"
-
-# behave tests that needs to be updated
-BEHAVE_BASE_DIR = 'tests/features'
-
-CLONE_REPO_SCRIPT = 'tests/test-apps/clone-repo.sh'
-SETUP_MAVEN_SCRIPT = 'scripts/setup-maven.sh'
-
-SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral",
-                              "kogito-data-index-postgresql",
-                              "kogito-jit-runner", "kogito-jobs-service-ephemeral",
-                              "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone",
-                              }
-
-# Temporary removal of sonataflow-* images that have been moved to kie-tools for the Apache 10 release
-SWF_BUILDER_IMAGES = {"kogito-base-builder"}
-
-
-def yaml_loader():
-    """
-    default yaml Loader
-    :return: yaml object
-    """
-    yaml = YAML()
-    yaml.preserve_quotes = True
-    yaml.width = 1024
-    yaml.indent(mapping=2, sequence=4, offset=2)
-    return yaml
-
-
-def update_community_images_version(target_version):
-    """
-    Update image.yml files version tag.
-    :param target_version: version used to update
-    """
-    for img in sorted(get_community_images()):
-        update_image_version_tag_in_yaml_file(target_version, "{}-image.yaml".format(img))
-
-
-def update_image_version_tag_in_yaml_file(target_version, yaml_file):
-    """
-    Update root version tag in yaml file.
-    :param target_version: version to set
-    :param yaml_file: yaml file to update
-    """
-    print("Updating Image main file version from file {0} to version {1}".format(yaml_file, target_version))
-    try:
-        with open(yaml_file) as image:
-            data = yaml_loader().load(image)
-            update_field_in_dict(data, 'version', target_version)
-
-        with open(yaml_file, 'w') as image:
-            yaml_loader().dump(data, image)
-    except TypeError as err:
-        print("Unexpected error:", err)
-
-def update_image_stream(target_version):
-    """
-    Update the imagestream file, it will update the tag name, version and image tag.
-    :param target_version: version used to update the imagestream file;
-    """
-    image_stream_filename = IMAGE_STREAM_FILENAME
-    print("Updating ImageStream images version from file {0} to version {1}".format(image_stream_filename,
-                                                                                    target_version))
-    try:
-        with open(image_stream_filename) as imagestream:
-            data = yaml_loader().load(imagestream)
-            for item_index, item in enumerate(data['items'], start=0):
-                for tag_index, tag in enumerate(item['spec']['tags'], start=0):
-                    data['items'][item_index]['spec']['tags'][tag_index]['name'] = target_version
-                    data['items'][item_index]['spec']['tags'][tag_index]['annotations']['version'] = target_version
-                    image_dict = str.split(data['items'][item_index]['spec']['tags'][tag_index]['from']['name'], ':')
-                    # image name + new version
-                    updated_image_name = image_dict[0] + ':' + target_version
-                    data['items'][item_index]['spec']['tags'][tag_index]['from']['name'] = updated_image_name
-
-        with open(image_stream_filename, 'w') as imagestream:
-            yaml_loader().dump(data, imagestream)
-
-    except TypeError:
-        raise
-
-
-def get_all_module_dirs():
-    """
-    Retrieve the module directories
-    """
-    modules = []
-
-    # r=>root, d=>directories, f=>files
-    for r, d, f in os.walk(MODULES_DIR):
-        for item in f:
-            if MODULE_FILENAME == item:
-                modules.append(os.path.dirname(os.path.join(r, item)))
-
-    return modules
-
-def get_community_module_dirs():
-    """
-    Retrieve the Kogito module directories
-    """
-    community_modules = []
-    for module_path in get_all_module_dirs():
-        if "{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(COMMUNITY_PREFIX):
-            community_modules.append(module_path)
-
-    return community_modules
-
-
-def get_images(prefix):
-    """
-    Retrieve the Kogito images' files
-    """
-    images = []
-
-    # r=>root, d=>directories, f=>files
-    for r, d, f in os.walk("."):
-        for item in f:
-            if re.compile(r'.*-image.yaml').match(item):
-                if item.startswith(prefix):
-                    images.append(item.replace("-image.yaml", ''))
-
-    return images
-
-
-def get_community_images():
-    """
-    Retrieve the Community images' names
-    """
-    return get_images(COMMUNITY_PREFIX)
-
-
-def get_supporting_services_images():
-    """
-    Retrieve the Supporting Services images' names
-    """
-    return SUPPORTING_SERVICES_IMAGES
-
-
-def is_supporting_services_or_swf_builder(image_name):
-    """
-    Raise an error if the given image is not a supporting service
-    """
-    found = False
-    if image_name not in SUPPORTING_SERVICES_IMAGES and image_name not in SWF_BUILDER_IMAGES:
-        raise RuntimeError('{} is not a supporting service or a swf builder image.'.format(image_name))
-
-
-def get_swf_builder_images():
-    """
-    Raise an error if the given image is not a supporting service
-    """
-    return SWF_BUILDER_IMAGES
-
-
-def retrieve_version():
-    """
-    Retrieve the project version from project data file
-    """
-    return get_project_versions_module_data()['version']
-
-
-def get_project_versions_module_data():
-    """
-    Get a specific field value from project versions module file
-    :param field_name: Field to search for
-    """
-    try:
-        project_versions_module_file = os.path.join(PROJECT_VERSIONS_MODULE)
-        with open(project_versions_module_file) as project_versions_data:
-            return yaml_loader().load(project_versions_data)
-
-    except TypeError:
-        raise
-
-
-def update_kogito_modules_version(target_version):
-    """
-    Update every Kogito module.yaml to the given version.
-    :param target_version: version used to update all Kogito module.yaml files
-    """
-    modules = []
-    current_version = retrieve_version()
-    modules = get_community_module_dirs()
-
-    for module_dir in modules:
-        update_kogito_module_version(module_dir, current_version, target_version)
-
-
-def update_kogito_module_version(module_dir, old_version, target_version):
-    """
-    Set Kogito module.yaml to given version.
-    :param module_dir: directory where cekit modules are hold
-    :param target_version: version to set into the module
-    """
-    try:
-        module_file = os.path.join(module_dir, "module.yaml")
-        with open(module_file) as module:
-            data = yaml_loader().load(module)
-            if data['version'] == old_version:
-                print(
-                    "Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
-                data['version'] = target_version
-
-        with open(module_file, 'w') as module:
-            yaml_loader().dump(data, module)
-
-    except TypeError:
-        raise
-
-def update_quarkus_platform_version_in_build(quarkus_platform_version):
-    """
-    Update quarkus_platform_version version into images/modules
-    :param quarkus_platform_version: quarkus version to set
-    """
-    update_env_value(QUARKUS_PLATFORM_VERSION_ENV_KEY, quarkus_platform_version)
-    update_label_value(QUARKUS_PLATFORM_VERSION_LABEL_NAME, quarkus_platform_version)
-
-def update_quarkus_platform_version_in_behave_tests_repository_paths(quarkus_platform_version):
-    """
-    Update quarkus_platform_version version into behave tests repository paths
-    :param quarkus_platform_version: quarkus version to set
-    """
-    print("Set quarkus_platform_version {} in behave tests as repository path".format(quarkus_platform_version))
-    # pattern to change the KOGITO_VERSION
-    pattern = re.compile(
-        'io/quarkus/platform/quarkus-bom/([\d.]+.Final)/quarkus-bom-([\d.]+.Final).pom')
-    replacement = 'io/quarkus/platform/quarkus-bom/{}/quarkus-bom-{}.pom'.format(quarkus_platform_version, quarkus_platform_version)
-    update_in_behave_tests(pattern, replacement)
-
-def update_examples_ref_in_behave_tests(examples_ref):
-    """
-    Update examples git reference into behave tests
-    :param examples_ref: kogito-examples reference
-    """
-    print("Set examples_ref {} in behave tests".format(examples_ref))
-    # this pattern will look for any occurrences of using nightly-main or using nightly-x.x.x or using x.x.x
-    pattern = re.compile(r'(using nightly-main)|(using nightly-\s*([\d.]+.x))|(using \s*([\d.]+[.x]?))')
-    replacement = 'using {}'.format(examples_ref)
-    update_in_behave_tests(pattern, replacement)
-
-
-def update_examples_uri_in_behave_tests(examples_uri):
-    """
-    Update examples uri into behave tests
-    :param examples_uri: kogito-examples uri
-    """
-    print("Set examples_uri {} in behave tests".format(examples_uri))
-    # pattern to get the default examples uri
-    pattern = re.compile(r'(https://github.com/apache/incubator-kie-kogito-examples.git)')
-    replacement = examples_uri
-    update_in_behave_tests(pattern, replacement)
-
-def update_artifacts_version_in_build(artifacts_version):
-    """
-    Update artifacts version into modules / images
-    :param artifacts_version: artifacts version to set
-    """
-    update_env_value(KOGITO_VERSION_ENV_KEY, artifacts_version)
-    update_label_value(KOGITO_VERSION_LABEL_NAME, artifacts_version)
-
-def update_artifacts_version_in_behave_tests(artifacts_version):
-    """
-    Update artifacts version into behave tests
-    :param artifacts_version: artifacts version to set
-    """
-    print("Set artifacts_version {} in behave tests".format(artifacts_version))
-    # pattern to change the KOGITO_VERSION
-    pattern = re.compile(
-        '\|[\s]*KOGITO_VERSION[\s]*\|[\s]*(([\d.]+.x)|([\d.]+)[\s]*|([\d.]+-SNAPSHOT)|([\d.]+.Final)|([\d.]+\.redhat-[\d]+))[\s]*\|')
-    replacement = '| KOGITO_VERSION | {} | '.format(artifacts_version)
-    update_in_behave_tests(pattern, replacement)
-
-def update_maven_repo_in_behave_tests(repo_url, replace_default_repository):
-    """
-    Update maven repository into behave tests
-    :param repo_url: Maven repository url
-    :param replace_default_repository: Set to true if default repository needs to be overriden
-    """
-    print("Set maven repo {} in behave tests".format(repo_url))
-    pattern = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
-    env_var_key = "MAVEN_REPO_URL"
-    if replace_default_repository:
-        env_var_key = "DEFAULT_MAVEN_REPO_URL"
-    replacement = "| variable | value |\n      | {} | {} |".format(env_var_key,
-                                                                                                           repo_url)
-    update_in_behave_tests(pattern, replacement)
-
-
-def update_maven_mirror_url_in_build_config(mirror_url):
-    """
-    Update maven mirror url into behave tests
-    :param repo_url: Maven mirror url
-    """
-    update_env_value_in_build_config_modules('MAVEN_MIRROR_URL', mirror_url, True)
-
-def update_maven_mirror_url_in_quarkus_plugin_behave_tests(mirror_url):
-    """
-    Update maven mirror url into behave tests
-    :param repo_url: Maven mirror url
-    """
-    print("Set maven repo {} in quarkus plugin behave tests".format(mirror_url))
-    pattern = re.compile(
-        '(Kogito Maven archetype.*(?<!springboot)\r?\n\s*Given.*\r?\n\s*)\|\s*variable[\s]*\|[\s]*value[\s]*\|')
-    replacement = "\g<1>| variable | value |\n      | {} | {} |\n      | MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE | true |\n      | DEBUG | true |".format(
-        "MAVEN_MIRROR_URL", mirror_url)
-    update_in_behave_tests(pattern, replacement)
-
-def update_maven_repo_env_value(repo_url, replace_default_repository):
-    """
-    Update the given maven repository value for all images/modules.
-    :param repo_url: Maven repository url
-    :param replace_default_repository: Set to true if default repository needs to be overidden
-    """
-    env_name = "MAVEN_REPO_URL"
-    if replace_default_repository:
-        env_name = "DEFAULT_MAVEN_REPO_URL"
-    update_env_value(env_name, repo_url)
-
-
-def ignore_maven_self_signed_certificate_in_behave_tests():
-    """
-    Sets the environment variable to ignore the self-signed certificates in maven
-    """
-    print("Setting MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE env in behave tests")
-    pattern = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
-    replacement = "| variable | value |\n      | MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE | true |"
-    update_in_behave_tests(pattern, replacement)
-
-
-def update_in_behave_tests(pattern, replacement):
-    """
-    Update all behave tests files
-    :param pattern: Pattern to look for into file
-    :param replacement: What to put instead if pattern found
-    """
-    for f in os.listdir(BEHAVE_BASE_DIR):
-        if f.endswith('.feature'):
-            update_in_file(os.path.join(BEHAVE_BASE_DIR, f), pattern, replacement)
-
-
-def update_examples_ref_in_clone_repo(examples_ref):
-    """
-    Update examples git reference into clone-repo.sh script
-    :param examples_ref: kogito-examples reference
-    """
-    print("Set examples_ref {} in clone-repo script".format(examples_ref))
-    pattern = re.compile(r'(git checkout.*)')
-    replacement = "git checkout main"
-    if examples_ref != 'main':
-        replacement = "git checkout -b {0}".format(examples_ref)
-    update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
-
-
-def update_examples_uri_in_clone_repo(examples_uri):
-    """
-    Update examples uri into clone-repo.sh script
-    :param examples_uri: kogito-examples uri
-    """
-    print("Set examples_uri {} in clone-repo script".format(examples_uri))
-    pattern = re.compile(r'(git clone \S+)')
-    replacement = "git clone {}".format(examples_uri)
-    update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
-
-def update_maven_repo_in_build_config(repo_url, replace_default_repository):
-    """
-    Update maven repository in build config modules
-    :param repo_url: Maven repository url
-    :param replace_default_repository: Set to true if default repository needs to be overridden
-    """
-    maven_env_name = 'MAVEN_REPO_URL'
-    if replace_default_repository:
-        maven_env_name = 'DEFAULT_MAVEN_REPO_URL'
-    update_env_value_in_build_config_modules(maven_env_name, repo_url, True)
-
-def update_maven_repo_in_setup_maven(repo_url, replace_default_repository):
-    """
-    Update maven repository into setup-maven.sh script
-    :param repo_url: Maven repository url
-    :param replace_default_repository: Set to true if default repository needs to be overridden
-    """
-    print("Set maven repo {} in setup-maven script".format(repo_url))
-    pattern = ""
-    replacement = ""
-    if replace_default_repository:
-        pattern = re.compile(r'(export DEFAULT_MAVEN_REPO_URL=.*)')
-        replacement = 'export DEFAULT_MAVEN_REPO_URL="{}"'.format(repo_url)
-    else:
-        pattern = re.compile(r'(# export MAVEN_REPO_URL=.*)')
-        replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
-    update_in_file(SETUP_MAVEN_SCRIPT, pattern, replacement)
-
-def update_env_value(env_name, env_value):
-    """
-    Update environment value into the given yaml module/image file
-    :param env_name: environment variable name to update
-    :param env_value: value to set
-    """
-
-    images = []
-    modules = []
-    images = get_community_images()
-    modules = get_community_module_dirs()
-
-    for image_name in images:
-        image_filename = "{}-image.yaml".format(image_name)
-        update_env_value_in_file(image_filename, env_name, env_value)
-
-    for module_dir in modules:
-        module_file = os.path.join(module_dir, "module.yaml")
-        update_env_value_in_file(module_file, env_name, env_value)
-
-def update_env_value_in_file(filename, env_name, env_value):
-    """
-    Update environment value into the given yaml module/image file
-    :param filename: filename to update
-    :param env_name: environment variable name to update
-    :param env_value: value to set
-    """
-    print("Updating {0} label {1} with value {2}".format(filename, env_name, env_value))
-    try:
-        with open(filename) as yaml_file:
-            data = yaml_loader().load(yaml_file)
-            update_env_value_in_data(data, env_name, env_value)
-
-        with open(filename, 'w') as yaml_file:
-            yaml_loader().dump(data, yaml_file)
-
-    except TypeError:
-        raise
-
-
-def update_env_value_in_data(data, env_name, env_value, ignore_empty = False):
-    """
-    Update environment variable value in data dict if exists
-    :param data: dict to update
-    :param env_name: environment variable name
-    :param env_value: environment variable value to set
-    :param ignore_empty: Whether previous value should be present to set the new value
-    """
-    if isinstance(data, list):
-        for data_item in data:
-            update_env_value_in_data(data_item, env_name, env_value, ignore_empty)
-    else:
-        if ignore_empty:
-            if 'envs' not in data:
-                data['envs'] = []
-            data['envs'] += [ dict(name=env_name, value=env_value) ]
-        elif 'envs' in data:
-            for _, env in enumerate(data['envs'], start=0):
-                if env['name'] == env_name:
-                    update_field_in_dict(env, 'value', env_value, ignore_empty)
-
-
-def update_env_value_in_build_config_modules(env_name, new_value, ignore_empty = False):
-    """
-    Update environment variable in build config modules
-    :param env_name: Environment variable to lookup
-    :param new_value: New value to set
-    :param ignore_empty: Whether previous value should be present to set the new value
-    """
-    print("Updating env value {0} into build config modules")
-    for module_dir in get_all_module_dirs():
-        try:
-            module_file = os.path.join(module_dir, "module.yaml")
-            with open(module_file) as module:
-                data = yaml_loader().load(module)
-                print(data['name'])
-                if data['name'].endswith('build-config'):
-                    print(
-                        "Updating module {0} maven repo env {1} to {2}".format(data['name'], env_name, new_value))
-                    update_env_value_in_data(data, env_name, new_value, ignore_empty)
-
-            with open(module_file, 'w') as module:
-                yaml_loader().dump(data, module)
-
-        except TypeError:
-            raise
-
-def update_label_value(label_name, label_value):
-    """
-    Update label value in all module / image files
-    :param label_name: label name to update
-    :param label_value: value to set
-    """
-
-    images = []
-    modules = []
-    images = get_community_images()
-    modules = get_community_module_dirs()
-
-    for image_name in images:
-        image_filename = "{}-image.yaml".format(image_name)
-        update_label_value_in_file(image_filename, label_name, label_value)
-
-    for module_dir in modules:
-        module_file = os.path.join(module_dir, "module.yaml")
-        update_label_value_in_file(module_file, label_name, label_name)
-
-def update_label_value_in_file(filename, label_name, label_value):
-    """
-    Update label value into the given yaml module/image file
-    :param filename: filename to update
-    :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))
-    try:
-        with open(filename) as yaml_file:
-            data = yaml_loader().load(yaml_file)
-            update_label_value_in_data(data, label_name, label_value)
-
-        with open(filename, 'w') as yaml_file:
-            yaml_loader().dump(data, yaml_file)
-
-    except TypeError:
-        raise
-
-
-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
-    :param label_name: label name
-    :param label_value: label value to set
-    :param ignore_empty: Whether previous value should be present to set the new value
-    """
-    if isinstance(data, list):
-        for data_item in data:
-            update_label_value_in_data(data_item, label_name, label_value, ignore_empty)
-    else:
-        if ignore_empty:
-            if 'labels' not in data:
-                data['labels'] = []
-            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:
-                    update_field_in_dict(label, 'value', label_value, ignore_empty)
-
-
-def ignore_maven_self_signed_certificate_in_build_config():
-    """
-    Sets the environment variable to ignore the self-signed certificates in build config modules
-    """
-    update_env_value_in_build_config_modules('MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE', 'true', True)
-
-
-def ignore_maven_self_signed_certificate_in_setup_maven():
-    """
-    Sets the environment variable to ignore the self-signed certificates in maven
-    """
-    print("Setting MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE env in setup maven")
-    pattern = re.compile(r'(# MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=.*)')
-    replacement = "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true"
-    update_in_file(SETUP_MAVEN_SCRIPT, pattern, replacement)
-
-
-def update_in_file(file, pattern, replacement):
-    """
-    Update in given file
-    :param file: file to update
-    :param pattern: Pattern to look for into file
-    :param replacement: What to put instead if pattern found
-    """
-    with open(file) as fe:
-        updated_value = pattern.sub(replacement, fe.read())
-    with open(file, 'w') as fe:
-        fe.write(updated_value)
-
-def update_field_in_dict(data, key, new_value, ignore_empty = False):
-    """
-    Update version field in given data dict
-    :param data: dictionary to update
-    :param key: key to lookup
-    :param new_value: value to set
-    :param ignore_empty: Whether previous value should be present to set the new value
-    """
-    if isinstance(data, list):
-        for data_item in data:
-            update_field_in_dict(data_item, key, new_value, ignore_empty)
-    else:
-        if ignore_empty or key in data:
-            data[key] = new_value
-        else:
-            print("Field " + key + " not found, returning...")
-
-if __name__ == "__main__":
-    print("Community modules:")
-    for m in get_community_module_dirs():
-        print("module {}".format(m))
diff --git a/scripts/list-images.py b/scripts/list-images.py
deleted file mode 100644
index 9d77880cd99..00000000000
--- a/scripts/list-images.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-#
-# 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.
-#
-
-# Script responsible to update the tests with
-# Should be run from root directory of the repository
-
-
-import argparse
-import sys
-
-import common
-
-sys.tracebacklimit = 0
-sys.dont_write_bytecode = True
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(
-        description='Kogito Version Manager - List Images by Community and Product version')
-    parser.add_argument('--swf-builder', default=False, action='store_true', help='List swf builder images')
-    parser.add_argument('-s', '--supporting-services', default=False, action='store_true',
-                        help='List Supporting Services images')
-    parser.add_argument('-is', '--is_supporting_services_or_swf_builder', default=False, type=str,
-                        help='Query the given supporting service or swf builder image, if not found raise exception.')
-
-    args = parser.parse_args()
-
-    images = []
-    if args.is_supporting_services_or_swf_builder:
-        common.is_supporting_services_or_swf_builder(args.is_supporting_services_or_swf_builder)
-    elif args.supporting_services:
-        images = common.get_supporting_services_images()
-    elif args.swf_builder:
-        images = common.get_swf_builder_images()
-    else:
-        images = common.get_community_images()
-
-    for img in sorted(images):
-        print(img)
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
deleted file mode 100644
index 733d94a7492..00000000000
--- a/scripts/manage-kogito-version.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env python
-#
-# 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.
-#
-
-# This script will be responsible to help to manage kogito images and modules version, it will update all needed files
-# Example of usage:
-#   # move the current version to the next one or rcX
-#   python scripts/manage-kogito-version.py --bump-to 0.99.0
-#
-#   # to set a custom kogito-examples branch for the behave tests different than the defaults (sam than the version
-#   # or main for rc) use --branch-apps parameters, e.g.:
-#   python scripts/manage-kogito-version.py --bump-to 0.99.0 --apps-branch 0.10.x
-#
-# Dependencies:
-#  ruamel.yaml
-
-import sys
-import argparse
-import common
-import re
-
-sys.dont_write_bytecode = True
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Kogito Version Manager')
-    parser.add_argument('--bump-to', dest='bump_to', help='bump everything to the next version')
-    parser.add_argument('--artifacts-version', dest='artifacts_version',
-                        help='update the artifacts version in modules/tests. Default is equal to bump-to')
-    parser.add_argument('--examples-ref', dest='examples_ref',
-                        help='Update Behave tests to use the desired branch for kogito-examples')
-    parser.add_argument('--confirm', default=False, action='store_true', help='To confirm automatically the setup')
-
-    args = parser.parse_args()
-
-    if args.bump_to:
-        # validate if the provided version is valid.
-        # e.g. 1.10.0, 10.0.x, 1.0.0-rc1, 999-snapshot or 999-20240101-snapshot
-        pattern = r'(\d+.\d+.)?(x$|\d+$|\d+-rc\d+$|\d+(-\d{8})?-snapshot$)'
-        regex = re.compile(pattern, re.IGNORECASE)
-        valid = regex.match(args.bump_to)
-        examples_ref = ""
-        if valid:
-            examples_ref = args.bump_to
-            if args.examples_ref is not None:
-                examples_ref = args.examples_ref
-            if 'rc' in args.bump_to:
-                examples_ref = 'main'
-
-            artifacts_version = args.bump_to
-            if args.artifacts_version:
-                artifacts_version = args.artifacts_version
-
-            print("Images version will be updated to {0}".format(args.bump_to))
-            print("Artifacts version will be updated to {0}".format(artifacts_version))
-            print("Examples ref will be updated to {}".format(examples_ref))
-
-            if not args.confirm:
-                input("Is the information correct? If so press any key to continue...")
-
-            # modules
-            common.update_kogito_modules_version(args.bump_to) # Need to be done before updating the project data version
-            common.update_community_images_version(args.bump_to)
-            common.update_image_stream(args.bump_to)
-            common.update_artifacts_version_in_build(artifacts_version)
-
-            # tests default values
-            common.update_examples_ref_in_behave_tests(examples_ref)
-            common.update_examples_ref_in_clone_repo(examples_ref)
-            common.update_artifacts_version_in_behave_tests(artifacts_version)
-        else:
-            print("Provided version {0} does not match the expected regex - {1}".format(args.bump_to, pattern))
-    else:
-        print(parser.print_usage())
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
deleted file mode 100644
index ce9672b337d..00000000000
--- a/scripts/push-local-registry.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-# Simple usage: /bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}
-
-BUILD_ENGINE="docker"
-
-registry=${REGISTRY:-{1}}
-version=${2:-latest}
-namespace=${3:-openshift}
-
-if [ "${registry}x" == "x"  ]; then
-    echo "No registry provided, please set the env REGISTRY or set it as parameter to this script"
-    echo "Simple usage: /bin/sh scripts/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS}"
-    exit 1
-fi
-if [ "${version}" == "latest"  ]; then
-    echo "No version provided, latest will be used"
-fi
-if [ "${namespace}" == "openshift"  ]; then
-    echo "No namespace provided, images will be installed on openshift namespace"
-fi
-
-echo "Images version ${version} will be pushed to registry ${registry}"
-
-while read image; do
-    echo "tagging image ${image} to ${registry}/${namespace}/${image}:${version}"
-    ${BUILD_ENGINE} tag docker.io/apache/incubator-kie-${image}:${version} ${registry}/${namespace}/${image}:${version}
-    echo "Deleting imagestream ${image} if exists `oc delete oc -n ${namespace} ${image}`"
-    ${BUILD_ENGINE} push ${registry}/${namespace}/${image}:${version}
-done <<<$(python scripts/list-images.py)
-
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
deleted file mode 100644
index de30a74410e..00000000000
--- a/scripts/push-staging.py
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/env python
-#
-# 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.
-#
-
-# This script will be responsible to fetch the latest rc tags from each image and define the next
-# rc tag to avoid images get overridden.
-#
-# Requires QUAY_TOKEN env to be set.
-# export QUAY_TOKEN=XXXXX
-# this token can be retrieved from https://quay.io/repository/kiegroup
-#
-import sys
-
-sys.dont_write_bytecode = True
-
-import docker
-import os
-import requests
-import yaml
-import common
-import argparse
-
-IMAGES_NEXT_RC_TAG = []
-QUAY_KOGITO_ORG_PLACE_HOLDER = "docker.io/apache/incubator-kie-{}:{}"
-QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG = "docker.io/apache/incubator-kie-{}"
-
-
-def find_next_tag(override_tags):
-    """
-    Populate the IMAGES_NEXT_RC_TAGS with the next rc tag for each image.
-    """
-    global IMAGES_NEXT_RC_TAG
-    for image in common.get_community_images():
-        tag = fetch_tag(image, override_tags)
-        print("Next tag for image %s is %s" % (image, tag))
-        IMAGES_NEXT_RC_TAG.append('{}:{}'.format(image, tag))
-
-
-def fetch_tag(image, override_tags):
-    """
-    fetch the rcX tag for the given image, keep increasing until no rc tag is found
-    then return the next tag to be used.
-    :param image: image to be verified
-    :param override_tags: if true, does not increase the rc-X tag
-    :return: the next rc tag if override_tags is false.
-    """
-    version = find_current_rc_version()
-    while True:
-        url = 'https://quay.io/api/v1/repository/kiegroup/{}/tag/{}/images'.format(image, version)
-        print("Defining latest rc tag for image %s with url %s" % (image, url))
-        authorization = 'Bearer %s'.format(os.environ['QUAY_TOKEN'])
-        headers = {'content-type': 'application/json', 'Authorization': authorization}
-        response = requests.get(url, headers=headers)
-        if response.status_code == 404:
-            return version
-        else:
-            if override_tags:
-                # increase number
-                current_number = version[-1]
-                print("Image found, current rc tag number is %s, increasing..." % current_number)
-            version = get_next_rc_version(version, override_tags)
-
-
-def tag_and_push_images():
-    """
-    tag and push the images to quay.io
-    """
-    cli = docker.client.from_env()
-    current_version = common.retrieve_version()
-    print("New rc tags %s" % IMAGES_NEXT_RC_TAG)
-    if '-rc' not in current_version:
-        for next_tag in IMAGES_NEXT_RC_TAG:
-            iname = str.split(next_tag, ':')[0]
-            iversion_next_tag = str.split(next_tag, ':')[1]
-            iname_tag = QUAY_KOGITO_ORG_PLACE_HOLDER.format(iname, current_version)
-            try:
-                print("Tagging image %s as %s" % (iname_tag, iversion_next_tag))
-                cr_tag = QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG.format(iname)
-                cli.images.get(iname_tag).tag(cr_tag, iversion_next_tag)
-                print("Trying to push %s:%s" % (cr_tag, iversion_next_tag))
-                cli.images.push(cr_tag, iversion_next_tag)
-                print("Pushed")
-            except:
-                raise
-
-    else:
-        # if rc is already on the image version, just tag if needed and push it
-        for next_tag in IMAGES_NEXT_RC_TAG:
-            iname = str.split(next_tag, ':')[0]
-            iversion_next_tag = str.split(next_tag, ':')[1]
-            iname_tag = QUAY_KOGITO_ORG_PLACE_HOLDER.format(iname, current_version)
-            cr_tag = QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG.format(iname)
-            try:
-                if iversion_next_tag != common.retrieve_version():
-                    print("Tagging image %s as %s" % (iname_tag, iversion_next_tag))
-                    cli.images.get(iname_tag).tag(cr_tag, iversion_next_tag)
-
-                print("Trying to push %s:%s" % (cr_tag, iversion_next_tag))
-                cli.images.push(cr_tag, iversion_next_tag)
-            except:
-                raise
-
-def find_current_rc_version():
-    """
-    If the current version already includes the rc tag, keep it, otherwise add it -rc1 tag.
-    :return: the current image tag version
-    """
-    version = common.retrieve_version()
-    if '-rc' in version:
-        current_image_version = version
-    else:
-        current_image_version = version + '-rc1'
-    return current_image_version
-
-
-def get_next_rc_version(current_rc_version, override_tags):
-    """
-    After finding the current rc tag of the image, adds one to it
-    e.g: 0.10.0-rc1 will returned as 0.10.0-rc2
-    :param current_rc_version: takes the current rc version of the image as input
-    :param override_tags: override image tags
-    :return: returns the next rc version of the image
-    """
-    return current_rc_version if override_tags else (
-                current_rc_version.split("rc")[0] + "rc" + str(int(current_rc_version.split("rc")[1]) + 1))
-
-
-if __name__ == "__main__":
-    if 'QUAY_TOKEN' not in os.environ:
-        print("Env QUAY_TOKEN not found, aborting...")
-        os._exit(1)
-
-    parser = argparse.ArgumentParser(description='Push staging images to Quay.io registry.')
-    parser.add_argument('-o', action='store_true', dest='override_tags',
-                        help='If true, instead increase the tag version, it will use the latest tag retrieved from Quay.')
-    args = parser.parse_args()
-
-    version = get_next_rc_version(find_current_rc_version(), args.override_tags)
-    common.update_community_images_version(version)
-    common.update_image_stream(version)
-    common.update_kogito_modules_version(version)
-    common.update_artifacts_version_env_in_modules(version)
-
-    find_next_tag(args.override_tags)
-    tag_and_push_images()
diff --git a/scripts/update-repository.py b/scripts/update-repository.py
deleted file mode 100644
index f854b37d9ba..00000000000
--- a/scripts/update-repository.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env python
-#
-# 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.
-#
-
-#Script responsible to update the tests with 
-#Should be run from root directory of the repository
-#Sample usage:  python scripts/update-tests.py
-
-import sys
-sys.dont_write_bytecode = True
-
-import common
-
-import argparse
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and '
-                                                 'version.')
-    parser.add_argument('--repo-url', dest='repo_url', help='Defines the url of the repository to setup into the tests')
-    parser.add_argument('--replace-default-repo', dest='replace_default_repo', default=False, action='store_true',
-                        help='Enable if repo-url should replace the default repository')
-    parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False,
-                        action='store_true',
-                        help='If set to true will relax the SSL for user-generated self-signed certificates')
-    parser.add_argument('--build-maven-mirror-url', dest='build_maven_mirror_url',
-                        help='Maven mirror URL to be used for cekit build')
-    parser.add_argument('--archetype-maven-mirror-url', dest='archetype_maven_mirror_url',
-                        help='Maven mirror URL to be used for archetype generation')
-
-    parser.add_argument('--examples-uri', dest='examples_uri', help='To update the examples uri for testing')
-    parser.add_argument('--examples-ref', dest='examples_ref', help='To update the examples ref for testing')
-
-    parser.add_argument('--artifacts-version', dest='artifacts_version',
-                        help='To update the artifacts version for testing')
-    parser.add_argument('--quarkus-platform-version', dest='quarkus_platform_version', help='Update Quarkus version for the tests')
-
-    parser.add_argument('--tests-only', dest='tests_only', default=False, action='store_true', help='Update product modules/images')
-    args = parser.parse_args()
-
-    if args.repo_url:
-        common.update_maven_repo_in_build_config(args.repo_url, args.replace_default_repo)
-        common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_default_repo)
-        common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_default_repo)
-        if not args.tests_only:
-            common.update_maven_repo_env_value(args.repo_url, args.replace_default_repo)
-    
-    if args.ignore_self_signed_cert:
-        common.ignore_maven_self_signed_certificate_in_build_config()
-        common.ignore_maven_self_signed_certificate_in_setup_maven()
-        common.ignore_maven_self_signed_certificate_in_behave_tests()
-
-    if args.build_maven_mirror_url:
-        common.update_maven_mirror_url_in_build_config(args.build_maven_mirror_url)
-
-    if args.archetype_maven_mirror_url:
-        common.update_maven_mirror_url_in_build_config(args.archetype_maven_mirror_url)
-        common.update_maven_mirror_url_in_quarkus_plugin_behave_tests(args.archetype_maven_mirror_url)
-
-    if args.examples_uri:
-        common.update_examples_uri_in_behave_tests(args.examples_uri)
-        common.update_examples_uri_in_clone_repo(args.examples_uri)
-
-    if args.examples_ref:
-        common.update_examples_ref_in_behave_tests(args.examples_ref)
-        common.update_examples_ref_in_clone_repo(args.examples_ref)
-
-    if args.artifacts_version:
-        common.update_artifacts_version_in_build(args.artifacts_version)
-    
-    if args.quarkus_platform_version:
-        if not args.tests_only:
-            common.update_quarkus_platform_version_in_build(args.quarkus_platform_version)
-        
-        common.update_quarkus_platform_version_in_behave_tests_repository_paths(args.quarkus_platform_version)
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
deleted file mode 100644
index f908ebf4edf..00000000000
--- a/tests/features/common-custom-truststore.feature
+++ /dev/null
@@ -1,35 +0,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.
-#
-
-@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
-@docker.io/apache/incubator-kie-kogito-data-index-postgresql
-@docker.io/apache/incubator-kie-kogito-jit-runner
-@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
-@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
-Feature: Common tests for Custom TrustStore configuration
-  # This test sets an invalid certificate to the container, it fails to start, and if timing is bad cekit hangs on 'Running command ps -C java in container'
-  # See https://github.com/apache/incubator-kie-kogito-images/issues/1722
-  @ignore
-  Scenario: Verify if a custom certificate is correctly handled
-    When container is started with command bash -c "/home/kogito/kogito-app-launch.sh"
-      | variable            | value              |
-      | CUSTOM_TRUSTSTORE   | my-truststore.jks  |
-      | RUNTIME_TYPE        | quarkus            |
-    Then container log should contain INFO ---> Configuring custom Java Truststore 'my-truststore.jks' in the path /home/kogito/certs/custom-truststore
-    Then container log should contain ERROR ---> A custom truststore was specified ('my-truststore.jks'), but wasn't found in the path /home/kogito/certs/custom-truststore
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
deleted file mode 100644
index d3b9e345855..00000000000
--- a/tests/features/common-dynamic-resources.feature
+++ /dev/null
@@ -1,71 +0,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.
-#
-
-# Run only on images that won't die instantly
-# See https://github.com/apache/incubator-kie-kogito-images/issues/1722
-@docker.io/apache/incubator-kie-kogito-data-index-ephemeral
-#@docker.io/apache/incubator-kie-kogito-data-index-postgresql
-#@docker.io/apache/incubator-kie-kogito-jit-runner
-@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral
-#@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql
-Feature: Common tests for Kogito images
-
-  Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
-    When container is started with args
-      | arg       | value                                                                           |
-      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                           |
-      | mem_limit | 1073741824                                                                      |
-      | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 80, "JAVA_INITIAL_MEM_RATIO": 25} |
-    Then container log should match regex -Xms205m
-    And container log should match regex -Xmx819m
-
-  Scenario: Verify if the DEFAULT MEM RATIO properties are overridden with different values
-    When container is started with args
-      | arg       | value                                                                           |
-      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                           |
-      | mem_limit | 1073741824                                                                      |
-      | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 50, "JAVA_INITIAL_MEM_RATIO": 10} |
-    Then container log should match regex -Xms51m
-    And container log should match regex -Xmx512m
-
-  Scenario: Verify if the properties were correctly set when aren't passed
-    When container is started with args
-      | arg       | value                                                 |
-      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh" |
-      | mem_limit | 1073741824                                            |
-      | env_json  | {"SCRIPT_DEBUG":"true"}                               |
-    Then container log should match regex -Xms128m
-    And container log should match regex -Xmx512m
-
-  Scenario: Verify if Java Remote Debug is correctly configured
-    When container is started with args
-      | arg       | value                                                                   |
-      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                   |
-      | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_DEBUG":"true", "JAVA_DEBUG_PORT":"9222"}  |
-    Then container log should match regex -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9222
-
-  Scenario: Verify if the DEFAULT MEM RATIO properties are overridden with different values from user provided Xmx and Xms
-    When container is started with args
-      | arg       | value                                                                                                                 |
-      | command   | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh"                                                                 |
-      | mem_limit | 1073741824                                                                                                            |
-      | env_json  | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 50, "JAVA_INITIAL_MEM_RATIO": 10, "JAVA_OPTIONS":"-Xms4000m -Xmx8000m"} |
-    Then container log should match regex -Xms4000m
-    And container log should match regex -Xmx8000m
-
diff --git a/tests/shell/README.md b/tests/shell/README.md
deleted file mode 100644
index 571e1abb30a..00000000000
--- a/tests/shell/README.md
+++ /dev/null
@@ -1,40 +0,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.
-  -->
-
-# Tests in Shell
-
-## Running Tests With JBang
-
-- Install JBang
-- Install VSCode Red Hat's Java plugin
-- Install VSCode JBang plugin
-
-You can then edit the files in `sonataflow-builder` and `sonataflow-devmode` with intellisense.
-
-The `run.sh` should be used to run the tests since it must set a few env vars. To run from your terminal, try:
-
-```shell
-tests/shell/run.sh sonataflow-devmode docker.io/apache/incubator-kie-sonataflow-devmode:999-SNAPSHOT
-```
-
-The first argument is the test case to run and the second, the image.
-
-Under the hood, it uses [Junit's Console Launcher](https://junit.org/junit5/docs/current/user-guide/#running-tests-console-launcher) tool to run the tests from the command line.
-
-Update this file with new findings, and don't remove the `.vscode` folder. It's useful to run JBang from the IDE.
diff --git a/tests/shell/sonataflow-builder/.vscode/launch.json b/tests/shell/sonataflow-builder/.vscode/launch.json
deleted file mode 100644
index f329b95134c..00000000000
--- a/tests/shell/sonataflow-builder/.vscode/launch.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "java",
-            "name": "RunTests-port-4004",
-            "request": "attach",
-            "hostName": "localhost",
-            "port": 4004
-        },
-        {
-            "type": "java",
-            "name": "Debug (Launch) - RunTests",
-            "request": "launch",
-            "mainClass": "RunTests",
-            "projectName": "RunTests"
-        }
-    ]
-}
diff --git a/tests/shell/sonataflow-builder/.vscode/settings.json b/tests/shell/sonataflow-builder/.vscode/settings.json
deleted file mode 100644
index ca7dd198068..00000000000
--- a/tests/shell/sonataflow-builder/.vscode/settings.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "java.import.gradle.enabled": false,
-    "java.import.maven.enabled": false,
-    "java.eclipse.downloadSources": true,
-    "files.exclude": {
-        "bin/": true,
-        ".eclipse/": true,
-        ".project": true,
-        ".classpath": true,
-        "build.gradle": true
-    },
-    "java.completion.importOrder": [
-        "",
-        "javax",
-        "java",
-        "#"
-    ]
-}
\ No newline at end of file
diff --git a/tests/shell/sonataflow-builder/resources/greet-with-inputschema/.mvn/jvm.config b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/.mvn/jvm.config
deleted file mode 100644
index df7809fac1f..00000000000
--- a/tests/shell/sonataflow-builder/resources/greet-with-inputschema/.mvn/jvm.config
+++ /dev/null
@@ -1 +0,0 @@
--Xms1024m
\ No newline at end of file
diff --git a/tests/shell/sonataflow-builder/resources/greet/.mvn/jvm.config b/tests/shell/sonataflow-builder/resources/greet/.mvn/jvm.config
deleted file mode 100644
index df7809fac1f..00000000000
--- a/tests/shell/sonataflow-builder/resources/greet/.mvn/jvm.config
+++ /dev/null
@@ -1 +0,0 @@
--Xms1024m
\ No newline at end of file
diff --git a/tests/shell/sonataflow-devmode/.vscode/launch.json b/tests/shell/sonataflow-devmode/.vscode/launch.json
deleted file mode 100644
index f329b95134c..00000000000
--- a/tests/shell/sonataflow-devmode/.vscode/launch.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "java",
-            "name": "RunTests-port-4004",
-            "request": "attach",
-            "hostName": "localhost",
-            "port": 4004
-        },
-        {
-            "type": "java",
-            "name": "Debug (Launch) - RunTests",
-            "request": "launch",
-            "mainClass": "RunTests",
-            "projectName": "RunTests"
-        }
-    ]
-}
diff --git a/tests/shell/sonataflow-devmode/.vscode/settings.json b/tests/shell/sonataflow-devmode/.vscode/settings.json
deleted file mode 100644
index ca7dd198068..00000000000
--- a/tests/shell/sonataflow-devmode/.vscode/settings.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "java.import.gradle.enabled": false,
-    "java.import.maven.enabled": false,
-    "java.eclipse.downloadSources": true,
-    "files.exclude": {
-        "bin/": true,
-        ".eclipse/": true,
-        ".project": true,
-        ".classpath": true,
-        "build.gradle": true
-    },
-    "java.completion.importOrder": [
-        "",
-        "javax",
-        "java",
-        "#"
-    ]
-}
\ No newline at end of file
diff --git a/tests/test-apps/application.properties b/tests/test-apps/application.properties
deleted file mode 100644
index 399172eadb8..00000000000
--- a/tests/test-apps/application.properties
+++ /dev/null
@@ -1,20 +0,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.
-#
-
-quarkus.http.port=10000
\ No newline at end of file
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
deleted file mode 100755
index 13e108ae1df..00000000000
--- a/tests/test-apps/clone-repo.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-#
-# Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
-# if image name is supporting services, don't build it
-IMAGE_NAME="$2"
-KOGITO_EXAMPLES_REPO_NAME='incubator-kie-kogito-examples'
-KOGITO_EXAMPLES_FOLDER_NAME='kogito-examples' # many tests rely on location /tmp/kogito-examples
-
-if [ -n "${IMAGE_NAME}" ]; then
-    if python ../../scripts/list-images.py -is ${IMAGE_NAME}; then
-        echo "Target image is supporting services, skipping examples build"
-        exit 0
-    fi
-fi
-
-set -e
-realPath="realpath"
-if [[ $OSTYPE == 'darwin'* ]]; then
-  # If you are on MacOS, use "brew install coreutils"
-  realPath="grealpath"
-fi
-base_dir=`dirname $(${realPath} -s $0)`
-echo $base_dir
-. ${base_dir}/../../scripts/setup-maven.sh "$(mktemp)"
-
-CONTAINER_ENGINE=${CONTAINER_ENGINE:-"docker"}
-MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS=${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS:-"-Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=${CONTAINER_ENGINE}"}
-
-NATIVE_BUILD=$1
-if [ -z $NATIVE_BUILD ]; then
-    NATIVE_BUILD=true
-fi
-
-set -e
-
-# Clone examples
-KOGITO_EXAMPLES_DIR=/tmp/${KOGITO_EXAMPLES_FOLDER_NAME}
-rm -rf ${KOGITO_EXAMPLES_DIR}
-git clone https://github.com/apache/${KOGITO_EXAMPLES_REPO_NAME}.git ${KOGITO_EXAMPLES_DIR}
-cd ${KOGITO_EXAMPLES_DIR}/
-git fetch origin
-git fetch origin --tags
-git switch nightly-main
-
-# make a new copy of rules-quarkus-helloworld for native tests
-cp -rv  ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld/ ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld-native/
-
-set -x
-
-# generating the app binaries to test the binary build
-mvn -f kogito-quarkus-examples/rules-quarkus-helloworld clean package ${MAVEN_OPTIONS}
-mvn -f kogito-springboot-examples/process-springboot-example clean package ${MAVEN_OPTIONS}
-
-if [ "$NATIVE_BUILD" = 'true' ]; then
-    mvn -f kogito-quarkus-examples/rules-quarkus-helloworld-native -Dnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
-    ls -lah ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld-native/target/
-fi
-
-# preparing directory to run kogito maven archetypes tests
-mkdir -pv ${KOGITO_EXAMPLES_DIR}/dmn-example
-cp ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/dmn-quarkus-example/src/main/resources/* ${KOGITO_EXAMPLES_DIR}/dmn-example/
-
-# by adding the application.properties file telling app to start on
-# port 10000, the purpose of this tests is make sure that the images
-# will ensure the use of the port 8080.
-
-cp ${base_dir}/application.properties ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
-(echo ""; echo "server.port=10000") >> ${KOGITO_EXAMPLES_DIR}/kogito-springboot-examples/process-springboot-example/src/main/resources/application.properties
-
-set +x
-
-git config commit.gpgsign false
-git add --all  :/
-git commit -am "test"
\ No newline at end of file

From a2ac917451b64c1b6c43da0ca00d6e9234441494 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <ricardozanini@gmail.com>
Date: Mon, 23 Sep 2024 15:50:02 -0400
Subject: [PATCH 708/709] Remove sonataflow-{common|builder|devmode} images

Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com>
---
 packages/sonataflow-builder-image/README.md   | 104 ----
 .../sonataflow-builder-image/env/index.js     |  54 ---
 packages/sonataflow-builder-image/install.js  |  64 ---
 .../sonataflow-builder-image/package.json     |  48 --
 ...ncubator-kie-sonataflow-builder-image.yaml |  74 ---
 .../builder/build-config/module.yaml          |  29 --
 .../builder/runtime/community/configure.sh    |  33 --
 .../builder/runtime/community/module.yaml     |  31 --
 .../bats/sonataflow-builder-build-app.bats    |  45 --
 .../features/sonataflow-builder-2.feature     |  14 -
 .../tests/features/sonataflow-builder.feature |  38 --
 .../sonataflow-builder/.vscode/launch.json    |  22 -
 .../sonataflow-builder/.vscode/settings.json  |  13 -
 .../greet-with-inputschema/Dockerfile         |  41 --
 .../greet-with-inputschema/greet.sw.json      |  89 ----
 .../greet-with-inputschema/schemas/input.json |  13 -
 .../resources/greet/Dockerfile                |  41 --
 .../resources/greet/greet.sw.json             |  67 ---
 .../sonataflow-builder/src/RunTests.java      | 140 ------
 packages/sonataflow-devmode-image/README.md   | 104 ----
 .../sonataflow-devmode-image/env/index.js     |  60 ---
 packages/sonataflow-devmode-image/install.js  |  64 ---
 .../sonataflow-devmode-image/package.json     |  50 --
 ...ncubator-kie-sonataflow-devmode-image.yaml |  85 ----
 .../sonataflow/devmode/build-config/configure |  38 --
 .../devmode/build-config/module.yaml          |  39 --
 .../runtime/common/added/run-app-devmode.sh   |  53 ---
 .../devmode/runtime/common/configure.sh       |  30 --
 .../devmode/runtime/common/module.yaml        |  25 -
 .../devmode/runtime/community/configure.sh    |  34 --
 .../devmode/runtime/community/module.yaml     |  51 --
 .../features/sonataflow-devmode-2.feature     |  14 -
 .../tests/features/sonataflow-devmode.feature | 144 ------
 .../sonataflow-devmode/.vscode/launch.json    |  22 -
 .../sonataflow-devmode/.vscode/settings.json  |  13 -
 .../resources/greet.sw.json                   |  67 ---
 .../sonataflow-devmode/src/RunTests.java      | 105 -----
 packages/sonataflow-image-common/README.md    |  80 ----
 packages/sonataflow-image-common/env/index.js |  31 --
 packages/sonataflow-image-common/install.js   |  35 --
 packages/sonataflow-image-common/package.json |  29 --
 .../resources/Makefile                        |  87 ----
 .../added/container-limits                    | 137 ------
 .../added/debug-options                       |  35 --
 .../added/java-default-options                | 201 --------
 .../kogito-dynamic-resources/configure        |  29 --
 .../kogito-dynamic-resources/module.yaml      |  75 ---
 .../kogito-launch-scripts/added/configure.sh  | 132 ------
 .../modules/kogito-launch-scripts/configure   |  26 -
 .../modules/kogito-launch-scripts/module.yaml |  24 -
 .../modules/kogito-logging/added/logging.sh   |  43 --
 .../modules/kogito-logging/configure          |  25 -
 .../modules/kogito-logging/module.yaml        |  24 -
 .../common/added/configure-maven.sh           | 272 -----------
 .../modules/kogito-maven/common/configure     |  39 --
 .../kogito-maven/common/maven/settings.xml    |  61 ---
 .../modules/kogito-maven/common/module.yaml   |  94 ----
 .../tests/bats/maven-settings.bats            | 446 ------------------
 .../kogito-project-versions/module.yaml       |  33 --
 .../modules/kogito-system-user/add-user       |  37 --
 .../modules/kogito-system-user/module.yaml    |  35 --
 .../common/build/added/cleanup_project.sh     |  43 --
 .../common/build/added/zip_files.sh           |  34 --
 .../sonataflow/common/build/configure.sh      |  43 --
 .../sonataflow/common/build/module.yaml       |  25 -
 .../common/scripts/added/add-extension.sh     |  49 --
 .../common/scripts/added/build-app.sh         |  65 ---
 .../common/scripts/added/configure-jvm-mvn.sh |  30 --
 .../common/scripts/added/create-app.sh        | 145 ------
 .../common/scripts/added/jvm-settings.sh      |  46 --
 .../sonataflow/common/scripts/configure.sh    |  31 --
 .../sonataflow/common/scripts/module.yaml     |  45 --
 .../resources/scripts/README.md               |  64 ---
 .../resources/scripts/common.py               | 304 ------------
 .../resources/scripts/retrieve_version.py     |  31 --
 .../resources/scripts/run-bats.sh             |  37 --
 .../resources/scripts/versions_manager.py     |  52 --
 .../resources/tests/shell/README.md           |  36 --
 .../resources/tests/shell/run.sh              |  51 --
 .../bats/sonataflow-builder-jvm-settings.bats |  57 ---
 80 files changed, 5176 deletions(-)
 delete mode 100644 packages/sonataflow-builder-image/README.md
 delete mode 100644 packages/sonataflow-builder-image/env/index.js
 delete mode 100644 packages/sonataflow-builder-image/install.js
 delete mode 100644 packages/sonataflow-builder-image/package.json
 delete mode 100644 packages/sonataflow-builder-image/resources/incubator-kie-sonataflow-builder-image.yaml
 delete mode 100644 packages/sonataflow-builder-image/resources/modules/sonataflow/builder/build-config/module.yaml
 delete mode 100644 packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/configure.sh
 delete mode 100644 packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/module.yaml
 delete mode 100644 packages/sonataflow-builder-image/test-resources/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder-2.feature
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder.feature
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/launch.json
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/settings.json
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/Dockerfile
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/greet.sw.json
 delete mode 100644 packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/src/RunTests.java
 delete mode 100644 packages/sonataflow-devmode-image/README.md
 delete mode 100644 packages/sonataflow-devmode-image/env/index.js
 delete mode 100644 packages/sonataflow-devmode-image/install.js
 delete mode 100644 packages/sonataflow-devmode-image/package.json
 delete mode 100644 packages/sonataflow-devmode-image/resources/incubator-kie-sonataflow-devmode-image.yaml
 delete mode 100644 packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure
 delete mode 100644 packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/module.yaml
 delete mode 100755 packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh
 delete mode 100644 packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/configure.sh
 delete mode 100644 packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/module.yaml
 delete mode 100644 packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/configure.sh
 delete mode 100644 packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/module.yaml
 delete mode 100644 packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode-2.feature
 delete mode 100644 packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode.feature
 delete mode 100644 packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/launch.json
 delete mode 100644 packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/settings.json
 delete mode 100644 packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/resources/greet.sw.json
 delete mode 100644 packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
 delete mode 100644 packages/sonataflow-image-common/README.md
 delete mode 100644 packages/sonataflow-image-common/env/index.js
 delete mode 100644 packages/sonataflow-image-common/install.js
 delete mode 100644 packages/sonataflow-image-common/package.json
 delete mode 100644 packages/sonataflow-image-common/resources/Makefile
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/container-limits
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/debug-options
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/java-default-options
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/configure
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/module.yaml
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/added/configure.sh
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/configure
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/module.yaml
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-logging/added/logging.sh
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-logging/configure
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-logging/module.yaml
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-maven/common/added/configure-maven.sh
 delete mode 100755 packages/sonataflow-image-common/resources/modules/kogito-maven/common/configure
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-maven/common/maven/settings.xml
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-maven/common/module.yaml
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-maven/tests/bats/maven-settings.bats
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-project-versions/module.yaml
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-system-user/add-user
 delete mode 100644 packages/sonataflow-image-common/resources/modules/kogito-system-user/module.yaml
 delete mode 100755 packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/cleanup_project.sh
 delete mode 100755 packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/zip_files.sh
 delete mode 100644 packages/sonataflow-image-common/resources/modules/sonataflow/common/build/configure.sh
 delete mode 100644 packages/sonataflow-image-common/resources/modules/sonataflow/common/build/module.yaml
 delete mode 100755 packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/add-extension.sh
 delete mode 100755 packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/build-app.sh
 delete mode 100755 packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh
 delete mode 100755 packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/create-app.sh
 delete mode 100755 packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/jvm-settings.sh
 delete mode 100644 packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/configure.sh
 delete mode 100644 packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/module.yaml
 delete mode 100644 packages/sonataflow-image-common/resources/scripts/README.md
 delete mode 100644 packages/sonataflow-image-common/resources/scripts/common.py
 delete mode 100644 packages/sonataflow-image-common/resources/scripts/retrieve_version.py
 delete mode 100755 packages/sonataflow-image-common/resources/scripts/run-bats.sh
 delete mode 100644 packages/sonataflow-image-common/resources/scripts/versions_manager.py
 delete mode 100644 packages/sonataflow-image-common/resources/tests/shell/README.md
 delete mode 100755 packages/sonataflow-image-common/resources/tests/shell/run.sh
 delete mode 100644 packages/sonataflow-image-common/test-resources/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats

diff --git a/packages/sonataflow-builder-image/README.md b/packages/sonataflow-builder-image/README.md
deleted file mode 100644
index d6ec5463641..00000000000
--- a/packages/sonataflow-builder-image/README.md
+++ /dev/null
@@ -1,104 +0,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.
--->
-
-# sonataflow-builder
-
-This package contains the `cekit` image descriptor (`sonataflow-builder-image.yaml`) and modules needed to build the `sonataflow-builder`
-image along with the modules and scripts provided in `@kie-tools/sonataflow-image-common`.
-
-## Additional requirements
-
-- **python3** with the following packages installed:
-  - `behave` `lxml` `docker` `docker-squash` `elementPath` `pyyaml` `ruamel.yaml` `python-dateutil` `Jinja2` `pykwalify` `colorlog` `click`
-- **cekit 4.11.0**: [docs.cekit.io](https://docs.cekit.io/en/latest/index.html)
-- **s2i**: [source-to-image](https://github.com/openshift/source-to-image)
-- **make**
-- **docker**
-
-## Build
-
-- Enable the image to be built:
-
-  ```bash
-  export KIE_TOOLS_BUILD__buildContainerImages=true
-  ```
-
-- (Optional) The image name and tags can be customized by setting the following environment variables:
-
-  ```bash
-  export SONATAFLOW_BUILDER_IMAGE__registry=<registry>
-  export SONATAFLOW_BUILDER_IMAGE__account=<account>
-  export SONATAFLOW_BUILDER_IMAGE__name=<image-name>
-  export SONATAFLOW_BUILDER_IMAGE__buildTag=<image-tag>
-  ```
-
-  > Default values can be found [here](./env/index.js).
-
-- After optionally setting up the environment variables, run the following in the root folder of the repository to build the package:
-
-  ```bash
-  pnpm -F @kie-tools/sonataflow-builder-image build:prod
-  ```
-
-- Then check if the image is correctly stored:
-
-  ```bash
-  docker images
-  ```
-
-## Testing the generated image (only for Linux)
-
-- With the image generated, run:
-
-  ```bash
-  pnpm -F @kie-tools/sonataflow-builder-image image:test
-  ```
-
-## Envs
-
-|                 Name                 |                    Description                     |                          Default                          |
-| :----------------------------------: | :------------------------------------------------: | :-------------------------------------------------------: |
-| `SONATAFLOW_BUILDER_IMAGE__registry` | Registry where the generated image will be pushed. |                        "docker.io"                        |
-| `SONATAFLOW_BUILDER_IMAGE__account`  |        Account where image will be stored.         |                         "apache"                          |
-|   `SONATAFLOW_BUILDER_IMAGE__name`   |              SWF Builder Image name.               |                   "sonataflow-builder"                    |
-| `SONATAFLOW_BUILDER_IMAGE__buildTag` |                    Tag to use .                    | $KIE_TOOLS_BUILD\_\_streamName (E.g., "main" or "10.0.x") |
-
----
-
-Apache KIE (incubating) is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the name of Apache Incubator. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-Some of the incubating project’s releases may not be fully compliant with ASF
-policy. For example, releases may have incomplete or un-reviewed licensing
-conditions. What follows is a list of known issues the project is currently
-aware of (note that this list, by definition, is likely to be incomplete):
-
-- Hibernate, an LGPL project, is being used. Hibernate is in the process of
-  relicensing to ASL v2
-- Some files, particularly test files, and those not supporting comments, may
-  be missing the ASF Licensing Header
-
-If you are planning to incorporate this work into your product/project, please
-be aware that you will need to conduct a thorough licensing review to determine
-the overall implications of including this work. For the current status of this
-project through the Apache Incubator visit:
-https://incubator.apache.org/projects/kie.html
diff --git a/packages/sonataflow-builder-image/env/index.js b/packages/sonataflow-builder-image/env/index.js
deleted file mode 100644
index 4c6bfb01333..00000000000
--- a/packages/sonataflow-builder-image/env/index.js
+++ /dev/null
@@ -1,54 +0,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.
- */
-
-const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
-
-const rootEnv = require("@kie-tools/root-env/env");
-
-module.exports = composeEnv([rootEnv], {
-  vars: varsWithName({
-    SONATAFLOW_BUILDER_IMAGE__registry: {
-      default: "docker.io",
-      description: "The image registry.",
-    },
-    SONATAFLOW_BUILDER_IMAGE__account: {
-      default: "apache",
-      description: "The image registry account.",
-    },
-    SONATAFLOW_BUILDER_IMAGE__name: {
-      default: "incubator-kie-sonataflow-builder",
-      description: "The image name.",
-    },
-    SONATAFLOW_BUILDER_IMAGE__buildTag: {
-      default: rootEnv.env.root.streamName,
-      description: "The image tag.",
-    },
-  }),
-  get env() {
-    return {
-      sonataflowBuilderImage: {
-        registry: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__registry),
-        account: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__account),
-        name: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__name),
-        tag: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__buildTag),
-        version: require("../package.json").version,
-      },
-    };
-  },
-});
diff --git a/packages/sonataflow-builder-image/install.js b/packages/sonataflow-builder-image/install.js
deleted file mode 100644
index a3090a5364a..00000000000
--- a/packages/sonataflow-builder-image/install.js
+++ /dev/null
@@ -1,64 +0,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.
- */
-
-const { execSync } = require("child_process");
-const fs = require("fs");
-
-const buildEnv = require("./env");
-const path = require("path");
-const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
-const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
-const replaceInFile = require("replace-in-file");
-
-const activateCmd =
-  process.platform === "win32"
-    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
-    : `. ${pythonVenvDir}/venv/bin/activate`;
-
-execSync(
-  `${activateCmd} && \
-  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowBuilderImage.version} --source-folder ./resources`,
-  { stdio: "inherit" }
-);
-
-// Find and read the -image.yaml file
-const resourcesPath = path.resolve(__dirname, "./resources");
-const files = fs.readdirSync(resourcesPath);
-const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
-if (imageYamlFiles.length !== 1) {
-  throw new Error("There should only be one -image.yaml file on ./resources!");
-}
-const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
-let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
-
-const imageUrl = `${buildEnv.env.sonataflowBuilderImage.registry}/${buildEnv.env.sonataflowBuilderImage.account}/${buildEnv.env.sonataflowBuilderImage.name}`;
-
-// Replace the whole string between quotes ("") with the image name
-imageYaml = imageYaml.replace(/(?<=")(.*sonataflow-builder.*)(?=")/gm, imageUrl);
-
-// Write file and then rename it to match the image name
-fs.writeFileSync(originalYamlPath, imageYaml);
-fs.renameSync(originalYamlPath, path.join(resourcesPath, `${buildEnv.env.sonataflowBuilderImage.name}-image.yaml`));
-
-// Replace image URL in .feature files
-replaceInFile.sync({
-  files: ["**/*.feature"],
-  from: /@docker.io\/apache\/.*/g,
-  to: `@${imageUrl}`,
-});
diff --git a/packages/sonataflow-builder-image/package.json b/packages/sonataflow-builder-image/package.json
deleted file mode 100644
index 8819e58502e..00000000000
--- a/packages/sonataflow-builder-image/package.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "private": true,
-  "name": "@kie-tools/sonataflow-builder-image",
-  "version": "0.0.0",
-  "description": "",
-  "license": "Apache-2.0",
-  "homepage": "https://github.com/apache/incubator-kie-tools",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/apache/incubator-kie-tools.git"
-  },
-  "bugs": {
-    "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: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",
-    "copy-test-assets": "run-script-os",
-    "copy-test-assets:linux:darwin": "cp -R ./node_modules/@kie-tools/sonataflow-image-common/test-resources/* build && cp -R test-resources/* build",
-    "format": "prettier --write . --ignore-path=../../.prettierignore --ignore-path=../../.gitignore",
-    "image:build": "run-script-os",
-    "image:build:darwin:win32": "echo \"Build skipped on macOS and Windows\"",
-    "image:build:linux": "pnpm setup:env make -C ./build build",
-    "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 \"cp -r build/target/test/results dist-e2e-tests/\"",
-    "image:test:darwin:win32": "echo \"Tests skipped on macOS and Windows\"",
-    "image:test:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
-    "install": "node install.js && pnpm format",
-    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env SWF_IMAGE_REGISTRY=$(build-env sonataflowBuilderImage.registry) SWF_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowBuilderImage.account) SWF_IMAGE_NAME=$(build-env sonataflowBuilderImage.name) SWF_IMAGE_TAG=$(build-env sonataflowBuilderImage.tag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)"
-  },
-  "devDependencies": {
-    "@kie-tools/python-venv": "workspace:*",
-    "@kie-tools/root-env": "workspace:*",
-    "@kie-tools/sonataflow-image-common": "workspace:*",
-    "cross-env": "^7.0.3",
-    "replace-in-file": "^7.1.0",
-    "rimraf": "^3.0.2",
-    "run-script-os": "^1.1.6"
-  },
-  "kieTools": {
-    "requiredPreinstalledCliCommands": [
-      "python3",
-      "make",
-      "s2i"
-    ]
-  }
-}
diff --git a/packages/sonataflow-builder-image/resources/incubator-kie-sonataflow-builder-image.yaml b/packages/sonataflow-builder-image/resources/incubator-kie-sonataflow-builder-image.yaml
deleted file mode 100644
index a32e547ac9e..00000000000
--- a/packages/sonataflow-builder-image/resources/incubator-kie-sonataflow-builder-image.yaml
+++ /dev/null
@@ -1,74 +0,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.
-#
-- name: builder
-  from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
-  version: "0.0.0"
-  modules:
-    repositories:
-      - path: modules
-    install:
-      - name: org.kie.kogito.system.user
-      - name: org.kie.kogito.logging
-      - name: org.kie.kogito.launch.scripts
-      - name: org.kie.kogito.dynamic.resources
-      - name: org.kie.kogito.maven.common
-      - name: org.kie.kogito.project.versions
-      - name: org.kie.sonataflow.common.scripts
-      - name: org.kie.sonataflow.builder.build-config
-      - name: org.kie.sonataflow.common.build
-
-- name: "docker.io/apache/incubator-kie-sonataflow-builder"
-  from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
-  version: "0.0.0"
-  description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled"
-
-  labels:
-    - name: "io.openshift.s2i.scripts-url"
-      value: "image:///usr/local/s2i"
-    - name: "io.openshift.s2i.destination"
-      value: "/tmp"
-    - name: "io.quarkus.platform.version"
-      value: "### SET ME DURING BUILD PROCESS ###"
-    - name: "org.kie.kogito.version"
-      value: "### SET ME DURING BUILD PROCESS ###"
-    - name: "maintainer"
-      value: "Apache KIE <dev@kie.apache.org>"
-    - name: "io.k8s.description"
-      value: "Sonataflow base builder with Quarkus extensions libraries preinstalled."
-    - name: "io.k8s.display-name"
-      value: "Sonataflow Builder"
-    - name: "io.openshift.tags"
-      value: "kogito,builder,serverless,workflow"
-
-  modules:
-    repositories:
-      - path: modules
-    install:
-      - name: org.kie.kogito.system.user
-      - name: org.kie.kogito.logging
-      - name: org.kie.kogito.launch.scripts
-      - name: org.kie.kogito.dynamic.resources
-      - name: org.kie.kogito.maven.common
-      - name: org.kie.kogito.project.versions
-      - name: org.kie.sonataflow.common.scripts
-      - name: org.kie.sonataflow.builder.runtime.community
-
-  run:
-    workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
-    user: 1001
diff --git a/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/build-config/module.yaml b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/build-config/module.yaml
deleted file mode 100644
index 42fc4129494..00000000000
--- a/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/build-config/module.yaml
+++ /dev/null
@@ -1,29 +0,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.
-#
-schema_version: 1
-name: org.kie.sonataflow.builder.build-config
-version: "0.0.0"
-description: "Sonataflow builder image build configuration"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    value: "false"
-  - name: QUARKUS_EXTENSIONS
-    # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: quarkus-kubernetes,smallrye-health,org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie:kie-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie:kie-addons-quarkus-events-process:${KOGITO_VERSION},org.kie:kie-addons-quarkus-process-management:${KOGITO_VERSION},org.kie:kie-addons-quarkus-source-files:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-jobs-knative-eventing:${KOGITO_VERSION},org.kie:kie-addons-quarkus-monitoring-prometheus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-monitoring-sonataflow:${KOGITO_VERSION}
diff --git a/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/configure.sh b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/configure.sh
deleted file mode 100644
index 8d26bb5940e..00000000000
--- a/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/configure.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-
-mkdir -p "${KOGITO_HOME}"/.m2/repository
-mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
-
-# Unzip Quarkus app and Maven repository
-tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
-tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/module.yaml b/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/module.yaml
deleted file mode 100644
index c15fa0af09f..00000000000
--- a/packages/sonataflow-builder-image/resources/modules/sonataflow/builder/runtime/community/module.yaml
+++ /dev/null
@@ -1,31 +0,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.
-#
-schema_version: 1
-name: org.kie.sonataflow.builder.runtime.community
-version: "0.0.0"
-description: "Sonataflow builder runtime module"
-
-artifacts:
-  - image: builder
-    path: /home/kogito/build_output/kogito-swf-quarkus-app.tar
-  - image: builder
-    path: /home/kogito/build_output/kogito-swf-maven-repo.tar
-
-execute:
-  - script: configure.sh
diff --git a/packages/sonataflow-builder-image/test-resources/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats b/packages/sonataflow-builder-image/test-resources/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats
deleted file mode 100644
index 9a85ce1a47a..00000000000
--- a/packages/sonataflow-builder-image/test-resources/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-setup() {
-    export KOGITO_HOME=/tmp/kogito
-    export HOME="${KOGITO_HOME}"
-    mkdir -p "${KOGITO_HOME}"/launch
-    mkdir -p "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/
-    cp $BATS_TEST_DIRNAME/../../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-    cp $BATS_TEST_DIRNAME/../../added/jvm-settings.sh "${KOGITO_HOME}"/launch/
-    cp $BATS_TEST_DIRNAME/../../added/build-app.sh "${KOGITO_HOME}"/launch/
-}
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"
-    rm -rf /tmp/resources
-}
-
-@test "verify copy resources is working" {
-    TEMPD=$(mktemp -d)
-    cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/sonataflow-builder/resources/greet-with-inputschema/* ${TEMPD}
-
-    # We don't care about the errors to try to execute and build the program, just the copy matters
-    source ${KOGITO_HOME}/launch/build-app.sh ${TEMPD} || true
-
-    [[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/greet.sw.json ]]
-    [[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/schemas/input.json ]]
-}
diff --git a/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder-2.feature b/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder-2.feature
deleted file mode 100644
index 7cb7705d987..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder-2.feature
+++ /dev/null
@@ -1,14 +0,0 @@
-@docker.io/apache/incubator-kie-sonataflow-builder
-Feature: Serverless Workflow images common
-
-  Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
-    When container is started with command bash
-    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom should exist and be a directory
-      And file /home/kogito/.m2/repository/org/apache/kie/sonataflow/sonataflow-quarkus/ should exist and be a directory
-
-  # This check should be enabled again once a similar check is done on runtimes
-  # to make sure we only have one version of quarkus bom ...
-  # See https://issues.redhat.com/browse/KOGITO-8555 to enable again
-  # Scenario: verify if there is no dependencies with multiple versions in /home/kogito/.m2/repository
-  #   When container is started with command bash
-  #   Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
diff --git a/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder.feature b/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder.feature
deleted file mode 100644
index a4e1bdfcf6b..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/features/sonataflow-builder.feature
+++ /dev/null
@@ -1,38 +0,0 @@
-@docker.io/apache/incubator-kie-sonataflow-builder
-Feature: Serverless Workflow builder images
-
-  Scenario: Verify that the application is built and started correctly
-    When container is started with command bash -c '/home/kogito/launch/build-app.sh && java -jar target/quarkus-app/quarkus-run.jar'
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then check that page is served
-      | property             | value             |
-      | port                 | 8080              |
-      | path                 | /q/health/ready   |
-      | wait                 | 480               |
-      | request_method       | GET               |
-      | expected_status_code | 200               |
-    And container log should contain --no-transfer-progress
-    And container log should contain -Duser.home=/home/kogito
-    And container log should match regex Installed features:.*kogito-serverless-workflow
-    And container log should match regex Installed features:.*kie-addon-knative-eventing-extension
-    And container log should match regex Installed features:.*smallrye-health
-
-  Scenario: Verify that the application is built and started correctly when QUARKUS_EXTENSIONS env is used
-    When container is started with command bash -c '/home/kogito/launch/build-app.sh && java -jar target/quarkus-app/quarkus-run.jar'
-      | variable            | value                                    |
-      | SCRIPT_DEBUG        | true                                     |
-      | QUARKUS_EXTENSIONS  | io.quarkus:quarkus-elytron-security-jdbc |
-    Then check that page is served
-      | property             | value             |
-      | port                 | 8080              |
-      | path                 | /q/health/ready   |
-      | wait                 | 480               |
-      | request_method       | GET               |
-      | expected_status_code | 200               |
-    And container log should contain -Duser.home=/home/kogito
-    And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
-    And container log should match regex Installed features:.*kogito-serverless-workflow
-    And container log should match regex Installed features:.*kie-addon-knative-eventing-extension
-    And container log should match regex Installed features:.*smallrye-health
-    And container log should match regex Installed features:.*security-jdbc
\ No newline at end of file
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/launch.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/launch.json
deleted file mode 100644
index 82cbbc6179c..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/launch.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "java",
-      "name": "RunTests-port-4004",
-      "request": "attach",
-      "hostName": "localhost",
-      "port": 4004
-    },
-    {
-      "type": "java",
-      "name": "Debug (Launch) - RunTests",
-      "request": "launch",
-      "mainClass": "RunTests",
-      "projectName": "RunTests"
-    }
-  ]
-}
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/settings.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/settings.json
deleted file mode 100644
index b57ea44670f..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/.vscode/settings.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "java.import.gradle.enabled": false,
-  "java.import.maven.enabled": false,
-  "java.eclipse.downloadSources": true,
-  "files.exclude": {
-    "bin/": true,
-    ".eclipse/": true,
-    ".project": true,
-    ".classpath": true,
-    "build.gradle": true
-  },
-  "java.completion.importOrder": ["", "javax", "java", "#"]
-}
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
deleted file mode 100644
index 247563dc256..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:main"
-# This argument is overriden by run.sh script based on the image tag set on the Makefile
-
-FROM ${BUILDER_IMAGE_TAG} AS builder
-
-# Kogito user
-USER 1001
-
-ARG QUARKUS_PACKAGE_TYPE="jar"
-ARG SCRIPT_DEBUG="true"
-ARG MAVEN_DOWNLOAD_OUTPUT="true"
-ARG MAVEN_OFFLINE_MODE="true"
-
-# Copy from build context to resources directory
-COPY --chown=1001 . ./resources
-
-# Build app with given resources
-RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
-
-#=============================
-# Runtime Run
-#=============================
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
-
-ARG QUARKUS_LAUNCH_DEVMODE=false
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
-# Default name is 'serverless-workflow-project'
-ARG PROJECT_ARTIFACT_ID='serverless-workflow-project'
-
-# We make four distinct layers so if there are application changes the library layers can be re-used
-COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/lib/ /deployments/lib/
-COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/*.jar /deployments/
-COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/app/ /deployments/app/
-COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/quarkus/ /deployments/quarkus/
-
-EXPOSE 8080
-USER 185
-ENV AB_JOLOKIA_OFF=""
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
deleted file mode 100644
index 5e3c8b0d00d..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "id": "greeting",
-  "description": "Greeting example on k8s!",
-  "version": "0.0.1",
-  "start": {
-    "stateName": "ChooseOnLanguage"
-  },
-  "dataInputSchema": {
-    "schema": "schemas/input.json",
-    "failOnValidationErrors": true
-  },
-  "specVersion": "0.8",
-  "expressionLang": "jq",
-  "states": [
-    {
-      "name": "ChooseOnLanguage",
-      "type": "switch",
-      "defaultCondition": {
-        "transition": {
-          "nextState": "GreetInEnglish"
-        }
-      },
-      "dataConditions": [
-        {
-          "condition": "${ .language == \"English\" }",
-          "transition": {
-            "nextState": "GreetInEnglish"
-          }
-        },
-        {
-          "condition": "${ .language == \"Spanish\" }",
-          "transition": {
-            "nextState": "GreetInSpanish"
-          }
-        }
-      ]
-    },
-    {
-      "name": "GreetInEnglish",
-      "type": "inject",
-      "transition": {
-        "nextState": "GreetPerson"
-      },
-      "data": {
-        "greeting": "Hello from JSON Workflow, "
-      }
-    },
-    {
-      "name": "GreetInSpanish",
-      "type": "inject",
-      "transition": {
-        "nextState": "GreetPerson"
-      },
-      "data": {
-        "greeting": "Saludos desde JSON Workflow, "
-      }
-    },
-    {
-      "name": "GreetPerson",
-      "type": "operation",
-      "end": {
-        "terminate": true
-      },
-      "actionMode": "sequential",
-      "actions": [
-        {
-          "name": "greetAction",
-          "functionRef": {
-            "refName": "greetFunction",
-            "arguments": {
-              "message": ".greeting+.name"
-            },
-            "invoke": "sync"
-          },
-          "actionDataFilter": {
-            "useResults": true
-          }
-        }
-      ]
-    }
-  ],
-  "functions": [
-    {
-      "name": "greetFunction",
-      "operation": "sysout",
-      "type": "custom"
-    }
-  ]
-}
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
deleted file mode 100644
index 965e88ea634..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object",
-  "properties": {
-    "language": {
-      "type": "string"
-    },
-    "name": {
-      "type": "string"
-    }
-  },
-  "required": ["language", "name"]
-}
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/Dockerfile b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/Dockerfile
deleted file mode 100644
index 247563dc256..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:main"
-# This argument is overriden by run.sh script based on the image tag set on the Makefile
-
-FROM ${BUILDER_IMAGE_TAG} AS builder
-
-# Kogito user
-USER 1001
-
-ARG QUARKUS_PACKAGE_TYPE="jar"
-ARG SCRIPT_DEBUG="true"
-ARG MAVEN_DOWNLOAD_OUTPUT="true"
-ARG MAVEN_OFFLINE_MODE="true"
-
-# Copy from build context to resources directory
-COPY --chown=1001 . ./resources
-
-# Build app with given resources
-RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
-
-#=============================
-# Runtime Run
-#=============================
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
-
-ARG QUARKUS_LAUNCH_DEVMODE=false
-
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
-# Default name is 'serverless-workflow-project'
-ARG PROJECT_ARTIFACT_ID='serverless-workflow-project'
-
-# We make four distinct layers so if there are application changes the library layers can be re-used
-COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/lib/ /deployments/lib/
-COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/*.jar /deployments/
-COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/app/ /deployments/app/
-COPY --from=builder --chown=185 /home/kogito/${PROJECT_ARTIFACT_ID}/target/quarkus-app/quarkus/ /deployments/quarkus/
-
-EXPOSE 8080
-USER 185
-ENV AB_JOLOKIA_OFF=""
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
-ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/greet.sw.json b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/greet.sw.json
deleted file mode 100644
index a619b3b8bc7..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/resources/greet/greet.sw.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "id": "jsongreet",
-  "version": "1.0",
-  "name": "Greeting workflow",
-  "description": "JSON based greeting workflow",
-  "start": "ChooseOnLanguage",
-  "functions": [
-    {
-      "name": "greetFunction",
-      "type": "custom",
-      "operation": "sysout"
-    }
-  ],
-  "states": [
-    {
-      "name": "ChooseOnLanguage",
-      "type": "switch",
-      "dataConditions": [
-        {
-          "condition": "${ .language == \"English\" }",
-          "transition": "GreetInEnglish"
-        },
-        {
-          "condition": "${ .language == \"Spanish\" }",
-          "transition": "GreetInSpanish"
-        }
-      ],
-      "defaultCondition": {
-        "transition": "GreetInEnglish"
-      }
-    },
-    {
-      "name": "GreetInEnglish",
-      "type": "inject",
-      "data": {
-        "greeting": "Hello from JSON Workflow, "
-      },
-      "transition": "GreetPerson"
-    },
-    {
-      "name": "GreetInSpanish",
-      "type": "inject",
-      "data": {
-        "greeting": "Saludos desde JSON Workflow, "
-      },
-      "transition": "GreetPerson"
-    },
-    {
-      "name": "GreetPerson",
-      "type": "operation",
-      "actions": [
-        {
-          "name": "greetAction",
-          "functionRef": {
-            "refName": "greetFunction",
-            "arguments": {
-              "message": ".greeting+.name"
-            }
-          }
-        }
-      ],
-      "end": {
-        "terminate": true
-      }
-    }
-  ]
-}
diff --git a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/src/RunTests.java b/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/src/RunTests.java
deleted file mode 100644
index 2ec43afadc8..00000000000
--- a/packages/sonataflow-builder-image/test-resources/tests/shell/sonataflow-builder/src/RunTests.java
+++ /dev/null
@@ -1,140 +0,0 @@
-///usr/bin/env jbang "$0" "$@" ; exit $?
-
-// 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.
-
-//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
-
-// engine to run the tests (tests are written with Junit5):
-//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1
-
-// testcontainers
-//DEPS org.testcontainers:testcontainers:1.19.3
-//DEPS org.testcontainers:junit-jupiter:1.19.3
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.nio.file.Paths;
-import java.time.Duration;
-import org.junit.jupiter.api.Test;
-import org.junit.platform.console.ConsoleLauncher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-@Testcontainers
-public class RunTests {
-
-        private static Logger LOGGER = LoggerFactory.getLogger(RunTests.class);
-
-        private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
-
-        @Container
-        private GenericContainer greetBuiltImage = new GenericContainer(
-                        new ImageFromDockerfile(
-                                        "dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
-                                        .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet", "Dockerfile"))
-                                        .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
-                        .withExposedPorts(8080)
-                        .withEnv("KOGITO_SERVICE_URL", "http://localhost:8080")
-                        .waitingFor(Wait.forHttp("/jsongreet"))
-                        .withLogConsumer(logConsumer);
-
-        @Test
-        public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
-                greetBuiltImage.start();
-                HttpRequest request = HttpRequest.newBuilder()
-                                .uri(new URI("http://" + greetBuiltImage.getHost() + ":"
-                                                + greetBuiltImage.getFirstMappedPort() + "/jsongreet"))
-                                .header("Content-Type", "application/json")
-                                .header("Accept", "application/json")
-                                .timeout(Duration.ofSeconds(10))
-                                .POST(HttpRequest.BodyPublishers
-                                                .ofString("{\"workflowdata\" : {\"name\": \"John\", \"language\": \"English\"}}"))
-                                .build();
-                HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
-                assertEquals(201, response.statusCode());
-                greetBuiltImage.stop();
-        }
-
-        @Container
-        private GenericContainer greetWithInputSchemaBuiltImage = new GenericContainer(
-                        new ImageFromDockerfile(
-                                        "dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00))
-                                        .withDockerfile(Paths.get(getScriptDirPath(),
-                                                        "resources/greet-with-inputschema", "Dockerfile"))
-                                        .withBuildArg("BUILDER_IMAGE_TAG", getTestImage()))
-                        .withExposedPorts(8080)
-                        .withEnv("KOGITO_SERVICE_URL", "http://localhost:8080")
-                        .waitingFor(Wait.forHttp("/greeting"))
-                        .withLogConsumer(logConsumer);
-
-        @Test
-        public void testBuiltContainerWithInputSchemaAnswerCorrectly()
-                        throws URISyntaxException, IOException, InterruptedException {
-                greetWithInputSchemaBuiltImage.start();
-                HttpRequest request = HttpRequest.newBuilder()
-                                .uri(new URI("http://" + greetWithInputSchemaBuiltImage.getHost() + ":"
-                                                + greetWithInputSchemaBuiltImage.getFirstMappedPort() + "/greeting"))
-                                .header("Content-Type", "application/json")
-                                .header("Accept", "application/json")
-                                .timeout(Duration.ofSeconds(10))
-                                .POST(HttpRequest.BodyPublishers
-                                                .ofString("{\"name\": \"John\", \"language\": \"English\"}"))
-                                .build();
-                HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
-                assertEquals(201, response.statusCode());
-                greetWithInputSchemaBuiltImage.stop();
-        }
-
-        public static void main(String... args) throws Exception {
-                // Log docker build. Source:
-                // https://github.com/testcontainers/testcontainers-java/issues/3093
-                System.setProperty(
-                                "org.slf4j.simpleLogger.log.com.github.dockerjava.api.command.BuildImageResultCallback",
-                                "debug");
-                ConsoleLauncher.main("--select-class=" + RunTests.class.getName(),
-                                "--reports-dir=" + Paths.get(getOutputDir()).toString());
-        }
-
-        static String getTestImage() {
-                return System.getenv("TEST_IMAGE");
-        }
-
-        static String getOutputDir() {
-                return System.getenv("OUTPUT_DIR");
-        }
-
-        static String getScriptDirPath() {
-                return System.getenv("TESTS_SCRIPT_DIR_PATH");
-        }
-}
\ No newline at end of file
diff --git a/packages/sonataflow-devmode-image/README.md b/packages/sonataflow-devmode-image/README.md
deleted file mode 100644
index 61e0381674c..00000000000
--- a/packages/sonataflow-devmode-image/README.md
+++ /dev/null
@@ -1,104 +0,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.
--->
-
-# sonataflow-devmode
-
-This package contains the `cekit` image descriptor (`sonataflow-devmode-image.yaml`) and modules needed to build the `sonataflow-devmode`
-image along with the modules and scripts provided in `@kie-tools/sonataflow-image-common`.
-
-## Additional requirements
-
-- **python3** with the following packages installed:
-  - `behave` `lxml` `docker` `docker-squash` `elementPath` `pyyaml` `ruamel.yaml` `python-dateutil` `Jinja2` `pykwalify` `colorlog` `click`
-- **cekit 4.11.0**: [docs.cekit.io](https://docs.cekit.io/en/latest/index.html)
-- **s2i**: [source-to-image](https://github.com/openshift/source-to-image)
-- **make**
-- **docker**
-
-## Build
-
-- Enable the image to be built:
-
-  ```bash
-  export KIE_TOOLS_BUILD__buildContainerImages=true
-  ```
-
-- (Optional) The image name and tags can be customized by setting the following environment variables:
-
-  ```bash
-  export SONATAFLOW_DEVMODE_IMAGE__registry=<registry>
-  export SONATAFLOW_DEVMODE_IMAGE__account=<account>
-  export SONATAFLOW_DEVMODE_IMAGE__name=<image-name>
-  export SONATAFLOW_DEVMODE_IMAGE__buildTag=<image-tag>
-  ```
-
-  > Default values can be found [here](./env/index.js).
-
-- After optionally setting up the environment variables, run the following in the root folder of the repository to build the package:
-
-  ```bash
-  pnpm -F @kie-tools/sonataflow-devmode-image build:prod
-  ```
-
-- Then check if the image is correctly stored:
-
-  ```bash
-  docker images
-  ```
-
-## Testing the generated image (only for Linux)
-
-- With the image generated, run:
-
-  ```bash
-  pnpm -F @kie-tools/sonataflow-devmode-image image:test
-  ```
-
-## Envs
-
-|                 Name                 |                    Description                     |                          Default                          |
-| :----------------------------------: | :------------------------------------------------: | :-------------------------------------------------------: |
-| `SONATAFLOW_DEVMODE_IMAGE__registry` | Registry where the generated image will be pushed. |                        "docker.io"                        |
-| `SONATAFLOW_DEVMODE_IMAGE__account`  |        Account where image will be stored.         |                         "apache"                          |
-|   `SONATAFLOW_DEVMODE_IMAGE__name`   |              SWF DevMode Image name.               |                   "sonataflow-devmode"                    |
-| `SONATAFLOW_DEVMODE_IMAGE__buildTag` |                    Tag to use .                    | $KIE_TOOLS_BUILD\_\_streamName (E.g., "main" or "10.0.x") |
-
----
-
-Apache KIE (incubating) is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the name of Apache Incubator. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-Some of the incubating project’s releases may not be fully compliant with ASF
-policy. For example, releases may have incomplete or un-reviewed licensing
-conditions. What follows is a list of known issues the project is currently
-aware of (note that this list, by definition, is likely to be incomplete):
-
-- Hibernate, an LGPL project, is being used. Hibernate is in the process of
-  relicensing to ASL v2
-- Some files, particularly test files, and those not supporting comments, may
-  be missing the ASF Licensing Header
-
-If you are planning to incorporate this work into your product/project, please
-be aware that you will need to conduct a thorough licensing review to determine
-the overall implications of including this work. For the current status of this
-project through the Apache Incubator visit:
-https://incubator.apache.org/projects/kie.html
diff --git a/packages/sonataflow-devmode-image/env/index.js b/packages/sonataflow-devmode-image/env/index.js
deleted file mode 100644
index 660f9197301..00000000000
--- a/packages/sonataflow-devmode-image/env/index.js
+++ /dev/null
@@ -1,60 +0,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.
- */
-
-const { varsWithName, composeEnv, getOrDefault } = require("@kie-tools-scripts/build-env");
-const sonataFlowQuarkusDevUiEnv = require("@kie-tools/sonataflow-quarkus-devui/env");
-
-const rootEnv = require("@kie-tools/root-env/env");
-
-module.exports = composeEnv([rootEnv], {
-  vars: varsWithName({
-    SONATAFLOW_DEVMODE_IMAGE__registry: {
-      default: "docker.io",
-      description: "E.g., `docker.io` or `quay.io`.",
-    },
-    SONATAFLOW_DEVMODE_IMAGE__account: {
-      default: "apache",
-      description: "E.g,. `apache` or `kie-tools-bot`",
-    },
-    SONATAFLOW_DEVMODE_IMAGE__name: {
-      default: "incubator-kie-sonataflow-devmode",
-      description: "Name of the image itself.",
-    },
-    SONATAFLOW_DEVMODE_IMAGE__buildTag: {
-      default: rootEnv.env.root.streamName,
-      description: "Tag version of this image. E.g., `main` or `10.0.x` or `10.0.0",
-    },
-    SONATAFLOW_DEVMODE_IMAGE__sonataflowQuarkusDevUiVersion: {
-      default: sonataFlowQuarkusDevUiEnv.env.sonataflowQuarkusDevuiExtension.version,
-      description: "SonataFlow Quarkus Dev UI version",
-    },
-  }),
-  get env() {
-    return {
-      sonataflowDevModeImage: {
-        registry: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__registry),
-        account: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__account),
-        name: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__name),
-        tag: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__buildTag),
-        version: require("../package.json").version,
-        sonataflowQuarkusDevUiVersion: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__sonataflowQuarkusDevUiVersion),
-      },
-    };
-  },
-});
diff --git a/packages/sonataflow-devmode-image/install.js b/packages/sonataflow-devmode-image/install.js
deleted file mode 100644
index 79fee7113bc..00000000000
--- a/packages/sonataflow-devmode-image/install.js
+++ /dev/null
@@ -1,64 +0,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.
- */
-
-const { execSync } = require("child_process");
-const fs = require("fs");
-
-const buildEnv = require("./env");
-const path = require("path");
-const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
-const sonataflowImageCommonDir = path.dirname(require.resolve("@kie-tools/sonataflow-image-common/package.json"));
-const replaceInFile = require("replace-in-file");
-
-const activateCmd =
-  process.platform === "win32"
-    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
-    : `. ${pythonVenvDir}/venv/bin/activate`;
-
-execSync(
-  `${activateCmd} && \
-  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowDevModeImage.version} --source-folder ./resources`,
-  { stdio: "inherit" }
-);
-
-// Find and read the -image.yaml file
-const resourcesPath = path.resolve(__dirname, "./resources");
-const files = fs.readdirSync(resourcesPath);
-const imageYamlFiles = files.filter((fileName) => fileName.endsWith("-image.yaml"));
-if (imageYamlFiles.length !== 1) {
-  throw new Error("There should only be one -image.yaml file on ./resources!");
-}
-const originalYamlPath = path.join(resourcesPath, imageYamlFiles[0]);
-let imageYaml = fs.readFileSync(originalYamlPath, "utf8");
-
-const imageUrl = `${buildEnv.env.sonataflowDevModeImage.registry}/${buildEnv.env.sonataflowDevModeImage.account}/${buildEnv.env.sonataflowDevModeImage.name}`;
-
-// Replace the whole string between quotes ("") with the image name
-imageYaml = imageYaml.replace(/(?<=")(.*sonataflow-devmode.*)(?=")/gm, imageUrl);
-
-// Write file and then rename it to match the image name
-fs.writeFileSync(originalYamlPath, imageYaml);
-fs.renameSync(originalYamlPath, path.join(resourcesPath, `${buildEnv.env.sonataflowDevModeImage.name}-image.yaml`));
-
-// Replace image URL in .feature files
-replaceInFile.sync({
-  files: ["**/*.feature"],
-  from: /@docker.io\/apache\/.*/g,
-  to: `@${imageUrl}`,
-});
diff --git a/packages/sonataflow-devmode-image/package.json b/packages/sonataflow-devmode-image/package.json
deleted file mode 100644
index d46b4029e61..00000000000
--- a/packages/sonataflow-devmode-image/package.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "private": true,
-  "name": "@kie-tools/sonataflow-devmode-image",
-  "version": "0.0.0",
-  "description": "",
-  "license": "Apache-2.0",
-  "homepage": "https://github.com/apache/incubator-kie-tools",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/apache/incubator-kie-tools.git"
-  },
-  "bugs": {
-    "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: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 && pnpm copy-devui-repo",
-    "copy-devui-repo": "tar -C ~/.m2/repository/org/apache/kie/ -cvf build/modules/sonataflow/devmode/build-config/sonataflow-quarkus-devui-maven-repo.tar sonataflow && tar -C ~/.m2/repository/org/kie/ -cvf build/modules/sonataflow/devmode/build-config/kie-tools-maven-base-maven-repo.tar kie-tools-maven-base",
-    "copy-test-assets": "run-script-os",
-    "copy-test-assets:linux:darwin": "cp -R ./node_modules/@kie-tools/sonataflow-image-common/test-resources/* build && cp -R test-resources/* build",
-    "format": "prettier --write . --ignore-path=../../.prettierignore --ignore-path=../../.gitignore",
-    "image:build": "run-script-os",
-    "image:build:darwin:win32": "echo \"Build skipped on macOS and Windows\"",
-    "image:build:linux": "pnpm setup:env make -C ./build build",
-    "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 \"cp -r build/target/test/results dist-e2e-tests/\"",
-    "image:test:darwin:win32": "echo \"Tests skipped on macOS and Windows\"",
-    "image:test:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
-    "install": "node install.js && pnpm format",
-    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env SWF_IMAGE_REGISTRY=$(build-env sonataflowDevModeImage.registry) SWF_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowDevModeImage.account) SWF_IMAGE_NAME=$(build-env sonataflowDevModeImage.name) SWF_IMAGE_TAG=$(build-env sonataflowDevModeImage.tag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version) SONATAFLOW_QUARKUS_DEVUI_VERSION=$(build-env sonataflowDevModeImage.sonataflowQuarkusDevUiVersion)"
-  },
-  "devDependencies": {
-    "@kie-tools/python-venv": "workspace:*",
-    "@kie-tools/root-env": "workspace:*",
-    "@kie-tools/sonataflow-image-common": "workspace:*",
-    "@kie-tools/sonataflow-quarkus-devui": "workspace:*",
-    "cross-env": "^7.0.3",
-    "replace-in-file": "^7.1.0",
-    "rimraf": "^3.0.2",
-    "run-script-os": "^1.1.6"
-  },
-  "kieTools": {
-    "requiredPreinstalledCliCommands": [
-      "python3",
-      "make",
-      "s2i"
-    ]
-  }
-}
diff --git a/packages/sonataflow-devmode-image/resources/incubator-kie-sonataflow-devmode-image.yaml b/packages/sonataflow-devmode-image/resources/incubator-kie-sonataflow-devmode-image.yaml
deleted file mode 100644
index a4a7f56a14c..00000000000
--- a/packages/sonataflow-devmode-image/resources/incubator-kie-sonataflow-devmode-image.yaml
+++ /dev/null
@@ -1,85 +0,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.
-#
-- name: builder
-  from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
-  version: "0.0.0"
-  modules:
-    repositories:
-      - path: modules
-    install:
-      - name: org.kie.kogito.system.user
-      - name: org.kie.kogito.logging
-      - name: org.kie.kogito.launch.scripts
-      - name: org.kie.kogito.dynamic.resources
-      - name: org.kie.kogito.maven.common
-      - name: org.kie.kogito.project.versions
-      - name: org.kie.sonataflow.common.scripts
-      - name: org.kie.sonataflow.devmode.build-config
-      - name: org.kie.sonataflow.common.build
-
-  packages:
-    manager: microdnf
-
-- name: "docker.io/apache/incubator-kie-sonataflow-devmode"
-  from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
-  version: "0.0.0"
-  description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled"
-
-  labels:
-    - name: "io.quarkus.platform.version"
-      value: "### SET ME DURING BUILD PROCESS ###"
-    - name: "org.kie.kogito.version"
-      value: "### SET ME DURING BUILD PROCESS ###"
-    - name: "maintainer"
-      value: "Apache KIE <dev@kie.apache.org>"
-    - name: "io.k8s.description"
-      value: "Sonataflow DevMode with Quarkus extensions libraries preinstalled."
-    - name: "io.k8s.display-name"
-      value: "Sonataflow DevMode"
-    - name: "io.openshift.tags"
-      value: "kogito,development,serverless,workflow"
-    - name: "io.openshift.expose-services"
-      value: "8080:http,5005:http"
-
-  packages:
-    manager: microdnf
-
-  modules:
-    repositories:
-      - path: modules
-    install:
-      - name: org.kie.kogito.system.user
-      - name: org.kie.kogito.logging
-      - name: org.kie.kogito.launch.scripts
-      - name: org.kie.kogito.dynamic.resources
-      - name: org.kie.kogito.maven.common
-      - name: org.kie.kogito.project.versions
-      - name: org.kie.sonataflow.common.scripts
-      - name: org.kie.sonataflow.devmode.runtime.common
-      - name: org.kie.sonataflow.devmode.runtime.community
-
-  ports:
-    - value: 8080
-    - value: 5005
-
-  run:
-    workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
-    user: 1001
-    cmd:
-      - "/home/kogito/launch/run-app-devmode.sh"
diff --git a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure
deleted file mode 100644
index 8c27f782926..00000000000
--- a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/configure
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-# mvn install:install-file \
-#    -Dfile=/tmp/artifacts/sonataflow-quarkus-devui.jar \
-#    -DgroupId=org.apache.kie.sonataflow \
-#    -DartifactId=sonataflow-quarkus-devui \
-#    -Dversion=$SONATAFLOW_QUARKUS_DEVUI_VERSION \
-#    -Dpackaging=jar \
-#    -DgeneratePom=true
-
-ls -la /tmp/artifacts
-
-mkdir -p "${KOGITO_HOME}"/.m2/repository/org/apache/kie/
-mkdir -p "${KOGITO_HOME}"/.m2/repository/org/kie/
-tar xf /tmp/artifacts/sonataflow-quarkus-devui-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository/org/apache/kie/
-tar xf /tmp/artifacts/kie-tools-maven-base-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository/org/kie/
-
-find "${KOGITO_HOME}"/.m2/repository -name _remote.repositories | xargs rm
-
diff --git a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/module.yaml b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/module.yaml
deleted file mode 100644
index 2150cf0300b..00000000000
--- a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/build-config/module.yaml
+++ /dev/null
@@ -1,39 +0,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.
-#
-schema_version: 1
-name: org.kie.sonataflow.devmode.build-config
-version: "0.0.0"
-description: "Kogito Serverless Workflow devmode image build configuration"
-
-envs:
-  - name: "SCRIPT_DEBUG"
-    value: "false"
-  - name: QUARKUS_EXTENSIONS
-    # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too!
-    # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270
-    value: org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION},smallrye-health,org.apache.kie.sonataflow:sonataflow-quarkus-devui:${SONATAFLOW_QUARKUS_DEVUI_VERSION},org.kie:kie-addons-quarkus-source-files:${KOGITO_VERSION},org.kie:kie-addons-quarkus-process-management:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-jobs-service-embedded:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-data-index-inmemory:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie:kie-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION}
-
-artifacts:
-  - name: sonataflow-quarkus-devui-maven-repo.tar
-    path: ./sonataflow-quarkus-devui-maven-repo.tar
-  - name: kie-tools-maven-base-maven-repo.tar
-    path: ./kie-tools-maven-base-maven-repo.tar
-
-execute:
-  - script: configure
diff --git a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh
deleted file mode 100755
index 6f5ec36109e..00000000000
--- a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# shellcheck source=/dev/null
-source "${script_dir_path}"/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    printenv
-fi
-
-# copy .mvn/jvm-config from resources to project's base dir.
-find . -maxdepth 5 -name  'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
-source "${script_dir_path}"/configure-jvm-mvn.sh
-
-# `-o` means offline mode
-offline_param="-o"
-if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
-    ${KOGITO_HOME}/launch/add-extension.sh "${QUARKUS_EXTENSIONS}" "true"
-    offline_param=""
-fi
-
-"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-    ${offline_param} \
-    -s "${MAVEN_SETTINGS_PATH}" \
-    -DskipTests \
-    -Dquarkus.http.host=0.0.0.0 \
-    -Dquarkus.test.continuous-testing=${QUARKUS_CONTINUOUS_TESTING:-disabled} \
-    -Dquarkus.analytics.disabled=${QUARKUS_ANALYTICS_DISABLED:true} \
-    clean compile quarkus:dev
\ No newline at end of file
diff --git a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/configure.sh b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/configure.sh
deleted file mode 100644
index 582997ada49..00000000000
--- a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/configure.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ADDED_DIR="${SCRIPT_DIR}"/added
-LAUNCH_DIR="${KOGITO_HOME}"/launch
-
-cp -v "${ADDED_DIR}"/* "${LAUNCH_DIR}"
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/module.yaml b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/module.yaml
deleted file mode 100644
index 0cb80d5fd7a..00000000000
--- a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/common/module.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
-schema_version: 1
-name: org.kie.sonataflow.devmode.runtime.common
-version: "0.0.0"
-description: "Kogito Serverless Workflow devmode common module"
-
-execute:
-  - script: configure.sh
diff --git a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/configure.sh b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/configure.sh
deleted file mode 100644
index 7404a5c1e5f..00000000000
--- a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/configure.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SOURCES_DIR=/tmp/artifacts
-
-mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
-mkdir -p "${KOGITO_HOME}"/.m2/repository
-
-# Unzip Quarkus app and Maven repository
-tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}"
-tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/module.yaml b/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/module.yaml
deleted file mode 100644
index db3ac439371..00000000000
--- a/packages/sonataflow-devmode-image/resources/modules/sonataflow/devmode/runtime/community/module.yaml
+++ /dev/null
@@ -1,51 +0,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.
-#
-schema_version: 1
-name: org.kie.sonataflow.devmode.runtime.community
-version: "0.0.0"
-description: "Kogito Serverless Workflow devmode with required extensions"
-
-envs:
-  - name: QUARKUS_KOGITO_DEVSERVICES_ENABLED
-    description: Whether to enable Kogito Devservices or not. Default to "false" since Data Index needs Docker.
-    value: "false"
-  - name: QUARKUS_DEVSERVICES_ENABLED
-    description: Whether to enable Quarkus Devservices or not. Default to "false" since the Kafka broker needs Docker.
-    value: "false"
-  - name: QUARKUS_KUBERNETES_CLIENT_DEVSERVICES_ENABLED
-    description: Whether to enable Kogito Devservices or not. Default to "false" since Kubernetes objects are managed by the Kogito Serverless Operator.
-    value: "false"
-  - name: QUARKUS_CONTINUOUS_TESTING
-    description: Whether to enable Quarkus continous testing on DevMode or not. Default to "disabled".
-    value: "disabled"
-  - name: QUARKUS_ANALYTICS_DISABLED
-    description: Whether to disable the Quarkus analytics data collecting on DevMode or not. Default to "true".
-    value: "true"
-  - name: KOGITO_CODEGEN_PROCESS_FAILONERROR
-    description: Boolean flag that will prevent Dev Mode to crash if the provided workflow is wrong.
-    value: "false"
-
-artifacts:
-  - image: builder
-    path: /home/kogito/build_output/kogito-swf-quarkus-app.tar
-  - image: builder
-    path: /home/kogito/build_output/kogito-swf-maven-repo.tar
-
-execute:
-  - script: configure.sh
diff --git a/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode-2.feature b/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode-2.feature
deleted file mode 100644
index e6359d75340..00000000000
--- a/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode-2.feature
+++ /dev/null
@@ -1,14 +0,0 @@
-@docker.io/apache/incubator-kie-sonataflow-devmode
-Feature: Serverless Workflow images common
-
-  Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository
-    When container is started with command bash
-    Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom should exist and be a directory
-      And file /home/kogito/.m2/repository/org/apache/kie/sonataflow/sonataflow-quarkus/ should exist and be a directory
-
-  # This check should be enabled again once a similar check is done on runtimes
-  # to make sure we only have one version of quarkus bom ...
-  # See https://issues.redhat.com/browse/KOGITO-8555 to enable again
-  # Scenario: verify if there is no dependencies with multiple versions in /home/kogito/.m2/repository
-  #   When container is started with command bash
-  #   Then run sh -c 'ls /home/kogito/.m2/repository/io/quarkus/quarkus-bom  | wc -l' in container and immediately check its output for 1
diff --git a/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode.feature b/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode.feature
deleted file mode 100644
index 7ba91ee955e..00000000000
--- a/packages/sonataflow-devmode-image/test-resources/tests/features/sonataflow-devmode.feature
+++ /dev/null
@@ -1,144 +0,0 @@
-@docker.io/apache/incubator-kie-sonataflow-devmode
-Feature: Serverless Workflow devmode images
-
-  Scenario: Verify if container starts in devmode by default
-    When container is started with env
-      | variable     | value |
-      | SCRIPT_DEBUG | true  |
-    Then check that page is served
-      | property             | value             |
-      | port                 | 8080              |
-      | path                 | /q/health/ready   |
-      | wait                 | 480               |
-      | request_method       | GET               |
-      | expected_status_code | 200               |
-    And container log should contain --no-transfer-progress
-    And container log should contain -Duser.home=/home/kogito -o
-    And container log should contain -Dquarkus.test.continuous-testing=disabled
-    And container log should match regex Installed features:.*kogito-serverless-workflow
-    And container log should match regex Installed features:.*kie-addon-knative-eventing-extension
-    And container log should match regex Installed features:.*smallrye-health
-    And container log should match regex Installed features:.*sonataflow-quarkus-devui
-    And container log should match regex Installed features:.*kie-addon-source-files-extension
-    And container log should match regex Installed features:.*kogito-addons-quarkus-jobs-service-embedded
-    And container log should match regex Installed features:.*kogito-addons-quarkus-data-index-inmemory
-
-  Scenario: Verify if container starts correctly when continuous testing is enabled
-    When container is started with env
-      | variable                   | value    |
-      | SCRIPT_DEBUG               | true     |
-      | QUARKUS_CONTINUOUS_TESTING | enabled  |
-    Then check that page is served
-      | property             | value             |
-      | port                 | 8080              |
-      | path                 | /q/health/ready   |
-      | wait                 | 480               |
-      | request_method       | GET               |
-      | expected_status_code | 200               |
-    And container log should contain -Duser.home=/home/kogito
-    And container log should not contain /bin/mvn -B -X --batch-mode -o
-    And container log should contain -Dquarkus.test.continuous-testing=enabled
-
-  Scenario: Verify if container starts correctly when QUARKUS_EXTENSIONS env is used
-    When container is started with env
-      | variable                   | value                                    |
-      | SCRIPT_DEBUG               | true                                     |
-      | QUARKUS_EXTENSIONS         | io.quarkus:quarkus-elytron-security-jdbc |
-    Then check that page is served
-      | property             | value             |
-      | port                 | 8080              |
-      | path                 | /q/health/ready   |
-      | wait                 | 960               |
-      | request_method       | GET               |
-      | expected_status_code | 200               |
-    And container log should contain -Duser.home=/home/kogito
-    And container log should not contain /bin/mvn -B -X --batch-mode -o
-    And container log should contain Extension io.quarkus:quarkus-elytron-security-jdbc has been installed
-    And container log should match regex Installed features:.*kogito-serverless-workflow
-    And container log should match regex Installed features:.*kie-addon-knative-eventing-extension
-    And container log should match regex Installed features:.*smallrye-health
-    And container log should match regex Installed features:.*sonataflow-quarkus-devui
-    And container log should match regex Installed features:.*kie-addon-source-files-extension
-    And container log should match regex Installed features:.*kogito-addons-quarkus-jobs-service-embedded
-    And container log should match regex Installed features:.*kogito-addons-quarkus-data-index-inmemory
-    And container log should match regex Installed features:.*security-jdbc
-
-  Scenario: verify that the embedded jobs-service is running
-    When container is started with env
-      | variable                    | value |
-      | QUARKUS_DEVSERVICES_ENABLED | false |
-    Then check that page is served
-      | property             | value             |
-      | port                 | 8080              |
-      | path                 | /q/health/ready   |
-      | wait                 | 480               |
-      | request_method       | GET               |
-      | expected_status_code | 200               |
-    And container log should contain Embedded Postgres started at port
-    And container log should contain SET Leader
-    And check that page is served
-      | property             | value             |
-      | port                 | 8080              |
-      | path                 | /v2/jobs/1234     |
-      | wait                 | 480               |
-      | request_method       | GET               |
-      | expected_status_code | 404               |
-      | expected_phrase      | Job not found     |
-
-  Scenario: verify that the embedded data-index service is running
-    When container is started with env
-      | variable                    | value |
-      | QUARKUS_DEVSERVICES_ENABLED | false |
-    Then check that page is served
-      | property             | value             |
-      | port                 | 8080              |
-      | path                 | /q/health/ready   |
-      | request_method       | GET               |
-      | wait                 | 480               |
-      | expected_status_code | 200               |
-    And container log should contain Embedded Postgres started at port
-    And check that page is served
-      | property             | value                                    |
-      | port                 | 8080                                     |
-      | path                 | /graphql                                 |
-      | request_method       | POST                                     |
-      | request_body         | { "query": "{ProcessInstances{ id } }" } |
-      | wait                 | 480                                      |
-      | expected_status_code | 200                                      |
-      | expected_phrase      | {"data":{"ProcessInstances":[]}}         |
-
-  Scenario: verify that the serverless workflow devui is running
-    When container is started with env
-      | variable                    | value |
-      | QUARKUS_DEVSERVICES_ENABLED | false |
-    Then check that page is served
-      | property             | value                                                                 |
-      | port                 | 8080                                                                  |
-      | path                 | /q/dev-ui/org.kie.kogito-addons-quarkus-data-index-inmemory/dataindex |
-      | request_method       | GET                                                                   |
-      | wait                 | 480                                                                   |
-      | expected_status_code | 200                                                                   |
-    And check that page is served
-      | property             | value                                                                  |
-      | port                 | 8080                                                                   |
-      | path                 | /q/dev-ui/org.apache.kie.sonataflow.sonataflow-quarkus-devui/workflows |
-      | request_method       | GET                                                                    |
-      | wait                 | 480                                                                    |
-      | expected_status_code | 200                                                                    |
-
-  Scenario: Verify if container starts in devmode with service discovery enabled
-    When container is started with env
-      | variable                    | value |
-      | QUARKUS_DEVSERVICES_ENABLED | false |
-    Then check that page is served
-      | property             | value             |
-      | port                 | 8080              |
-      | path                 | /q/health/ready   |
-      | wait                 | 480               |
-      | request_method       | GET               |
-      | expected_status_code | 200               |
-    And container log should contain kogito-addon-microprofile-config-service-catalog-extension
-
-  Scenario: Verify if container have the KOGITO_CODEGEN_PROCESS_FAILONERROR env set to false
-    When container is started with command bash
-    Then run sh -c 'echo $KOGITO_CODEGEN_PROCESS_FAILONERROR' in container and immediately check its output for false
diff --git a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/launch.json b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/launch.json
deleted file mode 100644
index 82cbbc6179c..00000000000
--- a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/launch.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "java",
-      "name": "RunTests-port-4004",
-      "request": "attach",
-      "hostName": "localhost",
-      "port": 4004
-    },
-    {
-      "type": "java",
-      "name": "Debug (Launch) - RunTests",
-      "request": "launch",
-      "mainClass": "RunTests",
-      "projectName": "RunTests"
-    }
-  ]
-}
diff --git a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/settings.json b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/settings.json
deleted file mode 100644
index b57ea44670f..00000000000
--- a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/.vscode/settings.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "java.import.gradle.enabled": false,
-  "java.import.maven.enabled": false,
-  "java.eclipse.downloadSources": true,
-  "files.exclude": {
-    "bin/": true,
-    ".eclipse/": true,
-    ".project": true,
-    ".classpath": true,
-    "build.gradle": true
-  },
-  "java.completion.importOrder": ["", "javax", "java", "#"]
-}
diff --git a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/resources/greet.sw.json b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/resources/greet.sw.json
deleted file mode 100644
index a619b3b8bc7..00000000000
--- a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/resources/greet.sw.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "id": "jsongreet",
-  "version": "1.0",
-  "name": "Greeting workflow",
-  "description": "JSON based greeting workflow",
-  "start": "ChooseOnLanguage",
-  "functions": [
-    {
-      "name": "greetFunction",
-      "type": "custom",
-      "operation": "sysout"
-    }
-  ],
-  "states": [
-    {
-      "name": "ChooseOnLanguage",
-      "type": "switch",
-      "dataConditions": [
-        {
-          "condition": "${ .language == \"English\" }",
-          "transition": "GreetInEnglish"
-        },
-        {
-          "condition": "${ .language == \"Spanish\" }",
-          "transition": "GreetInSpanish"
-        }
-      ],
-      "defaultCondition": {
-        "transition": "GreetInEnglish"
-      }
-    },
-    {
-      "name": "GreetInEnglish",
-      "type": "inject",
-      "data": {
-        "greeting": "Hello from JSON Workflow, "
-      },
-      "transition": "GreetPerson"
-    },
-    {
-      "name": "GreetInSpanish",
-      "type": "inject",
-      "data": {
-        "greeting": "Saludos desde JSON Workflow, "
-      },
-      "transition": "GreetPerson"
-    },
-    {
-      "name": "GreetPerson",
-      "type": "operation",
-      "actions": [
-        {
-          "name": "greetAction",
-          "functionRef": {
-            "refName": "greetFunction",
-            "arguments": {
-              "message": ".greeting+.name"
-            }
-          }
-        }
-      ],
-      "end": {
-        "terminate": true
-      }
-    }
-  ]
-}
diff --git a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
deleted file mode 100644
index 473be499be2..00000000000
--- a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
+++ /dev/null
@@ -1,105 +0,0 @@
-///usr/bin/env jbang "$0" "$@" ; exit $?
-
-/*
- * 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.
- */
-
-//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
-
-// engine to run the tests (tests are written with Junit5):
-//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1
-
-// testcontainers
-//DEPS org.testcontainers:testcontainers:1.19.3
-//DEPS org.testcontainers:junit-jupiter:1.19.3
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.nio.file.Paths;
-import java.time.Duration;
-import org.junit.jupiter.api.Test;
-import org.junit.platform.console.ConsoleLauncher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.BindMode;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-@Testcontainers
-public class RunTests {
-
-    private static Logger LOGGER = LoggerFactory.getLogger(RunTests.class);
-
-    private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER);
-
-    @Container
-    private GenericContainer devModeImage = new GenericContainer(getTestImage())
-            .withEnv("MAVEN_ARGS_APPEND", "-Ddebug=false -Dquarkus.devservices.enabled=false")
-            .withFileSystemBind(getScriptDirPath() + "/resources",
-                    "/home/kogito/serverless-workflow-project/src/main/resources", BindMode.READ_ONLY)
-            .withExposedPorts(8080)
-            .waitingFor(Wait.forHttp("/jsongreet"))
-            .withStartupTimeout(Duration.ofMinutes(2))
-            .withLogConsumer(logConsumer);
-
-    @Test
-    public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException {
-        devModeImage.start();
-        HttpRequest request = HttpRequest.newBuilder()
-                .uri(new URI(
-                        "http://" + devModeImage.getHost() + ":" + devModeImage.getFirstMappedPort() + "/jsongreet"))
-                .header("Content-Type", "application/json")
-                .header("Accept", "application/json")
-                .timeout(Duration.ofSeconds(10))
-                .POST(HttpRequest.BodyPublishers
-                        .ofString("{\"workflowdata\" : {\"name\": \"John\", \"language\": \"English\"}}"))
-                .build();
-        HttpResponse<String> response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString());
-        assertEquals(201, response.statusCode());
-    }
-
-    public static void main(String... args) throws Exception {
-        ConsoleLauncher.main("--select-class=" + RunTests.class.getName(),
-                "--reports-dir=" + Paths.get(getOutputDir()).toString());
-    }
-
-    static String getTestImage() {
-        return System.getenv("TEST_IMAGE");
-    }
-
-    static String getOutputDir() {
-        return System.getenv("OUTPUT_DIR");
-    }
-
-    static String getScriptDirPath() {
-        return System.getenv("TESTS_SCRIPT_DIR_PATH");
-    }
-}
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/README.md b/packages/sonataflow-image-common/README.md
deleted file mode 100644
index 71c4aa3c313..00000000000
--- a/packages/sonataflow-image-common/README.md
+++ /dev/null
@@ -1,80 +0,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.
--->
-
-# sonataflow-image-common
-
-This package contains the necessary resources to help other modules to build the `sonataflow-{builder|devmode}` images.
-
-The contents of this package are:
-
-- [Makefile](./resources/Makefile): convenience tool to help building and testing the images.
-- [Cekit Modules](./resources/modules): Common Cekit Module descriptors to be used when building the images.
-- [Utility Scripts](./resources/scripts): Utility scripts to be used during the image building process or bootstraping packages
-- [Testing infra](./resources/tests): Testing infra to help testing the generated images
-
-## Requirements
-
-- **python3** with the following packages installed:
-  - `behave` `lxml` `docker` `docker-squash` `elementPath` `pyyaml` `ruamel.yaml` `python-dateutil` `Jinja2` `pykwalify` `colorlog` `click`
-- **cekit 4.11.0**: [docs.cekit.io](https://docs.cekit.io/en/latest/index.html)
-- **make**
-- **docker**
-
-## Using the Makefile
-
-To build and tests the images the package provides a convenient `Makefile` that will do the hard work for you. It relies in the following Envs (or arguments):
-
-- `SWF_IMAGE_NAME`: (required) Specifies the image name to build. It should match the image descriptor.
-- `SWF_IMAGE_REGISTRY`: Image registry to use, defaults to 'docker.io'
-- `SWF_IMAGE_REGISTRY_ACCOUNT`: Image registry account to use, defaults to 'apache'
-- `SWF_IMAGE_TAG`: Custom tag for the image. If not provided it will use the version in the image descriptor.
-
-- `QUARKUS_PLATFORM_VERSION`: (required) Quarkus platform version to use inside the image.
-- `KOGITO_VERSION`: (required) Kogito platform version to use inside the image.
-
-- `CEKIT_BUILD_OPTIONS`: extra build options, please refer to [docs.cekit.io](https://docs.cekit.io/en/latest/index.html)
-- `BUILD_ENGINE`: (docker/podman) engine used to build the image, defaults to docker
-- `BUILD_ENGINE_OPTIONS`: extra build options to pass to the build engine
-
-## Building images..
-
-- Copy your image descriptor and modules along with the contents of the `resources` into a separate folder (eg: `/tmp/build`)
-- ***
-
-Apache KIE (incubating) is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the name of Apache Incubator. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-Some of the incubating project’s releases may not be fully compliant with ASF
-policy. For example, releases may have incomplete or un-reviewed licensing
-conditions. What follows is a list of known issues the project is currently
-aware of (note that this list, by definition, is likely to be incomplete):
-
-- Hibernate, an LGPL project, is being used. Hibernate is in the process of
-  relicensing to ASL v2
-- Some files, particularly test files, and those not supporting comments, may
-  be missing the ASF Licensing Header
-
-If you are planning to incorporate this work into your product/project, please
-be aware that you will need to conduct a thorough licensing review to determine
-the overall implications of including this work. For the current status of this
-project through the Apache Incubator visit:
-https://incubator.apache.org/projects/kie.html
diff --git a/packages/sonataflow-image-common/env/index.js b/packages/sonataflow-image-common/env/index.js
deleted file mode 100644
index fd84bd0e7a2..00000000000
--- a/packages/sonataflow-image-common/env/index.js
+++ /dev/null
@@ -1,31 +0,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.
- */
-
-const { varsWithName, composeEnv } = require("@kie-tools-scripts/build-env");
-
-module.exports = composeEnv([require("@kie-tools/root-env/env")], {
-  vars: varsWithName({}),
-  get env() {
-    return {
-      sonataflowImageCommon: {
-        version: require("../package.json").version,
-      },
-    };
-  },
-});
diff --git a/packages/sonataflow-image-common/install.js b/packages/sonataflow-image-common/install.js
deleted file mode 100644
index 66430aad443..00000000000
--- a/packages/sonataflow-image-common/install.js
+++ /dev/null
@@ -1,35 +0,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.
- */
-
-const { execSync } = require("child_process");
-
-const buildEnv = require("./env");
-const path = require("path");
-const pythonVenvDir = path.dirname(require.resolve("@kie-tools/python-venv/package.json"));
-
-const activateCmd =
-  process.platform === "win32"
-    ? `${pythonVenvDir}\\venv\\Scripts\\Activate.bat`
-    : `. ${pythonVenvDir}/venv/bin/activate`;
-
-execSync(
-  `${activateCmd} && \
-  python3 ./resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowImageCommon.version} --source-folder ./resources`,
-  { stdio: "inherit" }
-);
diff --git a/packages/sonataflow-image-common/package.json b/packages/sonataflow-image-common/package.json
deleted file mode 100644
index 48c6e347535..00000000000
--- a/packages/sonataflow-image-common/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "private": true,
-  "name": "@kie-tools/sonataflow-image-common",
-  "version": "0.0.0",
-  "description": "",
-  "license": "Apache-2.0",
-  "homepage": "https://github.com/apache/incubator-kie-tools",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/apache/incubator-kie-tools.git"
-  },
-  "bugs": {
-    "url": "https://github.com/apache/incubator-kie-tools/issues"
-  },
-  "scripts": {
-    "install": "node install.js"
-  },
-  "devDependencies": {
-    "@kie-tools/python-venv": "workspace:*",
-    "@kie-tools/root-env": "workspace:*"
-  },
-  "kieTools": {
-    "requiredPreinstalledCliCommands": [
-      "python3",
-      "pip3",
-      "make"
-    ]
-  }
-}
diff --git a/packages/sonataflow-image-common/resources/Makefile b/packages/sonataflow-image-common/resources/Makefile
deleted file mode 100644
index 79c1803284a..00000000000
--- a/packages/sonataflow-image-common/resources/Makefile
+++ /dev/null
@@ -1,87 +0,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.
-
-.DEFAULT_GOAL 				:= build
-
-# Image build envs
-CEKIT_BUILD_OPTIONS 		?=
-CEKIT_CMD 					:= cekit ${CEKIT_BUILD_OPTIONS}
-BUILD_ENGINE 				?= docker
-BUILD_ENGINE_OPTIONS 	 	?=
-
-# Resolving the current image version from the kogito.project.versions module. Cekit will use it to tag the image.
-CURRENT_IMAGE_VERSION 		:= $(shell python3 scripts/retrieve_version.py)
-
-# SWF Image creation envs
-SWF_IMAGE_NAME				?= # Image name
-SWF_IMAGE_REGISTRY 			?= 'docker.io'
-SWF_IMAGE_REGISTRY_ACCOUNT 	?= 'apache'
-SWF_IMAGE_TAG 				?= $(CURRENT_IMAGE_VERSION) # Setting a default value if SWF_IMAGE_TAG env is not present
-SWF_FULL_IMAGE_NAME 		:= $(SWF_IMAGE_REGISTRY)/$(SWF_IMAGE_REGISTRY_ACCOUNT)/$(SWF_IMAGE_NAME)
-SWF_IMAGE_FILENAME			:= ${SWF_IMAGE_NAME}-image.yaml
-
-_check_swf_image_name:
-ifndef SWF_IMAGE_NAME
- $(error Cannot build image, please provide a valid image name using the SWF_IMAGE_NAME env)
-endif
-
-# Check if there are Quarkus and Kogito version envs
-_check_versions:
-ifndef QUARKUS_PLATFORM_VERSION
- $(error Cannot build image, please provide a valid Quarkus version using the QUARKUS_PLATFORM_VERSION env)
-endif
-ifndef KOGITO_VERSION
- $(error Cannot build image, please provide a valid Kogito version using the KOGITO_VERSION env)
-endif
-
-# Upgrade Quarkus & Kogito versions in the images and modules
-_run_version_manager:
-ifneq ($(SONATAFLOW_QUARKUS_DEVUI_VERSION),)
-	python3 scripts/versions_manager.py --quarkus-version ${QUARKUS_PLATFORM_VERSION} --kogito-version ${KOGITO_VERSION} --sonataflow-quarkus-devui-version ${SONATAFLOW_QUARKUS_DEVUI_VERSION}
-else
-	python3 scripts/versions_manager.py --quarkus-version ${QUARKUS_PLATFORM_VERSION} --kogito-version ${KOGITO_VERSION}
-endif
-
-_fix_platform_versions: _check_versions _run_version_manager
-
-# Building the SWF image with Cekit
-_cekit_build:
-	${CEKIT_CMD} --descriptor ${SWF_IMAGE_FILENAME} build ${CEKIT_BUILD_OPTIONS} ${BUILD_ENGINE} ${BUILD_ENGINE_OPTIONS} --tag ${SWF_FULL_IMAGE_NAME}:${CURRENT_IMAGE_VERSION} --tag ${SWF_FULL_IMAGE_NAME}:${SWF_IMAGE_TAG} --tag ${SWF_FULL_IMAGE_NAME}:latest
-
-# Tagging the generated image if SWF_IMAGE_TAG doesn't match the CURRENT_IMAGE_VERSION
-# Currently unused, as cekit will tag the image for us
-_tag_image:
-ifneq ($(SWF_IMAGE_TAG), $(CURRENT_IMAGE_VERSION))
-	${BUILD_ENGINE} tag ${SWF_FULL_IMAGE_NAME}:${CURRENT_IMAGE_VERSION} ${SWF_FULL_IMAGE_NAME}:${SWF_IMAGE_TAG}
-endif
-
-_create_e2e_dir:
-	rm -rf ../dist-tests-e2e
-	mkdir ../dist-tests-e2e
-
-# Trigger the image tests
-.PHONY test-image: _create_e2e_dir _check_swf_image_name bats _test_image
-_test_image:
-	${CEKIT_CMD} --descriptor ${SWF_IMAGE_FILENAME} test behave
-	tests/shell/run.sh ${SWF_IMAGE_NAME} ${SWF_FULL_IMAGE_NAME}:${SWF_IMAGE_TAG}
-
-.PHONY build: _check_swf_image_name _fix_platform_versions _cekit_build
-
-# run bat tests locally
-.PHONY: bats
-bats:
-	./scripts/run-bats.sh
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/container-limits b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/container-limits
deleted file mode 100644
index f262ee7c408..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/container-limits
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-# Detects container limits
-# If found these are exposed as the following environment variables:
-#
-# - CONTAINER_MAX_MEMORY
-# - CONTAINER_CORE_LIMIT
-#
-# This script is meant to be sourced.
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-fi
-
-# query the resources based on cgroups version
-# cgroups v1 points to tmpfs
-# cgroups v2 points to cgroup2fs
-CGROUPS_VERSION="v1"
-tmp_fs=$(stat -fc %T /sys/fs/cgroup)
-if [ "${tmp_fs}" = "cgroup2fs" ]; then
-    CGROUPS_VERSION="v2"
-fi
-
-
-ceiling() {
-    awk -vnumber="$1" -vdiv="$2" '
-        function ceiling(x){
-            return x%1 ? int(x)+1 : x
-        }
-        BEGIN{
-            print ceiling(number/div)
-        }
-    '
-}
-
-# Based on the cgroups limits, figure out the max number of core we should use
-core_limit() {
-    if [ "${CGROUPS_VERSION}" = "v1" ]; then
-        local cpu_period_file="/sys/fs/cgroup/cpu/cpu.cfs_period_us"
-        local cpu_quota_file="/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
-        if [ -r "${cpu_period_file}" ]; then
-            local cpu_period="$(cat ${cpu_period_file})"
-            if [ -r "${cpu_quota_file}" ]; then
-                local cpu_quota="$(cat ${cpu_quota_file})"
-                # cfs_quota_us == -1 --> no restrictions
-                if [ "x$cpu_quota" != "x-1" ]; then
-                    ceiling "$cpu_quota" "$cpu_period"
-                fi
-            fi
-        fi
-    else
-        # v2
-        # on cgroupsv2 the period and quota a queried from the same file
-        local cpu_max_file="/sys/fs/cgroup/cpu.max"
-        # when both are set we will have the following output:
-        # $MAX $PERIOD
-        # where the first number is the quota/max and the second is the period
-        # if the quota/max is not set then we will have only the period set:
-        # max 100000
-        if [ -r "${cpu_max_file}" ]; then
-            local cpu_max="$(cat ${cpu_max_file})"
-            if [ "x$cpu_max" != "x" ]; then
-                local cpu_quota="$(echo $cpu_max | awk '{print $1}')"
-                local cpu_period="$(echo $cpu_max | awk '{print $2}')"
-                if [ "$cpu_quota" != "max" ] && [ "x$cpu_period" != "x" ]; then
-                    ceiling "$cpu_quota" "$cpu_period"
-                fi
-            fi
-        fi
-    fi
-}
-
-max_unbounded() {
-    cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2*1024}'
-}
-
-container_memory() {
-    local max_mem_unbounded="$(max_unbounded)"
-    # High number which is the max limit unit which memory is supposed to be unbounded.
-    if [ "${CGROUPS_VERSION}" = "v1" ]; then
-        local mem_file="/sys/fs/cgroup/memory/memory.limit_in_bytes"
-        if [ -r "${mem_file}" ]; then
-            local max_mem="$(cat ${mem_file})"
-            if [ ${max_mem} -lt ${max_mem_unbounded} ]; then
-                echo "${max_mem}"
-            fi
-        fi
-    else
-        # v2
-        local mem_file="/sys/fs/cgroup/memory.max"
-        if [ -r "${mem_file}" ]; then
-            local max_mem="$(cat ${mem_file})"
-            # if not set, it will contain only the string "max"
-            if [ "$max_mem" != "max" ]; then
-                if [ ${max_mem} -lt ${max_mem_unbounded} ]; then
-                    echo "${max_mem}"
-                fi
-            fi
-        fi
-    fi
-}
-
-min() {
-    printf "%s\n" "$@" | sort -g | head -n1
-}
-
-limit="$(core_limit)"
-if [ x$limit != x ]; then
-    export CONTAINER_CORE_LIMIT="$limit"
-fi
-
-env_core_limit="$(min $CONTAINER_CORE_LIMIT $JAVA_CORE_LIMIT)"
-if [ -n "$env_core_limit" ]; then
-    export CORE_LIMIT="$env_core_limit"
-fi
-
-max_mem="$(container_memory)"
-if [ x$max_mem != x ]; then
-    export CONTAINER_MAX_MEMORY="$max_mem"
-fi
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/debug-options b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/debug-options
deleted file mode 100644
index b7ea7d4ed10..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/debug-options
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-# Check for debug options and echo them if enabled. Meant to be included by
-# a run script.
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-fi
-
-debug_options() {
-    if [ "x${JAVA_DEBUG}" != "x" ]; then
-        local debug_port=${JAVA_DEBUG_PORT:-5005}
-        echo "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${debug_port}"
-    fi
-}
-
-## Echo options, trimming trailing and multiple spaces
-echo "$(debug_options)" | awk '$1=$1'
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/java-default-options b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/java-default-options
deleted file mode 100644
index 5ec707a68f7..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/added/java-default-options
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-# =================================================================
-# Detect whether running in a container and set appropriate options
-# for limiting Java VM resources
-#
-# Usage: JAVA_OPTS="$(java-default-options) $(debug_options)"
-
-# Env Vars respected:
-
-# JAVA_OPTIONS: Checked for already set options.
-# JAVA_OPTS: Checked for already set options
-# JAVA_INITIAL_MEM_RATIO: Ratio of maximum memory to use for initial heap size
-#                         (i.e. -Xms).  Defaults to 25 (i.e -Xms=-Xmx/4).
-# JAVA_MAX_INITIAL_MEM: The maximum value of the initial heap size, defaults to 4G.
-# JAVA_MAX_MEM_RATIO: Ratio use to calculate a default maximum Memory, in percent.
-#                     E.g. the default value "50" implies that 50% of the Memory
-#                     given to the container is used as the maximum heap memory with
-#                     '-Xmx'. It is a heuristic and should be better backed up with real
-#                     experiments and measurements.
-#                     For a good overviews what tuning options are available -->
-#                             https://youtu.be/Vt4G-pHXfs4
-#                             https://www.youtube.com/watch?v=w1rZOY5gbvk
-#                             https://vimeo.com/album/4133413/video/181900266
-# Also note that heap is only a small portion of the memory used by a JVM. There are lot
-# of other memory areas (metadata, thread, code cache, ...) which addes to the overall
-# size. There is no easy solution for this, 50% seems to be are reasonable compromise.
-# However, when your container gets killed because of an OOM, then you should tune
-# the absolute values
-#
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-fi
-
-__DEFAULT_JAVA_MAX_MEM_RATIO=50
-__DEFAULT_JAVA_INITIAL_MEM_RATIO=25
-__DEFAULT_JAVA_MAX_INITIAL_MEM=4096
-
-# stubs for jvm specific overrides
-jvm_specific_options() {
-    :
-}
-
-jvm_specific_diagnostics() {
-    :
-}
-
-# Include overridden jvm_specific_*() functions
-if [ -f "${JBOSS_CONTAINER_OPENJDK_JDK_MODULE}/jvm-options" ]; then
-    source "${JBOSS_CONTAINER_OPENJDK_JDK_MODULE}/jvm-options"
-fi
-
-initialize_container_limits() {
-    # we can't run without limits
-    source ${JBOSS_CONTAINER_JAVA_JVM_MODULE}/container-limits
-}
-
-# Check for memory options and calculate a sane default if not given
-max_memory() {
-    # Check whether -Xmx is already given in JAVA_OPTIONS. Then we dont
-    # do anything here
-    # XXX: I think this should be removed.  If folks want to hard code max/min,
-    # then they can set the ratios to zero and set the options in JAVA_OPTS_APPEND.
-    if echo "${JAVA_OPTS:-${JAVA_OPTIONS}}" | grep -q -- "-Xmx"; then
-        return
-    fi
-
-    # Check if explicitly disabled
-    if [ "x$JAVA_MAX_MEM_RATIO" = "x0" ]; then
-        return
-    fi
-
-    # Check for the 'real memory size' and calculate mx from a ratio
-    # given (default is 50%)
-    if [ "x$CONTAINER_MAX_MEMORY" != x ]; then
-        local max_mem="${CONTAINER_MAX_MEMORY}"
-        local ratio=${JAVA_MAX_MEM_RATIO:-${__DEFAULT_JAVA_MAX_MEM_RATIO}}
-        local mx=$(echo "${max_mem} ${ratio} 1048576" | awk '{printf "%d\n" , ($1*$2)/(100*$3) + 0.5}')
-        echo "-Xmx${mx}m"
-    fi
-}
-
-# Check for memory options and calculate a sane default if not given
-initial_memory() {
-    # Check whether -Xms is already given in JAVA_OPTS. Then we dont
-    # do anything here
-    # XXX: I think this should be removed.  If folks want to hard code max/min,
-    # then they can set the ratios to zero and set the options in JAVA_OPTS_APPEND.
-    if echo "${JAVA_OPTS:-${JAVA_OPTIONS}}" | grep -q -- "-Xms"; then
-        return
-    fi
-
-    # Check if explicitly disabled
-    if [ "x$JAVA_INITIAL_MEM_RATIO" = "x0" ]; then
-        return
-    fi
-
-    # Check for the 'real memory size' and calculate ms from a ratio
-    # given (default is 25%)
-    if [ "x$CONTAINER_MAX_MEMORY" != x ]; then
-        local max_mem="${CONTAINER_MAX_MEMORY}"
-        local max_ratio=${JAVA_MAX_MEM_RATIO:-${__DEFAULT_JAVA_MAX_MEM_RATIO}}
-        local initial_ratio=${JAVA_INITIAL_MEM_RATIO:-${__DEFAULT_JAVA_INITIAL_MEM_RATIO}}
-        local ms=$(echo "${max_mem} ${max_ratio} ${initial_ratio} 1048576" | awk '{printf "%d\n" , ($1*(($2*$3)/10000))/$4 + 0.5}')
-        local max_initial_memory=${JAVA_MAX_INITIAL_MEM:-${__DEFAULT_JAVA_MAX_INITIAL_MEM}}
-        if [ "${ms}" -lt "${max_initial_memory}" ] ; then
-          echo "-Xms${ms}m"
-        else
-          echo "-Xms${max_initial_memory}m"
-        fi
-    fi
-}
-
-# Switch on diagnostics except when switched off
-diagnostics() {
-    if [ "x$JAVA_DIAGNOSTICS" != "x" ]; then
-        echo "$(jvm_specific_diagnostics)"
-    fi
-}
-
-cpu_core_tunning() {
-    # If both are set rely on JAVA_CORE_LIMIT limited to CONTAINER_CORE_LIMIT
-    # If none are set, just return.
-    local core_limit=${JAVA_CORE_LIMIT:-${CONTAINER_CORE_LIMIT}}
-    if [ "x$core_limit" = "x0" -o "x$core_limit" = "x" ]; then
-        return
-    else
-        if [ "x$CONTAINER_CORE_LIMIT" != "x" ] && [ $core_limit -gt $CONTAINER_CORE_LIMIT ]; then
-            core_limit=$CONTAINER_CORE_LIMIT
-        fi
-         echo "-XX:ParallelGCThreads=${core_limit} " \
-              "-Djava.util.concurrent.ForkJoinPool.common.parallelism=${core_limit} "\
-              "-XX:CICompilerCount=2"
-    fi
-}
-
-gc_config() {
-    local minHeapFreeRatio=${GC_MIN_HEAP_FREE_RATIO:-10}
-    local maxHeapFreeRatio=${GC_MAX_HEAP_FREE_RATIO:-20}
-    local timeRatio=${GC_TIME_RATIO:-4}
-    local adaptiveSizePolicyWeight=${GC_ADAPTIVE_SIZE_POLICY_WEIGHT:-90}
-    local maxMetaspaceSize
-    local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelGC}"
-    # for compat reasons we don't set a default value for metaspaceSize
-    local metaspaceSize
-
-    if [ -n "${GC_MAX_METASPACE_SIZE}" ]; then
-        maxMetaspaceSize=${GC_MAX_METASPACE_SIZE}
-    fi
-
-    if [ -n "${GC_METASPACE_SIZE}" ]; then
-        metaspaceSize=${GC_METASPACE_SIZE}
-        if [ -n "${maxMetaspaceSize}" ]; then
-        # clamp the max size of metaspaceSize to be <= maxMetaspaceSize
-            if [ "${metaspaceSize}" -gt "${maxMetaspaceSize}" ]; then
-                metaspaceSize=${maxMetaspaceSize}
-            fi
-        fi
-    fi
-
-    local allOptions="$(jvm_specific_options) "
-    allOptions+="${gcOptions} "
-    allOptions+="-XX:MinHeapFreeRatio=${minHeapFreeRatio} "
-    allOptions+="-XX:MaxHeapFreeRatio=${maxHeapFreeRatio} "
-    allOptions+="-XX:GCTimeRatio=${timeRatio} "
-    allOptions+="-XX:AdaptiveSizePolicyWeight=${adaptiveSizePolicyWeight} "
-    if [ -n "${maxMetaspaceSize}" ]; then
-        allOptions+="-XX:MaxMetaspaceSize=${maxMetaspaceSize}m "
-    fi
-    if [ -n "${metaspaceSize}" ]; then
-        allOptions+="-XX:MetaspaceSize=${metaspaceSize}m "
-    fi
-
-    echo "${allOptions}"
-}
-
-error_handling() {
-    echo "-XX:+ExitOnOutOfMemoryError"
-}
-
-initialize_container_limits > /dev/null
-
-## Echo options, trimming trailing and multiple spaces
-echo "$(initial_memory) $(max_memory) $(gc_config) $(diagnostics) $(cpu_core_tunning) $(error_handling)" | awk '$1=$1'
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/configure b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/configure
deleted file mode 100644
index 4a24c6e9a75..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/configure
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SCRIPT_DIR=$(dirname "$0")
-
-mkdir -p "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
-
-cp -prv "${SCRIPT_DIR}"/added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
-chown -R kogito:root "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
-chmod -R ug+x-w "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
-
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/module.yaml
deleted file mode 100644
index 8761f126a4f..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-dynamic-resources/module.yaml
+++ /dev/null
@@ -1,75 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.dynamic.resources
-version: "0.0.0"
-
-description: -| Module retrieved from https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash However it contains a few customizations to fit Kogito needs.
-
-execute:
-  - script: configure
-
-envs:
-  - name: JAVA_OPTIONS
-    description: User specified Java options to be appended to generated options in JAVA_OPTS (internal use).
-    example: "-verbose:class"
-  - name: JAVA_MAX_MEM_RATIO
-    description: Is used when no `-Xmx` option is given in **JAVA_OPTIONS**. This is used to calculate a default maximal heap memory based on a containers restriction. If used in a container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio of the container available memory as set here. The default is `50` which means 50% of the available memory is used as an upper boundary. You can skip this mechanism by setting this value to `0` in which case no `-Xmx` option is added.
-  - name: JAVA_INITIAL_MEM_RATIO
-    description: Is used when no `-Xms` option is given in **JAVA_OPTIONS**. This is used to calculate a default initial heap memory based on the maximum heap memory. If used in a container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xms` is set to a ratio of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` is used as the initial heap size. You can skip this mechanism by setting this value to `0` in which case no `-Xms` option is added.
-    example: "25"
-  - name: JAVA_MAX_INITIAL_MEM
-    description: Is used when no `-Xms` option is given in **JAVA_OPTIONS**. This is used to calculate the maximum value of the initial heap memory. If used in a container without any memory constraints for the container then this option has no effect. If there is a memory constraint then `-Xms` is limited to the value set here. The default is 4096Mb which means the calculated value of `-Xms` never will be greater than 4096Mb. The value of this variable is expressed in MB.
-    example: "4096"
-  - name: JAVA_DIAGNOSTICS
-    description: Set this to get some diagnostics information to standard output when things are happening. **Disabled by default.**
-    example: "true"
-  - name: JAVA_DEBUG
-    description: If set remote debugging will be switched on. **Disabled by default.**
-    example: "true"
-  - name: JAVA_DEBUG_PORT
-    description: Port used for remote debugging. Defaults to *5005*.
-    example: "8787"
-  - name: CONTAINER_CORE_LIMIT
-    description: A calculated core limit as described in https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt.
-    example: "2"
-  - name: CONTAINER_MAX_MEMORY
-    description: Memory limit given to the container.
-    example: "1024"
-  - name: GC_MIN_HEAP_FREE_RATIO
-    description: Minimum percentage of heap free after GC to avoid expansion.
-    example: "20"
-  - name: GC_MAX_HEAP_FREE_RATIO
-    description: Maximum percentage of heap free after GC to avoid shrinking.
-    example: "40"
-  - name: GC_TIME_RATIO
-    description: Specifies the ratio of the time spent outside the garbage collection (for example, the time spent for application execution) to the time spent in the garbage collection.
-    example: "4"
-  - name: GC_ADAPTIVE_SIZE_POLICY_WEIGHT
-    description: The weighting given to the current GC time versus previous GC times.
-    example: "90"
-  - name: GC_METASPACE_SIZE
-    description: The initial metaspace size.
-    example: "20"
-  - name: GC_MAX_METASPACE_SIZE
-    description: The maximum metaspace size.
-    example: "100"
-  - name: GC_CONTAINER_OPTIONS
-    description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelGC`.
-    example: -XX:+UseG1GC
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/added/configure.sh b/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/added/configure.sh
deleted file mode 100644
index 8244ba32ff6..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/added/configure.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-# This script executes a list of modules defined by CONFIGURE_SCRIPTS.
-#
-# Configuration occurs over three basic phases: preConfigure, configure and
-# postConfigure.
-#
-# The configure phase is special in that it iterates over a series of
-# environments.  In addition to the execution environment, users may specify
-# additional configuration details through environment scripts specified through
-# the ENV_FILES variable.  The processing of env files is similar to the process
-# for the execution environment, with the addition of a prepareEnv method, which
-# is used to clean the environment before processing the env contributed by
-# a file.  This is to help ensure that duplicate configurations are not created
-# when processing env files.
-#
-# The following details the API which the modules may implement.  If a
-# particular function is not implemented by a module, it is treated as a no-op.
-#
-# preConfigure:     invoked before any configuration takes place.  Use this to
-#                   manipulate the environment prior to configuration.  For
-#                   example, the backward-compatiblity.sh module initializes
-#                   environment variables from older variable names, if present.
-#
-# configure:        invoked to configure based on the execution environment.
-#
-# postConfigure:    invoked after all configuration has been completed.
-#
-# prepareEnv:       invoked prior to processing env files.  Modules should
-#                   use this to prepare the environment before processing
-#                   configuration from a file, e.g. by unset variables
-#                   defined in the execution environment to prevent duplicate
-#                   configuration entries.  This method is invoked once, as
-#                   each env file is processed in a subshell, thus preventing
-#                   contamination of the environment from file to file.
-#
-# preConfigureEnv:  similar to preConfigure, except this is invoked after an env
-#                   file has been sourced, but before configureEnv.
-#
-# configureEnv:     similar to configure.
-#
-# postConfigureEnv: simliar to postConfigure, except that it is invoked for each
-#                   env file.
-#
-# The reason the configuration API is duplicated for an Env, is that some
-# modules may not support env files, or may require configuration of "singleton"
-# type entries, which should only be processed once.
-#
-
-#import
-source "${KOGITO_HOME}"/launch/logging.sh
-
-# clear functions from any previous module
-function prepareModule() {
-  unset -f preConfigure
-  unset -f configure
-  unset -f postConfigure
-
-  unset -f prepareEnv
-  unset -f preConfigureEnv
-  unset -f configureEnv
-  unset -f postConfigureEnv
-}
-
-# Execute a particular function from a module
-# $1 - module file
-# $2 - function name
-function executeModule() {
-  # shellcheck source=/dev/null
-  source "$1"
-  if [ -n "$(type -t "$2")" ]; then
-    eval "$2"
-  fi
-}
-
-# Run through the list of scripts, executing the specified function for each.
-# $1 - function name
-function executeModules() {
-  # shellcheck disable=SC2048
-  for module in ${CONFIGURE_SCRIPTS[*]}; do
-    prepareModule
-    executeModule "${module}" "${1}"
-  done
-}
-
-# Processes the files provided by ENV_FILES.  Invokes the *Env functions for
-# each module.  Env processing is done in subshells.  The outer subshell
-# provides a sanitized environment, that will be used by each inner subshell.
-# This insulates the execution environment from any changes made during env
-# file processing, and keeps the base environment the same from file to file
-# (i.e. we don't have to run prepareEnv for each file).
-function processEnvFiles() {
-  if [ -n "$ENV_FILES" ]; then
-    executeModules prepareEnv
-    for prop_file_arg in ${ENV_FILES//,/ }; do
-      while IFS= read -r -d '' prop_file
-        do
-          if [ -f "${prop_file}" ]; then
-            source "${prop_file}"
-            executeModules preConfigureEnv
-            executeModules configureEnv
-            executeModules postConfigureEnv
-          else
-            log_warning "Could not process environment for ${prop_file}.  File does not exist."
-          fi
-        done < <(find "${prop_file_arg}" -maxdepth 0 2>/dev/null)
-    done
-  fi
-}
-
-executeModules preConfigure
-executeModules configure
-processEnvFiles
-executeModules postConfigure
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/configure b/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/configure
deleted file mode 100644
index 096018fd528..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-mkdir -p "${KOGITO_HOME}"/launch
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/module.yaml
deleted file mode 100644
index 801c65cb8f1..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-launch-scripts/module.yaml
+++ /dev/null
@@ -1,24 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.launch.scripts
-version: "0.0.0"
-
-execute:
-  - script: configure
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-logging/added/logging.sh b/packages/sonataflow-image-common/resources/modules/kogito-logging/added/logging.sh
deleted file mode 100644
index 9c72c21edb7..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-logging/added/logging.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-BLACK='\033[0;30m'
-RED='\033[0;31m'
-YELLOW='\033[0;33m'
-DEFAULT='\033[0m'
-
-function log_warning() {
-  local message="${1}"
-
-  echo >&2 -e "${YELLOW}WARN ${message}${DEFAULT}"
-}
-
-function log_error() {
-  local message="${1}"
-
-  echo >&2 -e "${RED}ERROR ${message}${DEFAULT}"
-}
-
-function log_info() {
-  local message="${1}"
-
-  echo >&2 -e "INFO ${message}"
-}
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-logging/configure b/packages/sonataflow-image-common/resources/modules/kogito-logging/configure
deleted file mode 100644
index f16737b464c..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-logging/configure
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-SCRIPT_DIR=$(dirname "${0}")
-
-# logging
-mkdir -p "${KOGITO_HOME}"/launch/
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
-chmod +x-w "${KOGITO_HOME}"/launch/logging.sh
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-logging/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-logging/module.yaml
deleted file mode 100644
index 238ed43465f..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-logging/module.yaml
+++ /dev/null
@@ -1,24 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.logging
-version: "0.0.0"
-
-execute:
-  - script: configure
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-maven/common/added/configure-maven.sh b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/added/configure-maven.sh
deleted file mode 100644
index b2b41b7cba4..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-maven/common/added/configure-maven.sh
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-#Please keep them in alphabetical order
-function prepareEnv() {
-    unset HTTP_PROXY_HOST
-    unset HTTP_PROXY_PORT
-    unset HTTP_PROXY_PASSWORD
-    unset HTTP_PROXY_USERNAME
-    unset HTTP_PROXY_NONPROXYHOSTS
-    unset HTTPS_PROXY
-    unset MAVEN_DOWNLOAD_OUTPUT
-    unset MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE
-    unset MAVEN_MIRROR_URL
-    unset MAVEN_REPO_ID
-    unset MAVEN_REPO_LAYOUT
-    unset MAVEN_REPO_RELEASES_ENABLED
-    unset MAVEN_REPO_RELEASES_UPDATE_POLICY
-    unset MAVEN_REPO_RELEASES_CHECKSUM_POLICY
-    unset MAVEN_REPO_SNAPSHOTS_ENABLED
-    unset MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY
-    unset MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY
-    unset MAVEN_REPO_URL
-    unset MAVEN_REPOS
-}
-
-function configure() {
-    log_info "Configure Maven"
-
-    configure_proxy
-    configure_mirrors
-    configure_maven_download_output
-    configure_maven_offline_mode
-    ignore_maven_self_signed_certificates
-    set_kogito_maven_repo
-    add_maven_repo
-    configureMavenHome
-
-    if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-        cat "${MAVEN_SETTINGS_PATH}"
-    fi
-
-    rm -rf *.bak
-}
-
-# When Running on OpenShift with AnyUID the HOME environment variable gets overridden to "/"
-# Maven build might fail with this issue:  'Could not create local repository at /.m2/repository'
-# Set the property maven.home to $KOGITO_HOME so the HOME env is ignored.
-function configureMavenHome() {
-  export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Duser.home=${KOGITO_HOME}"
-}
-
-# insert settings for HTTP proxy into maven settings.xml if supplied
-function configure_proxy() {
-    # prefer old http_proxy_ format for username/password, but
-    # also allow proxy_ format.
-    HTTP_PROXY_USERNAME=${HTTP_PROXY_USERNAME:-$PROXY_USERNAME}
-    HTTP_PROXY_PASSWORD=${HTTP_PROXY_PASSWORD:-$PROXY_PASSWORD}
-
-    proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}}
-    # if http_proxy_host/port is set, prefer that (oldest mechanism)
-    # before looking at HTTP(S)_PROXY
-    proxyhost=${HTTP_PROXY_HOST:-$(echo "${proxy}" | cut -d : -f 1,2)}
-    proxyport=${HTTP_PROXY_PORT:-$(echo "${proxy}" | cut -d : -f 3)}
-
-    if [ -n "$proxyhost" ]; then
-        if echo "${proxyhost}" | grep -q -i https://; then
-          proxyport=${proxyport:-443}
-          proxyprotocol="https"
-        else
-          proxyport=${proxyport:-80}
-          proxyprotocol="http"
-        fi
-
-        xml="<proxy>\
-         <id>genproxy</id>\
-         <active>true</active>\
-         <protocol>$proxyprotocol</protocol>\
-         <host>$proxyhost</host>\
-         <port>$proxyport</port>"
-
-        if [ -n "$HTTP_PROXY_USERNAME" ] && [ -n "$HTTP_PROXY_PASSWORD" ]; then
-            xml="$xml\
-         <username>$HTTP_PROXY_USERNAME</username>\
-         <password>$HTTP_PROXY_PASSWORD</password>"
-        fi
-        if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then
-            nonproxyhosts="${HTTP_PROXY_NONPROXYHOSTS//|/\\|}"
-            xml="$xml\
-         <nonProxyHosts>$nonproxyhosts</nonProxyHosts>"
-        fi
-        xml="$xml\
-       </proxy>"
-        sed -i.bak "s|<!-- ### configured http proxy ### -->|${xml}|" "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-# insert settings for mirrors/repository managers into settings.xml if supplied
-function configure_mirrors() {
-    if [ -n "$MAVEN_MIRROR_URL" ]; then
-        xml="    <mirror>\
-      <id>mirror.default</id>\
-      <url>$MAVEN_MIRROR_URL</url>\
-      <mirrorOf>external:*</mirrorOf>\
-    </mirror>"
-        sed -i.bak "s|<!-- ### configured mirrors ### -->|$xml|" "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-function configure_maven_download_output() {
-    if [ "${MAVEN_DOWNLOAD_OUTPUT}" != "true" ]; then
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --no-transfer-progress"
-    fi
-}
-
-function configure_maven_offline_mode() {
-    if [ "${MAVEN_OFFLINE_MODE}" = "true" ]; then
-        log_info "Setup Maven offline mode. No artifact will be downloaded !!!"
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -o"
-    fi
-}
-
-function ignore_maven_self_signed_certificates() {
-    if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then
-        export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
-    fi
-}
-
-function set_kogito_maven_repo() {
-    local kogito_maven_repo_url="${DEFAULT_MAVEN_REPO_URL}"
-    if [ -n "${kogito_maven_repo_url}" ]; then
-        sed -i.bak "s|https://repository.apache.org/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
-    fi
-}
-
-function add_maven_repo() {
-    # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service
-    local single_repo_url="${MAVEN_REPO_URL}"
-    if [ -n "$single_repo_url" ]; then
-        single_repo_id=$(_maven_find_env "MAVEN_REPO_ID" "repo-$(_generate_random_id)")
-        _add_maven_repo "$single_repo_url" "$single_repo_id" ""
-    fi
-
-    # multiple remote repositories scenario: respect fully qualified url(s) if specified, otherwise find and use service(s); can be used together with "single repo scenario" above
-    local multi_repo_counter=1
-    IFS=',' read -r -a multi_repo_prefixes <<<"${MAVEN_REPOS}"
-    for multi_repo_prefix in "${multi_repo_prefixes[@]}"; do
-        multi_repo_url=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_URL")
-        multi_repo_id=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_ID" "repo${multi_repo_counter}-$(_generate_random_id)")
-        _add_maven_repo "$multi_repo_url" "$multi_repo_id" "$multi_repo_prefix"
-        multi_repo_counter=$((multi_repo_counter + 1))
-    done
-}
-# add maven repositories
-# Parameters:
-#   $1 - repo url
-#   $2 - repo id
-#   $3 - repo prefix
-function _add_maven_repo() {
-    local repo_url=$1
-    local repo_id=$2
-    local prefix=$3
-
-    repo_name=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_NAME" "${repo_id}")
-    repo_layout=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_LAYOUT" "default")
-    releases_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_ENABLED" "true")
-    releases_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_UPDATE_POLICY" "always")
-    releases_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" "warn")
-    snapshots_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_ENABLED" "true")
-    snapshots_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" "always")
-    snapshots_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" "warn")
-
-    local repo="\n\
-                <repository>\n\
-                    <id>${repo_id}</id>\n\
-                    <name>${repo_name}</name>\n\
-                    <url>${repo_url}</url>\n\
-                    <layout>${repo_layout}</layout>\n\
-                    <releases>\n\
-                        <enabled>${releases_enabled}</enabled>\n\
-                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
-                    </releases>\n\
-                    <snapshots>\n\
-                        <enabled>${snapshots_enabled}</enabled>\n\
-                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
-                    </snapshots>\n\
-                </repository>\n\
-                <!-- ### configured repositories ### -->"
-    sed -i.bak "s|<!-- ### configured repositories ### -->|${repo}|" "${MAVEN_SETTINGS_PATH}"
-
-    local pluginRepo="\n\
-                <pluginRepository>\n\
-                    <id>${repo_id}</id>\n\
-                    <name>${repo_name}</name>\n\
-                    <url>${repo_url}</url>\n\
-                    <layout>${repo_layout}</layout>\n\
-                    <releases>\n\
-                        <enabled>${releases_enabled}</enabled>\n\
-                        <updatePolicy>${releases_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${releases_checksum_policy}</checksumPolicy>\n\
-                    </releases>\n\
-                    <snapshots>\n\
-                        <enabled>${snapshots_enabled}</enabled>\n\
-                        <updatePolicy>${snapshots_update_policy}</updatePolicy>\n\
-                        <checksumPolicy>${snapshots_checksum_policy}</checksumPolicy>\n\
-                    </snapshots>\n\
-                </pluginRepository>\n\
-                <!-- ### configured plugin repositories ### -->"
-
-    sed -i.bak "s|<!-- ### configured plugin repositories ### -->|${pluginRepo}|" "${MAVEN_SETTINGS_PATH}"
-
-    # new repo should be skipped by mirror if exists
-    sed -i.bak "s|</mirrorOf>|,!${repo_id}</mirrorOf>|g" "${MAVEN_SETTINGS_PATH}"
-}
-
-# Finds the environment variable  and returns its value if found.
-# Otherwise returns the default value if provided.
-#
-# Arguments:
-# $1 env variable name to check
-# $2 default value if environment variable was not set
-function _maven_find_env() {
-    local var=${!1}
-    echo "${var:-$2}"
-}
-
-# Finds the environment variable with the given prefix. If not found
-# the default value will be returned. If no prefix is provided will
-# rely on _maven_find_env
-#
-# Arguments
-#  - $1 prefix. Transformed to uppercase and replace - by _
-#  - $2 variable name. Prepended by "prefix_"
-#  - $3 default value if the variable is not defined
-function _maven_find_prefixed_env() {
-    local prefix=$1
-
-    if [[ -z $prefix ]]; then
-        _maven_find_env "${2}" "${3}"
-    else
-        prefix=${prefix^^} # uppercase
-        prefix=${prefix//-/_} #replace - by _
-
-        local var_name="${prefix}_${2}"
-        echo "${!var_name:-${3}}"
-      fi
-}
-
-# private
-function _generate_random_id() {
-    env LC_CTYPE=C < /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
-}
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-maven/common/configure b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/configure
deleted file mode 100755
index e28dccbbd17..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-maven/common/configure
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-set -e
-
-SOURCES_DIR=/tmp/artifacts
-SCRIPT_DIR=$(dirname "${0}")
-
-mvn_install_dir="/usr/share/maven"
-
-# Verify if mvn is installed
-if [ ! -d ${mvn_install_dir} ] && ! command -v mvn > /dev/null 2>&1 ;
-then
-    echo "---> Maven not found, downloading and installing it"
-    tar xzf "${SOURCES_DIR}"/apache-maven-"${MAVEN_VERSION}"-bin.tar.gz -C /usr/share
-    mv /usr/share/apache-maven-"${MAVEN_VERSION}" ${mvn_install_dir}
-else
-    echo "---> Maven already present in the current context"
-fi
-
-mkdir "${KOGITO_HOME}"/.m2
-cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
-cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-maven/common/maven/settings.xml b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/maven/settings.xml
deleted file mode 100644
index eae20db74b4..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-maven/common/maven/settings.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<settings
-  xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd"
->
-  <mirrors>
-    <!-- ### configured mirrors ### -->
-  </mirrors>
-
-  <proxies>
-    <!-- ### configured http proxy ### -->
-  </proxies>
-
-  <profiles>
-    <!-- ### extra maven repositories ### -->
-
-    <profile>
-      <id>kogito-images</id>
-      <repositories>
-        <repository>
-          <id>apache-public-repository-group</id>
-          <name>Apache Public Repository Group</name>
-          <url>https://repository.apache.org/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </repository>
-        <!-- ### configured repositories ### -->
-      </repositories>
-
-      <pluginRepositories>
-        <pluginRepository>
-          <id>apache-public-repository-group</id>
-          <name>Apache Public Repository Group</name>
-          <url>https://repository.apache.org/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </pluginRepository>
-        <!-- ### configured plugin repositories ### -->
-      </pluginRepositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <!-- ### extra maven profile ### -->
-    <activeProfile>kogito-images</activeProfile>
-  </activeProfiles>
-</settings>
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-maven/common/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-maven/common/module.yaml
deleted file mode 100644
index bf616eaa8dc..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-maven/common/module.yaml
+++ /dev/null
@@ -1,94 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.maven.common
-version: "0.0.0"
-
-envs:
-  - name: "MAVEN_VERSION"
-    description: "The Maven version to setup with this module"
-  - name: "MAVEN_HOME"
-    value: "/usr/share/maven"
-  - name: "MAVEN_SETTINGS_PATH"
-    description: "The location of the settings.xml file"
-    value: "${KOGITO_HOME}/.m2/settings.xml"
-  - name: "HTTP_PROXY"
-    description: "The location of the http proxy, will be used for both Maven builds and Java runtime."
-    example: "http://127.0.0.1:8080"
-  - name: "HTTP_PROXY_HOST"
-    description: "Proxy Host, don't need to be set if HTTP_PROXY is used."
-    example: "127.0.0.1"
-  - name: "HTTP_PROXY_PORT"
-    description: "Proxy Port, don't need to be set if HTTP_PROXY is used."
-    example: "8181"
-  - name: "HTTP_PROXY_PASSWORD"
-    description: "Proxy Password"
-  - name: "HTTP_PROXY_USERNAME"
-    description: "Proxy Username"
-  - name: "HTTP_PROXY_NONPROXYHOSTS"
-    description: "Non proxy hosts, list of hosts that will ot be proxied."
-    example: "localhost"
-  - name: "MAVEN_MIRROR_URL"
-    description: "The base URL of a mirror used for retrieving artifacts."
-    example: "http://10.0.0.1:8080/repository/internal/"
-  - name: "MAVEN_DOWNLOAD_OUTPUT"
-    description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
-    example: "true"
-  - name: "DEFAULT_MAVEN_REPO_URL"
-    value: "https://repository.apache.org/content/groups/public/"
-    description: "Defines the default Maven repository for Kogito artifacts."
-  - name: "MAVEN_REPO_URL"
-    description: "Defines an extra Maven repository."
-    example: "https://nexus.test.com/group/public"
-  - name: "MAVEN_REPO_ID"
-    description: "Defines the id of the new Repository"
-    example: "nexus-test"
-  - name: "MAVEN_REPO_LAYOUT"
-    description: "The type of layout this repository uses for locating and storing artifacts - can be 'legacy' or 'default'.Defaults to 'default'."
-    example: "legacy"
-  - name: "MAVEN_REPO_RELEASES_ENABLED"
-    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
-    example: "false"
-  - name: "MAVEN_REPO_RELEASES_UPDATE_POLICY"
-    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
-    example: "never"
-  - name: "MAVEN_REPO_RELEASES_CHECKSUM_POLICY"
-    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
-    example: "fail"
-  - name: "MAVEN_REPO_SNAPSHOTS_ENABLED"
-    description: "Whether to use this repository for downloading this type of artifact. Default value is: true."
-    example: "false"
-  - name: "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY"
-    description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always."
-    example: "never"
-  - name: "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY"
-    description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn"
-    example: "fail"
-  - name: "MAVEN_REPOS"
-    description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories."
-    example: "CENTRAL,INTERNAL"
-  - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE"
-    description: "When set, use of relaxed SSL check for user generated certificates. Default value is false"
-    example: "true"
-  - name: "MAVEN_OFFLINE_MODE"
-    description: "When set to true, tells Maven to work in offline mode. See Maven `-o` option for more information."
-    example: "true"
-
-execute:
-  - script: configure
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/tests/bats/maven-settings.bats
deleted file mode 100644
index 8a7e85067c7..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-maven/tests/bats/maven-settings.bats
+++ /dev/null
@@ -1,446 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-# imports
-source $BATS_TEST_DIRNAME/../../common/added/configure-maven.sh
-
-
-setup() {
-    export HOME=$BATS_TMPDIR/maven
-    mkdir -p ${HOME}/.m2/
-    cp $BATS_TEST_DIRNAME/../../common/maven/settings.xml ${HOME}/.m2/
-    export MAVEN_SETTINGS_PATH="${HOME}/.m2/settings.xml"
-}
-
-teardown() {
-    rm -rf ${HOME}
-}
-
-# override this function, cat /dec/urandon makes the test hangs on GH actions
-function _generate_random_id() {
-    echo "testing" | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1
-}
-
-
-@test "test maven mirror configuration" {
-    prepareEnv
-    MAVEN_MIRROR_URL="http://localhost:8081/nexus/custom/repo/public"
-    run configure_mirrors
-    expected="<mirror>      <id>mirror.default</id>      <url>http://localhost:8081/nexus/custom/repo/public</url>      <mirrorOf>external:*</mirrorOf>    </mirror>"
-    result=$(xmllint --xpath "//*[local-name()='mirrors']//*[local-name()='mirror']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "expected=${result}"
-     [ "${expected}" = "${result}" ]
-}
-
-@test "test maven proxy configuration with HTTPS_PROXY env custom port https" {
-    prepareEnv
-    HTTPS_PROXY="https://10.10.10.10:8443"
-    run configure_proxy
-    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>https</protocol>         <host>https://10.10.10.10</host>         <port>8443</port>       </proxy>"
-    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven proxy configuration with HTTPS_PROXY env default port https" {
-    prepareEnv
-    HTTPS_PROXY="https://10.10.10.10:"
-    run configure_proxy
-    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>https</protocol>         <host>https://10.10.10.10</host>         <port>443</port>       </proxy>"
-    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven proxy configuration with HTTPS_PROXY env custom port https with username and password" {
-    prepareEnv
-    HTTPS_PROXY="https://10.10.10.10:8443"
-    PROXY_USERNAME="hello"
-    PROXY_PASSWORD="impossible2guess"
-    run configure_proxy
-    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>https</protocol>         <host>https://10.10.10.10</host>         <port>8443</port>         <username>hello</username>         <password>impossible2guess</password>       </proxy>"
-    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven proxy configuration with HTTP_PROXY env custom port http" {
-    prepareEnv
-    HTTP_PROXY="http://10.10.10.20:8003"
-    run configure_proxy
-    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>http://10.10.10.20</host>         <port>8003</port>       </proxy>"
-    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven proxy configuration with HTTP_PROXY env default port http with password" {
-    prepareEnv
-    HTTP_PROXY="http://10.10.10.20"
-    PROXY_USERNAME="hello"
-    PROXY_PASSWORD="impossible2guess"
-    run configure_proxy
-    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>http://10.10.10.20</host>         <port>80</port>         <username>hello</username>         <password>impossible2guess</password>       </proxy>"
-    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven proxy configuration with HTTP_PROXY env custom port http with username" {
-    prepareEnv
-    HTTP_PROXY="http://10.10.10.20:8003"
-    run configure_proxy
-    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>http://10.10.10.20</host>         <port>8003</port>       </proxy>"
-    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven proxy configuration with PROXY_ envs http" {
-    prepareEnv
-    HTTP_PROXY_HOST="10.10.10.20"
-    HTTP_PROXY_PORT="8080"
-    HTTP_PROXY_PASSWORD="impossible2guess"
-    HTTP_PROXY_USERNAME="beleza_pura"
-    HTTP_PROXY_NONPROXYHOSTS="127.0.0.1|10.1.1.1"
-    run configure_proxy
-    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>10.10.10.20</host>         <port>8080</port>         <username>beleza_pura</username>         <password>impossible2guess</password>         <nonProxyHosts>127.0.0.1|10.1.1.1</nonProxyHosts>       </proxy>"
-    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven proxy configuration with PROXY_ envs default port http no username" {
-    prepareEnv
-    HTTP_PROXY_HOST="10.10.10.20"
-    HTTP_PROXY_NONPROXYHOSTS="127.0.0.1|10.1.1.1"
-    run configure_proxy
-    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>http</protocol>         <host>10.10.10.20</host>         <port>80</port>         <nonProxyHosts>127.0.0.1|10.1.1.1</nonProxyHosts>       </proxy>"
-    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven proxy configuration with PROXY_ envs https" {
-    prepareEnv
-    HTTP_PROXY_HOST="https://10.10.10.20"
-    HTTP_PROXY_PORT="8443"
-    HTTP_PROXY_PASSWORD="impossible2guess"
-    HTTP_PROXY_USERNAME="beleza_pura"
-    HTTP_PROXY_NONPROXYHOSTS="127.0.0.1|10.1.1.1"
-    run configure_proxy
-    expected="<proxy>         <id>genproxy</id>         <active>true</active>         <protocol>https</protocol>         <host>https://10.10.10.20</host>         <port>8443</port>         <username>beleza_pura</username>         <password>impossible2guess</password>         <nonProxyHosts>127.0.0.1|10.1.1.1</nonProxyHosts>       </proxy>"
-    result=$(xmllint --xpath "//*[local-name()='proxies']//*[local-name()='proxy']" ${HOME}/.m2/settings.xml)
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven download output logs when MAVEN_DOWNLOAD_OUTPUT is not true" {
-    prepareEnv
-    configure_maven_download_output
-    expected=" --no-transfer-progress"
-    result="${MAVEN_ARGS_APPEND}"
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven download output logs when MAVEN_DOWNLOAD_OUTPUT is true" {
-    prepareEnv
-    MAVEN_DOWNLOAD_OUTPUT="true"
-    configure_maven_download_output
-    expected=""
-    result="${MAVEN_ARGS_APPEND}"
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven args when IGNORE_SELF_SIGNED_CERTIFICATE is true" {
-    prepareEnv
-    MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE="true"
-    ignore_maven_self_signed_certificates
-    expected=" -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true"
-    result="${MAVEN_ARGS_APPEND}"
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven args when IGNORE_SELF_SIGNED_CERTIFICATE is false" {
-    prepareEnv
-    ignore_maven_self_signed_certificates
-    expected=""
-    result="${MAVEN_ARGS_APPEND}"
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
-
-@test "test maven custom repo with ID and all supported configurations" {
-    prepareEnv
-    MAVEN_REPO_URL="http://my.cool.mvn.repo.severinolabs.com/group/public"
-    MAVEN_REPO_ID="my_cool_id"
-    MAVEN_REPO_LAYOUT="test"
-    MAVEN_REPO_RELEASES_ENABLED="true"
-    MAVEN_REPO_RELEASES_UPDATE_POLICY="never"
-    MAVEN_REPO_RELEASES_CHECKSUM_POLICY="test"
-    MAVEN_REPO_SNAPSHOTS_ENABLED="false"
-    MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY="test"
-    MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY="test"
-
-    run add_maven_repo
-
-    repository_expected="<repository>
-                    <id>my_cool_id</id>
-                    <name>my_cool_id</name>
-                    <url>http://my.cool.mvn.repo.severinolabs.com/group/public</url>
-                    <layout>test</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                        <checksumPolicy>test</checksumPolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                        <updatePolicy>test</updatePolicy>
-                        <checksumPolicy>test</checksumPolicy>
-                    </snapshots>
-                </repository>"
-    repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "repository_expected=${repository_expected}"
-    echo "repository_result  =${repository_result}"
-    [ "${repository_expected}" = "${repository_result}" ]
-
-    plugin_repository_expected="<pluginRepository>
-                    <id>my_cool_id</id>
-                    <name>my_cool_id</name>
-                    <url>http://my.cool.mvn.repo.severinolabs.com/group/public</url>
-                    <layout>test</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                        <checksumPolicy>test</checksumPolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                        <updatePolicy>test</updatePolicy>
-                        <checksumPolicy>test</checksumPolicy>
-                    </snapshots>
-                </pluginRepository>"
-    plugin_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "plugin_repository_expected=${plugin_repository_expected}"
-    echo "plugin_repository_result  =${plugin_repository_result}"
-    [ "${plugin_repository_expected}" = "${plugin_repository_result}" ]
-}
-
-
-@test "test maven custom repo with no ID and other configuration, test default values" {
-    prepareEnv
-    MAVEN_REPO_URL="http://my.cool.mvn.repo.severinolabs.com/group/public"
-    run add_maven_repo
-
-    repository_url_expected="<url>http://my.cool.mvn.repo.severinolabs.com/group/public</url>"
-    repository_url_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository']//*[local-name()='url'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "repository_url_expected=${repository_url_expected}"
-    echo "repository_url_result  =${repository_url_result}"
-    [ "${repository_url_expected}" = "${repository_url_result}" ]
-
-    repository_releases_expected="<releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>always</updatePolicy>
-                        <checksumPolicy>warn</checksumPolicy>
-                    </releases>"
-    repository_releases_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository']//*[local-name()='releases'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "repository_releases_expected=${repository_releases_expected}"
-    echo "repository_releases_result  =${repository_releases_result}"
-    [ "${repository_releases_expected}" = "${repository_releases_result}" ]
-
-    repository_snapshots_expected="<snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>always</updatePolicy>
-                        <checksumPolicy>warn</checksumPolicy>
-                    </snapshots>"
-    repository_snapshots_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository']//*[local-name()='snapshots'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "repository_snapshots_expected=${repository_snapshots_expected}"
-    echo "repository_snapshots_result  =${repository_snapshots_result}"
-    [ "${repository_snapshots_expected}" = "${repository_snapshots_result}" ]
-
-
-    plugin_repository_url_expected="<url>http://my.cool.mvn.repo.severinolabs.com/group/public</url>"
-    plugin_repository_url_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository']//*[local-name()='url'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "plugin_repository_url_expected=${plugin_repository_url_expected}"
-    echo "plugin_repository_url_result  =${plugin_repository_url_result}"
-    [ "${plugin_repository_url_expected}" = "${plugin_repository_url_result}" ]
-
-    plugin_repository_releases_expected="<releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>always</updatePolicy>
-                        <checksumPolicy>warn</checksumPolicy>
-                    </releases>"
-    plugin_repository_releases_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository']//*[local-name()='releases'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "plugin_repository_releases_expected=${plugin_repository_releases_expected}"
-    echo "plugin_repository_releases_result  =${plugin_repository_releases_result}"
-    [ "${plugin_repository_releases_expected}" = "${plugin_repository_releases_result}" ]
-
-    plugin_repository_snapshots_expected="<snapshots>
-                        <enabled>true</enabled>
-                        <updatePolicy>always</updatePolicy>
-                        <checksumPolicy>warn</checksumPolicy>
-                    </snapshots>"
-    plugin_repository_snapshots_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository']//*[local-name()='snapshots'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "plugin_repository_snapshots_expected=${plugin_repository_snapshots_expected}"
-    echo "plugin_repository_snapshots_result  =${plugin_repository_snapshots_result}"
-    [ "${plugin_repository_snapshots_expected}" = "${plugin_repository_snapshots_result}" ]
-}
-
-@test "test maven multiple custom repos with ID and all supported configuration" {
-    prepareEnv
-    MAVEN_REPOS="CENTRAL,COMPANY"
-    CENTRAL_MAVEN_REPO_URL="http://central.severinolabs.com/group/public"
-    CENTRAL_MAVEN_REPO_ID="my_cool_id_central"
-    CENTRAL_MAVEN_REPO_LAYOUT="test"
-    CENTRAL_MAVEN_REPO_RELEASES_ENABLED="true"
-    CENTRAL_MAVEN_REPO_RELEASES_UPDATE_POLICY="never"
-    CENTRAL_MAVEN_REPO_RELEASES_CHECKSUM_POLICY="test"
-    CENTRAL_MAVEN_REPO_SNAPSHOTS_ENABLED="false"
-    CENTRAL_MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY="test"
-    CENTRAL_MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY="test"
-
-    COMPANY_MAVEN_REPO_URL="http://company.severinolabs.com/group/public"
-    COMPANY_MAVEN_REPO_ID="my_cool_id_company"
-    COMPANY_MAVEN_REPO_LAYOUT="another-test"
-    COMPANY_MAVEN_REPO_RELEASES_ENABLED="true"
-    COMPANY_MAVEN_REPO_RELEASES_UPDATE_POLICY="never"
-    COMPANY_MAVEN_REPO_RELEASES_CHECKSUM_POLICY="another-test"
-    COMPANY_MAVEN_REPO_SNAPSHOTS_ENABLED="false"
-    COMPANY_MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY="another-test"
-    COMPANY_MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY="another-test"
-
-    run add_maven_repo
-
-    central_repository_expected="<repository>
-                    <id>my_cool_id_central</id>
-                    <name>my_cool_id_central</name>
-                    <url>http://central.severinolabs.com/group/public</url>
-                    <layout>test</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                        <checksumPolicy>test</checksumPolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                        <updatePolicy>test</updatePolicy>
-                        <checksumPolicy>test</checksumPolicy>
-                    </snapshots>
-                </repository>"
-    central_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository'])[last()-1]"  ${HOME}/.m2/settings.xml)
-    echo "central_repository_expected=${central_repository_expected}"
-    echo "central_repository_result  =${central_repository_result}"
-    [ "${central_repository_expected}" = "${central_repository_result}" ]
-
-    company_repository_expected="<repository>
-                    <id>my_cool_id_company</id>
-                    <name>my_cool_id_company</name>
-                    <url>http://company.severinolabs.com/group/public</url>
-                    <layout>another-test</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                        <checksumPolicy>another-test</checksumPolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                        <updatePolicy>another-test</updatePolicy>
-                        <checksumPolicy>another-test</checksumPolicy>
-                    </snapshots>
-                </repository>"
-    company_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='repositories']//*[local-name()='repository'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "company_repository_expected=${company_repository_expected}"
-    echo "company_repository_result  =${company_repository_result}"
-    [ "${company_repository_expected}" = "${company_repository_result}" ]
-
-
-    central_plugin_repository_expected="<pluginRepository>
-                    <id>my_cool_id_central</id>
-                    <name>my_cool_id_central</name>
-                    <url>http://central.severinolabs.com/group/public</url>
-                    <layout>test</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                        <checksumPolicy>test</checksumPolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                        <updatePolicy>test</updatePolicy>
-                        <checksumPolicy>test</checksumPolicy>
-                    </snapshots>
-                </pluginRepository>"
-    central_plugin_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository'])[last()-1]"  ${HOME}/.m2/settings.xml)
-    echo "central_plugin_repository_expected=${central_plugin_repository_expected}"
-    echo "central_plugin_repository_result  =${central_plugin_repository_result}"
-    [ "${central_plugin_repository_expected}" = "${central_plugin_repository_result}" ]
-
-    company_plugin_repository_expected="<pluginRepository>
-                    <id>my_cool_id_company</id>
-                    <name>my_cool_id_company</name>
-                    <url>http://company.severinolabs.com/group/public</url>
-                    <layout>another-test</layout>
-                    <releases>
-                        <enabled>true</enabled>
-                        <updatePolicy>never</updatePolicy>
-                        <checksumPolicy>another-test</checksumPolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                        <updatePolicy>another-test</updatePolicy>
-                        <checksumPolicy>another-test</checksumPolicy>
-                    </snapshots>
-                </pluginRepository>"
-    company_plugin_repository_result=$(xmllint --xpath "(//*[local-name()='profiles']//*[local-name()='profile']//*[local-name()='pluginRepositories']//*[local-name()='pluginRepository'])[last()]"  ${HOME}/.m2/settings.xml)
-    echo "company_plugin_repository_expected=${company_plugin_repository_expected}"
-    echo "company_plugin_repository_result  =${company_plugin_repository_result}"
-    [ "${company_plugin_repository_expected}" = "${company_plugin_repository_result}" ]
-}
-
-@test "test maven args if it contains the user.home pointing to /home/kogito" {
-    # it is expected that KOGITO_HOME is already set.
-    export KOGITO_HOME=/home/kogito
-    prepareEnv
-    configureMavenHome
-    expected=" -Duser.home=/home/kogito"
-    result="${MAVEN_ARGS_APPEND}"
-    echo "expected=${expected}"
-    echo "result=${result}"
-    [ "${expected}" = "${result}" ]
-}
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-project-versions/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-project-versions/module.yaml
deleted file mode 100644
index fb5dc14fc35..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-project-versions/module.yaml
+++ /dev/null
@@ -1,33 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.project.versions
-version: "0.0.0"
-description: "Kogito Project versions information"
-
-envs:
-  - name: "KOGITO_VERSION"
-    value: "### SET ME DURING BUILD PROCESS ###"
-    description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user.
-  - name: "QUARKUS_PLATFORM_VERSION"
-    value: "### SET ME DURING BUILD PROCESS ###"
-    description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user.
-  - name: "SONATAFLOW_QUARKUS_DEVUI_VERSION"
-    value: "### SET ME DURING BUILD PROCESS ###"
-    description: Defines the SonataFlow Quarkus Dev UI version to be used by the devmode image. Not intended to be changed by end user.
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-system-user/add-user b/packages/sonataflow-image-common/resources/modules/kogito-system-user/add-user
deleted file mode 100644
index f90e5b6178f..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-system-user/add-user
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-# Check if group 1001 exists, if not, create it
-if ! getent group kogito >/dev/null; then
-  groupadd -r kogito -g ${USER_ID}
-fi
-
-# Check if user 1001 exists, if not, reuse it for kogito
-if ! id "${USER_ID}" >/dev/null 2>&1; then
-  useradd -u "${USER_ID}" -r -g kogito -G root -m -d "${KOGITO_HOME}" -s /sbin/nologin -c "Kogito user" ${USER}
-else
-  echo "User with UID ${USER_ID} already exists, reusing it."
-  # Change home directory and group for the existing user
-  usermod -d "${KOGITO_HOME}" -g kogito ${USER}
-fi
-
-mkdir -p "${KOGITO_HOME}"/bin
-chmod ug+rwX "${KOGITO_HOME}"
-
diff --git a/packages/sonataflow-image-common/resources/modules/kogito-system-user/module.yaml b/packages/sonataflow-image-common/resources/modules/kogito-system-user/module.yaml
deleted file mode 100644
index efa064bc637..00000000000
--- a/packages/sonataflow-image-common/resources/modules/kogito-system-user/module.yaml
+++ /dev/null
@@ -1,35 +0,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.
-#
-schema_version: 1
-name: org.kie.kogito.system.user
-version: "0.0.0"
-
-execute:
-  - script: add-user
-
-envs:
-  - name: "KOGITO_HOME"
-    value: "/home/kogito"
-  # Force override here since some images depends on OpenJDK, which sets home to /home/jboss. Might be worth removing the kogito user and keep jboss instead. TODO: open an issue to track it and link to Kogito Operator deprecation.
-  - name: "HOME"
-    value: "/home/kogito"
-  - name: "USER"
-    value: "kogito"
-  - name: "USER_ID"
-    value: 1001
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/cleanup_project.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/cleanup_project.sh
deleted file mode 100755
index 69e0a61e975..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/cleanup_project.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-#remove unnecessary files
-echo 'Clean unnecessary files'
-rm -rfv "${PROJECT_ARTIFACT_ID}"/target
-rm -rfv "${PROJECT_ARTIFACT_ID}"/src/main/resources/*
-rm -rfv "${PROJECT_ARTIFACT_ID}"/src/main/docker
-rm -rfv "${PROJECT_ARTIFACT_ID}"/.mvn/wrapper
-rm -rfv "${PROJECT_ARTIFACT_ID}"/mvnw*
-rm -rfv "${PROJECT_ARTIFACT_ID}"/src/test
-rm -rfv "${PROJECT_ARTIFACT_ID}"/*.bak
-
-# Maven useless files
-# Needed to avoid Maven to automatically re-download from original Maven repository ...
-echo 'Clean Maven useless files'
-find "${KOGITO_HOME}"/.m2/repository -name _remote.repositories -type f -delete
-find "${KOGITO_HOME}"/.m2/repository -name _maven.repositories -type f -delete
-find "${KOGITO_HOME}"/.m2/repository -name '*.lastUpdated' -type f -delete
-
-# Remove files that include build timestamps to have reproducible images
-find "${KOGITO_HOME}"/.m2/ -name resolver-status.properties -delete 
-# Remove quarkus registry
-rm -rf "${KOGITO_HOME}"/.m2/repository/io/quarkus/registry/
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/zip_files.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/zip_files.sh
deleted file mode 100755
index 3e68296ef2c..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/added/zip_files.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-BUILD_OUTPUT="${KOGITO_HOME}"/build_output/
-
-mkdir -p "${BUILD_OUTPUT}"
-
-echo "Zip and copy scaffold project"
-tar cf kogito-swf-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" .
-cp -v kogito-swf-quarkus-app.tar "${BUILD_OUTPUT}"
-
-echo "Zip and copy maven repo"
-cd "${KOGITO_HOME}"/.m2/repository/
-tar cf kogito-swf-maven-repo.tar .
-cp -v kogito-swf-maven-repo.tar "${BUILD_OUTPUT}"
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/configure.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/configure.sh
deleted file mode 100644
index 50897c656b1..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/configure.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ADDED_DIR="${SCRIPT_DIR}"/added
-LAUNCH_DIR="${KOGITO_HOME}"/launch
-BUILD_DIR="${KOGITO_HOME}"/build
-
-mkdir -p "${BUILD_DIR}"
-cp -v "${ADDED_DIR}"/* "${BUILD_DIR}"
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
-
-cd "${KOGITO_HOME}"
-
-# Create app
-"${LAUNCH_DIR}"/create-app.sh
-
-"${BUILD_DIR}"/cleanup_project.sh
-"${BUILD_DIR}"/zip_files.sh
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/module.yaml b/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/module.yaml
deleted file mode 100644
index 0325c599ae4..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/build/module.yaml
+++ /dev/null
@@ -1,25 +0,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.
-#
-schema_version: 1
-name: org.kie.sonataflow.common.build
-version: "0.0.0"
-description: "Kogito Serverless Workflow image build process"
-
-execute:
-  - script: configure.sh
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/add-extension.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/add-extension.sh
deleted file mode 100755
index 6dc158d2a08..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/add-extension.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# extensions to be added, comma separated.
-extensions="$1"
-# parameter passed which will trigger or not the jvm/maven configuration.
-ignore_jvm_settings=${2:-false}
-
-# shellcheck source=/dev/null
-source "${script_dir_path}"/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    printenv
-fi
-
-if [ "${ignore_jvm_settings}" != "true" ]; then
-    source "${script_dir_path}"/configure-jvm-mvn.sh
-fi
-
-"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-    -nsu \
-    -s "${MAVEN_SETTINGS_PATH}" \
-    -DplatformVersion="${QUARKUS_PLATFORM_VERSION}" \
-    -Dextensions="${extensions}" \
-    ${QUARKUS_ADD_EXTENSION_ARGS} \
-    io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":add-extension
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/build-app.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/build-app.sh
deleted file mode 100755
index 671d6e09b1e..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/build-app.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-resources_path="$1"
-if [ -n "${resources_path}" ]; then
-    resources_path="$(realpath "${resources_path}")"
-fi
-
-# shellcheck source=/dev/null
-source "${script_dir_path}"/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode" 
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    log_info "Resources path is ${resources_path}"
-    printenv
-fi
-
-# Copy resources if exists
-log_info "-> Copying files from ${resources_path}, if any..."
-if [ -n "${resources_path}" ]; then
-    destination="${KOGITO_HOME}/serverless-workflow-project/src/main/resources/"
-    log_info "-> Destination folder is ${destination}"
-    cp -vR ${resources_path}/* ${destination}
-    find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p  ${destination}/.mvn \; -exec cp -v {} ${destination}/.mvn/ \;
-else
-    log_warning "-> Nothing to copy from ${resources_path}"
-fi
-
-source "${script_dir_path}"/configure-jvm-mvn.sh
-
-if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
-    log_info "Adding extensions '${QUARKUS_EXTENSIONS}'"
-    ${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}" "true"
-fi
-
-cd ${KOGITO_HOME}/serverless-workflow-project
-
-"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-    -nsu \
-    -s "${MAVEN_SETTINGS_PATH}" \
-    -DskipTests \
-    -Dquarkus.container-image.build=false \
-    clean install
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh
deleted file mode 100755
index cd8292cc014..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Dmaven.compiler.release=${JAVA_VERSION}"
-
-# Call the configure-maven here
-source "${KOGITO_HOME}"/launch/configure-maven.sh
-configure
-
-# auto configure JVM settings
-source "${KOGITO_HOME}"/launch/jvm-settings.sh
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/create-app.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/create-app.sh
deleted file mode 100755
index 9d99b521704..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/create-app.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# shellcheck source=/dev/null
-source "${script_dir_path}"/logging.sh
-
-if [ "${SCRIPT_DEBUG}" = "true" ] ; then
-    set -x
-    export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode"
-    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
-    printenv
-fi
-
-source "${script_dir_path}"/configure-jvm-mvn.sh
-
-"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-  -nsu \
-  -s "${MAVEN_SETTINGS_PATH}" \
-  io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":create ${QUARKUS_CREATE_ARGS} \
-  -DprojectGroupId="${PROJECT_GROUP_ID}" \
-  -DprojectArtifactId="${PROJECT_ARTIFACT_ID}" \
-  -DprojectVersionId="${PROJECT_VERSION}" \
-  -DplatformVersion="${QUARKUS_PLATFORM_VERSION}" \
-  -Dextensions="${QUARKUS_EXTENSIONS}"
-
-cd "${PROJECT_ARTIFACT_ID}"
-
-source "${script_dir_path}"/configure-jvm-mvn.sh
-
-# Fix as we cannot rely on Quarkus platform
-# Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented
-if [ ! -z ${KOGITO_VERSION} ]; then
-    echo "Replacing Kogito Platform BOM with version ${KOGITO_VERSION}"
-    # [ ]* -> is a regexp pattern to match any number of spaces
-    pattern_1="[ ]*<groupId>.*<\/groupId>"
-    pattern_2="[ ]*<artifactId>quarkus-kogito-bom<\/artifactId>\n"
-    pattern_3="[ ]*<version>.*<\/version>\n"
-    complete_pattern="$pattern_1\n$pattern_2$pattern_3"
-
-    replace_1="        <groupId>org.kie.kogito<\/groupId>\n"
-    replace_2="        <artifactId>kogito-bom<\/artifactId>\n"
-    replace_3="        <version>${KOGITO_VERSION}<\/version>\n"
-    complete_replace="$replace_1$replace_2$replace_3"
-
-    sed -i.bak -e "/$pattern_1/{
-        N;N;N
-        s/$complete_pattern/$complete_replace/
-        }" pom.xml
-fi
-
-# if the image being built is X86_64, remove the arm64 maven dependencies from
-# kogito-addons-quarkus-jobs-service-embedded and kogito-addons-quarkus-data-index-inmemory
-# using maven exclusions
-exclusion_jobs_service=""
-pattern_jobs_service="<artifactId>kogito-addons-quarkus-jobs-service-embedded</artifactId>"
-base_exclusions="<exclusion>\
-          <groupId>io.zonky.test.postgres</groupId>\
-          <artifactId>embedded-postgres-binaries-linux-amd64-alpine</artifactId>\
-        </exclusion>\
-        <exclusion>\
-          <groupId>io.zonky.test.postgres</groupId>\
-          <artifactId>embedded-postgres-binaries-darwin-amd64</artifactId>\
-        </exclusion>\
-        <exclusion>\
-          <groupId>io.zonky.test.postgres</groupId>\
-          <artifactId>embedded-postgres-binaries-darwin-arm64v8</artifactId>\
-        </exclusion>\
-        <exclusion>\
-          <groupId>io.zonky.test.postgres</groupId>\
-          <artifactId>embedded-postgres-binaries-windows-amd64</artifactId>\
-        </exclusion>"
-
-arch=$(uname -p)
-if [ "${arch}" = "x86_64" ]; then
-    echo "Removing arm64 dependencies from kogito-addons-quarkus-jobs-service-embedded and kogito-addons-quarkus-data-index-inmemory dependencies"
-    exclusion_jobs_service="${pattern_jobs_service}\
-     <exclusions>\
-        $base_exclusions\
-        <exclusion>\
-          <groupId>io.zonky.test.postgres</groupId>\
-          <artifactId>embedded-postgres-binaries-linux-arm64v8</artifactId>\
-        </exclusion>\
-     </exclusions>"
-
-elif [ "${arch}" = "aarch64" ]; then
-    echo "Removing amd64 dependencies from kogito-addons-quarkus-jobs-service-embedded and kogito-addons-quarkus-data-index-inmemory dependencies"
-    exclusion_jobs_service="${pattern_jobs_service}\
-     <exclusions>\
-        $base_exclusions\
-        <exclusion>\
-          <groupId>io.zonky.test.postgres</groupId>\
-          <artifactId>embedded-postgres-binaries-linux-amd64</artifactId>\
-        </exclusion>\
-     </exclusions>"
-fi
-
-# Do the replace if needed
-if [ ! -z "${exclusion_jobs_service}" ]; then
-    sed -i.bak "s|$pattern_jobs_service|$exclusion_jobs_service|" pom.xml
-fi
-
-if [ "${SCRIPT_DEBUG^^}" = "TRUE" ]; then
-    cat pom.xml
-fi
-
-ls -la "${KOGITO_HOME}"/.m2/repository/org/apache/kie/
-ls -la "${KOGITO_HOME}"/.m2/repository/org/kie/
-
-# we force the dependencies download beforehand, so we won't have problems when running or building our apps in offline mode
-# see:
-#   https://quarkus.io/guides/maven-tooling#downloading-maven-artifact-dependencies-for-offline-development-and-testing
-#   https://maven.apache.org/plugins/maven-dependency-plugin/go-offline-mojo.html
-"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-  -nsu \
-  -s "${MAVEN_SETTINGS_PATH}" \
-  -DskipTests=true \
-  -Dmaven.javadoc.skip=true \
-  clean dependency:go-offline io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":go-offline install
-
-# clean up
-"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-  -nsu \
-  -s "${MAVEN_SETTINGS_PATH}" \
-  clean
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/jvm-settings.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/jvm-settings.sh
deleted file mode 100755
index 168e5321617..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/added/jvm-settings.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-# Calculate the java memory for the given maven build.
-# It is based in the container-limits that can be found in
-# https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash/artifacts/opt/jboss/container/java/jvm/container-limits
-#
-# It respects the jvm.config of ${maven.projectBasedir}/.mvn/jvm.config
-# Usage: add the following line in the desired script:
-#   source "${KOGITO_HOME}"/launch/jvm-settings.sh
-# If you want to provide the jvm.config, be sure to access the target directory before sourcing this script.
-
-
-set -e
-
-# shellcheck source=/dev/null
-source "${KOGITO_HOME}"/launch/logging.sh
-
-log_info "--> checking if .mvn/jvm.config exists."
-if [ -f ".mvn/jvm.config" ]; then
-  log_info "---> .mvn/jvm.config exists."
-  JAVA_OPTIONS=$(cat .mvn/jvm.config)
-  export JAVA_OPTIONS
-else
-  log_info "---> .mvn/jvm.config does not exists, memory will be calculated based on container limits."
-fi
-
-MAVEN_OPTS="${JAVA_OPTIONS} $("${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/java-default-options) $("${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/debug-options)"
-export MAVEN_OPTS
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/configure.sh b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/configure.sh
deleted file mode 100644
index 8fa4b87981a..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/configure.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SOURCES_DIR=/tmp/artifacts
-ADDED_DIR="${SCRIPT_DIR}"/added
-LAUNCH_DIR="${KOGITO_HOME}"/launch
-
-cp -v "${ADDED_DIR}"/* "${LAUNCH_DIR}"
-
-chown -R 1001:0 "${KOGITO_HOME}"
-chmod -R ug+rwX "${KOGITO_HOME}"
diff --git a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/module.yaml b/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/module.yaml
deleted file mode 100644
index 38c498eac45..00000000000
--- a/packages/sonataflow-image-common/resources/modules/sonataflow/common/scripts/module.yaml
+++ /dev/null
@@ -1,45 +0,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.
-#
-schema_version: 1
-name: org.kie.sonataflow.common.scripts
-version: "0.0.0"
-description: "Kogito Serverless Workflow image common scripts"
-
-envs:
-  - name: QUARKUS_EXTENSIONS
-    example: "quarkus-kubernetes,org.apache.kie.sonataflow:sonataflow-quarkus:${KOGITO_VERSION},org.kie:kie-addons-quarkus-knative-eventing:${KOGITO_VERSION}"
-    description: To add extension to your application
-
-  - name: PROJECT_GROUP_ID
-    value: "org.acme"
-    description: Please do not change. To change only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
-  - name: PROJECT_ARTIFACT_ID
-    value: "serverless-workflow-project"
-    description: Please do not change. To change only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
-  - name: PROJECT_VERSION
-    value: "1.0.0-SNAPSHOT"
-    description: Please do not change. To change only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
-  - name: QUARKUS_CREATE_ARGS
-    example: -DnoCode
-    description: To use only if you plan to use the ${KOGITO_HOME}/launch/create-app.sh
-  - name: QUARKUS_ADD_EXTENSION_ARGS
-    description: To use only if you plan to use the ${KOGITO_HOME}/launch/add-extension.sh
-
-execute:
-  - script: configure.sh
diff --git a/packages/sonataflow-image-common/resources/scripts/README.md b/packages/sonataflow-image-common/resources/scripts/README.md
deleted file mode 100644
index a4989b53d4e..00000000000
--- a/packages/sonataflow-image-common/resources/scripts/README.md
+++ /dev/null
@@ -1,64 +0,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.
--->
-<!--
-   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.
--->
-
-# sonataflow-image-common utility scripts
-
-This directory contains a set of python scripts used to help to perform some tasks during the build and configuration of the `kogito-swf` images:
-
-## Common script
-
-The [common.py](common.py) defines the basic functions that will be used by other scripts
-
-## Retrieve Versions script
-
-The [retrieve_versions.py](retrieve_version.py) script is used to read the actual image version from the
-`kogito-project-versions` module during the image build process.
-
-## Versions Manager
-
-The [versions_manager.py](versions_manager.py) script offers a CLI that helps upgrading versions properties in
-the images yaml descriptor or cekit modules. This script is being used during the image build time, but it's also used
-to update the images / cekit modules versions when bootstraping the `@kie-tools` repo.
-
-Usage:
-
-- Bumping images / cekit modules versions of a package in `@kie-tools`
-  Args:
-
-  - `--bump-to`: bumps the image and module versions (in the `resources` folder) to the specified version.
-  - `--source-folder`: specifies the path to the `resources` folder.
-
-- Upgrading platform dependencies in all images / modules envs and labels during the image build process.
-  Args:
-- `--quarkus-version`: Sets the Quarkus version
-- `--kogito-version`: Sets the Kogito version
diff --git a/packages/sonataflow-image-common/resources/scripts/common.py b/packages/sonataflow-image-common/resources/scripts/common.py
deleted file mode 100644
index 30cbdc44c93..00000000000
--- a/packages/sonataflow-image-common/resources/scripts/common.py
+++ /dev/null
@@ -1,304 +0,0 @@
-import os
-import re
-import glob
-
-from ruamel.yaml import YAML
-
-MODULE_FILENAME = "module.yaml"
-MODULES_DIR = "modules"
-PROJECT_VERSIONS_MODULE = "modules/kogito-project-versions/module.yaml"
-
-KOGITO_VERSION_ENV_KEY = "KOGITO_VERSION"
-KOGITO_VERSION_LABEL_NAME = "org.kie.kogito.version"
-
-QUARKUS_PLATFORM_VERSION_ENV_KEY = "QUARKUS_PLATFORM_VERSION"
-QUARKUS_PLATFORM_VERSION_LABEL_NAME = "io.quarkus.platform.version"
-
-SONATAFLOW_QUARKUS_DEVUI_VERSION_ENV_KEY = "SONATAFLOW_QUARKUS_DEVUI_VERSION"
-
-
-def yaml_loader():
-    """
-    default yaml Loader
-    :return: yaml object
-    """
-    yaml = YAML()
-    yaml.preserve_quotes = True
-    yaml.width = 1024
-    yaml.indent(mapping=2, sequence=4, offset=2)
-    return yaml
-
-def retrieve_version():
-    """
-    Retrieve the project version from project data file
-    """
-    return get_project_versions_module_data()['version']
-
-def get_all_images(source_folder = None):
-    """
-    Retrieve all images in current dir
-    """
-    root_folder = "." if source_folder is None else source_folder
-    return glob.glob("{}/*-image.yaml".format(root_folder))
-
-def get_project_versions_module_data():
-    """
-    Get a specific field value from project versions module file
-    """
-    try:
-        project_versions_module_file = os.path.join(PROJECT_VERSIONS_MODULE)
-        with open(project_versions_module_file) as project_versions_data:
-            return yaml_loader().load(project_versions_data)
-
-    except TypeError:
-        raise
-
-def get_all_module_dirs(source_folder = None):
-    """
-    Retrieve the module directories
-    :param source_folder: folder where resources are stored
-    """
-
-    root_folder = "." if source_folder is None else source_folder
-    modules_dir = "{}/{}".format(root_folder, MODULES_DIR)
-
-    modules = []
-
-    # r=>root, d=>directories, f=>files
-    for r, d, f in os.walk(modules_dir):
-        for item in f:
-            if MODULE_FILENAME == item:
-                modules.append(os.path.dirname(os.path.join(r, item)))
-                print("[sonataflow-image-common] Processing modules of '" + os.path.dirname(os.path.join(r, item)) + "'")
-
-    return modules
-
-def update_image_and_modules_version(target_version, source_folder = None):
-    """
-    Update every Kogito module.yaml to the given version.
-    :param target_version: version used to update all Kogito module.yaml files
-    :param source_folder: folder where resources are stored
-    """
-    print("Images and Modules version will be updated to {0}".format(target_version))
-    update_images_version(target_version, source_folder)
-    update_modules_version(target_version, source_folder)
-
-
-def update_modules_version(target_version, source_folder = None):
-    """
-    Update every Kogito module.yaml to the given version.
-    :param target_version: version used to update all Kogito module.yaml files
-    :param source_folder: folder where resources are stored
-    """
-    modules = get_all_module_dirs(source_folder)
-
-    for module_dir in modules:
-        update_module_version(module_dir, target_version)
-
-
-def update_module_version(module_dir, target_version):
-    """
-    Set Kogito module.yaml to given version.
-    :param module_dir: directory where cekit modules are hold
-    :param target_version: version to set into the module
-    """
-    try:
-        module_file = os.path.join(module_dir, MODULE_FILENAME)
-        with open(module_file) as module:
-            data = yaml_loader().load(module)
-            print("Updating module {0} version from {1} to {2}".format(data['name'], data['version'], target_version))
-            data['version'] = target_version
-
-        with open(module_file, 'w') as module:
-            yaml_loader().dump(data, module)
-
-    except TypeError:
-        raise
-
-def update_images_version(target_version, source_folder = None):
-    """
-    Update image.yml files version tag.
-    :param target_version: version used to update
-    :param source_folder: folder where resources are stored
-    """
-    for image_filename in get_all_images(source_folder):
-        update_image_version_tag_in_yaml_file(target_version, image_filename)
-
-
-def update_image_version_tag_in_yaml_file(target_version, yaml_file):
-    """
-    Update root version tag in yaml file.
-    :param target_version: version to set
-    :param yaml_file: yaml file to update
-    """
-    print("Updating Image main file version from file {0} to version {1}".format(yaml_file, target_version))
-    try:
-        with open(yaml_file) as image:
-            data = yaml_loader().load(image)
-            update_field_in_dict(data, 'version', target_version)
-
-        with open(yaml_file, 'w') as image:
-            yaml_loader().dump(data, image)
-    except TypeError as err:
-        print("Unexpected error:", err)
-
-def update_kogito_platform_version(kogito_platform_version):
-    """
-    Update kogito_platform_version version into images/modules
-    :param kogito_platform_version: kogito version to set
-    """
-    print("Setting Kogito Platform version: " + kogito_platform_version)
-    update_env_value(KOGITO_VERSION_ENV_KEY, kogito_platform_version)
-    update_label_value(KOGITO_VERSION_LABEL_NAME, kogito_platform_version)
-
-def update_quarkus_platform_version(quarkus_platform_version):
-    """
-    Update quarkus_platform_version version into images/modules
-    :param quarkus_platform_version: quarkus version to set
-    """
-    print("Setting Quarkus version: " + quarkus_platform_version)
-    update_env_value(QUARKUS_PLATFORM_VERSION_ENV_KEY, quarkus_platform_version)
-    update_label_value(QUARKUS_PLATFORM_VERSION_LABEL_NAME, quarkus_platform_version)
-
-def update_sonataflow_quarkus_devui_version(sonataflow_quarkus_devui_version):
-    """
-    Update sonataflow_quarkus_devui_version version into images/modules
-    :param sonataflow_quarkus_devui_version: sonataflow quarkus devui version to set
-    """
-    print("Setting SonataFlow Quarkus DevUI version: " + sonataflow_quarkus_devui_version)
-    update_env_value(SONATAFLOW_QUARKUS_DEVUI_VERSION_ENV_KEY, sonataflow_quarkus_devui_version)
-
-def update_env_value(env_name, env_value):
-    """
-    Update environment value into the given yaml module/image file
-    :param env_name: environment variable name to update
-    :param env_value: value to set
-    """
-
-    images = get_all_images()
-    modules = get_all_module_dirs()
-
-    for image_filename in images:
-        update_env_value_in_file(image_filename, env_name, env_value)
-
-    for module_dir in modules:
-        module_file = os.path.join(module_dir, "module.yaml")
-        update_env_value_in_file(module_file, env_name, env_value)
-
-def update_env_value_in_file(filename, env_name, env_value):
-    """
-    Update environment value into the given yaml module/image file
-    :param filename: filename to update
-    :param env_name: environment variable name to update
-    :param env_value: value to set
-    """
-    print("Updating {0} label {1} with value {2}".format(filename, env_name, env_value))
-    try:
-        with open(filename) as yaml_file:
-            data = yaml_loader().load(yaml_file)
-            update_env_value_in_data(data, env_name, env_value)
-
-        with open(filename, 'w') as yaml_file:
-            yaml_loader().dump(data, yaml_file)
-
-    except TypeError:
-        raise
-
-
-def update_env_value_in_data(data, env_name, env_value, ignore_empty = False):
-    """
-    Update environment variable value in data dict if exists
-    :param data: dict to update
-    :param env_name: environment variable name
-    :param env_value: environment variable value to set
-    :param ignore_empty: Whether previous value should be present to set the new value
-    """
-    if isinstance(data, list):
-        for data_item in data:
-            update_env_value_in_data(data_item, env_name, env_value, ignore_empty)
-    else:
-        if ignore_empty:
-            if 'envs' not in data:
-                data['envs'] = []
-            data['envs'] += [ dict(name=env_name, value=env_value) ]
-        elif 'envs' in data:
-            for _, env in enumerate(data['envs'], start=0):
-                if env['name'] == env_name:
-                    update_field_in_dict(env, 'value', env_value, ignore_empty)
-
-def update_field_in_dict(data, key, new_value, ignore_empty = False):
-    """
-    Update version field in given data dict
-    :param data: dictionary to update
-    :param key: key to lookup
-    :param new_value: value to set
-    :param ignore_empty: Whether previous value should be present to set the new value
-    """
-    if isinstance(data, list):
-        for data_item in data:
-            update_field_in_dict(data_item, key, new_value, ignore_empty)
-    else:
-        if ignore_empty or key in data:
-            data[key] = new_value
-        else:
-            print("Field " + key + " not found, returning...")
-
-def update_label_value(label_name, label_value):
-    """
-    Update label value in all modules and images
-    :param label_name: label name to update
-    :param label_value: value to set
-    """
-
-    images = get_all_images()
-    modules = get_all_module_dirs()
-
-    for image_filename in images:
-        print("updating image: " + image_filename)
-        update_label_value_in_file(image_filename, label_name, label_value)
-
-    for module_dir in modules:
-        module_file = os.path.join(module_dir, "module.yaml")
-        update_label_value_in_file(module_file, label_name, label_name)
-
-def update_label_value_in_file(filename, label_name, label_value):
-    """
-    Update label value into the given yaml module/image file
-    :param filename: filename to update
-    :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))
-    try:
-        with open(filename) as yaml_file:
-            data = yaml_loader().load(yaml_file)
-            update_label_value_in_data(data, label_name, label_value)
-
-        with open(filename, 'w') as yaml_file:
-            yaml_loader().dump(data, yaml_file)
-
-    except TypeError:
-        raise
-
-
-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
-    :param label_name: label name
-    :param label_value: label value to set
-    :param ignore_empty: Whether previous value should be present to set the new value
-    """
-    if isinstance(data, list):
-        for data_item in data:
-            update_label_value_in_data(data_item, label_name, label_value, ignore_empty)
-    else:
-        if ignore_empty:
-            if 'labels' not in data:
-                data['labels'] = []
-            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:
-                    update_field_in_dict(label, 'value', label_value, ignore_empty)
-
diff --git a/packages/sonataflow-image-common/resources/scripts/retrieve_version.py b/packages/sonataflow-image-common/resources/scripts/retrieve_version.py
deleted file mode 100644
index d741e2454b4..00000000000
--- a/packages/sonataflow-image-common/resources/scripts/retrieve_version.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-#
-# 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.
-#
-
-#Script responsible to update the tests with
-#Should be run from root directory of the repository
-#Sample usage:  python3 scripts/retrieve_version.py
-
-import sys
-sys.dont_write_bytecode = True
-
-import common
-
-if __name__ == "__main__":
-    print(common.retrieve_version())
diff --git a/packages/sonataflow-image-common/resources/scripts/run-bats.sh b/packages/sonataflow-image-common/resources/scripts/run-bats.sh
deleted file mode 100755
index af64c14d850..00000000000
--- a/packages/sonataflow-image-common/resources/scripts/run-bats.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-
-set -e
-
-script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-if [[ $(command -v ./bats/bin/bats) ]]; then    #skip if bats already installed else will install the bats
-    echo "---> bats already available running tests"
-else
-    git clone https://github.com/bats-core/bats-core.git
-    ./bats-core/install.sh bats
-    rm -rf bats-core
-fi
-
-tests_output_path="${script_dir_path}/../../dist-tests-e2e"
-
-echo "----> running bats"
-./bats/bin/bats modules/sonataflow/common/scripts/tests/bats --formatter junit --report-formatter junit --output "${tests_output_path}"
diff --git a/packages/sonataflow-image-common/resources/scripts/versions_manager.py b/packages/sonataflow-image-common/resources/scripts/versions_manager.py
deleted file mode 100644
index d71f18a8917..00000000000
--- a/packages/sonataflow-image-common/resources/scripts/versions_manager.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python3
-#
-# 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.
-#
-
-#Script responsible to update the tests with
-#Should be run from root directory of the repository
-#Sample usage:  python3 scripts/retrieve_version.py
-
-import sys
-import argparse
-import common
-import re
-
-sys.dont_write_bytecode = True
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Kie Tools - SWF Image Version Manager')
-    parser.add_argument('--bump-to', dest='bump_to', help='Bump all images and yamls to the next version')
-    parser.add_argument('--source-folder', dest='source_folder')
-    parser.add_argument('--quarkus-version', dest='quarkus_version', help='Sets the image Quarkus Version')
-    parser.add_argument('--kogito-version', dest='kogito_version', help='Sets the image Kogito Version')
-    parser.add_argument('--sonataflow-quarkus-devui-version', dest='sonataflow_quarkus_devui_version', help='Sets the image SonataFlow Quarkus DevUI Version', required=False)
-
-    args = parser.parse_args()
-
-    if args.bump_to is None and args.kogito_version is None and args.quarkus_version is None:
-        print(parser.print_usage())
-    else:
-        if args.bump_to is not None:
-            common.update_image_and_modules_version(args.bump_to, args.source_folder)
-        if args.kogito_version is not None:
-            common.update_kogito_platform_version(args.kogito_version)
-        if args.quarkus_version is not None:
-            common.update_quarkus_platform_version(args.quarkus_version)
-        if args.sonataflow_quarkus_devui_version is not None:
-            common.update_sonataflow_quarkus_devui_version(args.sonataflow_quarkus_devui_version)
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/resources/tests/shell/README.md b/packages/sonataflow-image-common/resources/tests/shell/README.md
deleted file mode 100644
index c330c3b8ec6..00000000000
--- a/packages/sonataflow-image-common/resources/tests/shell/README.md
+++ /dev/null
@@ -1,36 +0,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.
--->
-
-# Tests in Shell
-
-## Running Tests With JBang
-
-- Install JBang
-- Install VSCode Red Hat's Java plugin
-- Install VSCode JBang plugin
-
-The `run.sh` should be used to run the tests since it must set a few env vars. To run from your terminal, try:
-
-```shell
-tests/shell/run.sh sonataflow-devmode docker.io/apache/sonataflow-devmode:999-20240620-SNAPSHOT
-```
-
-The first argument is the test case to run and the second, the image.
-
-Under the hood, it uses [Junit's Console Launcher](https://junit.org/junit5/docs/current/user-guide/#running-tests-console-launcher) tool to run the tests from the command line.
-
-Update this file with new findings, and don't remove the `.vscode` folder. It's useful to run JBang from the IDE.
diff --git a/packages/sonataflow-image-common/resources/tests/shell/run.sh b/packages/sonataflow-image-common/resources/tests/shell/run.sh
deleted file mode 100755
index 8903f84a49f..00000000000
--- a/packages/sonataflow-image-common/resources/tests/shell/run.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-#
-# 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.
-#
-
-set -e
-
-script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-image_name=$1
-image_tag=$2
-
-if [ -z "${image_name}" ]; then
-  echo "Please provide the image id to test"
-  exit 1
-fi
-
-if [ -z "${image_tag}" ]; then
-  echo "Please provide the container image full tag (ie 'registry/namespace/image:version')"
-  exit 1
-fi
-
-export TEST_IMAGE="${image_tag}"
-export OUTPUT_DIR="${script_dir_path}/../../target/shell/${image_name}"
-export TESTS_SCRIPT_DIR_PATH="${script_dir_path}/${image_name}"
-
-echo "image_name=${image_name}"
-echo "TEST_IMAGE=${TEST_IMAGE}"
-echo "OUTPUT_DIR=${OUTPUT_DIR}"
-echo "TESTS_SCRIPT_DIR_PATH=${TESTS_SCRIPT_DIR_PATH}"
-
-if [ -d  "${script_dir_path}/${image_name}" ]; then
-  curl -Ls https://sh.jbang.dev | bash -s - "${TESTS_SCRIPT_DIR_PATH}/src/RunTests.java"
-else
-  echo "No shell test to run for image ${image_name}"
-fi
\ No newline at end of file
diff --git a/packages/sonataflow-image-common/test-resources/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats b/packages/sonataflow-image-common/test-resources/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats
deleted file mode 100644
index a0487e8d477..00000000000
--- a/packages/sonataflow-image-common/test-resources/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bats
-#
-# 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.
-#
-
-
-export KOGITO_HOME=/tmp/kogito
-export HOME="${KOGITO_HOME}"
-export JBOSS_CONTAINER_JAVA_JVM_MODULE=/tmp/container/java/jvm
-mkdir -p "${KOGITO_HOME}"/launch
-mkdir -p "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
-cp $BATS_TEST_DIRNAME/../../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
-cp -r $BATS_TEST_DIRNAME/../../../../../kogito-dynamic-resources/added/* "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"/
-chmod -R +x "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
-cp $BATS_TEST_DIRNAME/../../added/jvm-settings.sh "${KOGITO_HOME}"/launch/
-
-teardown() {
-    rm -rf "${KOGITO_HOME}"
-    rm -rf "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"
-}
-
-@test "run jvm-settings with no custom conf" {
-    expected_status_code=0
-    mkdir -p $KOGITO_HOME/my-app
-
-    source ${KOGITO_HOME}/launch/jvm-settings.sh
-
-    echo "MAVEN_OPTS is: ${MAVEN_OPTS}"
-    [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
-}
-
-@test "run jvm-settings with custom conf" {
-    expected_status_code=0
-    mkdir -p $KOGITO_HOME/my-app/.mvn
-    cd $KOGITO_HOME/my-app
-    echo "-Xmx1024m -Xms512m -Xotherthing" > $KOGITO_HOME/my-app/.mvn/jvm.config
-
-    source ${KOGITO_HOME}/launch/jvm-settings.sh
-
-    echo "MAVEN_OPTS is: ${MAVEN_OPTS}"
-    [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
-}

From b98827330e320a0fff8a0e4c9984dd832fa2f4ea Mon Sep 17 00:00:00 2001
From: Tiago Bento <tiagobentofernandes@gmail.com>
Date: Wed, 25 Sep 2024 15:40:31 -0400
Subject: [PATCH 709/709] Adapt the repo to use images migrated from
 `kogito-images`

---
 .ci/jenkins/shared-scripts/buildUtils.groovy  |  2 +-
 KOGITO_UPGRADE_PROCESS.md                     |  2 +-
 .../env/index.js                              |  2 +-
 packages/kn-plugin-workflow/env/index.js      |  2 +-
 .../maven-m2-repo-via-http-image/env/index.js |  2 +-
 .../maven-m2-repo-via-http-image/package.json |  2 +-
 .../env/index.js                              |  2 +-
 .../Containerfile                             |  4 +-
 .../env/index.js                              | 22 ++++---
 .../package.json                              |  3 +-
 .../env/index.js                              |  2 +-
 .../env/index.js                              |  4 +-
 .../package.json                              |  2 +-
 .../env/index.js                              |  2 +-
 .../Containerfile                             |  4 +-
 .../env/index.js                              | 18 ++---
 .../install.js                                |  2 +-
 .../package.json                              |  7 +-
 .../serverless-logic-web-tools/env/index.js   |  6 +-
 .../webpack.config.ts                         | 24 +++----
 .../sonataflow-builder-image/env/index.js     |  2 +-
 packages/sonataflow-builder-image/install.js  |  2 +-
 .../sonataflow-builder-image/package.json     |  2 +-
 .../sonataflow-devmode-image/env/index.js     |  2 +-
 packages/sonataflow-devmode-image/install.js  |  2 +-
 .../sonataflow-devmode-image/package.json     |  2 +-
 packages/sonataflow-operator/env/index.js     |  6 +-
 .../sonataflow-operator/hack/bump-version.sh  |  3 +-
 .../images/requirements.txt                   |  2 +-
 packages/sonataflow-operator/package.json     |  4 ++
 .../sonataflow-operator/version/version.go    |  2 +-
 pnpm-lock.yaml                                | 42 ++++++------
 repo/graph.dot                                |  7 +-
 repo/graph.json                               | 65 +++++++++++++------
 ...eck_required_preinstalled_cli_commands.mjs |  1 +
 .../update_kogito_version.js                  | 52 ++-------------
 36 files changed, 156 insertions(+), 154 deletions(-)

diff --git a/.ci/jenkins/shared-scripts/buildUtils.groovy b/.ci/jenkins/shared-scripts/buildUtils.groovy
index a10964f90f2..de24bb6fbb3 100644
--- a/.ci/jenkins/shared-scripts/buildUtils.groovy
+++ b/.ci/jenkins/shared-scripts/buildUtils.groovy
@@ -106,7 +106,7 @@ def pnpmUpdateProjectVersion(String projectVersion) {
 */
 def pnpmUpdateKogitoVersion(String kogitoVersion, String imagesTag) {
     sh """#!/bin/bash -el
-    pnpm update-kogito-version-to --maven ${kogitoVersion} --images-tag ${imagesTag}
+    pnpm update-kogito-version-to --maven ${kogitoVersion}
     """.trim()
 }
 
diff --git a/KOGITO_UPGRADE_PROCESS.md b/KOGITO_UPGRADE_PROCESS.md
index 4b74a31d4ef..2896b7f32b1 100644
--- a/KOGITO_UPGRADE_PROCESS.md
+++ b/KOGITO_UPGRADE_PROCESS.md
@@ -86,7 +86,7 @@ You can find an example of the Quarkus upgrade in [this PR](https://github.com/a
 
 # Upgrading Kogito
 
-In the root directory, run `pnpm update-kogito-version-to --maven [version] --images-tag [tag]`.
+In the root directory, run `pnpm update-kogito-version-to --maven [version]`.
 
 Of course, a new Kogito version may lead to incompatibilities in the code and with other dependencies. In such a case, an investigation and evetually a fix is required to complete the process.
 
diff --git a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js b/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
index db4e8b45097..7087fb761c4 100644
--- a/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
+++ b/packages/dev-deployment-kogito-quarkus-blank-app-image/env/index.js
@@ -52,7 +52,7 @@ module.exports = composeEnv([rootEnv], {
       description: "Tag version of this image. E.g., `main` or `10.0.x` or `10.0.0",
     },
     DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__mavenM2RepoViaHttpImage: {
-      default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.tag}`,
+      default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`,
       description: "The image tag for the Maven M2 Repo via HTTP. Used during the build only.",
     },
   }),
diff --git a/packages/kn-plugin-workflow/env/index.js b/packages/kn-plugin-workflow/env/index.js
index 81fdf4f1f29..a6ec7558357 100644
--- a/packages/kn-plugin-workflow/env/index.js
+++ b/packages/kn-plugin-workflow/env/index.js
@@ -35,7 +35,7 @@ module.exports = composeEnv([rootEnv, sonataflowDevModeImageEnv], {
       description: "Quarkus group to be used when creating the SonataFlow project",
     },
     KN_PLUGIN_WORKFLOW__devModeImageUrl: {
-      default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.tag}`,
+      default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.buildTag}`,
       description: "Kogito SWF DevMode image URL.",
     },
   }),
diff --git a/packages/maven-m2-repo-via-http-image/env/index.js b/packages/maven-m2-repo-via-http-image/env/index.js
index d989c25bd14..b5b8f0393be 100644
--- a/packages/maven-m2-repo-via-http-image/env/index.js
+++ b/packages/maven-m2-repo-via-http-image/env/index.js
@@ -46,7 +46,7 @@ module.exports = composeEnv([rootEnv], {
         registry: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__registry),
         account: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__account),
         name: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__name),
-        tag: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__buildTag),
+        buildTag: getOrDefault(this.vars.MAVEN_M2_REPO_VIA_HTTP_IMAGE__buildTag),
       },
     };
   },
diff --git a/packages/maven-m2-repo-via-http-image/package.json b/packages/maven-m2-repo-via-http-image/package.json
index 4fc49abc485..342622b2cd4 100644
--- a/packages/maven-m2-repo-via-http-image/package.json
+++ b/packages/maven-m2-repo-via-http-image/package.json
@@ -16,7 +16,7 @@
     "build": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm image:docker:build\"",
     "build:dev": "pnpm build",
     "build:prod": "pnpm build",
-    "image:docker:build": "kie-tools--image-builder build -r \"$(build-env mavenM2RepoViaHttpImage.registry)\" -a \"$(build-env mavenM2RepoViaHttpImage.account)\" -n \"$(build-env mavenM2RepoViaHttpImage.name)\" -t \"$(build-env mavenM2RepoViaHttpImage.tag)\""
+    "image:docker:build": "kie-tools--image-builder build -r \"$(build-env mavenM2RepoViaHttpImage.registry)\" -a \"$(build-env mavenM2RepoViaHttpImage.account)\" -n \"$(build-env mavenM2RepoViaHttpImage.name)\" -t \"$(build-env mavenM2RepoViaHttpImage.buildTag)\""
   },
   "devDependencies": {
     "@kie-tools/image-builder": "workspace:*",
diff --git a/packages/serverless-logic-web-tools-base-builder-image-env/env/index.js b/packages/serverless-logic-web-tools-base-builder-image-env/env/index.js
index afdfe513458..1978806b118 100644
--- a/packages/serverless-logic-web-tools-base-builder-image-env/env/index.js
+++ b/packages/serverless-logic-web-tools-base-builder-image-env/env/index.js
@@ -42,7 +42,7 @@ module.exports = composeEnv([rootEnv], {
   }),
   get env() {
     return {
-      baseBuilderImageEnv: {
+      slwtBaseBuilderImageEnv: {
         registry: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry),
         account: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageAccount),
         name: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageName),
diff --git a/packages/serverless-logic-web-tools-base-builder-image/Containerfile b/packages/serverless-logic-web-tools-base-builder-image/Containerfile
index b5c59c044f7..59434a0a31d 100644
--- a/packages/serverless-logic-web-tools-base-builder-image/Containerfile
+++ b/packages/serverless-logic-web-tools-base-builder-image/Containerfile
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARG KOGITO_IMAGE_TAG
+ARG BASE_IMAGE_TAG
 
-FROM --platform=linux/amd64 docker.io/apache/incubator-kie-kogito-base-builder:$KOGITO_IMAGE_TAG
+FROM --platform=linux/amd64 $BASE_IMAGE_TAG
 
 ARG KUBECTL_VERSION
 
diff --git a/packages/serverless-logic-web-tools-base-builder-image/env/index.js b/packages/serverless-logic-web-tools-base-builder-image/env/index.js
index e3eaefd9787..15c0e91d75f 100644
--- a/packages/serverless-logic-web-tools-base-builder-image/env/index.js
+++ b/packages/serverless-logic-web-tools-base-builder-image/env/index.js
@@ -19,26 +19,28 @@
 
 const { varsWithName, getOrDefault, composeEnv } = require("@kie-tools-scripts/build-env");
 
+const {
+  env: { kogitoBaseBuilderImage: kogitoBaseBuilderImageEnv },
+} = require("@kie/kogito-base-builder-image/env");
+
 module.exports = composeEnv(
   [require("@kie-tools/root-env/env"), require("@kie-tools/serverless-logic-web-tools-base-builder-image-env/env")],
   {
     vars: varsWithName({
-      SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKubectlVersion: {
+      SERVERLESS_LOGIC_WEB_TOOLS_BASE_BUILDER_IMAGE__kubectlVersion: {
         default: "v1.27.3",
-        description: "",
+        description: "kubectl version to install.",
       },
-      /* (begin) This part of the file is referenced in `scripts/update-kogito-version` */
-      SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag: {
-        default: "main-20240905",
-        description: "",
+      SERVERLESS_LOGIC_WEB_TOOLS_BASE_BUILDER_IMAGE__baseImageTag: {
+        default: `${kogitoBaseBuilderImageEnv.registry}/${kogitoBaseBuilderImageEnv.account}/${kogitoBaseBuilderImageEnv.name}:${kogitoBaseBuilderImageEnv.buildTag}`,
+        description: "Base image complete tag.",
       },
-      /* end */
     }),
     get env() {
       return {
-        baseBuilderImage: {
-          kubectlVersion: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKubectlVersion),
-          kogitoImageTag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag),
+        slwtBaseBuilderImage: {
+          kubectlVersion: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_BASE_BUILDER_IMAGE__kubectlVersion),
+          baseImageTag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_BASE_BUILDER_IMAGE__baseImageTag),
         },
       };
     },
diff --git a/packages/serverless-logic-web-tools-base-builder-image/package.json b/packages/serverless-logic-web-tools-base-builder-image/package.json
index 1a579ec1422..e43d512b064 100644
--- a/packages/serverless-logic-web-tools-base-builder-image/package.json
+++ b/packages/serverless-logic-web-tools-base-builder-image/package.json
@@ -18,11 +18,12 @@
     "build:prod:linux:darwin": "run-script-if --bool \"$(build-env containerImages.build)\" --then \"pnpm image:docker:build\"",
     "build:prod:win32": "echo \"Build not supported on Windows\"",
     "cleanup": "rimraf dist-dev && mkdir dist-dev",
-    "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] && echo true || echo false) --then \"docker build --ulimit nofile=5000:5000 $(echo $(build-env baseBuilderImageEnv.buildTag) | xargs printf -- \"-t $(build-env baseBuilderImageEnv.registry)/$(build-env baseBuilderImageEnv.account)/$(build-env baseBuilderImageEnv.name):%s\n\" | xargs echo) --build-arg KOGITO_IMAGE_TAG=$(build-env baseBuilderImage.kogitoImageTag) --build-arg KUBECTL_VERSION=$(build-env baseBuilderImage.kubectlVersion) .\" --else \"echo Docker not found, skipping image build.\""
+    "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] && echo true || echo false) --then \"docker build --ulimit nofile=5000:5000 $(echo $(build-env slwtBaseBuilderImageEnv.buildTag) | xargs printf -- \"-t $(build-env slwtBaseBuilderImageEnv.registry)/$(build-env slwtBaseBuilderImageEnv.account)/$(build-env slwtBaseBuilderImageEnv.name):%s\n\" | xargs echo) --build-arg BASE_IMAGE_TAG=$(build-env slwtBaseBuilderImage.baseImageTag) --build-arg KUBECTL_VERSION=$(build-env slwtBaseBuilderImage.kubectlVersion) .\" --else \"echo Docker not found, skipping image build.\""
   },
   "devDependencies": {
     "@kie-tools/root-env": "workspace:*",
     "@kie-tools/serverless-logic-web-tools-base-builder-image-env": "workspace:*",
+    "@kie/kogito-base-builder-image": "workspace:*",
     "rimraf": "^3.0.2",
     "run-script-os": "^1.1.6"
   }
diff --git a/packages/serverless-logic-web-tools-swf-builder-image-env/env/index.js b/packages/serverless-logic-web-tools-swf-builder-image-env/env/index.js
index 12c1289cada..0f2c264d380 100644
--- a/packages/serverless-logic-web-tools-swf-builder-image-env/env/index.js
+++ b/packages/serverless-logic-web-tools-swf-builder-image-env/env/index.js
@@ -42,7 +42,7 @@ module.exports = composeEnv([rootEnv], {
   }),
   get env() {
     return {
-      swfBuilderImageEnv: {
+      slwtBuilderImageEnv: {
         registry: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry),
         account: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount),
         name: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName),
diff --git a/packages/serverless-logic-web-tools-swf-builder-image/env/index.js b/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
index 86df3331a33..0efda095d0b 100644
--- a/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
+++ b/packages/serverless-logic-web-tools-swf-builder-image/env/index.js
@@ -26,13 +26,13 @@ const sonataflowBuilderImageEnv = require("@kie-tools/sonataflow-builder-image/e
 module.exports = composeEnv([rootEnv, serverlessLogicWebToolsSwfBuilderImageEnv, sonataflowBuilderImageEnv], {
   vars: varsWithName({
     SERVERLESS_LOGIC_WEB_TOOLS_SWF_BUILDER_IMAGE__baseImageUrl: {
-      default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.tag}`,
+      default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.buildTag}`,
       description: "The image used in the FROM import.",
     },
   }),
   get env() {
     return {
-      swfBuilderImage: {
+      slwtBuilderImage: {
         baseImageUrl: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_SWF_BUILDER_IMAGE__baseImageUrl),
       },
     };
diff --git a/packages/serverless-logic-web-tools-swf-builder-image/package.json b/packages/serverless-logic-web-tools-swf-builder-image/package.json
index 7309aa8324e..d86f263f4cd 100644
--- a/packages/serverless-logic-web-tools-swf-builder-image/package.json
+++ b/packages/serverless-logic-web-tools-swf-builder-image/package.json
@@ -21,7 +21,7 @@
     "cleanup": "rimraf dist-dev && mkdir dist-dev",
     "copy:assets": "pnpm copy:webapp",
     "copy:webapp": "cp -r ./node_modules/sonataflow-deployment-webapp/dist dist-dev/webapp",
-    "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] && echo true || echo false) --then \"docker build --ulimit nofile=5000:5000 $(echo $(build-env swfBuilderImageEnv.buildTag) | xargs printf -- \"-t $(build-env swfBuilderImageEnv.registry)/$(build-env swfBuilderImageEnv.account)/$(build-env swfBuilderImageEnv.name):%s\n\" | xargs echo) --build-arg BASE_IMAGE_URL=$(build-env swfBuilderImage.baseImageUrl) .\" --else \"echo Docker not found, skipping image build.\""
+    "image:docker:build": "run-script-if --bool $([ $(command -v docker) ] && echo true || echo false) --then \"docker build --ulimit nofile=5000:5000 $(echo $(build-env slwtBuilderImageEnv.buildTag) | xargs printf -- \"-t $(build-env slwtBuilderImageEnv.registry)/$(build-env slwtBuilderImageEnv.account)/$(build-env slwtBuilderImageEnv.name):%s\n\" | xargs echo) --build-arg BASE_IMAGE_URL=$(build-env slwtBuilderImage.baseImageUrl) .\" --else \"echo Docker not found, skipping image build.\""
   },
   "devDependencies": {
     "@kie-tools/root-env": "workspace:*",
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image-env/env/index.js b/packages/serverless-logic-web-tools-swf-dev-mode-image-env/env/index.js
index bc9514484a1..804d8ff6bd6 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image-env/env/index.js
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image-env/env/index.js
@@ -42,7 +42,7 @@ module.exports = composeEnv([rootEnv], {
   }),
   get env() {
     return {
-      swfDevModeImageEnv: {
+      slwtDevModeImageEnv: {
         registry: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageRegistry),
         account: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageAccount),
         name: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageName),
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile b/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
index 48395f4882c..1038ffd3cc4 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/Containerfile
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ARG KOGITO_IMAGE_TAG
+ARG BASE_IMAGE_TAG
 
-FROM --platform=linux/amd64 docker.io/apache/incubator-kie-kogito-base-builder:$KOGITO_IMAGE_TAG
+FROM --platform=linux/amd64 $BASE_IMAGE_TAG
 
 ENV PATH="${PATH}:/usr/share/maven/bin"
 
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js b/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js
index 434d3870172..1c29373cc23 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js
@@ -25,24 +25,26 @@ const {
   env: { mavenM2RepoViaHttpImage: mavenM2RepoViaHttpImageEnv },
 } = require("@kie-tools/maven-m2-repo-via-http-image/env");
 
+const {
+  env: { kogitoBaseBuilderImage: kogitoBaseBuilderImageEnv },
+} = require("@kie/kogito-base-builder-image/env");
+
 module.exports = composeEnv([rootEnv, require("@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env/env")], {
   vars: varsWithName({
-    /* (begin) This part of the file is referenced in `scripts/update-kogito-version` */
-    SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag: {
-      default: "main-20240905",
-      description: "",
+    SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__baseImageTag: {
+      default: `${kogitoBaseBuilderImageEnv.registry}/${kogitoBaseBuilderImageEnv.account}/${kogitoBaseBuilderImageEnv.name}:${kogitoBaseBuilderImageEnv.buildTag}`,
+      description: "Base image complete tag.",
     },
-    /* end */
     SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__mavenM2RepoViaHttpImage: {
-      default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.tag}`,
+      default: `${mavenM2RepoViaHttpImageEnv.registry}/${mavenM2RepoViaHttpImageEnv.account}/${mavenM2RepoViaHttpImageEnv.name}:${mavenM2RepoViaHttpImageEnv.buildTag}`,
       description: "The image tag for the Maven M2 Repo via HTTP. Used during the build only.",
     },
   }),
   get env() {
     return {
-      swfDevModeImage: {
+      slwtDevModeImage: {
+        baseImageTag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__baseImageTag),
         version: require("../package.json").version,
-        kogitoImageTag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag),
         dev: {
           mavenM2RepoViaHttpImage: getOrDefault(
             this.vars.SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__mavenM2RepoViaHttpImage
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js b/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js
index 94df8d4a2e8..6a812f4a2e6 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/install.js
@@ -21,5 +21,5 @@ const buildEnv = require("./env");
 const { setup } = require("@kie-tools/maven-config-setup-helper");
 
 setup(`
-    -Drevision=${buildEnv.env.swfDevModeImage.version}
+    -Drevision=${buildEnv.env.slwtDevModeImage.version}
 `);
diff --git a/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json b/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
index b9a76e09952..f395d8d6393 100644
--- a/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
+++ b/packages/serverless-logic-web-tools-swf-dev-mode-image/package.json
@@ -26,11 +26,11 @@
     "copy:sonataflow-deployment-webapp": "run-script-os",
     "copy:sonataflow-deployment-webapp:linux:darwin": "cp -R ./node_modules/sonataflow-deployment-webapp/dist/* ./dist-dev/quarkus-app/src/main/resources/META-INF/resources",
     "copy:sonataflow-deployment-webapp:win32": "pnpm powershell \"Copy-Item -R ./node_modules/sonataflow-deployment-webapp/dist/* ./dist-dev/quarkus-app/src/main/resources/META-INF/resources\"",
-    "image:docker:build": "kie-tools--image-builder build --allowHostNetworkAccess -r \"$(build-env swfDevModeImageEnv.registry)\" -a \"$(build-env swfDevModeImageEnv.account)\" -n \"$(build-env swfDevModeImageEnv.name)\" -t \"$(build-env swfDevModeImageEnv.buildTag)\" --build-arg KOGITO_IMAGE_TAG=\"$(build-env swfDevModeImage.kogitoImageTag)\"",
-    "image:docker:squash": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && DOCKER_HOST=$(docker context inspect | jq '.[].Endpoints.docker.Host' | tr -d '\"') docker-squash -t $(build-env swfDevModeImageEnv.registry)/$(build-env swfDevModeImageEnv.account)/$(build-env swfDevModeImageEnv.name):$(build-env swfDevModeImageEnv.buildTag) $(build-env swfDevModeImageEnv.registry)/$(build-env swfDevModeImageEnv.account)/$(build-env swfDevModeImageEnv.name):$(build-env swfDevModeImageEnv.buildTag)",
+    "image:docker:build": "kie-tools--image-builder build --allowHostNetworkAccess -r \"$(build-env slwtDevModeImageEnv.registry)\" -a \"$(build-env slwtDevModeImageEnv.account)\" -n \"$(build-env slwtDevModeImageEnv.name)\" -t \"$(build-env slwtDevModeImageEnv.buildTag)\" --build-arg BASE_IMAGE_TAG=\"$(build-env slwtDevModeImage.baseImageTag)\"",
+    "image:docker:squash": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && DOCKER_HOST=$(docker context inspect | jq '.[].Endpoints.docker.Host' | tr -d '\"') docker-squash -t $(build-env slwtDevModeImageEnv.registry)/$(build-env slwtDevModeImageEnv.account)/$(build-env slwtDevModeImageEnv.name):$(build-env slwtDevModeImageEnv.buildTag) $(build-env slwtDevModeImageEnv.registry)/$(build-env slwtDevModeImageEnv.account)/$(build-env slwtDevModeImageEnv.name):$(build-env slwtDevModeImageEnv.buildTag)",
     "install": "node install.js",
     "m2-repo-via-http:container:kill": "(docker container kill m2-repo-via-http || true) && (docker container rm m2-repo-via-http || true)",
-    "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && docker run --name m2-repo-via-http -v \"$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout):/var/www/html\" -dit $(build-env swfDevModeImage.dev.mavenM2RepoViaHttpImage)",
+    "m2-repo-via-http:container:run": "(pnpm m2-repo-via-http:container:kill || true) && docker run --name m2-repo-via-http -v \"$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout):/var/www/html\" -dit $(build-env slwtDevModeImage.dev.mavenM2RepoViaHttpImage)",
     "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command"
   },
   "devDependencies": {
@@ -41,6 +41,7 @@
     "@kie-tools/root-env": "workspace:*",
     "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app": "workspace:*",
     "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env": "workspace:*",
+    "@kie/kogito-base-builder-image": "workspace:*",
     "rimraf": "^3.0.2",
     "run-script-os": "^1.1.6",
     "sonataflow-deployment-webapp": "workspace:*"
diff --git a/packages/serverless-logic-web-tools/env/index.js b/packages/serverless-logic-web-tools/env/index.js
index 41004e01ce5..01c2c8611fb 100644
--- a/packages/serverless-logic-web-tools/env/index.js
+++ b/packages/serverless-logic-web-tools/env/index.js
@@ -86,16 +86,16 @@ module.exports = composeEnv(
             cypressUrl: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__cypressUrl),
             port: 9020,
           },
-          swfBuilderImage: {
+          slwtBuilderImageEnv: {
             tag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageTag),
           },
-          baseBuilderImage: {
+          slwtBaseBuilderImage: {
             tag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageTag),
           },
           dashbuilderViewerImage: {
             tag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__dashbuilderViewerImageTag),
           },
-          swfDevModeImage: {
+          slwtDevModeImage: {
             tag: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageTag),
           },
           corsProxyUrl: getOrDefault(this.vars.SERVERLESS_LOGIC_WEB_TOOLS__corsProxyUrl),
diff --git a/packages/serverless-logic-web-tools/webpack.config.ts b/packages/serverless-logic-web-tools/webpack.config.ts
index 689a4aa196e..961ee98cb09 100644
--- a/packages/serverless-logic-web-tools/webpack.config.ts
+++ b/packages/serverless-logic-web-tools/webpack.config.ts
@@ -220,10 +220,10 @@ export default async (env: any, argv: any) => {
 };
 
 function getSwfBuilderImageArgs() {
-  const swfBuilderImageRegistry = buildEnv.swfBuilderImageEnv.registry;
-  const swfBuilderImageAccount = buildEnv.swfBuilderImageEnv.account;
-  const swfBuilderImageName = buildEnv.swfBuilderImageEnv.name;
-  const swfBuilderImageTag = buildEnv.serverlessLogicWebTools.swfBuilderImage.tag;
+  const swfBuilderImageRegistry = buildEnv.slwtBuilderImageEnv.registry;
+  const swfBuilderImageAccount = buildEnv.slwtBuilderImageEnv.account;
+  const swfBuilderImageName = buildEnv.slwtBuilderImageEnv.name;
+  const swfBuilderImageTag = buildEnv.serverlessLogicWebTools.slwtBuilderImageEnv.tag;
 
   console.info("Serverless Logic Web Tools :: SWF Builder Image Registry: " + swfBuilderImageRegistry);
   console.info("Serverless Logic Web Tools :: SWF Builder Image Account: " + swfBuilderImageAccount);
@@ -234,10 +234,10 @@ function getSwfBuilderImageArgs() {
 }
 
 function getSwfDevModeImageArgs() {
-  const swfDevModeImageRegistry = buildEnv.swfDevModeImageEnv.registry;
-  const swfDevModeImageAccount = buildEnv.swfDevModeImageEnv.account;
-  const swfDevModeImageName = buildEnv.swfDevModeImageEnv.name;
-  const swfDevModeImageTag = buildEnv.serverlessLogicWebTools.swfDevModeImage.tag;
+  const swfDevModeImageRegistry = buildEnv.slwtDevModeImageEnv.registry;
+  const swfDevModeImageAccount = buildEnv.slwtDevModeImageEnv.account;
+  const swfDevModeImageName = buildEnv.slwtDevModeImageEnv.name;
+  const swfDevModeImageTag = buildEnv.serverlessLogicWebTools.slwtDevModeImage.tag;
 
   console.info("Serverless Logic Web Tools :: Dev Mode Image Registry: " + swfDevModeImageRegistry);
   console.info("Serverless Logic Web Tools :: Dev Mode Image Account: " + swfDevModeImageAccount);
@@ -248,10 +248,10 @@ function getSwfDevModeImageArgs() {
 }
 
 function getBaseBuilderImageArgs() {
-  const baseBuilderImageRegistry = buildEnv.baseBuilderImageEnv.registry;
-  const baseBuilderImageAccount = buildEnv.baseBuilderImageEnv.account;
-  const baseBuilderImageName = buildEnv.baseBuilderImageEnv.name;
-  const baseBuilderImageTag = buildEnv.serverlessLogicWebTools.baseBuilderImage.tag;
+  const baseBuilderImageRegistry = buildEnv.slwtBaseBuilderImageEnv.registry;
+  const baseBuilderImageAccount = buildEnv.slwtBaseBuilderImageEnv.account;
+  const baseBuilderImageName = buildEnv.slwtBaseBuilderImageEnv.name;
+  const baseBuilderImageTag = buildEnv.serverlessLogicWebTools.slwtBaseBuilderImage.tag;
 
   console.info("Serverless Logic Web Tools :: Base Builder Image Registry: " + baseBuilderImageRegistry);
   console.info("Serverless Logic Web Tools :: Base Builder Image Account: " + baseBuilderImageAccount);
diff --git a/packages/sonataflow-builder-image/env/index.js b/packages/sonataflow-builder-image/env/index.js
index a2032324056..36e3cc1181e 100644
--- a/packages/sonataflow-builder-image/env/index.js
+++ b/packages/sonataflow-builder-image/env/index.js
@@ -46,7 +46,7 @@ module.exports = composeEnv([rootEnv], {
         registry: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__registry),
         account: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__account),
         name: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__name),
-        tag: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__buildTag),
+        buildTag: getOrDefault(this.vars.SONATAFLOW_BUILDER_IMAGE__buildTag),
       },
     };
   },
diff --git a/packages/sonataflow-builder-image/install.js b/packages/sonataflow-builder-image/install.js
index b3a511cbcc0..00f6c3a3bbf 100644
--- a/packages/sonataflow-builder-image/install.js
+++ b/packages/sonataflow-builder-image/install.js
@@ -33,7 +33,7 @@ const activateCmd =
 
 execSync(
   `${activateCmd} && \
-  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowBuilderImage.tag} --source-folder ./resources`,
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowBuilderImage.buildTag} --source-folder ./resources`,
   { stdio: "inherit" }
 );
 
diff --git a/packages/sonataflow-builder-image/package.json b/packages/sonataflow-builder-image/package.json
index 2994231beba..3c4463d089e 100644
--- a/packages/sonataflow-builder-image/package.json
+++ b/packages/sonataflow-builder-image/package.json
@@ -27,7 +27,7 @@
     "image:test:darwin:win32": "echo \"Tests skipped on macOS and Windows\"",
     "image:test:linux": "pnpm copy-test-assets && pnpm setup:env make -C ./build test-image",
     "install": "node install.js && pnpm format",
-    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowBuilderImage.tag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)",
+    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowBuilderImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowBuilderImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowBuilderImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowBuilderImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version)",
     "test": "run-script-os",
     "test:cleanup": "mv dist-tests/report.xml dist-tests/junit-report.xml || true",
     "test:linux:darwin": "run-script-if --bool \"$(build-env tests.run)\" --then \"pnpm test:setup\" \"pnpm test:run\" --finally \"pnpm test:cleanup\"",
diff --git a/packages/sonataflow-devmode-image/env/index.js b/packages/sonataflow-devmode-image/env/index.js
index c67f4995769..6b741da955c 100644
--- a/packages/sonataflow-devmode-image/env/index.js
+++ b/packages/sonataflow-devmode-image/env/index.js
@@ -51,7 +51,7 @@ module.exports = composeEnv([rootEnv], {
         registry: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__registry),
         account: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__account),
         name: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__name),
-        tag: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__buildTag),
+        buildTag: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__buildTag),
         sonataflowQuarkusDevUiVersion: getOrDefault(this.vars.SONATAFLOW_DEVMODE_IMAGE__sonataflowQuarkusDevUiVersion),
       },
     };
diff --git a/packages/sonataflow-devmode-image/install.js b/packages/sonataflow-devmode-image/install.js
index de22bb2875c..f701da5c030 100644
--- a/packages/sonataflow-devmode-image/install.js
+++ b/packages/sonataflow-devmode-image/install.js
@@ -33,7 +33,7 @@ const activateCmd =
 
 execSync(
   `${activateCmd} && \
-  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowDevModeImage.tag} --source-folder ./resources`,
+  python3 ${sonataflowImageCommonDir}/resources/scripts/versions_manager.py --bump-to ${buildEnv.env.sonataflowDevModeImage.buildTag} --source-folder ./resources`,
   { stdio: "inherit" }
 );
 
diff --git a/packages/sonataflow-devmode-image/package.json b/packages/sonataflow-devmode-image/package.json
index 69e5c6d828d..4a2843d4a25 100644
--- a/packages/sonataflow-devmode-image/package.json
+++ b/packages/sonataflow-devmode-image/package.json
@@ -28,7 +28,7 @@
     "image:test: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",
-    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowDevModeImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowDevModeImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowDevModeImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowDevModeImage.tag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version) SONATAFLOW_QUARKUS_DEVUI_VERSION=$(build-env sonataflowDevModeImage.sonataflowQuarkusDevUiVersion)"
+    "setup:env": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate && cross-env KOGITO_IMAGE_REGISTRY=$(build-env sonataflowDevModeImage.registry) KOGITO_IMAGE_REGISTRY_ACCOUNT=$(build-env sonataflowDevModeImage.account) KOGITO_IMAGE_NAME=$(build-env sonataflowDevModeImage.name) KOGITO_IMAGE_TAG=$(build-env sonataflowDevModeImage.buildTag) QUARKUS_PLATFORM_VERSION=$(build-env quarkusPlatform.version) KOGITO_VERSION=$(build-env kogitoRuntime.version) SONATAFLOW_QUARKUS_DEVUI_VERSION=$(build-env sonataflowDevModeImage.sonataflowQuarkusDevUiVersion)"
   },
   "devDependencies": {
     "@kie-tools/python-venv": "workspace:*",
diff --git a/packages/sonataflow-operator/env/index.js b/packages/sonataflow-operator/env/index.js
index bb7dff616d4..fdb5568d930 100644
--- a/packages/sonataflow-operator/env/index.js
+++ b/packages/sonataflow-operator/env/index.js
@@ -42,11 +42,11 @@ module.exports = composeEnv([rootEnv, sonataflowBuilderImageEnv, sonataflowDevMo
       description: "Tag version of this image. E.g., `main` or `10.0.x` or `10.0.0",
     },
     SONATAFLOW_OPERATOR__sonataflowBuilderImage: {
-      default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.tag}`,
+      default: `${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.registry}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.account}/${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.name}:${sonataflowBuilderImageEnv.env.sonataflowBuilderImage.buildTag}`,
       description: "Sonataflow Builder image",
     },
     SONATAFLOW_OPERATOR__sonataflowDevModeImage: {
-      default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.tag}`,
+      default: `${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.registry}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.account}/${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.name}:${sonataflowDevModeImageEnv.env.sonataflowDevModeImage.buildTag}`,
       description: "Sonataflow DevMode image",
     },
   }),
@@ -56,7 +56,7 @@ module.exports = composeEnv([rootEnv, sonataflowBuilderImageEnv, sonataflowDevMo
         registry: getOrDefault(this.vars.SONATAFLOW_OPERATOR__registry),
         account: getOrDefault(this.vars.SONATAFLOW_OPERATOR__account),
         name: getOrDefault(this.vars.SONATAFLOW_OPERATOR__name),
-        tag: getOrDefault(this.vars.SONATAFLOW_OPERATOR__buildTag),
+        buildTag: getOrDefault(this.vars.SONATAFLOW_OPERATOR__buildTag),
         version: require("../package.json").version,
         sonataflowBuilderImage: getOrDefault(this.vars.SONATAFLOW_OPERATOR__sonataflowBuilderImage),
         sonataflowDevModeImage: getOrDefault(this.vars.SONATAFLOW_OPERATOR__sonataflowDevModeImage),
diff --git a/packages/sonataflow-operator/hack/bump-version.sh b/packages/sonataflow-operator/hack/bump-version.sh
index e2b131e7b35..1db411598a8 100755
--- a/packages/sonataflow-operator/hack/bump-version.sh
+++ b/packages/sonataflow-operator/hack/bump-version.sh
@@ -24,7 +24,7 @@ script_dir_path=$(dirname "${BASH_SOURCE[0]}")
 source "${script_dir_path}"/env.sh
 
 imageName=$(pnpm build-env sontaflowOperator.registry)/$(pnpm build-env sontaflowOperator.account)/$(pnpm build-env sontaflowOperator.name)
-imageTag=$(pnpm build-env sontaflowOperator.tag)
+imageTag=$(pnpm build-env sontaflowOperator.buildTag)
 version=$(pnpm build-env sontaflowOperator.version)
 
 targetSonataflowBuilderImage=$(pnpm build-env sontaflowOperator.sonataflowBuilderImage)
@@ -60,6 +60,7 @@ node -p "require('replace-in-file').sync({ from: /sonataflow-operator-system\/so
 
 node -p "require('replace-in-file').sync({ from: /\bOperatorVersion = .*/g, to: 'OperatorVersion = \"${version}\"', files: ['version/version.go'] });"
 node -p "require('replace-in-file').sync({ from: /\btagVersion = .*/g, to: 'tagVersion = \"${imageTag}\"', files: ['version/version.go'] });"
+node -p "require('replace-in-file').sync({ from: /\bkogitoImagesTagVersion = .*/g, to: 'kogitoImagesTagVersion = \"${imageTag}\"', files: ['version/version.go'] });"
 node -p "require('replace-in-file').sync({ from: /\bcontainerImage:.*\b/g, to: 'containerImage: ${targetSonataflowOperatorImage}', files: ['$(getCsvFile)'] });"
 
 make generate-all
diff --git a/packages/sonataflow-operator/images/requirements.txt b/packages/sonataflow-operator/images/requirements.txt
index 87a0ef5117c..c0ed2e16a76 100644
--- a/packages/sonataflow-operator/images/requirements.txt
+++ b/packages/sonataflow-operator/images/requirements.txt
@@ -1,4 +1,4 @@
-# Requirements for cekit 4.11.0 build
+# Requirements for cekit 4.12.0 build
 # see: https://pip.pypa.io/en/stable/reference/requirements-file-format/
 docker-squash
 odcs
diff --git a/packages/sonataflow-operator/package.json b/packages/sonataflow-operator/package.json
index 25cdd5e4a5d..846d641b45a 100644
--- a/packages/sonataflow-operator/package.json
+++ b/packages/sonataflow-operator/package.json
@@ -40,6 +40,10 @@
     "@kie-tools/root-env": "workspace:*",
     "@kie-tools/sonataflow-builder-image": "workspace:*",
     "@kie-tools/sonataflow-devmode-image": "workspace:*",
+    "@kie/kogito-data-index-ephemeral-image": "workspace:*",
+    "@kie/kogito-data-index-postgresql-image": "workspace:*",
+    "@kie/kogito-jobs-service-ephemeral-image": "workspace:*",
+    "@kie/kogito-jobs-service-postgresql-image": "workspace:*",
     "replace-in-file": "^7.1.0",
     "rimraf": "^3.0.2",
     "run-script-os": "^1.1.6"
diff --git a/packages/sonataflow-operator/version/version.go b/packages/sonataflow-operator/version/version.go
index e028d4226d7..5cfd5fae728 100644
--- a/packages/sonataflow-operator/version/version.go
+++ b/packages/sonataflow-operator/version/version.go
@@ -32,7 +32,7 @@ const (
 	// For example, docker.io/apache/incubator-kie-sonataflow-operator:main -> 10.0
 	tagVersion = "main"
 	// Kogito images tag version. Used for data-index and jobs-service images.
-	kogitoImagesTagVersion = "main-20240905"
+	kogitoImagesTagVersion = "main"
 	// OpenJDK image tag version
 	openJDKImageTagVersion = "1.20"
 )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 836f60d9ab4..c32ba9b016c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9606,6 +9606,9 @@ importers:
       '@kie-tools/serverless-logic-web-tools-base-builder-image-env':
         specifier: workspace:*
         version: link:../serverless-logic-web-tools-base-builder-image-env
+      '@kie/kogito-base-builder-image':
+        specifier: workspace:*
+        version: link:../kogito-base-builder-image
       rimraf:
         specifier: ^3.0.2
         version: 3.0.2
@@ -9685,6 +9688,9 @@ importers:
       '@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env':
         specifier: workspace:*
         version: link:../serverless-logic-web-tools-swf-dev-mode-image-env
+      '@kie/kogito-base-builder-image':
+        specifier: workspace:*
+        version: link:../kogito-base-builder-image
       rimraf:
         specifier: ^3.0.2
         version: 3.0.2
@@ -11463,6 +11469,18 @@ importers:
       '@kie-tools/sonataflow-devmode-image':
         specifier: workspace:*
         version: link:../sonataflow-devmode-image
+      '@kie/kogito-data-index-ephemeral-image':
+        specifier: workspace:*
+        version: link:../kogito-data-index-ephemeral-image
+      '@kie/kogito-data-index-postgresql-image':
+        specifier: workspace:*
+        version: link:../kogito-data-index-postgresql-image
+      '@kie/kogito-jobs-service-ephemeral-image':
+        specifier: workspace:*
+        version: link:../kogito-jobs-service-ephemeral-image
+      '@kie/kogito-jobs-service-postgresql-image':
+        specifier: workspace:*
+        version: link:../kogito-jobs-service-postgresql-image
       replace-in-file:
         specifier: ^7.1.0
         version: 7.1.0
@@ -22869,10 +22887,6 @@ packages:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
 
-  escalade@3.1.2:
-    resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
-    engines: {node: '>=6'}
-
   escalade@3.2.0:
     resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
@@ -28757,10 +28771,6 @@ packages:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
 
-  strip-ansi@7.0.1:
-    resolution: {integrity: sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==}
-    engines: {node: '>=12'}
-
   strip-ansi@7.1.0:
     resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
     engines: {node: '>=12'}
@@ -38033,7 +38043,7 @@ snapshots:
     dependencies:
       string-width: 5.1.2
       string-width-cjs: string-width@4.2.3
-      strip-ansi: 7.0.1
+      strip-ansi: 7.1.0
       strip-ansi-cjs: strip-ansi@6.0.1
       wrap-ansi: 8.1.0
       wrap-ansi-cjs: wrap-ansi@7.0.0
@@ -48144,8 +48154,6 @@ snapshots:
 
   escalade@3.1.1: {}
 
-  escalade@3.1.2: {}
-
   escalade@3.2.0: {}
 
   escape-html@1.0.3: {}
@@ -56101,7 +56109,7 @@ snapshots:
     dependencies:
       eastasianwidth: 0.2.0
       emoji-regex: 9.2.2
-      strip-ansi: 7.0.1
+      strip-ansi: 7.1.0
 
   string-width@7.2.0:
     dependencies:
@@ -56179,10 +56187,6 @@ snapshots:
     dependencies:
       ansi-regex: 5.0.1
 
-  strip-ansi@7.0.1:
-    dependencies:
-      ansi-regex: 6.0.1
-
   strip-ansi@7.1.0:
     dependencies:
       ansi-regex: 6.0.1
@@ -57525,7 +57529,7 @@ snapshots:
   update-browserslist-db@1.0.13(browserslist@4.23.0):
     dependencies:
       browserslist: 4.23.0
-      escalade: 3.1.1
+      escalade: 3.2.0
       picocolors: 1.0.1
 
   update-browserslist-db@1.1.0(browserslist@4.23.2):
@@ -58745,7 +58749,7 @@ snapshots:
     dependencies:
       ansi-styles: 6.2.1
       string-width: 5.1.2
-      strip-ansi: 7.0.1
+      strip-ansi: 7.1.0
 
   wrap-ansi@9.0.0:
     dependencies:
@@ -58925,7 +58929,7 @@ snapshots:
   yargs@17.7.2:
     dependencies:
       cliui: 8.0.1
-      escalade: 3.1.2
+      escalade: 3.2.0
       get-caller-file: 2.0.5
       require-directory: 2.1.1
       string-width: 4.2.3
diff --git a/repo/graph.dot b/repo/graph.dot
index a883d69cce4..d7c98c77dbc 100644
--- a/repo/graph.dot
+++ b/repo/graph.dot
@@ -538,6 +538,7 @@ digraph G {
   "@kie-tools/serverless-logic-web-tools" -> "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools" -> "@kie-tools/sonataflow-dev-app" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-base-builder-image" -> "@kie-tools/serverless-logic-web-tools-base-builder-image-env" [ style = "dashed", color = "black" ];
+  "@kie-tools/serverless-logic-web-tools-base-builder-image" -> "@kie/kogito-base-builder-image" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-base-builder-image-env" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-builder-image" -> "@kie-tools/serverless-logic-web-tools-swf-builder-image-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-builder-image" -> "@kie-tools/sonataflow-builder-image" [ style = "dashed", color = "black" ];
@@ -545,9 +546,9 @@ digraph G {
   "@kie-tools/serverless-logic-web-tools-swf-builder-image-env" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" -> "@kie-tools/sonataflow-quarkus-devui" [ style = "solid", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie-tools/maven-m2-repo-via-http-image" [ style = "dashed", color = "black" ];
-  "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie-tools/python-venv" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env" [ style = "dashed", color = "black" ];
+  "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "@kie/kogito-base-builder-image" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" -> "sonataflow-deployment-webapp" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ];
   "@kie-tools/serverless-workflow-combined-editor" -> "@kie-tools/serverless-workflow-diagram-editor-assets" [ style = "solid", color = "blue" ];
@@ -598,6 +599,10 @@ digraph G {
   "@kie-tools/sonataflow-management-console-webapp" -> "@kie-tools/sonataflow-dev-app" [ style = "dashed", color = "blue" ];
   "@kie-tools/sonataflow-operator" -> "@kie-tools/sonataflow-builder-image" [ style = "dashed", color = "black" ];
   "@kie-tools/sonataflow-operator" -> "@kie-tools/sonataflow-devmode-image" [ style = "dashed", color = "black" ];
+  "@kie-tools/sonataflow-operator" -> "@kie/kogito-data-index-ephemeral-image" [ style = "dashed", color = "black" ];
+  "@kie-tools/sonataflow-operator" -> "@kie/kogito-data-index-postgresql-image" [ style = "dashed", color = "black" ];
+  "@kie-tools/sonataflow-operator" -> "@kie/kogito-jobs-service-ephemeral-image" [ style = "dashed", color = "black" ];
+  "@kie-tools/sonataflow-operator" -> "@kie/kogito-jobs-service-postgresql-image" [ style = "dashed", color = "black" ];
   "@kie-tools/sonataflow-quarkus-devui" -> "@kie-tools/serverless-workflow-dev-ui-webapp" [ style = "dashed", color = "black" ];
   "@kie-tools/storybook-base" -> "@kie-tools-core/webpack-base" [ style = "dashed", color = "blue" ];
   "@kie-tools/storybook-base" -> "@kie-tools/eslint" [ style = "dashed", color = "blue" ];
diff --git a/repo/graph.json b/repo/graph.json
index ff9fbefac0c..d0b1cd4a282 100644
--- a/repo/graph.json
+++ b/repo/graph.json
@@ -154,15 +154,15 @@
       { "id": "@kie-tools/sonataflow-operator" },
       { "id": "@kie-tools/sonataflow-builder-image" },
       { "id": "@kie-tools/sonataflow-devmode-image" },
+      { "id": "@kie/kogito-data-index-ephemeral-image" },
+      { "id": "@kie/kogito-data-index-postgresql-image" },
+      { "id": "@kie/kogito-jobs-service-ephemeral-image" },
+      { "id": "@kie/kogito-jobs-service-postgresql-image" },
       { "id": "@kie/kogito-base-builder-image" },
       { "id": "@kie-tools/sonataflow-image-common" },
       { "id": "@kie-tools/python-venv" },
-      { "id": "@kie/kogito-data-index-ephemeral-image" },
-      { "id": "@kie/kogito-data-index-postgresql-image" },
       { "id": "@kie/kogito-jit-runner-image" },
       { "id": "@kie/kogito-jobs-service-allinone-image" },
-      { "id": "@kie/kogito-jobs-service-ephemeral-image" },
-      { "id": "@kie/kogito-jobs-service-postgresql-image" },
       { "id": "@kie-tools/unitables" },
       { "id": "pmml-vscode-extension" },
       { "id": "@kie-tools/runtime-tools-components" },
@@ -1920,6 +1920,26 @@
         "target": "@kie-tools/sonataflow-devmode-image",
         "weight": 1
       },
+      {
+        "source": "@kie-tools/sonataflow-operator",
+        "target": "@kie/kogito-data-index-ephemeral-image",
+        "weight": 1
+      },
+      {
+        "source": "@kie-tools/sonataflow-operator",
+        "target": "@kie/kogito-data-index-postgresql-image",
+        "weight": 1
+      },
+      {
+        "source": "@kie-tools/sonataflow-operator",
+        "target": "@kie/kogito-jobs-service-ephemeral-image",
+        "weight": 1
+      },
+      {
+        "source": "@kie-tools/sonataflow-operator",
+        "target": "@kie/kogito-jobs-service-postgresql-image",
+        "weight": 1
+      },
       {
         "source": "@kie-tools/sonataflow-builder-image",
         "target": "@kie-tools/sonataflow-image-common",
@@ -1936,47 +1956,47 @@
         "weight": 1
       },
       {
-        "source": "@kie/kogito-base-builder-image",
+        "source": "@kie/kogito-data-index-ephemeral-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie-tools/sonataflow-image-common",
-        "target": "@kie-tools/python-venv",
+        "source": "@kie/kogito-data-index-postgresql-image",
+        "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie-tools/sonataflow-image-common",
-        "target": "@kie-tools/root-env",
+        "source": "@kie/kogito-jobs-service-ephemeral-image",
+        "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-data-index-ephemeral-image",
+        "source": "@kie/kogito-jobs-service-postgresql-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-data-index-postgresql-image",
+        "source": "@kie/kogito-base-builder-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-jit-runner-image",
-        "target": "@kie-tools/sonataflow-image-common",
+        "source": "@kie-tools/sonataflow-image-common",
+        "target": "@kie-tools/python-venv",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-jobs-service-allinone-image",
-        "target": "@kie-tools/sonataflow-image-common",
+        "source": "@kie-tools/sonataflow-image-common",
+        "target": "@kie-tools/root-env",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-jobs-service-ephemeral-image",
+        "source": "@kie/kogito-jit-runner-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
       {
-        "source": "@kie/kogito-jobs-service-postgresql-image",
+        "source": "@kie/kogito-jobs-service-allinone-image",
         "target": "@kie-tools/sonataflow-image-common",
         "weight": 1
       },
@@ -2270,6 +2290,11 @@
         "target": "@kie-tools/serverless-logic-web-tools-base-builder-image-env",
         "weight": 1
       },
+      {
+        "source": "@kie-tools/serverless-logic-web-tools-base-builder-image",
+        "target": "@kie/kogito-base-builder-image",
+        "weight": 1
+      },
       {
         "source": "@kie-tools/serverless-logic-web-tools-swf-builder-image",
         "target": "@kie-tools/serverless-logic-web-tools-swf-builder-image-env",
@@ -2317,17 +2342,17 @@
       },
       {
         "source": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image",
-        "target": "@kie-tools/python-venv",
+        "target": "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app",
         "weight": 1
       },
       {
         "source": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image",
-        "target": "@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app",
+        "target": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env",
         "weight": 1
       },
       {
         "source": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image",
-        "target": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env",
+        "target": "@kie/kogito-base-builder-image",
         "weight": 1
       },
       {
diff --git a/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs b/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
index 02f725435a8..6930f85d62f 100755
--- a/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
+++ b/scripts/bootstrap/check_required_preinstalled_cli_commands.mjs
@@ -34,6 +34,7 @@ const argsByCommand = new Map([
   ["python3", ["--version"]],
   ["pip3", ["--version"]],
   ["s2i", ["version"]],
+  ["xmllint", ["-version"]],
 ]);
 
 async function main() {
diff --git a/scripts/update-kogito-version/update_kogito_version.js b/scripts/update-kogito-version/update_kogito_version.js
index eff803cf607..df2396eb796 100755
--- a/scripts/update-kogito-version/update_kogito_version.js
+++ b/scripts/update-kogito-version/update_kogito_version.js
@@ -22,16 +22,15 @@ const path = require("path");
 const execSync = require("child_process").execSync;
 
 const newMavenVersion = process.argv[3];
-const newImagesTag = process.argv[5];
 if (!newMavenVersion) {
-  console.error("Usage 'node update_kogito_version.js --maven [version] --images-tag [tag]'");
+  console.error("Usage 'node update_kogito_version.js --maven [version]");
   return 1;
 }
 
-if (process.argv[2] !== "--maven" || process.argv[4] !== "--images-tag") {
+if (process.argv[2] !== "--maven") {
   console.error("Arguments need to be passed in the correct order.");
   console.error(`Argv: ${process.argv.join(", ")}`);
-  console.error("Usage 'node update_kogito_version.js --maven [version] --images-tag [tag]'");
+  console.error("Usage 'node update_kogito_version.js --maven [version]");
   process.exit(1);
 }
 
@@ -50,56 +49,13 @@ try {
       )
   );
 
-  console.info("[update-kogito-version] Updating 'serverless-logic-web-tools-base-builder-image/env/index.js'...");
-  const serverlessLogicWebToolsBaseBuilderImageEnvPath = path.resolve(
-    __dirname,
-    "../../packages/serverless-logic-web-tools-base-builder-image/env/index.js"
-  );
-  fs.writeFileSync(
-    serverlessLogicWebToolsBaseBuilderImageEnvPath,
-    fs
-      .readFileSync(serverlessLogicWebToolsBaseBuilderImageEnvPath, "utf-8")
-      .replace(
-        /SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag:[\s\n]*{[\s\n]*default:[\s\n]*".*"/,
-        `SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderKogitoImageTag: {\n        default: "${newImagesTag}"`
-      )
-  );
-
-  console.info(
-    "[update-kogito-version] Updating 'packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js'..."
-  );
-  const serverlessLogicWebToolsSwfDevModeImageEnvPath = path.resolve(
-    __dirname,
-    "../../packages/serverless-logic-web-tools-swf-dev-mode-image/env/index.js"
-  );
-  fs.writeFileSync(
-    serverlessLogicWebToolsSwfDevModeImageEnvPath,
-    fs
-      .readFileSync(serverlessLogicWebToolsSwfDevModeImageEnvPath, "utf-8")
-      .replace(
-        /SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag:[\s\n]*{[\s\n]*default:[\s\n]*".*"/,
-        `SERVERLESS_LOGIC_WEB_TOOLS_DEVMODE_IMAGE__kogitoBaseBuilderImageTag: {\n        default: "${newImagesTag}"`
-      )
-  );
-
-  console.info("[update-kogito-version] Updating 'packages/sonataflow-operator/version/version.go'...");
-  const sonataflowOperatorVersionsGo = path.resolve(__dirname, "../../packages/sonataflow-operator/version/version.go");
-  fs.writeFileSync(
-    sonataflowOperatorVersionsGo,
-    fs
-      .readFileSync(sonataflowOperatorVersionsGo, "utf-8")
-      .replace(/kogitoImagesTagVersion = ".*"/, `kogitoImagesTagVersion = "${newImagesTag}"`)
-  );
-
   console.info(`[update-kogito-version] Bootstrapping with updated Kogito version...`);
   execSync(`pnpm bootstrap`, execOpts);
 
   console.info(`[update-kogito-version] Formatting files...`);
   execSync(`pnpm pretty-quick`, execOpts);
 
-  console.info(
-    `[update-kogito-version] Updated Kogito to '${newMavenVersion}' (Maven) and '${newImagesTag}' (Images tag).`
-  );
+  console.info(`[update-kogito-version] Updated Kogito to '${newMavenVersion}' (Maven)`);
   console.info(`[update-kogito-version] Done.`);
 } catch (error) {
   console.error(error);